diff --git a/Assets/arts/animations/ui/arena/arena_match_appear_l.anim b/Assets/arts/animations/ui/arena/arena_match_appear.anim similarity index 97% rename from Assets/arts/animations/ui/arena/arena_match_appear_l.anim rename to Assets/arts/animations/ui/arena/arena_match_appear.anim index 52c6b7b6a..0b1b3ae73 100644 --- a/Assets/arts/animations/ui/arena/arena_match_appear_l.anim +++ b/Assets/arts/animations/ui/arena/arena_match_appear.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: arena_match_appear_l + m_Name: arena_match_appear serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/arts/animations/ui/arena/arena_match_appear_l.anim.meta b/Assets/arts/animations/ui/arena/arena_match_appear.anim.meta similarity index 100% rename from Assets/arts/animations/ui/arena/arena_match_appear_l.anim.meta rename to Assets/arts/animations/ui/arena/arena_match_appear.anim.meta diff --git a/Assets/arts/animations/ui/arena/arena_match_appear_l.controller b/Assets/arts/animations/ui/arena/arena_match_appear.controller similarity index 89% rename from Assets/arts/animations/ui/arena/arena_match_appear_l.controller rename to Assets/arts/animations/ui/arena/arena_match_appear.controller index f06504f4d..9132538a3 100644 --- a/Assets/arts/animations/ui/arena/arena_match_appear_l.controller +++ b/Assets/arts/animations/ui/arena/arena_match_appear.controller @@ -10,8 +10,8 @@ AnimatorStateMachine: m_Name: Base Layer m_ChildStates: - serializedVersion: 1 - m_State: {fileID: 7438174731599615645} - m_Position: {x: 240, y: 60, z: 0} + m_State: {fileID: 220762235041923957} + m_Position: {x: 230, y: 60, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -21,14 +21,14 @@ AnimatorStateMachine: m_EntryPosition: {x: 50, y: 60, z: 0} m_ExitPosition: {x: 50, y: 100, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 7438174731599615645} + m_DefaultState: {fileID: 220762235041923957} --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: arena_match_appear_l + m_Name: arena_match_appear serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: @@ -44,14 +44,14 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1102 &7438174731599615645 +--- !u!1102 &220762235041923957 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: arena_match_appear_l + m_Name: arena_match_appear m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] diff --git a/Assets/arts/animations/ui/arena/arena_match_appear_l.controller.meta b/Assets/arts/animations/ui/arena/arena_match_appear.controller.meta similarity index 100% rename from Assets/arts/animations/ui/arena/arena_match_appear_l.controller.meta rename to Assets/arts/animations/ui/arena/arena_match_appear.controller.meta diff --git a/Assets/arts/animations/ui/arena/arena_match_appear_r.anim b/Assets/arts/animations/ui/arena/arena_match_appear_r.anim deleted file mode 100644 index 8c0604060..000000000 --- a/Assets/arts/animations/ui/arena/arena_match_appear_r.anim +++ /dev/null @@ -1,53 +0,0 @@ -%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: arena_match_appear_r - serializedVersion: 6 - 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: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Assets/arts/animations/ui/arena/arena_match_appear_r.anim.meta b/Assets/arts/animations/ui/arena/arena_match_appear_r.anim.meta deleted file mode 100644 index 07e821b32..000000000 --- a/Assets/arts/animations/ui/arena/arena_match_appear_r.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c420fa4918faada42b0e1880bfbe7d66 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/animations/ui/arena/arena_match_appear_r.controller b/Assets/arts/animations/ui/arena/arena_match_appear_r.controller deleted file mode 100644 index 1ac8706fc..000000000 --- a/Assets/arts/animations/ui/arena/arena_match_appear_r.controller +++ /dev/null @@ -1,72 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1107 &-2414691991970011120 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 7642115822760265230} - m_Position: {x: 240, y: 60, 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: 60, z: 0} - m_ExitPosition: {x: 50, y: 100, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 7642115822760265230} ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: arena_match_appear_r - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: -2414691991970011120} - 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 &7642115822760265230 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: arena_match_appear_r - 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: c420fa4918faada42b0e1880bfbe7d66, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: diff --git a/Assets/arts/animations/ui/arena/arena_match_appear_r.controller.meta b/Assets/arts/animations/ui/arena/arena_match_appear_r.controller.meta deleted file mode 100644 index 9253c43cc..000000000 --- a/Assets/arts/animations/ui/arena/arena_match_appear_r.controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 288066bd707f9f54f97fc02b81397bba -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 9100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/prefabs/ui/arena/arena_match_ui.prefab b/Assets/prefabs/ui/arena/arena_match_ui.prefab index b005967fa..dffc90cdd 100644 --- a/Assets/prefabs/ui/arena/arena_match_ui.prefab +++ b/Assets/prefabs/ui/arena/arena_match_ui.prefab @@ -238,7 +238,6 @@ GameObject: - component: {fileID: 4913380882724635054} - component: {fileID: 1959679968156037996} - component: {fileID: 7915609320071441048} - - component: {fileID: 8940578001779276414} m_Layer: 5 m_Name: self m_TagString: Untagged @@ -306,25 +305,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!95 &8940578001779276414 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 548761283093183381} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 288066bd707f9f54f97fc02b81397bba, 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 &1440471523058403614 GameObject: m_ObjectHideFlags: 0 @@ -633,7 +613,6 @@ GameObject: - component: {fileID: 1882688869272361315} - component: {fileID: 895455004406819325} - component: {fileID: 3179995692011479226} - - component: {fileID: 7375319881381128310} m_Layer: 5 m_Name: match m_TagString: Untagged @@ -701,25 +680,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!95 &7375319881381128310 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1817460203726830672} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: d42a76bf8a2f695419b2c2bf7a75764b, 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 &2591614445065678836 GameObject: m_ObjectHideFlags: 0 @@ -3313,6 +3273,7 @@ GameObject: m_Component: - component: {fileID: 5221279569728953363} - component: {fileID: 5847854978575966064} + - component: {fileID: 8378493685032460045} m_Layer: 5 m_Name: match_result m_TagString: Untagged @@ -3354,6 +3315,25 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8329696636492396501} m_CullTransparentMesh: 1 +--- !u!95 &8378493685032460045 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8329696636492396501} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: d42a76bf8a2f695419b2c2bf7a75764b, 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 &8743152846842926726 GameObject: m_ObjectHideFlags: 0 @@ -3727,16 +3707,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} ---- !u!1 &3663199460368674985 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4327981527104624259, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} - m_PrefabInstance: {fileID: 1064635963393402410} - m_PrefabAsset: {fileID: 0} --- !u!224 &5360279720986575252 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} m_PrefabInstance: {fileID: 1064635963393402410} m_PrefabAsset: {fileID: 0} +--- !u!1 &3663199460368674985 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4327981527104624259, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} + m_PrefabInstance: {fileID: 1064635963393402410} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1387319428845566745 PrefabInstance: m_ObjectHideFlags: 0 @@ -3962,16 +3942,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} ---- !u!224 &4623697183919127515 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - m_PrefabInstance: {fileID: 1387319428845566745} - m_PrefabAsset: {fileID: 0} --- !u!1 &2094515170546121612 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1031757354196467861, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} m_PrefabInstance: {fileID: 1387319428845566745} m_PrefabAsset: {fileID: 0} +--- !u!224 &4623697183919127515 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + m_PrefabInstance: {fileID: 1387319428845566745} + m_PrefabAsset: {fileID: 0} --- !u!114 &4376010882360431022 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4217,16 +4197,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} ---- !u!1 &3073651592587710914 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4327981527104624259, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} - m_PrefabInstance: {fileID: 1637016210762041153} - m_PrefabAsset: {fileID: 0} --- !u!224 &5913801728998695167 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} m_PrefabInstance: {fileID: 1637016210762041153} m_PrefabAsset: {fileID: 0} +--- !u!1 &3073651592587710914 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4327981527104624259, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} + m_PrefabInstance: {fileID: 1637016210762041153} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2973947786109774002 PrefabInstance: m_ObjectHideFlags: 0 @@ -4708,13 +4688,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} ---- !u!224 &788944132258065787 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8585876331803127136, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} - m_PrefabInstance: {fileID: 9067379420394799131} - m_PrefabAsset: {fileID: 0} --- !u!1 &3069215967538611150 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6290902110419108821, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} m_PrefabInstance: {fileID: 9067379420394799131} m_PrefabAsset: {fileID: 0} +--- !u!224 &788944132258065787 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8585876331803127136, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} + m_PrefabInstance: {fileID: 9067379420394799131} + m_PrefabAsset: {fileID: 0}