From 7cdf72cf24c9dbe95c11be23d7c579919fa463e9 Mon Sep 17 00:00:00 2001
From: BOT Alex <44818698+MagicBOTAlex@users.noreply.github.com>
Date: Sun, 21 Apr 2024 01:43:22 +0200
Subject: [PATCH] Better ui and placement soon done
---
Assets/Animations/UI/cocksex.controller | 97 +-
Assets/Scenes/TowerPlacement.unity | 996 +++++++++---------
Assets/Scripts/Manager/GameManager.cs | 25 +-
Assets/Scripts/Manager/MoneyManager.cs | 9 +-
.../PlacementSystem/PlacementManager.cs | 37 +-
Assets/Scripts/UI/UIManager.cs | 97 +-
6 files changed, 616 insertions(+), 645 deletions(-)
diff --git a/Assets/Animations/UI/cocksex.controller b/Assets/Animations/UI/cocksex.controller
index 6cec86d..cb762d2 100644
--- a/Assets/Animations/UI/cocksex.controller
+++ b/Assets/Animations/UI/cocksex.controller
@@ -8,8 +8,8 @@ AnimatorStateTransition:
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- - m_ConditionMode: 1
- m_ConditionEvent: Close
+ - m_ConditionMode: 2
+ m_ConditionEvent: IsOpen
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 2682460963827588746}
@@ -25,58 +25,6 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
---- !u!1101 &-7641027645006483654
-AnimatorStateTransition:
- m_ObjectHideFlags: 1
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name:
- m_Conditions:
- - m_ConditionMode: 1
- m_ConditionEvent: Open
- m_EventTreshold: 0
- m_DstStateMachine: {fileID: 0}
- m_DstState: {fileID: -2280432560819215181}
- m_Solo: 0
- m_Mute: 0
- m_IsExit: 0
- serializedVersion: 3
- m_TransitionDuration: 0
- m_TransitionOffset: 0
- m_ExitTime: 0
- m_HasExitTime: 0
- m_HasFixedDuration: 0
- m_InterruptionSource: 0
- m_OrderedInterruption: 1
- m_CanTransitionToSelf: 1
---- !u!1102 &-2280432560819215181
-AnimatorState:
- serializedVersion: 6
- m_ObjectHideFlags: 1
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: FullOut
- m_Speed: 1
- m_CycleOffset: 0
- m_Transitions:
- - {fileID: 8958318208459601179}
- m_StateMachineBehaviours: []
- m_Position: {x: 50, y: 50, z: 0}
- m_IKOnFeet: 0
- m_WriteDefaultValues: 1
- m_Mirror: 0
- m_SpeedParameterActive: 0
- m_MirrorParameterActive: 0
- m_CycleOffsetParameterActive: 0
- m_TimeParameterActive: 0
- m_Motion: {fileID: 7400000, guid: a9f8f24edd1852c4e829d921b091c37d, type: 2}
- m_Tag:
- m_SpeedParameter:
- m_MirrorParameter:
- m_CycleOffsetParameter:
- m_TimeParameter:
--- !u!1102 &-2135777584370832094
AnimatorState:
serializedVersion: 6
@@ -88,7 +36,6 @@ AnimatorState:
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- - {fileID: -7641027645006483654}
- {fileID: -8896916857368744256}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
@@ -120,9 +67,6 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: -2135777584370832094}
m_Position: {x: 240, y: 30, z: 0}
- - serializedVersion: 1
- m_State: {fileID: -2280432560819215181}
- m_Position: {x: 490, y: 30, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@@ -142,14 +86,8 @@ AnimatorController:
m_Name: cocksex
serializedVersion: 5
m_AnimatorParameters:
- - m_Name: Open
- m_Type: 9
- m_DefaultFloat: 0
- m_DefaultInt: 0
- m_DefaultBool: 0
- m_Controller: {fileID: 9100000}
- - m_Name: Close
- m_Type: 9
+ - m_Name: IsOpen
+ m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
@@ -203,7 +141,7 @@ AnimatorStateTransition:
m_Name:
m_Conditions:
- m_ConditionMode: 1
- m_ConditionEvent: Open
+ m_ConditionEvent: IsOpen
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -2135777584370832094}
@@ -219,28 +157,3 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
---- !u!1101 &8958318208459601179
-AnimatorStateTransition:
- m_ObjectHideFlags: 1
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name:
- m_Conditions:
- - m_ConditionMode: 1
- m_ConditionEvent: Close
- m_EventTreshold: 0
- m_DstStateMachine: {fileID: 0}
- m_DstState: {fileID: 2682460963827588746}
- m_Solo: 0
- m_Mute: 0
- m_IsExit: 0
- serializedVersion: 3
- m_TransitionDuration: 0.2
- m_TransitionOffset: 0
- m_ExitTime: 0
- m_HasExitTime: 0
- m_HasFixedDuration: 1
- m_InterruptionSource: 0
- m_OrderedInterruption: 1
- m_CanTransitionToSelf: 1
diff --git a/Assets/Scenes/TowerPlacement.unity b/Assets/Scenes/TowerPlacement.unity
index d43b1ba..af367b9 100644
--- a/Assets/Scenes/TowerPlacement.unity
+++ b/Assets/Scenes/TowerPlacement.unity
@@ -170,8 +170,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
RebuildGrid: 0
- DebugTowerPrefab: {fileID: 8488737342646939416, guid: 9415cb10a1bd579269301ca4f61a1554,
- type: 3}
SilhouetteMaterial: {fileID: 2100000, guid: 0610eb89b05f0b546929db3664a351d8, type: 2}
--- !u!1 &60408394
GameObject:
@@ -290,6 +288,92 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 60408394}
m_CullTransparentMesh: 1
+--- !u!1 &217430505
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 217430506}
+ - component: {fileID: 217430508}
+ - component: {fileID: 217430507}
+ - component: {fileID: 217430509}
+ m_Layer: 5
+ m_Name: OpenTrigger
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &217430506
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 217430505}
+ 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_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1361712799}
+ 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: 887.0786, y: 467.78867}
+ m_SizeDelta: {x: 145.8427, y: 145.8427}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &217430507
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 217430505}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Delegates: []
+--- !u!222 &217430508
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 217430505}
+ m_CullTransparentMesh: 1
+--- !u!114 &217430509
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 217430505}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 0}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Texture: {fileID: 0}
+ m_UVRect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 1
+ height: 1
--- !u!1 &248072532
GameObject:
m_ObjectHideFlags: 0
@@ -434,6 +518,47 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 260681845}
m_CullTransparentMesh: 1
+--- !u!21 &261155270
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: UI/RoundedCorners/IndependentRoundedCorners
+ m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
+ m_ValidKeywords: []
+ m_InvalidKeywords: []
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_LockedProperties:
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _ColorMask: 15
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilOp: 0
+ - _StencilReadMask: 255
+ - _StencilWriteMask: 255
+ - _UseUIAlphaClip: 0
+ m_Colors:
+ - _halfSize: {r: 35.4485, g: 38.0555, b: 0, a: 0}
+ - _r: {r: 40, g: 0, b: 0, a: 40}
+ - _rect2props: {r: 20.000002, g: -0.0000038146973, b: 37.833046, a: 37.833046}
+ m_BuildTextureStacks: []
--- !u!4 &268589088 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2739991145043243501, guid: 0c13e24f92c86f84a85c76e0bca22830,
@@ -687,47 +812,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: -2.008855}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!21 &381726217
-Material:
- serializedVersion: 8
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: UI/RoundedCorners/IndependentRoundedCorners
- m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
- m_Parent: {fileID: 0}
- m_ModifiedSerializedProperties: 0
- m_ValidKeywords: []
- m_InvalidKeywords: []
- m_LightmapFlags: 4
- m_EnableInstancingVariants: 0
- m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
- stringTagMap: {}
- disabledShaderPasses: []
- m_LockedProperties:
- m_SavedProperties:
- serializedVersion: 3
- m_TexEnvs:
- - _MainTex:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- m_Ints: []
- m_Floats:
- - _ColorMask: 15
- - _Stencil: 0
- - _StencilComp: 8
- - _StencilOp: 0
- - _StencilReadMask: 255
- - _StencilWriteMask: 255
- - _UseUIAlphaClip: 0
- m_Colors:
- - _halfSize: {r: 97.8265, g: 37.763, b: 0, a: 0}
- - _r: {r: 30.96, g: 0, b: 0, a: 0}
- - _rect2props: {r: 7.7400208, g: -7.7400017, b: 84.93025, a: 95.87626}
- m_BuildTextureStacks: []
--- !u!1 &426438110
GameObject:
m_ObjectHideFlags: 0
@@ -801,108 +885,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 426438110}
m_CullTransparentMesh: 1
---- !u!1 &455871645
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 455871648}
- - component: {fileID: 455871647}
- - component: {fileID: 455871646}
- m_Layer: 5
- m_Name: CloseUITrigger
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!114 &455871646
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 455871645}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: ff219968359ff3a4490aea564d194887, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- anim: {fileID: 1325887244}
- animationCall: Close
- activateGo: {fileID: 0}
- deactivateSelf: 1
- affectedObj: {fileID: 1458184090}
- count: 0
- maxCount: 2
- currentCount: 0
---- !u!61 &455871647
-BoxCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 455871645}
- m_Enabled: 1
- m_Density: 1
- m_Material: {fileID: 0}
- m_IncludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ExcludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_LayerOverridePriority: 0
- m_ForceSendLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_ForceReceiveLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_ContactCaptureLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_CallbackLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_IsTrigger: 1
- m_UsedByEffector: 0
- m_UsedByComposite: 0
- m_Offset: {x: 0, y: 0}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0, y: 0}
- oldSize: {x: 0, y: 0}
- newSize: {x: 0, y: 0}
- adaptiveTilingThreshold: 0
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- serializedVersion: 2
- m_Size: {x: 500, y: 1100}
- m_EdgeRadius: 0
---- !u!224 &455871648
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 455871645}
- 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_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 1361712799}
- 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: -28, y: 0}
- m_SizeDelta: {x: 100, y: 100}
- m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &510617948
GameObject:
m_ObjectHideFlags: 0
@@ -1158,7 +1140,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 542957379}
m_CullTransparentMesh: 1
---- !u!21 &553111349
+--- !u!21 &654460998
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
@@ -1195,9 +1177,9 @@ Material:
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- - _halfSize: {r: 36.5705, g: 37.7215, b: 0, a: 0}
- - _r: {r: 40, g: 0, b: 0, a: 40}
- - _rect2props: {r: 20, g: -0.0000076293945, b: 38.390244, a: 38.390244}
+ - _halfSize: {r: 97.85, g: 477.754, b: 0, a: 0}
+ - _r: {r: 0, g: 0, b: 0, a: 40}
+ - _rect2props: {r: 10, g: 9.999939, b: 407.01352, a: 392.87137}
m_BuildTextureStacks: []
--- !u!1 &665775405
GameObject:
@@ -1316,6 +1298,47 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 665775405}
m_CullTransparentMesh: 1
+--- !u!21 &687683564
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: UI/RoundedCorners/IndependentRoundedCorners
+ m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
+ m_ValidKeywords: []
+ m_InvalidKeywords: []
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_LockedProperties:
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _ColorMask: 15
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilOp: 0
+ - _StencilReadMask: 255
+ - _StencilWriteMask: 255
+ - _UseUIAlphaClip: 0
+ m_Colors:
+ - _halfSize: {r: 360, g: 550, b: 0, a: 0}
+ - _r: {r: 0, g: 59.4, b: 59.4, a: 59.4}
+ - _rect2props: {r: -14.850006, g: 14.849915, b: 622.4661, a: 601.4651}
+ m_BuildTextureStacks: []
--- !u!1001 &698712475
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1516,7 +1539,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Material: {fileID: 925777692}
+ m_Material: {fileID: 1008385119}
m_Color: {r: 0.9811321, g: 0.8669752, b: 0.8669752, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -1539,47 +1562,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 698871428}
m_CullTransparentMesh: 1
---- !u!21 &728463258
-Material:
- serializedVersion: 8
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: UI/RoundedCorners/IndependentRoundedCorners
- m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
- m_Parent: {fileID: 0}
- m_ModifiedSerializedProperties: 0
- m_ValidKeywords: []
- m_InvalidKeywords: []
- m_LightmapFlags: 4
- m_EnableInstancingVariants: 0
- m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
- stringTagMap: {}
- disabledShaderPasses: []
- m_LockedProperties:
- m_SavedProperties:
- serializedVersion: 3
- m_TexEnvs:
- - _MainTex:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- m_Ints: []
- m_Floats:
- - _ColorMask: 15
- - _Stencil: 0
- - _StencilComp: 8
- - _StencilOp: 0
- - _StencilReadMask: 255
- - _StencilWriteMask: 255
- - _UseUIAlphaClip: 0
- m_Colors:
- - _halfSize: {r: 5, g: 13.05, b: 0, a: 0}
- - _r: {r: 0, g: 0, b: 5, a: 5}
- - _rect2props: {r: 0.00000047683716, g: 2.4999986, b: 10.995511, a: 10.995511}
- m_BuildTextureStacks: []
--- !u!1 &747314135
GameObject:
m_ObjectHideFlags: 0
@@ -1850,47 +1832,6 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 808311836}
m_PrefabAsset: {fileID: 0}
---- !u!21 &925777692
-Material:
- serializedVersion: 8
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: UI/RoundedCorners/IndependentRoundedCorners
- m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
- m_Parent: {fileID: 0}
- m_ModifiedSerializedProperties: 0
- m_ValidKeywords: []
- m_InvalidKeywords: []
- m_LightmapFlags: 4
- m_EnableInstancingVariants: 0
- m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
- stringTagMap: {}
- disabledShaderPasses: []
- m_LockedProperties:
- m_SavedProperties:
- serializedVersion: 3
- m_TexEnvs:
- - _MainTex:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- m_Ints: []
- m_Floats:
- - _ColorMask: 15
- - _Stencil: 0
- - _StencilComp: 8
- - _StencilOp: 0
- - _StencilReadMask: 255
- - _StencilWriteMask: 255
- - _UseUIAlphaClip: 0
- m_Colors:
- - _halfSize: {r: 5, g: 13.05, b: 0, a: 0}
- - _r: {r: 5, g: 5, b: 0, a: 0}
- - _rect2props: {r: 0, g: -2.500002, b: 10.995511, a: 10.995511}
- m_BuildTextureStacks: []
--- !u!1 &926053097
GameObject:
m_ObjectHideFlags: 0
@@ -2227,7 +2168,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Material: {fileID: 553111349}
+ m_Material: {fileID: 1318321551}
m_Color: {r: 0.76862746, g: 0.34901962, b: 0.24313726, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -2250,74 +2191,47 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 954712142}
m_CullTransparentMesh: 1
---- !u!1 &1012036658
-GameObject:
+--- !u!21 &1008385119
+Material:
+ serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1012036659}
- - component: {fileID: 1012036661}
- - component: {fileID: 1012036660}
- m_Layer: 0
- m_Name: EventSystem
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1012036659
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1012036658}
- serializedVersion: 2
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -960, y: -540, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 1361712799}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1012036660
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1012036658}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_SendPointerHoverToParent: 1
- m_HorizontalAxis: Horizontal
- m_VerticalAxis: Vertical
- m_SubmitButton: Submit
- m_CancelButton: Cancel
- m_InputActionsPerSecond: 10
- m_RepeatDelay: 0.5
- m_ForceModuleActive: 0
---- !u!114 &1012036661
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1012036658}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_FirstSelected: {fileID: 0}
- m_sendNavigationEvents: 1
- m_DragThreshold: 10
+ m_Name: UI/RoundedCorners/IndependentRoundedCorners
+ m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
+ m_ValidKeywords: []
+ m_InvalidKeywords: []
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_LockedProperties:
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _ColorMask: 15
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilOp: 0
+ - _StencilReadMask: 255
+ - _StencilWriteMask: 255
+ - _UseUIAlphaClip: 0
+ m_Colors:
+ - _halfSize: {r: 5, g: 13.05, b: 0, a: 0}
+ - _r: {r: 5, g: 5, b: 0, a: 0}
+ - _rect2props: {r: 0, g: -2.500002, b: 10.995511, a: 10.995511}
+ m_BuildTextureStacks: []
--- !u!1 &1023572425
GameObject:
m_ObjectHideFlags: 0
@@ -2453,6 +2367,47 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!21 &1031704740
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: UI/RoundedCorners/IndependentRoundedCorners
+ m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
+ m_ValidKeywords: []
+ m_InvalidKeywords: []
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_LockedProperties:
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _ColorMask: 15
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilOp: 0
+ - _StencilReadMask: 255
+ - _StencilWriteMask: 255
+ - _UseUIAlphaClip: 0
+ m_Colors:
+ - _halfSize: {r: 5, g: 13.05, b: 0, a: 0}
+ - _r: {r: 0, g: 0, b: 5, a: 5}
+ - _rect2props: {r: 0.00000047683716, g: 2.4999986, b: 10.995511, a: 10.995511}
+ m_BuildTextureStacks: []
--- !u!1 &1072290691
GameObject:
m_ObjectHideFlags: 0
@@ -2709,7 +2664,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Material: {fileID: 1775254820}
+ m_Material: {fileID: 261155270}
m_Color: {r: 0.83137256, g: 0.6901961, b: 0.654902, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -2798,7 +2753,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Material: {fileID: 381726217}
+ m_Material: {fileID: 1857030066}
m_Color: {r: 0.90588236, g: 0.78431374, b: 0.78431374, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -2966,12 +2921,139 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1254340705}
m_CullTransparentMesh: 1
+--- !u!1 &1255340475
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1255340479}
+ - component: {fileID: 1255340478}
+ - component: {fileID: 1255340476}
+ - component: {fileID: 1255340477}
+ m_Layer: 5
+ m_Name: CloseTrigger
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &1255340476
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1255340475}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Delegates: []
+--- !u!114 &1255340477
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1255340475}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 0}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Texture: {fileID: 0}
+ m_UVRect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 1
+ height: 1
+--- !u!222 &1255340478
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1255340475}
+ m_CullTransparentMesh: 1
+--- !u!224 &1255340479
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1255340475}
+ 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_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1361712799}
+ 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.36008}
+ m_SizeDelta: {x: 557.6676, y: 1080.7}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!4 &1287631730 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2739991145043243501, guid: 0c13e24f92c86f84a85c76e0bca22830,
type: 3}
m_PrefabInstance: {fileID: 1625022535}
m_PrefabAsset: {fileID: 0}
+--- !u!21 &1318321551
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: UI/RoundedCorners/IndependentRoundedCorners
+ m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
+ m_ValidKeywords: []
+ m_InvalidKeywords: []
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_LockedProperties:
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _ColorMask: 15
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilOp: 0
+ - _StencilReadMask: 255
+ - _StencilWriteMask: 255
+ - _UseUIAlphaClip: 0
+ m_Colors:
+ - _halfSize: {r: 36.5705, g: 37.7215, b: 0, a: 0}
+ - _r: {r: 40, g: 0, b: 0, a: 40}
+ - _rect2props: {r: 20, g: -0.0000076293945, b: 38.390244, a: 38.390244}
+ m_BuildTextureStacks: []
--- !u!1 &1325887242
GameObject:
m_ObjectHideFlags: 0
@@ -2985,6 +3067,7 @@ GameObject:
- component: {fileID: 1325887246}
- component: {fileID: 1325887245}
- component: {fileID: 1325887244}
+ - component: {fileID: 1325887248}
m_Layer: 5
m_Name: UI Border
m_TagString: Untagged
@@ -3062,7 +3145,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Material: {fileID: 1726464744}
+ m_Material: {fileID: 687683564}
m_Color: {r: 0.76729554, g: 0.34738284, b: 0.24370071, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -3085,6 +3168,19 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1325887242}
m_CullTransparentMesh: 1
+--- !u!114 &1325887248
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1325887242}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Delegates: []
--- !u!1 &1331444962
GameObject:
m_ObjectHideFlags: 0
@@ -3307,6 +3403,7 @@ GameObject:
- component: {fileID: 1361712797}
- component: {fileID: 1361712796}
- component: {fileID: 1361712795}
+ - component: {fileID: 1361712800}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
@@ -3388,8 +3485,8 @@ Canvas:
m_GameObject: {fileID: 1361712794}
m_Enabled: 1
serializedVersion: 3
- m_RenderMode: 1
- m_Camera: {fileID: 0}
+ m_RenderMode: 0
+ m_Camera: {fileID: 1508047064}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
@@ -3414,10 +3511,10 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
- - {fileID: 1012036659}
+ - {fileID: 217430506}
+ - {fileID: 1255340479}
- {fileID: 1325887243}
- - {fileID: 455871648}
- - {fileID: 1458184089}
+ - {fileID: 1905297351}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -3425,6 +3522,21 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
+--- !u!114 &1361712800
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1361712794}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: ff219968359ff3a4490aea564d194887, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ anim: {fileID: 1325887244}
+ OpenerTrigger: {fileID: 217430507}
+ CloseTrigger: {fileID: 1255340476}
--- !u!1 &1414423272
GameObject:
m_ObjectHideFlags: 0
@@ -3614,108 +3726,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1435538639}
m_CullTransparentMesh: 1
---- !u!1 &1458184088
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1458184089}
- - component: {fileID: 1458184091}
- - component: {fileID: 1458184090}
- m_Layer: 5
- m_Name: CloseUITrigger (1)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1458184089
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1458184088}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.49602905, y: 0.10052444, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 1361712799}
- 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: 937, y: 492}
- m_SizeDelta: {x: 100, y: 100}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1458184090
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1458184088}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: ff219968359ff3a4490aea564d194887, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- anim: {fileID: 1325887244}
- animationCall: Open
- activateGo: {fileID: 455871645}
- deactivateSelf: 0
- affectedObj: {fileID: 0}
- count: 1
- maxCount: 2
- currentCount: 0
---- !u!61 &1458184091
-BoxCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1458184088}
- m_Enabled: 1
- m_Density: 1
- m_Material: {fileID: 0}
- m_IncludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ExcludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_LayerOverridePriority: 0
- m_ForceSendLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_ForceReceiveLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_ContactCaptureLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_CallbackLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_IsTrigger: 1
- m_UsedByEffector: 0
- m_UsedByComposite: 0
- m_Offset: {x: -101.62274, y: -167.50247}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0, y: 0}
- oldSize: {x: 0, y: 0}
- newSize: {x: 0, y: 0}
- adaptiveTilingThreshold: 0
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- serializedVersion: 2
- m_Size: {x: 303.24536, y: 1435.0049}
- m_EdgeRadius: 0
--- !u!1001 &1472549667
PrefabInstance:
m_ObjectHideFlags: 0
@@ -3918,7 +3928,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Material: {fileID: 2123466984}
+ m_Material: {fileID: 1726352763}
m_Color: {r: 0.8301887, g: 0.6912864, b: 0.6552747, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -4332,7 +4342,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Material: {fileID: 1619095144}
+ m_Material: {fileID: 654460998}
m_Color: {r: 0.9056604, g: 0.78319687, b: 0.78319687, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -4355,47 +4365,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1615413019}
m_CullTransparentMesh: 1
---- !u!21 &1619095144
-Material:
- serializedVersion: 8
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: UI/RoundedCorners/IndependentRoundedCorners
- m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
- m_Parent: {fileID: 0}
- m_ModifiedSerializedProperties: 0
- m_ValidKeywords: []
- m_InvalidKeywords: []
- m_LightmapFlags: 4
- m_EnableInstancingVariants: 0
- m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
- stringTagMap: {}
- disabledShaderPasses: []
- m_LockedProperties:
- m_SavedProperties:
- serializedVersion: 3
- m_TexEnvs:
- - _MainTex:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- m_Ints: []
- m_Floats:
- - _ColorMask: 15
- - _Stencil: 0
- - _StencilComp: 8
- - _StencilOp: 0
- - _StencilReadMask: 255
- - _StencilWriteMask: 255
- - _UseUIAlphaClip: 0
- m_Colors:
- - _halfSize: {r: 97.85, g: 477.754, b: 0, a: 0}
- - _r: {r: 0, g: 0, b: 0, a: 40}
- - _rect2props: {r: 10, g: 9.999939, b: 407.01352, a: 392.87137}
- m_BuildTextureStacks: []
--- !u!1001 &1625022535
PrefabInstance:
m_ObjectHideFlags: 0
@@ -4734,7 +4703,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1675354854}
m_CullTransparentMesh: 1
---- !u!21 &1726464744
+--- !u!21 &1726352763
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
@@ -4771,9 +4740,9 @@ Material:
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- - _halfSize: {r: 360, g: 550, b: 0, a: 0}
- - _r: {r: 0, g: 59.4, b: 59.4, a: 59.4}
- - _rect2props: {r: -14.850006, g: 14.849915, b: 622.4661, a: 601.4651}
+ - _halfSize: {r: 340.1145, g: 535, b: 0, a: 0}
+ - _r: {r: 0, g: 0, b: 0, a: 40}
+ - _rect2props: {r: 10.0000305, g: 9.999878, b: 618.79944, a: 604.6573}
m_BuildTextureStacks: []
--- !u!1001 &1767770602
PrefabInstance:
@@ -4910,7 +4879,7 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 1767770602}
m_PrefabAsset: {fileID: 0}
---- !u!21 &1775254820
+--- !u!21 &1857030066
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
@@ -4947,10 +4916,78 @@ Material:
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- - _halfSize: {r: 35.4485, g: 38.0555, b: 0, a: 0}
- - _r: {r: 40, g: 0, b: 0, a: 40}
- - _rect2props: {r: 20.000002, g: -0.0000038146973, b: 37.833046, a: 37.833046}
+ - _halfSize: {r: 97.8265, g: 37.763, b: 0, a: 0}
+ - _r: {r: 30.96, g: 0, b: 0, a: 0}
+ - _rect2props: {r: 7.7400208, g: -7.7400017, b: 84.93025, a: 95.87626}
m_BuildTextureStacks: []
+--- !u!1 &1905297350
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1905297351}
+ - component: {fileID: 1905297353}
+ - component: {fileID: 1905297352}
+ m_Layer: 5
+ m_Name: EventSystem
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1905297351
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1905297350}
+ serializedVersion: 2
+ 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_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1361712799}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1905297352
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1905297350}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_SendPointerHoverToParent: 1
+ m_HorizontalAxis: Horizontal
+ m_VerticalAxis: Vertical
+ m_SubmitButton: Submit
+ m_CancelButton: Cancel
+ m_InputActionsPerSecond: 10
+ m_RepeatDelay: 0.5
+ m_ForceModuleActive: 0
+--- !u!114 &1905297353
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1905297350}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_FirstSelected: {fileID: 0}
+ m_sendNavigationEvents: 1
+ m_DragThreshold: 10
--- !u!1 &1980823141
GameObject:
m_ObjectHideFlags: 0
@@ -5088,7 +5125,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Material: {fileID: 728463258}
+ m_Material: {fileID: 1031704740}
m_Color: {r: 0.9811321, g: 0.8669752, b: 0.8669752, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -5498,47 +5535,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2107754074}
m_CullTransparentMesh: 1
---- !u!21 &2123466984
-Material:
- serializedVersion: 8
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: UI/RoundedCorners/IndependentRoundedCorners
- m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
- m_Parent: {fileID: 0}
- m_ModifiedSerializedProperties: 0
- m_ValidKeywords: []
- m_InvalidKeywords: []
- m_LightmapFlags: 4
- m_EnableInstancingVariants: 0
- m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
- stringTagMap: {}
- disabledShaderPasses: []
- m_LockedProperties:
- m_SavedProperties:
- serializedVersion: 3
- m_TexEnvs:
- - _MainTex:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- m_Ints: []
- m_Floats:
- - _ColorMask: 15
- - _Stencil: 0
- - _StencilComp: 8
- - _StencilOp: 0
- - _StencilReadMask: 255
- - _StencilWriteMask: 255
- - _UseUIAlphaClip: 0
- m_Colors:
- - _halfSize: {r: 340.1145, g: 535, b: 0, a: 0}
- - _r: {r: 0, g: 0, b: 0, a: 40}
- - _rect2props: {r: 10.0000305, g: 9.999878, b: 618.79944, a: 604.6573}
- m_BuildTextureStacks: []
--- !u!1 &2132491020
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Manager/GameManager.cs b/Assets/Scripts/Manager/GameManager.cs
index f14a12b..5a9132e 100644
--- a/Assets/Scripts/Manager/GameManager.cs
+++ b/Assets/Scripts/Manager/GameManager.cs
@@ -1,3 +1,4 @@
+using System;
using UnityEngine;
public class GameManager : MonoBehaviour
@@ -8,8 +9,6 @@ public class GameManager : MonoBehaviour
public bool IsBuildMode = false;
private Tower selectedTower;
- public TowerInfo ShopSelectedTower;
-
public Tower SelectedTower { get { return selectedTower; } set {
if (selectedTower != null)
selectedTower.TowerSelected(false);
@@ -25,4 +24,26 @@ public class GameManager : MonoBehaviour
Destroy(Instance);
Instance = this;
}
+
+ private void OnEnable()
+ {
+ MoneyManager.OnShopSelected += m_OnTowerShopSelected;
+ TowerPlacementManager.OnTowerPlaced += m_finishBuildmode;
+ }
+
+ private void OnDisable()
+ {
+ MoneyManager.OnShopSelected -= m_OnTowerShopSelected;
+ TowerPlacementManager.OnTowerPlaced -= m_finishBuildmode;
+ }
+
+ private void m_OnTowerShopSelected(TowerInfo info)
+ {
+ IsBuildMode = true;
+ }
+
+ private void m_finishBuildmode(TowerInfo info)
+ {
+ IsBuildMode = false;
+ }
}
diff --git a/Assets/Scripts/Manager/MoneyManager.cs b/Assets/Scripts/Manager/MoneyManager.cs
index 1cb795a..a1ee641 100644
--- a/Assets/Scripts/Manager/MoneyManager.cs
+++ b/Assets/Scripts/Manager/MoneyManager.cs
@@ -1,3 +1,4 @@
+using System;
using System.Collections;
using System.Collections.Generic;
using TMPro;
@@ -11,6 +12,11 @@ public class MoneyManager : MonoBehaviour
public GameObject[] ShopButtons;
public TMP_Text[] MoneyTexts;
+ ///
+ /// Invoked when player selects tower from shop
+ ///
+ public static event Action OnShopSelected;
+
private void OnEnable()
{
for (int i = 0; i < ShopButtons.Length; i++)
@@ -35,7 +41,6 @@ public class MoneyManager : MonoBehaviour
{
Assert.AreNotEqual(index, -1, "Shop button not init-ed with index");
- GameManager.Instance.ShopSelectedTower = towerCollection.Towers[index];
- GameManager.Instance.IsBuildMode = true;
+ OnShopSelected?.Invoke(towerCollection.Towers[index]);
}
}
diff --git a/Assets/Scripts/PlacementSystem/PlacementManager.cs b/Assets/Scripts/PlacementSystem/PlacementManager.cs
index 92f7da6..f7b07d1 100644
--- a/Assets/Scripts/PlacementSystem/PlacementManager.cs
+++ b/Assets/Scripts/PlacementSystem/PlacementManager.cs
@@ -8,26 +8,28 @@ using UnityEngine;
public class TowerPlacementManager : MonoBehaviour
{
- ///
- /// Sender
- ///
+ public static TowerPlacementManager Instance;
+
+ // Spawning grid events
public static event Action OnSpawnGridRequested;
public static event Action OnGridDeleteRequested;
- public static TowerPlacementManager Instance;
+
+ // Placing tower
+ public static event Action OnTowerPlaced;
+
[Header("Debug")]
[SerializeField] private bool RebuildGrid = false;
// Section: Mouse
private SlotManager CurrentSelectedSlot;
- private SlotManager CurrentHovered; // Not implemented
private int CurrentRotation = 0; // 0, 1, 2, 3
private GameObject SilhouettedObject;
+ private TowerInfo SelectedTowerInfo;
- // Section: Debug
- public GameObject DebugTowerPrefab;
+ private GameObject SelectedTowerPrefab => SelectedTowerInfo.prefab;
private void Start()
{
@@ -59,12 +61,27 @@ public class TowerPlacementManager : MonoBehaviour
}
}
+ private void OnEnable()
+ {
+ MoneyManager.OnShopSelected += OnShopSelected;
+ }
+
+ private void OnDisable()
+ {
+ MoneyManager.OnShopSelected -= OnShopSelected;
+ }
+
+ private void OnShopSelected(TowerInfo info)
+ {
+ SelectedTowerInfo = info;
+ }
+
public void OnSlotClicked(SlotManager slot, GridManager grid, int x, int y)
{
slot.gameObject.GetComponentInChildren().material.color = Color.blue;
OnSelectSlot(slot);
- SpawnTowerAtSelected(DebugTowerPrefab);
+ SpawnTowerAtSelected(SelectedTowerPrefab);
}
// Called when a slot is selected
@@ -94,13 +111,13 @@ public class TowerPlacementManager : MonoBehaviour
public void OnSlotHovered(SlotManager slot, GridManager grid, int x, int y)
{
if (SilhouettedObject == null)
- SilhouettedObject = ToSilhouette(DebugTowerPrefab);
+ SilhouettedObject = ToSilhouette(SelectedTowerPrefab);
// Sets tower rotation
Quaternion newRotation = Quaternion.AngleAxis(CurrentRotation * 90f, transform.up);
SilhouettedObject.transform.localRotation = newRotation;
- Vector3 offset = DebugTowerPrefab.transform.position;
+ Vector3 offset = SelectedTowerPrefab.transform.position;
//SilhouettedObject.SetActive(true);
SilhouettedObject.transform.parent = slot.TowerSpawnPoint.transform;
diff --git a/Assets/Scripts/UI/UIManager.cs b/Assets/Scripts/UI/UIManager.cs
index c9300dc..6954367 100644
--- a/Assets/Scripts/UI/UIManager.cs
+++ b/Assets/Scripts/UI/UIManager.cs
@@ -1,53 +1,72 @@
+using System;
+using UnityEditor.PackageManager;
using UnityEngine;
+using UnityEngine.EventSystems;
public class UIManager : MonoBehaviour
{
- public Animator anim;
- public string animationCall;
+ [SerializeField] private Animator anim;
+ [SerializeField] private EventTrigger OpenerTrigger;
+ [SerializeField] private EventTrigger CloseTrigger;
- public GameObject activateGo;
- public bool deactivateSelf;
+ private bool OpenerIsHovered = false;
+ private bool CloseIsHovered = false;
- public UIManager affectedObj;
+ private bool CurrentShopState = false;
- public bool count;
-
- public int maxCount = 1;
- public int currentCount = 0;
-
-
- private void Awake()
+ private void OnEnable()
{
- if(count)
- currentCount = 0;
- }
- public void OnMouseEnter()
- {
- anim.SetTrigger(animationCall);
+ // Subscribe to PointerEnter event
+ EventTrigger.Entry pointerOpenerEnter = new EventTrigger.Entry();
+ pointerOpenerEnter.eventID = EventTriggerType.PointerEnter;
+ pointerOpenerEnter.callback.AddListener((data) => { OnOpenerEnter((PointerEventData)data); });
+ OpenerTrigger.triggers.Add(pointerOpenerEnter);
- if (activateGo != null)
- activateGo.SetActive(true);
+ // Subscribe to PointerExit event
+ EventTrigger.Entry pointerOpenerExit = new EventTrigger.Entry();
+ pointerOpenerExit.eventID = EventTriggerType.PointerExit;
+ pointerOpenerExit.callback.AddListener((data) => { OnOpenerExit((PointerEventData)data); });
+ OpenerTrigger.triggers.Add(pointerOpenerExit);
- if (deactivateSelf)
- {
- gameObject.SetActive(false);
- if (count)
- ResetCount();
- }
- //gameObject.SetActive(false);
+ // Subscribe to PointerEnter event
+ EventTrigger.Entry pointerCloseTriggerEnter = new EventTrigger.Entry();
+ pointerCloseTriggerEnter.eventID = EventTriggerType.PointerEnter;
+ pointerCloseTriggerEnter.callback.AddListener((data) => { OnCloseTriggerEnter((PointerEventData)data); });
+ CloseTrigger.triggers.Add(pointerCloseTriggerEnter);
- if (count)
- currentCount++;
- if (currentCount >= maxCount && count)
- gameObject.SetActive(false);
-
- if (affectedObj != null && affectedObj.currentCount >= affectedObj.maxCount && affectedObj.count)
- ResetCount();
- }
- public void ResetCount()
- {
- affectedObj.gameObject.SetActive(true);
- affectedObj.currentCount = 0;
+ // Subscribe to PointerExit event
+ EventTrigger.Entry pointerCloseTriggerExit = new EventTrigger.Entry();
+ pointerCloseTriggerExit.eventID = EventTriggerType.PointerExit;
+ pointerCloseTriggerExit.callback.AddListener((data) => { OnCloseTriggerExit((PointerEventData)data); });
+ CloseTrigger.triggers.Add(pointerCloseTriggerExit);
}
+ private void OnCloseTriggerEnter(PointerEventData data)
+ {
+ CloseIsHovered = true;
+ UpdateShopState();
+ }
+
+ private void OnCloseTriggerExit(PointerEventData data)
+ {
+ CloseIsHovered = false;
+ UpdateShopState();
+ }
+
+ private void OnOpenerEnter(PointerEventData data)
+ {
+ OpenerIsHovered = true;
+ UpdateShopState();
+ }
+ private void OnOpenerExit(PointerEventData data)
+ {
+ OpenerIsHovered = false;
+ UpdateShopState();
+ }
+
+ private void UpdateShopState()
+ {
+ CurrentShopState = (CurrentShopState && !CloseIsHovered) || (OpenerIsHovered && !CloseIsHovered);
+ anim.SetBool("IsOpen", CurrentShopState);
+ }
}