From a426055616fd5bd7d9ee1e871be97456064bd622 Mon Sep 17 00:00:00 2001 From: yangjing Date: Thu, 10 Feb 2022 17:21:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E5=8D=A1=E9=80=89=E6=8B=A9=E7=95=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIAnimation/Btn_breath.controller | 1020 +++++++++++++++++ .../UIAnimation/Btn_breath.controller.meta | 8 + Assets/Resources/UIs/PanelLevel.prefab | 838 ++++++++------ Assets/Scenes/Game.unity | 337 +++--- Assets/Scripts/Config/GameConfig.cs | 21 +- Assets/Scripts/Const/Const.Path.cs | 5 + Assets/Scripts/UI/CustomControl/ImageNum.cs | 21 + .../Scripts/UI/CustomControl/ImageNum.cs.meta | 11 + Assets/Scripts/UI/CustomControl/LevelCell.cs | 18 - .../Scripts/UI/CustomControl/LevelList.meta | 8 + .../UI/CustomControl/LevelList/LevelCell.cs | 51 + .../{ => LevelList}/LevelCell.cs.meta | 0 .../UI/CustomControl/LevelList/LevelList.cs | 28 + .../CustomControl/LevelList/LevelList.cs.meta | 11 + Assets/Scripts/UI/PanelGame.cs | 5 +- Assets/Scripts/UI/PanelLevel.cs | 44 + Assets/Scripts/UI/PanelResult.cs | 3 +- Assets/Scripts/Utils/UITools/UIListView.meta | 8 + .../Utils/UITools/UIListView/UIListCell.cs | 15 + .../UITools/UIListView/UIListCell.cs.meta | 11 + .../Utils/UITools/UIListView/UIListView.cs | 80 ++ .../UITools/UIListView/UIListView.cs.meta | 11 + 22 files changed, 1992 insertions(+), 562 deletions(-) create mode 100644 Assets/Resources/UIAnimation/Btn_breath.controller create mode 100644 Assets/Resources/UIAnimation/Btn_breath.controller.meta create mode 100644 Assets/Scripts/UI/CustomControl/ImageNum.cs create mode 100644 Assets/Scripts/UI/CustomControl/ImageNum.cs.meta delete mode 100644 Assets/Scripts/UI/CustomControl/LevelCell.cs create mode 100644 Assets/Scripts/UI/CustomControl/LevelList.meta create mode 100644 Assets/Scripts/UI/CustomControl/LevelList/LevelCell.cs rename Assets/Scripts/UI/CustomControl/{ => LevelList}/LevelCell.cs.meta (100%) create mode 100644 Assets/Scripts/UI/CustomControl/LevelList/LevelList.cs create mode 100644 Assets/Scripts/UI/CustomControl/LevelList/LevelList.cs.meta create mode 100644 Assets/Scripts/Utils/UITools/UIListView.meta create mode 100644 Assets/Scripts/Utils/UITools/UIListView/UIListCell.cs create mode 100644 Assets/Scripts/Utils/UITools/UIListView/UIListCell.cs.meta create mode 100644 Assets/Scripts/Utils/UITools/UIListView/UIListView.cs create mode 100644 Assets/Scripts/Utils/UITools/UIListView/UIListView.cs.meta diff --git a/Assets/Resources/UIAnimation/Btn_breath.controller b/Assets/Resources/UIAnimation/Btn_breath.controller new file mode 100644 index 00000000..61421245 --- /dev/null +++ b/Assets/Resources/UIAnimation/Btn_breath.controller @@ -0,0 +1,1020 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-7353509542249772473 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Selected + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4074735857500220643} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-6550896356562347483 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Selected + 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: 3676372683813760675} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-5862353822682348955 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Highlighted + 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: -2794480169887027205} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-4074735857500220643 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Selected + 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: 3676372683813760675} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-4023000535446325363 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Normal + 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: -3995971468022252890} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!74 &-3995971468022252890 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Normal + serializedVersion: 7 + 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, 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: 0.5 + value: {x: 1.1, y: 1.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: + m_FloatCurves: [] + 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: 0 + attribute: 3 + script: {fileID: 0} + typeID: 4 + 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: 1 + 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 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1.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: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1.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: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + 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: + classID: 224 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !u!74 &-3845130008473141331 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pressed + serializedVersion: 7 + 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: 0.9, y: 0.9, z: 0.9} + 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: + m_FloatCurves: [] + 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: 0 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + 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: 0.9 + 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: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.9 + 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: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.9 + 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: + classID: 224 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !u!74 &-2794480169887027205 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Highlighted + serializedVersion: 7 + 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, 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: 0.5 + value: {x: 1.1, y: 1.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: + m_FloatCurves: [] + 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: 0 + attribute: 3 + script: {fileID: 0} + typeID: 4 + 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: 1 + 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 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1.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: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1.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: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + 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: + classID: 224 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !u!1101 &-2712463217201393133 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Normal + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4023000535446325363} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.03 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 +--- !u!74 &-1987951549809271857 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Disabled + 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: [] + 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: [] + 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: 1 + 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: [] +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Btn_breath + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: Normal + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Highlighted + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Pressed + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Disabled + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Selected + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 8490674881130972859} + 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 &1468687313313257330 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pressed + 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: -3845130008473141331} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!74 &3676372683813760675 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Selected + 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: [] + 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: [] + 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: 1 + 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: [] +--- !u!1102 &4473447230574851255 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Disabled + 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: -1987951549809271857} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &4980252255939981410 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Highlighted + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -5862353822682348955} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.03 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 +--- !u!1101 &5790277781806940057 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Disabled + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4473447230574851255} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.03 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 +--- !u!1101 &8011492652575321591 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Selected + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -6550896356562347483} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.03 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &8490674881130972859 +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: -4023000535446325363} + m_Position: {x: 190, y: -70, z: 0} + - serializedVersion: 1 + m_State: {fileID: -5862353822682348955} + m_Position: {x: 340, y: 30, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1468687313313257330} + m_Position: {x: 140, y: 320, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4473447230574851255} + m_Position: {x: 340, y: 260, z: 0} + - serializedVersion: 1 + m_State: {fileID: -6550896356562347483} + m_Position: {x: 430, y: 170, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: + - {fileID: -2712463217201393133} + - {fileID: 4980252255939981410} + - {fileID: 8915774910027242989} + - {fileID: 5790277781806940057} + - {fileID: 8011492652575321591} + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: -90, y: -20, z: 0} + m_EntryPosition: {x: 200, y: -190, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -4023000535446325363} +--- !u!1101 &8915774910027242989 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Pressed + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1468687313313257330} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.03 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 diff --git a/Assets/Resources/UIAnimation/Btn_breath.controller.meta b/Assets/Resources/UIAnimation/Btn_breath.controller.meta new file mode 100644 index 00000000..cfe1ba7d --- /dev/null +++ b/Assets/Resources/UIAnimation/Btn_breath.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c5bfb2498e6764b8d93104b25bb17a6e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UIs/PanelLevel.prefab b/Assets/Resources/UIs/PanelLevel.prefab index cf0f5e5e..236a68b1 100644 --- a/Assets/Resources/UIs/PanelLevel.prefab +++ b/Assets/Resources/UIs/PanelLevel.prefab @@ -103,12 +103,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1549853547788376780} + m_Father: {fileID: 7274106814010849299} m_RootOrder: 2 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 69, y: -20} m_SizeDelta: {x: 29, y: 39} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1549853547539696656 @@ -148,145 +148,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &1549853547584295393 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1549853547584295392} - - component: {fileID: 1549853547584295422} - - component: {fileID: 1549853547584295423} - m_Layer: 5 - m_Name: Content - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1549853547584295392 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549853547584295393} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1549853547905349718} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 1} ---- !u!114 &1549853547584295422 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549853547584295393} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 ---- !u!114 &1549853547584295423 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549853547584295393} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 30 - m_Bottom: 30 - m_ChildAlignment: 4 - m_StartCorner: 0 - m_StartAxis: 0 - m_CellSize: {x: 150, y: 150} - m_Spacing: {x: 0, y: 20} - m_Constraint: 0 - m_ConstraintCount: 4 ---- !u!1 &1549853547788376781 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1549853547788376780} - - component: {fileID: 1549853547788376779} - m_Layer: 5 - m_Name: Number - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1549853547788376780 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549853547788376781} - 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: 1549853548418705246} - - {fileID: 1549853549197227371} - - {fileID: 1549853547539696658} - m_Father: {fileID: 1549853548759154686} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50, y: -10} - m_SizeDelta: {x: 100, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1549853547788376779 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549853547788376781} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 4 - m_Spacing: -10 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 --- !u!1 &1549853547845650294 GameObject: m_ObjectHideFlags: 0 @@ -322,7 +183,7 @@ RectTransform: 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: 880, y: 1420} + m_SizeDelta: {x: 900, y: 1500} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1549853547845650291 CanvasRenderer: @@ -386,14 +247,14 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1549853547891824686} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 1549853547994234810} - {fileID: 1549853547358536702} - m_Father: {fileID: 1549853548759154686} - m_RootOrder: 1 + m_Father: {fileID: 1549853548948624558} + 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} @@ -437,80 +298,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &1549853547897278288 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1549853547897278319} - - component: {fileID: 1549853547897278317} - - component: {fileID: 1549853547897278318} - m_Layer: 5 - m_Name: Img_ProgressBar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1549853547897278319 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549853547897278288} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1549853548759154686} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 39} - m_SizeDelta: {x: 107, y: 21} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1549853547897278317 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549853547897278288} - m_CullTransparentMesh: 0 ---- !u!114 &1549853547897278318 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549853547897278288} - 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: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 99e924a27f2d04eeb823d8dd0d478875, type: 3} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 0 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &1549853547905349719 GameObject: m_ObjectHideFlags: 0 @@ -541,8 +328,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1549853547584295392} - m_Father: {fileID: 1549853549297517292} + - {fileID: 7274106814343902015} + m_Father: {fileID: 7274106815721414707} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -636,7 +423,7 @@ RectTransform: 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: 880, y: 1420} + m_SizeDelta: {x: 2000, y: 2000} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1549853547933002479 CanvasRenderer: @@ -896,12 +683,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1549853547788376780} + m_Father: {fileID: 7274106814010849299} m_RootOrder: 0 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 31, y: -20} m_SizeDelta: {x: 29, y: 39} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1549853548418705244 @@ -972,7 +759,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1549853549434864437} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -1068,13 +855,14 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1549853548759154686} + - component: {fileID: 7274106815003640832} m_Layer: 5 m_Name: Tpl_LevelCell m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1549853548759154686 RectTransform: m_ObjectHideFlags: 0 @@ -1087,18 +875,33 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1549853548948624558} - - {fileID: 1549853547891824685} - - {fileID: 1549853547788376780} - - {fileID: 1549853549092898970} - - {fileID: 1549853547897278319} - m_Father: {fileID: 1549853549434864437} - m_RootOrder: 3 + m_Father: {fileID: 7274106815726529936} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -120.00001} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7274106815003640832 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1549853548759154687} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e589fd1db4863417d81be566c2027e60, type: 3} + m_Name: + m_EditorClassIdentifier: + mBtnBg: {fileID: 1549853548948624557} + mInmLevel: {fileID: 7274106814730485970} + mImgIconBg: {fileID: 1549853547891824684} + mImgIcon: {fileID: 1549853547358536701} + mGobDone: {fileID: 1549853547994234811} + mGobComplete: {fileID: 7274106816053439044} + mImgProgress: {fileID: 7274106814941670833} --- !u!1 &1549853548948624559 GameObject: m_ObjectHideFlags: 0 @@ -1111,8 +914,10 @@ GameObject: - component: {fileID: 1549853548948624555} - component: {fileID: 1549853548948624556} - component: {fileID: 1549853548948624557} + - component: {fileID: 240536531425399772} + - component: {fileID: 240536531425399773} m_Layer: 5 - m_Name: BG + m_Name: Btn_Bg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1128,7 +933,11 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 1549853547891824685} + - {fileID: 7274106814010849299} + - {fileID: 7274106816053439045} + - {fileID: 7274106814941670832} m_Father: {fileID: 1549853548759154686} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1192,7 +1001,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + 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} @@ -1217,80 +1026,37 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!1 &1549853549092898971 -GameObject: +--- !u!95 &240536531425399772 +Animator: + serializedVersion: 3 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1549853549092898970} - - component: {fileID: 1549853549092898968} - - component: {fileID: 1549853549092898969} - m_Layer: 5 - m_Name: Go_Complete - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1549853549092898970 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549853549092898971} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1549853548759154686} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -36, y: -25} - m_SizeDelta: {x: 61, y: 65} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1549853549092898968 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549853549092898971} - m_CullTransparentMesh: 0 ---- !u!114 &1549853549092898969 + m_GameObject: {fileID: 1549853548948624559} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 7c5794036b4624dd7a0d12e3ceb6bb4a, 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!114 &240536531425399773 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549853549092898971} + m_GameObject: {fileID: 1549853548948624559} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 791356b2c7d5c444980c1472ffa8f1ff, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 83e86ecb7fe7d4c84adf9e0882c0b40e, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &1549853549197227372 GameObject: m_ObjectHideFlags: 0 @@ -1320,12 +1086,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1549853547788376780} + m_Father: {fileID: 7274106814010849299} m_RootOrder: 1 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 50, y: -20} m_SizeDelta: {x: 29, y: 39} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1549853549197227369 @@ -1365,7 +1131,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &1549853549297517293 +--- !u!1 &1549853549434864438 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1373,52 +1139,350 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1549853549297517292} - - component: {fileID: 1549853549297517289} - - component: {fileID: 1549853549297517290} - - component: {fileID: 1549853549297517291} + - component: {fileID: 1549853549434864437} + - component: {fileID: 2134253801646824259} + - component: {fileID: 923398011} m_Layer: 5 - m_Name: Scroll View + m_Name: PanelLevel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1549853549297517292 +--- !u!224 &1549853549434864437 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549853549297517293} + m_GameObject: {fileID: 1549853549434864438} 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: 1549853547905349718} - m_Father: {fileID: 1549853549434864437} - m_RootOrder: 1 + - {fileID: 1549853547933002449} + - {fileID: 7274106815726529936} + - {fileID: 1549853548048420531} + - {fileID: 1549853548561325181} + m_Father: {fileID: 0} + m_RootOrder: 0 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: 120.29999} - m_SizeDelta: {x: 0, y: -400.6} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1549853549297517289 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549853549297517293} - m_CullTransparentMesh: 0 ---- !u!114 &1549853549297517290 +--- !u!114 &2134253801646824259 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549853549297517293} + m_GameObject: {fileID: 1549853549434864438} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2e9cc35539f7641c388c46189f4a1e96, type: 3} + m_Name: + m_EditorClassIdentifier: + mBtnBack: {fileID: 1549853548048420530} + mBtnBackToMain: {fileID: 1549853548561325180} + mLvList: {fileID: 1357238547523903181} +--- !u!114 &923398011 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1549853549434864438} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2fc7dc4f2dbf74088998b4077cae77cd, type: 3} + m_Name: + m_EditorClassIdentifier: + OffsetY: 65 +--- !u!1 &7274106814010849298 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7274106814010849299} + - component: {fileID: 7274106814010849300} + - component: {fileID: 7274106814730485970} + m_Layer: 5 + m_Name: Inm_Level + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7274106814010849299 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7274106814010849298} + 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: 1549853548418705246} + - {fileID: 1549853549197227371} + - {fileID: 1549853547539696658} + m_Father: {fileID: 1549853548948624558} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 71, y: -37} + m_SizeDelta: {x: 100, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7274106814010849300 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7274106814010849298} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: -10 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 +--- !u!114 &7274106814730485970 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7274106814010849298} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5684c0a0e8754b99bc58afde52624b3, type: 3} + m_Name: + m_EditorClassIdentifier: + mImgOnes: {fileID: 1549853547539696657} + mImgTens: {fileID: 1549853549197227370} + mImgHundreds: {fileID: 1549853548418705245} +--- !u!1 &7274106814343902014 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7274106814343902015} + - component: {fileID: 7274106814343901985} + - component: {fileID: 7274106814343901984} + m_Layer: 5 + m_Name: Ctn_Levels + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7274106814343902015 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7274106814343902014} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1549853547905349718} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &7274106814343901985 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7274106814343902014} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &7274106814343901984 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7274106814343902014} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 30 + m_Bottom: 30 + m_ChildAlignment: 4 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 150, y: 150} + m_Spacing: {x: 0, y: 20} + m_Constraint: 0 + m_ConstraintCount: 4 +--- !u!1 &7274106814941670799 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7274106814941670832} + - component: {fileID: 7274106814941670834} + - component: {fileID: 7274106814941670833} + m_Layer: 5 + m_Name: Img_Progress + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7274106814941670832 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7274106814941670799} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1549853548948624558} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 66} + m_SizeDelta: {x: 107, y: 21} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7274106814941670834 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7274106814941670799} + m_CullTransparentMesh: 0 +--- !u!114 &7274106814941670833 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7274106814941670799} + 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: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 99e924a27f2d04eeb823d8dd0d478875, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 0 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7274106815721414706 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7274106815721414707} + - component: {fileID: 7274106815721414710} + - component: {fileID: 7274106815721414709} + - component: {fileID: 7274106815721414708} + m_Layer: 5 + m_Name: ScrollView + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7274106815721414707 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7274106815721414706} + 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: 1549853547905349718} + m_Father: {fileID: 7274106815726529936} + m_RootOrder: 0 + 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.2999878} + m_SizeDelta: {x: 0, y: -0.6000061} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7274106815721414710 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7274106815721414706} + m_CullTransparentMesh: 0 +--- !u!114 &7274106815721414709 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7274106815721414706} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -1441,19 +1505,19 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &1549853549297517291 +--- !u!114 &7274106815721414708 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549853549297517293} + m_GameObject: {fileID: 7274106815721414706} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} m_Name: m_EditorClassIdentifier: - m_Content: {fileID: 1549853547584295392} + m_Content: {fileID: 7274106814343902015} m_Horizontal: 0 m_Vertical: 1 m_MovementType: 1 @@ -1471,7 +1535,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] ---- !u!1 &1549853549434864438 +--- !u!1 &7274106815726529647 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1479,35 +1543,121 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1549853549434864437} + - component: {fileID: 7274106815726529936} + - component: {fileID: 1357238547523903181} m_Layer: 5 - m_Name: PanelLevel + m_Name: LevelList m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1549853549434864437 +--- !u!224 &7274106815726529936 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549853549434864438} + m_GameObject: {fileID: 7274106815726529647} 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: 1549853547933002449} - - {fileID: 1549853549297517292} - - {fileID: 1549853548048420531} + - {fileID: 7274106815721414707} - {fileID: 1549853548759154686} - - {fileID: 1549853548561325181} - m_Father: {fileID: 0} - m_RootOrder: 0 + m_Father: {fileID: 1549853549434864437} + m_RootOrder: 1 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_AnchoredPosition: {x: 0, y: 120} + m_SizeDelta: {x: 0, y: -400} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1357238547523903181 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7274106815726529647} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a46c284f255c46569f976045d5ccae9, type: 3} + m_Name: + m_EditorClassIdentifier: + mTplCell: {fileID: 1549853548759154687} + mCtnCells: {fileID: 7274106814343902015} +--- !u!1 &7274106816053439044 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7274106816053439045} + - component: {fileID: 7274106816053439047} + - component: {fileID: 7274106816053439046} + m_Layer: 5 + m_Name: Gob_Complete + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7274106816053439045 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7274106816053439044} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1549853548948624558} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -57.000004, y: -52.000004} + m_SizeDelta: {x: 61, y: 65} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7274106816053439047 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7274106816053439044} + m_CullTransparentMesh: 0 +--- !u!114 &7274106816053439046 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7274106816053439044} + 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: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 83e86ecb7fe7d4c84adf9e0882c0b40e, 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 diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index e7e26277..617c20e7 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -271,12 +271,6 @@ Transform: m_Father: {fileID: 493959136} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!224 &923398010 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - m_PrefabInstance: {fileID: 1549853548646788175} - m_PrefabAsset: {fileID: 0} --- !u!1 &981190535 GameObject: m_ObjectHideFlags: 0 @@ -309,7 +303,7 @@ RectTransform: - {fileID: 7676866811056894034} - {fileID: 987875187} - {fileID: 1714038173902949465} - - {fileID: 923398010} + - {fileID: 8174312654083100069} m_Father: {fileID: 1041748534} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -538,195 +532,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1001 &1549853548646788175 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 981190536} - m_Modifications: - - target: {fileID: 1549853547539696658, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1549853547539696658, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1549853547539696658, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 69 - objectReference: {fileID: 0} - - target: {fileID: 1549853547539696658, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 1549853547584295392, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_SizeDelta.y - value: 40 - objectReference: {fileID: 0} - - target: {fileID: 1549853548418705246, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1549853548418705246, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1549853548418705246, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 31 - objectReference: {fileID: 0} - - target: {fileID: 1549853548418705246, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 1549853549197227371, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1549853549197227371, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1549853549197227371, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 50 - objectReference: {fileID: 0} - - target: {fileID: 1549853549197227371, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864438, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_Name - value: PanelLevel - objectReference: {fileID: 0} - - target: {fileID: 1549853549434864438, guid: 30cc95837c5a74b1ca4757bb85a4abfa, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 30cc95837c5a74b1ca4757bb85a4abfa, type: 3} --- !u!224 &1714038173902949465 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 539047986927620545, guid: 25cbbba289b6a49d6916bc6215534770, @@ -900,6 +705,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 414 objectReference: {fileID: 0} + - target: {fileID: 5510529009573689666, guid: 841ca4be8d96342da81473d244f04f57, + type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 9100000, guid: c5bfb2498e6764b8d93104b25bb17a6e, type: 2} - target: {fileID: 6887168215451146749, guid: 841ca4be8d96342da81473d244f04f57, type: 3} propertyPath: m_AnchorMax.y @@ -1068,6 +878,141 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1969282075732289138} m_PrefabAsset: {fileID: 0} +--- !u!224 &8174312654083100069 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + m_PrefabInstance: {fileID: 8225385738963814813} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &8225385738963814813 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 981190536} + m_Modifications: + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864438, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_Name + value: PanelLevel + objectReference: {fileID: 0} + - target: {fileID: 1549853549434864438, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7274106814343902015, guid: 30cc95837c5a74b1ca4757bb85a4abfa, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 30cc95837c5a74b1ca4757bb85a4abfa, type: 3} --- !u!1001 &9049642900195122466 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Config/GameConfig.cs b/Assets/Scripts/Config/GameConfig.cs index a9e41fd6..76c899b2 100644 --- a/Assets/Scripts/Config/GameConfig.cs +++ b/Assets/Scripts/Config/GameConfig.cs @@ -27,6 +27,7 @@ public class LevelData { int tEndingID = -1; + //first check accurately for (int i = 0; i < Endings.Count; i++) { if (Endings[i].IsMatching(pEndingStr)) @@ -36,6 +37,19 @@ public class LevelData } } + //if no match,check with X + if (tEndingID == -1) + { + for (int i = 0; i < Endings.Count; i++) + { + if (Endings[i].IsMatching(pEndingStr, true)) + { + tEndingID = i; + break; + } + } + } + return tEndingID; } } @@ -47,13 +61,18 @@ public class EndingData public bool IsGoodEnding; public string EndingCode;//eg: 12X;132; - public bool IsMatching(string pEndingStr) + public bool IsMatching(string pEndingStr, bool pWithX = false) { bool tMatching = false; string[] tTemplateEndingStrs = EndingCode.Split(';'); for (int i = 0; i < tTemplateEndingStrs.Length; i++) { + if ((pWithX && !tTemplateEndingStrs[i].Contains("X")) || (!pWithX && tTemplateEndingStrs[i].Contains("X"))) + { + continue; + } + if (CompareEndingStr(pEndingStr, tTemplateEndingStrs[i])) { tMatching = true; diff --git a/Assets/Scripts/Const/Const.Path.cs b/Assets/Scripts/Const/Const.Path.cs index 1f588dbc..184795db 100644 --- a/Assets/Scripts/Const/Const.Path.cs +++ b/Assets/Scripts/Const/Const.Path.cs @@ -37,5 +37,10 @@ public partial class Const string tLevelIDStr = (pLevelID + 1).ToString().PadLeft(3, '0'); return string.Format("Audio/GameSound/{0}/{1}", tLevelIDStr, tLevelIDStr + "_" + (pSoundIndex + 1).ToString()); } + + public static string GetNumPicA(string pNum) + { + return string.Format("Image/NumPic/NumA_{0}", pNum); + } } } \ No newline at end of file diff --git a/Assets/Scripts/UI/CustomControl/ImageNum.cs b/Assets/Scripts/UI/CustomControl/ImageNum.cs new file mode 100644 index 00000000..c2329dc9 --- /dev/null +++ b/Assets/Scripts/UI/CustomControl/ImageNum.cs @@ -0,0 +1,21 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class ImageNum : MonoBehaviour +{ + [SerializeField] Image mImgOnes; + [SerializeField] Image mImgTens; + [SerializeField] Image mImgHundreds; + + public void SetNum(int pNum) + { + pNum = pNum % 1000; + string tNumStr = pNum.ToString().PadLeft(3, '0'); + + mImgHundreds.sprite = ResourceManager.Instance.LoadRes(Const.Path.GetNumPicA(tNumStr[0].ToString())); + mImgTens.sprite = ResourceManager.Instance.LoadRes(Const.Path.GetNumPicA(tNumStr[1].ToString())); + mImgOnes.sprite = ResourceManager.Instance.LoadRes(Const.Path.GetNumPicA(tNumStr[2].ToString())); + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/CustomControl/ImageNum.cs.meta b/Assets/Scripts/UI/CustomControl/ImageNum.cs.meta new file mode 100644 index 00000000..8b0d15b6 --- /dev/null +++ b/Assets/Scripts/UI/CustomControl/ImageNum.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e5684c0a0e8754b99bc58afde52624b3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/CustomControl/LevelCell.cs b/Assets/Scripts/UI/CustomControl/LevelCell.cs deleted file mode 100644 index e760e834..00000000 --- a/Assets/Scripts/UI/CustomControl/LevelCell.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class LevelCell : MonoBehaviour -{ - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/Assets/Scripts/UI/CustomControl/LevelList.meta b/Assets/Scripts/UI/CustomControl/LevelList.meta new file mode 100644 index 00000000..751105f4 --- /dev/null +++ b/Assets/Scripts/UI/CustomControl/LevelList.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6aae01851068f446fb96764f7b0852bd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/CustomControl/LevelList/LevelCell.cs b/Assets/Scripts/UI/CustomControl/LevelList/LevelCell.cs new file mode 100644 index 00000000..6234978e --- /dev/null +++ b/Assets/Scripts/UI/CustomControl/LevelList/LevelCell.cs @@ -0,0 +1,51 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class LevelCell : UIListCell +{ + public Action DelClick; + + [SerializeField] Button mBtnBg; + [SerializeField] ImageNum mInmLevel; + [SerializeField] Image mImgIconBg; + [SerializeField] Image mImgIcon; + [SerializeField] GameObject mGobDone; + [SerializeField] GameObject mGobComplete; + [SerializeField] Image mImgProgress; + + private int mLevelID; + + private void Awake() + { + UIUtils.BindBtn(mBtnBg, OnClick); + } + + public void Init() + { + mLevelID = GameConfig.Instance.LevelSort[mIndex]; + LevelData tLvData = GameConfig.Instance.GetLevelData(mLevelID); + + mInmLevel.SetNum(mIndex + 1); + if (ColorUtility.TryParseHtmlString(tLvData.LevelColorCode, out Color tBgColor)) + { + mImgIconBg.color = tBgColor; + } + + mImgIcon.sprite = ResourceManager.Instance.LoadRes(Const.Path.GetLevelIconSmall(mLevelID)); + + int tUnlockedEndingCount = PlayerData.Instance.EndingCountOfLevel(mLevelID); + bool tIsAllEndingsDone = tUnlockedEndingCount == tLvData.Endings.Count; + mGobDone.SetActive(tIsAllEndingsDone); + mGobComplete.SetActive(tIsAllEndingsDone); + + mImgProgress.fillAmount = (float)tUnlockedEndingCount / tLvData.Endings.Count; + } + + private void OnClick() + { + DelClick?.Invoke(mIndex); + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/CustomControl/LevelCell.cs.meta b/Assets/Scripts/UI/CustomControl/LevelList/LevelCell.cs.meta similarity index 100% rename from Assets/Scripts/UI/CustomControl/LevelCell.cs.meta rename to Assets/Scripts/UI/CustomControl/LevelList/LevelCell.cs.meta diff --git a/Assets/Scripts/UI/CustomControl/LevelList/LevelList.cs b/Assets/Scripts/UI/CustomControl/LevelList/LevelList.cs new file mode 100644 index 00000000..32354e11 --- /dev/null +++ b/Assets/Scripts/UI/CustomControl/LevelList/LevelList.cs @@ -0,0 +1,28 @@ +using System.Collections; +using System; +using System.Collections.Generic; +using UnityEngine; + +public class LevelList : UIListView +{ + public Action DelClickLevel; + + public override int Count + { + get + { + return PlayerData.Instance.UnlockedLevel; + } + } + + protected override void ConfigCell(LevelCell pCell) + { + pCell.Init(); + pCell.DelClick = OnClickLevel; + } + + private void OnClickLevel(int pLevelIndex) + { + DelClickLevel?.Invoke(pLevelIndex); + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/CustomControl/LevelList/LevelList.cs.meta b/Assets/Scripts/UI/CustomControl/LevelList/LevelList.cs.meta new file mode 100644 index 00000000..0e17b95d --- /dev/null +++ b/Assets/Scripts/UI/CustomControl/LevelList/LevelList.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2a46c284f255c46569f976045d5ccae9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/PanelGame.cs b/Assets/Scripts/UI/PanelGame.cs index 915863e8..f8e2550a 100644 --- a/Assets/Scripts/UI/PanelGame.cs +++ b/Assets/Scripts/UI/PanelGame.cs @@ -89,7 +89,8 @@ public class PanelGame : BasePanel private void OnClickLevel() { - + PanelLevel tUILevel = UIManager.Instance.OpenUI(); + tUILevel.Init(true); } private void OnClickMenu() @@ -121,7 +122,7 @@ public class PanelGame : BasePanel mAtrAction.gameObject.SetActive(true); mAtrAction.Play("Action"); - TimerManager.Instance.Schedule(StartPlay, 1.5f); + TimerManager.Instance.Schedule(StartPlay, 2f); } private void StartPlay() diff --git a/Assets/Scripts/UI/PanelLevel.cs b/Assets/Scripts/UI/PanelLevel.cs index e2e17c57..90155dd0 100644 --- a/Assets/Scripts/UI/PanelLevel.cs +++ b/Assets/Scripts/UI/PanelLevel.cs @@ -1,8 +1,52 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.UI; public class PanelLevel : BasePanel { + [SerializeField] Button mBtnBack; + [SerializeField] Button mBtnBackToMain; + [SerializeField] LevelList mLvList; + private bool mOpenInLevel = false; + + private void Awake() + { + UIUtils.BindBtn(mBtnBack, Close); + UIUtils.BindBtn(mBtnBackToMain, OnClickBackToMain); + + mLvList.DelClickLevel = OnClickLevel; + } + + protected override void OnOpen() + { + base.OnOpen(); + + mLvList.LoadData(); + } + + public void Init(bool pOpenInLevel) + { + mOpenInLevel = pOpenInLevel; + mBtnBackToMain.gameObject.SetActive(pOpenInLevel); + } + + private void OnClickLevel(int pLevelIndex) + { + if (mOpenInLevel && PlayerData.Instance.CurrentLevel == (pLevelIndex + 1)) + { + Close(); + } + else + { + PlayerData.Instance.CurrentLevel = pLevelIndex + 1; + GameManager.Instance.LoadGame(); + } + } + + private void OnClickBackToMain() + { + GameManager.Instance.LoadMain(); + } } \ No newline at end of file diff --git a/Assets/Scripts/UI/PanelResult.cs b/Assets/Scripts/UI/PanelResult.cs index 70654e2c..1126ada8 100644 --- a/Assets/Scripts/UI/PanelResult.cs +++ b/Assets/Scripts/UI/PanelResult.cs @@ -65,7 +65,8 @@ public class PanelResult : BasePanel private void OnClickChoose() { - + PanelLevel tUILevel = UIManager.Instance.OpenUI(); + tUILevel.Init(true); } private void OnClickEndings() diff --git a/Assets/Scripts/Utils/UITools/UIListView.meta b/Assets/Scripts/Utils/UITools/UIListView.meta new file mode 100644 index 00000000..87ba55cf --- /dev/null +++ b/Assets/Scripts/Utils/UITools/UIListView.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 295cb5ee3c53041c2bb000090add301b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Utils/UITools/UIListView/UIListCell.cs b/Assets/Scripts/Utils/UITools/UIListView/UIListCell.cs new file mode 100644 index 00000000..88499595 --- /dev/null +++ b/Assets/Scripts/Utils/UITools/UIListView/UIListCell.cs @@ -0,0 +1,15 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class UIListCell : MonoBehaviour +{ + public int Index => mIndex; + + protected int mIndex; + + public void SetIndex(int pIndex) + { + mIndex = pIndex; + } +} \ No newline at end of file diff --git a/Assets/Scripts/Utils/UITools/UIListView/UIListCell.cs.meta b/Assets/Scripts/Utils/UITools/UIListView/UIListCell.cs.meta new file mode 100644 index 00000000..9032c223 --- /dev/null +++ b/Assets/Scripts/Utils/UITools/UIListView/UIListCell.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c862f27d824654b41bea209813d96ac1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Utils/UITools/UIListView/UIListView.cs b/Assets/Scripts/Utils/UITools/UIListView/UIListView.cs new file mode 100644 index 00000000..deaa2bab --- /dev/null +++ b/Assets/Scripts/Utils/UITools/UIListView/UIListView.cs @@ -0,0 +1,80 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public abstract class UIListView : MonoBehaviour, IListView where T : UIListCell +{ + public abstract int Count + { + get; + } + + [SerializeField] GameObject mTplCell; + [SerializeField] Transform mCtnCells; + + protected List mCellList; + + public virtual void Show(bool pShow) + { + gameObject.SetActive(pShow); + } + + public virtual void LoadData() + { + if (mCellList == null) + { + mCellList = new List(); + } + + for (int i = 0; i < Count; i++) + { + T tCell = null; + if (i < mCellList.Count) + { + tCell = mCellList[i]; + } + else + { + tCell = SpawnCell(); + mCellList.Add(tCell); + } + + tCell.gameObject.SetActive(true); + tCell.SetIndex(i); + ConfigCell(tCell); + } + + HideUnused(); + } + + public virtual void ClearSelection() + { + + } + + protected abstract void ConfigCell(T pCell); + + private T SpawnCell() + { + GameObject tCellOb = Instantiate(mTplCell, mCtnCells); + + tCellOb.transform.localScale = Vector3.one; + + return tCellOb.GetComponent(); + } + + private void HideUnused() + { + for (int i = Count; i < mCellList.Count; i++) + { + mCellList[i].gameObject.SetActive(false); + } + } +} + +public interface IListView +{ + void Show(bool pShow); + void LoadData(); + void ClearSelection(); +} \ No newline at end of file diff --git a/Assets/Scripts/Utils/UITools/UIListView/UIListView.cs.meta b/Assets/Scripts/Utils/UITools/UIListView/UIListView.cs.meta new file mode 100644 index 00000000..7e9e7db2 --- /dev/null +++ b/Assets/Scripts/Utils/UITools/UIListView/UIListView.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 127f5e3ec25fd45ef9877982381e48d2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: