laurids
/
GWConquest
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

Planet Visibility Fixes

master
laurids 3 years ago
parent
3a08ae85e9
commit
62719b0bdf
9 changed files with 175 additions and 97 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -0
      .gitignore
  2. +73
    -3
      Assets/GWConquest/Scenes/MainMenu.unity
  3. +2
    -0
      Assets/GWConquest/Scripts/GameManager.cs
  4. +7
    -3
      Assets/GWConquest/Scripts/Planet.cs
  5. +8
    -2
      Assets/GWConquest/Scripts/Player.cs
  6. +1
    -4
      Assets/GWConquest/Scripts/UI/DebugUI.cs
  7. +82
    -60
      Assets/GWConquest/Scripts/UI/PlanetIndicatorUI.cs
  8. +1
    -1
      Assets/Photon/PhotonBolt/resources/BoltRuntimeSettings.asset
  9. +0
    -24
      UserSettings/EditorUserSettings.asset

+ 1
- 0
.gitignore View File

@ -4,6 +4,7 @@
[Bb]uilds/
[Tt]est/
[Ll]ogs/
[Uu]serSettings/
.vs/
# Autogenerated VS/MD solution and project files


+ 73
- 3
Assets/GWConquest/Scenes/MainMenu.unity View File

@ -38,12 +38,12 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
m_IndirectSpecularColor: {r: 0.007903649, g: 0.0044802446, b: 0.0041637, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 11
serializedVersion: 12
m_GIWorkflowMode: 1
m_GISettings:
serializedVersion: 2
@ -98,7 +98,7 @@ LightmapSettings:
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
m_LightingSettings: {fileID: 0}
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
@ -118,6 +118,8 @@ NavMeshSettings:
manualTileSize: 0
tileSize: 256
accuratePlacement: 0
maxJobWorkers: 0
preserveTilesOutsideBounds: 0
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
@ -173,6 +175,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0.8901961, b: 0.5647059, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -253,6 +256,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0.8901961, b: 0.5647059, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -333,6 +337,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 0.8, g: 0.25490198, b: 0.14509805, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -537,6 +542,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
@ -567,6 +573,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1812249645}
m_TargetAssemblyTypeName:
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
@ -578,6 +585,7 @@ MonoBehaviour:
m_BoolArgument: 1
m_CallState: 2
- m_Target: {fileID: 832321101}
m_TargetAssemblyTypeName:
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
@ -603,6 +611,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -677,6 +686,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -939,6 +949,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1356,6 +1367,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1434,6 +1446,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1514,6 +1527,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1593,6 +1607,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
@ -1623,6 +1638,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 804547815}
m_TargetAssemblyTypeName:
m_MethodName: Quit
m_Mode: 1
m_Arguments:
@ -1648,6 +1664,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -2208,6 +2225,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -2291,6 +2309,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 0
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
@ -2321,6 +2340,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1849321102}
m_TargetAssemblyTypeName:
m_MethodName: Select
m_Mode: 3
m_Arguments:
@ -2546,6 +2566,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 0
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
@ -2576,6 +2597,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 804547815}
m_TargetAssemblyTypeName:
m_MethodName: CancelClient
m_Mode: 1
m_Arguments:
@ -2587,6 +2609,7 @@ MonoBehaviour:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 832321101}
m_TargetAssemblyTypeName:
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
@ -2598,6 +2621,7 @@ MonoBehaviour:
m_BoolArgument: 1
m_CallState: 2
- m_Target: {fileID: 565186569}
m_TargetAssemblyTypeName:
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
@ -2623,6 +2647,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -2706,6 +2731,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 0
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
@ -2736,6 +2762,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1142353830}
m_TargetAssemblyTypeName:
m_MethodName: Select
m_Mode: 3
m_Arguments:
@ -3379,6 +3406,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -3501,6 +3529,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -3580,6 +3609,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
@ -3610,6 +3640,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 804547815}
m_TargetAssemblyTypeName:
m_MethodName: StartClient
m_Mode: 1
m_Arguments:
@ -3621,6 +3652,7 @@ MonoBehaviour:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 565186569}
m_TargetAssemblyTypeName:
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
@ -3632,6 +3664,7 @@ MonoBehaviour:
m_BoolArgument: 1
m_CallState: 2
- m_Target: {fileID: 832321101}
m_TargetAssemblyTypeName:
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
@ -3657,6 +3690,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -3738,6 +3772,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 0
--- !u!223 &804547813
Canvas:
m_ObjectHideFlags: 0
@ -3909,6 +3944,7 @@ Light:
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!4 &835318823
@ -4056,6 +4092,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -4134,6 +4171,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -4296,6 +4334,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -4514,6 +4553,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -4592,6 +4632,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -4670,6 +4711,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -4747,6 +4789,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 0
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
@ -4777,6 +4820,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1142353830}
m_TargetAssemblyTypeName:
m_MethodName: Select
m_Mode: 3
m_Arguments:
@ -4903,6 +4947,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 0.8, g: 0.25490198, b: 0.14509805, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -5173,6 +5218,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 0
--- !u!223 &1214876925
Canvas:
m_ObjectHideFlags: 0
@ -5268,6 +5314,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
@ -5298,6 +5345,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 736075750}
m_TargetAssemblyTypeName:
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
@ -5309,6 +5357,7 @@ MonoBehaviour:
m_BoolArgument: 1
m_CallState: 2
- m_Target: {fileID: 736075751}
m_TargetAssemblyTypeName:
m_MethodName: Show
m_Mode: 1
m_Arguments:
@ -5320,6 +5369,7 @@ MonoBehaviour:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 832321101}
m_TargetAssemblyTypeName:
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
@ -5345,6 +5395,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -5425,6 +5476,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -5499,6 +5551,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -5579,6 +5632,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -5947,6 +6001,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 0
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
@ -5977,6 +6032,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1849321102}
m_TargetAssemblyTypeName:
m_MethodName: Select
m_Mode: 3
m_Arguments:
@ -6083,6 +6139,7 @@ VideoPlayer:
m_Looping: 1
m_WaitForFirstFrame: 1
m_FrameReadyEventEnabled: 0
m_VideoShaders: []
--- !u!114 &1427117530
MonoBehaviour:
m_ObjectHideFlags: 0
@ -6098,6 +6155,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -6365,6 +6423,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 0.8, g: 0.25490198, b: 0.14509805, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -6678,6 +6737,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -6756,6 +6816,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -6854,6 +6915,7 @@ VideoPlayer:
m_Looping: 1
m_WaitForFirstFrame: 1
m_FrameReadyEventEnabled: 0
m_VideoShaders: []
--- !u!114 &1798018175
MonoBehaviour:
m_ObjectHideFlags: 0
@ -6869,6 +6931,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -7573,6 +7636,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -7775,6 +7839,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 0
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
@ -7805,6 +7870,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1142353830}
m_TargetAssemblyTypeName:
m_MethodName: Select
m_Mode: 3
m_Arguments:
@ -7893,6 +7959,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -7973,6 +8040,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0.8901961, b: 0.5647059, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -8179,6 +8247,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 0
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
@ -8209,6 +8278,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1849321102}
m_TargetAssemblyTypeName:
m_MethodName: Select
m_Mode: 3
m_Arguments:


