From 35e1424d4204a8e55cec58b7c4a9656b4708170e Mon Sep 17 00:00:00 2001 From: laurids Date: Mon, 28 Dec 2020 23:26:31 +0100 Subject: [PATCH] Layers in UI Rendering --- Assets/GWConquest/PlanetNames.mat | 84 -- Assets/GWConquest/Prefabs/Planet.prefab | 4 +- .../GWConquest/Prefabs/UI/DistrictIcon.prefab | 2 +- .../GWConquest/Prefabs/UI/MoneyDisplay.prefab | 32 + .../Prefabs/UI/PlanetIndicator.prefab | 1056 +++++++++++++++++ .../UI/PlanetIndicator.prefab.meta} | 5 +- .../Resources/PlanetConnection.prefab | 2 +- Assets/GWConquest/Scenes/GalaxyMap.unity | 307 +++-- Assets/GWConquest/Scripts/BattleLog.cs | 92 ++ Assets/GWConquest/Scripts/BattleLog.cs.meta | 11 + Assets/GWConquest/Scripts/GWCamera.cs | 22 +- Assets/GWConquest/Scripts/GameManager.cs | 2 + Assets/GWConquest/Scripts/Planet.cs | 7 +- Assets/GWConquest/Scripts/TurnToCamera.cs | 19 + .../GWConquest/Scripts/TurnToCamera.cs.meta | 11 + Assets/GWConquest/Scripts/UI/GalaxyMapUI.cs | 8 +- Assets/GWConquest/Scripts/UI/IngameUI.cs | 3 + .../Scripts/UI/PlanetIndicatorUI.cs | 1 - Assets/GWConquest/Scripts/Unit.cs | 4 + ProjectSettings/TagManager.asset | 2 +- 20 files changed, 1440 insertions(+), 234 deletions(-) delete mode 100644 Assets/GWConquest/PlanetNames.mat create mode 100644 Assets/GWConquest/Prefabs/UI/PlanetIndicator.prefab rename Assets/GWConquest/{PlanetNames.mat.meta => Prefabs/UI/PlanetIndicator.prefab.meta} (54%) create mode 100644 Assets/GWConquest/Scripts/BattleLog.cs create mode 100644 Assets/GWConquest/Scripts/BattleLog.cs.meta create mode 100644 Assets/GWConquest/Scripts/TurnToCamera.cs create mode 100644 Assets/GWConquest/Scripts/TurnToCamera.cs.meta diff --git a/Assets/GWConquest/PlanetNames.mat b/Assets/GWConquest/PlanetNames.mat deleted file mode 100644 index 2b8d6bd..0000000 --- a/Assets/GWConquest/PlanetNames.mat +++ /dev/null @@ -1,84 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: PlanetNames - m_Shader: {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 10 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/GWConquest/Prefabs/Planet.prefab b/Assets/GWConquest/Prefabs/Planet.prefab index 9a5a274..78f8276 100644 --- a/Assets/GWConquest/Prefabs/Planet.prefab +++ b/Assets/GWConquest/Prefabs/Planet.prefab @@ -93,7 +93,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6ded4d2fd3f18ad40916c57fe4f6a566, type: 3} m_Name: m_EditorClassIdentifier: - textPrefab: {fileID: 0} + textPrefab: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, + type: 3} spaceZones: - {fileID: 4678135252239284612} groundZones: @@ -101,6 +102,7 @@ MonoBehaviour: showPlanetName: 1 planetName: planetCameraTransform: {fileID: 3266501631720423375} + InTransitFormations: [] connections: [] --- !u!1 &4678135251355824058 GameObject: diff --git a/Assets/GWConquest/Prefabs/UI/DistrictIcon.prefab b/Assets/GWConquest/Prefabs/UI/DistrictIcon.prefab index 3b46000..0e3aec4 100644 --- a/Assets/GWConquest/Prefabs/UI/DistrictIcon.prefab +++ b/Assets/GWConquest/Prefabs/UI/DistrictIcon.prefab @@ -295,7 +295,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 4efcda70235ff1d4ca9ef256caac46ee, type: 2} + m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_Maskable: 1 diff --git a/Assets/GWConquest/Prefabs/UI/MoneyDisplay.prefab b/Assets/GWConquest/Prefabs/UI/MoneyDisplay.prefab index 18cea68..55b16d5 100644 --- a/Assets/GWConquest/Prefabs/UI/MoneyDisplay.prefab +++ b/Assets/GWConquest/Prefabs/UI/MoneyDisplay.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 4096209424460686482} - component: {fileID: 4096209424460686484} - component: {fileID: 4096209424460686483} + - component: {fileID: 6615438051788853644} m_Layer: 5 m_Name: Total m_TagString: Untagged @@ -78,6 +79,21 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 1000 +--- !u!114 &6615438051788853644 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4096209424460686481} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.63529414} + m_EffectDistance: {x: 2, y: -2} + m_UseGraphicAlpha: 1 --- !u!1 &4096209424666407826 GameObject: m_ObjectHideFlags: 0 @@ -281,6 +297,7 @@ GameObject: - component: {fileID: 4411086135142167815} - component: {fileID: 7939806406244802544} - component: {fileID: 773670987009055092} + - component: {fileID: 3928546618575188225} m_Layer: 5 m_Name: Balance m_TagString: Untagged @@ -348,6 +365,21 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: '[+200]' +--- !u!114 &3928546618575188225 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4928236438828894843} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.63529414} + m_EffectDistance: {x: 2, y: -2} + m_UseGraphicAlpha: 1 --- !u!1 &5945601791339210574 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/GWConquest/Prefabs/UI/PlanetIndicator.prefab b/Assets/GWConquest/Prefabs/UI/PlanetIndicator.prefab new file mode 100644 index 0000000..971c555 --- /dev/null +++ b/Assets/GWConquest/Prefabs/UI/PlanetIndicator.prefab @@ -0,0 +1,1056 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &663035535662628319 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2625678746010572272} + - component: {fileID: 8506913301198793904} + - component: {fileID: 6853616382483371767} + m_Layer: 5 + m_Name: Image (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2625678746010572272 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 663035535662628319} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: -1, y: -1, z: 1} + m_Children: [] + m_Father: {fileID: 1577843074573127529} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 115.94, y: 115.94} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8506913301198793904 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 663035535662628319} + m_CullTransparentMesh: 0 +--- !u!114 &6853616382483371767 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 663035535662628319} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.8, g: 0.25490198, b: 0.14509805, a: 0.62352943} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7f590b703cf5e894ba87509ddeee5bf6, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 1 + m_FillAmount: 0.355 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1004975018085727846 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2845208572781105551} + - component: {fileID: 6883330568249547342} + - component: {fileID: 7197385088179281400} + m_Layer: 5 + m_Name: FactionIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2845208572781105551 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1004975018085727846} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3206999086042524838} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 54} + m_SizeDelta: {x: 33.828804, y: 33.828804} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6883330568249547342 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1004975018085727846} + m_CullTransparentMesh: 0 +--- !u!114 &7197385088179281400 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1004975018085727846} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 3347df28e84113b4999b27c6afc9f3a0, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1425561383975781025 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7614578727491438161} + - component: {fileID: 348536072657243391} + - component: {fileID: 4407254663704189510} + m_Layer: 5 + m_Name: Image (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7614578727491438161 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1425561383975781025} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: -1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 949089614183720835} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 115.94, y: 115.94} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &348536072657243391 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1425561383975781025} + m_CullTransparentMesh: 0 +--- !u!114 &4407254663704189510 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1425561383975781025} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.8, g: 0.25490198, b: 0.14509805, a: 0.62352943} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7f590b703cf5e894ba87509ddeee5bf6, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 1 + m_FillAmount: 0.355 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1573826406629317414 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3206999086042524838} + - component: {fileID: 6687127290163467835} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3206999086042524838 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1573826406629317414} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.8185288, y: 0.8185361, z: 0.8185361} + m_Children: + - {fileID: 3879185905057081487} + - {fileID: 949089614183720835} + - {fileID: 2845208572781105551} + - {fileID: 6750907626847124730} + - {fileID: 1577843074573127529} + m_Father: {fileID: 7384831771431062766} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6687127290163467835 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1573826406629317414} + m_CullTransparentMesh: 0 +--- !u!1 &2095399765145761935 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1577843074573127529} + m_Layer: 5 + m_Name: EnemyIndicatorGround + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1577843074573127529 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2095399765145761935} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2625678746010572272} + - {fileID: 529533629988970957} + m_Father: {fileID: 3206999086042524838} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2248881935027077392 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5551721084081144133} + - component: {fileID: 4886435160560621168} + - component: {fileID: 2179597209832431822} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5551721084081144133 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2248881935027077392} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3879185905057081487} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 115.94, y: 115.94} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4886435160560621168 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2248881935027077392} + m_CullTransparentMesh: 0 +--- !u!114 &2179597209832431822 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2248881935027077392} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.8901961, b: 0.5686275, a: 0.62352943} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7f590b703cf5e894ba87509ddeee5bf6, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 1 + m_FillAmount: 0.324 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2451066642176989824 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1340098551323402705} + - component: {fileID: 7739739101607988475} + - component: {fileID: 9065863115877297986} + m_Layer: 5 + m_Name: Image (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1340098551323402705 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2451066642176989824} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: -1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 949089614183720835} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 115.94, y: 115.94} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7739739101607988475 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2451066642176989824} + m_CullTransparentMesh: 0 +--- !u!114 &9065863115877297986 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2451066642176989824} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.25882354} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 69cab572022c85f4ca97a4bcc005e8f8, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2757051028987816225 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 529533629988970957} + - component: {fileID: 4830321633491969655} + - component: {fileID: 2524867253286451070} + m_Layer: 5 + m_Name: Image (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &529533629988970957 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2757051028987816225} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: -1, y: -1, z: 1} + m_Children: [] + m_Father: {fileID: 1577843074573127529} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 115.94, y: 115.94} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4830321633491969655 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2757051028987816225} + m_CullTransparentMesh: 0 +--- !u!114 &2524867253286451070 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2757051028987816225} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.25882354} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 69cab572022c85f4ca97a4bcc005e8f8, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3536075192841412823 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7493439069602050584} + - component: {fileID: 8817467615109816757} + - component: {fileID: 8517481495962601137} + - component: {fileID: 8442851035215243681} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7493439069602050584 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3536075192841412823} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7384831771431062766} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.0008392157, y: -40} + m_SizeDelta: {x: 200, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8817467615109816757 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3536075192841412823} + m_CullTransparentMesh: 0 +--- !u!114 &8517481495962601137 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3536075192841412823} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.36078432} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: c47f9c9ae53006b46bef8b5c48a002a5, type: 3} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 74 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!114 &8442851035215243681 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3536075192841412823} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.63529414} + m_EffectDistance: {x: 2, y: -2} + m_UseGraphicAlpha: 1 +--- !u!1 &4082808148708746503 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5244398785863296100} + - component: {fileID: 439038825745129500} + - component: {fileID: 45041556200994050} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5244398785863296100 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4082808148708746503} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3879185905057081487} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 115.94, y: 115.94} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &439038825745129500 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4082808148708746503} + m_CullTransparentMesh: 0 +--- !u!114 &45041556200994050 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4082808148708746503} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.25882354} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 69cab572022c85f4ca97a4bcc005e8f8, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4330833540100011828 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8919448470561112503} + - component: {fileID: 578329824177997362} + - component: {fileID: 1935984406216536802} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8919448470561112503 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4330833540100011828} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: -1, z: 1} + m_Children: [] + m_Father: {fileID: 6750907626847124730} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 115.94, y: 115.94} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &578329824177997362 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4330833540100011828} + m_CullTransparentMesh: 0 +--- !u!114 &1935984406216536802 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4330833540100011828} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.8901961, b: 0.5686275, a: 0.62352943} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7f590b703cf5e894ba87509ddeee5bf6, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 1 + m_FillAmount: 0.625 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5727137025483658638 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3879185905057081487} + m_Layer: 5 + m_Name: PlayerIndicatorSpace + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3879185905057081487 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5727137025483658638} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 5551721084081144133} + - {fileID: 5244398785863296100} + m_Father: {fileID: 3206999086042524838} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &5759467313754587104 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2591312047826121234} + - component: {fileID: 3965476354150559101} + - component: {fileID: 7586352828773501397} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2591312047826121234 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5759467313754587104} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: -1, z: 1} + m_Children: [] + m_Father: {fileID: 6750907626847124730} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 115.94, y: 115.94} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3965476354150559101 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5759467313754587104} + m_CullTransparentMesh: 0 +--- !u!114 &7586352828773501397 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5759467313754587104} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.25882354} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 69cab572022c85f4ca97a4bcc005e8f8, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5800374272511425802 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6750907626847124730} + m_Layer: 5 + m_Name: PlayerIndicatorGround + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6750907626847124730 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5800374272511425802} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8919448470561112503} + - {fileID: 2591312047826121234} + m_Father: {fileID: 3206999086042524838} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &7169571971754125867 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 949089614183720835} + m_Layer: 5 + m_Name: EnemyIndicatorSpace + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &949089614183720835 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7169571971754125867} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7614578727491438161} + - {fileID: 1340098551323402705} + m_Father: {fileID: 3206999086042524838} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &7384831771431062761 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7384831771431062766} + - component: {fileID: 7384831771431062765} + - component: {fileID: 7384831771431062764} + - component: {fileID: 7384831771431062767} + m_Layer: 0 + m_Name: PlanetIndicator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7384831771431062766 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7384831771431062761} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7493439069602050584} + - {fileID: 3206999086042524838} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 200, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &7384831771431062765 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7384831771431062761} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &7384831771431062764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7384831771431062761} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9bcbd10dd54fd824abba4f5b4cf5b6a9, type: 3} + m_Name: + m_EditorClassIdentifier: + PlanetNameText: {fileID: 8517481495962601137} + PlayerIndicator: {fileID: 5727137025483658638} + PlayerIndicatorBar: {fileID: 2179597209832431822} + EnemyIndicator: {fileID: 7169571971754125867} + EnemyIndicatorBar: {fileID: 4407254663704189510} + PlayerIndicatorGround: {fileID: 5800374272511425802} + PlayerIndicatorBarGround: {fileID: 1935984406216536802} + EnemyIndicatorGround: {fileID: 2095399765145761935} + EnemyIndicatorBarGround: {fileID: 6853616382483371767} + MaxFillAmount: 1 + MaxFormationStrength: 100 + FactionImage: {fileID: 7197385088179281400} +--- !u!114 &7384831771431062767 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7384831771431062761} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e11e604ed3fa06f4bb0769de129bd71d, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/GWConquest/PlanetNames.mat.meta b/Assets/GWConquest/Prefabs/UI/PlanetIndicator.prefab.meta similarity index 54% rename from Assets/GWConquest/PlanetNames.mat.meta rename to Assets/GWConquest/Prefabs/UI/PlanetIndicator.prefab.meta index cf5e4e6..8727b58 100644 --- a/Assets/GWConquest/PlanetNames.mat.meta +++ b/Assets/GWConquest/Prefabs/UI/PlanetIndicator.prefab.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 4efcda70235ff1d4ca9ef256caac46ee -NativeFormatImporter: +guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264 +PrefabImporter: externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/GWConquest/Resources/PlanetConnection.prefab b/Assets/GWConquest/Resources/PlanetConnection.prefab index c3ebed1..ca4679d 100644 --- a/Assets/GWConquest/Resources/PlanetConnection.prefab +++ b/Assets/GWConquest/Resources/PlanetConnection.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 5208040857522702122} - component: {fileID: 5208040857522702121} - component: {fileID: 526244009083771565} - m_Layer: 0 + m_Layer: 10 m_Name: PlanetConnection m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/GWConquest/Scenes/GalaxyMap.unity b/Assets/GWConquest/Scenes/GalaxyMap.unity index 51ff25d..487803c 100644 --- a/Assets/GWConquest/Scenes/GalaxyMap.unity +++ b/Assets/GWConquest/Scenes/GalaxyMap.unity @@ -586,7 +586,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -1999,7 +1999,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -2386,7 +2386,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -2642,7 +2642,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -3869,7 +3869,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -4087,7 +4087,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -6835,7 +6835,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -7231,7 +7231,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -12770,7 +12770,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -13010,6 +13010,80 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 59300c3dd14d29d4895f5f18e85d7eb3, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &197337106 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 197337107} + - component: {fileID: 197337108} + m_Layer: 0 + m_Name: ConnectionsCam + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &197337107 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 197337106} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 663080993} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &197337108 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 197337106} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 1 + far clip plane: 100000 + field of view: 60 + orthographic: 1 + orthographic size: 774.82 + m_Depth: -2 + m_CullingMask: + serializedVersion: 2 + m_Bits: 1024 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &200482310 GameObject: m_ObjectHideFlags: 0 @@ -15327,7 +15401,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -15991,7 +16065,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -16470,7 +16544,7 @@ Transform: m_LocalScale: {x: 50, y: 50, z: 50} m_Children: [] m_Father: {fileID: 539048598} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &276098502 SphereCollider: @@ -17156,7 +17230,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -18652,7 +18726,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -19934,7 +20008,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -20725,7 +20799,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -21002,7 +21076,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4036631883583960, guid: e4cc86a2911f81c4cafc54b909e0f521, type: 3} propertyPath: m_RootOrder - value: 6 + value: 3 objectReference: {fileID: 0} - target: {fileID: 4036631883583960, guid: e4cc86a2911f81c4cafc54b909e0f521, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -22483,7 +22557,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -23282,7 +23356,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -23490,7 +23564,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 7 + value: 4 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -24345,7 +24419,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -25246,7 +25320,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -25872,7 +25946,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -31572,7 +31646,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -31791,7 +31865,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -32835,7 +32909,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -33123,7 +33197,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -33153,7 +33227,7 @@ PrefabInstance: - target: {fileID: 7191419555384860655, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 7191419555384860655, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -33304,7 +33378,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -34823,7 +34897,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -35997,7 +36071,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4036631883583960, guid: e4cc86a2911f81c4cafc54b909e0f521, type: 3} propertyPath: m_RootOrder - value: 6 + value: 3 objectReference: {fileID: 0} - target: {fileID: 4036631883583960, guid: e4cc86a2911f81c4cafc54b909e0f521, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -38745,7 +38819,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -40182,6 +40256,7 @@ MonoBehaviour: PlayerFleetPanel: {fileID: 1002982021} EnemyFleetPanel: {fileID: 18126404} PlanetSelection: {fileID: 1798411514} + NeutralSelectionColor: {r: 0.66, g: 0.66, b: 0.66, a: 1} PlayerIndicator: {fileID: 1847976303} EnemyIndicator: {fileID: 1983076281} --- !u!1 &659889902 @@ -40340,7 +40415,8 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 197337107} m_Father: {fileID: 690503116} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -40452,7 +40528,7 @@ Camera: m_GameObject: {fileID: 663080992} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 1 + m_ClearFlags: 3 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 @@ -40474,7 +40550,7 @@ Camera: m_Depth: -1 m_CullingMask: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 823 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -40953,7 +41029,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -41335,7 +41411,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -42988,7 +43064,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -45123,7 +45199,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -45341,7 +45417,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -47175,7 +47251,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -48102,7 +48178,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -50823,7 +50899,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -52204,7 +52280,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -53358,7 +53434,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -54511,7 +54587,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -54998,7 +55074,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -55211,7 +55287,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -57424,7 +57500,7 @@ Transform: m_LocalScale: {x: 50, y: 50, z: 50} m_Children: [] m_Father: {fileID: 509110626} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &952141930 SphereCollider: @@ -58776,7 +58852,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -60338,7 +60414,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -60649,7 +60725,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -61882,7 +61958,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -62316,7 +62392,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -62798,7 +62874,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -64323,7 +64399,7 @@ Transform: m_LocalScale: {x: 50, y: 50, z: 50} m_Children: [] m_Father: {fileID: 1969868143} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &1059617906 SphereCollider: @@ -64755,7 +64831,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -64933,7 +65009,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -65833,7 +65909,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -67522,7 +67598,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -68141,7 +68217,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -68453,7 +68529,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -70091,7 +70167,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -71992,7 +72068,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -72942,7 +73018,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -75005,7 +75081,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4006107773484516, guid: 7311d170d172b8443ae175801f682aad, type: 3} propertyPath: m_RootOrder - value: 5 + value: 3 objectReference: {fileID: 0} - target: {fileID: 4006107773484516, guid: 7311d170d172b8443ae175801f682aad, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -75991,7 +76067,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -77109,7 +77185,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -79107,7 +79183,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -89809,7 +89885,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -91394,7 +91470,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -93879,7 +93955,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -94324,7 +94400,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -94759,7 +94835,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -98535,7 +98611,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -100219,7 +100295,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -102434,7 +102510,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -103314,7 +103390,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -105211,7 +105287,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -106612,7 +106688,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -106928,7 +107004,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -107614,7 +107690,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 8 + value: 5 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -113954,7 +114030,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -114162,7 +114238,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -114370,7 +114446,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -114801,7 +114877,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -115258,7 +115334,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -116443,7 +116519,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -118861,7 +118937,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -120955,7 +121031,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -122052,7 +122128,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -122430,7 +122506,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -122808,7 +122884,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -122838,7 +122914,7 @@ PrefabInstance: - target: {fileID: 7191419555384860655, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 7191419555384860655, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -124755,7 +124831,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1992706994} - - component: {fileID: 1992706995} - component: {fileID: 1992706993} m_Layer: 0 m_Name: Camera Rotator @@ -124777,6 +124852,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: cameraTransform: {fileID: 690503116} + mainCam: {fileID: 663080998} + additionalCameras: + - {fileID: 197337108} cameraTranslationSpeedMinZoom: 1000 cameraTranslationSpeedMaxZoom: 3500 scrollRegionSize: 10 @@ -124804,31 +124882,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 54.33, y: 0, z: 0} ---- !u!114 &1992706995 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1992706992} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 70d295fa3522a4f4a84d1c92a0a98a94, type: 3} - m_Name: - m_EditorClassIdentifier: - cameraTransform: {fileID: 690503116} - cameraTranslationSpeedMinZoom: 1000 - cameraTranslationSpeedMaxZoom: 3500 - scrollRegionSize: 10 - cameraRotationSpeed: 300 - cameraZoomSpeed: 300000 - cameraZoomTranslationSpeed: 1 - cameraZoomSmooth: 0.03 - cameraTranslationSmooth: 0.03 - minCameraAngle: 35 - maxCameraAngle: 90 - minCameraZoom: -5000 - maxCameraZoom: -300 --- !u!1001 &1993069155 PrefabInstance: m_ObjectHideFlags: 0 @@ -125854,7 +125907,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -127163,7 +127216,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -128979,7 +129032,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -129806,7 +129859,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -130605,7 +130658,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -131045,7 +131098,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -131679,7 +131732,7 @@ PrefabInstance: type: 3} propertyPath: textPrefab value: - objectReference: {fileID: 8467716388278459805, guid: db87c6b873833724cafe2f8940f45b52, + objectReference: {fileID: 7384831771431062761, guid: 0e3f0bd9d99f2c743ad9f5d63b3f5264, type: 3} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} diff --git a/Assets/GWConquest/Scripts/BattleLog.cs b/Assets/GWConquest/Scripts/BattleLog.cs new file mode 100644 index 0000000..94e0e0c --- /dev/null +++ b/Assets/GWConquest/Scripts/BattleLog.cs @@ -0,0 +1,92 @@ +using System.Collections.Generic; +using System.Linq; +using UnityEngine; +using Bolt; +using System; + +namespace GWConquest +{ + public class BattleLog + { + public static BattleLog Instance; + + public struct BattleLogUnitEntry + { + public NetworkId Id; + public string ClassName; + public int PlayerID; + + public UnitClass UnitClass { + get => UnitClass.FromName(ClassName); + } + + public Unit Unit { + get => BoltNetwork.FindEntity(Id)?.GetComponent(); + } + } + + public struct BattleLogBattleEntry + { + public NetworkId Id; + public string BattleName; + public string PlanetName; + + public Battle Battle { + get => BoltNetwork.FindEntity(Id)?.GetComponent(); + } + } + + public enum BattleLogAction { + Attacked, Killed + } + + public struct BattleLogEntry + { + public BattleLogUnitEntry Unit; + public BattleLogUnitEntry Target; + public BattleLogBattleEntry Battle; + public BattleLogAction Action; + public DateTime Timestamp; + + public BattleLogEntry(Unit unit, BattleLogAction action, Unit target = null, Battle battle = null) + { + Unit = new BattleLogUnitEntry() { + Id = unit.entity.NetworkId, + ClassName = unit.state.UnitClass, + PlayerID = unit.Player.PlayerId + }; + Action = action; + if(target != null) + { + Target = new BattleLogUnitEntry() { + Id = target.entity.NetworkId, + ClassName = target.state.UnitClass, + PlayerID = target.Player.PlayerId + }; + } + else { + Target = new BattleLogUnitEntry(); + } + if(battle != null) + { + Battle = new BattleLogBattleEntry() { + Id = battle.entity.NetworkId, + BattleName = battle.name, + PlanetName = battle.Zone.planet.name + }; + } + else { + Battle = new BattleLogBattleEntry(); + } + Timestamp = DateTime.Now; + } + } + + public List Entries = new List(); + + public void AddEntry(Unit unit, BattleLogAction action, Unit target = null, Battle battle = null) + { + Entries.Add(new BattleLogEntry(unit, action, target, battle)); + } + } +} diff --git a/Assets/GWConquest/Scripts/BattleLog.cs.meta b/Assets/GWConquest/Scripts/BattleLog.cs.meta new file mode 100644 index 0000000..da9a95d --- /dev/null +++ b/Assets/GWConquest/Scripts/BattleLog.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6b34d62073251b948972870c10e7f1ff +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Scripts/GWCamera.cs b/Assets/GWConquest/Scripts/GWCamera.cs index 55c5bc3..ceaade3 100644 --- a/Assets/GWConquest/Scripts/GWCamera.cs +++ b/Assets/GWConquest/Scripts/GWCamera.cs @@ -8,6 +8,9 @@ namespace GWConquest { public Transform cameraTransform; + public Camera mainCam; + public Camera[] additionalCameras; + public float cameraTranslationSpeedMinZoom = 1f; public float cameraTranslationSpeedMaxZoom = 1f; @@ -37,10 +40,9 @@ namespace GWConquest private void Start() { - Camera cam = cameraTransform.GetComponentInChildren(); - if(cam.orthographic) + if(mainCam.orthographic) { - cameraZoomTarget = cam.orthographicSize; + cameraZoomTarget = mainCam.orthographicSize; } else { @@ -133,10 +135,9 @@ namespace GWConquest float middle = Input.GetAxis("Mouse ScrollWheel"); - Camera cam = cameraTransform.GetComponentInChildren(); - if (cam != null) + if (mainCam != null) { - if (cam.orthographic) + if (mainCam.orthographic) { if (middle != 0) { @@ -145,8 +146,13 @@ namespace GWConquest } - cam.orthographicSize = Mathf.SmoothDamp(cam.orthographicSize, cameraZoomTarget, ref cameraZoomVelocity, cameraZoomSmooth); + var orthSize = Mathf.SmoothDamp(mainCam.orthographicSize, cameraZoomTarget, ref cameraZoomVelocity, cameraZoomSmooth); + mainCam.orthographicSize = orthSize; + foreach(Camera cam in additionalCameras) + { + cam.orthographicSize = orthSize; + } } else { @@ -190,7 +196,7 @@ namespace GWConquest public void ResetCameraTransform() { - Camera.main.transform.SetParent(cameraTransform, true); + mainCam.transform.SetParent(cameraTransform, true); } } } diff --git a/Assets/GWConquest/Scripts/GameManager.cs b/Assets/GWConquest/Scripts/GameManager.cs index 22292c7..d94ea0d 100644 --- a/Assets/GWConquest/Scripts/GameManager.cs +++ b/Assets/GWConquest/Scripts/GameManager.cs @@ -54,6 +54,8 @@ namespace GWConquest UnitClass.LoadClassMap(); PlanetRegistry.Load(); + + BattleLog.Instance = new BattleLog(); } public void OnSceneLoadLocalDone() diff --git a/Assets/GWConquest/Scripts/Planet.cs b/Assets/GWConquest/Scripts/Planet.cs index ca2d6d5..2e926bd 100644 --- a/Assets/GWConquest/Scripts/Planet.cs +++ b/Assets/GWConquest/Scripts/Planet.cs @@ -36,7 +36,7 @@ namespace GWConquest get => PlanetRegistry.GetPlanetData(gameObject.name); } - private PlanetIndicatorUI indicatorUI; + public PlanetIndicatorUI indicatorUI {get; private set;} public List InTransitFormations = new List(); @@ -116,10 +116,11 @@ namespace GWConquest if (showPlanetName) { - IngameUI ui = FindObjectOfType(); GameObject text = Instantiate(textPrefab); - text.transform.SetParent(ui.PlanetNames.transform, false); + text.transform.SetParent(transform); + text.transform.localPosition = Vector3.zero; text.transform.localRotation = Quaternion.identity; + text.transform.localScale = Vector3.one; indicatorUI = text.GetComponent(); indicatorUI.SetPlanet(this); } diff --git a/Assets/GWConquest/Scripts/TurnToCamera.cs b/Assets/GWConquest/Scripts/TurnToCamera.cs new file mode 100644 index 0000000..8239b42 --- /dev/null +++ b/Assets/GWConquest/Scripts/TurnToCamera.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace GWConquest +{ + public class TurnToCamera : MonoBehaviour + { + private Camera mainCam; + + private void Start() { + mainCam = Camera.main; + } + + private void Update() { + transform.rotation = mainCam.transform.rotation; + } + } +} diff --git a/Assets/GWConquest/Scripts/TurnToCamera.cs.meta b/Assets/GWConquest/Scripts/TurnToCamera.cs.meta new file mode 100644 index 0000000..b5aa02b --- /dev/null +++ b/Assets/GWConquest/Scripts/TurnToCamera.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e11e604ed3fa06f4bb0769de129bd71d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Scripts/UI/GalaxyMapUI.cs b/Assets/GWConquest/Scripts/UI/GalaxyMapUI.cs index 0e1a619..dea66a0 100644 --- a/Assets/GWConquest/Scripts/UI/GalaxyMapUI.cs +++ b/Assets/GWConquest/Scripts/UI/GalaxyMapUI.cs @@ -13,6 +13,7 @@ namespace GWConquest public GameObject EnemyFleetPanel; public GameObject PlanetSelection; + public Color NeutralSelectionColor; private Planet SelectedPlanet; @@ -37,10 +38,9 @@ namespace GWConquest PlanetSelection.SetActive(true); PlanetSelection.transform.SetParent(planet.transform, false); Renderer r = PlanetSelection.GetComponentInChildren(); - if(Player.CurrentPlayer != null) - { - r.material.color = r.material.color.UpdateColorRGB(Player.CurrentPlayer.Color); - } + var player = SelectedPlanet.ControllingPlayer; + var playerColor = player == null ? NeutralSelectionColor : player.Color; + r.material.color = r.material.color.UpdateColorRGB(playerColor); PlanetNameText.text = SelectedPlanet.planetName; UpdateIndicator(); diff --git a/Assets/GWConquest/Scripts/UI/IngameUI.cs b/Assets/GWConquest/Scripts/UI/IngameUI.cs index abd437c..84065aa 100644 --- a/Assets/GWConquest/Scripts/UI/IngameUI.cs +++ b/Assets/GWConquest/Scripts/UI/IngameUI.cs @@ -251,6 +251,8 @@ namespace GWConquest r.enabled = false; } } + + p.indicatorUI.gameObject.SetActive(false); } PlanetViewEnabled = true; @@ -269,6 +271,7 @@ namespace GWConquest { r.enabled = true; } + p.indicatorUI.gameObject.SetActive(true); } GWCamera camera = FindObjectOfType(); diff --git a/Assets/GWConquest/Scripts/UI/PlanetIndicatorUI.cs b/Assets/GWConquest/Scripts/UI/PlanetIndicatorUI.cs index 6bea240..0af864e 100644 --- a/Assets/GWConquest/Scripts/UI/PlanetIndicatorUI.cs +++ b/Assets/GWConquest/Scripts/UI/PlanetIndicatorUI.cs @@ -34,7 +34,6 @@ namespace GWConquest Planet = planet; PlanetNameText.text = planet.planetName.ToUpper(); PlanetNameText.gameObject.SetActive(planet.showPlanetName); - GetComponent().target = planet.transform; } public void UpdateIndicator() diff --git a/Assets/GWConquest/Scripts/Unit.cs b/Assets/GWConquest/Scripts/Unit.cs index 49d5402..7f7c468 100644 --- a/Assets/GWConquest/Scripts/Unit.cs +++ b/Assets/GWConquest/Scripts/Unit.cs @@ -174,8 +174,12 @@ namespace GWConquest if(Hitpoints <= 0) { + BattleLog.Instance.AddEntry(attacker, BattleLog.BattleLogAction.Killed, this, CurrentBattle); CurrentBattle.OnUnitDead(this); } + else { + BattleLog.Instance.AddEntry(attacker, BattleLog.BattleLogAction.Attacked, this, CurrentBattle); + } } public override void OnEvent(UnitDamageAnimEvent evnt) diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 4037b33..3dbd892 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -15,7 +15,7 @@ TagManager: - - PostProcessing - Illuminated - - + - Connections - - -