Browse Source

Orthografische Perspektive

bolt_update
laurids 4 years ago
parent
commit
f6e667bc72
3 changed files with 181 additions and 173 deletions
  1. +100
    -100
      Assets/GWConquest/Scenes/GalaxyMap.unity
  2. +70
    -73
      Assets/GWConquest/Scripts/GWCamera.cs
  3. +11
    -0
      Assets/GWConquest/Scripts/IngameUI.cs

+ 100
- 100
Assets/GWConquest/Scenes/GalaxyMap.unity View File

@ -465,7 +465,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -1081,7 +1081,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -1224,7 +1224,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -1395,7 +1395,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -1946,7 +1946,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -2089,7 +2089,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -3197,7 +3197,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -3507,7 +3507,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -5107,7 +5107,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -5688,7 +5688,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -6052,7 +6052,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -6617,7 +6617,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -7160,7 +7160,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -7488,7 +7488,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -8075,7 +8075,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -8835,7 +8835,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -9227,7 +9227,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -9568,7 +9568,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -10039,7 +10039,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -10392,7 +10392,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -12007,7 +12007,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -12180,7 +12180,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -12857,7 +12857,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -13060,7 +13060,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -13191,7 +13191,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -13847,7 +13847,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -15569,7 +15569,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -16629,10 +16629,10 @@ Camera:
y: 0
width: 1
height: 1
near clip plane: 0.01
far clip plane: 1e+12
near clip plane: 1
far clip plane: 20000
field of view: 60
orthographic: 0
orthographic: 1
orthographic size: 774.82
m_Depth: -1
m_CullingMask:
@ -16664,7 +16664,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -17011,7 +17011,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -17293,7 +17293,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 690503115}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -2000}
m_LocalPosition: {x: 0, y: 0, z: -10000}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 663080993}
@ -17723,7 +17723,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -18676,7 +18676,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -18819,7 +18819,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -19466,7 +19466,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -19851,7 +19851,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -20495,7 +20495,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -20815,7 +20815,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -21248,7 +21248,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -21738,7 +21738,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -22134,7 +22134,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -22277,7 +22277,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -23335,7 +23335,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -24296,7 +24296,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -24439,7 +24439,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -24822,7 +24822,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -25100,7 +25100,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -25491,7 +25491,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -26337,7 +26337,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -26505,7 +26505,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -26883,7 +26883,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -27218,7 +27218,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -27547,7 +27547,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -27690,7 +27690,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -28341,7 +28341,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -28840,7 +28840,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -29088,7 +29088,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -30189,7 +30189,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -30666,7 +30666,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -31559,7 +31559,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -33087,7 +33087,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -33623,7 +33623,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -34483,7 +34483,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -34699,7 +34699,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -34872,7 +34872,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -36167,7 +36167,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -37027,7 +37027,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -37907,7 +37907,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -38325,7 +38325,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -38880,7 +38880,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -39334,7 +39334,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -39477,7 +39477,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -40018,7 +40018,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -40186,7 +40186,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -40390,7 +40390,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -40638,7 +40638,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -40911,7 +40911,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -41424,7 +41424,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -42170,7 +42170,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -42889,7 +42889,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -43371,7 +43371,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -43716,7 +43716,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -43964,7 +43964,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -44733,22 +44733,22 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1992706992}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 70d295fa3522a4f4a84d1c92a0a98a94, type: 3}
m_Name:
m_EditorClassIdentifier:
cameraTransform: {fileID: 690503116}
cameraTranslationSpeedMinZoom: 1
cameraTranslationSpeedMaxZoom: 1
cameraTranslationSpeedMinZoom: 1000
cameraTranslationSpeedMaxZoom: 3500
scrollRegionSize: 100
cameraRotationSpeed: 200
cameraZoomSpeed: -40000
cameraZoomTranslationSpeed: 1
cameraZoomSmooth: 1
cameraTranslationSmooth: 1
minCameraAngle: 10
maxCameraAngle: 80
cameraZoomSmooth: 0.03
cameraTranslationSmooth: 0.03
minCameraAngle: 20
maxCameraAngle: 90
minCameraZoom: 500
maxCameraZoom: 4000
--- !u!4 &1992706994
@ -44773,7 +44773,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1992706992}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 70d295fa3522a4f4a84d1c92a0a98a94, type: 3}
m_Name:
@ -45221,7 +45221,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -45882,7 +45882,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -46518,7 +46518,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -47039,7 +47039,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -47387,7 +47387,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -47648,7 +47648,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
@ -48047,7 +48047,7 @@ PrefabInstance:
- target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}
propertyPath: FixPlanetSize
value: 0.48
value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
type: 3}


+ 70
- 73
Assets/GWConquest/Scripts/GWCamera.cs View File

