diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/UILoadUpdate.cs b/Client/Assets/Scripts/Hotfix/GameLogic/UILoadUpdate.cs index b966b6a..f245d73 100644 --- a/Client/Assets/Scripts/Hotfix/GameLogic/UILoadUpdate.cs +++ b/Client/Assets/Scripts/Hotfix/GameLogic/UILoadUpdate.cs @@ -1,5 +1,6 @@ using AlicizaX.UI.Runtime; +using Game.UI; using GameLogic.UI; using UnityEngine; diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/ui_UILoadUpdateWindow.cs b/Client/Assets/Scripts/Hotfix/GameLogic/ui_UILoadUpdateWindow.cs index d920a6e..413c4fa 100644 --- a/Client/Assets/Scripts/Hotfix/GameLogic/ui_UILoadUpdateWindow.cs +++ b/Client/Assets/Scripts/Hotfix/GameLogic/ui_UILoadUpdateWindow.cs @@ -1,9 +1,10 @@ -using UnityEngine; +using UnityEngine; using UnityEngine.UI; using TMPro; +using System.Collections.Generic; using Sirenix.OdinInspector; using AlicizaX.UI.Runtime; -namespace GameLogic.UI +namespace Game.UI { [UIRes(ui_UILoadUpdateWindow.ResTag, EUIResLoadType.AssetBundle)] public class ui_UILoadUpdateWindow : UIHolderObjectBase @@ -12,23 +13,25 @@ namespace GameLogic.UI #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; + [SerializeField] + private UXImage[] mImgTestList = new UXImage[5]; + public UXImage[] ImgTestList => mImgTestList; + + [SerializeField] + private CanvasGroup[] mCanvasGroupTestList = new CanvasGroup[5]; + public CanvasGroup[] CanvasGroupTestList => mCanvasGroupTestList; + #endregion } diff --git a/Client/Assets/Scripts/Hotfix/UXHotfixComponent.cs b/Client/Assets/Scripts/Hotfix/UXHotfixComponent.cs new file mode 100644 index 0000000..297bd4c --- /dev/null +++ b/Client/Assets/Scripts/Hotfix/UXHotfixComponent.cs @@ -0,0 +1,16 @@ +using UnityEngine; + +public class UXHotfixComponent : MonoBehaviour +{ + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Client/Assets/Scripts/Hotfix/UXHotfixComponent.cs.meta b/Client/Assets/Scripts/Hotfix/UXHotfixComponent.cs.meta new file mode 100644 index 0000000..22e9417 --- /dev/null +++ b/Client/Assets/Scripts/Hotfix/UXHotfixComponent.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 366fc66b74c28654189d16f54713ec0b \ No newline at end of file diff --git a/Client/Assets/Test.meta b/Client/Assets/Test.meta new file mode 100644 index 0000000..6346552 --- /dev/null +++ b/Client/Assets/Test.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6041b7ac33f601049b424a9a02938c98 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Test/GameBase.dll.bytes b/Client/Assets/Test/GameBase.dll.bytes new file mode 100644 index 0000000..de5564e Binary files /dev/null and b/Client/Assets/Test/GameBase.dll.bytes differ diff --git a/Client/Assets/Test/GameBase.dll.bytes.meta b/Client/Assets/Test/GameBase.dll.bytes.meta new file mode 100644 index 0000000..e2ff607 --- /dev/null +++ b/Client/Assets/Test/GameBase.dll.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d09d9371d1009e847b2ecffa8491412e +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Test/GameBase.pdb.bytes b/Client/Assets/Test/GameBase.pdb.bytes new file mode 100644 index 0000000..1ce4716 Binary files /dev/null and b/Client/Assets/Test/GameBase.pdb.bytes differ diff --git a/Client/Assets/Test/GameBase.pdb.bytes.meta b/Client/Assets/Test/GameBase.pdb.bytes.meta new file mode 100644 index 0000000..22e47eb --- /dev/null +++ b/Client/Assets/Test/GameBase.pdb.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3c3b29e4ec29e2740932eb0595f8d61d +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Test/GameLib.dll.bytes b/Client/Assets/Test/GameLib.dll.bytes new file mode 100644 index 0000000..8cec0ad Binary files /dev/null and b/Client/Assets/Test/GameLib.dll.bytes differ diff --git a/Client/Assets/Test/GameLib.dll.bytes.meta b/Client/Assets/Test/GameLib.dll.bytes.meta new file mode 100644 index 0000000..9368740 --- /dev/null +++ b/Client/Assets/Test/GameLib.dll.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 29c04c3563d5209468ba7056c350bced +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Test/GameLib.pdb.bytes b/Client/Assets/Test/GameLib.pdb.bytes new file mode 100644 index 0000000..b363ec3 Binary files /dev/null and b/Client/Assets/Test/GameLib.pdb.bytes differ diff --git a/Client/Assets/Test/GameLib.pdb.bytes.meta b/Client/Assets/Test/GameLib.pdb.bytes.meta new file mode 100644 index 0000000..cd83202 --- /dev/null +++ b/Client/Assets/Test/GameLib.pdb.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ab1962af65464d444be6f54cf9105d36 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Test/GameLogic.dll.bytes b/Client/Assets/Test/GameLogic.dll.bytes new file mode 100644 index 0000000..def2209 Binary files /dev/null and b/Client/Assets/Test/GameLogic.dll.bytes differ diff --git a/Client/Assets/Test/GameLogic.dll.bytes.meta b/Client/Assets/Test/GameLogic.dll.bytes.meta new file mode 100644 index 0000000..3f8dd57 --- /dev/null +++ b/Client/Assets/Test/GameLogic.dll.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 46cf174f5addc00478c98811ee0e64d8 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Test/GameLogic.pdb.bytes b/Client/Assets/Test/GameLogic.pdb.bytes new file mode 100644 index 0000000..c80d2a8 Binary files /dev/null and b/Client/Assets/Test/GameLogic.pdb.bytes differ diff --git a/Client/Assets/Test/GameLogic.pdb.bytes.meta b/Client/Assets/Test/GameLogic.pdb.bytes.meta new file mode 100644 index 0000000..d911dfc --- /dev/null +++ b/Client/Assets/Test/GameLogic.pdb.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fd632286fd6e2de48b3c1993e7325af4 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Test/GameProto.dll.bytes b/Client/Assets/Test/GameProto.dll.bytes new file mode 100644 index 0000000..a5f7c84 Binary files /dev/null and b/Client/Assets/Test/GameProto.dll.bytes differ diff --git a/Client/Assets/Test/GameProto.dll.bytes.meta b/Client/Assets/Test/GameProto.dll.bytes.meta new file mode 100644 index 0000000..879694b --- /dev/null +++ b/Client/Assets/Test/GameProto.dll.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 30a9cb679a5528d4f97687e9a664d61c +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Test/GameProto.pdb.bytes b/Client/Assets/Test/GameProto.pdb.bytes new file mode 100644 index 0000000..448a10a Binary files /dev/null and b/Client/Assets/Test/GameProto.pdb.bytes differ diff --git a/Client/Assets/Test/GameProto.pdb.bytes.meta b/Client/Assets/Test/GameProto.pdb.bytes.meta new file mode 100644 index 0000000..e83a6ac --- /dev/null +++ b/Client/Assets/Test/GameProto.pdb.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2ace906aa7e47db4497aa5b39d3799a9 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/uielementconfig.txt b/Client/Assets/uielementconfig.txt new file mode 100644 index 0000000..5d7abf7 --- /dev/null +++ b/Client/Assets/uielementconfig.txt @@ -0,0 +1,86 @@ +[ + { + "uiElementRegex": "Rect", + "componentType": "RectTransform" + }, + { + "uiElementRegex": "Obj", + "componentType": "GameObject" + }, + { + "uiElementRegex": "Tf", + "componentType": "Transform" + }, + { + "uiElementRegex": "Btn", + "componentType": "UXButton" + }, + { + "uiElementRegex": "Slider", + "componentType": "Slider" + }, + { + "uiElementRegex": "Img", + "componentType": "Image" + }, + { + "uiElementRegex": "RImg", + "componentType": "RawImage" + }, + { + "uiElementRegex": "Scrollbar", + "componentType": "Scrollbar" + }, + { + "uiElementRegex": "ScrollRect", + "componentType": "ScrollRect" + }, + { + "uiElementRegex": "GLayout", + "componentType": "GridLayoutGroup" + }, + { + "uiElementRegex": "HLayout", + "componentType": "HorizontalLayoutGroup" + }, + { + "uiElementRegex": "VLayout", + "componentType": "VerticalLayoutGroup" + }, + { + "uiElementRegex": "Text", + "componentType": "TMPro.TextMeshProUGUI" + }, + { + "uiElementRegex": "TogGroup", + "componentType": "UXGroup" + }, + { + "uiElementRegex": "Mask2D", + "componentType": "RectMask2D" + }, + { + "uiElementRegex": "Video", + "componentType": "Video.VideoPlayer" + }, + { + "uiElementRegex": "Input", + "componentType": "TMPro.TMP_InputField" + }, + { + "uiElementRegex": "CanvasGroup", + "componentType": "CanvasGroup" + }, + { + "uiElementRegex": "ScrollView", + "componentType": "RecyclerView" + }, + { + "uiElementRegex": "Drag", + "componentType": "UXDraggable" + }, + { + "uiElementRegex": "", + "componentType": "" + } +] \ No newline at end of file diff --git a/Client/Assets/uielementconfig.txt.meta b/Client/Assets/uielementconfig.txt.meta new file mode 100644 index 0000000..e4278db --- /dev/null +++ b/Client/Assets/uielementconfig.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 80277f623b9fa2c4284a4734a018bb2e +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/ProjectSettings/UIGenerateConfiguration.asset b/Client/ProjectSettings/UIGenerateConfiguration.asset index e49274e..167b4e4 100644 --- a/Client/ProjectSettings/UIGenerateConfiguration.asset +++ b/Client/ProjectSettings/UIGenerateConfiguration.asset @@ -19,17 +19,13 @@ MonoBehaviour: GeneratePrefix: ui ExcludeKeywords: - ViewHolder - UIScriptGenerateConfig: - MainProjectUIScriptGenerateData: - NameSpace: Unity.Startup - GenerateHolderCodePath: Assets/Scripts/Startup/Framework/UI - UIPrefabRootPath: Assets/Resources/UI - LoadType: 0 - HotFixProjectUIScriptGenerateData: - NameSpace: GameLogic.UI - GenerateHolderCodePath: Assets/Scripts/Hotfix/GameLogic - UIPrefabRootPath: - LoadType: 1 + CombineWords: + - Key: Window + Value: Window + - Key: ViewHolder + Value: ViewHolder + - Key: Widget + Value: Widget UIElementRegexConfigs: - uiElementRegex: Rect componentType: RectTransform @@ -71,3 +67,17 @@ MonoBehaviour: componentType: RecyclerView - uiElementRegex: Drag componentType: UXDraggable + - uiElementRegex: + componentType: + UIScriptGenerateConfigs: + - ProjectName: MainProject + NameSpace: Game.UI + GenerateHolderCodePath: Assets/Scripts/UI/Generated + UIPrefabRootPath: Assets/Art/UI/Prefabs + LoadType: 0 + - ProjectName: Hotfix + NameSpace: Game.UI + GenerateHolderCodePath: Assets/Scripts/Hotfix/GameLogic + UIPrefabRootPath: Assets/Art/UI/Prefabs + LoadType: 1 + UIScriptGeneratorHelper: AlicizaX.UI.Editor.DefaultUIGeneratorHelper diff --git a/Client/UserSettings/EditorUserSettings.asset b/Client/UserSettings/EditorUserSettings.asset index 0206018..58a3642 100644 --- a/Client/UserSettings/EditorUserSettings.asset +++ b/Client/UserSettings/EditorUserSettings.asset @@ -33,10 +33,10 @@ EditorUserSettings: value: 0505045406565e080c59097440205d4444164f727d7d76367d7d1c63e3b9646d 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/default-6000.dwlt b/Client/UserSettings/Layouts/default-6000.dwlt index 61b577e..1acc678 100644 --- a/Client/UserSettings/Layouts/default-6000.dwlt +++ b/Client/UserSettings/Layouts/default-6000.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 997 m_ShowMode: 4 - m_Title: Inspector + m_Title: Hierarchy m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -121,7 +121,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 46 + controlID: 132 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -140,7 +140,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 242 + width: 329 height: 941 m_MinSize: {x: 201, y: 226} m_MaxSize: {x: 4001, y: 4026} @@ -167,14 +167,14 @@ MonoBehaviour: - {fileID: 9} m_Position: serializedVersion: 2 - x: 242 + x: 329 y: 0 - width: 400 + width: 403 height: 941 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 47 + controlID: 26 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -193,8 +193,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 400 - height: 363 + width: 403 + height: 556 m_MinSize: {x: 202, y: 226} m_MaxSize: {x: 4002, y: 4026} m_ActualView: {fileID: 15} @@ -218,9 +218,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 363 - width: 400 - height: 578 + y: 556 + width: 403 + height: 385 m_MinSize: {x: 102, y: 126} m_MaxSize: {x: 4002, y: 4026} m_ActualView: {fileID: 16} @@ -244,9 +244,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 642 + x: 732 y: 0 - width: 626 + width: 514 height: 941 m_MinSize: {x: 232, y: 276} m_MaxSize: {x: 10002, y: 10026} @@ -270,9 +270,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1268 + x: 1246 y: 0 - width: 652 + width: 674 height: 941 m_MinSize: {x: 276, y: 76} m_MaxSize: {x: 4001, y: 4026} @@ -302,10 +302,10 @@ MonoBehaviour: m_TextWithWhitespace: "Game\u200B" m_Pos: serializedVersion: 2 - x: 242 - y: 442 - width: 456 - height: 552 + x: 412 + y: 552 + width: 426 + height: 442 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -323,7 +323,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 456, y: 256} + m_TargetSize: {x: 426, y: 240} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -338,10 +338,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -228 - m_HBaseRangeMax: 228 - m_VBaseRangeMin: -128 - m_VBaseRangeMax: 128 + m_HBaseRangeMin: -213 + m_HBaseRangeMax: 213 + m_VBaseRangeMin: -120 + m_VBaseRangeMax: 120 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -359,23 +359,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 456 - height: 531 + width: 426 + height: 421 m_Scale: {x: 1, y: 1} - m_Translation: {x: 228, y: 265.5} + m_Translation: {x: 213, y: 210.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -228 - y: -265.5 - width: 456 - height: 531 + x: -213 + y: -210.5 + width: 426 + height: 421 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 456, y: 552} + m_LastWindowPixelSize: {x: 426, y: 442} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -476,7 +476,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 24 - width: 241 + width: 328 height: 915 m_SerializedDataModeController: m_DataMode: 0 @@ -1046,9 +1046,9 @@ MonoBehaviour: m_AudioPlay: 0 m_DebugDrawModesUseInteractiveLightBakingData: 0 m_Position: - m_Target: {x: 997.2073, y: 999.3342, z: 100} + m_Target: {x: 1000.5826, y: 1000.46826, z: 709.1769} speed: 2 - m_Value: {x: 997.2073, y: 999.3342, z: 100} + m_Value: {x: 1000.5826, y: 1000.46826, z: 709.1769} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1098,9 +1098,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 0.6538925 + m_Target: 2.6676862 speed: 2 - m_Value: 0.6538925 + m_Value: 2.6676862 m_Ortho: m_Target: 1 speed: 2 @@ -1154,8 +1154,8 @@ MonoBehaviour: serializedVersion: 2 x: 1 y: 24 - width: 398 - height: 337 + width: 401 + height: 530 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1172,7 +1172,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: f6faffff + m_ExpandedIDs: 5a70ffff5079ffff8c79ffff9879ffffa479ffffb079ffffd479ffff827fffff8e7fffffc48bffffd08bffffd68cffffe68cffffee8cfffff08cfffff095ffff3ed0ffffe8d5ffff1ef3ffff26f3ffff28f3fffff6faffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1219,9 +1219,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 1 - y: 387 - width: 398 - height: 552 + y: 580 + width: 401 + height: 359 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1254,9 +1254,9 @@ MonoBehaviour: m_TextWithWhitespace: "Project\u200B" m_Pos: serializedVersion: 2 - x: 643 + x: 733 y: 24 - width: 624 + width: 512 height: 915 m_SerializedDataModeController: m_DataMode: 0 @@ -1279,7 +1279,8 @@ MonoBehaviour: m_ShowAllHits: 0 m_SkipHidden: 0 m_SearchArea: 1 - m_Folders: [] + m_Folders: + - Assets/YooAsset m_Globs: [] m_ProductIds: m_AnyWithAssetOrigin: 0 @@ -1297,7 +1298,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: e48c0000 m_LastClickedID: 36068 - m_ExpandedIDs: 00000000eac10000ecc10000eec10000f0c10000f2c10000f4c10000f6c10000f8c10000fac10000fcc10000fec1000000c2000002c2000004c2000006c2000008c200000ac200000cc200000ec2000010c2000012c2000014c2000016c2000018c200001ac200001cc200001ec2000020c2000022c2000024c2000026c2000028c200002ac200002cc200002ec2000030c2000032c2000034c2000036c2000038c200003ac200003cc200003ec2000040c2000042c2000044c2000046c2000048c200004ac200004cc200004ec2000050c2000052c2000054c2000056c2000058c200005ac200005cc200005ec2000060c2000062c2000064c2000066c2000068c200006ac200006cc200006ec2000070c2000072c2000074c2000076c2000078c200007ac200007cc200007ec2000080c2000082c2000084c2000086c2000088c200008ac200008cc200008ec2000090c2000092c2000094c2000096c2000098c200009ac200009cc200009ec20000a0c20000a2c20000a4c20000a6c20000a8c20000aac20000acc20000aec20000b0c20000b2c20000b4c20000b6c20000b8c20000bac20000bcc20000bec20000c0c20000c2c20000c4c20000c6c20000c8c20000cac20000ccc20000cec20000d0c20000d2c20000d4c20000d6c20000d8c20000dac20000dcc20000dec20000e0c20000e2c20000e4c20000e6c20000e8c20000eac20000ecc20000eec20000f0c20000f2c20000f4c20000f6c20000f8c20000fac20000fcc20000fec2000000c3000002c3000004c3000006c3000008c300000ac300000cc300000ec3000010c3000012c3000014c3000016c3000018c300001ac300001cc300001ec3000020c3000022c3000024c3000026c30000 + m_ExpandedIDs: 00000000a8bf00000cc200000ec2000010c2000012c2000014c2000016c2000018c200001ac200001cc200001ec2000020c2000022c2000024c2000026c2000028c200002ac200002cc200002ec2000030c2000032c2000034c2000036c2000038c200003ac200003cc200003ec2000040c2000042c2000044c2000046c2000048c200004ac200004cc200004ec2000050c2000052c2000054c2000056c2000058c200005ac200005cc200005ec2000060c2000062c2000064c2000066c2000068c200006ac200006cc200006ec2000070c2000072c2000074c2000076c2000078c200007ac200007cc200007ec2000080c2000082c2000084c2000086c2000088c200008ac200008cc200008ec2000090c2000092c2000094c2000096c2000098c200009ac200009cc200009ec20000a0c20000a2c20000a4c20000a6c20000a8c20000aac20000acc20000aec20000b0c20000b2c20000b4c20000b6c20000b8c20000bac20000bcc20000bec20000c0c20000c2c20000c4c20000c6c20000c8c20000cac20000ccc20000cec20000d0c20000d2c20000d4c20000d6c20000d8c20000dac20000dcc20000dec20000e0c20000e2c20000e4c20000e6c20000e8c20000eac20000ecc20000eec20000f0c20000f2c20000f4c20000f6c20000f8c20000fac20000fcc20000fec2000000c3000002c3000004c3000006c3000008c300000ac300000cc300000ec3000010c3000012c3000014c3000016c3000018c300001ac300001cc300001ec3000020c3000022c3000024c3000026c3000028c300002ac300002cc300002ec3000030c3000032c3000034c3000036c3000038c300003ac300003cc300003ec3000040c3000042c3000044c3000046c3000048c300004ac300004cc300004ec3000050c3000052c3000054c3000056c30000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1323,10 +1324,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 395} + scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000eac10000ecc10000eec10000f0c10000f2c10000f4c10000f6c10000f8c10000fac10000fcc10000fec1000000c2000002c2000004c2000006c2000008c200000ac200000cc200000ec2000010c2000012c2000014c2000016c2000018c200001ac200001cc200001ec2000020c2000022c2000024c2000026c2000028c200002ac200002cc200002ec2000030c2000032c2000034c2000036c2000038c200003ac200003cc200003ec2000040c2000042c2000044c2000046c2000048c200004ac200004cc200004ec2000050c2000052c2000054c2000056c2000058c200005ac200005cc200005ec2000060c2000062c2000064c2000066c2000068c200006ac200006cc200006ec2000070c2000072c2000074c2000076c2000078c200007ac200007cc200007ec2000080c2000082c2000084c2000086c2000088c200008ac200008cc200008ec2000090c2000092c2000094c2000096c2000098c200009ac200009cc200009ec20000a0c20000a2c20000a4c20000a6c20000a8c20000aac20000acc20000aec20000b0c20000b2c20000b4c20000b6c20000b8c20000bac20000bcc20000bec20000c0c20000c2c20000c4c20000c6c20000c8c20000cac20000ccc20000cec20000d0c20000d2c20000d4c20000d6c20000d8c20000dac20000dcc20000dec20000e0c20000e2c20000e4c20000e6c20000e8c20000eac20000ecc20000eec20000f0c20000f2c20000f4c20000f6c20000f8c20000fac20000fcc20000fec2000000c3000002c3000004c3000006c3000008c300000ac300000cc300000ec3000010c3000012c3000014c3000016c3000018c300001ac300001cc300001ec3000020c3000022c3000024c3000026c30000 + m_ExpandedIDs: 00000000a8bf00000cc200000ec2000010c2000012c2000014c2000016c2000018c200001ac200001cc200001ec2000020c2000022c2000024c2000026c2000028c200002ac200002cc200002ec2000030c2000032c2000034c2000036c2000038c200003ac200003cc200003ec2000040c2000042c2000044c2000046c2000048c200004ac200004cc200004ec2000050c2000052c2000054c2000056c2000058c200005ac200005cc200005ec2000060c2000062c2000064c2000066c2000068c200006ac200006cc200006ec2000070c2000072c2000074c2000076c2000078c200007ac200007cc200007ec2000080c2000082c2000084c2000086c2000088c200008ac200008cc200008ec2000090c2000092c2000094c2000096c2000098c200009ac200009cc200009ec20000a0c20000a2c20000a4c20000a6c20000a8c20000aac20000acc20000aec20000b0c20000b2c20000b4c20000b6c20000b8c20000bac20000bcc20000bec20000c0c20000c2c20000c4c20000c6c20000c8c20000cac20000ccc20000cec20000d0c20000d2c20000d4c20000d6c20000d8c20000dac20000dcc20000dec20000e0c20000e2c20000e4c20000e6c20000e8c20000eac20000ecc20000eec20000f0c20000f2c20000f4c20000f6c20000f8c20000fac20000fcc20000fec2000000c3000002c3000004c3000006c3000008c300000ac300000cc300000ec3000010c3000012c3000014c3000016c3000018c300001ac300001cc300001ec3000020c3000022c3000024c3000026c3000028c300002ac300002cc300002ec3000030c3000032c3000034c3000036c3000038c300003ac300003cc300003ec3000040c3000042c3000044c3000046c3000048c300004ac300004cc300004ec3000050c3000052c3000054c3000056c30000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1405,9 +1406,9 @@ MonoBehaviour: m_TextWithWhitespace: "Inspector\u200B" m_Pos: serializedVersion: 2 - x: 1269 + x: 1247 y: 24 - width: 651 + width: 673 height: 915 m_SerializedDataModeController: m_DataMode: 0 @@ -1423,7 +1424,7 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: -236 + m_CachedPref: 161 m_ControlHash: 1412526313 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1