diff --git a/Assets/Prefabs/Pet/Buff.prefab b/Assets/Prefabs/Pet/Buff.prefab index 84e2e5d294a684dd92cc613b042d2487a4a70610..240497bcf0c5ff4155675031149cc442d11947d0 100644 --- a/Assets/Prefabs/Pet/Buff.prefab +++ b/Assets/Prefabs/Pet/Buff.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &96302004802594873 +--- !u!1 &1535292663726020532 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,88 +8,35 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7988294545465999327} - - component: {fileID: 524603843606646747} + - component: {fileID: 5604965703848560319} m_Layer: 5 - m_Name: Slider + m_Name: Fill Area m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7988294545465999327 +--- !u!224 &5604965703848560319 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 96302004802594873} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 1535292663726020532} + 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: - - {fileID: 1654964848174718096} - - {fileID: 6804924502204225625} - m_Father: {fileID: 3245046435496180817} + - {fileID: 4497457565938472287} + m_Father: {fileID: 8291794954218262706} 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_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 160, y: 20} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &524603843606646747 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 96302004802594873} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 0 - 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: 0 - m_TargetGraphic: {fileID: 0} - m_FillRect: {fileID: 140351870021505023} - m_HandleRect: {fileID: 0} - m_Direction: 0 - m_MinValue: 0 - m_MaxValue: 70 - m_WholeNumbers: 0 - m_Value: 70 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &2293496505898268873 +--- !u!1 &1884984716015006170 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -97,64 +44,64 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1654964848174718096} - - component: {fileID: 7911697988544347687} - - component: {fileID: 4280715715567886690} + - component: {fileID: 4497457565938472287} + - component: {fileID: 4517025387517216518} + - component: {fileID: 1119490219315858415} m_Layer: 5 - m_Name: Background + m_Name: Fill m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1654964848174718096 +--- !u!224 &4497457565938472287 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2293496505898268873} + m_GameObject: {fileID: 1884984716015006170} 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: 7988294545465999327} + m_Father: {fileID: 5604965703848560319} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7911697988544347687 +--- !u!222 &4517025387517216518 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2293496505898268873} + m_GameObject: {fileID: 1884984716015006170} m_CullTransparentMesh: 1 ---- !u!114 &4280715715567886690 +--- !u!114 &1119490219315858415 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2293496505898268873} + m_GameObject: {fileID: 1884984716015006170} 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.89433956, g: 0.20080444, b: 0.20080444, a: 1} + m_Color: {r: 0.09787818, g: 0.8792453, b: 0.12590699, 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: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -164,7 +111,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &3880974247051364728 +--- !u!1 &2544234614826602835 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -172,10 +119,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3245046435496180817} - - component: {fileID: 2970236498031513165} - - component: {fileID: 5491504971471651918} - - component: {fileID: 5205234215984506972} + - component: {fileID: 8479929553861313650} + - component: {fileID: 9104148746058702109} + - component: {fileID: 8363437645661532894} + - component: {fileID: 1105030647141069318} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -183,33 +130,33 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &3245046435496180817 +--- !u!224 &8479929553861313650 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3880974247051364728} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.04} + m_GameObject: {fileID: 2544234614826602835} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -1.772} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 7988294545465999327} + - {fileID: 8291794954218262706} m_Father: {fileID: 6220440759874809753} 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: 1.08} + m_AnchoredPosition: {x: 0, y: 1.4} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &2970236498031513165 +--- !u!223 &9104148746058702109 Canvas: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3880974247051364728} + m_GameObject: {fileID: 2544234614826602835} m_Enabled: 1 serializedVersion: 3 m_RenderMode: 2 @@ -226,13 +173,13 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!114 &5491504971471651918 +--- !u!114 &8363437645661532894 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3880974247051364728} + m_GameObject: {fileID: 2544234614826602835} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} @@ -249,13 +196,13 @@ MonoBehaviour: m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 m_PresetInfoIsWorld: 1 ---- !u!114 &5205234215984506972 +--- !u!114 &1105030647141069318 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3880974247051364728} + m_GameObject: {fileID: 2544234614826602835} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} @@ -266,7 +213,7 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!1 &7519284702679657523 +--- !u!1 &2851200307679606716 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -274,35 +221,88 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6804924502204225625} + - component: {fileID: 8291794954218262706} + - component: {fileID: 1211421424821667628} m_Layer: 5 - m_Name: Fill Area + m_Name: HealthSlider m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6804924502204225625 +--- !u!224 &8291794954218262706 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7519284702679657523} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 2851200307679606716} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 22.1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 140351870021505023} - m_Father: {fileID: 7988294545465999327} + - {fileID: 5911703483269188085} + - {fileID: 5604965703848560319} + m_Father: {fileID: 8479929553861313650} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: -5, y: 0} - m_SizeDelta: {x: -20, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 3, y: -2.9} + m_SizeDelta: {x: 160, y: 20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &8912521898150762048 +--- !u!114 &1211421424821667628 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2851200307679606716} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + 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: 0 + m_TargetGraphic: {fileID: 0} + m_FillRect: {fileID: 4497457565938472287} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 70 + m_WholeNumbers: 0 + m_Value: 70 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &8233728276267389188 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -310,64 +310,64 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 140351870021505023} - - component: {fileID: 4180201615794312878} - - component: {fileID: 6522081814855361538} + - component: {fileID: 5911703483269188085} + - component: {fileID: 5405457656796117644} + - component: {fileID: 9152623046311933086} m_Layer: 5 - m_Name: Fill + m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &140351870021505023 +--- !u!224 &5911703483269188085 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8912521898150762048} + m_GameObject: {fileID: 8233728276267389188} 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: 6804924502204225625} + m_Father: {fileID: 8291794954218262706} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 4.68, y: 0} - m_SizeDelta: {x: 19.36, y: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4180201615794312878 +--- !u!222 &5405457656796117644 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8912521898150762048} + m_GameObject: {fileID: 8233728276267389188} m_CullTransparentMesh: 1 ---- !u!114 &6522081814855361538 +--- !u!114 &9152623046311933086 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8912521898150762048} + m_GameObject: {fileID: 8233728276267389188} 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.14837307, g: 0.86415094, b: 0.22581175, a: 1} + m_Color: {r: 0.81886786, g: 0.09733708, b: 0.09733708, 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -530,7 +530,7 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3} insertIndex: -1 - addedObject: {fileID: 3245046435496180817} + addedObject: {fileID: 8479929553861313650} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3} insertIndex: -1 diff --git a/Assets/Prefabs/Pet/Fighter.prefab b/Assets/Prefabs/Pet/Fighter.prefab index 858d91da58fb4fcfd9a60360694b9a207ea42aad..91034397c0f47f2669a4e13345fe0a81cfe2168e 100644 --- a/Assets/Prefabs/Pet/Fighter.prefab +++ b/Assets/Prefabs/Pet/Fighter.prefab @@ -4900,7 +4900,7 @@ ParticleSystemRenderer: m_MeshWeighting2: 1 m_MeshWeighting3: 1 m_MaskInteraction: 0 ---- !u!1 &360071291544041461 +--- !u!1 &879024736590908903 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4908,101 +4908,63 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7375181214309104546} - - component: {fileID: 5499562714962360966} - - component: {fileID: 1504612466866488836} - - component: {fileID: 4775576799251568463} - m_Layer: 5 - m_Name: Canvas + - component: {fileID: 8670112699971036584} + m_Layer: 6 + m_Name: Spine m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7375181214309104546 -RectTransform: +--- !u!4 &8670112699971036584 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 360071291544041461} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_GameObject: {fileID: 879024736590908903} + serializedVersion: 2 + m_LocalRotation: {x: -0.14742991, y: 0, z: -0, w: 0.9890725} + m_LocalPosition: {x: -0, y: 0.0007026704, z: 3.7252902e-11} + m_LocalScale: {x: 1, y: 1, z: 1.0000001} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1410146050337891214} - m_Father: {fileID: 5233720092725804505} + - {fileID: 4682276465588183580} + m_Father: {fileID: 7589281599615252185} 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.037, y: 1.187} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &5499562714962360966 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 360071291544041461} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 0 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!114 &1504612466866488836 -MonoBehaviour: +--- !u!1 &960506750402569162 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 360071291544041461} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 ---- !u!114 &4775576799251568463 -MonoBehaviour: + serializedVersion: 6 + m_Component: + - component: {fileID: 8681661483607261052} + m_Layer: 6 + m_Name: Tail2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8681661483607261052 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 360071291544041461} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!1 &815521659874349399 + m_GameObject: {fileID: 960506750402569162} + serializedVersion: 2 + m_LocalRotation: {x: 0.09017606, y: 0, z: -0, w: 0.99592584} + m_LocalPosition: {x: -0, y: 0.00086856645, z: 1.4901161e-10} + m_LocalScale: {x: 1, y: 0.99999994, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5138549124433007118} + m_Father: {fileID: 4675025286648829411} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1197174574771564179 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5010,9 +4972,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8494577743577093577} - - component: {fileID: 1985949320059834477} - - component: {fileID: 1725585404315085218} + - component: {fileID: 5636505493815967990} + - component: {fileID: 7794367499237640977} + - component: {fileID: 3586563074534316323} m_Layer: 5 m_Name: Background m_TagString: Untagged @@ -5020,47 +4982,47 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8494577743577093577 +--- !u!224 &5636505493815967990 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 815521659874349399} + m_GameObject: {fileID: 1197174574771564179} 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: 1410146050337891214} + m_Father: {fileID: 5732093022640130692} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1985949320059834477 +--- !u!222 &7794367499237640977 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 815521659874349399} + m_GameObject: {fileID: 1197174574771564179} m_CullTransparentMesh: 1 ---- !u!114 &1725585404315085218 +--- !u!114 &3586563074534316323 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 815521659874349399} + m_GameObject: {fileID: 1197174574771564179} 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.8862745, g: 0.3069445, b: 0.06666667, a: 1} + m_Color: {r: 0.81886786, g: 0.09733708, b: 0.09733708, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -5077,39 +5039,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &879024736590908903 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8670112699971036584} - m_Layer: 6 - m_Name: Spine - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8670112699971036584 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 879024736590908903} - serializedVersion: 2 - m_LocalRotation: {x: -0.14742991, y: 0, z: -0, w: 0.9890725} - m_LocalPosition: {x: -0, y: 0.0007026704, z: 3.7252902e-11} - m_LocalScale: {x: 1, y: 1, z: 1.0000001} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4682276465588183580} - m_Father: {fileID: 7589281599615252185} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &960506750402569162 +--- !u!1 &1323153661642164250 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5117,31 +5047,31 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8681661483607261052} + - component: {fileID: 219480487697053493} m_Layer: 6 - m_Name: Tail2 + m_Name: Shoulder.R m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &8681661483607261052 +--- !u!4 &219480487697053493 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 960506750402569162} + m_GameObject: {fileID: 1323153661642164250} serializedVersion: 2 - m_LocalRotation: {x: 0.09017606, y: 0, z: -0, w: 0.99592584} - m_LocalPosition: {x: -0, y: 0.00086856645, z: 1.4901161e-10} - m_LocalScale: {x: 1, y: 0.99999994, z: 1} + m_LocalRotation: {x: 0.44003898, y: 0.59377474, z: 0.58966887, w: -0.32571134} + m_LocalPosition: {x: 0.0011785148, y: 0.00084871904, z: 0.00041672896} + m_LocalScale: {x: 1, y: 1.0000002, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5138549124433007118} - m_Father: {fileID: 4675025286648829411} + - {fileID: 764971148283497516} + m_Father: {fileID: 7007841070678610446} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1323153661642164250 +--- !u!1 &1371107191549450123 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5149,30 +5079,34 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 219480487697053493} - m_Layer: 6 - m_Name: Shoulder.R + - component: {fileID: 7804365280183046132} + m_Layer: 5 + m_Name: Fill Area m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &219480487697053493 -Transform: +--- !u!224 &7804365280183046132 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1323153661642164250} - serializedVersion: 2 - m_LocalRotation: {x: 0.44003898, y: 0.59377474, z: 0.58966887, w: -0.32571134} - m_LocalPosition: {x: 0.0011785148, y: 0.00084871904, z: 0.00041672896} - m_LocalScale: {x: 1, y: 1.0000002, z: 1} + m_GameObject: {fileID: 1371107191549450123} + 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: - - {fileID: 764971148283497516} - m_Father: {fileID: 7007841070678610446} + - {fileID: 7983772251308732626} + m_Father: {fileID: 5732093022640130692} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1659124944483683571 GameObject: m_ObjectHideFlags: 0 @@ -5335,7 +5269,7 @@ Transform: - {fileID: 7589281599615252185} m_Father: {fileID: 5233720092725804505} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3464293283152406352 +--- !u!1 &3713557238465421916 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5343,74 +5277,119 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 752676268747904241} - - component: {fileID: 3497137011374807667} - - component: {fileID: 6299782126508975671} - m_Layer: 5 - m_Name: Fill + - component: {fileID: 5138549124433007118} + m_Layer: 6 + m_Name: Tail3 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &752676268747904241 -RectTransform: +--- !u!4 &5138549124433007118 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3464293283152406352} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 3713557238465421916} + serializedVersion: 2 + m_LocalRotation: {x: 0.06682506, y: 0, z: -0, w: 0.9977647} + m_LocalPosition: {x: -0, y: 0.00066383544, z: -1.8626451e-11} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1116118038157198981} + m_Father: {fileID: 8681661483607261052} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 5.03, y: 0} - m_SizeDelta: {x: 20.05, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3497137011374807667 -CanvasRenderer: +--- !u!1 &4233680260348947640 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3464293283152406352} - m_CullTransparentMesh: 1 ---- !u!114 &6299782126508975671 + serializedVersion: 6 + m_Component: + - component: {fileID: 5732093022640130692} + - component: {fileID: 4893255910633044474} + m_Layer: 5 + m_Name: HealthSlider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5732093022640130692 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4233680260348947640} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 22.1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5636505493815967990} + - {fileID: 7804365280183046132} + m_Father: {fileID: 5334218418040005116} + 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: 3, y: -2.9} + m_SizeDelta: {x: 160, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &4893255910633044474 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3464293283152406352} + m_GameObject: {fileID: 4233680260348947640} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.17940192, g: 0.85660374, b: 0.18733498, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + 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: 0 + m_TargetGraphic: {fileID: 0} + m_FillRect: {fileID: 7983772251308732626} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 70 + m_WholeNumbers: 0 + m_Value: 70 + m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - 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 &3713557238465421916 +--- !u!1 &4329196660363886793 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5418,30 +5397,31 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5138549124433007118} + - component: {fileID: 6657068531258941582} m_Layer: 6 - m_Name: Tail3 + m_Name: Lower.Arm.R m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &5138549124433007118 +--- !u!4 &6657068531258941582 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3713557238465421916} + m_GameObject: {fileID: 4329196660363886793} serializedVersion: 2 - m_LocalRotation: {x: 0.06682506, y: 0, z: -0, w: 0.9977647} - m_LocalPosition: {x: -0, y: 0.00066383544, z: -1.8626451e-11} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalRotation: {x: 0.1295426, y: 0.0030623104, z: 0.011361053, w: 0.9915041} + m_LocalPosition: {x: -2.561137e-10, y: 0.0012228463, z: 3.9115547e-10} + m_LocalScale: {x: 0.99999976, y: 0.99999976, z: 0.99999994} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8681661483607261052} + m_Children: + - {fileID: 3222373240977097806} + m_Father: {fileID: 764971148283497516} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &4195011705586714872 +--- !u!1 &4883556337509988994 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5449,66 +5429,100 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1116118038157198981} + - component: {fileID: 5334218418040005116} + - component: {fileID: 4986396672331020436} + - component: {fileID: 5051518651666334029} + - component: {fileID: 4922494729096190118} m_Layer: 5 - m_Name: Fill Area + m_Name: Canvas m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1116118038157198981 +--- !u!224 &5334218418040005116 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4195011705586714872} + m_GameObject: {fileID: 4883556337509988994} 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_LocalPosition: {x: 0, y: 0, z: 0.11800003} + m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 752676268747904241} - m_Father: {fileID: 1410146050337891214} + - {fileID: 5732093022640130692} + m_Father: {fileID: 5233720092725804505} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: -5, y: 0} - m_SizeDelta: {x: -20, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 1.4} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &4329196660363886793 -GameObject: +--- !u!223 &4986396672331020436 +Canvas: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6657068531258941582} - m_Layer: 6 - m_Name: Lower.Arm.R - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6657068531258941582 -Transform: + m_GameObject: {fileID: 4883556337509988994} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &5051518651666334029 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4329196660363886793} - serializedVersion: 2 - m_LocalRotation: {x: 0.1295426, y: 0.0030623104, z: 0.011361053, w: 0.9915041} - m_LocalPosition: {x: -2.561137e-10, y: 0.0012228463, z: 3.9115547e-10} - m_LocalScale: {x: 0.99999976, y: 0.99999976, z: 0.99999994} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3222373240977097806} - m_Father: {fileID: 764971148283497516} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 4883556337509988994} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 +--- !u!114 &4922494729096190118 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4883556337509988994} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 --- !u!1 &4893785644411561827 GameObject: m_ObjectHideFlags: 0 @@ -5549,7 +5563,7 @@ Transform: - {fileID: 830556214195339982} - {fileID: 7308506457572821002} - {fileID: 1277203867210560728} - - {fileID: 7375181214309104546} + - {fileID: 5334218418040005116} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &5692359950287471795 @@ -5778,6 +5792,81 @@ Transform: - {fileID: 6657068531258941582} m_Father: {fileID: 219480487697053493} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6101001413200800996 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7983772251308732626} + - component: {fileID: 190362636215556915} + - component: {fileID: 1158743322500135449} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7983772251308732626 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6101001413200800996} + 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: 7804365280183046132} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &190362636215556915 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6101001413200800996} + m_CullTransparentMesh: 1 +--- !u!114 &1158743322500135449 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6101001413200800996} + 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.09787818, g: 0.8792453, b: 0.12590699, 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &6114649223198090942 GameObject: m_ObjectHideFlags: 0 @@ -5946,95 +6035,6 @@ SkinnedMeshRenderer: m_Center: {x: 0, y: 0.002765044, z: -0.00214535} m_Extent: {x: 0.0056557246, y: 0.0056063053, z: 0.0047500776} m_DirtyAABB: 0 ---- !u!1 &7181618785855047147 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1410146050337891214} - - component: {fileID: 4122734396222421255} - m_Layer: 5 - m_Name: HealthSlider - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1410146050337891214 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7181618785855047147} - 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: - - {fileID: 8494577743577093577} - - {fileID: 1116118038157198981} - m_Father: {fileID: 7375181214309104546} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 160, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &4122734396222421255 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7181618785855047147} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 0 - 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: 0 - m_TargetGraphic: {fileID: 0} - m_FillRect: {fileID: 752676268747904241} - m_HandleRect: {fileID: 0} - m_Direction: 0 - m_MinValue: 0 - m_MaxValue: 70 - m_WholeNumbers: 0 - m_Value: 70 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] --- !u!1 &7205143059170389069 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Pet/Healer.prefab b/Assets/Prefabs/Pet/Healer.prefab index 7a400f5582fc8953b62a7f8e96981da6c6d81756..7fe3c1f2b42a53ca135461375ac123f0084c86b7 100644 --- a/Assets/Prefabs/Pet/Healer.prefab +++ b/Assets/Prefabs/Pet/Healer.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &2841526632005913092 +--- !u!1 &79358625054743327 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,35 +8,163 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1202764503688370186} + - component: {fileID: 2262800109291814524} + - component: {fileID: 2799887987947674669} m_Layer: 5 - m_Name: Fill Area + m_Name: HealthSlider m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1202764503688370186 +--- !u!224 &2262800109291814524 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2841526632005913092} + m_GameObject: {fileID: 79358625054743327} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 22.1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4152877478499446653} + - {fileID: 6814020351790205447} + m_Father: {fileID: 6446727882841222844} + 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: 3, y: -2.9} + m_SizeDelta: {x: 160, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2799887987947674669 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 79358625054743327} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + 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: 0 + m_TargetGraphic: {fileID: 0} + m_FillRect: {fileID: 4781718560730125580} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 70 + m_WholeNumbers: 0 + m_Value: 70 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &4892156815789250282 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4152877478499446653} + - component: {fileID: 3881182252776555109} + - component: {fileID: 4268073928810293437} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4152877478499446653 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4892156815789250282} 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: - - {fileID: 5373715224866869206} - m_Father: {fileID: 7972162811958177701} + m_Children: [] + m_Father: {fileID: 2262800109291814524} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: -5, y: 0} - m_SizeDelta: {x: -20, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &3921383596069374604 +--- !u!222 &3881182252776555109 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4892156815789250282} + m_CullTransparentMesh: 1 +--- !u!114 &4268073928810293437 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4892156815789250282} + 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.81886786, g: 0.09733708, b: 0.09733708, 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: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &4944737054583867951 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -44,10 +172,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 990394378697579799} - - component: {fileID: 4881148738239133243} - - component: {fileID: 568265607598014401} - - component: {fileID: 572048376944548636} + - component: {fileID: 6446727882841222844} + - component: {fileID: 5879476890335432378} + - component: {fileID: 6601178510277321632} + - component: {fileID: 9026418227201813633} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -55,33 +183,33 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &990394378697579799 +--- !u!224 &6446727882841222844 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3921383596069374604} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 4944737054583867951} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 2.878} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 7972162811958177701} + - {fileID: 2262800109291814524} m_Father: {fileID: 8185111475316584391} 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.031, y: 1.116} + m_AnchoredPosition: {x: 0, y: 1.3699999} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &4881148738239133243 +--- !u!223 &5879476890335432378 Canvas: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3921383596069374604} + m_GameObject: {fileID: 4944737054583867951} m_Enabled: 1 serializedVersion: 3 m_RenderMode: 2 @@ -98,13 +226,13 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!114 &568265607598014401 +--- !u!114 &6601178510277321632 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3921383596069374604} + m_GameObject: {fileID: 4944737054583867951} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} @@ -121,13 +249,13 @@ MonoBehaviour: m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 m_PresetInfoIsWorld: 1 ---- !u!114 &572048376944548636 +--- !u!114 &9026418227201813633 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3921383596069374604} + m_GameObject: {fileID: 4944737054583867951} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} @@ -138,7 +266,7 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!1 &5832545007871326904 +--- !u!1 &5137801493164558344 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -146,9 +274,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5373715224866869206} - - component: {fileID: 4900294402050360777} - - component: {fileID: 7594151009663653918} + - component: {fileID: 4781718560730125580} + - component: {fileID: 7659649304189306108} + - component: {fileID: 767533631702575592} m_Layer: 5 m_Name: Fill m_TagString: Untagged @@ -156,47 +284,47 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5373715224866869206 +--- !u!224 &4781718560730125580 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5832545007871326904} + m_GameObject: {fileID: 5137801493164558344} 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: 1202764503688370186} + m_Father: {fileID: 6814020351790205447} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 5.03, y: 0} - m_SizeDelta: {x: 20.07, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4900294402050360777 +--- !u!222 &7659649304189306108 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5832545007871326904} + m_GameObject: {fileID: 5137801493164558344} m_CullTransparentMesh: 1 ---- !u!114 &7594151009663653918 +--- !u!114 &767533631702575592 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5832545007871326904} + m_GameObject: {fileID: 5137801493164558344} 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.21135977, g: 0.85660374, b: 0.15354209, a: 1} + m_Color: {r: 0.09787818, g: 0.8792453, b: 0.12590699, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -213,7 +341,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &6681513553721763992 +--- !u!1 &5876857898788500577 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -221,162 +349,34 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5543745489210436898} - - component: {fileID: 1274418462951899538} - - component: {fileID: 3860342157672627664} + - component: {fileID: 6814020351790205447} m_Layer: 5 - m_Name: Background + m_Name: Fill Area m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5543745489210436898 +--- !u!224 &6814020351790205447 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6681513553721763992} + m_GameObject: {fileID: 5876857898788500577} 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: 7972162811958177701} + m_Children: + - {fileID: 4781718560730125580} + m_Father: {fileID: 2262800109291814524} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1274418462951899538 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6681513553721763992} - m_CullTransparentMesh: 1 ---- !u!114 &3860342157672627664 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6681513553721763992} - 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.81886786, g: 0.11587741, b: 0.11587741, 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: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - 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 &6843271080707116963 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7972162811958177701} - - component: {fileID: 5605087466850432535} - m_Layer: 5 - m_Name: Slider - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7972162811958177701 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6843271080707116963} - 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: - - {fileID: 5543745489210436898} - - {fileID: 1202764503688370186} - m_Father: {fileID: 990394378697579799} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 160, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &5605087466850432535 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6843271080707116963} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 0 - 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: 0 - m_TargetGraphic: {fileID: 0} - m_FillRect: {fileID: 5373715224866869206} - m_HandleRect: {fileID: 0} - m_Direction: 0 - m_MinValue: 0 - m_MaxValue: 70 - m_WholeNumbers: 0 - m_Value: 70 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] --- !u!1001 &8511208426981460012 PrefabInstance: m_ObjectHideFlags: 0 @@ -530,7 +530,7 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 46f311046d2104da8b56be3d0a49a119, type: 3} insertIndex: -1 - addedObject: {fileID: 990394378697579799} + addedObject: {fileID: 6446727882841222844} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 46f311046d2104da8b56be3d0a49a119, type: 3} insertIndex: -1 diff --git a/Assets/Scenes/Level01.unity b/Assets/Scenes/Level01.unity index 30ba2353c4b328950b1c2033b5df0dc1b20792e7..4bef6414699500a823b838b3e94f9d0399d644db 100644 --- a/Assets/Scenes/Level01.unity +++ b/Assets/Scenes/Level01.unity @@ -13359,6 +13359,21 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 913d896b31c0464458f65f00ff3d4532, type: 3} m_PrefabInstance: {fileID: 1563925321} m_PrefabAsset: {fileID: 0} +--- !u!114 &1312448817 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1312448811} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f1f6287601807854986437524b2584fa, type: 3} + m_Name: + m_EditorClassIdentifier: + coins: {fileID: 109216540} + increment: 50 + currentReward: 1 --- !u!1 &1357751488 GameObject: m_ObjectHideFlags: 0 @@ -14666,6 +14681,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 913d896b31c0464458f65f00ff3d4532, type: 3} insertIndex: -1 addedObject: {fileID: 1312448812} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 913d896b31c0464458f65f00ff3d4532, type: 3} + insertIndex: -1 + addedObject: {fileID: 1312448817} m_SourcePrefab: {fileID: 100100000, guid: 913d896b31c0464458f65f00ff3d4532, type: 3} --- !u!1 &1570746568 GameObject: diff --git a/Assets/Scripts/Managers/LevelManager.cs b/Assets/Scripts/Managers/LevelManager.cs index b2dfad62d59f38a43969693cb4902dbb99b3d8b8..7da27f2b44f0c9e72a543a717a64e7d5424548a7 100644 --- a/Assets/Scripts/Managers/LevelManager.cs +++ b/Assets/Scripts/Managers/LevelManager.cs @@ -32,7 +32,7 @@ namespace Nightmare public TMPro.TextMeshProUGUI questText; private float timeRemaining = 0f; private bool nextQuest = false; - private bool isCinematic = false; + public bool isCinematic = false; public int kerocoKilled = 0; public int kepalaKerocoKilled = 0; public int jendralKilled = 0; @@ -156,6 +156,8 @@ namespace Nightmare announcementText.text = "Quest berhasil diselesaikan!"; questText.text = ""; winQuest = true; + RewardManager reward = shopKeeper.GetComponent<RewardManager>(); + if (reward) reward.Reward(); } if (announcementDuration <= 0) @@ -198,6 +200,8 @@ namespace Nightmare announcementText.text = "Quest berhasil diselesaikan!"; questText.text = ""; winQuest = true; + RewardManager reward = shopKeeper.GetComponent<RewardManager>(); + if (reward) reward.Reward(); } if (announcementDuration <= 0) { @@ -240,6 +244,8 @@ namespace Nightmare announcementText.text = "Quest berhasil diselesaikan!"; questText.text = ""; winQuest = true; + RewardManager reward = shopKeeper.GetComponent<RewardManager>(); + if (reward) reward.Reward(); } if (announcementDuration <= 0) { diff --git a/Assets/Scripts/Managers/RewardManager.cs b/Assets/Scripts/Managers/RewardManager.cs new file mode 100644 index 0000000000000000000000000000000000000000..66e6b2735bad837ed74b446c44f70f69e0b67aca --- /dev/null +++ b/Assets/Scripts/Managers/RewardManager.cs @@ -0,0 +1,21 @@ +using Nightmare; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class RewardManager : MonoBehaviour +{ + public PlayerCoin coins; + public float increment = 50; + public int currentReward = 1; + + public void Reward() + { + if (LevelManager.Instance.currentQuest >= currentReward) + { + coins.coin += increment; + increment += 50; + currentReward = LevelManager.Instance.currentQuest + 1; + } + } +} diff --git a/Assets/Scripts/Managers/RewardManager.cs.meta b/Assets/Scripts/Managers/RewardManager.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..808749defdec9ccd56467fa11aa1d3f0ad7ff3ce --- /dev/null +++ b/Assets/Scripts/Managers/RewardManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f1f6287601807854986437524b2584fa +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Orbs/OrbSpawner.cs b/Assets/Scripts/Orbs/OrbSpawner.cs index 2a60bdb8078dad4c8e7f576a99a24dd6404ecc22..4b751c1a6edaebbc636fec3f7ac593da2d8653b5 100644 --- a/Assets/Scripts/Orbs/OrbSpawner.cs +++ b/Assets/Scripts/Orbs/OrbSpawner.cs @@ -1,3 +1,4 @@ +using Nightmare; using System.Collections; using System.Collections.Generic; using System.Threading; @@ -20,7 +21,7 @@ public class OrbSpawner : MonoBehaviour { timer += Time.deltaTime; - if (timer >= spawnTime) + if (timer >= spawnTime && !LevelManager.Instance.fail && !LevelManager.Instance.isShopKeeper && !LevelManager.Instance.isCinematic) { SpawnOrb(); } diff --git a/Assets/Scripts/ShopKeeper/ShopManager.cs b/Assets/Scripts/ShopKeeper/ShopManager.cs index 38209e62e7a44ca4ad8d0c8098ccb00997672018..f745d9118b01b61411626babeb0c6202005d90c9 100644 --- a/Assets/Scripts/ShopKeeper/ShopManager.cs +++ b/Assets/Scripts/ShopKeeper/ShopManager.cs @@ -8,8 +8,6 @@ using Nightmare; public class ShopManager : MonoBehaviour, IDataPersistence { public PlayerCoin coins; - public float increment = 50; - public int currentReward = 1; public TMP_Text coinUI; public ShopItemSO[] shopItemsSO; public GameObject[] shopPanelsGO; @@ -93,20 +91,6 @@ public class ShopManager : MonoBehaviour, IDataPersistence CheckPurchaseable(); } - void OnEnable() - { - if (LevelManager.Instance.currentQuest >= currentReward) - { - coins.coin += increment; - increment += 50; - - UpdateCoinsUI(); - CheckPurchaseable(); - - currentReward = LevelManager.Instance.currentQuest + 1; - } - } - void UpdateCoinsUI() { coinUI.text = coins.coin.ToString();