diff --git a/client/Assets/Animations/Player.controller b/client/Assets/Animations/Player.controller index 0fe1762..99bf211 100644 --- a/client/Assets/Animations/Player.controller +++ b/client/Assets/Animations/Player.controller @@ -1,5 +1,109 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8751720300697357132 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Walk_Left + 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: a7083ef8d62a92b48b2a9a1e286c2c35, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-7209621109841967045 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Walk_Top + 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: 05d0e22070abf854a8fb82cf7fdb43af, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-2770689912488685362 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle_Down + 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: b120de01e21de274bb0254cb788618b2, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-1146606308859933053 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle_Left + 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: 8466cb9097718e741be6f31c9ba5237e, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -22,6 +126,58 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1102 &917365999204545627 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle_Right + 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: 6a40d89479a66c54dac7a2a2be985413, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1468890098642137518 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Walk_Down + 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: 0130929d1238a744bae0d65bc8a842aa, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1107 &1741904732465245123 AnimatorStateMachine: serializedVersion: 6 @@ -34,6 +190,33 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 8365478598857187166} m_Position: {x: 200, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: 2479137506993953446} + m_Position: {x: 235, y: 65, z: 0} + - serializedVersion: 1 + m_State: {fileID: -2770689912488685362} + m_Position: {x: 376.9344, y: 144.79129, z: 0} + - serializedVersion: 1 + m_State: {fileID: -1146606308859933053} + m_Position: {x: 386.9344, y: 154.79129, z: 0} + - serializedVersion: 1 + m_State: {fileID: 917365999204545627} + m_Position: {x: 396.9344, y: 164.79129, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3977673060842279271} + m_Position: {x: 406.9344, y: 174.79129, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1468890098642137518} + m_Position: {x: 408.44678, y: 94.37149, z: 0} + - serializedVersion: 1 + m_State: {fileID: -8751720300697357132} + m_Position: {x: 418.44678, y: 104.37149, z: 0} + - serializedVersion: 1 + m_State: {fileID: 2231425742319041760} + m_Position: {x: 428.44678, y: 114.37149, z: 0} + - serializedVersion: 1 + m_State: {fileID: -7209621109841967045} + m_Position: {x: 438.44678, y: 124.37149, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -44,6 +227,84 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 8365478598857187166} +--- !u!1102 &2231425742319041760 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Walk_Right + 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: 26679f0f6b973684c81eb91967b4a74e, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &2479137506993953446 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle_Top + 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: 193313d658d7aff43bd02fed94989827, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &3977673060842279271 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle_Top 0 + 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: 193313d658d7aff43bd02fed94989827, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &8365478598857187166 AnimatorState: serializedVersion: 6 diff --git a/client/Assets/Ether/Scenes/Boot.unity b/client/Assets/Ether/Scenes/Boot.unity index 05b9219..8a1cfcc 100644 --- a/client/Assets/Ether/Scenes/Boot.unity +++ b/client/Assets/Ether/Scenes/Boot.unity @@ -190,133 +190,6 @@ CanvasRenderer: m_CorrespondingSourceObject: {fileID: 3595610330307833792, guid: 2d40455ce379bd946bbf5e5e4e71d04c, type: 3} m_PrefabInstance: {fileID: 5978091752429385269} m_PrefabAsset: {fileID: 0} ---- !u!1 &263135841 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 263135844} - - component: {fileID: 263135843} - - component: {fileID: 263135842} - - component: {fileID: 263135845} - m_Layer: 0 - m_Name: Square - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!95 &263135842 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 263135841} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 387713758007777052, guid: 1de2d94c1442cc74799d4362f6bbd241, type: 3} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 1 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 ---- !u!212 &263135843 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 263135841} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -519423957 - m_SortingLayer: 4 - m_SortingOrder: 0 - m_Sprite: {fileID: 761606858315472836, guid: 1de2d94c1442cc74799d4362f6bbd241, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &263135844 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 263135841} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.05, y: 0.04, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &263135845 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 263135841} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9cfcc9ceea0bf419cb3bcaf548c2600d, type: 3} - m_Name: - m_EditorClassIdentifier: - saveLayer: 0 - saveTag: 0 - saveName: 0 - saveHideFlags: 0 - saveActive: 0 - saveChildren: 0 - componentsToSave: - - {fileID: 263135844} --- !u!1 &306672549 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7856366910562810276, guid: 2d40455ce379bd946bbf5e5e4e71d04c, type: 3} @@ -676,187 +549,6 @@ MonoBehaviour: SerializationNodes: [] key: MainCanvas dontDestroy: 1 ---- !u!1 &541893777 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 541893779} - - component: {fileID: 541893778} - - component: {fileID: 541893780} - m_Layer: 0 - m_Name: Square_1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!212 &541893778 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 541893777} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &541893779 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 541893777} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.3802, y: 1.3599, z: 0} - m_LocalScale: {x: 4.4582, y: 4.8013496, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &541893780 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 541893777} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 1 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 --- !u!1001 &549239009 PrefabInstance: m_ObjectHideFlags: 0 @@ -915,7 +607,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4897292196941797631, guid: 0aaca3e185238014bba82a38ce55f4fc, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5331904816632057308, guid: 0aaca3e185238014bba82a38ce55f4fc, type: 3} propertyPath: _serializedBlackboard @@ -965,7 +657,7 @@ PrefabInstance: objectReference: {fileID: 8283022809456686519, guid: 0aaca3e185238014bba82a38ce55f4fc, type: 3} - target: {fileID: 8283022809456686519, guid: 0aaca3e185238014bba82a38ce55f4fc, type: 3} propertyPath: serializationData.PrefabModifications.Array.size - value: 0 + value: 2 objectReference: {fileID: 0} - target: {fileID: 8283022809456686519, guid: 0aaca3e185238014bba82a38ce55f4fc, type: 3} propertyPath: serializationData.PrefabModifications.Array.data[0] @@ -975,26 +667,18 @@ PrefabInstance: propertyPath: serializationData.PrefabModifications.Array.data[1] value: '"path":"allAnimationSet.{\"Walk\"}","value":$eref:1' objectReference: {fileID: 0} - - target: {fileID: 8283022809456686519, guid: 0aaca3e185238014bba82a38ce55f4fc, type: 3} - propertyPath: serializationData.ReferencedUnityObjects.Array.data[0] - value: - objectReference: {fileID: 11400000, guid: de6fd73048f4ee34d92630d158a35222, type: 2} - - target: {fileID: 8283022809456686519, guid: 0aaca3e185238014bba82a38ce55f4fc, type: 3} - propertyPath: serializationData.ReferencedUnityObjects.Array.data[1] - value: - objectReference: {fileID: 11400000, guid: ac34ca06695fe3849ac8ebc8a48c9a00, type: 2} - target: {fileID: 8283022809456686519, guid: 0aaca3e185238014bba82a38ce55f4fc, type: 3} propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.size - value: 0 + value: 2 objectReference: {fileID: 0} - target: {fileID: 8283022809456686519, guid: 0aaca3e185238014bba82a38ce55f4fc, type: 3} propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[0] value: - objectReference: {fileID: 11400000, guid: de6fd73048f4ee34d92630d158a35222, type: 2} + objectReference: {fileID: 11400000, guid: 6bb26e5b81e57284aa2c1a41c990cf6c, type: 2} - target: {fileID: 8283022809456686519, guid: 0aaca3e185238014bba82a38ce55f4fc, type: 3} propertyPath: serializationData.PrefabModificationsReferencedUnityObjects.Array.data[1] value: - objectReference: {fileID: 11400000, guid: ac34ca06695fe3849ac8ebc8a48c9a00, type: 2} + objectReference: {fileID: 11400000, guid: 2d73a032c498a904495086f56105eb89, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1456,7 +1140,7 @@ MonoBehaviour: openPrefabs: 0 prefabs: [] idRef: - _Keys: 5337fb48ba082f4c11da0277d9afca7edd7b5efceef807273ed4d82f77fa3117d52bb9c665d7aa545cd63732fbb03921f9fbdfe7d589f4265fc87a4a912787717f7186df3643453fed272c5aecffe812f105d68c26e7134be387642fb5503d06682bd2536d6caf50d362220ad1fe5b4de27d054df1dabd62d20890cda9a8005df33fe6687a906568ca6ddbd2ae0b197c5ea9b16d3718573dbfe00651a266c55e2199130e729def78b18c3b97fd14986685d215c868729107c05703bcb18424275266b4f8129b12635882ddde307e8172bfe80df6d1df5a4b95d8ef46b1dab61aea7cbe563ea127283a17a609b254103becde2445c0b04258583792a3187b68486828d5db4638563c3fc4b876bc06d53fc8b35ad2b5705938c69a5089cb34be4b7f115e7680cb0a4ce3b977a1034eb51fa8fc8664117feb6e01cb08d748b7900e9e1ea5806706dd7405d661b4ab5e5235590b7edfd2fb0b53c80735ccfd696e64b779c0dd0bc978512705a1c4e2c93d5fe2c181c2c64ec35d45c66a241e3041716dd34732a6b98e01cbd5afbfeb312b053d1dcbb8111980158f100aa834627e4e801055f30791b7341e456a049e475a770f909ec304057d79ada23f483cc8ca68a89fc00479e1f3312a0028a97c7a4b2a6c819aa3c3ba497973315f552eff8f180fd25cff8755fd1011962244d1d95b638f4099a91e4ca23e50fe914a6209ac2b97ebb968a060ab16c1b221ea5070373eda76fec8762d5571f49656ecf638ff62d1f6b9ba3ae62d1e6bdbc9e041900521c75371ec0be3b43a412a74090abf1f074e7ce6a54883fc0db720cbad08c94c639135b34aa9eb6d12437efc655b372853453e6e3a55a027496ae3a9ef7e20e402b5d008a7cfecc425fcf5080c775dd4384c2a712b5ae01c3bc1829056e9b44c5820c42d7dafd45d5adcc628f903af460cf08fc4576ef0a36bee44e64d5c6e3b46574f134ccfa976207934f9def7eac0113c84477978a3c70f6899906bed0ffd6d751eafac3d6d2447e85c2f5c167d9c0384d511d727c2cd05e9dd4c96c61df268c873abe96692b05757716de38c950616027318e701d9b938ecb4951bb9ba0d366ac7258a2985691686682e9830b1917de563993936da6a10468c034e026b62639dc8b2ac456fbf7723d09295f7ad97624613ff1c54476d705d14449c821b131a07cbfc67fee538755cdde99ab82be6680a5f6ae99581481c36224f312a22f407428870d44ed09b2b4b74c0765dd2b8770553581d79025078ece7cd246af8b57fd2f15730ba1219393dc161df3e2e41082438c98184ed7e4038f8e7660277c15242bf5b938578430c391e5a3a632fb61ad82900ced1cb051b7217f8c22ab3374c83b49d7fd2ad83627cd647659343dc08bf32c2d38870dc75bb3f059c7005377919f242e732c912295962b558ec95502ec6107ea38af52b12d928c592a8e6f27e0dc07d8686c33b0b20982cea2534624f9134d75f8693ee2239cff0f5fb807f3f55334a2c17caa776b3767c0e37bf135bc67502740f93f75eafa04cb6d3460f60196c3f597e8e665a23b1ec03ef03a57a446b458e7d0cb1172ba87d767df1a36d9ae3d95b009325360fa897c07ffa4d54052d06c17461220b44d77bd8f4222832baf1802a8b0f6825c2ce9fd80ffe2b31d1caceff9721320657a9839a1db2693492aa1edd5882c558622b6b535eaca0471cb1fb55dd68bd17fd7eacb11eb8557339d44764e04dd84dfa8962944a215803b0815cd4519ebc77de1077d40bd55e63f12c1838809e9611491ef1473787b9325cfd99288f98c11f3c73436baefd5f19622eb6d67711374e186e8a32ac753f565645780e3c36d37612c802f2a5d49d477d0be409d0e3bb4bc64a0f210e8e734f4d653d0b8992aa2c5a40c4af0e44a943d142b5a19036867377d3b80ed94d987cac4c5ac0686e4215a047516fe1f3c27ea0cc50cbd9d1be1721357da3b547fa58d8415a5a9e6aac3f84ca40d887f5547d113aafa59d63567c0b719f33f09e6058b307b8ddb1e2e336e0efb9f06f1a701676046d8568ab443b97d665100adf30232a99257f3d76cb0de21a3952559af20ffe76560af31a3f08c27c45db7cd22c4021dd1a083fef53007ffe182fa6b29101b094595704ae26143d58ae6b7306af7169480d973327703234d0382ce97e8411277b7d417c980367728e4801be365469460d88fb486fa2554d7452269e75e95b2c62bc0877910b0133d9513bc0912023ebb830194c652175f3c199300f6e42648381f1f3bd803b0f48d9c3af1db83e226a8aeda95afd570c932cf20362dba53a6a12ee736e972b1ab892d073a171583b8376c6848099092dddf34a7bf7030024d6cb0047b1faff623fa7a295d00000064af80f37d21c9503852d86d9a22abb021d1b5062e1a6124b6e540b5ca7d76b2e1b3b328757beff0677b100da75263956b91b4cc203f3e35d193c3581efc6a353c357be66f733ab5e1c4aeb2fa637d5471bb516c2232d310d1f8fa193f481f63d5653181e67d25e12c6aade4dde120451127d9ca5dd65776bda4eb7986de8956554adda521fb7e048570488ce0b7eec316b0d5a8ee264e445cb84f8b58af77f22eb875f7412a88f365ee4fbe1ee4577593be82c608e0782489320889abe2abe5f7b991c7be087e114646fd00297fca81004ae0e8cdc204f0d0ba7e2f220f477765ea59aabd604874c0717c3fdd884df6a88886093c6b4c45bb6f17977952cca6f08a55b0d9d02c608355b85c45c513570884c7ba8550b3c12960a0a1a75f049331ecc0acdd62e327911bf278db968f841bf4d8ffabf8ba5451c183fb24342b85b19801c4aa39a042ec8a05db28e0e1a02e355119389252f0f591dbdc030f0901013078ccc4b04b01137a92d6b870e692f6ab708d93f674846f2d59ea253ecce47326d9f87814db7170623c932539b966786ec29e8f9694f54bf46bf21a2536422e26d7792f7ab9245eeae1ed7a4fcb9581b026aad68a74169ccc6a2e25a30e93c0b114160e092e4044de14fbc5a3a8e1678753a196ee1ad1cff0e209dcf8466573f361b66c2e64e6587ebaac8d6b0d5686f7f8b7effe078348d946e883e6c444667ba1715b64e7a43ad1660d96fcbe45ec49f5c7918728e697d39ea1c25627f71a04c3283029ce36e857a7288c964c853d0098c760c4f810caf8309cfc3ab56792cad997d645d1d4a98ef392298615c27130308122790ba14532d96ac61dfba3cd87882ddc3f42450394160521a423a4bb1403cef4fcffe4d679763d3485ad74f0c857c7c376f2943f5b3b21bc7fc21162c1aef78ca9d78390469aafbcc4e1806823ca06a3f4f091ba0f3ec9f7f225e1b5347730bd4414e6e0e4380a01924105865536775a348297b67b12666446ab2228de94dc0fe0a1c77a6755ed061f1675daf8e91147244ee5a6dbfbb048efc1562c8d65ca7d941dc5086f8535260f432754ac8b7b5d89daf2dd7a82dbdc52106569f0467c8b1f0c8106be28f7af19bfa7872b9443abaa07565858ad031131e8b59ffa9f1645bfa263a6e38b50af2cbc4735d59b4f4233364018e0142272096fc76911684b85569e26d2080347d14948c45c65d8d6dd37f7c3446f0f25c3c4e5a273c3e78db470c1d39c3dd2a5d011913238d8761c3088fa3129a4ffd465c3faa2e260db9520d678c45c1ab560aaae0cd5e0516eac4af1e30536699be08f129227bcd047cf12c99ce0a14a683b4e6aebd7ae4a3b58dd69121072399128c567bab688ada3da663db316a48e0d956a1e539135739254d7395a53be37514c6ac5b606605e5c23f149b21078eb4ba0a47349a08d326e28fa1f9dc0ccbfd3b1139944213808dae43dd050045181edb2750af8316f0e2662cc20ff802c2cf0a11d73340068f5976457aa9d432269da6bfd4045c7bb798052468382d3ad47a6dd7ab69cb5b551824da527fbc158075635561ac4b41ee869f95102c085c823527695bba8f465e0ab3ae9e894738240f5c22637d637fc5afe925c9364a280fc75b88a626703bc19847df76d43f042d57d0f45c4aef271678782df4c7d4228b9f7cb63d38233c461f16339470a916c5b151be74e5eb3aa4ba393fccbd2126fc0cfca62fe90f2ab9e025e1f4ea9025333bbd5b95f4ad6ea3cc576426e1e81cde1f5c7887c0e301de18b37e04d89113092d0ba01a81aa391dbc2fb6e751263255fcfc69d508ac3aa024a7efd4778b76cf42f87835c7b66e709235368eb4882223daa28b53508471468e532ab47f0a6d66564e9c6ca58c14863b08a2927fdf62deceb0f52aeaae700baa148b6f6ef70e7938631afddb717cba378d4f3ea9525b78bf8e07f80cc2215c41200f6b433e45d720a54fd113b7217a79f2f38ec9d330ba0773223a66de28f24c2fda1387ca1095aa808169dcb14f37ad569b4f6d0c126ed1c4e99b4196058ceed11e38e59f39d2a75d920706af5f5941576339d09f7a65cfef3aa09aea0a1750273e3e2a4a62efead736424b567523410d3bffc7512ae3fd62070da13767 + _Keys: 5337fb48ba082f4c11da0277d9afca7edd7b5efceef807273ed4d82f77fa3117d52bb9c665d7aa545cd63732fbb03921f9fbdfe7d589f4265fc87a4a912787717f7186df3643453fed272c5aecffe812f105d68c26e7134be387642fb5503d06682bd2536d6caf50d362220ad1fe5b4de27d054df1dabd62d20890cda9a8005df33fe6687a906568ca6ddbd2ae0b197c5ea9b16d3718573dbfe00651a266c55e2199130e729def78b18c3b97fd14986685d215c868729107c05703bcb18424275266b4f8129b12635882ddde307e8172bfe80df6d1df5a4b95d8ef46b1dab61aea7cbe563ea127283a17a609b254103becde2445c0b04258583792a3187b68486828d5db4638563c3fc4b876bc06d53fc8b35ad2b5705938c69a5089cb34be4b7f115e7680cb0a4ce3b977a1034eb51fa8fc8664117feb6e01cb08d748b7900e9e1ea5806706dd7405d661b4ab5e5235590b7edfd2fb0b53c80735ccfd696e64b779c0dd0bc978512705a1c4e2c93d5fe2c181c2c64ec35d45c66a241e3041716dd34732a6b98e01cbd5afbfeb312b053d1dcbb8111980158f100aa834627e4e801055f30791b7341e456a049e475a770f909ec304057d79ada23f483cc8ca68a89fc00479e1f3312a0028a97c7a4b2a6c819aa3c3ba497973315f552eff8f180fd25cff8755fd1011962244d1d95b638f4099a91e4ca23e50fe914a6209ac2b97ebb968a060ab16c1b221ea5070373eda76fec8762d5571f49656ecf638ff62d1f6b9ba3ae62d1e6bdbc9e041900521c75371ec0be3b43a412a74090abf1f074e7ce6a54883fc0db720cbad08c94c639135b34aa9eb6d12437efc655b372853453e6e3a55a027496ae3a9ef7e20e402b5d008a7cfecc425fcf5080c775dd4384c2a712b5ae01c3bc1829056e9b44c5820c42d7dafd45d5adcc628f903af460cf08fc4576ef0a36bee44e64d5c6e3b46574f134ccfa976207934f9def7eac0113c84477978a3c70f6899906bed0ffd6d751eafac3d6d2447e85c2f5c167d9c0384d511d727c2cd05e9dd4c96c61df268c873abe96692b05757716de38c950616027318e701d9b938ecb4951bb9ba0d366ac7258a2985691686682e9830b1917de563993936da6a10468c034e026b62639dc8b2ac456fbf7723d09295f7ad97624613ff1c54476d705d14449c821b131a07cbfc67fee538755cdde99ab82be6680a5f6ae99581481c36224f312a22f407428870d44ed09b2b4b74c0765dd2b8770553581d79025078ece7cd246af8b57fd2f15730ba1219393dc161df3e2e41082438c98184ed7e4038f8e7660277c15242bf5b938578430c391e5a3a632fb61ad82900ced1cb051b7217f8c22ab3374c83b49d7fd2ad83627cd647659343dc08bf32c2d38870dc75bb3f059c7005377919f242e732c912295962b558ec95502ec6107ea38af52b12d928c592a8e6f27e0dc07d8686c33b0b20982cea2534624f9134d75f8693ee2239cff0f5fb807f3f55334a2c17caa776b3767c0e37bf135bc67502740f93f75eafa04cb6d3460f60196c3f597e8e665a23b1ec03ef03a57a446b458e7d0cb1172ba87d767df1a36d9ae3d95b009325360fa897c07ffa4d54052d06c17461220b44d77bd8f4222832baf1802a8b0f6825c2ce9fd80ffe2b31d1caceff9721320657a9839a1db2693492aa1edd5882c558622b6b535eaca0471cb1fb55dd68bd17fd7eacb11eb8557339d44764e04dd84dfa8962944a215803b0815cd4519ebc77de1077d40bd55e63f12c1838809e9611491ef1473787b9325cfd99288f98c11f3c73436baefd5f19622eb6d67711374e186e8a32ac753f565645780e3c36d37612c802f2a5d49d477d0be409d0e3bb4bc64a0f210e8e734f4d653d0b8992aa2c5a40c4af0e44a943d142b5a19036867377d3b80ed94d987cac4c5ac0686e4215a047516fe1f3c27ea0cc50cbd9d1be1721357da3b547fa58d8415a5a9e6aac3f84ca40d887f5547d113aafa59d63567c0b719f33f09e6058b307b8ddb1e2e336e0efb9f06f1a701676046d8568ab443b97d665100adf30232a99257f3d76cb0de21a3952559af20ffe76560af31a3f08c27c45db7cd22c4021dd1a083fef53007ffe182fa6b29101b094595704ae26143d58ae6b7306af7169480d973327703234d0382ce97e8411277b7d417c980367728e4801be365469460d88fb486fa2554d7452269e75e95b2c62bc0877910b0133d9513bc0912023ebb830194c652175f3c199300f6e42648381f1f3bd803b0f48d9c3af1db83e226a8aeda95afd570c932cf20362dba53a6a12ee736e972b1ab892d073a171583b8376c6848099092dddf34a7bf7030024d6cb0047b1faff623fa7a295d00000064af80f37d21c9503852d86d9a22abb021d1b5062e1a6124b6e540b5ca7d76b2e1b3b328757beff0677b100da75263956b91b4cc203f3e35d193c3581efc6a353c357be66f733ab5e1c4aeb2fa637d5471bb516c2232d310d1f8fa193f481f63d5653181e67d25e12c6aade4dde120451127d9ca5dd65776bda4eb7986de8956554adda521fb7e048570488ce0b7eec316b0d5a8ee264e445cb84f8b58af77f22eb875f7412a88f365ee4fbe1ee4577593be82c608e0782489320889abe2abe5f7b991c7be087e114646fd00297fca81004ae0e8cdc204f0d0ba7e2f220f477765ea59aabd604874c0717c3fdd884df6a88886093c6b4c45bb6f17977952cca6f08a55b0d9d02c608355b85c45c513570884c7ba8550b3c12960a0a1a75f049331ecc0acdd62e327911bf278db968f841bf4d8ffabf8ba5451c183fb24342b85b19801c4aa39a042ec8a05db28e0e1a02e355119389252f0f591dbdc030f0901013078ccc4b04b01137a92d6b870e692f6ab708d93f674846f2d59ea253ecce47326d9f87814db7170623c932539b966786ec29e8f9694f54bf46bf21a2536422e26d7792f7ab9245eeae1ed7a4fcb9581b026aad68a74169ccc6a2e25a30e93c0b114160e092e4044de14fbc5a3a8e1644ca435d7429d6566f7f8b7effe078348d946e883e6c4446a04c3283029ce36e857a7288c964c853d0098c760c4f810caf8309cfc3ab56792cad997d645d1d4a98ef392298615c27130308122790ba14532d96ac61dfba3c394160521a423a4bb1403cef4fcffe4d679763d3485ad74f0c857c7c376f2943f5b3b21bc7fc21162c1aef78ca9d78390469aafbcc4e1806823ca06a3f4f091ba0f3ec9f7f225e1b5347730bd4414e6e0e4380a01924105865536775a348297b67b12666446ab2228de94dc0fe0a1c77a6755ed061f1675daf8e91147244ee5a6dbfbb048efc1562c8d65ca7d941dc5086f8535260f432754ac8b7b5d89daf2dd7a82dbdc52106569f0467c8b1f0c8106be28f7af19bfa7872b9443abaa07565858ad031131e8b59ffa9f1645bfa263a6e38b50af2cbc4735d59b4f4233364018e0142272096fc76911684b85569e26d2080347d14948c45c65d8d6dd37f7c3446f0f25c3c4e5a273c3e78db470c1d39c3dd2a5d011913238d8761c3088fa3129a4ffd465c3faa2e260db9520d678c45c1ab560aaae0cd5e0516eac4af1e30536699be08f129227bcd047cf12c99ce0a14a683b4e6aebd7ae4a3b58dd69121072399128c567bab688ada3da663db316a48e0d956a1e539135739254d7395a53be37514c6ac5b606605e5c23f149b21078eb4ba0a47349a08d326e28fa1f9dc0ccbfd3b1139944213808dae43dd050045181edb2750af8316f0e2662cc20ff802c2cf0a11d73340068f5976457aa9d432269da6bfd4045c7bb798052468382d3ad47a6dd7ab69cb5b551824da527fbc158075635561ac4b41ee869f95102c085c823527695bba8f465e0ab3ae9e894738240f5c22637d637fc5afe925c9364a280fc75b88a626703bc19847df76d43f042d57d0f45c4aef271678782df4c7d4228b9f7cb63d38233c461f16339470a916c5b151be74e5eb3aa4ba393fccbd2126fc0cfca62fe90f2ab9e025e1f4ea9025333bbd5b95f4ad6ea3cc576426e1e81cde1f5c7887c0e301de18b37e04d89113092d0ba01a81aa391dbc2fb6e751263255fcfc69d508ac3aa024a7efd4778b76cf42f87835c7b66e709235368eb4882223daa28b53508471468e532ab47f0a6d66564e9c6ca58c14863b08a2927fdf62deceb0f52aeaae700baa148b6f6ef70e7938631afddb717cba378d4f3ea9525b78bf8e07f80cc2215c41200f6b433e45d720a54fd113b7217a79f2f38ec9d330ba0773223a66de28f24c2fda1387ca1095aa808169dcb14f37ad569b4f6d0c126ed1c4e99b4196058ceed11e38e59f39d2a75d920706af5f5941576339d09f7a65cfef3aa09aea0a1750273e3e2a4a62efead736424b567523410d3bffc7512ae3fd62070da13767a087a4e7ab70507b139c1eed21a6f35eb8ac4ed28eeeeb243a5060e8cc236e2307a51040a646114ff2abdda7efd63878cc7f25231d65e81d89270062be64cf5642fbba2c4143ff034116aa7dac96353293c5b2273e343f4f1f3cd7513b607353b2de17b32a1b2b04b774c76eaf8db8177b03fbfa51f49a2dc6c6cc8fa925ac21e6f52161bb7f4f1e03ce210c79e6a66ebf2e9b1f9f95b50ab83ed2b8e8d08d26534da4626ebaa6746fd65e6ec5d0ea313cb9ee438866e90a91342d0a27242d1e44be48457f877747a52cbf9ab3a615424e12d6246ac9183a6366881f61a55d49a93fb2841930b04b41a6e7b52584be15e014a7c505ad767ba60ea7e50f97a900308a0d8b0c6fd67ec221e2c3e163141902736c8650c93332515aac9c4e0dd43f8a8b7c7900b5aa3ff08288c669a111629f6f52722d54496a9a45d1f20176a046f3f4c242bc68b13bf39b370acf82ec0a8a347326357b1e76aedd2746ada665774911898664ed33036499d5b4e24f6c73beb52e8a969c562d28de1cb7bee4532ec29242bf76f5043e8550928aa329142ffc7cf00e3a548e54bc5c5e86d07b447ffe4ec2031277fc7915f43742cb0c87298d62a2c43236523fe227ec2171986043ba76e8554b787a71a28f2d16d9f60c065ab5cbde56d77a65a77e6b400ac70e2f380db2490200bd10a82b09c7654824663c486e34fb31f3183ef89c42dbbbb57f108e7589acb72c7c25a800905102d16165bf51f7adaa8f3877a0e1439e80ea3951ddf265d724317c32505015b6bf5764 _Values: - {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} @@ -1728,16 +1412,9 @@ MonoBehaviour: - {fileID: 11500000, guid: 9cfcc9ceea0bf419cb3bcaf548c2600d, type: 3} - {fileID: 3765421091833750969, guid: 1de2d94c1442cc74799d4362f6bbd241, type: 3} - {fileID: 387713758007777052, guid: 1de2d94c1442cc74799d4362f6bbd241, type: 3} - - {fileID: 263135844} - - {fileID: 263135843} - - {fileID: 263135842} - - {fileID: 263135841} + - {fileID: 1318221636598892449, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} - {fileID: 2800000, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - - {fileID: 541893777} - - {fileID: 541893779} - - {fileID: 541893778} - - {fileID: 541893780} - {fileID: 1650476989} - {fileID: 1650476988} - {fileID: 1650476985} @@ -1746,7 +1423,6 @@ MonoBehaviour: - {fileID: 1650476986} - {fileID: 11500000, guid: 9107aee0ced90422da95f0b31680501f, type: 3} - {fileID: 11500000, guid: 4286eeee023cce141b7df518847d52e9, type: 3} - - {fileID: 263135845} - {fileID: 344948077} - {fileID: 6872002841214859180, guid: 2d40455ce379bd946bbf5e5e4e71d04c, type: 3} - {fileID: 1145879265431766087, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} @@ -1860,6 +1536,76 @@ MonoBehaviour: - {fileID: 11400000, guid: 83d42e1d762810e4998bd389027d388d, type: 2} - {fileID: 1307021877} - {fileID: 2800000, guid: b8ba3923a6094cd48b85425f47fd7450, type: 3} + - {fileID: -1404362506, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: 7400000, guid: 26679f0f6b973684c81eb91967b4a74e, type: 2} + - {fileID: 7400000, guid: b120de01e21de274bb0254cb788618b2, type: 2} + - {fileID: 7400000, guid: 6a40d89479a66c54dac7a2a2be985413, type: 2} + - {fileID: 7400000, guid: 0130929d1238a744bae0d65bc8a842aa, type: 2} + - {fileID: 7400000, guid: a7083ef8d62a92b48b2a9a1e286c2c35, type: 2} + - {fileID: 7400000, guid: 8466cb9097718e741be6f31c9ba5237e, type: 2} + - {fileID: 7400000, guid: 05d0e22070abf854a8fb82cf7fdb43af, type: 2} + - {fileID: -630749051, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -717991256, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: 1896816050, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: 7400000, guid: 193313d658d7aff43bd02fed94989827, type: 2} + - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 21300000, guid: d996920a4a1f8134aabc7244613b1f5d, type: 3} + - {fileID: 5105121612671048028, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 3528294649239010760, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 6258217570802260177, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 6571995522228188845, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 21300000, guid: 0c83a04b3389e144cabe25c2e0c6fa60, type: 3} + - {fileID: 3067888778417102641, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 2800000, guid: 0c83a04b3389e144cabe25c2e0c6fa60, type: 3} + - {fileID: -83483519, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -55215574, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -357776312, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: 295794219, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -1308045171, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -1032384029, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -2131185455, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -2116817227, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: 700202679, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -348269802, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -2105769957, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: 11400000, guid: 6bb26e5b81e57284aa2c1a41c990cf6c, type: 2} + - {fileID: 11400000, guid: 2d73a032c498a904495086f56105eb89, type: 2} + - {fileID: 5295280968827265955, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + - {fileID: 2800000, guid: d996920a4a1f8134aabc7244613b1f5d, type: 3} + - {fileID: 3950132547103660250, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 7949147313755412997, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 4784508413772615938, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 1743613205134904381, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 8843322178977931602, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 2800000, guid: df62d7cb36be0824c86b65e492ed2c98, type: 3} + - {fileID: 21300000, guid: df62d7cb36be0824c86b65e492ed2c98, type: 3} + - {fileID: 7273047838430584260, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 3421876157422990341, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 8816311266647585904, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 2347265085560077571, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 4181754186166374592, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 2572418115146805507, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 2554257353944664774, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 8316624014678108907, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 2800000, guid: 060b7b38f49eb81429c70495ed1331c7, type: 3} + - {fileID: 8782080372564717854, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 3982478712223789523, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 628233043269791667, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 7798283344985895026, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 5753499899592356063, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 21300000, guid: 060b7b38f49eb81429c70495ed1331c7, type: 3} + - {fileID: 1068767711000079592, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 5244295604767873910, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 2800000, guid: 2f7974e696a920d41819abef845b6350, type: 3} + - {fileID: 10763, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10761, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 630078276818980878, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 578024413890116002, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 93442473689958131, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 7523983491215687038, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 1436287154886143937, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 8430808257815661382, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} --- !u!4 &1650476989 Transform: m_ObjectHideFlags: 0 @@ -2279,6 +2025,4 @@ SceneRoots: - {fileID: 757682347168729909} - {fileID: 5978091752429385269} - {fileID: 549239009} - - {fileID: 263135844} - - {fileID: 541893779} - {fileID: 1650476989} diff --git a/client/Assets/Plugins/Easy Save 3/Resources/ES3/ES3GlobalReferences.asset b/client/Assets/Plugins/Easy Save 3/Resources/ES3/ES3GlobalReferences.asset index a6e0a66..b94272f 100644 --- a/client/Assets/Plugins/Easy Save 3/Resources/ES3/ES3GlobalReferences.asset +++ b/client/Assets/Plugins/Easy Save 3/Resources/ES3/ES3GlobalReferences.asset @@ -256,4 +256,75 @@ MonoBehaviour: - {fileID: 2800000, guid: d084d55442d208241b5b3be0eb538f9b, type: 3} - {fileID: 11400000, guid: 83d42e1d762810e4998bd389027d388d, type: 2} - {fileID: 2800000, guid: b8ba3923a6094cd48b85425f47fd7450, type: 3} - _Values: 5337fb48ba082f4c11da0277d9afca7edd7b5efceef80727e387642fb5503d06682bd2536d6caf50e27d054df1dabd62d362220ad1fe5b4dd20890cda9a8005df33fe6687a9065682199130e729def7895d8ef46b1dab61aea7cbe563ea127283a17a609b254103becde2445c0b04258583792a3187b68486828d5db4638563c3fc4b876bc06d53fc8b35ad2b5705938c69a5089cb34be4b7f115e7680cb0a4ce3b977a1034eb51fa8fc8664117feb6e01cb08d748b7900e9e1ea5806706dd7405d661b4ab5e5235590b7edfd2fb0b53c80735ccfd696e64b779c0dd0bc978512705a1c4e2c93d5fe2c181c2c64ec35d45c66a241e3041716dd34732a6b98e01cbd5afbfeb312b053d1dcbb8111980158f100aa834627e4e801055f30791b7341e456a049e475a770f909ec304057d79ada23f483cc8ca68a89fc00479e1f3312a0028a97c7a4b2a6c819aa3c3ba497973315f552eff8f180fd25cff8755fd1011962244d1d95b638f4099a91e4ca23e6ae3a9ef7e20e402b5d008a7cfecc425fcf5080c775dd4384c2a712b5ae01c3bc1829056e9b44c5820c42d7dafd45d5adcc628f903af460cf08fc4576ef0a36bee44e64d5c6e3b46574f134ccfa976207934f9def7eac0113c84477978a3c70f6899906bed0ffd6d751eafac3d6d2447e85c2f5c167d9c0384d511d727c2cd05e9dd4c96c61df268c873abe96692b05757716de38c950616027318e701d9b938ecb4951bb9ba0d366ac7258a2985691686682e9830b1917de563993936da6a10468c034e026b62639dc8b2ac456fbf7723d09295f7ad97624613ff1c54476d705d14449c821b131a07cbfc67fee538755cdde99ab82be6680a5f6ae99581481c36224f312a22f407428870d44ed09b2b4b74c0765dd2b8770553581d79025078ece7cd246af8b57fd2f15730ba1219393dc161df3e2e41082438c98184ed7e4038f8e7660277c15242bf5b938578430c391e5a3a632fb61ad82900ced1cb051b7217f8c22ab3374c83b49d7fd2ad83627cd647659343dc08bf32c2d38870dc75bb3f059c7005377919f242e732c912295962b558ec95502ec6107ea38af52b12d928c592a8e6f27e0dc07d8686c33b0b20982cea2534624f9134d75f8693ee2239cff0f5fb807f3f55334a2c17caa776b3767c0e37bf135bc67502740f93f75eafa04cb6d3460f60196c3f597e8e665a23b1ec03ef03a57a446b458e7d0cb1172ba87d767df1a36d9ae3d95b009325360fa897c07ffa4d54052d06c17461220b44d77bd8f4222832baf1802a8b0f6825c2ce9fd80ffe2b31d1caceff9721320657a9839a1db2693492aa1edd5882c558622b6b535eaca0471cb1fb55dd68bd17fd7eacb11eb8557339d44764e04dd84dfa8962944a215803bf4d8ffabf8ba54519801c4aa39a042eb094595704ae26148381f1f3bd803b0f3d58ae6b7306af7169480d973327703234d0382ce97e8411277b7d417c980367460d88fb486fa2551c183fb24342b85b11bf278db968f8412c62bc0877910b014d7452269e75e95b728e4801be36546933d9513bc0912023ebb830194c652175f3c199300f6e4264d6cb0047b1faff6248d9c3af1db83e226a8aeda95afd570c932cf20362dba53a6a12ee736e972b1ab892d073a171583b8376c6848099092dddf34a7bf70300247ffe182fa6b291014af80f37d21c9503852d86d9a22abb021d1b5062e1a6124b6e540b5ca7d76b2e1b3b328757beff0677b100da75263956b91b4cc203f3e35d193c3581efc6a353c357be66f733ab5e1c4aeb2fa637d5471bb516c2232d310d1f8fa193f481f63d5653181e67d25e12c6aade4dde120451127d9ca5dd65776bda4eb7986de8956554adda521fb7e048570488ce0b7eec316b0d5a8ee264e445cb84f8b58af77f22eb875f7412a88f365ee4fbe1ee4577593be82c608e0782489320889abe2abe5f7b991c7be087e114646fd00297fca81004ae0e8cdc204f0d0ba7e2f220f477765ea59aabd604874c0717c3fdd884df6a88886093c6b4c45bb6f17977952cca6f08a55b0d9d02c608355b85c45c513570884c7ba8550b3c12960a0a1a75f049331ecc0acdd62e32793fa7a295d0000006e26d7792f7ab9245eeae1ed7a4fcb9581b026aad68a741690b114160e092e4044de14fbc5a3a8e166f7f8b7effe078348d946e883e6c4446ccc6a2e25a30e93ce5d5b6a08124795daf8309cfc3ab5679130308122790ba14532d96ac61dfba3cb1403cef4fcffe4d8b9f7cb63d38233cc5b151be74e5eb3aa4ba393fccbd2126fc0cfca62fe90f2ab9e025e1f4ea9025333bbd5b95f4ad6ede1f5c7887c0e301de18b37e04d89113092d0ba01a81aa391dbc2fb6e7512632dcc9fa81aab5332410e2ea21b5973076ac33aa42444bdb21679763d3485ad74f55fcfc69d508ac3aa024a7efd4778b76cf42f87835c7b66e709235368eb4882223daa28b53508471468e532ab47f0a6d66564e9c6ca58c14863b08a2927fdf62deceb0f52aeaae700baa148b6f6ef70e7938631afddb717ca3cc576426e1e81cba378d4f3ea9525b78bf8e07f80cc2215c41200f6b433e45d720a54fd113b7217a79f2f38ec9d330ba0773223a66de286ed1c4e99b4196058ceed11e38e59f39d2a75d920706af5f5941576339d09f7a65cfef3aa09aea0a1750273e3e2a4a62efead736424b5675e3fd62070da13767 + - {fileID: 3528294649239010760, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 6258217570802260177, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 6571995522228188845, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 21300000, guid: 0c83a04b3389e144cabe25c2e0c6fa60, type: 3} + - {fileID: 3067888778417102641, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 2800000, guid: 0c83a04b3389e144cabe25c2e0c6fa60, type: 3} + - {fileID: 7400000, guid: 193313d658d7aff43bd02fed94989827, type: 2} + - {fileID: 1896816050, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -717991256, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -630749051, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: 7400000, guid: 05d0e22070abf854a8fb82cf7fdb43af, type: 2} + - {fileID: 7400000, guid: 8466cb9097718e741be6f31c9ba5237e, type: 2} + - {fileID: 7400000, guid: a7083ef8d62a92b48b2a9a1e286c2c35, type: 2} + - {fileID: 7400000, guid: 0130929d1238a744bae0d65bc8a842aa, type: 2} + - {fileID: 7400000, guid: 6a40d89479a66c54dac7a2a2be985413, type: 2} + - {fileID: 7400000, guid: b120de01e21de274bb0254cb788618b2, type: 2} + - {fileID: 7400000, guid: 26679f0f6b973684c81eb91967b4a74e, type: 2} + - {fileID: -1404362506, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -83483519, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -55215574, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -357776312, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: 295794219, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -1308045171, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -1032384029, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -2131185455, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -2116817227, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: 700202679, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -348269802, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -2105769957, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: 11400000, guid: 6bb26e5b81e57284aa2c1a41c990cf6c, type: 2} + - {fileID: 11400000, guid: 2d73a032c498a904495086f56105eb89, type: 2} + - {fileID: 1318221636598892449, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 5295280968827265955, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + - {fileID: 5105121612671048028, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 21300000, guid: d996920a4a1f8134aabc7244613b1f5d, type: 3} + - {fileID: 2800000, guid: d996920a4a1f8134aabc7244613b1f5d, type: 3} + - {fileID: 3950132547103660250, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 7949147313755412997, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 4784508413772615938, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 1743613205134904381, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 2800000, guid: df62d7cb36be0824c86b65e492ed2c98, type: 3} + - {fileID: 21300000, guid: df62d7cb36be0824c86b65e492ed2c98, type: 3} + - {fileID: 7273047838430584260, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 3421876157422990341, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 8816311266647585904, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 2347265085560077571, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 4181754186166374592, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 2572418115146805507, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 2554257353944664774, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 8316624014678108907, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2800000, guid: 2f7974e696a920d41819abef845b6350, type: 3} + - {fileID: 10763, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10761, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 5244295604767873910, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 1068767711000079592, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 8782080372564717854, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 8843322178977931602, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 2800000, guid: 060b7b38f49eb81429c70495ed1331c7, type: 3} + - {fileID: 21300000, guid: 060b7b38f49eb81429c70495ed1331c7, type: 3} + - {fileID: 5753499899592356063, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 7798283344985895026, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 628233043269791667, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 3982478712223789523, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 630078276818980878, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 578024413890116002, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 93442473689958131, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 7523983491215687038, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 1436287154886143937, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 8430808257815661382, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + _Values: 5337fb48ba082f4c11da0277d9afca7edd7b5efceef80727e387642fb5503d06682bd2536d6caf50e27d054df1dabd62d362220ad1fe5b4dd20890cda9a8005df33fe6687a9065682199130e729def7895d8ef46b1dab61aea7cbe563ea127283a17a609b254103becde2445c0b04258583792a3187b68486828d5db4638563c3fc4b876bc06d53fc8b35ad2b5705938c69a5089cb34be4b7f115e7680cb0a4ce3b977a1034eb51fa8fc8664117feb6e01cb08d748b7900e9e1ea5806706dd7405d661b4ab5e5235590b7edfd2fb0b53c80735ccfd696e64b779c0dd0bc978512705a1c4e2c93d5fe2c181c2c64ec35d45c66a241e3041716dd34732a6b98e01cbd5afbfeb312b053d1dcbb8111980158f100aa834627e4e801055f30791b7341e456a049e475a770f909ec304057d79ada23f483cc8ca68a89fc00479e1f3312a0028a97c7a4b2a6c819aa3c3ba497973315f552eff8f180fd25cff8755fd1011962244d1d95b638f4099a91e4ca23e6ae3a9ef7e20e402b5d008a7cfecc425fcf5080c775dd4384c2a712b5ae01c3bc1829056e9b44c5820c42d7dafd45d5adcc628f903af460cf08fc4576ef0a36bee44e64d5c6e3b46574f134ccfa976207934f9def7eac0113c84477978a3c70f6899906bed0ffd6d751eafac3d6d2447e85c2f5c167d9c0384d511d727c2cd05e9dd4c96c61df268c873abe96692b05757716de38c950616027318e701d9b938ecb4951bb9ba0d366ac7258a2985691686682e9830b1917de563993936da6a10468c034e026b62639dc8b2ac456fbf7723d09295f7ad97624613ff1c54476d705d14449c821b131a07cbfc67fee538755cdde99ab82be6680a5f6ae99581481c36224f312a22f407428870d44ed09b2b4b74c0765dd2b8770553581d79025078ece7cd246af8b57fd2f15730ba1219393dc161df3e2e41082438c98184ed7e4038f8e7660277c15242bf5b938578430c391e5a3a632fb61ad82900ced1cb051b7217f8c22ab3374c83b49d7fd2ad83627cd647659343dc08bf32c2d38870dc75bb3f059c7005377919f242e732c912295962b558ec95502ec6107ea38af52b12d928c592a8e6f27e0dc07d8686c33b0b20982cea2534624f9134d75f8693ee2239cff0f5fb807f3f55334a2c17caa776b3767c0e37bf135bc67502740f93f75eafa04cb6d3460f60196c3f597e8e665a23b1ec03ef03a57a446b458e7d0cb1172ba87d767df1a36d9ae3d95b009325360fa897c07ffa4d54052d06c17461220b44d77bd8f4222832baf1802a8b0f6825c2ce9fd80ffe2b31d1caceff9721320657a9839a1db2693492aa1edd5882c558622b6b535eaca0471cb1fb55dd68bd17fd7eacb11eb8557339d44764e04dd84dfa8962944a215803bf4d8ffabf8ba54519801c4aa39a042eb094595704ae26148381f1f3bd803b0f3d58ae6b7306af7169480d973327703234d0382ce97e8411277b7d417c980367460d88fb486fa2551c183fb24342b85b11bf278db968f8412c62bc0877910b014d7452269e75e95b728e4801be36546933d9513bc0912023ebb830194c652175f3c199300f6e4264d6cb0047b1faff6248d9c3af1db83e226a8aeda95afd570c932cf20362dba53a6a12ee736e972b1ab892d073a171583b8376c6848099092dddf34a7bf70300247ffe182fa6b291014af80f37d21c9503852d86d9a22abb021d1b5062e1a6124b6e540b5ca7d76b2e1b3b328757beff0677b100da75263956b91b4cc203f3e35d193c3581efc6a353c357be66f733ab5e1c4aeb2fa637d5471bb516c2232d310d1f8fa193f481f63d5653181e67d25e12c6aade4dde120451127d9ca5dd65776bda4eb7986de8956554adda521fb7e048570488ce0b7eec316b0d5a8ee264e445cb84f8b58af77f22eb875f7412a88f365ee4fbe1ee4577593be82c608e0782489320889abe2abe5f7b991c7be087e114646fd00297fca81004ae0e8cdc204f0d0ba7e2f220f477765ea59aabd604874c0717c3fdd884df6a88886093c6b4c45bb6f17977952cca6f08a55b0d9d02c608355b85c45c513570884c7ba8550b3c12960a0a1a75f049331ecc0acdd62e32793fa7a295d0000006e26d7792f7ab9245eeae1ed7a4fcb9581b026aad68a741690b114160e092e4044de14fbc5a3a8e166f7f8b7effe078348d946e883e6c4446ccc6a2e25a30e93ce5d5b6a08124795daf8309cfc3ab5679130308122790ba14532d96ac61dfba3cb1403cef4fcffe4d8b9f7cb63d38233cc5b151be74e5eb3aa4ba393fccbd2126fc0cfca62fe90f2ab9e025e1f4ea9025333bbd5b95f4ad6ede1f5c7887c0e301de18b37e04d89113092d0ba01a81aa391dbc2fb6e7512632dcc9fa81aab5332410e2ea21b5973076ac33aa42444bdb21679763d3485ad74f55fcfc69d508ac3aa024a7efd4778b76cf42f87835c7b66e709235368eb4882223daa28b53508471468e532ab47f0a6d66564e9c6ca58c14863b08a2927fdf62deceb0f52aeaae700baa148b6f6ef70e7938631afddb717ca3cc576426e1e81cba378d4f3ea9525b78bf8e07f80cc2215c41200f6b433e45d720a54fd113b7217a79f2f38ec9d330ba0773223a66de286ed1c4e99b4196058ceed11e38e59f39d2a75d920706af5f5941576339d09f7a65cfef3aa09aea0a1750273e3e2a4a62efead736424b5675e3fd62070da13767c6c6cc8fa925ac21e6f52161bb7f4f1e03ce210c79e6a66ebf2e9b1f9f95b50ab83ed2b8e8d08d26534da4626ebaa6741f3cd7513b60735393c5b2273e343f4f4116aa7dac96353242fbba2c4143ff0389270062be64cf56cc7f25231d65e81df2abdda7efd6387807a51040a646114f3a5060e8cc236e23b8ac4ed28eeeeb24139c1eed21a6f35ea087a4e7ab70507b6fd65e6ec5d0ea313cb9ee438866e90a91342d0a27242d1e44be48457f877747a52cbf9ab3a615424e12d6246ac9183a6366881f61a55d49a93fb2841930b04b41a6e7b52584be15e014a7c505ad767ba60ea7e50f97a900308a0d8b0c6fd67ec221e2c3e163141944ca435d7429d65602736c8650c93332515aac9c4e0dd43f7b03fbfa51f49a2db774c76eaf8db8178a8b7c7900b5aa3ff08288c669a111629f6f52722d54496a9a45d1f20176a046f3f4c242bc68b13b8a347326357b1e76aedd2746ada665774911898664ed33036499d5b4e24f6c73beb52e8a969c562d28de1cb7bee4532ec29242bf76f5043e8550928aa329142ffc7cf00e3a548e54bc5c5e86d07b447fb2de17b32a1b2b04a82b09c7654824663c486e34fb31f3183ef89c42dbbbb57f380db2490200bd10a77e6b400ac70e2f15f43742cb0c8729f39b370acf82ec0afe4ec2031277fc795ab5cbde56d77a65a28f2d16d9f60c06ba76e8554b787a71e227ec21719860438d62a2c43236523f108e7589acb72c7c25a800905102d16165bf51f7adaa8f3877a0e1439e80ea3951ddf265d724317c32505015b6bf5764 diff --git a/client/Assets/Plugins/Easy Save 3/Editor/ES3Asmdefs.unitypackage.meta b/client/Assets/Resources/Art/Role.meta similarity index 67% rename from client/Assets/Plugins/Easy Save 3/Editor/ES3Asmdefs.unitypackage.meta rename to client/Assets/Resources/Art/Role.meta index 550f254..0be363c 100644 --- a/client/Assets/Plugins/Easy Save 3/Editor/ES3Asmdefs.unitypackage.meta +++ b/client/Assets/Resources/Art/Role.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: de41a70ead12af544a4e99a925b269d2 +guid: e68c7049220c973429b57ad4333737c9 +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/client/Assets/Resources/Art/Role/Player.meta b/client/Assets/Resources/Art/Role/Player.meta new file mode 100644 index 0000000..1518c14 --- /dev/null +++ b/client/Assets/Resources/Art/Role/Player.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cdee9da86c0c00d4f8fc8458bd2234a2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/client/Assets/Resources/Art/Role/Player/Idle.asset b/client/Assets/Resources/Art/Role/Player/Idle.asset new file mode 100644 index 0000000..0e337a4 --- /dev/null +++ b/client/Assets/Resources/Art/Role/Player/Idle.asset @@ -0,0 +1,101 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 700ee77955080b443b2b2d565d9f383c, type: 3} + m_Name: Idle + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: + - {fileID: 7400000, guid: 193313d658d7aff43bd02fed94989827, type: 2} + - {fileID: 7400000, guid: b120de01e21de274bb0254cb788618b2, type: 2} + - {fileID: 7400000, guid: 8466cb9097718e741be6f31c9ba5237e, type: 2} + - {fileID: 7400000, guid: 6a40d89479a66c54dac7a2a2be985413, type: 2} + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: animationClips + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[Ether.AnimationSetType, Ether],[UnityEngine.AnimationClip, + UnityEngine.AnimationModule]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.EnumEqualityComparer`1[[Ether.AnimationSetType, + Ether]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 4 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 3 + Data: 1 + - Name: $v + Entry: 10 + Data: 0 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 3 + Data: 2 + - Name: $v + Entry: 10 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 3 + Data: 3 + - Name: $v + Entry: 10 + Data: 2 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 3 + Data: 4 + - Name: $v + Entry: 10 + Data: 3 + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/client/Assets/Resources/Art/Role/Player/Idle.asset.meta b/client/Assets/Resources/Art/Role/Player/Idle.asset.meta new file mode 100644 index 0000000..ef02e94 --- /dev/null +++ b/client/Assets/Resources/Art/Role/Player/Idle.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6bb26e5b81e57284aa2c1a41c990cf6c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/client/Assets/Resources/Art/Role/Player/Idle_Down.anim b/client/Assets/Resources/Art/Role/Player/Idle_Down.anim new file mode 100644 index 0000000..f4667b8 --- /dev/null +++ b/client/Assets/Resources/Art/Role/Player/Idle_Down.anim @@ -0,0 +1,78 @@ +%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: Idle_Down + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 295794219, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - time: 0.33333334 + value: {fileID: -1308045171, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - time: 0.6666667 + value: {fileID: 295794219, guid: 42573517692667044a6784f3a56fd63f, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 295794219, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -1308045171, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: 295794219, guid: 42573517692667044a6784f3a56fd63f, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.68333334 + 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: [] diff --git a/client/Assets/Resources/Art/Role/Player/Idle_Down.anim.meta b/client/Assets/Resources/Art/Role/Player/Idle_Down.anim.meta new file mode 100644 index 0000000..903467d --- /dev/null +++ b/client/Assets/Resources/Art/Role/Player/Idle_Down.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b120de01e21de274bb0254cb788618b2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/client/Assets/Resources/Art/Role/Player/Idle_Left.anim b/client/Assets/Resources/Art/Role/Player/Idle_Left.anim new file mode 100644 index 0000000..75497ed --- /dev/null +++ b/client/Assets/Resources/Art/Role/Player/Idle_Left.anim @@ -0,0 +1,78 @@ +%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: Idle_Left + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -1404362506, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - time: 0.33333334 + value: {fileID: -83483519, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - time: 0.6666667 + value: {fileID: -1404362506, guid: 42573517692667044a6784f3a56fd63f, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -1404362506, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -83483519, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -1404362506, guid: 42573517692667044a6784f3a56fd63f, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.68333334 + 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: [] diff --git a/client/Assets/Resources/Art/Role/Player/Idle_Left.anim.meta b/client/Assets/Resources/Art/Role/Player/Idle_Left.anim.meta new file mode 100644 index 0000000..09783c4 --- /dev/null +++ b/client/Assets/Resources/Art/Role/Player/Idle_Left.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8466cb9097718e741be6f31c9ba5237e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/client/Assets/Resources/Art/Role/Player/Idle_Right.anim b/client/Assets/Resources/Art/Role/Player/Idle_Right.anim new file mode 100644 index 0000000..79cea9a --- /dev/null +++ b/client/Assets/Resources/Art/Role/Player/Idle_Right.anim @@ -0,0 +1,78 @@ +%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: Idle_Right + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -55215574, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - time: 0.33333334 + value: {fileID: -357776312, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - time: 0.6666667 + value: {fileID: -55215574, guid: 42573517692667044a6784f3a56fd63f, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -55215574, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -357776312, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -55215574, guid: 42573517692667044a6784f3a56fd63f, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.68333334 + 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: [] diff --git a/client/Assets/Resources/Art/Role/Player/Idle_Right.anim.meta b/client/Assets/Resources/Art/Role/Player/Idle_Right.anim.meta new file mode 100644 index 0000000..d6b3234 --- /dev/null +++ b/client/Assets/Resources/Art/Role/Player/Idle_Right.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6a40d89479a66c54dac7a2a2be985413 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/client/Assets/Resources/Art/Role/Player/Idle_Top.anim b/client/Assets/Resources/Art/Role/Player/Idle_Top.anim new file mode 100644 index 0000000..9192116 --- /dev/null +++ b/client/Assets/Resources/Art/Role/Player/Idle_Top.anim @@ -0,0 +1,78 @@ +%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: Idle_Top + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -1518724910, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - time: 0.33333334 + value: {fileID: -717991256, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - time: 0.6666667 + value: {fileID: -1518724910, guid: 42573517692667044a6784f3a56fd63f, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -1518724910, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -717991256, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -1518724910, guid: 42573517692667044a6784f3a56fd63f, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.68333334 + 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: [] diff --git a/client/Assets/Resources/Art/Role/Player/Idle_Top.anim.meta b/client/Assets/Resources/Art/Role/Player/Idle_Top.anim.meta new file mode 100644 index 0000000..94fb458 --- /dev/null +++ b/client/Assets/Resources/Art/Role/Player/Idle_Top.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 193313d658d7aff43bd02fed94989827 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/client/Assets/Resources/Art/Role/Player/Walk.asset b/client/Assets/Resources/Art/Role/Player/Walk.asset new file mode 100644 index 0000000..02d5bd2 --- /dev/null +++ b/client/Assets/Resources/Art/Role/Player/Walk.asset @@ -0,0 +1,101 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 700ee77955080b443b2b2d565d9f383c, type: 3} + m_Name: Walk + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: + - {fileID: 7400000, guid: 0130929d1238a744bae0d65bc8a842aa, type: 2} + - {fileID: 7400000, guid: 05d0e22070abf854a8fb82cf7fdb43af, type: 2} + - {fileID: 7400000, guid: a7083ef8d62a92b48b2a9a1e286c2c35, type: 2} + - {fileID: 7400000, guid: 26679f0f6b973684c81eb91967b4a74e, type: 2} + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: animationClips + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[Ether.AnimationSetType, Ether],[UnityEngine.AnimationClip, + UnityEngine.AnimationModule]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.EnumEqualityComparer`1[[Ether.AnimationSetType, + Ether]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 4 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 3 + Data: 2 + - Name: $v + Entry: 10 + Data: 0 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 3 + Data: 1 + - Name: $v + Entry: 10 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 3 + Data: 3 + - Name: $v + Entry: 10 + Data: 2 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 3 + Data: 4 + - Name: $v + Entry: 10 + Data: 3 + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/client/Assets/Resources/Art/Role/Player/Walk.asset.meta b/client/Assets/Resources/Art/Role/Player/Walk.asset.meta new file mode 100644 index 0000000..c5b1545 --- /dev/null +++ b/client/Assets/Resources/Art/Role/Player/Walk.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2d73a032c498a904495086f56105eb89 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/client/Assets/Resources/Art/Role/Player/Walk_Down.anim b/client/Assets/Resources/Art/Role/Player/Walk_Down.anim new file mode 100644 index 0000000..6f02d92 --- /dev/null +++ b/client/Assets/Resources/Art/Role/Player/Walk_Down.anim @@ -0,0 +1,84 @@ +%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: Walk_Down + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 295794219, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - time: 0.16666667 + value: {fileID: -1032384029, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - time: 0.33333334 + value: {fileID: -1308045171, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - time: 0.5 + value: {fileID: -2131185455, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - time: 0.6666667 + value: {fileID: 295794219, guid: 42573517692667044a6784f3a56fd63f, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 295794219, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -1032384029, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -1308045171, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -2131185455, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: 295794219, guid: 42573517692667044a6784f3a56fd63f, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.68333334 + 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: [] diff --git a/client/Assets/Resources/Art/Role/Player/Walk_Down.anim.meta b/client/Assets/Resources/Art/Role/Player/Walk_Down.anim.meta new file mode 100644 index 0000000..ce6df05 --- /dev/null +++ b/client/Assets/Resources/Art/Role/Player/Walk_Down.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0130929d1238a744bae0d65bc8a842aa +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/client/Assets/Resources/Art/Role/Player/Walk_Left.anim b/client/Assets/Resources/Art/Role/Player/Walk_Left.anim new file mode 100644 index 0000000..86c4953 --- /dev/null +++ b/client/Assets/Resources/Art/Role/Player/Walk_Left.anim @@ -0,0 +1,84 @@ +%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: Walk_Left + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -2116817227, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - time: 0.16666667 + value: {fileID: -83483519, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - time: 0.33333334 + value: {fileID: 700202679, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - time: 0.5 + value: {fileID: -1404362506, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - time: 0.6666667 + value: {fileID: -2116817227, guid: 42573517692667044a6784f3a56fd63f, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -2116817227, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -83483519, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: 700202679, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -1404362506, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -2116817227, guid: 42573517692667044a6784f3a56fd63f, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.68333334 + 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: [] diff --git a/client/Assets/Resources/Art/Role/Player/Walk_Left.anim.meta b/client/Assets/Resources/Art/Role/Player/Walk_Left.anim.meta new file mode 100644 index 0000000..651c943 --- /dev/null +++ b/client/Assets/Resources/Art/Role/Player/Walk_Left.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a7083ef8d62a92b48b2a9a1e286c2c35 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/client/Assets/Resources/Art/Role/Player/Walk_Right.anim b/client/Assets/Resources/Art/Role/Player/Walk_Right.anim new file mode 100644 index 0000000..1a6f1ac --- /dev/null +++ b/client/Assets/Resources/Art/Role/Player/Walk_Right.anim @@ -0,0 +1,84 @@ +%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: Walk_Right + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -348269802, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - time: 0.16666667 + value: {fileID: -55215574, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - time: 0.33333334 + value: {fileID: -2105769957, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - time: 0.5 + value: {fileID: -357776312, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - time: 0.6666667 + value: {fileID: -348269802, guid: 42573517692667044a6784f3a56fd63f, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -348269802, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -55215574, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -2105769957, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -357776312, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -348269802, guid: 42573517692667044a6784f3a56fd63f, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.68333334 + 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: [] diff --git a/client/Assets/Resources/Art/Role/Player/Walk_Right.anim.meta b/client/Assets/Resources/Art/Role/Player/Walk_Right.anim.meta new file mode 100644 index 0000000..42449aa --- /dev/null +++ b/client/Assets/Resources/Art/Role/Player/Walk_Right.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 26679f0f6b973684c81eb91967b4a74e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/client/Assets/Resources/Art/Role/Player/Walk_Top.anim b/client/Assets/Resources/Art/Role/Player/Walk_Top.anim new file mode 100644 index 0000000..5c1a102 --- /dev/null +++ b/client/Assets/Resources/Art/Role/Player/Walk_Top.anim @@ -0,0 +1,84 @@ +%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: Walk_Top + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -1518724910, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - time: 0.16666667 + value: {fileID: 1896816050, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - time: 0.33333334 + value: {fileID: -717991256, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - time: 0.5 + value: {fileID: -630749051, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - time: 0.6666667 + value: {fileID: -1518724910, guid: 42573517692667044a6784f3a56fd63f, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -1518724910, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: 1896816050, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -717991256, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -630749051, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: -1518724910, guid: 42573517692667044a6784f3a56fd63f, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.68333334 + 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: [] diff --git a/client/Assets/Resources/Art/Role/Player/Walk_Top.anim.meta b/client/Assets/Resources/Art/Role/Player/Walk_Top.anim.meta new file mode 100644 index 0000000..7de1494 --- /dev/null +++ b/client/Assets/Resources/Art/Role/Player/Walk_Top.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 05d0e22070abf854a8fb82cf7fdb43af +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/client/Assets/Resources/Art/UI/member.png b/client/Assets/Resources/Art/Role/Player/member.png similarity index 100% rename from client/Assets/Resources/Art/UI/member.png rename to client/Assets/Resources/Art/Role/Player/member.png diff --git a/client/Assets/Resources/Art/UI/member.png.meta b/client/Assets/Resources/Art/Role/Player/member.png.meta similarity index 87% rename from client/Assets/Resources/Art/UI/member.png.meta rename to client/Assets/Resources/Art/Role/Player/member.png.meta index e753bc3..3727378 100644 --- a/client/Assets/Resources/Art/UI/member.png.meta +++ b/client/Assets/Resources/Art/Role/Player/member.png.meta @@ -93,6 +93,32 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: @@ -104,8 +130,8 @@ TextureImporter: y: 589 width: 80 height: 164 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -125,8 +151,8 @@ TextureImporter: y: 589 width: 77 height: 164 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -146,8 +172,8 @@ TextureImporter: y: 589 width: 80 height: 164 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -167,8 +193,8 @@ TextureImporter: y: 589 width: 77 height: 164 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -188,8 +214,8 @@ TextureImporter: y: 397 width: 74 height: 168 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -209,8 +235,8 @@ TextureImporter: y: 396 width: 74 height: 169 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -230,8 +256,8 @@ TextureImporter: y: 397 width: 74 height: 168 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -251,8 +277,8 @@ TextureImporter: y: 397 width: 73 height: 168 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -272,8 +298,8 @@ TextureImporter: y: 204 width: 74 height: 168 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -293,8 +319,8 @@ TextureImporter: y: 204 width: 74 height: 168 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -314,8 +340,8 @@ TextureImporter: y: 204 width: 74 height: 168 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -335,8 +361,8 @@ TextureImporter: y: 204 width: 73 height: 168 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -356,8 +382,8 @@ TextureImporter: y: 15 width: 80 height: 165 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -377,8 +403,8 @@ TextureImporter: y: 15 width: 77 height: 165 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -398,8 +424,8 @@ TextureImporter: y: 15 width: 80 height: 165 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -419,8 +445,8 @@ TextureImporter: y: 15 width: 77 height: 165 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] diff --git a/client/Assets/Resources/Art/UI/Font/UI_FONT_Num_1.png.meta b/client/Assets/Resources/Art/UI/Font/UI_FONT_Num_1.png.meta index 37d0498..b958dd9 100644 --- a/client/Assets/Resources/Art/UI/Font/UI_FONT_Num_1.png.meta +++ b/client/Assets/Resources/Art/UI/Font/UI_FONT_Num_1.png.meta @@ -93,9 +93,266 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: UI_FONT_Num_1_0 + rect: + serializedVersion: 2 + x: 0 + y: 88 + width: 24 + height: 40 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: eae257cad0d0d3d4189ca5e9621e90d2 + internalID: 268119968 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: UI_FONT_Num_1_1 + rect: + serializedVersion: 2 + x: 24 + y: 88 + width: 24 + height: 40 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1d6d8462268d8ce4b8bf8e269e786abd + internalID: 2104157425 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: UI_FONT_Num_1_2 + rect: + serializedVersion: 2 + x: 48 + y: 88 + width: 24 + height: 40 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 085014acfe2130a47a2e3ef0036ef3c8 + internalID: -625084028 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: UI_FONT_Num_1_3 + rect: + serializedVersion: 2 + x: 72 + y: 88 + width: 24 + height: 40 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4f27fd8f8d8ae304baba89311e42718c + internalID: 1820476570 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: UI_FONT_Num_1_4 + rect: + serializedVersion: 2 + x: 96 + y: 88 + width: 24 + height: 40 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 784b92e7fac8f9749b0e31095d68b06f + internalID: 70012780 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: UI_FONT_Num_1_5 + rect: + serializedVersion: 2 + x: 120 + y: 88 + width: 24 + height: 40 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 409a3f2af822d514aa26ff290e3f2ed4 + internalID: -1682774991 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: UI_FONT_Num_1_6 + rect: + serializedVersion: 2 + x: 144 + y: 88 + width: 24 + height: 40 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: fa833ad4dfd98c947b31bd0daae370b3 + internalID: -630486825 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: UI_FONT_Num_1_7 + rect: + serializedVersion: 2 + x: 168 + y: 88 + width: 24 + height: 40 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3164bfdbf55a0a54da14520b6991a5f2 + internalID: 771533175 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: UI_FONT_Num_1_8 + rect: + serializedVersion: 2 + x: 192 + y: 88 + width: 24 + height: 40 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b6e2f8185f88c23488114b343f30362e + internalID: 2110581729 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: UI_FONT_Num_1_9 + rect: + serializedVersion: 2 + x: 216 + y: 88 + width: 24 + height: 40 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e66eddca1ad01064b8fce115da147ad2 + internalID: -914866323 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: UI_FONT_Num_1_10 + rect: + serializedVersion: 2 + x: 0 + y: 48 + width: 24 + height: 40 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 92f51197bfa603d40a62f7acc18a9ab5 + internalID: -932655198 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] @@ -106,7 +363,18 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - nameFileIdTable: {} + nameFileIdTable: + UI_FONT_Num_1_0: 268119968 + UI_FONT_Num_1_1: 2104157425 + UI_FONT_Num_1_10: -932655198 + UI_FONT_Num_1_2: -625084028 + UI_FONT_Num_1_3: 1820476570 + UI_FONT_Num_1_4: 70012780 + UI_FONT_Num_1_5: -1682774991 + UI_FONT_Num_1_6: -630486825 + UI_FONT_Num_1_7: 771533175 + UI_FONT_Num_1_8: 2110581729 + UI_FONT_Num_1_9: -914866323 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/client/Assets/Resources/Art/UI/Main/UI_Nine_Main_Bg.png.meta b/client/Assets/Resources/Art/UI/Main/UI_Nine_Main_Bg.png.meta index 8619751..7919dca 100644 --- a/client/Assets/Resources/Art/UI/Main/UI_Nine_Main_Bg.png.meta +++ b/client/Assets/Resources/Art/UI/Main/UI_Nine_Main_Bg.png.meta @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 198, z: 0, w: 84} + spriteBorder: {x: 1341, y: 198, z: 520, w: 84} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -93,6 +93,32 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/client/Assets/Resources/Config/GlobalSettings.asset b/client/Assets/Resources/Config/GlobalSettings.asset index 2d6e6d0..90d54fd 100644 --- a/client/Assets/Resources/Config/GlobalSettings.asset +++ b/client/Assets/Resources/Config/GlobalSettings.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c5ac578b65530ce44be05b4dd02c3247, type: 3} m_Name: GlobalSettings m_EditorClassIdentifier: - startFrame: LoginFrame - startScence: Boot + startFrame: MainFrame + startScence: DiningCar diff --git a/client/Assets/Resources/Prefabs/Frames/Main/MainFrame.prefab b/client/Assets/Resources/Prefabs/Frames/Main/MainFrame.prefab index 6c68f2f..909774e 100644 --- a/client/Assets/Resources/Prefabs/Frames/Main/MainFrame.prefab +++ b/client/Assets/Resources/Prefabs/Frames/Main/MainFrame.prefab @@ -1,5 +1,222 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &93442473689958131 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7523983491215687038} + m_Layer: 0 + m_Name: ShortcutMenu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7523983491215687038 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 93442473689958131} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 630078276818980878} + 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: 84.307846} + m_SizeDelta: {x: 722.8802, y: 113.8981} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &578024413890116002 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 630078276818980878} + m_Layer: 0 + m_Name: DownMenu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &630078276818980878 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 578024413890116002} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8430808257815661382} + - {fileID: 7523983491215687038} + m_Father: {fileID: 3490045521475080903} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 80.11807} + m_SizeDelta: {x: 0, y: 160.2361} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1068767711000079592 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5244295604767873910} + m_Layer: 0 + m_Name: TimeRoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5244295604767873910 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1068767711000079592} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3490045521475080903} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -376.04065, y: -74.99063} + m_SizeDelta: {x: 243.8984, y: 104.0512} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1436287154886143937 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8430808257815661382} + m_Layer: 0 + m_Name: ShortcutKeyRoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8430808257815661382 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1436287154886143937} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 630078276818980878} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 214.00275, y: 56.949} + m_SizeDelta: {x: 428.0057, y: 113.8981} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2554257353944664774 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4181754186166374592} + - component: {fileID: 8316624014678108907} + - component: {fileID: 2572418115146805507} + m_Layer: 0 + m_Name: Hp3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4181754186166374592 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2554257353944664774} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1318221636598892449} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 44, y: 32} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8316624014678108907 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2554257353944664774} + m_CullTransparentMesh: 1 +--- !u!114 &2572418115146805507 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2554257353944664774} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: df62d7cb36be0824c86b65e492ed2c98, 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 &2816930960907507644 GameObject: m_ObjectHideFlags: 0 @@ -30,8 +247,11 @@ RectTransform: m_Children: - {fileID: 4569178611706505149} - {fileID: 9073674028789606162} - - {fileID: 8923559829592244387} - {fileID: 3528294649239010760} + - {fileID: 8923559829592244387} + - {fileID: 5244295604767873910} + - {fileID: 8782080372564717854} + - {fileID: 630078276818980878} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -56,7 +276,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4569178611706505149 RectTransform: m_ObjectHideFlags: 0 @@ -114,6 +334,221 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4784508413772615938 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3950132547103660250} + - component: {fileID: 1743613205134904381} + - component: {fileID: 7949147313755412997} + m_Layer: 0 + m_Name: Hp1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3950132547103660250 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4784508413772615938} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1318221636598892449} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 44, y: 32} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1743613205134904381 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4784508413772615938} + m_CullTransparentMesh: 1 +--- !u!114 &7949147313755412997 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4784508413772615938} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: d996920a4a1f8134aabc7244613b1f5d, 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 &5295280968827265955 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1318221636598892449} + - component: {fileID: 5105121612671048028} + m_Layer: 0 + m_Name: HpList + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1318221636598892449 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5295280968827265955} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3950132547103660250} + - {fileID: 3421876157422990341} + - {fileID: 4181754186166374592} + m_Father: {fileID: 8923559829592244387} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 304.37048, y: -78.6488} + m_SizeDelta: {x: 503.6188, y: 52.5008} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &5105121612671048028 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5295280968827265955} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 15 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 3 + m_Spacing: 7.43 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 1 + m_ChildScaleHeight: 1 + m_ReverseArrangement: 0 +--- !u!1 &5753499899592356063 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3982478712223789523} + - component: {fileID: 7798283344985895026} + - component: {fileID: 628233043269791667} + m_Layer: 0 + m_Name: Image_1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3982478712223789523 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5753499899592356063} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8782080372564717854} + 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: -13.1, y: 2.3} + m_SizeDelta: {x: 212, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7798283344985895026 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5753499899592356063} + m_CullTransparentMesh: 1 +--- !u!114 &628233043269791667 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5753499899592356063} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 060b7b38f49eb81429c70495ed1331c7, 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 &6571995522228188845 GameObject: m_ObjectHideFlags: 0 @@ -173,7 +608,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -189,6 +624,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7273047838430584260 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3421876157422990341} + - component: {fileID: 2347265085560077571} + - component: {fileID: 8816311266647585904} + m_Layer: 0 + m_Name: Hp2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3421876157422990341 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7273047838430584260} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1318221636598892449} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 44, y: 32} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2347265085560077571 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7273047838430584260} + m_CullTransparentMesh: 1 +--- !u!114 &8816311266647585904 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7273047838430584260} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: d996920a4a1f8134aabc7244613b1f5d, 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 &7513414227915240351 GameObject: m_ObjectHideFlags: 0 @@ -264,6 +774,42 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8843322178977931602 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8782080372564717854} + m_Layer: 0 + m_Name: WeatherRoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8782080372564717854 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8843322178977931602} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3982478712223789523} + m_Father: {fileID: 3490045521475080903} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -127.04, y: -63.508} + m_SizeDelta: {x: 254.1, y: 127.02} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &9100865826815272717 GameObject: m_ObjectHideFlags: 0 @@ -274,7 +820,7 @@ GameObject: m_Component: - component: {fileID: 8923559829592244387} m_Layer: 0 - m_Name: Menu + m_Name: TopMenu m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -291,11 +837,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1318221636598892449} m_Father: {fileID: 3490045521475080903} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 568.77924, y: -59.83313} - m_SizeDelta: {x: 1137.5583, y: 119.6663} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -63.5081} + m_SizeDelta: {x: 0, y: 127.0161} m_Pivot: {x: 0.5, y: 0.5} diff --git a/client/Assets/Scripts/AutoGenerated/FrameBase/MainFrameBase.cs b/client/Assets/Scripts/AutoGenerated/FrameBase/MainFrameBase.cs new file mode 100644 index 0000000..b8a2700 --- /dev/null +++ b/client/Assets/Scripts/AutoGenerated/FrameBase/MainFrameBase.cs @@ -0,0 +1,19 @@ +//=================================================== 代码自动创建，禁止手动修改 =================================================== +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +using TMPro; + +namespace Ether +{ + public class MainFrameBase : FrameBase + { + public override string PrefabPath { get; } = "Prefabs/Frames/Main/MainFrame"; + + protected override void OnInit() + { + + } + } +} diff --git a/client/Assets/Scripts/AutoGenerated/FrameBase/MainFrameBase.cs.meta b/client/Assets/Scripts/AutoGenerated/FrameBase/MainFrameBase.cs.meta new file mode 100644 index 0000000..49516d3 --- /dev/null +++ b/client/Assets/Scripts/AutoGenerated/FrameBase/MainFrameBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 62746de7b0141514bb148544389323d3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/client/Assets/Scripts/Frame/Main.meta b/client/Assets/Scripts/Frame/Main.meta new file mode 100644 index 0000000..2cb0150 --- /dev/null +++ b/client/Assets/Scripts/Frame/Main.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1a58d3e3bd4cd7241931549063cd4e1a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/client/Assets/Scripts/Frame/Main/MainFrame.cs b/client/Assets/Scripts/Frame/Main/MainFrame.cs new file mode 100644 index 0000000..584965b --- /dev/null +++ b/client/Assets/Scripts/Frame/Main/MainFrame.cs @@ -0,0 +1,12 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace Ether +{ + public class MainFrame : MainFrameBase + { + + } +} + diff --git a/client/Assets/Scripts/Frame/Main/MainFrame.cs.meta b/client/Assets/Scripts/Frame/Main/MainFrame.cs.meta new file mode 100644 index 0000000..ca83500 --- /dev/null +++ b/client/Assets/Scripts/Frame/Main/MainFrame.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1fb933b9ea5695b43bc441bd1d18405e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: