diff --git a/popcorn/Assets/MyGame/Resource/Animation/CountDown.anim b/popcorn/Assets/MyGame/Resource/Animation/CountDown.anim new file mode 100644 index 00000000..f11906c5 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Animation/CountDown.anim @@ -0,0 +1,268 @@ +%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: CountDown + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1.4891, y: 1.4891, z: 3.5066814} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.33333334 + value: {x: 1, y: 1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 1, y: 1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Text_countDown + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_fontColor.a + path: Text_countDown + classID: 114 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_PPtrCurves: [] + 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: 2838652788 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2838652788 + attribute: 4185109675 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + 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: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.4891 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: Text_countDown + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.4891 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: Text_countDown + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3.5066814 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: Text_countDown + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_fontColor.a + path: Text_countDown + classID: 114 + script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/popcorn/Assets/MyGame/Resource/Animation/CountDown.anim.meta b/popcorn/Assets/MyGame/Resource/Animation/CountDown.anim.meta new file mode 100644 index 00000000..e1ff4528 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Animation/CountDown.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e62a0c34e68bc4c7f8a04331de94f628 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resource/Animation/CountDown.controller b/popcorn/Assets/MyGame/Resource/Animation/CountDown.controller new file mode 100644 index 00000000..df3046b6 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Animation/CountDown.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-6635877270998937966 +AnimatorStateMachine: + serializedVersion: 5 + 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: -662039314922859782} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -662039314922859782} +--- !u!1102 &-662039314922859782 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CountDown + 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: e62a0c34e68bc4c7f8a04331de94f628, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CountDown + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -6635877270998937966} + 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} diff --git a/popcorn/Assets/MyGame/Resource/Animation/CountDown.controller.meta b/popcorn/Assets/MyGame/Resource/Animation/CountDown.controller.meta new file mode 100644 index 00000000..d77a71e0 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Animation/CountDown.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 462b66a8451c7495eafd31ec97035998 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_fence_Dither.png b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_fence_Dither.png index 925e1d7f..78021e95 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_fence_Dither.png and b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_fence_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_item_Mala.png b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_item_Mala.png index ddd8305b..7bcc77a4 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_item_Mala.png and b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_item_Mala.png differ diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/BackGround.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/BackGround.prefab index bc952500..7fedf5ca 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/BackGround.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/BackGround.prefab @@ -81,52 +81,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &6610967728638901643 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5754152980052854981} - - component: {fileID: 3646424511159473702} - m_Layer: 0 - m_Name: fence - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5754152980052854981 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6610967728638901643} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -5.43, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 3898132706768809190} - - {fileID: 6433203076001778202} - - {fileID: 1546679554045142346} - - {fileID: 5562565403561688067} - m_Father: {fileID: 6693468020679260201} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!210 &3646424511159473702 -SortingGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6610967728638901643} - m_Enabled: 1 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 3 --- !u!1 &6693468020679260202 GameObject: m_ObjectHideFlags: 0 @@ -159,7 +113,7 @@ Transform: - {fileID: 1723748830347897422} - {fileID: 835325393001496006} - {fileID: 4011736666950912259} - - {fileID: 5754152980052854981} + - {fileID: 3898132706768809190} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -457,173 +411,33 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1001 &2625948555077840102 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 5754152980052854981} - m_Modifications: - - target: {fileID: 3369490898853473183, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_SortingOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 7298026551172620012, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_Name - value: fence (3) - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalPosition.x - value: 6.6000004 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalPosition.y - value: 4.1600003 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7fa52d20820d0f84a9218625917a643a, type: 3} ---- !u!4 &5562565403561688067 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - m_PrefabInstance: {fileID: 2625948555077840102} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &3459988905682524927 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 5754152980052854981} - m_Modifications: - - target: {fileID: 3369490898853473183, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_SortingOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 7298026551172620012, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_Name - value: fence (1) - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalPosition.x - value: -2.1900005 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalPosition.y - value: 4.1600003 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7fa52d20820d0f84a9218625917a643a, type: 3} ---- !u!4 &6433203076001778202 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - m_PrefabInstance: {fileID: 3459988905682524927} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6871365500090186755 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 5754152980052854981} + m_TransformParent: {fileID: 6693468020679260201} m_Modifications: + - target: {fileID: 3369490898853473183, guid: 7fa52d20820d0f84a9218625917a643a, + type: 3} + propertyPath: m_Size.x + value: 17.46 + objectReference: {fileID: 0} + - target: {fileID: 3369490898853473183, guid: 7fa52d20820d0f84a9218625917a643a, + type: 3} + propertyPath: m_Size.y + value: 3.4 + objectReference: {fileID: 0} + - target: {fileID: 3369490898853473183, guid: 7fa52d20820d0f84a9218625917a643a, + type: 3} + propertyPath: m_DrawMode + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3369490898853473183, guid: 7fa52d20820d0f84a9218625917a643a, + type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} - target: {fileID: 7298026551172620012, guid: 7fa52d20820d0f84a9218625917a643a, type: 3} propertyPath: m_Name @@ -632,17 +446,27 @@ PrefabInstance: - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, type: 3} propertyPath: m_RootOrder - value: 0 + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, + type: 3} + propertyPath: m_LocalScale.x + value: 1.01 + objectReference: {fileID: 0} + - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, + type: 3} + propertyPath: m_LocalScale.y + value: 1 objectReference: {fileID: 0} - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, type: 3} propertyPath: m_LocalPosition.x - value: -6.5699997 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, type: 3} propertyPath: m_LocalPosition.y - value: 4.1600003 + value: -1.2699995 objectReference: {fileID: 0} - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, type: 3} @@ -767,83 +591,3 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7747817936090880844} m_PrefabAsset: {fileID: 0} ---- !u!1001 &8950311979529991599 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 5754152980052854981} - m_Modifications: - - target: {fileID: 3369490898853473183, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_SortingOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 7298026551172620012, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_Name - value: fence (2) - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalPosition.x - value: 2.12 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalPosition.y - value: 4.1600003 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7fa52d20820d0f84a9218625917a643a, type: 3} ---- !u!4 &1546679554045142346 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7584921105269690597, guid: 7fa52d20820d0f84a9218625917a643a, - type: 3} - m_PrefabInstance: {fileID: 8950311979529991599} - m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Header.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Header.prefab index 55d4fe51..98c49e15 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Header.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Header.prefab @@ -346,6 +346,196 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 100 +--- !u!1 &2570823429725665912 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7957151030862449602} + - component: {fileID: 7090706454885209789} + - component: {fileID: 6898933620753137981} + m_Layer: 5 + m_Name: Text_countDown + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7957151030862449602 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2570823429725665912} + 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: 2.3549} + m_Children: [] + m_Father: {fileID: 1812783774180679619} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7090706454885209789 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2570823429725665912} + m_CullTransparentMesh: 0 +--- !u!114 &6898933620753137981 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2570823429725665912} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 1 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 1ecb91d9b4f7d1b4d9ac80b14e928555, type: 2} + m_sharedMaterial: {fileID: 5374284371091958195, guid: 1ecb91d9b4f7d1b4d9ac80b14e928555, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 300 + m_fontSizeBase: 300 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + 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_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &3654461001691508598 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1812783774180679619} + - component: {fileID: 8834137657701799390} + m_Layer: 5 + m_Name: CountDown + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1812783774180679619 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3654461001691508598} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7957151030862449602} + m_Father: {fileID: 7328251774731631637} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 457} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &8834137657701799390 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3654461001691508598} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 462b66a8451c7495eafd31ec97035998, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &7328251774731631636 GameObject: m_ObjectHideFlags: 0 @@ -377,6 +567,7 @@ RectTransform: - {fileID: 1458058295471017775} - {fileID: 7328251775215910466} - {fileID: 7328251775992443661} + - {fileID: 1812783774180679619} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}