From 195f5c0cb4ca72310d3aa7df53362ad6547ca64c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B5=B7?= <1464576565@qq.com> Date: Thu, 31 Jul 2025 20:15:20 +0800 Subject: [PATCH] aaa --- Client/Assets/Btn@test (1).controller | 603 ++++++++++ ....txt.meta => Btn@test (1).controller.meta} | 5 +- Client/Assets/Button.controller | 1009 ++++++++++++++++- Client/Assets/Scenes/Desingn.unity | 792 +++++++++---- .../Scripts/Hotfix/GameLogic/GameLogic.asmdef | 3 +- .../Scripts/Hotfix/GameLogic/TestMono.cs | 3 +- .../Scripts/Hotfix/GameLogic/TestWindow.meta | 3 + .../GameLogic/TestWindow/UIHomeWindow.cs | 55 + .../GameLogic/TestWindow/UIHomeWindow.cs.meta | 3 + .../Scripts/Hotfix/GameLogic/UILoadUpdate.cs | 2 +- .../Hotfix/GameLogic/ui_UITestWindow.cs | 35 + .../Hotfix/GameLogic/ui_UITestWindow.cs.meta | 2 + Client/Assets/Test/GameLogic.dll.bytes | Bin 11776 -> 13312 bytes Client/Assets/Test/GameLogic.pdb.bytes | Bin 25176 -> 26044 bytes Client/Assets/Test/GameProto.dll.bytes | Bin 4608 -> 4608 bytes Client/Assets/Test/GameProto.pdb.bytes | Bin 21556 -> 21556 bytes Client/Assets/uielementconfig.txt | 1 - .../com.alicizax.unity.editor.extension | 2 +- .../Manager/LocalizationModule.cs | 11 +- Client/Packages/com.alicizax.unity.ui | 1 + .../Packages/com.alicizax.unity.ui.extension | 2 +- .../Runtime/Utility/Utility.PlayerPrefs.cs | 16 +- .../UIGenerateConfiguration.asset | 2 +- Client/UserSettings/EditorUserSettings.asset | 4 +- .../Layouts/CurrentMaximizeLayout.dwlt | 324 +++--- Client/UserSettings/Layouts/default-6000.dwlt | 466 ++++---- 26 files changed, 2765 insertions(+), 579 deletions(-) create mode 100644 Client/Assets/Btn@test (1).controller rename Client/Assets/{uielementconfig.txt.meta => Btn@test (1).controller.meta} (52%) create mode 100644 Client/Assets/Scripts/Hotfix/GameLogic/TestWindow.meta create mode 100644 Client/Assets/Scripts/Hotfix/GameLogic/TestWindow/UIHomeWindow.cs create mode 100644 Client/Assets/Scripts/Hotfix/GameLogic/TestWindow/UIHomeWindow.cs.meta create mode 100644 Client/Assets/Scripts/Hotfix/GameLogic/ui_UITestWindow.cs create mode 100644 Client/Assets/Scripts/Hotfix/GameLogic/ui_UITestWindow.cs.meta delete mode 100644 Client/Assets/uielementconfig.txt create mode 160000 Client/Packages/com.alicizax.unity.ui diff --git a/Client/Assets/Btn@test (1).controller b/Client/Assets/Btn@test (1).controller new file mode 100644 index 0000000..0897654 --- /dev/null +++ b/Client/Assets/Btn@test (1).controller @@ -0,0 +1,603 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &-9090774001316443934 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Normal + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !u!1102 &-8693552057324963318 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Normal + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -9090774001316443934} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-6906168766418164292 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Highlighted + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 4989305191645084833} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-6774526650745907050 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pressed + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 8676087848710923419} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-4093880631040413276 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Selected + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 2942374859931494694} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!74 &-3207384325364676137 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Disabled + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !u!1101 &-742765193987355991 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Pressed + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -6774526650745907050} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-546515764025387848 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Disabled + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4498182239900281189} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Btn@test (1) + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: Normal + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Highlighted + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Pressed + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Selected + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Disabled + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 528180310289601023} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &528180310289601023 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -8693552057324963318} + m_Position: {x: 200, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: -6906168766418164292} + m_Position: {x: 235, y: 65, z: 0} + - serializedVersion: 1 + m_State: {fileID: -6774526650745907050} + m_Position: {x: 270, y: 130, z: 0} + - serializedVersion: 1 + m_State: {fileID: -4093880631040413276} + m_Position: {x: 305, y: 195, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4498182239900281189} + m_Position: {x: 340, y: 260, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: + - {fileID: 2608779112498780453} + - {fileID: 560093290910266340} + - {fileID: -742765193987355991} + - {fileID: 1017225522669802059} + - {fileID: -546515764025387848} + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -8693552057324963318} +--- !u!1101 &560093290910266340 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Highlighted + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -6906168766418164292} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1017225522669802059 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Selected + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4093880631040413276} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &2608779112498780453 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Normal + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -8693552057324963318} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!74 &2942374859931494694 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Selected + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !u!1102 &4498182239900281189 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Disabled + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -3207384325364676137} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!74 &4989305191645084833 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Highlighted + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !u!74 &8676087848710923419 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pressed + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Client/Assets/uielementconfig.txt.meta b/Client/Assets/Btn@test (1).controller.meta similarity index 52% rename from Client/Assets/uielementconfig.txt.meta rename to Client/Assets/Btn@test (1).controller.meta index 763af47..4b5f1f7 100644 --- a/Client/Assets/uielementconfig.txt.meta +++ b/Client/Assets/Btn@test (1).controller.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 -guid: cd96f3d9dd2a90d40a81a1d4319ce8f2 -TextScriptImporter: +guid: 75db14477f59de44b96f358d16e02e73 +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 9100000 userData: assetBundleName: assetBundleVariant: diff --git a/Client/Assets/Button.controller b/Client/Assets/Button.controller index 9c71674..a335a3b 100644 --- a/Client/Assets/Button.controller +++ b/Client/Assets/Button.controller @@ -1,5 +1,699 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-8576374866958262256 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Highlighted + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -1189332510667581616} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-6003968167186950823 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Pressed + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 7367296468848834415} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!74 &-3654425328362922469 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pressed + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.32 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 4215373228 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 2526845255 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 2334886179 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 304273561 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.32 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !u!74 &-2486769752253590459 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Disabled + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !u!1101 &-1408962421469086002 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Selected + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4507093007493756659} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-1189332510667581616 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Highlighted + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -607698034180551696} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!74 &-607698034180551696 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Highlighted + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 160 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 170 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SizeDelta.x + path: + classID: 224 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 45 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 52 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SizeDelta.y + path: + classID: 224 + script: {fileID: 0} + flags: 0 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1967290853 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 38095219 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.16666667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 160 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 170 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SizeDelta.x + path: + classID: 224 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 45 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 52 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SizeDelta.y + path: + classID: 224 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !u!1102 &-190787714872654096 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Disabled + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -2486769752253590459} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -8,5 +702,316 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: Button serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: [] + m_AnimatorParameters: + - m_Name: Normal + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Highlighted + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Pressed + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Selected + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Disabled + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 6688734232031279982} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1101 &323046975846036885 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Disabled + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -190787714872654096} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &3519086387243995105 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Normal + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 6558106295707085078} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &4507093007493756659 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Selected + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 8819595223343768633} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &6558106295707085078 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Normal + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 8402517560827762849} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &6688734232031279982 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 6558106295707085078} + m_Position: {x: 440, y: 70, z: 0} + - serializedVersion: 1 + m_State: {fileID: -1189332510667581616} + m_Position: {x: 480, y: 140, z: 0} + - serializedVersion: 1 + m_State: {fileID: 7367296468848834415} + m_Position: {x: 510, y: 200, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4507093007493756659} + m_Position: {x: 550, y: 270, z: 0} + - serializedVersion: 1 + m_State: {fileID: -190787714872654096} + m_Position: {x: 580, y: 330, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: + - {fileID: 3519086387243995105} + - {fileID: -8576374866958262256} + - {fileID: -6003968167186950823} + - {fileID: -1408962421469086002} + - {fileID: 323046975846036885} + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 6558106295707085078} +--- !u!1102 &7367296468848834415 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pressed + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -3654425328362922469} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!74 &8402517560827762849 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Normal + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !u!74 &8819595223343768633 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Selected + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Client/Assets/Scenes/Desingn.unity b/Client/Assets/Scenes/Desingn.unity index 5e68aaf..f2334f9 100644 --- a/Client/Assets/Scenes/Desingn.unity +++ b/Client/Assets/Scenes/Desingn.unity @@ -119,6 +119,122 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &125612302 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1162767588} + m_Modifications: + - target: {fileID: 5177867036417995378, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3} + propertyPath: mBtntest + value: + objectReference: {fileID: 0} + - target: {fileID: 5177867036417995378, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3} + propertyPath: mTextTitl + value: + objectReference: {fileID: 0} + - target: {fileID: 7611974172231861040, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7611974172231861040, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7611974172231861040, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7611974172231861040, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7611974172231861040, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7611974172231861040, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7611974172231861040, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7611974172231861040, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7611974172231861040, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7611974172231861040, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7611974172231861040, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7611974172231861040, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7611974172231861040, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7611974172231861040, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7611974172231861040, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7611974172231861040, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7611974172231861040, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7611974172231861040, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7611974172231861040, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7611974172231861040, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7924938683301344427, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3} + propertyPath: m_TransitionData.colors.m_NormalColor.a + value: 0.34901962 + objectReference: {fileID: 0} + - target: {fileID: 7988604795814338832, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3} + propertyPath: m_Name + value: UITestWindow + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: + - {fileID: 623158043881056883, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3} + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7611974172231861040, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3} + insertIndex: -1 + addedObject: {fileID: 2069737132} + - targetCorrespondingSourceObject: {fileID: 7611974172231861040, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3} + insertIndex: -1 + addedObject: {fileID: 1768216400} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3} --- !u!1 &203844586 GameObject: m_ObjectHideFlags: 0 @@ -240,7 +356,7 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &453805642 +--- !u!1 &835349030 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -248,96 +364,48 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 453805643} - - component: {fileID: 453805646} - - component: {fileID: 453805645} - - component: {fileID: 453805644} + - component: {fileID: 835349031} + - component: {fileID: 835349033} + - component: {fileID: 835349032} m_Layer: 5 - m_Name: TestViewHolder (1) + m_Name: UXImage m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &453805643 +--- !u!224 &835349031 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 453805642} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 835349030} + 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: 2553447207363733383} + m_Father: {fileID: 1768216400} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &453805644 +--- !u!114 &835349032 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 453805642} + m_GameObject: {fileID: 835349030} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d7e92b092d584bb39e5239463f064cbe, type: 3} + m_Script: {fileID: 11500000, guid: af0993b503fa4dd1adf519458df05486, type: 3} m_Name: m_EditorClassIdentifier: - m_Interactable: 0 - m_Mode: 1 - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TransitionData: - targetGraphic: {fileID: 453805645} - transition: 1 - colors: - m_NormalColor: {r: 0.9847498, g: 1, b: 0, a: 1} - m_HighlightedColor: {r: 0, g: 1, b: 0.12997723, a: 1} - m_PressedColor: {r: 1, g: 0, b: 0, a: 1} - m_SelectedColor: {r: 0.23380716, g: 0.033018887, b: 1, a: 1} - m_DisabledColor: {r: 0.7843137, g: 0.7843137, b: 0.7843137, a: 0.5} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - spriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - animationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_ChildTransitions: [] - m_UXGroup: {fileID: 0} - hoverAudioClip: {fileID: 0} - clickAudioClip: {fileID: 0} - m_SelectionState: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &453805645 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 453805642} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 624af9784554f4047997278dfbb22e47, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -355,13 +423,52 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &453805646 + m_ColorType: 0 + m_GradientColor: + serializedVersion: 2 + key0: {r: 0, g: 0, b: 0, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + m_Direction: 0 + m_OriginFlipMode: 0 + m_FlipMode: 0 + m_FlipWithCopy: 1 + m_FlipEdgeHorizontal: 2 + m_FlipEdgeVertical: 5 + m_FlipFillCenter: 3 + m_FlipDirection: 3 +--- !u!222 &835349033 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 453805642} + m_GameObject: {fileID: 835349030} m_CullTransparentMesh: 1 --- !u!1 &961739749 GameObject: @@ -500,6 +607,16 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!224 &1149398277 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7611974172231861040, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3} + m_PrefabInstance: {fileID: 125612302} + m_PrefabAsset: {fileID: 0} +--- !u!224 &1162767588 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3110666966229274110, guid: 9368ff38b2090b2468f8358242026e4b, type: 3} + m_PrefabInstance: {fileID: 1496268631} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1496268631 PrefabInstance: m_ObjectHideFlags: 0 @@ -557,15 +674,10 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 3110666966229274110, guid: 9368ff38b2090b2468f8358242026e4b, type: 3} insertIndex: -1 - addedObject: {fileID: 2553447207363733383} + addedObject: {fileID: 1149398277} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9368ff38b2090b2468f8358242026e4b, type: 3} ---- !u!224 &1496268632 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3110666966229274110, guid: 9368ff38b2090b2468f8358242026e4b, type: 3} - m_PrefabInstance: {fileID: 1496268631} - m_PrefabAsset: {fileID: 0} ---- !u!1 &526598952644250733 +--- !u!1 &1739381811 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -573,32 +685,49 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2553447207363733383} - - component: {fileID: 4801502738679186807} - - component: {fileID: 1839643557661772062} - - component: {fileID: 3878109914955847118} - - component: {fileID: 4801502738679186808} + - component: {fileID: 1739381812} + - component: {fileID: 1739381814} + - component: {fileID: 1739381813} m_Layer: 5 - m_Name: UILoadUpdateWindow + m_Name: UXImage m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &881789250601706820 +--- !u!224 &1739381812 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1739381811} + 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: 2069737132} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1739381813 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5796037856364799285} + m_GameObject: {fileID: 1739381811} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: af0993b503fa4dd1adf519458df05486, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Material: {fileID: 2100000, guid: 624af9784554f4047997278dfbb22e47, type: 2} + m_Color: {r: 1, g: 0.61752665, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -615,115 +744,54 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &1839643557661772062 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 526598952644250733} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: + m_ColorType: 0 + m_GradientColor: serializedVersion: 2 - m_Bits: 55 ---- !u!224 &2553447207363733383 -RectTransform: + key0: {r: 0, g: 0, b: 0, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + m_Direction: 0 + m_OriginFlipMode: 0 + m_FlipMode: 0 + m_FlipWithCopy: 1 + m_FlipEdgeHorizontal: 2 + m_FlipEdgeVertical: 5 + m_FlipFillCenter: 3 + m_FlipDirection: 3 +--- !u!222 &1739381814 +CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 526598952644250733} - 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: 4895621795333603157} - - {fileID: 453805643} - m_Father: {fileID: 1496268632} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &3878109914955847118 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 526598952644250733} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 330876e70d2a63a46b715c69efd1c482, type: 3} - m_Name: - m_EditorClassIdentifier: - AnimationFlow: {fileID: 0} - mImgBackGround: {fileID: 881789250601706820} ---- !u!223 &4801502738679186807 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 526598952644250733} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 1 - m_AdditionalShaderChannelsFlag: -1 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!114 &4801502738679186808 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 526598952644250733} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 505f6b3030031c24f994c1d4b93fbe20, type: 3} - m_Name: - m_EditorClassIdentifier: - btnTest: {fileID: 453805644} - selected: 0 ---- !u!224 &4895621795333603157 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5796037856364799285} - 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: 2553447207363733383} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &5796037856364799285 + m_GameObject: {fileID: 1739381811} + m_CullTransparentMesh: 1 +--- !u!1 &1768216399 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -731,24 +799,358 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4895621795333603157} - - component: {fileID: 8962701528096896734} - - component: {fileID: 881789250601706820} + - component: {fileID: 1768216400} + - component: {fileID: 1768216403} + - component: {fileID: 1768216401} + - component: {fileID: 1768216404} m_Layer: 5 - m_Name: Img@BackGround + m_Name: Button m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!222 &8962701528096896734 +--- !u!224 &1768216400 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1768216399} + 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: 835349031} + m_Father: {fileID: 1149398277} + 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: 19.1, y: 63.7} + m_SizeDelta: {x: 160, y: 64.42} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &1768216401 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1768216399} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: c103b1c0b339fe14eb5e4fea21d45a67, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!222 &1768216403 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5796037856364799285} - m_CullTransparentMesh: 0 + m_GameObject: {fileID: 1768216399} + m_CullTransparentMesh: 1 +--- !u!114 &1768216404 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1768216399} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7e92b092d584bb39e5239463f064cbe, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Interactable: 1 + m_Mode: 0 + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TransitionData: + targetGraphic: {fileID: 0} + transition: 3 + colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1} + m_PressedColor: {r: 0.7843137, g: 0.7843137, b: 0.7843137, a: 1} + m_SelectedColor: {r: 1, g: 1, b: 1, a: 1} + m_DisabledColor: {r: 0.7843137, g: 0.7843137, b: 0.7843137, a: 0.5} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + spriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + animationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_ChildTransitions: [] + m_UXGroup: {fileID: 0} + hoverAudioClip: {fileID: 8300000, guid: 185869ec9d2b4844ca54aa1f616404b9, type: 3} + clickAudioClip: {fileID: 8300000, guid: be441f609df74024dabfd79aef5a2940, type: 3} + m_SelectionState: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &1855178168 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1855178169} + - component: {fileID: 1855178171} + - component: {fileID: 1855178170} + m_Layer: 5 + m_Name: Text@Titl + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1855178169 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1855178168} + 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: 2069737132} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1855178170 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1855178168} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 50 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1855178171 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1855178168} + m_CullTransparentMesh: 1 +--- !u!1 &2069737131 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2069737132} + - component: {fileID: 2069737134} + - component: {fileID: 2069737133} + m_Layer: 5 + m_Name: Btn@test (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2069737132 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2069737131} + 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: 1739381812} + - {fileID: 1855178169} + m_Father: {fileID: 1149398277} + 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: 438, y: -72} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &2069737133 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2069737131} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 75db14477f59de44b96f358d16e02e73, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &2069737134 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2069737131} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7e92b092d584bb39e5239463f064cbe, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Interactable: 1 + m_Mode: 0 + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TransitionData: + targetGraphic: {fileID: 0} + transition: 3 + colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1} + m_PressedColor: {r: 0.7843137, g: 0.7843137, b: 0.7843137, a: 1} + m_SelectedColor: {r: 1, g: 1, b: 1, a: 1} + m_DisabledColor: {r: 0.7843137, g: 0.7843137, b: 0.7843137, a: 0.5} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + spriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + animationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_ChildTransitions: [] + m_UXGroup: {fileID: 0} + hoverAudioClip: {fileID: 0} + clickAudioClip: {fileID: 0} + m_SelectionState: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/GameLogic.asmdef b/Client/Assets/Scripts/Hotfix/GameLogic/GameLogic.asmdef index cb27059..39dc34a 100644 --- a/Client/Assets/Scripts/Hotfix/GameLogic/GameLogic.asmdef +++ b/Client/Assets/Scripts/Hotfix/GameLogic/GameLogic.asmdef @@ -17,7 +17,8 @@ "GUID:e34a5702dd353724aa315fb8011f08c3", "GUID:6055be8ebefd69e48b49212b09b47b2f", "GUID:760f1778adc613f49a4394fb41ff0bbc", - "GUID:f318a940a77af754eb1172da9dc1b400" + "GUID:f318a940a77af754eb1172da9dc1b400", + "GUID:198eb6af143bbc4488e2779d96697e06" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/TestMono.cs b/Client/Assets/Scripts/Hotfix/GameLogic/TestMono.cs index faa6145..3cd1353 100644 --- a/Client/Assets/Scripts/Hotfix/GameLogic/TestMono.cs +++ b/Client/Assets/Scripts/Hotfix/GameLogic/TestMono.cs @@ -2,6 +2,7 @@ using System; using AlicizaX.Event.Runtime; using AlicizaX; using AlicizaX.Resource.Runtime; +using Hotfix.GameLogic.TestWindow; using UnityEditor; using UnityEngine; using UnityEngine.Profiling; @@ -15,7 +16,7 @@ public class TestMono : MonoBehaviour { if (GUILayout.Button("HideUI")) { - GameApp.UI.CloseUI(); + GameApp.UI.ShowUI(); } } } diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/TestWindow.meta b/Client/Assets/Scripts/Hotfix/GameLogic/TestWindow.meta new file mode 100644 index 0000000..df45159 --- /dev/null +++ b/Client/Assets/Scripts/Hotfix/GameLogic/TestWindow.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 828b46d2c5eb4264bbaceb409fc9150b +timeCreated: 1753768359 \ No newline at end of file diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/TestWindow/UIHomeWindow.cs b/Client/Assets/Scripts/Hotfix/GameLogic/TestWindow/UIHomeWindow.cs new file mode 100644 index 0000000..f59de17 --- /dev/null +++ b/Client/Assets/Scripts/Hotfix/GameLogic/TestWindow/UIHomeWindow.cs @@ -0,0 +1,55 @@ +using AlicizaX.UI.Runtime; +using GameLogic.UI; +using UnityEngine; +using AudioType = AlicizaX.Audio.Runtime.AudioType; + +namespace Hotfix.GameLogic.TestWindow +{ + [Window(UILayer.UI)] + public class UIHomeWindow : UIWindow + { + protected override void OnInitialize() + { + baseui.ImgBackGround.color = Color.gray; + baseui.Btntest.onClick.AddListener(OnTestClick); + } + + private void OnTestClick() + { + GameApp.Audio.Play(AudioType.UISound, "A1"); + Debug.Log("aaa"); + // GameApp.UI.ShowUI(); + } + } + + [Window(UILayer.UI)] + public class UITestAWindow : UIWindow + { + protected override void OnInitialize() + { + baseui.ImgBackGround.color = Color.yellow; + baseui.Btntest.onClick.AddListener(OnTestClick); + } + + private void OnTestClick() + { + GameApp.UI.ShowUI(); + } + } + + + [Window(UILayer.UI)] + public class UITestBWindow : UIWindow + { + protected override void OnInitialize() + { + baseui.ImgBackGround.color = Color.blue; + baseui.Btntest.onClick.AddListener(OnTestClick); + } + + private void OnTestClick() + { + CloseSelf(); + } + } +} diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/TestWindow/UIHomeWindow.cs.meta b/Client/Assets/Scripts/Hotfix/GameLogic/TestWindow/UIHomeWindow.cs.meta new file mode 100644 index 0000000..11ed324 --- /dev/null +++ b/Client/Assets/Scripts/Hotfix/GameLogic/TestWindow/UIHomeWindow.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 0edc29f83cc34c5eb513f0666dca292f +timeCreated: 1753768367 \ No newline at end of file diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/UILoadUpdate.cs b/Client/Assets/Scripts/Hotfix/GameLogic/UILoadUpdate.cs index 7cbe301..c08e285 100644 --- a/Client/Assets/Scripts/Hotfix/GameLogic/UILoadUpdate.cs +++ b/Client/Assets/Scripts/Hotfix/GameLogic/UILoadUpdate.cs @@ -9,7 +9,7 @@ using Cysharp.Threading.Tasks; using GameLogic.UI; using UnityEngine; -[Window(UILayer.UI, false)] +[Window(UILayer.UI)] public class UILoadUpdate : UITabWindow { diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/ui_UITestWindow.cs b/Client/Assets/Scripts/Hotfix/GameLogic/ui_UITestWindow.cs new file mode 100644 index 0000000..766756c --- /dev/null +++ b/Client/Assets/Scripts/Hotfix/GameLogic/ui_UITestWindow.cs @@ -0,0 +1,35 @@ +using UnityEngine; +using UnityEngine.UI; +using TMPro; +using Sirenix.OdinInspector; +using AlicizaX.UI.Runtime; +namespace GameLogic.UI +{ + [UIRes(ui_UITestWindow.ResTag, EUIResLoadType.AssetBundle)] + public class ui_UITestWindow : UIHolderObjectBase + { + public const string ResTag = "UITestWindow"; + #region Generated by Script Tool + + [SerializeField] + [ReadOnly] + [HideLabel] + private Image mImgBackGround; + public Image ImgBackGround => mImgBackGround; + + [SerializeField] + [ReadOnly] + [HideLabel] + private UXButton mBtntest; + public UXButton Btntest => mBtntest; + + [SerializeField] + [ReadOnly] + [HideLabel] + private TextMeshProUGUI mTextTitl; + public TextMeshProUGUI TextTitl => mTextTitl; + + + #endregion + } +} diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/ui_UITestWindow.cs.meta b/Client/Assets/Scripts/Hotfix/GameLogic/ui_UITestWindow.cs.meta new file mode 100644 index 0000000..4c155c0 --- /dev/null +++ b/Client/Assets/Scripts/Hotfix/GameLogic/ui_UITestWindow.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: ca1ef561ac5a9b8438b50785de7197dc \ No newline at end of file diff --git a/Client/Assets/Test/GameLogic.dll.bytes b/Client/Assets/Test/GameLogic.dll.bytes index 501756ae1ed4972fb2c7dd145c5af9b45e72bf22..fd576a678bc3878a7aec4aa86c87390460522ba6 100644 GIT binary patch literal 13312 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 kNRFX5v+yqTmU>YAeckcPl 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 Gp#K6^Gc_9k diff --git a/Client/Assets/Test/GameProto.dll.bytes b/Client/Assets/Test/GameProto.dll.bytes index 6fbf5e76a67c8c2b72693a1147655b2cf651a907..c3232215d86c1a7f87038b02a6658b70b865b0e0 100644 GIT binary patch delta 105 zcmZorX;7Ka!Lrv$Z_dV^IqU)|i+-$N-u1y@#(WjCCHm#Hn=LpJ7+He98+A>d!xM`W%@!O9j4TZYpS_)rKy%oijB!7O%jm%Q};58v5 /// 当前用户前缀，用于隔离不同用户的配置项。 /// - public static string CurrentUserPrefix { get; set; } + public static string CurrentUserPrefix + { + get + { + if (string.IsNullOrEmpty(_prefix)) + { + _prefix = Application.productName.ToString(); + } + + return _prefix; + } + set => _prefix = value; + } /// /// 组合完整键名，格式为"[前缀].[原始键名]" diff --git a/Client/ProjectSettings/UIGenerateConfiguration.asset b/Client/ProjectSettings/UIGenerateConfiguration.asset index bcd4c0d..e49274e 100644 --- a/Client/ProjectSettings/UIGenerateConfiguration.asset +++ b/Client/ProjectSettings/UIGenerateConfiguration.asset @@ -42,7 +42,7 @@ MonoBehaviour: - uiElementRegex: Slider componentType: Slider - uiElementRegex: Img - componentType: UXImage + componentType: Image - uiElementRegex: RImg componentType: RawImage - uiElementRegex: Scrollbar diff --git a/Client/UserSettings/EditorUserSettings.asset b/Client/UserSettings/EditorUserSettings.asset index 7d36584..f40b188 100644 --- a/Client/UserSettings/EditorUserSettings.asset +++ b/Client/UserSettings/EditorUserSettings.asset @@ -33,10 +33,10 @@ EditorUserSettings: value: 5001560504060c590f5b0f7245725a44404f1d7c297e2233787e4a36b5e4666b flags: 0 RecentlyUsedSceneGuid-8: - value: 50500404540c580d0f0b5e7543725b44424f4c7a7b7c7734747e4f36e4b1676d + value: 5a07065703500c59585e0e7748770d44444f4a737d2d7f35787d4f63e0b26668 flags: 0 RecentlyUsedSceneGuid-9: - value: 5a07065703500c59585e0e7748770d44444f4a737d2d7f35787d4f63e0b26668 + value: 50500404540c580d0f0b5e7543725b44424f4c7a7b7c7734747e4f36e4b1676d flags: 0 vcSharedLogLevel: value: 0d5e400f0650 diff --git a/Client/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/Client/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index d133b9e..b30cfb8 100644 --- a/Client/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/Client/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -14,9 +14,9 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 3} - - {fileID: 6} - - {fileID: 11} + - {fileID: 8} - {fileID: 13} + - {fileID: 15} m_Position: serializedVersion: 2 x: 0 @@ -49,10 +49,10 @@ MonoBehaviour: m_TextWithWhitespace: "Game\u200B" m_Pos: serializedVersion: 2 - x: 1928 - y: 92 - width: 696 - height: 915 + x: 0 + y: 528 + width: 734 + height: 466 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -70,7 +70,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1920, y: 1080} + m_TargetSize: {x: 734, y: 413} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -79,25 +79,25 @@ MonoBehaviour: m_VSyncEnabled: 0 m_Gizmos: 0 m_Stats: 0 - m_SelectedSizes: 03000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_SelectedSizes: 01000000000000000000000000000000000000000000000000000000000000000000000000000000 m_ZoomArea: m_HRangeLocked: 0 m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -960 - m_HBaseRangeMax: 960 - m_VBaseRangeMin: -540 - m_VBaseRangeMax: 540 + m_HBaseRangeMin: -367 + m_HBaseRangeMax: 367 + m_VBaseRangeMin: -206.5 + m_VBaseRangeMax: 206.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 m_VAllowExceedBaseRangeMax: 1 m_ScaleWithWindow: 0 - m_HSlider: 1 + m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -106,29 +106,55 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 696 - height: 894 - m_Scale: {x: 0.3625, y: 0.3625} - m_Translation: {x: 347.99997, y: 447} + width: 734 + height: 445 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 367, y: 222.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -959.9999 - y: -1233.1034 - width: 1919.9999 - height: 2466.2068 + x: -367 + y: -222.5 + width: 734 + height: 445 m_MinimalGUI: 1 - m_defaultScale: 0.3625 - m_LastWindowPixelSize: {x: 696, y: 915} + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 734, y: 466} m_ClearInEditMode: 1 m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 00000000000000000000 + m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} --- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 4} + - {fileID: 7} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 735 + height: 941 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 8096, y: 16192} + vertical: 1 + controlID: -1 + draggingID: 0 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -138,25 +164,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 0 - width: 697 - height: 941 - m_MinSize: {x: 51, y: 76} - m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 2} + width: 735 + height: 449 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 6} m_Panes: - - {fileID: 4} - {fileID: 5} - - {fileID: 2} - m_Selected: 2 - m_LastSelected: 1 ---- !u!114 &4 + - {fileID: 6} + m_Selected: 1 + m_LastSelected: 0 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -179,8 +204,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 79 - width: 898 - height: 915 + width: 454 + height: 337 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -194,16 +219,16 @@ MonoBehaviour: m_OverlaysVisible: 1 m_ViewTransforms: m_KeySerializationHelper: - - {fileID: -6160161352362109779, guid: 3eeadcbf1ba8317409cc12fb1cadff5b, type: 2} + - {fileID: 6688734232031279982, guid: c103b1c0b339fe14eb5e4fea21d45a67, type: 2} m_ValueSerializationHelper: - - e00: 1 + - e00: 0.3205771 e01: 0 e02: 0 - e03: 0 + e03: 123.74013 e10: 0 - e11: 1 + e11: 0.3205771 e12: 0 - e13: 0 + e13: 136.81012 e20: 0 e21: 0 e22: 1 @@ -213,9 +238,9 @@ MonoBehaviour: e32: 0 e33: 1 m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: 3eeadcbf1ba8317409cc12fb1cadff5b, type: 2} + m_AnimatorController: {fileID: 9100000, guid: c103b1c0b339fe14eb5e4fea21d45a67, type: 2} m_BreadCrumbs: - - m_Target: {fileID: -6160161352362109779, guid: 3eeadcbf1ba8317409cc12fb1cadff5b, type: 2} + - m_Target: {fileID: 6688734232031279982, guid: c103b1c0b339fe14eb5e4fea21d45a67, type: 2} m_ScrollPosition: {x: 0, y: 0} stateMachineGraph: {fileID: 0} stateMachineGraphGUI: {fileID: 0} @@ -228,7 +253,7 @@ MonoBehaviour: m_CurrentEditor: 1 m_LayerEditor: m_SelectedLayerIndex: 0 ---- !u!114 &5 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -249,10 +274,10 @@ MonoBehaviour: m_TextWithWhitespace: "Scene\u200B" m_Pos: serializedVersion: 2 - x: 1928 - y: 92 - width: 843 - height: 915 + x: 0 + y: 79 + width: 734 + height: 423 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -323,12 +348,12 @@ MonoBehaviour: displayed: 1 id: unity-transform-toolbar index: 0 - contents: '{"m_Layout":2,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":-258.9990234375,"y":-238.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":3,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":2,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":24.0,"y":135.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 - snapOffset: {x: -258.99902, y: -238} + snapOffset: {x: 24, y: 135} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 3 + snapCorner: 0 layout: 2 size: {x: 0, y: 0} sizeOverridden: 0 @@ -575,12 +600,12 @@ MonoBehaviour: displayed: 1 id: AINavigationOverlay index: 7 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":-216.0,"y":-278.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":3,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":21.0,"y":-54.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":2,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 - snapOffset: {x: -216, y: -278} + snapOffset: {x: 21, y: -54} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 3 + snapCorner: 2 layout: 4 size: {x: 0, y: 0} sizeOverridden: 0 @@ -815,15 +840,15 @@ MonoBehaviour: m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 0 m_SceneLighting: 1 - m_2DMode: 0 + m_2DMode: 1 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_DebugDrawModesUseInteractiveLightBakingData: 0 m_Position: - m_Target: {x: 1000.4877, y: 1000.71796, z: 895.2147} + m_Target: {x: 1000.21875, y: 1000.3139, z: 1.5496193} speed: 2 - m_Value: {x: 1000.4877, y: 1000.71796, z: 895.2147} + m_Value: {x: 1000.21875, y: 1000.3139, z: 1.5496193} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -851,17 +876,17 @@ MonoBehaviour: m_Size: {x: 0, y: 0} yGrid: m_Fade: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} zGrid: m_Fade: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} @@ -869,17 +894,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 7.792969 + m_Target: 1.2568226 speed: 2 - m_Value: 7.792969 + m_Value: 1.2568226 m_Ortho: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_CameraSettings: m_Speed: 2 m_SpeedNormalized: 1 @@ -896,7 +921,7 @@ MonoBehaviour: m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} m_LastSceneViewOrtho: 0 m_Viewpoint: - m_SceneView: {fileID: 5} + m_SceneView: {fileID: 6} m_CameraOverscanSettings: m_Opacity: 50 m_Scale: 1 @@ -906,7 +931,33 @@ MonoBehaviour: m_LastLockedObject: {fileID: 0} m_LastDebugDrawMode: 35 m_ViewIsLockedToObject: 0 ---- !u!114 &6 +--- !u!114 &7 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: GameView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 449 + width: 735 + height: 492 + m_MinSize: {x: 50, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 2} + m_Panes: + - {fileID: 2} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -919,20 +970,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 7} - {fileID: 9} + - {fileID: 11} m_Position: serializedVersion: 2 - x: 697 + x: 735 y: 0 - width: 330 + width: 165 height: 941 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 27 + controlID: 71 draggingID: 0 ---- !u!114 &7 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -949,16 +1000,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 330 - height: 386 - m_MinSize: {x: 202, y: 226} - m_MaxSize: {x: 4002, y: 4026} - m_ActualView: {fileID: 8} + width: 165 + height: 440 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 10} m_Panes: - - {fileID: 8} + - {fileID: 10} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &8 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -979,10 +1030,10 @@ MonoBehaviour: m_TextWithWhitespace: "Hierarchy\u200B" m_Pos: serializedVersion: 2 - x: 2625 - y: 92 - width: 328 - height: 360 + x: 735 + y: 79 + width: 163 + height: 414 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -997,9 +1048,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 3ecfffff - m_LastClickedID: -12482 - m_ExpandedIDs: e6cfffffeecfffff7cd0fffff6fafffff8faffff + m_SelectedIDs: a482feff + m_LastClickedID: -97628 + m_ExpandedIDs: a482feff7883feffa0a5feff26d8fefffcd8feff04d9feff06d9feff72dafeff7adefeffe6defefff0defeff02dffeffd6dffeffdedffeffe0dffeff22edfeff2aedfeff4009ffff6409ffff6c09ffff0026ffff9045ffff9a45ffffac45ffffd8daffff02e7ffffeefafffff6fafffff8fafffff4ffffff98c10000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1016,7 +1067,7 @@ MonoBehaviour: m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 3} + m_ClientGUIView: {fileID: 9} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -1024,7 +1075,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 85728a346145f5041b41bc3ce2f945c6 ---- !u!114 &9 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1040,17 +1091,17 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 386 - width: 330 - height: 555 - m_MinSize: {x: 102, y: 126} - m_MaxSize: {x: 4002, y: 4026} - m_ActualView: {fileID: 10} + y: 440 + width: 165 + height: 501 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 12} m_Panes: - - {fileID: 10} + - {fileID: 12} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &10 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1071,10 +1122,10 @@ MonoBehaviour: m_TextWithWhitespace: "Console\u200B" m_Pos: serializedVersion: 2 - x: 2625 - y: 478 - width: 328 - height: 529 + x: 735 + y: 519 + width: 163 + height: 475 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1086,7 +1137,7 @@ MonoBehaviour: m_SaveData: [] m_ContainerData: [] m_OverlaysVisible: 1 ---- !u!114 &11 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1094,25 +1145,25 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 + m_EditorHideFlags: 0 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 1027 + x: 900 y: 0 - width: 323 + width: 438 height: 941 m_MinSize: {x: 232, y: 276} m_MaxSize: {x: 10002, y: 10026} - m_ActualView: {fileID: 12} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 12} + - {fileID: 14} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &12 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1133,9 +1184,9 @@ MonoBehaviour: m_TextWithWhitespace: "Project\u200B" m_Pos: serializedVersion: 2 - x: 2955 - y: 92 - width: 321 + x: 901 + y: 24 + width: 436 height: 915 m_SerializedDataModeController: m_DataMode: 0 @@ -1158,7 +1209,8 @@ MonoBehaviour: m_ShowAllHits: 0 m_SkipHidden: 0 m_SearchArea: 0 - m_Folders: [] + m_Folders: + - Assets m_Globs: [] m_ProductIds: m_AnyWithAssetOrigin: 0 @@ -1176,7 +1228,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: e48c0000 m_LastClickedID: 36068 - m_ExpandedIDs: 00000000f4bf0000a8c10000aac10000acc10000aec10000b0c10000b2c10000b4c10000b6c10000b8c10000bac10000bcc10000bec10000c0c10000c2c10000c4c10000c6c10000c8c10000cac10000ccc10000cec10000d0c10000d2c10000d4c10000d6c10000d8c10000dac10000dcc10000dec10000e0c10000e2c10000e4c10000e6c10000e8c10000eac10000ecc10000eec10000f0c10000f2c10000 + m_ExpandedIDs: 0000000016c2000018c200001ac200001cc200001ec2000020c2000022c2000024c2000026c2000028c200002ac200002cc200002ec2000030c2000032c2000034c2000036c2000038c200003ac200003cc200003ec2000040c2000042c2000044c2000046c2000048c200004ac200004cc200004ec2000050c2000052c2000054c2000056c2000058c200005ac200005cc200005ec2000060c2000062c2000064c2000066c2000068c200006ac200006cc200006ec2000070c2000072c2000074c2000076c2000078c200007ac200007cc200007ec2000080c2000082c2000084c2000086c2000088c200008ac200008cc200008ec2000090c2000092c2000094c2000096c2000098c200009ac200009cc200009ec20000a0c20000a2c20000a4c20000a6c20000a8c20000aac20000acc20000aec20000b0c20000b2c20000b4c20000b6c20000b8c20000bac20000bcc20000bec20000c0c20000c2c20000c4c20000c6c20000c8c20000cac20000ccc20000cec20000d0c20000d2c20000d4c20000d6c20000d8c20000dac20000dcc20000dec20000e0c20000e2c20000e4c20000e6c20000e8c20000eac20000ecc20000eec20000f0c20000f2c20000f4c20000f6c20000f8c20000fac20000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1202,10 +1254,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 403} - m_SelectedIDs: 3ecfffff + scrollPos: {x: 0, y: 780} + m_SelectedIDs: a482feff m_LastClickedID: 0 - m_ExpandedIDs: ffffffff00000000b6bf0000f0bf0000f2bf0000f4bf0000f8bf0000febf000024c00000a8c10000aac10000acc10000aec10000b0c10000b2c10000b4c10000b6c10000b8c10000bac10000bcc10000bec10000c0c10000c2c10000c4c10000c6c10000c8c10000cac10000ccc10000cec10000d0c10000d2c10000d4c10000d6c10000d8c10000dac10000dcc10000dec10000e0c10000e2c10000e4c10000e6c10000e8c10000eac10000ecc10000eec10000f0c10000f2c1000060c200009ec20000a0c20000b6c20000c2c20000c4c20000dac20000e0c20000e4c90000e6c90000eac90000f6c90000f8c90000ffffff7f + m_ExpandedIDs: 1edaffffffffffff0000000016c2000018c200001ac200001cc200001ec2000020c2000022c2000024c2000026c2000028c200002ac200002cc200002ec2000030c2000032c2000034c2000036c2000038c200003ac200003cc200003ec2000040c2000042c2000044c2000046c2000048c200004ac200004cc200004ec2000050c2000052c2000056c2000058c200005cc200005ec2000060c2000062c2000064c2000066c2000068c200006ac200006cc200006ec2000070c2000072c2000074c2000076c2000078c200007ac200007cc200007ec2000080c2000082c2000084c2000086c2000088c200008ac200008cc200008ec2000090c2000092c2000094c2000096c2000098c200009ac200009cc200009ec20000a0c20000a2c20000a4c20000a6c20000a8c20000aac20000acc20000aec20000b0c20000b2c20000b4c20000b6c20000b8c20000bac20000c4c20000c6c20000c8c20000cac20000ccc20000cec20000d0c20000d2c20000d4c20000dac20000dec20000e0c20000e4c20000e8c20000eac20000ecc20000eec20000f0c20000f2c20000f4c20000f8c20000fac20000eac30000f0c30000c4c40000e0c4000008c500000ac500000cc5000010c500001ac500002ac500002cc500003ac5000068c500006ac5000078c500008ac50000ffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1222,7 +1274,7 @@ MonoBehaviour: m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 11} + m_ClientGUIView: {fileID: 13} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -1231,8 +1283,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 3ecfffff - m_LastClickedInstanceID: -12482 + m_SelectedInstanceIDs: a482feff + m_LastClickedInstanceID: -97628 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: 0c750000f2d60000 m_RenameOverlay: @@ -1251,7 +1303,7 @@ MonoBehaviour: m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 11} + m_ClientGUIView: {fileID: 15} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -1263,7 +1315,7 @@ MonoBehaviour: m_GridSize: 96 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 115 ---- !u!114 &13 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1278,18 +1330,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1350 + x: 1338 y: 0 - width: 570 + width: 582 height: 941 m_MinSize: {x: 276, y: 76} m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 14} + m_ActualView: {fileID: 16} m_Panes: - - {fileID: 14} + - {fileID: 16} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &14 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1297,7 +1349,7 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 + m_EditorHideFlags: 0 m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: @@ -1310,9 +1362,9 @@ MonoBehaviour: m_TextWithWhitespace: "Inspector\u200B" m_Pos: serializedVersion: 2 - x: 3278 - y: 92 - width: 569 + x: 1338 + y: 79 + width: 581 height: 915 m_SerializedDataModeController: m_DataMode: 0 @@ -1328,8 +1380,8 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: 206 - m_ControlHash: -371814159 + m_CachedPref: 151 + m_ControlHash: 1412526313 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 m_LastVerticalScrollValue: 0 diff --git a/Client/UserSettings/Layouts/default-6000.dwlt b/Client/UserSettings/Layouts/default-6000.dwlt index ad03c14..5a964cc 100644 --- a/Client/UserSettings/Layouts/default-6000.dwlt +++ b/Client/UserSettings/Layouts/default-6000.dwlt @@ -14,95 +14,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 0 - y: 43 + x: -429 + y: 238 width: 1920 height: 997 m_ShowMode: 4 - m_Title: Scene - m_RootView: {fileID: 5} + m_Title: Project + m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 1 + m_Maximized: 0 --- !u!114 &2 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 723 - y: 0 - width: 492 - height: 941 - m_MinSize: {x: 232, y: 276} - m_MaxSize: {x: 10002, y: 10026} - m_ActualView: {fileID: 20} - m_Panes: - - {fileID: 20} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &3 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 471 - width: 477 - height: 470 - m_MinSize: {x: 51, y: 76} - m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 15} - m_Panes: - - {fileID: 15} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &4 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 9} - - {fileID: 3} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 477 - height: 941 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 8096, y: 16192} - vertical: 1 - controlID: 17 - draggingID: 0 ---- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -115,9 +37,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 6} - - {fileID: 8} - - {fileID: 7} + - {fileID: 3} + - {fileID: 5} + - {fileID: 4} m_Position: serializedVersion: 2 x: 0 @@ -130,7 +52,7 @@ MonoBehaviour: m_TopViewHeight: 36 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &6 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -152,7 +74,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &7 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -173,7 +95,7 @@ MonoBehaviour: height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &8 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -186,9 +108,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 4} - - {fileID: 10} - - {fileID: 2} + - {fileID: 6} + - {fileID: 9} + - {fileID: 12} - {fileID: 13} m_Position: serializedVersion: 2 @@ -199,9 +121,35 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 102 + controlID: 161 draggingID: 0 ---- !u!114 &9 +--- !u!114 &6 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 7} + - {fileID: 8} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 436 + height: 941 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 8096, y: 16192} + vertical: 1 + controlID: 26 + draggingID: 0 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -218,17 +166,43 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 477 - height: 471 + width: 436 + height: 449 m_MinSize: {x: 201, y: 226} m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 17} + m_ActualView: {fileID: 16} m_Panes: + - {fileID: 15} - {fileID: 16} - - {fileID: 17} m_Selected: 1 - m_LastSelected: 1 ---- !u!114 &10 + m_LastSelected: 0 +--- !u!114 &8 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: GameView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 449 + width: 436 + height: 492 + m_MinSize: {x: 51, y: 76} + m_MaxSize: {x: 4001, y: 4026} + m_ActualView: {fileID: 14} + m_Panes: + - {fileID: 14} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -241,20 +215,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: + - {fileID: 10} - {fileID: 11} - - {fileID: 12} m_Position: serializedVersion: 2 - x: 477 + x: 436 y: 0 - width: 246 + width: 442 height: 941 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 controlID: 71 draggingID: 0 ---- !u!114 &11 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -271,16 +245,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 246 - height: 440 - m_MinSize: {x: 202, y: 226} - m_MaxSize: {x: 4002, y: 4026} - m_ActualView: {fileID: 18} + width: 442 + height: 439 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 18} + - {fileID: 17} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &12 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -296,11 +270,37 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 440 - width: 246 - height: 501 - m_MinSize: {x: 102, y: 126} - m_MaxSize: {x: 4002, y: 4026} + y: 439 + width: 442 + height: 502 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 18} + m_Panes: + - {fileID: 18} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &12 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ProjectBrowser + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 878 + y: 0 + width: 459 + height: 941 + m_MinSize: {x: 232, y: 276} + m_MaxSize: {x: 10002, y: 10026} m_ActualView: {fileID: 19} m_Panes: - {fileID: 19} @@ -321,67 +321,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1215 + x: 1337 y: 0 - width: 705 + width: 583 height: 941 m_MinSize: {x: 276, y: 76} m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 14} + m_ActualView: {fileID: 20} m_Panes: - - {fileID: 14} + - {fileID: 20} m_Selected: 0 m_LastSelected: 0 --- !u!114 &14 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12019, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Inspector - m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_TextWithWhitespace: "Inspector\u200B" - m_Pos: - serializedVersion: 2 - x: 1216 - y: 24 - width: 704 - height: 915 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ContainerData: [] - m_OverlaysVisible: 1 - m_ObjectsLockedBeforeSerialization: [] - m_InstanceIDsLockedBeforeSerialization: - m_PreviewResizer: - m_CachedPref: 151 - m_ControlHash: 1412526313 - m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 - m_GlobalObjectId: - m_InspectorMode: 0 - m_LockTracker: - m_IsLocked: 0 - m_PreviewWindow: {fileID: 0} ---- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -402,10 +353,10 @@ MonoBehaviour: m_TextWithWhitespace: "Game\u200B" m_Pos: serializedVersion: 2 - x: 0 - y: 495 - width: 476 - height: 444 + x: -429 + y: 723 + width: 435 + height: 466 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -423,7 +374,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 476, y: 268} + m_TargetSize: {x: 435, y: 245} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -438,10 +389,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -238 - m_HBaseRangeMax: 238 - m_VBaseRangeMin: -134 - m_VBaseRangeMax: 134 + m_HBaseRangeMin: -217.5 + m_HBaseRangeMax: 217.5 + m_VBaseRangeMin: -122.5 + m_VBaseRangeMax: 122.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -459,29 +410,29 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 476 - height: 423 + width: 435 + height: 445 m_Scale: {x: 1, y: 1} - m_Translation: {x: 238, y: 211.5} + m_Translation: {x: 217.5, y: 222.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -238 - y: -211.5 - width: 476 - height: 423 + x: -217.5 + y: -222.5 + width: 435 + height: 445 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 476, y: 444} + m_LastWindowPixelSize: {x: 435, y: 466} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &16 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -502,10 +453,10 @@ MonoBehaviour: m_TextWithWhitespace: "Animator\u200B" m_Pos: serializedVersion: 2 - x: 1920 - y: 84 - width: 549 - height: 915 + x: 0 + y: 79 + width: 454 + height: 337 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -519,16 +470,16 @@ MonoBehaviour: m_OverlaysVisible: 1 m_ViewTransforms: m_KeySerializationHelper: - - {fileID: -6160161352362109779, guid: 3eeadcbf1ba8317409cc12fb1cadff5b, type: 2} + - {fileID: 6688734232031279982, guid: c103b1c0b339fe14eb5e4fea21d45a67, type: 2} m_ValueSerializationHelper: - - e00: 1 + - e00: 0.3205771 e01: 0 e02: 0 - e03: 0 + e03: 123.74013 e10: 0 - e11: 1 + e11: 0.3205771 e12: 0 - e13: 0 + e13: 136.81012 e20: 0 e21: 0 e22: 1 @@ -538,9 +489,9 @@ MonoBehaviour: e32: 0 e33: 1 m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: 3eeadcbf1ba8317409cc12fb1cadff5b, type: 2} + m_AnimatorController: {fileID: 9100000, guid: c103b1c0b339fe14eb5e4fea21d45a67, type: 2} m_BreadCrumbs: - - m_Target: {fileID: -6160161352362109779, guid: 3eeadcbf1ba8317409cc12fb1cadff5b, type: 2} + - m_Target: {fileID: 6688734232031279982, guid: c103b1c0b339fe14eb5e4fea21d45a67, type: 2} m_ScrollPosition: {x: 0, y: 0} stateMachineGraph: {fileID: 0} stateMachineGraphGUI: {fileID: 0} @@ -553,7 +504,7 @@ MonoBehaviour: m_CurrentEditor: 1 m_LayerEditor: m_SelectedLayerIndex: 0 ---- !u!114 &17 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -574,10 +525,10 @@ MonoBehaviour: m_TextWithWhitespace: "Scene\u200B" m_Pos: serializedVersion: 2 - x: 0 - y: 24 - width: 476 - height: 445 + x: -429 + y: 274 + width: 435 + height: 423 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -648,12 +599,12 @@ MonoBehaviour: displayed: 1 id: unity-transform-toolbar index: 0 - contents: '{"m_Layout":2,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":-258.9990234375,"y":-238.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":3,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":2,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":24.0,"y":135.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 - snapOffset: {x: -258.99902, y: -238} + snapOffset: {x: 24, y: 135} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 3 + snapCorner: 0 layout: 2 size: {x: 0, y: 0} sizeOverridden: 0 @@ -1146,9 +1097,9 @@ MonoBehaviour: m_AudioPlay: 0 m_DebugDrawModesUseInteractiveLightBakingData: 0 m_Position: - m_Target: {x: 999.8521, y: 1000.1492, z: 596.13214} + m_Target: {x: 1000.9786, y: 1001.39417, z: 1.542775} speed: 2 - m_Value: {x: 999.8521, y: 1000.1492, z: 596.13214} + m_Value: {x: 1000.9786, y: 1001.39417, z: 1.542775} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1198,9 +1149,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 2.6442597 + m_Target: 1.9412607 speed: 2 - m_Value: 2.6442597 + m_Value: 1.9412607 m_Ortho: m_Target: 1 speed: 2 @@ -1221,7 +1172,7 @@ MonoBehaviour: m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} m_LastSceneViewOrtho: 0 m_Viewpoint: - m_SceneView: {fileID: 17} + m_SceneView: {fileID: 16} m_CameraOverscanSettings: m_Opacity: 50 m_Scale: 1 @@ -1231,7 +1182,7 @@ MonoBehaviour: m_LastLockedObject: {fileID: 0} m_LastDebugDrawMode: 35 m_ViewIsLockedToObject: 0 ---- !u!114 &18 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1254,8 +1205,8 @@ MonoBehaviour: serializedVersion: 2 x: 1 y: 24 - width: 244 - height: 414 + width: 440 + height: 413 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1270,9 +1221,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: 10c40000 m_LastClickedID: 0 - m_ExpandedIDs: 449bfcffa630ffffae30ffffb030ffff9a31ffffb432ffffbc32ffffbe32ffffac33ffff5c34ffff4a35ffffc24cffffca4cffffcc4cffff604dffff624effffeefafffff6fafffff8faffff7ec100009ad2000058d30000eed30000 + m_ExpandedIDs: 96faffff98faffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1289,7 +1240,7 @@ MonoBehaviour: m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 12} + m_ClientGUIView: {fileID: 7} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -1297,7 +1248,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 85728a346145f5041b41bc3ce2f945c6 ---- !u!114 &19 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1319,9 +1270,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 1 - y: 464 - width: 244 - height: 475 + y: 463 + width: 440 + height: 476 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1333,7 +1284,7 @@ MonoBehaviour: m_SaveData: [] m_ContainerData: [] m_OverlaysVisible: 1 ---- !u!114 &20 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1354,9 +1305,9 @@ MonoBehaviour: m_TextWithWhitespace: "Project\u200B" m_Pos: serializedVersion: 2 - x: 724 + x: 879 y: 24 - width: 490 + width: 457 height: 915 m_SerializedDataModeController: m_DataMode: 0 @@ -1380,7 +1331,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 0 m_Folders: - - Packages/com.alicizax.unity.ui.extension/Editor/Icons + - Packages/com.alicizax.unity.animationflow m_Globs: [] m_ProductIds: m_AnyWithAssetOrigin: 0 @@ -1398,7 +1349,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: e48c0000 m_LastClickedID: 36068 - m_ExpandedIDs: 0000000016c2000018c200001ac200001cc200001ec2000020c2000022c2000024c2000026c2000028c200002ac200002cc200002ec2000030c2000032c2000034c2000036c2000038c200003ac200003cc200003ec2000040c2000042c2000044c2000046c2000048c200004ac200004cc200004ec2000050c2000052c2000054c2000056c2000058c200005ac200005cc200005ec2000060c2000062c2000064c2000066c2000068c200006ac200006cc200006ec2000070c2000072c2000074c2000076c2000078c200007ac200007cc200007ec2000080c2000082c2000084c2000086c2000088c200008ac200008cc200008ec2000090c2000092c2000094c2000096c2000098c200009ac200009cc200009ec20000a0c20000a2c20000a4c20000a6c20000a8c20000aac20000acc20000aec20000b0c20000b2c20000b4c20000b6c20000b8c20000bac20000bcc20000bec20000c0c20000c2c20000c4c20000c6c20000c8c20000cac20000ccc20000cec20000d0c20000d2c20000d4c20000d6c20000d8c20000dac20000dcc20000dec20000e0c20000e2c20000e4c20000e6c20000e8c20000eac20000ecc20000eec20000f0c20000f2c20000f4c20000f6c20000f8c20000fac20000 + m_ExpandedIDs: 000000001cc00000c0c20000c2c20000c4c20000c6c20000c8c20000cac20000ccc20000cec20000d0c20000d2c20000d4c20000d6c20000d8c20000dac20000dcc20000dec20000e0c20000e2c20000e4c20000e6c20000e8c20000eac20000ecc20000eec20000f0c20000f2c20000f4c20000f6c20000f8c20000fac20000fcc20000fec2000000c3000002c3000004c3000006c3000008c300000ac300000cc300000ec3000010c3000012c3000014c3000016c3000018c300001ac300001cc300001ec3000020c3000022c3000024c3000026c3000028c300002ac300002cc300002ec3000030c3000032c3000034c3000036c3000038c300003ac300003cc300003ec3000040c3000042c3000044c3000046c3000048c300004ac300004cc300004ec3000050c3000052c3000054c3000056c3000058c300005ac300005cc300005ec3000060c3000062c3000064c3000066c3000068c300006ac300006cc300006ec3000070c3000072c3000074c3000076c3000078c300007ac300007cc300007ec3000080c3000082c3000084c3000086c3000088c300008ac300008cc300008ec3000090c3000092c3000094c3000096c3000098c300009ac300009cc300009ec30000a0c30000a2c30000a4c30000a6c30000a8c30000aac30000acc30000aec30000b0c30000b2c30000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1424,27 +1375,27 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 2511} + scrollPos: {x: 0, y: 300} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000016c2000018c200001ac200001cc200001ec2000020c2000022c2000024c2000026c2000028c200002ac200002cc200002ec2000030c2000032c2000034c2000036c2000038c200003ac200003cc200003ec2000040c2000042c2000044c2000046c2000048c200004ac200004cc200004ec2000050c2000052c2000054c2000056c2000058c200005ac200005cc200005ec2000060c2000062c2000064c2000066c2000068c200006ac200006cc200006ec2000070c2000072c2000074c2000076c2000078c200007ac200007cc200007ec2000080c2000082c2000084c2000086c2000088c200008ac200008cc200008ec2000090c2000092c2000094c2000096c2000098c200009ac200009cc200009ec20000a0c20000a2c20000a4c20000a6c20000a8c20000aac20000acc20000aec20000b0c20000b2c20000b4c20000b6c20000b8c20000bac20000bcc20000bec20000c0c20000c2c20000c4c20000c6c20000c8c20000cac20000ccc20000cec20000d0c20000d2c20000d4c20000d6c20000d8c20000dac20000dcc20000dec20000e0c20000e2c20000e4c20000e6c20000e8c20000eac20000ecc20000eec20000f0c20000f2c20000f4c20000f6c20000f8c20000fac20000 + m_ExpandedIDs: ffffffff00000000c0c20000c2c20000c4c20000c6c20000c8c20000cac20000ccc20000cec20000d0c20000d2c20000d4c20000d6c20000d8c20000dac20000dcc20000dec20000e0c20000e2c20000e4c20000e6c20000e8c20000eac20000eec20000f0c20000f2c20000f4c20000f6c20000f8c20000fac20000fcc2000000c3000002c3000004c3000006c3000008c300000ac300000cc300000ec3000010c3000012c3000016c3000018c300001ac300001cc300001ec3000020c3000022c3000024c3000026c3000028c300002ac300002cc300002ec3000030c3000032c3000034c3000036c3000038c300003ac300003cc300003ec3000040c3000042c3000044c3000046c3000048c300004ac300004cc300004ec3000050c3000052c3000054c3000056c3000058c300005ac300005cc300005ec3000060c3000062c3000064c3000068c300006ac300006cc3000072c3000074c300007cc300007ec3000080c3000082c3000084c3000086c3000088c300008ac300008cc3000090c3000092c3000096c3000098c300009ac300009cc300009ec30000a0c30000a2c30000a4c30000a6c30000a8c30000aac30000acc30000aec30000b2c30000bec4000004c5000062c50000acc60000ffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: LocalizationModule + m_OriginalName: LocalizationModule m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 41982 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 1 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 2} + m_ClientGUIView: {fileID: 12} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -1485,3 +1436,52 @@ MonoBehaviour: m_GridSize: 96 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 115 +--- !u!114 &20 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Inspector + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_TextWithWhitespace: "Inspector\u200B" + m_Pos: + serializedVersion: 2 + x: 908 + y: 274 + width: 582 + height: 915 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ContainerData: [] + m_OverlaysVisible: 1 + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: -236 + m_ControlHash: 1412526313 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 + m_GlobalObjectId: + m_InspectorMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0}