+ 2
- 0
Assets/GWConquest/Scripts/GameManager.cs View File

@ -134,6 +134,8 @@ namespace GWConquest
Planet.SetupPlanetPathfinding();
BoltLog.Info("Setup planet pathfinding.");
Planet.UpdateVisibilityStatus();
BoltLog.Info("Entities loaded, Dismissing loading screen...");
LoadingScreen.Dismiss();


+ 7
- 3
Assets/GWConquest/Scripts/Planet.cs View File

@ -15,7 +15,11 @@ namespace GWConquest
{
get
{
if (_allPlanets == null || !Application.isPlaying)
if(!Application.isPlaying || !GameManager.EntitiesLoaded)
{
return FindObjectsOfType<Planet>();
}
else if (_allPlanets == null)
{
_allPlanets = FindObjectsOfType<Planet>();
}
@ -413,14 +417,14 @@ namespace GWConquest
public void SetPlanetVisible(Player player)
{
if(VisibilityStatus != PlanetVisibilityStatus.Visible)
if(GetVisibilityStatus(player) != PlanetVisibilityStatus.Visible)
{
player.VisiblePlanetsList.Add(entity);
foreach(var cpe in ConnectedPlanetsList)
{
var otherPlanet = cpe.Entity.GetComponent<Planet>();
if(otherPlanet.VisibilityStatus == PlanetVisibilityStatus.Hidden)
if(otherPlanet.GetVisibilityStatus(player) == PlanetVisibilityStatus.Hidden)
{
player.KnownPlanetsList.Add(otherPlanet.entity);
}


+ 8
- 2
Assets/GWConquest/Scripts/Player.cs View File

@ -54,11 +54,17 @@ namespace GWConquest
VisiblePlanetsList = new EntityList(State, "VisiblePlanetsList");
State.AddCallback("KnownPlanetsList", () => {
Planet.UpdateVisibilityStatus();
if(GameManager.EntitiesLoaded)
{
Planet.UpdateVisibilityStatus();
}
});
State.AddCallback("VisiblePlanetsList", () => {
Planet.UpdateVisibilityStatus();
if(GameManager.EntitiesLoaded)
{
Planet.UpdateVisibilityStatus();
}
});
}


+ 1
- 4
Assets/GWConquest/Scripts/UI/DebugUI.cs View File

@ -76,10 +76,7 @@ namespace GWConquest
MoveEnemyUnits = MoveEnemyUnitsToggle.isOn;
FreeBuild = FreeBuildToggle.isOn;
foreach(Planet planet in Planet.AllPlanets)
{
planet.UpdatePlanetRenderer();
}
Planet.UpdateVisibilityStatus();
}
}
}


+ 82
- 60
Assets/GWConquest/Scripts/UI/PlanetIndicatorUI.cs View File

@ -68,101 +68,123 @@ namespace GWConquest
public void UpdateIndicator()
{
IEnumerable<Formation> formations = Planet.GetAllFormations(ZoneType.Space);
float playerStrength = formations.Sum(f => f.Player == Player.CurrentPlayer ? f.GetFormationStrength() : 0f);
float enemyStrength = formations.Sum(f => f.Player != Player.CurrentPlayer ? f.GetFormationStrength() : 0f);
if (DebugUI.ShowAllPlanets || Planet.VisibilityStatus == PlanetVisibilityStatus.Visible)
{
IEnumerable<Formation> formations = Planet.GetAllFormations(ZoneType.Space);
float playerStrength = formations.Sum(f => f.Player == Player.CurrentPlayer ? f.GetFormationStrength() : 0f);
float enemyStrength = formations.Sum(f => f.Player != Player.CurrentPlayer ? f.GetFormationStrength() : 0f);
IEnumerable<Formation> formationsGround = Planet.GetAllFormations(ZoneType.Ground);
float playerStrengthGround = formationsGround.Sum(f => f.Player == Player.CurrentPlayer ? f.GetFormationStrength() : 0f);
float enemyStrengthGround = formationsGround.Sum(f => f.Player != Player.CurrentPlayer ? f.GetFormationStrength() : 0f);
IEnumerable<Formation> formationsGround = Planet.GetAllFormations(ZoneType.Ground);
float playerStrengthGround = formationsGround.Sum(f => f.Player == Player.CurrentPlayer ? f.GetFormationStrength() : 0f);
float enemyStrengthGround = formationsGround.Sum(f => f.Player != Player.CurrentPlayer ? f.GetFormationStrength() : 0f);
if(Mathf.Max(playerStrength, enemyStrength, playerStrengthGround, enemyStrengthGround) > 0f)
{
PlayerIndicator.SetActive(true);
PlayerIndicatorBar.fillAmount = Mathf.Clamp01(playerStrength / MaxFormationStrength) * MaxFillAmount;
PlayerIndicatorBar.color = PlayerIndicatorBar.color.UpdateColorRGB(Player.CurrentPlayer.Color);
PlayerIndicatorGround.SetActive(true);
PlayerIndicatorBarGround.fillAmount = Mathf.Clamp01(playerStrengthGround / MaxFormationStrength) * MaxFillAmount;
PlayerIndicatorBarGround.color = PlayerIndicatorBarGround.color.UpdateColorRGB(Player.CurrentPlayer.Color);
EnemyIndicator.SetActive(true);
EnemyIndicatorBar.fillAmount = Mathf.Clamp01(enemyStrength / MaxFormationStrength) * MaxFillAmount;
Player enemyPlayer = formations.FirstOrDefault(f => f.Player != Player.CurrentPlayer)?.Player;
if(enemyPlayer != null)
if (Mathf.Max(playerStrength, enemyStrength, playerStrengthGround, enemyStrengthGround) > 0f)
{
EnemyIndicatorBar.color = EnemyIndicatorBar.color.UpdateColorRGB(enemyPlayer.Color);
}
PlayerIndicator.SetActive(true);
PlayerIndicatorBar.fillAmount = Mathf.Clamp01(playerStrength / MaxFormationStrength) * MaxFillAmount;
PlayerIndicatorBar.color = PlayerIndicatorBar.color.UpdateColorRGB(Player.CurrentPlayer.Color);
PlayerIndicatorGround.SetActive(true);
PlayerIndicatorBarGround.fillAmount = Mathf.Clamp01(playerStrengthGround / MaxFormationStrength) * MaxFillAmount;
PlayerIndicatorBarGround.color = PlayerIndicatorBarGround.color.UpdateColorRGB(Player.CurrentPlayer.Color);
EnemyIndicator.SetActive(true);
EnemyIndicatorBar.fillAmount = Mathf.Clamp01(enemyStrength / MaxFormationStrength) * MaxFillAmount;
Player enemyPlayer = formations.FirstOrDefault(f => f.Player != Player.CurrentPlayer)?.Player;
if (enemyPlayer != null)
{
EnemyIndicatorBar.color = EnemyIndicatorBar.color.UpdateColorRGB(enemyPlayer.Color);
}
EnemyIndicatorGround.SetActive(true);
EnemyIndicatorBarGround.fillAmount = Mathf.Clamp01(enemyStrengthGround / MaxFormationStrength) * MaxFillAmount;
enemyPlayer = formationsGround.FirstOrDefault(f => f.Player != Player.CurrentPlayer)?.Player;
if(enemyPlayer != null)
EnemyIndicatorGround.SetActive(true);
EnemyIndicatorBarGround.fillAmount = Mathf.Clamp01(enemyStrengthGround / MaxFormationStrength) * MaxFillAmount;
enemyPlayer = formationsGround.FirstOrDefault(f => f.Player != Player.CurrentPlayer)?.Player;
if (enemyPlayer != null)
{
EnemyIndicatorBarGround.color = EnemyIndicatorBarGround.color.UpdateColorRGB(enemyPlayer.Color);
}
}
else
{
EnemyIndicatorBarGround.color = EnemyIndicatorBarGround.color.UpdateColorRGB(enemyPlayer.Color);
PlayerIndicator.SetActive(false);
EnemyIndicator.SetActive(false);
PlayerIndicatorGround.SetActive(false);
EnemyIndicatorGround.SetActive(false);
}
}
else
{
else {
PlayerIndicator.SetActive(false);
EnemyIndicator.SetActive(false);
PlayerIndicatorGround.SetActive(false);
EnemyIndicatorGround.SetActive(false);
}
}
}
private void FixedUpdate() {
if(GameManager.EntitiesLoaded && Planet != null)
{
var controllingPlayer = Planet.ControllingPlayer;
if(controllingPlayer != null)
if (DebugUI.ShowAllPlanets || Planet.VisibilityStatus == PlanetVisibilityStatus.Visible)
{
FactionImage.gameObject.SetActive(true);
FactionImage.sprite = controllingPlayer.Faction.FactionLogo;
FactionImage.color = Util.UpdateColorRGB(FactionImage.color, controllingPlayer.Faction.FactionColor);
PlanetNameText.color = Util.UpdateColorRGB(PlanetNameText.color, controllingPlayer.Faction.FactionColor);
var controllingPlayer = Planet.ControllingPlayer;
}
else {
FactionImage.gameObject.SetActive(false);
if (controllingPlayer != null)
{
FactionImage.gameObject.SetActive(true);
FactionImage.sprite = controllingPlayer.Faction.FactionLogo;
FactionImage.color = Util.UpdateColorRGB(FactionImage.color, controllingPlayer.Faction.FactionColor);
PlanetNameText.color = Util.UpdateColorRGB(PlanetNameText.color, NeutralColor);
}
PlanetNameText.color = Util.UpdateColorRGB(PlanetNameText.color, controllingPlayer.Faction.FactionColor);
}
else
{
FactionImage.gameObject.SetActive(false);
PlanetNameText.color = Util.UpdateColorRGB(PlanetNameText.color, NeutralColor);
}
var districts = Planet.GetComponentsInChildren<District>();
foreach(var type in DistrictSymbolDict.Keys)
{
var typeDistricts = districts.Where(d => d.GetFullType() == type);
Color color = NeutralColor;
if(typeDistricts.All(d => d.ControllingPlayer == Player.CurrentPlayer))
DistrictSymbols.gameObject.SetActive(true);
var districts = Planet.GetComponentsInChildren<District>();
foreach (var type in DistrictSymbolDict.Keys)
{
if (typeDistricts.All(d => d.GetComponent<DistrictFactory>() != null))
var typeDistricts = districts.Where(d => d.GetFullType() == type);
Color color = NeutralColor;
if (typeDistricts.All(d => d.ControllingPlayer == Player.CurrentPlayer))
{
if(typeDistricts.All(d => d.GetComponent<DistrictFactory>().IsProducing))
if (typeDistricts.All(d => d.GetComponent<DistrictFactory>() != null))
{
if (typeDistricts.All(d => d.GetComponent<DistrictFactory>().IsProducing))
{
color = controllingPlayer.Faction.FactionColor;
}
}
else
{
color = controllingPlayer.Faction.FactionColor;
}
}
else
foreach (Image img in DistrictSymbolDict[type].GetComponentsInChildren<Image>())
{
color = controllingPlayer.Faction.FactionColor;
img.color = Util.UpdateColorRGB(img.color, color);
}
}
foreach(Image img in DistrictSymbolDict[type].GetComponentsInChildren<Image>())
{
img.color = Util.UpdateColorRGB(img.color, color);
}
GetComponent<Animator>().SetBool("Battle", Planet.HasBattle);
}
else {
FactionImage.gameObject.SetActive(false);
PlanetNameText.color = Util.UpdateColorRGB(PlanetNameText.color, NeutralColor);
DistrictSymbols.gameObject.SetActive(false);
GetComponent<Animator>().SetBool("Battle", false);
}
GetComponent<Animator>().SetBool("Battle", Planet.HasBattle);
}
}


+ 1
- 1
Assets/Photon/PhotonBolt/resources/BoltRuntimeSettings.asset View File

@ -50,7 +50,7 @@ MonoBehaviour:
debugStartPort: 54321
debugBuildMode: 1
debugStartMapName: GalaxyMap
debugPlayAsServer: 0
debugPlayAsServer: 1
showDebugInfo: 0
overrideTimeScale: 1
debugEditorMode: 1


+ 0
- 24
UserSettings/EditorUserSettings.asset View File

@ -1,24 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!162 &1
EditorUserSettings:
m_ObjectHideFlags: 0
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedScenePath-0:
value: 224247031146466b0501182d1e6c6f18190317240e272a24623a1e36ece52777c0e83afdc33f3d293e31ec390a3b4f2afc031d12
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650
flags: 0
m_VCAutomaticAdd: 1
m_VCDebugCom: 0
m_VCDebugCmd: 0
m_VCDebugOut: 0
m_SemanticMergeMode: 2
m_VCShowFailedCheckout: 1
m_VCOverwriteFailedCheckoutAssets: 1
m_VCProjectOverlayIcons: 1
m_VCHierarchyOverlayIcons: 1
m_VCOtherOverlayIcons: 1
m_VCAllowAsyncUpdate: 0

Write Preview
Loading…
Cancel
Save