@ -37,7 +37,15 @@ namespace GWConquest
private void Start()
{
cameraZoomTarget = cameraTransform.localPosition.z;
Camera cam = cameraTransform.GetComponentInChildren<Camera>();
if(cam.orthographic)
{
cameraZoomTarget = cam.orthographicSize;
}
else
{
cameraZoomTarget = cameraTransform.localPosition.z;
}
transformPositionTarget = transform.position;
cameraPlane = new Plane(Vector3.up, transform.position);
}
@ -88,107 +96,96 @@ namespace GWConquest
private void Update()
{
float horizontalButtons = Input.GetAxis("Horizontal");
float verticalButtons = Input.GetAxis("Vertical");
Vector2 edgeScroll = GetEdgeScroll();
float horizontal = Mathf.Clamp(horizontalButtons + edgeScroll.x, -1f, 1f);
float vertical = Mathf.Clamp(verticalButtons + edgeScroll.y, -1f, 1f);
//Debug.LogFormat("Horizontal: {0}; Vertical: {1}", horizontal, vertical);
Vector3 forward = Vector3.Cross(transform.right, Vector3.up);
Vector3 right = transform.right;
float zoomPercent = Mathf.InverseLerp(minCameraZoom, maxCameraZoom, cameraZoomTarget);
float cameraTranslationSpeed = Mathf.Lerp(cameraTranslationSpeedMaxZoom, cameraTranslationSpeedMinZoom, zoomPercent);
if (!IngameUI.PlanetViewEnabled)
{
float horizontalButtons = Input.GetAxis("Horizontal");
float verticalButtons = Input.GetAxis("Vertical");
transformPositionTarget += vertical * cameraTranslationSpeed * Time.deltaTime * forward;
transformPositionTarget += horizontal * cameraTranslationSpeed * Time.deltaTime * right;
Vector2 edgeScroll = GetEdgeScroll();
if (Input.GetButton("Middle Click"))
{
float mouseX = Input.GetAxis("Mouse X");
float mouseY = Input.GetAxis("Mouse Y");
float horizontal = Mathf.Clamp(horizontalButtons + edgeScroll.x, -1f, 1f);
float vertical = Mathf.Clamp(verticalButtons + edgeScroll.y, -1f, 1f);
Vector3 eulerAngles = transform.localEulerAngles;
eulerAngles.x -= mouseY * cameraRotationSpeed * Time.deltaTime;
eulerAngles.y += mouseX * cameraRotationSpeed * Time.deltaTime;
//Debug.LogFormat("Horizontal: {0}; Vertical: {1}", horizontal, vertical);
eulerAngles.x = Mathf.Clamp(eulerAngles.x, minCameraAngle, maxCameraAngle);
Vector3 forward = Vector3.Cross(transform.right, Vector3.up);
Vector3 right = transform.right;
transform.localEulerAngles = eulerAngles;
}
float zoomPercent = Mathf.InverseLerp(minCameraZoom, maxCameraZoom, cameraZoomTarget);
float cameraTranslationSpeed = Mathf.Lerp(cameraTranslationSpeedMaxZoom, cameraTranslationSpeedMinZoom, zoomPercent);
float middle = Input.GetAxis("Mouse ScrollWheel");
transformPositionTarget += vertical * cameraTranslationSpeed * Time.deltaTime * forward;
transformPositionTarget += horizontal * cameraTranslationSpeed * Time.deltaTime * right;
Camera cam = cameraTransform.GetComponentInChildren<Camera>();
if(cam != null)
{
if (cam.orthographic)
{
float camSize = cam.orthographicSize + middle * cameraZoomSpeed * Time.deltaTime;
camSize = Mathf.Clamp(camSize, minCameraZoom, maxCameraZoom);
cam.orthographicSize = camSize;
}
else
if (Input.GetButton("Middle Click"))
{
/*
Vector3 pointedAtBegin = GetMousePositionTarget();
float mouseX = Input.GetAxis("Mouse X");
float mouseY = Input.GetAxis("Mouse Y");
cameraZoomTarget += middle * cameraZoomSpeed * Time.deltaTime;
cameraZoomTarget = Mathf.Clamp(cameraZoomTarget, minCameraZoom, maxCameraZoom);
Vector3 eulerAngles = transform.localEulerAngles;
eulerAngles.x -= mouseY * cameraRotationSpeed * Time.deltaTime;
eulerAngles.y += mouseX * cameraRotationSpeed * Time.deltaTime;
Vector3 cameraPos = cameraTransform.localPosition;
eulerAngles.x = Mathf.Clamp(eulerAngles.x, minCameraAngle, maxCameraAngle);
cameraPos.z = Mathf.SmoothDamp(cameraPos.z, cameraZoomTarget, ref cameraZoomVelocity, cameraZoomSmooth);
transform.localEulerAngles = eulerAngles;
}
cameraTransform.localPosition = cameraPos;
float middle = Input.GetAxis("Mouse ScrollWheel");
Vector3 pointedAtEnd = GetMousePositionTarget();
Camera cam = cameraTransform.GetComponentInChildren<Camera>();
if (cam != null)
{
if (cam.orthographic)
{
if (middle != 0)
{
cameraZoomTarget += middle * cameraZoomSpeed * Time.deltaTime;
cameraZoomTarget = Mathf.Clamp(cameraZoomTarget, minCameraZoom, maxCameraZoom);
transform.position -= (pointedAtEnd - pointedAtBegin) * cameraZoomTranslationSpeed;
}
Debug.LogFormat("Begin: {0}; End: {1}; Difference: {2}; Afterwards: {3}", pointedAtBegin, pointedAtEnd, pointedAtEnd - pointedAtBegin, GetMousePositionTarget());
Debug.DrawLine(pointedAtBegin, pointedAtEnd, Color.magenta);
*/
cam.orthographicSize = Mathf.SmoothDamp(cam.orthographicSize, cameraZoomTarget, ref cameraZoomVelocity, cameraZoomSmooth);
if(middle != 0)
}
else
{
Vector3 pointedAt = GetMousePositionTarget();
float zoomDelta = cameraZoomSpeed * middle * Time.deltaTime;
Vector3 newCameraPosition = Vector3.MoveTowards(cameraTransform.position, pointedAt, zoomDelta);
Ray newCameraRay = new Ray(newCameraPosition, cameraTransform.forward);
if (cameraPlane.Raycast(newCameraRay, out float enter))
if (middle != 0)
{
Vector3 newTransformPos = newCameraRay.GetPoint(enter);
//transformPositionTarget += newTransformPos - transform.position;
transformPositionTarget = newTransformPos;
Vector3 pointedAt = GetMousePositionTarget();
float zoomDelta = cameraZoomSpeed * middle * Time.deltaTime;
Vector3 newCameraPosition = Vector3.MoveTowards(cameraTransform.position, pointedAt, zoomDelta);
Vector3 newCameraPosLocal = transform.InverseTransformPoint(newCameraPosition);
Ray newCameraRay = new Ray(newCameraPosition, cameraTransform.forward);
if (cameraPlane.Raycast(newCameraRay, out float enter))
{
Vector3 newTransformPos = newCameraRay.GetPoint(enter);
//transformPositionTarget += newTransformPos - transform.position;
transformPositionTarget = newTransformPos;
Debug.LogFormat("New Camera Pos {0}, New Camera Pos Local {1}; New Transform Pos {2}", newCameraPosition, newCameraPosLocal, newTransformPos);
Vector3 newCameraPosLocal = transform.InverseTransformPoint(newCameraPosition);
cameraZoomTarget = newCameraPosLocal.z;
cameraZoomTarget = Mathf.Clamp(cameraZoomTarget, minCameraZoom, maxCameraZoom);
Debug.LogFormat("New Camera Pos {0}, New Camera Pos Local {1}; New Transform Pos {2}", newCameraPosition, newCameraPosLocal, newTransformPos);
cameraZoomTarget = newCameraPosLocal.z;
cameraZoomTarget = Mathf.Clamp(cameraZoomTarget, minCameraZoom, maxCameraZoom);
}
}
}
Vector3 cameraPos = cameraTransform.localPosition;
cameraPos.z = Mathf.SmoothDamp(cameraPos.z, cameraZoomTarget, ref cameraZoomVelocity, cameraZoomSmooth);
Vector3 cameraPos = cameraTransform.localPosition;
cameraTransform.localPosition = cameraPos;
cameraPos.z = Mathf.SmoothDamp(cameraPos.z, cameraZoomTarget, ref cameraZoomVelocity, cameraZoomSmooth);
cameraTransform.localPosition = cameraPos;
}
transform.position = Vector3.SmoothDamp(transform.position, transformPositionTarget, ref transformPositionVelocity, cameraTranslationSmooth);
}
transform.position = Vector3.SmoothDamp(transform.position, transformPositionTarget, ref transformPositionVelocity, cameraTranslationSmooth);
}
}
public void ResetCameraTransform()


