From 45e4618d05c43a2c9f11d433bb1e54090254d4c7 Mon Sep 17 00:00:00 2001 From: SnowShow Date: Wed, 7 May 2025 17:17:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B4=A7=E6=9E=B6=E8=A1=8C?= =?UTF-8?q?=E4=B8=BA=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ShelfMachineBehaviour.asset | 4 +- Assets/GameLogic/Game/Common/Enum.meta | 8 + .../Game/Common/Enum/ShelfActionType.cs | 9 + .../Game/Common/Enum/ShelfActionType.cs.meta | 2 + Assets/Scenes/main.unity | 28 +- UserSettings/Layouts/default-6000.dwlt | 700 ++++++++---------- 6 files changed, 354 insertions(+), 397 deletions(-) create mode 100644 Assets/GameLogic/Game/Common/Enum.meta create mode 100644 Assets/GameLogic/Game/Common/Enum/ShelfActionType.cs create mode 100644 Assets/GameLogic/Game/Common/Enum/ShelfActionType.cs.meta diff --git a/Assets/AssetRaw/ScriptableObject/ShelfMachineBehaviour.asset b/Assets/AssetRaw/ScriptableObject/ShelfMachineBehaviour.asset index 9340e0b..42758d3 100644 --- a/Assets/AssetRaw/ScriptableObject/ShelfMachineBehaviour.asset +++ b/Assets/AssetRaw/ScriptableObject/ShelfMachineBehaviour.asset @@ -12,7 +12,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a686a47eee2fa44cb0a34b5d86e4d5e, type: 3} m_Name: ShelfMachineBehaviour m_EditorClassIdentifier: - _serializedGraph: '{"type":"NodeCanvas.BehaviourTrees.BehaviourTree","nodes":[],"connections":[],"canvasGroups":[],"localBlackboard":{"_variables":{}},"derivedData":{"repeat":true,"$type":"NodeCanvas.BehaviourTrees.BehaviourTree+DerivedSerializationData"}}' + _serializedGraph: '{"type":"NodeCanvas.BehaviourTrees.BehaviourTree","nodes":[{"selectionMode":1,"intCase":{},"enumCase":{"_type":"System.Enum","_name":""},"_position":{"x":564.0,"y":122.0},"$type":"NodeCanvas.BehaviourTrees.Switch"}],"connections":[],"canvasGroups":[],"localBlackboard":{"_variables":{"Enum + Case":{"_name":"Enum Case","_id":"765c30f0-31a8-432d-8a9e-1a9dbf4d0337","$type":"NodeCanvas.Framework.Variable`1[[System.Enum, + mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]"}}},"derivedData":{"repeat":true,"$type":"NodeCanvas.BehaviourTrees.BehaviourTree+DerivedSerializationData"}}' _objectReferences: [] _graphSource: _version: 3.32 diff --git a/Assets/GameLogic/Game/Common/Enum.meta b/Assets/GameLogic/Game/Common/Enum.meta new file mode 100644 index 0000000..97c6ce1 --- /dev/null +++ b/Assets/GameLogic/Game/Common/Enum.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 703d50361a118e34cbb9be2f134d6e42 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameLogic/Game/Common/Enum/ShelfActionType.cs b/Assets/GameLogic/Game/Common/Enum/ShelfActionType.cs new file mode 100644 index 0000000..26ae654 --- /dev/null +++ b/Assets/GameLogic/Game/Common/Enum/ShelfActionType.cs @@ -0,0 +1,9 @@ +using Sirenix.OdinInspector; +using UnityEngine; + +public enum ShelfActionType +{ + [LabelText("ÎÞ")]None, + [LabelText("×°»õ")]Load, + [LabelText("ж»õ")]UnLoad +} diff --git a/Assets/GameLogic/Game/Common/Enum/ShelfActionType.cs.meta b/Assets/GameLogic/Game/Common/Enum/ShelfActionType.cs.meta new file mode 100644 index 0000000..5e86260 --- /dev/null +++ b/Assets/GameLogic/Game/Common/Enum/ShelfActionType.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 91bb393342c6a4d4389f93da1368fe46 \ No newline at end of file diff --git a/Assets/Scenes/main.unity b/Assets/Scenes/main.unity index f766f8f..ae34614 100644 --- a/Assets/Scenes/main.unity +++ b/Assets/Scenes/main.unity @@ -38751,6 +38751,11 @@ Transform: m_Children: [] m_Father: {fileID: 664867040} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &587545622 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5304540892573083252, guid: 7827ccff2c5319541bbaf34e30e83074, type: 3} + m_PrefabInstance: {fileID: 1215215006} + m_PrefabAsset: {fileID: 0} --- !u!1 &587727080 GameObject: m_ObjectHideFlags: 0 @@ -66700,8 +66705,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963194225} serializedVersion: 2 - m_LocalRotation: {x: 0.06113388, y: -0.9031976, z: 0.13733405, w: 0.40204} - m_LocalPosition: {x: 90.59197, y: 24.513542, z: 24.777458} + m_LocalRotation: {x: -0.059602156, y: -0.8828924, z: 0.116679616, w: -0.45092642} + m_LocalPosition: {x: 21.895561, y: 26.234213, z: 22.103218} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -87167,6 +87172,9 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 588076630} m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5304540892573083252, guid: 7827ccff2c5319541bbaf34e30e83074, type: 3} + insertIndex: -1 + addedObject: {fileID: 1215215010} - targetCorrespondingSourceObject: {fileID: 5953207996287557680, guid: 7827ccff2c5319541bbaf34e30e83074, type: 3} insertIndex: -1 addedObject: {fileID: 126551405} @@ -87181,6 +87189,22 @@ Animator: m_CorrespondingSourceObject: {fileID: 4144906616167758305, guid: 7827ccff2c5319541bbaf34e30e83074, type: 3} m_PrefabInstance: {fileID: 1215215006} m_PrefabAsset: {fileID: 0} +--- !u!114 &1215215010 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 587545622} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b98a6db0b653f764eac834f85857a9dd, type: 3} + m_Name: + m_EditorClassIdentifier: + _parentBlackboard: {fileID: 0} + _serializedBlackboard: '{"_variables":{}}' + _objectReferences: [] + _serializedVariables: [] --- !u!114 &1215215012 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6795585866265439145, guid: 7827ccff2c5319541bbaf34e30e83074, type: 3} diff --git a/UserSettings/Layouts/default-6000.dwlt b/UserSettings/Layouts/default-6000.dwlt index cfcc354..84b50cf 100644 --- a/UserSettings/Layouts/default-6000.dwlt +++ b/UserSettings/Layouts/default-6000.dwlt @@ -15,143 +15,16 @@ MonoBehaviour: m_PixelRect: serializedVersion: 2 x: 0 - y: 23 + y: 43 width: 1920 - height: 1017 - m_ShowMode: 0 - m_Title: Project Settings - m_RootView: {fileID: 4} - m_MinSize: {x: 310, y: 226} - m_MaxSize: {x: 4000, y: 4026} - m_Maximized: 1 ---- !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: 12004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_PixelRect: - serializedVersion: 2 - x: 8 - y: 51 - width: 1904 - height: 981 + height: 997 m_ShowMode: 4 m_Title: Hierarchy - m_RootView: {fileID: 7} + m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 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: ProjectSettingsWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1920 - height: 1017 - m_MinSize: {x: 310, y: 226} - m_MaxSize: {x: 4000, y: 4026} - m_ActualView: {fileID: 18} - m_Panes: - - {fileID: 18} - 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: 3} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1920 - height: 1017 - m_MinSize: {x: 310, y: 226} - m_MaxSize: {x: 4000, y: 4026} - vertical: 0 - controlID: 2979 - draggingID: 0 ---- !u!114 &5 -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: 1211 - y: 0 - width: 100 - height: 479 - m_MinSize: {x: 102, y: 126} - m_MaxSize: {x: 4002, y: 4026} - m_ActualView: {fileID: 19} - m_Panes: - - {fileID: 19} - m_Selected: 0 - m_LastSelected: 0 ---- !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: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: TimelineWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 1311 - y: 0 - width: 146 - height: 479 - m_MinSize: {x: 102, y: 126} - m_MaxSize: {x: 4002, y: 4026} - m_ActualView: {fileID: 23} - m_Panes: - - {fileID: 23} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &7 + m_Maximized: 1 +--- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -164,22 +37,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 8} - - {fileID: 10} - - {fileID: 9} + - {fileID: 3} + - {fileID: 5} + - {fileID: 4} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1904 - height: 981 + width: 1920 + height: 997 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 m_TopViewHeight: 36 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &8 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -196,12 +69,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1904 + width: 1920 height: 36 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &9 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -217,12 +90,12 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 961 - width: 1904 + y: 977 + width: 1920 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &10 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -235,19 +108,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 11} + - {fileID: 6} m_Position: serializedVersion: 2 x: 0 y: 36 - width: 1904 - height: 925 + width: 1920 + height: 941 m_MinSize: {x: 500, y: 100} m_MaxSize: {x: 40480, y: 16192} vertical: 1 - controlID: 159 + controlID: 37592 draggingID: 0 ---- !u!114 &11 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -260,46 +133,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 12} - - {fileID: 17} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1904 - height: 925 - m_MinSize: {x: 500, y: 100} - m_MaxSize: {x: 40480, y: 16192} - vertical: 0 - controlID: 160 - draggingID: 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: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 13} + - {fileID: 7} - {fileID: 16} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1457 - height: 925 - m_MinSize: {x: 400, y: 100} - m_MaxSize: {x: 32384, y: 16192} - vertical: 1 - controlID: 101 + width: 1920 + height: 941 + m_MinSize: {x: 500, y: 100} + m_MaxSize: {x: 40480, y: 16192} + vertical: 0 + controlID: 37593 draggingID: 0 ---- !u!114 &13 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -312,22 +159,48 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 14} - - {fileID: 15} - - {fileID: 5} - - {fileID: 6} + - {fileID: 8} + - {fileID: 13} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1457 - height: 479 + width: 1253 + height: 941 + m_MinSize: {x: 400, y: 100} + m_MaxSize: {x: 32384, y: 16192} + vertical: 1 + controlID: 37594 + draggingID: 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: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 9} + - {fileID: 10} + - {fileID: 11} + - {fileID: 12} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1253 + height: 554 m_MinSize: {x: 400, y: 50} m_MaxSize: {x: 32384, y: 8096} vertical: 0 - controlID: 83 + controlID: 37595 draggingID: 0 ---- !u!114 &14 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -344,16 +217,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 256 - height: 479 - m_MinSize: {x: 201, y: 226} - m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 20} + width: 265 + height: 554 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 18} m_Panes: - - {fileID: 20} + - {fileID: 18} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &15 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -368,18 +241,96 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 256 + x: 265 y: 0 - width: 955 - height: 479 - m_MinSize: {x: 102, y: 126} - m_MaxSize: {x: 4002, y: 4026} - m_ActualView: {fileID: 21} + width: 768 + height: 554 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 19} m_Panes: - - {fileID: 21} + - {fileID: 19} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &16 +--- !u!114 &11 +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: 1033 + y: 0 + width: 120 + height: 554 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 17} + m_Panes: + - {fileID: 17} + 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: TimelineWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 1153 + y: 0 + width: 100 + height: 554 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 20} + m_Panes: + - {fileID: 20} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &13 +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: 14} + - {fileID: 15} + m_Position: + serializedVersion: 2 + x: 0 + y: 554 + width: 1253 + height: 387 + m_MinSize: {x: 200, y: 50} + m_MaxSize: {x: 16192, y: 8096} + vertical: 0 + controlID: 37638 + draggingID: 0 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -395,18 +346,43 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 479 - width: 1457 - height: 446 + y: 0 + width: 629 + height: 387 m_MinSize: {x: 231, y: 276} m_MaxSize: {x: 10001, y: 10026} - m_ActualView: {fileID: 24} + m_ActualView: {fileID: 21} + m_Panes: + - {fileID: 21} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &15 +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: ConsoleWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 629 + y: 0 + width: 624 + height: 387 + m_MinSize: {x: 102, y: 126} + m_MaxSize: {x: 4002, y: 4026} + m_ActualView: {fileID: 22} m_Panes: - - {fileID: 24} - {fileID: 22} m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &17 + m_LastSelected: 0 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -421,82 +397,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1457 + x: 1253 y: 0 - width: 447 - height: 925 - m_MinSize: {x: 276, y: 126} - m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 25} + width: 667 + height: 941 + m_MinSize: {x: 275, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 23} m_Panes: - - {fileID: 25} + - {fileID: 23} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &18 -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: 13854, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 310, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Project Settings - m_Image: {fileID: -5712115415447495865, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_TextWithWhitespace: "Project Settings\u200B" - m_Pos: - serializedVersion: 2 - x: 0 - y: 26 - width: 1920 - height: 991 - 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_PosLeft: {x: 0, y: 0} - m_PosRight: {x: 0, y: 600} - m_Scope: 1 - m_SplitterPos: 150 - m_SearchText: - m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 4dcf9b58 - m_LastClickedID: 1486606157 - m_ExpandedIDs: 00000000e594f01ac53aba5a - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 0} - m_SearchString: ---- !u!114 &19 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -517,10 +429,10 @@ MonoBehaviour: m_TextWithWhitespace: "Game\u200B" m_Pos: serializedVersion: 2 - x: 1212 - y: 24 - width: 98 - height: 453 + x: 1033 + y: 79 + width: 118 + height: 528 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -574,10 +486,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 98 - height: 432 - m_Scale: {x: 0.025520833, y: 0.025520831} - m_Translation: {x: 49, y: 215.99998} + width: 118 + height: 507 + m_Scale: {x: 0.030729167, y: 0.030729167} + m_Translation: {x: 59, y: 253.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -585,19 +497,19 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -1920 - y: -8463.674 + y: -8249.491 width: 3840 - height: 16927.348 + height: 16498.982 m_MinimalGUI: 1 - m_defaultScale: 0.025520833 - m_LastWindowPixelSize: {x: 98, y: 453} + m_defaultScale: 0.030729167 + m_LastWindowPixelSize: {x: 118, y: 528} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} m_showToolbar: 1 ---- !u!114 &20 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -619,9 +531,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 24 - width: 255 - height: 453 + y: 79 + width: 264 + height: 528 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -636,26 +548,26 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: cabbffff62f7ffff0afbffff24b1000056b40000c6b500000ec2000040c4000072c90000e2cb0000e6cb0000f2cd00001cd00000 + m_SelectedIDs: 6488ffff + m_LastClickedID: -30620 + m_ExpandedIDs: c234f1fff63af1ff70eff5ff7eeff5ff260bf6ffa00bf6ffae0bf6ffae0ef6ffbc0ef6ff0845f9ff1645f9ffe61cfeff9a35feffe238feff9651feff0692feff2a92feff3092feff4492feff56b1feff0acafefffccafeffc2cffeffd2cffeffd6cffeff1cd1feff24d1feff94d2feff9cd2feffc6d2feff0cd4feff14d4feff62d5feff68d5feff70d5feffeed7fefff4d7feff08d8feff1cdbfeffc80fffff0217ffffb62ffffffe32ffffb24bffffe688ffffec88ffff0089ffffcaa4ffff26c2ffff36c2ffff3cc2ffff0afbffffaa9c00005aa1000094a80000e4aa000080ae00008ab100009ab1000028b2000088b40000c2b4000046b50000c8b600007ebb0000a4bb00001abd00000ac00000d0c00000fac100008ec7000034c80000a4ca0000cecb000006ce0000f2ce0000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: "\u539F\u6750\u6599\u7ACB\u5E93 Variant (1)" + m_OriginalName: "\u539F\u6750\u6599\u7ACB\u5E93 Variant (1)" m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: -94310 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 0 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 14} + m_ClientGUIView: {fileID: 9} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -663,7 +575,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &21 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -684,10 +596,10 @@ MonoBehaviour: m_TextWithWhitespace: "Scene\u200B" m_Pos: serializedVersion: 2 - x: 257 - y: 24 - width: 953 - height: 453 + x: 265 + y: 79 + width: 766 + height: 528 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -730,10 +642,10 @@ MonoBehaviour: displayed: 1 id: unity-scene-view-toolbar index: 0 - contents: '{"m_Layout":1,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":24.0,"y":5.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":1,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":24.0,"y":25.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: 24, y: 5} + snapOffset: {x: 24, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 1 @@ -758,10 +670,10 @@ MonoBehaviour: displayed: 1 id: unity-transform-toolbar index: 0 - contents: '{"m_Layout":2,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":24.0,"y":13.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"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":25.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: 24, y: 13} + snapOffset: {x: 24, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 2 @@ -786,12 +698,12 @@ MonoBehaviour: displayed: 1 id: Orientation index: 0 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":71.5,"y":8.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":-63.5,"y":25.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":1,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 - snapOffset: {x: 71.5, y: 8} + snapOffset: {x: -63.5, y: 25} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 + snapCorner: 1 layout: 4 size: {x: 0, y: 0} sizeOverridden: 0 @@ -1080,10 +992,10 @@ MonoBehaviour: displayed: 1 id: unity-scene-view-camera-mode-toolbar index: 1 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":24.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":24.0,"y":25.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: 24, y: 0} + snapOffset: {x: 24, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 @@ -1108,10 +1020,10 @@ MonoBehaviour: displayed: 1 id: Overlays/OverlayMenu index: 1 - contents: '{"m_Layout":1,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":24.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":1,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":24.0,"y":25.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: 24, y: 0} + snapOffset: {x: 24, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 1 @@ -1147,7 +1059,7 @@ MonoBehaviour: sizeOverridden: 0 m_ContainerData: - containerId: overlay-toolbar__top - scrollOffset: 0 + scrollOffset: 27 - containerId: overlay-toolbar__left scrollOffset: 0 - containerId: overlay-container--left @@ -1172,9 +1084,9 @@ MonoBehaviour: m_AudioPlay: 0 m_DebugDrawModesUseInteractiveLightBakingData: 0 m_Position: - m_Target: {x: -72.33162, y: 0, z: 8.54694} + m_Target: {x: 11.0107, y: 9.7778, z: 7.5220566} speed: 2 - m_Value: {x: -72.33162, y: 0, z: 8.54694} + m_Value: {x: 11.0107, y: 9.7778, z: 7.5220556} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1220,13 +1132,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.15222394, y: -0.64144814, z: 0.13190775, w: 0.7402615} + m_Target: {x: 0.16529064, y: -0.7567191, z: 0.20974568, w: 0.59681594} speed: 2 - m_Value: {x: -0.15222394, y: 0.64144814, z: -0.13190776, w: -0.7402615} + m_Value: {x: 0.16559453, y: -0.7557749, z: 0.20948417, w: 0.59791225} m_Size: - m_Target: 10 + m_Target: 20.626644 speed: 2 - m_Value: 10 + m_Value: 20.626642 m_Ortho: m_Target: 0 speed: 2 @@ -1247,7 +1159,7 @@ MonoBehaviour: m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} m_LastSceneViewOrtho: 0 m_Viewpoint: - m_SceneView: {fileID: 21} + m_SceneView: {fileID: 19} m_CameraOverscanSettings: m_Opacity: 50 m_Scale: 1 @@ -1260,43 +1172,7 @@ MonoBehaviour: name: Contributors / Receivers section: Lighting m_ViewIsLockedToObject: 0 ---- !u!114 &22 -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: 1 - m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Console - m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_TextWithWhitespace: "Console\u200B" - m_Pos: - serializedVersion: 2 - x: 8 - y: 566 - width: 1456 - height: 420 - 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 ---- !u!114 &23 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1317,10 +1193,10 @@ MonoBehaviour: m_TextWithWhitespace: "Timeline\u200B" m_Pos: serializedVersion: 2 - x: 1312 - y: 24 - width: 144 - height: 453 + x: 1153 + y: 79 + width: 98 + height: 528 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1341,7 +1217,7 @@ MonoBehaviour: m_SequencePath: m_SelectionRoot: 0 m_SubElements: [] ---- !u!114 &24 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1363,9 +1239,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 503 - width: 1456 - height: 420 + y: 633 + width: 628 + height: 361 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1388,7 +1264,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/script/application + - Assets/GameLogic/Game/Common/Enum m_Globs: [] m_ProductIds: m_AnyWithAssetOrigin: 0 @@ -1398,16 +1274,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/script/application + - Assets/GameLogic/Game/Common/Enum m_LastFoldersGridSize: -1 m_LastProjectPath: D:\UGit\AK056 m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 120} - m_SelectedIDs: 32130100 - m_LastClickedID: 70450 - m_ExpandedIDs: 000000009c1201009e120100a0120100a212010000ca9a3bffffff7f + scrollPos: {x: 0, y: 65} + m_SelectedIDs: 60af1700 + m_LastClickedID: 1552224 + m_ExpandedIDs: 000000009c120100a2120100261301002c130100381301000a140100201e0100f03b0200184302002c430200764d03008c4d0300944d0300f04d03003ec30300acc30300c4c3030000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1424,7 +1300,7 @@ MonoBehaviour: m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 16} + m_ClientGUIView: {fileID: 14} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -1436,7 +1312,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000009c1201009e120100a0120100a2120100 + m_ExpandedIDs: 000000009c120100a212010026130100381301000a140100201e0100f03b0200184302002c430200764d03008c4d0300944d03003ec30300acc30300c4c3030000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1464,7 +1340,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000901d0600d2510500a2a305008ea0050010cb010044a200007e69000004a5780076d9790094da7900e0590400383d04002871000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1482,7 +1358,7 @@ MonoBehaviour: m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 16} + m_ClientGUIView: {fileID: 14} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -1493,8 +1369,44 @@ MonoBehaviour: m_ScrollPosition: {x: 0, y: 0} m_GridSize: 64 m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 229 ---- !u!114 &25 + m_DirectoriesAreaWidth: 287 +--- !u!114 &22 +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: 1 + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Console + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_TextWithWhitespace: "Console\u200B" + m_Pos: + serializedVersion: 2 + x: 629 + y: 633 + width: 622 + height: 361 + 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 +--- !u!114 &23 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1515,10 +1427,10 @@ MonoBehaviour: m_TextWithWhitespace: "Inspector\u200B" m_Pos: serializedVersion: 2 - x: 1458 - y: 24 - width: 446 - height: 899 + x: 1253 + y: 79 + width: 666 + height: 915 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1533,7 +1445,7 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: 350 + m_CachedPref: 151 m_ControlHash: 1412526313 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1