diff --git a/Assets/Prefabs/UI.prefab b/Assets/Prefabs/UI.prefab index 19ea813..7414100 100644 --- a/Assets/Prefabs/UI.prefab +++ b/Assets/Prefabs/UI.prefab @@ -30,16 +30,16 @@ RectTransform: m_GameObject: {fileID: 201270613} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.2984172, y: 1.2984172, z: 1.2984172} + m_LocalScale: {x: 1.298417, y: 1.298417, z: 1.298417} m_Children: - {fileID: 1503478382} - {fileID: 912928599} m_Father: {fileID: 8674794669486866727} - m_RootOrder: 11 + m_RootOrder: 12 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: -476, y: 271.39676} + m_AnchoredPosition: {x: 112.99994, y: 223} m_SizeDelta: {x: 77.190735, y: 54.38127} m_Pivot: {x: 0.5, y: 0.5} --- !u!82 &201270614 @@ -258,7 +258,7 @@ GameObject: - component: {fileID: 520874200} - component: {fileID: 520874199} m_Layer: 5 - m_Name: Image + m_Name: Return m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -273,14 +273,14 @@ RectTransform: m_GameObject: {fileID: 520874197} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.7395, y: 0.7395, z: 0.7395} + m_LocalScale: {x: 0.7394999, y: 0.7394999, z: 0.7394999} m_Children: [] m_Father: {fileID: 8674794669486866727} - m_RootOrder: 13 + m_RootOrder: 11 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: -750, y: 368.39673} + m_AnchoredPosition: {x: 216.00005, y: 232} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &520874201 @@ -413,7 +413,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 312, y: 826} + m_AnchoredPosition: {x: 312, y: 846} m_SizeDelta: {x: 1.559418, y: 0.12857056} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &736659287 @@ -747,7 +747,7 @@ GameObject: - component: {fileID: 1063152379} - component: {fileID: 1063152378} m_Layer: 5 - m_Name: Image (1) + m_Name: Close m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -762,14 +762,14 @@ RectTransform: m_GameObject: {fileID: 1063152376} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.60641545, y: 0.60641545, z: 0.60641545} + m_LocalScale: {x: 0.6064154, y: 0.6064154, z: 0.6064154} m_Children: [] m_Father: {fileID: 8674794669486866727} - m_RootOrder: 14 + m_RootOrder: 10 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: 761, y: 372.39673} + m_AnchoredPosition: {x: 319.00003, y: 236} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1063152380 @@ -1313,11 +1313,11 @@ RectTransform: - {fileID: 902179364} - {fileID: 2119158207} m_Father: {fileID: 8674794669486866727} - m_RootOrder: 12 + m_RootOrder: 9 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: 27, y: 270.39673} + m_AnchoredPosition: {x: 27, y: 297} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2119158206 @@ -1395,6 +1395,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &633077810876826599 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3484964253500845854} + - component: {fileID: 141227437946189753} + - component: {fileID: 2266404562451598558} + m_Layer: 5 + m_Name: Resource2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3484964253500845854 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 633077810876826599} + 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: 6926317023456770789} + m_RootOrder: 6 + 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: 22.999939, y: -42.999985} + m_SizeDelta: {x: 20, y: 65} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &141227437946189753 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 633077810876826599} + m_CullTransparentMesh: 0 +--- !u!114 &2266404562451598558 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 633077810876826599} + 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.5882353} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: f154a3d44b7ff7042b66517952a8b1b5, 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 &897281232947765899 GameObject: m_ObjectHideFlags: 0 @@ -1507,7 +1582,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -309, y: 826} + m_AnchoredPosition: {x: -309, y: 846} m_SizeDelta: {x: 1.559418, y: 0.12857056} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &897281233120809896 @@ -1712,7 +1787,7 @@ RectTransform: 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: -27, y: -65.00005} + m_AnchoredPosition: {x: 79.99994, y: -43.999985} m_SizeDelta: {x: 60, y: 65} m_Pivot: {x: 0.5, y: 0.4999992} --- !u!222 &2879525952551029661 @@ -1752,8 +1827,142 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 2516582400 + m_fontColor: {r: 0, g: 0, b: 0, a: 0.5882353} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1818189816083222450 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5226875170191934822} + - component: {fileID: 7635608521442103789} + - component: {fileID: 4086755649577615961} + m_Layer: 0 + m_Name: Resource1 Amount + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5226875170191934822 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1818189816083222450} + 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: 6926317023456770789} + m_RootOrder: 5 + 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: 79.99997, y: 45.00003} + m_SizeDelta: {x: 60, y: 65} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7635608521442103789 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1818189816083222450} + m_CullTransparentMesh: 0 +--- !u!114 &4086755649577615961 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1818189816083222450} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + 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: + m_Calls: [] + m_text: 100 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 2516582400 + m_fontColor: {r: 0, g: 0, b: 0, a: 0.5882353} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1842,11 +2051,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4663512140528063356} - m_RootOrder: 0 + 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: -210.00002, y: 0} + m_AnchoredPosition: {x: -89.00006, y: 45} m_SizeDelta: {x: 50, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3049577453076733092 @@ -1870,14 +2079,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.5882353} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 3233607880650682400, guid: f49bb474e34ba5c40a2c0d9ba13515f2, type: 3} + m_Sprite: {fileID: -3059454981854108379, guid: e16a3ae99fa021f49855e2fb535ab38a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2093,7 +2302,7 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!1 &2381224140599883572 +--- !u!1 &2483156752398083552 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2101,50 +2310,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4154567069437869496} - - component: {fileID: 2188882526831316512} - - component: {fileID: 2023035265302868253} + - component: {fileID: 8370210331460678101} + - component: {fileID: 8319245055030422823} + - component: {fileID: 6032452543586896410} m_Layer: 0 - m_Name: Ants Amount + m_Name: Resource2 Amount m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4154567069437869496 +--- !u!224 &8370210331460678101 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2381224140599883572} + m_GameObject: {fileID: 2483156752398083552} 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: 6487747203228416928} - m_RootOrder: 1 + m_Father: {fileID: 6926317023456770789} + m_RootOrder: 7 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: 211, y: -65} + m_AnchoredPosition: {x: 79.99994, y: -43.999985} m_SizeDelta: {x: 60, y: 65} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2188882526831316512 + m_Pivot: {x: 0.5, y: 0.4999992} +--- !u!222 &8319245055030422823 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2381224140599883572} + m_GameObject: {fileID: 2483156752398083552} m_CullTransparentMesh: 0 ---- !u!114 &2023035265302868253 +--- !u!114 &6032452543586896410 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2381224140599883572} + m_GameObject: {fileID: 2483156752398083552} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -2167,8 +2376,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 2516582400 + m_fontColor: {r: 0, g: 0, b: 0, a: 0.5882353} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2227,39 +2436,7 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &3241652078898949051 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2495248660206519639} - m_Layer: 0 - m_Name: UI - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2495248660206519639 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3241652078898949051} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -4.3282766, y: 56.87252, z: 316.81195} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 8674794669486866727} - - {fileID: 8674794667833382883} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3494033451245673109 +--- !u!1 &3027756822184676555 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2267,132 +2444,105 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8815207349762207987} - - component: {fileID: 8447956722324015073} - - component: {fileID: 7114833776361875859} - m_Layer: 0 - m_Name: Resource1 Amount + - component: {fileID: 7094508898516322001} + - component: {fileID: 3704012152835848926} + - component: {fileID: 6998597003782299486} + m_Layer: 5 + m_Name: Resource1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8815207349762207987 +--- !u!224 &7094508898516322001 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3494033451245673109} + m_GameObject: {fileID: 3027756822184676555} 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: 6487747203228416928} - m_RootOrder: 5 + m_Father: {fileID: 6926317023456770789} + 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: 87, y: -65} - m_SizeDelta: {x: 60, y: 65} + m_AnchoredPosition: {x: 25.999939, y: 41.000015} + m_SizeDelta: {x: 35, y: 65} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8447956722324015073 +--- !u!222 &3704012152835848926 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3494033451245673109} + m_GameObject: {fileID: 3027756822184676555} m_CullTransparentMesh: 0 ---- !u!114 &7114833776361875859 +--- !u!114 &6998597003782299486 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3494033451245673109} + m_GameObject: {fileID: 3027756822184676555} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + 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_Color: {r: 1, g: 1, b: 1, a: 0.5882353} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 100 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 4096 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 1 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} + m_Sprite: {fileID: 21300000, guid: 816584c73fb76d149a9a1cbcbbe6fa33, 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 &3241652078898949051 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2495248660206519639} + m_Layer: 0 + m_Name: UI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2495248660206519639 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3241652078898949051} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -4.3282766, y: 56.87252, z: 316.81195} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8674794669486866727} + - {fileID: 8674794667833382883} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3832251743038570999 GameObject: m_ObjectHideFlags: 0 @@ -2560,7 +2710,7 @@ RectTransform: 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: -27, y: 0} + m_AnchoredPosition: {x: 22.999939, y: -42.999985} m_SizeDelta: {x: 20, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2859897762659219327 @@ -2584,7 +2734,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.5882353} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -2635,7 +2785,7 @@ RectTransform: 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: -145, y: -65} + m_AnchoredPosition: {x: -30.00005, y: -44} m_SizeDelta: {x: 60, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6261802800072497428 @@ -2675,8 +2825,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 2516582400 + m_fontColor: {r: 0, g: 0, b: 0, a: 0.5882353} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2735,81 +2885,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &4070828352283452464 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8283427370528753202} - - component: {fileID: 2075632714473822073} - - component: {fileID: 3597602243861064951} - m_Layer: 5 - m_Name: Resource1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8283427370528753202 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4070828352283452464} - 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: 6487747203228416928} - 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: 89, y: -0.20004272} - m_SizeDelta: {x: 30, y: 65} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2075632714473822073 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4070828352283452464} - m_CullTransparentMesh: 0 ---- !u!114 &3597602243861064951 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4070828352283452464} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 816584c73fb76d149a9a1cbcbbe6fa33, 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 &4091033401310098083 GameObject: m_ObjectHideFlags: 0 @@ -2841,11 +2916,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8674794669486866727} - m_RootOrder: 10 + m_RootOrder: 8 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: 626, y: 411.39673} + m_AnchoredPosition: {x: 626, y: 431.39673} m_SizeDelta: {x: 84, y: 76.8} m_Pivot: {x: 0, y: 1} --- !u!222 &614399322712682228 @@ -2941,141 +3016,7 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!1 &4683017412969879756 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7068414675151296372} - - component: {fileID: 5082277098354610108} - - component: {fileID: 3121107394959241738} - m_Layer: 0 - m_Name: Resource2 Amount - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7068414675151296372 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4683017412969879756} - 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: 6487747203228416928} - m_RootOrder: 7 - 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: 24, y: -65} - m_SizeDelta: {x: 60, y: 65} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5082277098354610108 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4683017412969879756} - m_CullTransparentMesh: 0 ---- !u!114 &3121107394959241738 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4683017412969879756} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - 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: - m_Calls: [] - m_text: 100 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 4096 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 1 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &6277244916948197326 +--- !u!1 &6091547920659155532 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3083,65 +3024,73 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5377236700187431090} - - component: {fileID: 5078412794561474089} - - component: {fileID: 489737546050616799} + - component: {fileID: 6926317023456770789} + - component: {fileID: 2361274373937920566} + - component: {fileID: 5336346395388227571} m_Layer: 5 - m_Name: Resource2 + m_Name: GameDataLeft m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5377236700187431090 +--- !u!224 &6926317023456770789 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6277244916948197326} + m_GameObject: {fileID: 6091547920659155532} 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: 6487747203228416928} - m_RootOrder: 6 + m_LocalPosition: {x: 0, y: 0, z: -0.0000076293945} + m_LocalScale: {x: 1.1999999, y: 1.1999999, z: 1.1999999} + m_Children: + - {fileID: 9095104880420067120} + - {fileID: 86722496524096631} + - {fileID: 1845716979397314663} + - {fileID: 587646881998477150} + - {fileID: 7094508898516322001} + - {fileID: 5226875170191934822} + - {fileID: 3484964253500845854} + - {fileID: 8370210331460678101} + m_Father: {fileID: 8674794669486866727} + m_RootOrder: 14 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: 29, y: -0.20004272} - m_SizeDelta: {x: 20, y: 65} + m_AnchoredPosition: {x: -632, y: 118} + m_SizeDelta: {x: 282.60553, y: 163.43549} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5078412794561474089 +--- !u!222 &2361274373937920566 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6277244916948197326} + m_GameObject: {fileID: 6091547920659155532} m_CullTransparentMesh: 0 ---- !u!114 &489737546050616799 +--- !u!114 &5336346395388227571 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6277244916948197326} + m_GameObject: {fileID: 6091547920659155532} 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_Color: {r: 0.6981132, g: 0.5678519, b: 0.38527945, a: 0.5882353} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f154a3d44b7ff7042b66517952a8b1b5, type: 3} - m_Type: 0 + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3315,7 +3264,7 @@ RectTransform: 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: -69, y: 0} + m_AnchoredPosition: {x: 25.999939, y: 41.000015} m_SizeDelta: {x: 35, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4054041911861325653 @@ -3339,7 +3288,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.5882353} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -3356,81 +3305,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7378647613567488861 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5783296675299550144} - - component: {fileID: 1016609984028074049} - - component: {fileID: 3366316820720392741} - m_Layer: 5 - m_Name: Ants - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5783296675299550144 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7378647613567488861} - 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: 6487747203228416928} - 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: 212.00003, y: -0.20004272} - m_SizeDelta: {x: 50, y: 65} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1016609984028074049 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7378647613567488861} - m_CullTransparentMesh: 0 ---- !u!114 &3366316820720392741 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7378647613567488861} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: -2063937709773383588, guid: e16a3ae99fa021f49855e2fb535ab38a, 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 &7534914295498987268 GameObject: m_ObjectHideFlags: 0 @@ -3565,6 +3439,81 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8167440898046241852 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 86722496524096631} + - component: {fileID: 1879730546597790027} + - component: {fileID: 3328529740212703412} + m_Layer: 5 + m_Name: Ants + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &86722496524096631 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8167440898046241852} + 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: 6926317023456770789} + 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: -89.00006, y: 45} + m_SizeDelta: {x: 50, y: 65} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1879730546597790027 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8167440898046241852} + m_CullTransparentMesh: 0 +--- !u!114 &3328529740212703412 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8167440898046241852} + 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.5882353} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 3233607880650682400, guid: f49bb474e34ba5c40a2c0d9ba13515f2, 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 &8297236524644913119 GameObject: m_ObjectHideFlags: 0 @@ -3627,7 +3576,7 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!1 &8299979725890466759 +--- !u!1 &8402233282379174966 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3635,65 +3584,73 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8311580491381933849} - - component: {fileID: 2222664455604293276} - - component: {fileID: 7319384451191321860} + - component: {fileID: 4663512140528063356} + - component: {fileID: 6117394235859502419} + - component: {fileID: 6482944592060299298} m_Layer: 5 - m_Name: Scorpions + m_Name: GameDataRight m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8311580491381933849 +--- !u!224 &4663512140528063356 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8299979725890466759} + m_GameObject: {fileID: 8402233282379174966} 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: 6487747203228416928} - m_RootOrder: 2 + m_Children: + - {fileID: 77464171590917603} + - {fileID: 6192300162195527384} + - {fileID: 6836547525305916691} + - {fileID: 2106141621725493405} + - {fileID: 380209097684486977} + - {fileID: 7764877720003319099} + - {fileID: 5859889804592012603} + - {fileID: 232345013196691562} + m_Father: {fileID: 8674794669486866727} + m_RootOrder: 13 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: 152, y: -3.2000275} - m_SizeDelta: {x: 80.24327, y: 104.31625} + m_AnchoredPosition: {x: 658.99994, y: 134} + m_SizeDelta: {x: 282.60553, y: 163.43549} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2222664455604293276 +--- !u!222 &6117394235859502419 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8299979725890466759} + m_GameObject: {fileID: 8402233282379174966} m_CullTransparentMesh: 0 ---- !u!114 &7319384451191321860 +--- !u!114 &6482944592060299298 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8299979725890466759} + m_GameObject: {fileID: 8402233282379174966} 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.7843138, g: 0.43921572, b: 0.20784315, a: 1} + m_Color: {r: 0.6981132, g: 0.5678519, b: 0.38527945, a: 0.5882353} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d469dd94d5fcc1d4fa80b9a9052952f4, type: 3} - m_Type: 0 + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3702,7 +3659,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8402233282379174966 +--- !u!1 &8663287568577521631 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3710,41 +3667,73 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4663512140528063356} + - component: {fileID: 9095104880420067120} + - component: {fileID: 4701299589622884598} + - component: {fileID: 5350529613320527290} m_Layer: 5 - m_Name: GameDataLeft + m_Name: Scorpions m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4663512140528063356 +--- !u!224 &9095104880420067120 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8402233282379174966} + m_GameObject: {fileID: 8663287568577521631} 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: 6192300162195527384} - - {fileID: 6836547525305916691} - - {fileID: 77464171590917603} - - {fileID: 2106141621725493405} - - {fileID: 380209097684486977} - - {fileID: 7764877720003319099} - - {fileID: 5859889804592012603} - - {fileID: 232345013196691562} - m_Father: {fileID: 8674794669486866727} - m_RootOrder: 6 + m_Children: [] + m_Father: {fileID: 6926317023456770789} + 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: -547, y: 294.19678} - m_SizeDelta: {x: 480, y: 75} + m_AnchoredPosition: {x: -85.000046, y: -36} + m_SizeDelta: {x: 80.24327, y: 104.31625} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4701299589622884598 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8663287568577521631} + m_CullTransparentMesh: 0 +--- !u!114 &5350529613320527290 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8663287568577521631} + 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.5882353} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 9f0d160b5a59e0f4ebc5414ce714be9f, 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 &8674794667775569185 GameObject: m_ObjectHideFlags: 0 @@ -3782,7 +3771,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -948.49976, y: -142} + m_AnchoredPosition: {x: -952.49976, y: -154.00006} m_SizeDelta: {x: 86.79547, y: 52.08075} m_Pivot: {x: 1, y: 1} --- !u!222 &8674794667775569189 @@ -4158,11 +4147,11 @@ RectTransform: - {fileID: 8674794669081105412} - {fileID: 1203092130664108344} m_Father: {fileID: 8674794669486866727} - m_RootOrder: 8 + m_RootOrder: 6 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: 353, y: 333.3968} + m_AnchoredPosition: {x: 361, y: 341} m_SizeDelta: {x: 320, y: 100} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8674794667942260729 @@ -4809,11 +4798,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8674794669486866727} - m_RootOrder: 9 + m_RootOrder: 7 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: -689, y: 404.39673} + m_AnchoredPosition: {x: -689, y: 424.39673} m_SizeDelta: {x: 84, y: 76.8} m_Pivot: {x: 0, y: 1} --- !u!222 &8674794668642842211 @@ -5391,7 +5380,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -811, y: -141.99997} + m_AnchoredPosition: {x: -815, y: -154} m_SizeDelta: {x: 130.19318, y: 52.08075} m_Pivot: {x: 1, y: 1} --- !u!222 &8674794669103592193 @@ -5520,11 +5509,11 @@ RectTransform: - {fileID: 8674794667775569190} - {fileID: 8674794669103592194} m_Father: {fileID: 8674794669486866727} - m_RootOrder: 7 + m_RootOrder: 5 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: 800, y: 626.39685} + m_AnchoredPosition: {x: 800, y: 646.39685} m_SizeDelta: {x: 319.3797, y: 175} m_Pivot: {x: 1, y: 1} --- !u!1 &8674794669362352844 @@ -5851,16 +5840,16 @@ RectTransform: - {fileID: 1799773424849408643} - {fileID: 897281233120809902} - {fileID: 736659285} - - {fileID: 6487747203228416928} - - {fileID: 4663512140528063356} - {fileID: 8674794669239260972} - {fileID: 8674794667942260731} - {fileID: 8674794668642842268} - {fileID: 6497878173460714080} - - {fileID: 201270615} - {fileID: 1873759371} - - {fileID: 520874198} - {fileID: 1063152377} + - {fileID: 520874198} + - {fileID: 201270615} + - {fileID: 4663512140528063356} + - {fileID: 6926317023456770789} m_Father: {fileID: 2495248660206519639} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -14.502} @@ -5929,6 +5918,140 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &8805570389824526067 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 587646881998477150} + - component: {fileID: 2443945366445751900} + - component: {fileID: 903630050862069782} + m_Layer: 0 + m_Name: Scorpions Amount + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &587646881998477150 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8805570389824526067} + 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: 6926317023456770789} + 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: -30.00005, y: -44} + m_SizeDelta: {x: 60, y: 65} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2443945366445751900 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8805570389824526067} + m_CullTransparentMesh: 0 +--- !u!114 &903630050862069782 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8805570389824526067} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + 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: + m_Calls: [] + m_text: 100 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 2516582400 + m_fontColor: {r: 0, g: 0, b: 0, a: 0.5882353} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &8938332331218084662 GameObject: m_ObjectHideFlags: 0 @@ -5959,11 +6082,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4663512140528063356} - m_RootOrder: 1 + 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: -211, y: -65} + m_AnchoredPosition: {x: -30, y: 39} m_SizeDelta: {x: 60, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &715387855885254254 @@ -6003,8 +6126,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 2516582400 + m_fontColor: {r: 0, g: 0, b: 0, a: 0.5882353} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -6093,11 +6216,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4663512140528063356} - m_RootOrder: 2 + 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: -144, y: -2.9998245} + m_AnchoredPosition: {x: -85.000046, y: -36} m_SizeDelta: {x: 80.24327, y: 104.31625} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7440866534410683766 @@ -6121,14 +6244,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.7311321, b: 0.7311321, a: 0.5882353} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9f0d160b5a59e0f4ebc5414ce714be9f, type: 3} + m_Sprite: {fileID: 21300000, guid: 6a848196cadfec844aadda3dce193ed4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6138,50 +6261,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &9076022088515998459 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6487747203228416928} - m_Layer: 5 - m_Name: GameDataRight - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6487747203228416928 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9076022088515998459} - 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: 5783296675299550144} - - {fileID: 4154567069437869496} - - {fileID: 8311580491381933849} - - {fileID: 8356521331398952766} - - {fileID: 8283427370528753202} - - {fileID: 8815207349762207987} - - {fileID: 5377236700187431090} - - {fileID: 7068414675151296372} - m_Father: {fileID: 8674794669486866727} - m_RootOrder: 5 - 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: 560, y: 294.3968} - m_SizeDelta: {x: 480, y: 75} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &9096958742005419717 +--- !u!1 &9090893080143979072 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6189,50 +6269,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8356521331398952766} - - component: {fileID: 5020305917099533300} - - component: {fileID: 3878821761809243620} + - component: {fileID: 1845716979397314663} + - component: {fileID: 7225810660849797545} + - component: {fileID: 7291034715254765763} m_Layer: 0 - m_Name: Scorpions Amount + m_Name: Ants Amount m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8356521331398952766 +--- !u!224 &1845716979397314663 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9096958742005419717} + m_GameObject: {fileID: 9090893080143979072} 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: 6487747203228416928} - m_RootOrder: 3 + m_Father: {fileID: 6926317023456770789} + 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: 151, y: -65} + m_AnchoredPosition: {x: -30, y: 39} m_SizeDelta: {x: 60, y: 65} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5020305917099533300 +--- !u!222 &7225810660849797545 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9096958742005419717} + m_GameObject: {fileID: 9090893080143979072} m_CullTransparentMesh: 0 ---- !u!114 &3878821761809243620 +--- !u!114 &7291034715254765763 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9096958742005419717} + m_GameObject: {fileID: 9090893080143979072} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -6255,8 +6335,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 2516582400 + m_fontColor: {r: 0, g: 0, b: 0, a: 0.5882353} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -6349,7 +6429,7 @@ RectTransform: 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: -76, y: -65} + m_AnchoredPosition: {x: 79.99997, y: 45.00003} m_SizeDelta: {x: 60, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5469736989007494647 @@ -6389,8 +6469,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 2516582400 + m_fontColor: {r: 0, g: 0, b: 0, a: 0.5882353} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: diff --git a/Assets/Scenes/MapScene.unity b/Assets/Scenes/MapScene.unity index 9283a2f..e800c66 100644 --- a/Assets/Scenes/MapScene.unity +++ b/Assets/Scenes/MapScene.unity @@ -256,9 +256,9 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 73030630} m_CullTransparentMesh: 0 ---- !u!114 &80613773 stripped +--- !u!114 &116368892 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3878821761809243620, guid: c96875b7a845a7143be803fea0004d49, type: 3} + m_CorrespondingSourceObject: {fileID: 1623725677437971386, guid: c96875b7a845a7143be803fea0004d49, type: 3} m_PrefabInstance: {fileID: 397345935} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -267,20 +267,140 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &116462743 stripped +--- !u!1 &123243328 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 123243329} + - component: {fileID: 123243332} + - component: {fileID: 123243331} + - component: {fileID: 123243330} + m_Layer: 5 + m_Name: Close (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &123243329 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 123243328} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.6064154, y: 0.6064154, z: 0.6064154} + m_Children: [] + m_Father: {fileID: 1654332462} + m_RootOrder: 15 + 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: -724, y: 283} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &123243330 MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3121107394959241738, guid: c96875b7a845a7143be803fea0004d49, type: 3} - m_PrefabInstance: {fileID: 397345935} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 123243328} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &163998795 stripped + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 123243331} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1778195490} + m_TargetAssemblyTypeName: GameManager, Assembly-CSharp + m_MethodName: LeftStatsClicked + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &123243331 MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4253382106831416383, guid: c96875b7a845a7143be803fea0004d49, type: 3} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 123243328} + 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.31132078, g: 0.31132078, b: 0.31132078, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 10d78c024582d744ab51ef91e39909aa, 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!222 &123243332 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 123243328} + m_CullTransparentMesh: 0 +--- !u!114 &286255581 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6032452543586896410, guid: c96875b7a845a7143be803fea0004d49, type: 3} m_PrefabInstance: {fileID: 397345935} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -289,9 +409,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &175844971 stripped +--- !u!114 &310499132 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2023035265302868253, guid: c96875b7a845a7143be803fea0004d49, type: 3} + m_CorrespondingSourceObject: {fileID: 903630050862069782, guid: c96875b7a845a7143be803fea0004d49, type: 3} m_PrefabInstance: {fileID: 397345935} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -307,37 +427,77 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2069621863} m_Modifications: + - target: {fileID: 201270615, guid: c96875b7a845a7143be803fea0004d49, type: 3} + propertyPath: m_AnchoredPosition.x + value: 734 + objectReference: {fileID: 0} - target: {fileID: 201270615, guid: c96875b7a845a7143be803fea0004d49, type: 3} propertyPath: m_AnchoredPosition.y - value: 291.39676 + value: 291 objectReference: {fileID: 0} - - target: {fileID: 520874197, guid: c96875b7a845a7143be803fea0004d49, type: 3} - propertyPath: m_Name - value: Return + - target: {fileID: 520874198, guid: c96875b7a845a7143be803fea0004d49, type: 3} + propertyPath: m_AnchoredPosition.x + value: 695.77 objectReference: {fileID: 0} - target: {fileID: 520874198, guid: c96875b7a845a7143be803fea0004d49, type: 3} propertyPath: m_AnchoredPosition.y - value: 388.39673 + value: 397 + objectReference: {fileID: 0} + - target: {fileID: 520874198, guid: c96875b7a845a7143be803fea0004d49, type: 3} + propertyPath: m_LocalScale.x + value: 0.5193514 + objectReference: {fileID: 0} + - target: {fileID: 520874198, guid: c96875b7a845a7143be803fea0004d49, type: 3} + propertyPath: m_LocalScale.y + value: 0.5193514 + objectReference: {fileID: 0} + - target: {fileID: 520874198, guid: c96875b7a845a7143be803fea0004d49, type: 3} + propertyPath: m_LocalScale.z + value: 0.5193514 + objectReference: {fileID: 0} + - target: {fileID: 520874198, guid: c96875b7a845a7143be803fea0004d49, type: 3} + propertyPath: m_SizeDelta.x + value: 115.06003 + objectReference: {fileID: 0} + - target: {fileID: 520874198, guid: c96875b7a845a7143be803fea0004d49, type: 3} + propertyPath: m_SizeDelta.y + value: 102.73825 objectReference: {fileID: 0} - target: {fileID: 520874199, guid: c96875b7a845a7143be803fea0004d49, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 1778195490} + - target: {fileID: 520874200, guid: c96875b7a845a7143be803fea0004d49, type: 3} + propertyPath: m_Maskable + value: 0 + objectReference: {fileID: 0} - target: {fileID: 736659285, guid: c96875b7a845a7143be803fea0004d49, type: 3} - propertyPath: m_AnchoredPosition.y - value: 846 + propertyPath: m_AnchoredPosition.x + value: 235 objectReference: {fileID: 0} - target: {fileID: 798870761, guid: c96875b7a845a7143be803fea0004d49, type: 3} propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 1509055359} - - target: {fileID: 1063152376, guid: c96875b7a845a7143be803fea0004d49, type: 3} - propertyPath: m_Name - value: Close + - target: {fileID: 1063152377, guid: c96875b7a845a7143be803fea0004d49, type: 3} + propertyPath: m_AnchoredPosition.x + value: 762.2 objectReference: {fileID: 0} - target: {fileID: 1063152377, guid: c96875b7a845a7143be803fea0004d49, type: 3} propertyPath: m_AnchoredPosition.y - value: 392.39673 + value: 398.7 + objectReference: {fileID: 0} + - target: {fileID: 1063152377, guid: c96875b7a845a7143be803fea0004d49, type: 3} + propertyPath: m_LocalScale.x + value: 0.4608757 + objectReference: {fileID: 0} + - target: {fileID: 1063152377, guid: c96875b7a845a7143be803fea0004d49, type: 3} + propertyPath: m_LocalScale.y + value: 0.4608757 + objectReference: {fileID: 0} + - target: {fileID: 1063152377, guid: c96875b7a845a7143be803fea0004d49, type: 3} + propertyPath: m_LocalScale.z + value: 0.4608757 objectReference: {fileID: 0} - target: {fileID: 1063152378, guid: c96875b7a845a7143be803fea0004d49, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -356,12 +516,12 @@ PrefabInstance: value: objectReference: {fileID: 1509055359} - target: {fileID: 1873759371, guid: c96875b7a845a7143be803fea0004d49, type: 3} - propertyPath: m_AnchoredPosition.y - value: 297 + propertyPath: m_AnchoredPosition.x + value: -40 objectReference: {fileID: 0} - target: {fileID: 897281233120809902, guid: c96875b7a845a7143be803fea0004d49, type: 3} - propertyPath: m_AnchoredPosition.y - value: 846 + propertyPath: m_AnchoredPosition.x + value: -386 objectReference: {fileID: 0} - target: {fileID: 897281234955408375, guid: c96875b7a845a7143be803fea0004d49, type: 3} propertyPath: m_AnchorMax.x @@ -420,48 +580,56 @@ PrefabInstance: value: UI objectReference: {fileID: 0} - target: {fileID: 4663512140528063356, guid: c96875b7a845a7143be803fea0004d49, type: 3} - propertyPath: m_AnchoredPosition.y - value: 314.19678 + propertyPath: m_LocalScale.x + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 4663512140528063356, guid: c96875b7a845a7143be803fea0004d49, type: 3} + propertyPath: m_LocalScale.y + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 4663512140528063356, guid: c96875b7a845a7143be803fea0004d49, type: 3} + propertyPath: m_AnchoredPosition.x + value: 631 objectReference: {fileID: 0} - - target: {fileID: 6487747203228416928, guid: c96875b7a845a7143be803fea0004d49, type: 3} + - target: {fileID: 4663512140528063356, guid: c96875b7a845a7143be803fea0004d49, type: 3} propertyPath: m_AnchoredPosition.y - value: 314.3968 + value: 119 + objectReference: {fileID: 0} + - target: {fileID: 6091547920659155532, guid: c96875b7a845a7143be803fea0004d49, type: 3} + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - target: {fileID: 6497878173460714080, guid: c96875b7a845a7143be803fea0004d49, type: 3} - propertyPath: m_AnchoredPosition.y - value: 431.39673 + propertyPath: m_AnchoredPosition.x + value: 548.99994 objectReference: {fileID: 0} - - target: {fileID: 8674794667775569190, guid: c96875b7a845a7143be803fea0004d49, type: 3} - propertyPath: m_AnchoredPosition.y - value: -154.00006 + - target: {fileID: 7306596528923647282, guid: c96875b7a845a7143be803fea0004d49, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8402233282379174966, guid: c96875b7a845a7143be803fea0004d49, type: 3} + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - target: {fileID: 8674794667775569190, guid: c96875b7a845a7143be803fea0004d49, type: 3} propertyPath: m_AnchoredPosition.x - value: -952.49976 - objectReference: {fileID: 0} - - target: {fileID: 8674794667942260731, guid: c96875b7a845a7143be803fea0004d49, type: 3} - propertyPath: m_AnchoredPosition.y - value: 341 + value: -1035.4999 objectReference: {fileID: 0} - target: {fileID: 8674794667942260731, guid: c96875b7a845a7143be803fea0004d49, type: 3} propertyPath: m_AnchoredPosition.x - value: 361 + value: 316 objectReference: {fileID: 0} - target: {fileID: 8674794668642842268, guid: c96875b7a845a7143be803fea0004d49, type: 3} - propertyPath: m_AnchoredPosition.y - value: 424.39673 - objectReference: {fileID: 0} - - target: {fileID: 8674794669103592194, guid: c96875b7a845a7143be803fea0004d49, type: 3} - propertyPath: m_AnchoredPosition.y - value: -154 + propertyPath: m_AnchoredPosition.x + value: -766.00006 objectReference: {fileID: 0} - target: {fileID: 8674794669103592194, guid: c96875b7a845a7143be803fea0004d49, type: 3} propertyPath: m_AnchoredPosition.x - value: -815 + value: -898 objectReference: {fileID: 0} - target: {fileID: 8674794669239260972, guid: c96875b7a845a7143be803fea0004d49, type: 3} - propertyPath: m_AnchoredPosition.y - value: 646.39685 + propertyPath: m_AnchoredPosition.x + value: 722.99994 objectReference: {fileID: 0} - target: {fileID: 8674794669486866726, guid: c96875b7a845a7143be803fea0004d49, type: 3} propertyPath: m_Camera @@ -469,14 +637,9 @@ PrefabInstance: objectReference: {fileID: 1509055357} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c96875b7a845a7143be803fea0004d49, type: 3} ---- !u!4 &689220944 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2495248660206519639, guid: c96875b7a845a7143be803fea0004d49, type: 3} - m_PrefabInstance: {fileID: 397345935} - m_PrefabAsset: {fileID: 0} ---- !u!114 &722147019 stripped +--- !u!114 &464039737 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1623725677437971386, guid: c96875b7a845a7143be803fea0004d49, type: 3} + m_CorrespondingSourceObject: {fileID: 4375446094312665835, guid: c96875b7a845a7143be803fea0004d49, type: 3} m_PrefabInstance: {fileID: 397345935} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -485,6 +648,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &689220944 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2495248660206519639, guid: c96875b7a845a7143be803fea0004d49, type: 3} + m_PrefabInstance: {fileID: 397345935} + m_PrefabAsset: {fileID: 0} --- !u!1 &1003224825 GameObject: m_ObjectHideFlags: 0 @@ -606,6 +774,17 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &1222337744 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4086755649577615961, guid: c96875b7a845a7143be803fea0004d49, type: 3} + m_PrefabInstance: {fileID: 397345935} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &1246264933 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1294904146, guid: c96875b7a845a7143be803fea0004d49, type: 3} @@ -617,6 +796,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1276014728 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4253382106831416383, guid: c96875b7a845a7143be803fea0004d49, type: 3} + m_PrefabInstance: {fileID: 397345935} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1294973057 GameObject: m_ObjectHideFlags: 0 @@ -660,9 +850,14 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1380460256 stripped +--- !u!1 &1307909027 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6091547920659155532, guid: c96875b7a845a7143be803fea0004d49, type: 3} + m_PrefabInstance: {fileID: 397345935} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1322188073 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1620972576, guid: c96875b7a845a7143be803fea0004d49, type: 3} + m_CorrespondingSourceObject: {fileID: 3371460752167342783, guid: c96875b7a845a7143be803fea0004d49, type: 3} m_PrefabInstance: {fileID: 397345935} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -671,9 +866,140 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1489656326 stripped +--- !u!1 &1331234042 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1331234043} + - component: {fileID: 1331234046} + - component: {fileID: 1331234045} + - component: {fileID: 1331234044} + m_Layer: 5 + m_Name: Close (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1331234043 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1331234042} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.6064154, y: 0.6064154, z: 0.6064154} + m_Children: [] + m_Father: {fileID: 1654332462} + m_RootOrder: 16 + 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: 595, y: 283} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1331234044 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1331234042} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1331234045} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1778195490} + m_TargetAssemblyTypeName: GameManager, Assembly-CSharp + m_MethodName: RightStatsClicked + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1331234045 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1331234042} + 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.6320754, g: 0.25740176, b: 0.19975968, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 10d78c024582d744ab51ef91e39909aa, 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!222 &1331234046 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1331234042} + m_CullTransparentMesh: 0 +--- !u!114 &1380460256 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7114833776361875859, guid: c96875b7a845a7143be803fea0004d49, type: 3} + m_CorrespondingSourceObject: {fileID: 1620972576, guid: c96875b7a845a7143be803fea0004d49, type: 3} m_PrefabInstance: {fileID: 397345935} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -781,6 +1107,11 @@ MonoBehaviour: dragSpeed: 0.5 zoomSpeed: 1 myCamera: {fileID: 1509055357} +--- !u!1 &1539077790 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8402233282379174966, guid: c96875b7a845a7143be803fea0004d49, type: 3} + m_PrefabInstance: {fileID: 397345935} + m_PrefabAsset: {fileID: 0} --- !u!1 &1565897579 GameObject: m_ObjectHideFlags: 0 @@ -1027,6 +1358,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1646094282} m_CullTransparentMesh: 0 +--- !u!224 &1654332462 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8674794669486866727, guid: c96875b7a845a7143be803fea0004d49, type: 3} + m_PrefabInstance: {fileID: 397345935} + m_PrefabAsset: {fileID: 0} --- !u!1 &1778195489 GameObject: m_ObjectHideFlags: 0 @@ -1069,16 +1405,18 @@ MonoBehaviour: y0: 0 width: 2 haight: 2 - team0_alive_workers: {fileID: 175844971} - team0_alive_soldiers: {fileID: 80613773} - team0_total_resource0: {fileID: 1489656326} - team0_total_resource1: {fileID: 116462743} - team1_alive_workers: {fileID: 2115155545} - team1_alive_soldiers: {fileID: 722147019} - team1_total_resource0: {fileID: 1798243733} - team1_total_resource1: {fileID: 163998795} + team0_alive_workers: {fileID: 1322188073} + team0_alive_soldiers: {fileID: 116368892} + team0_total_resource0: {fileID: 464039737} + team0_total_resource1: {fileID: 1276014728} + team1_alive_workers: {fileID: 2140981958} + team1_alive_soldiers: {fileID: 310499132} + team1_total_resource0: {fileID: 1222337744} + team1_total_resource1: {fileID: 286255581} team0_name: {fileID: 1380460256} team1_name: {fileID: 1246264933} + RightStats: {fileID: 1539077790} + LeftStats: {fileID: 1307909027} --- !u!4 &1778195491 Transform: m_ObjectHideFlags: 0 @@ -1093,17 +1431,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1798243733 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4375446094312665835, guid: c96875b7a845a7143be803fea0004d49, type: 3} - m_PrefabInstance: {fileID: 397345935} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1950106924 GameObject: m_ObjectHideFlags: 0 @@ -1269,9 +1596,9 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2115155545 stripped +--- !u!114 &2140981958 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3371460752167342783, guid: c96875b7a845a7143be803fea0004d49, type: 3} + m_CorrespondingSourceObject: {fileID: 7291034715254765763, guid: c96875b7a845a7143be803fea0004d49, type: 3} m_PrefabInstance: {fileID: 397345935} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} diff --git a/Assets/Scripts/Map/GameManager.cs b/Assets/Scripts/Map/GameManager.cs index afae1e3..59bbf42 100644 --- a/Assets/Scripts/Map/GameManager.cs +++ b/Assets/Scripts/Map/GameManager.cs @@ -11,13 +11,13 @@ public class GameManager : MonoBehaviour public GameObject InGame; public GameObject GameLogBrowser; - public GameObject antPrefab; - public GameObject cell_empty; - public GameObject cell_wall; - public GameObject base1; - public GameObject base2; - public GameObject rec1; - public GameObject rec2; + [SerializeField] private GameObject antPrefab; + [SerializeField] private GameObject cell_empty; + [SerializeField] private GameObject cell_wall; + [SerializeField] private GameObject base1; + [SerializeField] private GameObject base2; + [SerializeField] private GameObject rec1; + [SerializeField] private GameObject rec2; private GameLog gameLog; private int currTurn; public int x0; @@ -36,6 +36,8 @@ public class GameManager : MonoBehaviour [SerializeField] private TextMeshProUGUI team1_total_resource1; [SerializeField] private TextMeshProUGUI team0_name; [SerializeField] private TextMeshProUGUI team1_name; + [SerializeField] private GameObject RightStats; + [SerializeField] private GameObject LeftStats; public int MaxTurns { get; private set; } private float baseTime; [HideInInspector] private bool playAnime; @@ -306,4 +308,14 @@ public void Return() { SceneManager.LoadScene(0); } + + public void RightStatsClicked() + { + RightStats.SetActive(!RightStats.activeSelf); + } + public void LeftStatsClicked() + { + LeftStats.SetActive(!LeftStats.activeSelf); + } + } \ No newline at end of file