+ 11
- 0
Assets/GWConquest/Scripts/IngameUI.cs View File

@ -128,12 +128,19 @@ namespace GWConquest
private void SelectPlanets(bool doubleClick)
{
Vector3 camPos = Camera.main.ScreenToWorldPoint(Input.mousePosition);
BoltLog.Info("Raycasting with origin {0}; direction {1}", camPos, Camera.main.transform.forward);
Debug.DrawRay(camPos, Camera.main.transform.forward, Color.green, 5);
PhysicsRaycaster pr = FindObjectOfType<PhysicsRaycaster>();
List<RaycastResult> list = pr.RaycastFromMousePosition();
bool hasHit = false;
foreach (RaycastResult result in list)
{
BoltLog.Info("Found game object {0}", result.gameObject);
Planet planet = result.gameObject.GetComponentInParent<Planet>();
if (planet != null)
{
@ -182,6 +189,8 @@ namespace GWConquest
Camera mainCam = Camera.main;
mainCam.orthographic = false;
mainCam.transform.SetParent(planet.planetCameraTransform, true);
viewedPlanet = planet;
@ -202,6 +211,8 @@ namespace GWConquest
GWCamera camera = FindObjectOfType<GWCamera>();
camera.ResetCameraTransform();
Camera.main.orthographic = true;
viewedPlanet.GetComponent<PlanetScaling>().enabled = true;
PlanetHud.gameObject.SetActive(true);
PlanetNames.SetActive(true);


Loading…
Cancel
Save