diff --git a/Assets/01.Scenes/01.Tycoon 1.unity b/Assets/01.Scenes/01.Tycoon 1.unity index 633fb8e01..5b6857652 100644 --- a/Assets/01.Scenes/01.Tycoon 1.unity +++ b/Assets/01.Scenes/01.Tycoon 1.unity @@ -1320,6 +1320,56 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 79484690} m_CullTransparentMesh: 1 +--- !u!1 &84791068 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 84791069} + - component: {fileID: 84791070} + m_Layer: 5 + m_Name: Upgrade_Popup + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &84791069 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 84791068} + 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: 284074492} + - {fileID: 1659979968} + m_Father: {fileID: 1049919592} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &84791070 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 84791068} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 53190759a9125774885ff29574bb98c0, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &88262797 GameObject: m_ObjectHideFlags: 0 @@ -2110,6 +2160,152 @@ MonoBehaviour: - {fileID: 121952, guid: 720348da784b8fa49a7c48365da6f1b1, type: 3} - {fileID: 162630, guid: f40d1072f56eeb04f9c104b7c4a8811f, type: 3} m_position: 0 +--- !u!1 &164608977 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 164608978} + - component: {fileID: 164608981} + - component: {fileID: 164608980} + - component: {fileID: 164608979} + - component: {fileID: 164608982} + m_Layer: 0 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &164608978 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 164608977} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1045027505} + m_Father: {fileID: 1345348643} + 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: 400, y: -300} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &164608979 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 164608977} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 164608980} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 164608982} + m_TargetAssemblyTypeName: Test_Title, Assembly-CSharp + m_MethodName: LoadSceneCoroutine + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: 00.TycoonTitle + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &164608980 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 164608977} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 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!222 &164608981 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 164608977} + m_CullTransparentMesh: 1 +--- !u!114 &164608982 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 164608977} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d6cc9dc07f6002a469a3d66a70755ed3, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &166220739 GameObject: m_ObjectHideFlags: 0 @@ -3503,6 +3699,118 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &284074491 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 284074492} + - component: {fileID: 284074496} + - component: {fileID: 284074495} + - component: {fileID: 284074494} + - component: {fileID: 284074493} + m_Layer: 5 + m_Name: BackgroundPaper + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &284074492 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 284074491} + 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: 84791069} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1000, y: 600} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &284074493 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 284074491} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 17488a2bea6f4126a7877ce5d934f865, type: 3} + m_Name: + m_EditorClassIdentifier: + _animator: {fileID: 284074494} +--- !u!95 &284074494 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 284074491} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 321b6014bde8a4d44aa6a3c1200a26cc, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &284074495 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 284074491} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &284074496 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 284074491} + m_CullTransparentMesh: 1 --- !u!1001 &308211526 PrefabInstance: m_ObjectHideFlags: 0 @@ -5612,7 +5920,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -230} + m_AnchoredPosition: {x: 0, y: -230.00002} m_SizeDelta: {x: -80, y: -540} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &526767281 @@ -6251,6 +6559,152 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 578755295} m_CullTransparentMesh: 1 +--- !u!1 &586688527 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 586688528} + - component: {fileID: 586688531} + - component: {fileID: 586688530} + - component: {fileID: 586688529} + - component: {fileID: 586688532} + m_Layer: 0 + m_Name: Retry + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &586688528 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 586688527} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1065266035} + m_Father: {fileID: 1345348643} + 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: -400, y: -300} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &586688529 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 586688527} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 586688530} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 586688532} + m_TargetAssemblyTypeName: Test_Retry, Assembly-CSharp + m_MethodName: RestartCurrentScene + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: 01.Tycoon 1 + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &586688530 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 586688527} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 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!222 &586688531 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 586688527} + m_CullTransparentMesh: 1 +--- !u!114 &586688532 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 586688527} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5628d889f0b759a47a296d5f332cdad5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &593921700 GameObject: m_ObjectHideFlags: 0 @@ -8288,7 +8742,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -10364,6 +10818,142 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bbb4e96b2ebafc246b85623c547a7d01, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1045027504 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1045027505} + - component: {fileID: 1045027507} + - component: {fileID: 1045027506} + m_Layer: 0 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1045027505 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1045027504} + 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: 164608978} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1045027506 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1045027504} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Title + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1045027507 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1045027504} + m_CullTransparentMesh: 1 --- !u!1 &1049919588 GameObject: m_ObjectHideFlags: 0 @@ -10474,6 +11064,7 @@ RectTransform: - {fileID: 186139408} - {fileID: 1345348643} - {fileID: 2055805161} + - {fileID: 84791069} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -10651,6 +11242,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1058006973} m_CullTransparentMesh: 1 +--- !u!1 &1065266034 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1065266035} + - component: {fileID: 1065266037} + - component: {fileID: 1065266036} + m_Layer: 0 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1065266035 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1065266034} + 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: 586688528} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1065266036 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1065266034} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Retry + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1065266037 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1065266034} + m_CullTransparentMesh: 1 --- !u!1 &1070845212 GameObject: m_ObjectHideFlags: 0 @@ -13950,13 +14677,14 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1345348643} + - component: {fileID: 1345348644} m_Layer: 0 m_Name: GameOverUi m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1345348643 RectTransform: m_ObjectHideFlags: 0 @@ -13974,6 +14702,8 @@ RectTransform: - {fileID: 1384958544} - {fileID: 2089294976} - {fileID: 835255952} + - {fileID: 586688528} + - {fileID: 164608978} m_Father: {fileID: 1049919592} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -13981,6 +14711,22 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1345348644 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1345348642} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3cd3ae36070b87f43897030288198ece, type: 3} + m_Name: + m_EditorClassIdentifier: + shakeAmount: 0.1 + shakeLimit: 10 + fallSpeed: 200 + shakeInterval: 0.01 --- !u!1 &1350109858 GameObject: m_ObjectHideFlags: 0 @@ -14804,7 +15550,6 @@ GameObject: - component: {fileID: 1384958544} - component: {fileID: 1384958547} - component: {fileID: 1384958546} - - component: {fileID: 1384958545} m_Layer: 0 m_Name: Ship m_TagString: Untagged @@ -14831,22 +15576,6 @@ RectTransform: m_AnchoredPosition: {x: -50, y: 50} m_SizeDelta: {x: 900, y: 900} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1384958545 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1384958543} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3cd3ae36070b87f43897030288198ece, type: 3} - m_Name: - m_EditorClassIdentifier: - shakeAmount: 1 - shakeLimit: 10 - fallSpeed: 200 - shakeInterval: 0.02 --- !u!114 &1384958546 MonoBehaviour: m_ObjectHideFlags: 0 @@ -18396,6 +19125,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1658965175} m_CullTransparentMesh: 1 +--- !u!1 &1659979967 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1659979968} + - component: {fileID: 1659979970} + - component: {fileID: 1659979969} + m_Layer: 5 + m_Name: Information + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1659979968 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1659979967} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 84791069} + 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: 1000, y: 1000} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1659979969 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1659979967} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: ea9a47744b51f7b46958a79a03d0cca6, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1659979970 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1659979967} + m_CullTransparentMesh: 1 --- !u!1001 &1660733460 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/02.Scripts/Tycoon/TycoonGameOver.cs b/Assets/02.Scripts/Tycoon/TycoonGameOver.cs index fa08ac0b7..3902bfeb6 100644 --- a/Assets/02.Scripts/Tycoon/TycoonGameOver.cs +++ b/Assets/02.Scripts/Tycoon/TycoonGameOver.cs @@ -1,10 +1,16 @@ using System.Collections; +using System.Drawing; +using BehaviorDesigner.Runtime.Tasks.Unity.UnityTransform; +using BlueWater.Audios; using UnityEngine; +using Sirenix.OdinInspector; +using Color = UnityEngine.Color; +using Image = UnityEngine.UI.Image; public class TycoonGameOver : MonoBehaviour { // RectTransform을 통해 UI 오브젝트 위치를 제어 - private RectTransform rectTransform; + private RectTransform _shipRectTransform; // 흔들림 강도와 범위 설정 public float shakeAmount = 0.1f; // 흔들림 강도 @@ -24,13 +30,34 @@ public class TycoonGameOver : MonoBehaviour private Vector2 originalPosition; private Vector2 shakeOffset; private float shakeTimer = 0f; // 흔들림 타이머 + private Color originalColor; // 원래 색상 저장 + private GameObject _ship; + private Image _text; + + private GameObject _titleBtn; + private GameObject _retryBtn; + void Start() { - // RectTransform 가져오기 - rectTransform = GetComponent(); - originalPosition = rectTransform.anchoredPosition; + _ship = transform.Find("Ship").gameObject; + _text = transform.Find("Text").GetComponent(); + _titleBtn = transform.Find("Title").gameObject; + _retryBtn = transform.Find("Retry").gameObject; + + originalColor = _text.color; // 원래 색상 저장 (투명도 포함) + //_ship = GetComponent.Find(""); + //AudioManager.Instance.SetMasterVolume(1.0f); + + // RectTransform 가져오기 + _shipRectTransform = _ship.GetComponent(); + originalPosition = _shipRectTransform.anchoredPosition; + } + + [Button("게임오버 시작")] + public void GameOver_Start() + { // 코루틴 시작 StartCoroutine(MoveObject()); } @@ -49,13 +76,34 @@ public class TycoonGameOver : MonoBehaviour // 그 후 5.0초 동안은 흔들리며 밑으로 내려감 timer = 0f; + + // 이미지의 초기 색상과 알파값을 0으로 설정 + Color imageColor = _text.color; + imageColor.a = 0f; + _text.color = imageColor; + + float elapsedTime = 0f; + while (timer < fallDuration) { + elapsedTime += Time.deltaTime; + imageColor.a = Mathf.Clamp01(elapsedTime / fallDuration); + _text.color = imageColor; + MoveDown(); ShakeObject(); timer += Time.deltaTime; + + _titleBtn.SetActive(true); + _retryBtn.SetActive(true); + yield return null; // 다음 프레임까지 대기 } + + // 최종적으로 알파값을 1로 설정 (완전히 불투명하게) + imageColor.a = 1f; + _text.color = imageColor; + } // 흔들림 구현 함수 @@ -78,7 +126,7 @@ public class TycoonGameOver : MonoBehaviour } // 현재 오브젝트의 좌표를 흔들림 값으로 업데이트 - rectTransform.anchoredPosition = originalPosition + shakeOffset; + _shipRectTransform.anchoredPosition = originalPosition + shakeOffset; } // 밑으로 내려가는 함수 @@ -88,7 +136,7 @@ public class TycoonGameOver : MonoBehaviour originalPosition.y -= fallSpeed * Time.deltaTime; // 현재 오브젝트 위치도 업데이트 - rectTransform.anchoredPosition = originalPosition+ shakeOffset; + _shipRectTransform.anchoredPosition = originalPosition+ shakeOffset; } - + } \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/Upgrade_Popup.cs b/Assets/02.Scripts/Ui/Tycoon/Upgrade_Popup.cs new file mode 100644 index 000000000..8a274e708 --- /dev/null +++ b/Assets/02.Scripts/Ui/Tycoon/Upgrade_Popup.cs @@ -0,0 +1,16 @@ +using UnityEngine; + +public class Upgrade_Popup : MonoBehaviour +{ + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/02.Scripts/Ui/Tycoon/Upgrade_Popup.cs.meta b/Assets/02.Scripts/Ui/Tycoon/Upgrade_Popup.cs.meta new file mode 100644 index 000000000..af51c2b3b --- /dev/null +++ b/Assets/02.Scripts/Ui/Tycoon/Upgrade_Popup.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 53190759a9125774885ff29574bb98c0 \ No newline at end of file diff --git a/Assets/02.Scripts/_Test_Retry.cs b/Assets/02.Scripts/_Test_Retry.cs new file mode 100644 index 000000000..4669ae39b --- /dev/null +++ b/Assets/02.Scripts/_Test_Retry.cs @@ -0,0 +1,14 @@ +using UnityEngine; +using UnityEngine.SceneManagement; + +public class Test_Retry : MonoBehaviour +{ + // 이 함수는 버튼에 연결될 함수입니다. + public void RestartCurrentScene() + { + // 현재 활성화된 씬의 이름을 가져옵니다. + string currentSceneName = SceneManager.GetActiveScene().name; + // 씬을 다시 로드합니다. + SceneManager.LoadScene(currentSceneName); + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/_Test_Retry.cs.meta b/Assets/02.Scripts/_Test_Retry.cs.meta new file mode 100644 index 000000000..0a93faf03 --- /dev/null +++ b/Assets/02.Scripts/_Test_Retry.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 5628d889f0b759a47a296d5f332cdad5 \ No newline at end of file diff --git a/Assets/02.Scripts/_Test_Title.cs b/Assets/02.Scripts/_Test_Title.cs new file mode 100644 index 000000000..b12f3d401 --- /dev/null +++ b/Assets/02.Scripts/_Test_Title.cs @@ -0,0 +1,10 @@ +using UnityEngine; +using UnityEngine.SceneManagement; + +public class Test_Title : MonoBehaviour +{ + public void LoadSceneCoroutine(string sceneName) + { + SceneManager.LoadScene(sceneName); + } +} diff --git a/Assets/02.Scripts/_Test_Title.cs.meta b/Assets/02.Scripts/_Test_Title.cs.meta new file mode 100644 index 000000000..99c5fbe8a --- /dev/null +++ b/Assets/02.Scripts/_Test_Title.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: d6cc9dc07f6002a469a3d66a70755ed3 \ No newline at end of file diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/CardUpgradeSprite.png b/Assets/03.Images/Ui/Tycoon/Loglike/CardUpgradeSprite.png new file mode 100644 index 000000000..c626fab79 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/CardUpgradeSprite.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/CardUpgradeSprite.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/CardUpgradeSprite.png.meta new file mode 100644 index 000000000..9c3c2404e --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/CardUpgradeSprite.png.meta @@ -0,0 +1,646 @@ +fileFormatVersion: 2 +guid: b11ff3cf4cd558e45ba44a568cbec05e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: CardUpgradeSprite_0 + rect: + serializedVersion: 2 + x: 0 + y: 4320 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c8db6cc448f395643ac2b83466a17756 + internalID: -514270279 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: CardUpgradeSprite_1 + rect: + serializedVersion: 2 + x: 1920 + y: 4320 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9787d63091ad4a6418a173fa98081aa0 + internalID: 2029891232 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: CardUpgradeSprite_2 + rect: + serializedVersion: 2 + x: 3840 + y: 4320 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8dd8479a95cab4f448b9d4e25d4d191b + internalID: -412110272 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: CardUpgradeSprite_3 + rect: + serializedVersion: 2 + x: 5760 + y: 4320 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e7ba6c117d412b140982d43166d9a680 + internalID: -1542280465 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: CardUpgradeSprite_4 + rect: + serializedVersion: 2 + x: 7680 + y: 4320 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c6bfaca0ca8c9b04d851619ff88d8df9 + internalID: -2081813130 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: CardUpgradeSprite_5 + rect: + serializedVersion: 2 + x: 0 + y: 3240 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1f8510966f1233544bd4d8de27045142 + internalID: 1792130637 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: CardUpgradeSprite_6 + rect: + serializedVersion: 2 + x: 1920 + y: 3240 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 986bf4e2201699e4cb87e1d73f605f47 + internalID: -1812076872 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: CardUpgradeSprite_7 + rect: + serializedVersion: 2 + x: 3840 + y: 3240 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6853eb4d083ed4f42a0d3b43fb5b08b0 + internalID: 886722811 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: CardUpgradeSprite_8 + rect: + serializedVersion: 2 + x: 5760 + y: 3240 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2450fea27bf21cf4d960c8b473ebd0d9 + internalID: 1413906995 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: CardUpgradeSprite_9 + rect: + serializedVersion: 2 + x: 7680 + y: 3240 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 417745c63d348304d9a89c1501c6f32f + internalID: 1247144302 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: CardUpgradeSprite_10 + rect: + serializedVersion: 2 + x: 0 + y: 2160 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: dde5e6b0ff4556d4a866a3d1163024cc + internalID: 1877791573 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: CardUpgradeSprite_11 + rect: + serializedVersion: 2 + x: 1920 + y: 2160 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 76a8ca4bab6a5c54cb3ead4b211be4e7 + internalID: -1962258449 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: CardUpgradeSprite_12 + rect: + serializedVersion: 2 + x: 3840 + y: 2160 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 558db8a4502c4f4438e820402e11ec19 + internalID: 301147385 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: CardUpgradeSprite_13 + rect: + serializedVersion: 2 + x: 5760 + y: 2160 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a78dff3d8d7999c4e8ab40a34ffaa880 + internalID: -401079672 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: CardUpgradeSprite_14 + rect: + serializedVersion: 2 + x: 7680 + y: 2160 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 90811b8a4f4a857489825d1f1ed6bf42 + internalID: 1932084080 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: CardUpgradeSprite_15 + rect: + serializedVersion: 2 + x: 0 + y: 1080 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1b11dd63ba5dea748a62019472c61126 + internalID: 382302681 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: CardUpgradeSprite_16 + rect: + serializedVersion: 2 + x: 1920 + y: 1080 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e5952c03768fdc34da57bd4640c60897 + internalID: 1256381956 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: CardUpgradeSprite_17 + rect: + serializedVersion: 2 + x: 3840 + y: 1080 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2e175636accf8a944ba84cd4965c9362 + internalID: 701231901 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: CardUpgradeSprite_18 + rect: + serializedVersion: 2 + x: 5760 + y: 1080 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 353ba31ff0765ed4b9dac1b0e0ead10e + internalID: -447176599 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: CardUpgradeSprite_19 + rect: + serializedVersion: 2 + x: 7680 + y: 1080 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ca294a6561731e74f9cdcc4b8aa8ff87 + internalID: -2135924175 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: CardUpgradeSprite_20 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9af59f36ce68b204dadeb421c2678b62 + internalID: 2045533380 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: CardUpgradeSprite_21 + rect: + serializedVersion: 2 + x: 1920 + y: 0 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9f49805404493984381025bc56512ba4 + internalID: 972430047 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: CardUpgradeSprite_22 + rect: + serializedVersion: 2 + x: 3840 + y: 0 + width: 1920 + height: 1080 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ef8d29f3a3801de40b9295e66c787d89 + internalID: -1139900630 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: fb094edc058ff814381b15b73d5dee90 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + CardUpgradeSprite_0: -514270279 + CardUpgradeSprite_1: 2029891232 + CardUpgradeSprite_10: 1877791573 + CardUpgradeSprite_11: -1962258449 + CardUpgradeSprite_12: 301147385 + CardUpgradeSprite_13: -401079672 + CardUpgradeSprite_14: 1932084080 + CardUpgradeSprite_15: 382302681 + CardUpgradeSprite_16: 1256381956 + CardUpgradeSprite_17: 701231901 + CardUpgradeSprite_18: -447176599 + CardUpgradeSprite_19: -2135924175 + CardUpgradeSprite_2: -412110272 + CardUpgradeSprite_20: 2045533380 + CardUpgradeSprite_21: 972430047 + CardUpgradeSprite_22: -1139900630 + CardUpgradeSprite_3: -1542280465 + CardUpgradeSprite_4: -2081813130 + CardUpgradeSprite_5: 1792130637 + CardUpgradeSprite_6: -1812076872 + CardUpgradeSprite_7: 886722811 + CardUpgradeSprite_8: 1413906995 + CardUpgradeSprite_9: 1247144302 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/UpgradePopup.png b/Assets/03.Images/Ui/Tycoon/Loglike/UpgradePopup.png new file mode 100644 index 000000000..9cb05b10f Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/UpgradePopup.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/UpgradePopup.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/UpgradePopup.png.meta new file mode 100644 index 000000000..d4c87bd3c --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/UpgradePopup.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: ea9a47744b51f7b46958a79a03d0cca6 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 1024 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/07.Animations/Uis/CardUpgrade.meta b/Assets/07.Animations/Uis/CardUpgrade.meta new file mode 100644 index 000000000..e33fda2d0 --- /dev/null +++ b/Assets/07.Animations/Uis/CardUpgrade.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: af2ef28668e4feb449e1c55a58df863f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/07.Animations/Uis/CardUpgrade/CardUpgrade.anim b/Assets/07.Animations/Uis/CardUpgrade/CardUpgrade.anim new file mode 100644 index 000000000..79dde2ea2 --- /dev/null +++ b/Assets/07.Animations/Uis/CardUpgrade/CardUpgrade.anim @@ -0,0 +1,138 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CardUpgrade + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -514270279, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - time: 0.05 + value: {fileID: 2029891232, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - time: 0.083333336 + value: {fileID: -412110272, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - time: 0.13333334 + value: {fileID: -1542280465, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - time: 0.18333334 + value: {fileID: -2081813130, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - time: 0.23333333 + value: {fileID: 1792130637, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - time: 0.26666668 + value: {fileID: -1812076872, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - time: 0.31666666 + value: {fileID: 886722811, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - time: 0.36666667 + value: {fileID: 1413906995, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - time: 0.41666666 + value: {fileID: 1247144302, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - time: 0.45 + value: {fileID: 1877791573, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - time: 0.5 + value: {fileID: -1962258449, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - time: 0.55 + value: {fileID: 301147385, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - time: 0.5833333 + value: {fileID: -401079672, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - time: 0.6333333 + value: {fileID: 1932084080, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - time: 0.68333334 + value: {fileID: 382302681, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - time: 0.73333335 + value: {fileID: 1256381956, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - time: 0.76666665 + value: {fileID: 701231901, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - time: 0.81666666 + value: {fileID: -447176599, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - time: 0.8666667 + value: {fileID: -2135924175, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - time: 0.9166667 + value: {fileID: 2045533380, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - time: 0.95 + value: {fileID: 972430047, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - time: 1 + value: {fileID: -1139900630, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + attribute: m_Sprite + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 2015549526 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -514270279, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - {fileID: 2029891232, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - {fileID: -412110272, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - {fileID: -1542280465, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - {fileID: -2081813130, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - {fileID: 1792130637, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - {fileID: -1812076872, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - {fileID: 886722811, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - {fileID: 1413906995, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - {fileID: 1247144302, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - {fileID: 1877791573, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - {fileID: -1962258449, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - {fileID: 301147385, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - {fileID: -401079672, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - {fileID: 1932084080, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - {fileID: 382302681, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - {fileID: 1256381956, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - {fileID: 701231901, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - {fileID: -447176599, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - {fileID: -2135924175, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - {fileID: 2045533380, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - {fileID: 972430047, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + - {fileID: -1139900630, guid: b11ff3cf4cd558e45ba44a568cbec05e, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.0166667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/07.Animations/Uis/CardUpgrade/CardUpgrade.anim.meta b/Assets/07.Animations/Uis/CardUpgrade/CardUpgrade.anim.meta new file mode 100644 index 000000000..ddb0aa2cb --- /dev/null +++ b/Assets/07.Animations/Uis/CardUpgrade/CardUpgrade.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9638333bc5f5e5a4c9260ca14309f58e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/07.Animations/Uis/CardUpgrade/CardUpgrade.controller b/Assets/07.Animations/Uis/CardUpgrade/CardUpgrade.controller new file mode 100644 index 000000000..efaaeb584 --- /dev/null +++ b/Assets/07.Animations/Uis/CardUpgrade/CardUpgrade.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-2278336637722815631 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 8619181993400042153} + m_Position: {x: 510, y: 150, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 320, y: 80, z: 0} + m_EntryPosition: {x: 330, y: 150, z: 0} + m_ExitPosition: {x: 730, y: 150, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 8619181993400042153} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CardUpgrade + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -2278336637722815631} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &8619181993400042153 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CardUpgrade + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + 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: 9638333bc5f5e5a4c9260ca14309f58e, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/07.Animations/Uis/CardUpgrade/CardUpgrade.controller.meta b/Assets/07.Animations/Uis/CardUpgrade/CardUpgrade.controller.meta new file mode 100644 index 000000000..fef351ca7 --- /dev/null +++ b/Assets/07.Animations/Uis/CardUpgrade/CardUpgrade.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 321b6014bde8a4d44aa6a3c1200a26cc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: