diff --git a/Client/Assets/Art/Atlas/Atlas_GuideIcon.spriteatlasv2 b/Client/Assets/Art/Atlas/Atlas_GuideIcon.spriteatlasv2 index 7ebfda1..b4d5d97 100644 --- a/Client/Assets/Art/Atlas/Atlas_GuideIcon.spriteatlasv2 +++ b/Client/Assets/Art/Atlas/Atlas_GuideIcon.spriteatlasv2 @@ -98,4 +98,3 @@ SpriteAtlasAsset: - {fileID: 21300000, guid: 1fb9ba7be3bd78d4d8f92defbaf20658, type: 3} - {fileID: 21300000, guid: 6d0b106c0ebb73b408da135fe36d1401, type: 3} m_IsVariant: 0 - m_ScriptablePacker: {fileID: 0} diff --git a/Client/Assets/Art/Atlas/Atlas_GuideIcon.spriteatlasv2.meta b/Client/Assets/Art/Atlas/Atlas_GuideIcon.spriteatlasv2.meta index c23ae6c..5779639 100644 --- a/Client/Assets/Art/Atlas/Atlas_GuideIcon.spriteatlasv2.meta +++ b/Client/Assets/Art/Atlas/Atlas_GuideIcon.spriteatlasv2.meta @@ -14,7 +14,7 @@ SpriteAtlasImporter: crunchedCompression: 0 sRGB: 1 platformSettings: - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -27,7 +27,7 @@ SpriteAtlasImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -40,7 +40,7 @@ SpriteAtlasImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 diff --git a/Client/Assets/Art/Atlas/Atlas_GuideIcon_GuideIcon_Nonuse.spriteatlasv2 b/Client/Assets/Art/Atlas/Atlas_GuideIcon_GuideIcon_Nonuse.spriteatlasv2 index 8007baf..fe0fc2b 100644 --- a/Client/Assets/Art/Atlas/Atlas_GuideIcon_GuideIcon_Nonuse.spriteatlasv2 +++ b/Client/Assets/Art/Atlas/Atlas_GuideIcon_GuideIcon_Nonuse.spriteatlasv2 @@ -16,4 +16,3 @@ SpriteAtlasAsset: - {fileID: 21300000, guid: 252e7aae10cf6c64e84fe81966b3fc8b, type: 3} - {fileID: 21300000, guid: c7f54aa88f902f24182d8259d502555a, type: 3} m_IsVariant: 0 - m_ScriptablePacker: {fileID: 0} diff --git a/Client/Assets/Art/Atlas/Atlas_GuideIcon_GuideIcon_Nonuse.spriteatlasv2.meta b/Client/Assets/Art/Atlas/Atlas_GuideIcon_GuideIcon_Nonuse.spriteatlasv2.meta index 4561b08..89a3564 100644 --- a/Client/Assets/Art/Atlas/Atlas_GuideIcon_GuideIcon_Nonuse.spriteatlasv2.meta +++ b/Client/Assets/Art/Atlas/Atlas_GuideIcon_GuideIcon_Nonuse.spriteatlasv2.meta @@ -14,7 +14,7 @@ SpriteAtlasImporter: crunchedCompression: 0 sRGB: 1 platformSettings: - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -27,7 +27,7 @@ SpriteAtlasImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -40,7 +40,7 @@ SpriteAtlasImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 diff --git a/Client/Assets/Art/Atlas/Atlas_bg.spriteatlasv2 b/Client/Assets/Art/Atlas/Atlas_bg.spriteatlasv2 index 15ac152..fb484ab 100644 --- a/Client/Assets/Art/Atlas/Atlas_bg.spriteatlasv2 +++ b/Client/Assets/Art/Atlas/Atlas_bg.spriteatlasv2 @@ -11,6 +11,7 @@ SpriteAtlasAsset: m_MasterAtlas: {fileID: 0} m_ImporterData: packables: + - {fileID: 21300000, guid: 6869fc80122cb044baa3653a39fb5ef7, type: 3} - {fileID: 21300000, guid: e81b97b271bf77d4cb197c547f16537f, type: 3} - {fileID: 21300000, guid: ea4359b56c3b3a243b655926c67c0c18, type: 3} - {fileID: 21300000, guid: be114b2ca0a3d674795409f008820559, type: 3} @@ -18,6 +19,4 @@ SpriteAtlasAsset: - {fileID: 21300000, guid: c85435c2e44fba84aa4be72463b4848a, type: 3} - {fileID: 21300000, guid: 7e8d3e1227cf0e349b1ec2314405ece9, type: 3} - {fileID: 21300000, guid: f1a9b3e844ba0514bb068e4586261e57, type: 3} - - {fileID: 21300000, guid: 6869fc80122cb044baa3653a39fb5ef7, type: 3} m_IsVariant: 0 - m_ScriptablePacker: {fileID: 0} diff --git a/Client/Assets/Art/Atlas/Atlas_bg.spriteatlasv2.meta b/Client/Assets/Art/Atlas/Atlas_bg.spriteatlasv2.meta index 6c55106..25a7f4e 100644 --- a/Client/Assets/Art/Atlas/Atlas_bg.spriteatlasv2.meta +++ b/Client/Assets/Art/Atlas/Atlas_bg.spriteatlasv2.meta @@ -14,7 +14,7 @@ SpriteAtlasImporter: crunchedCompression: 0 sRGB: 1 platformSettings: - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -27,7 +27,7 @@ SpriteAtlasImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -40,7 +40,7 @@ SpriteAtlasImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 diff --git a/Client/Assets/Art/Atlas/Atlas_icon.spriteatlasv2 b/Client/Assets/Art/Atlas/Atlas_icon.spriteatlasv2 index 4f9a62d..bd66907 100644 --- a/Client/Assets/Art/Atlas/Atlas_icon.spriteatlasv2 +++ b/Client/Assets/Art/Atlas/Atlas_icon.spriteatlasv2 @@ -46,4 +46,3 @@ SpriteAtlasAsset: - {fileID: 21300000, guid: f2128539ea77d2e46aebeddbaf8daa99, type: 3} - {fileID: 21300000, guid: 68899d4f5d193974fb77cdc96746d377, type: 3} m_IsVariant: 0 - m_ScriptablePacker: {fileID: 0} diff --git a/Client/Assets/Art/Atlas/Atlas_icon.spriteatlasv2.meta b/Client/Assets/Art/Atlas/Atlas_icon.spriteatlasv2.meta index 419d0b8..f815f07 100644 --- a/Client/Assets/Art/Atlas/Atlas_icon.spriteatlasv2.meta +++ b/Client/Assets/Art/Atlas/Atlas_icon.spriteatlasv2.meta @@ -14,7 +14,7 @@ SpriteAtlasImporter: crunchedCompression: 0 sRGB: 1 platformSettings: - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -27,7 +27,7 @@ SpriteAtlasImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -40,7 +40,7 @@ SpriteAtlasImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 diff --git a/Client/Assets/Bundles/DLL/AlicizaX.Framework.Runtime.dll.bytes b/Client/Assets/Bundles/DLL/AlicizaX.Framework.Runtime.dll.bytes index 9ef55a8..ecf5936 100644 Binary files a/Client/Assets/Bundles/DLL/AlicizaX.Framework.Runtime.dll.bytes and b/Client/Assets/Bundles/DLL/AlicizaX.Framework.Runtime.dll.bytes differ diff --git a/Client/Assets/Bundles/DLL/GameBase.dll.bytes b/Client/Assets/Bundles/DLL/GameBase.dll.bytes index 0035200..369aaa4 100644 Binary files a/Client/Assets/Bundles/DLL/GameBase.dll.bytes and b/Client/Assets/Bundles/DLL/GameBase.dll.bytes differ diff --git a/Client/Assets/Bundles/DLL/GameLib.dll.bytes b/Client/Assets/Bundles/DLL/GameLib.dll.bytes index 7c34e27..e8d1dcd 100644 Binary files a/Client/Assets/Bundles/DLL/GameLib.dll.bytes and b/Client/Assets/Bundles/DLL/GameLib.dll.bytes differ diff --git a/Client/Assets/Bundles/DLL/GameLogic.dll.bytes b/Client/Assets/Bundles/DLL/GameLogic.dll.bytes index 39148d1..63ff56f 100644 Binary files a/Client/Assets/Bundles/DLL/GameLogic.dll.bytes and b/Client/Assets/Bundles/DLL/GameLogic.dll.bytes differ diff --git a/Client/Assets/Bundles/DLL/GameProto.dll.bytes b/Client/Assets/Bundles/DLL/GameProto.dll.bytes index 6596490..64f1bab 100644 Binary files a/Client/Assets/Bundles/DLL/GameProto.dll.bytes and b/Client/Assets/Bundles/DLL/GameProto.dll.bytes differ diff --git a/Client/Assets/Bundles/DLL/UniTask.Runtime.dll.bytes b/Client/Assets/Bundles/DLL/UniTask.Runtime.dll.bytes index eb081a7..1a75b40 100644 Binary files a/Client/Assets/Bundles/DLL/UniTask.Runtime.dll.bytes and b/Client/Assets/Bundles/DLL/UniTask.Runtime.dll.bytes differ diff --git a/Client/Assets/Bundles/DLL/Unity.InputSystem.dll.bytes b/Client/Assets/Bundles/DLL/Unity.InputSystem.dll.bytes index b301051..1d86b9d 100644 Binary files a/Client/Assets/Bundles/DLL/Unity.InputSystem.dll.bytes and b/Client/Assets/Bundles/DLL/Unity.InputSystem.dll.bytes differ diff --git a/Client/Assets/Bundles/DLL/mscorlib.dll.bytes b/Client/Assets/Bundles/DLL/mscorlib.dll.bytes index b19a12c..8e0b62c 100644 Binary files a/Client/Assets/Bundles/DLL/mscorlib.dll.bytes and b/Client/Assets/Bundles/DLL/mscorlib.dll.bytes differ diff --git a/Client/Assets/Bundles/ShaderVariants/MyShaderVariants.shadervariants b/Client/Assets/Bundles/ShaderVariants/MyShaderVariants.shadervariants index 877fade..134aad1 100644 --- a/Client/Assets/Bundles/ShaderVariants/MyShaderVariants.shadervariants +++ b/Client/Assets/Bundles/ShaderVariants/MyShaderVariants.shadervariants @@ -8,6 +8,11 @@ ShaderVariantCollection: m_PrefabAsset: {fileID: 0} m_Name: MyShaderVariants m_Shaders: + - first: {fileID: 0} + second: + variants: + - keywords: + passType: 0 - first: {fileID: 66, guid: 0000000000000000f000000000000000, type: 0} second: variants: @@ -56,9 +61,19 @@ ShaderVariantCollection: - first: {fileID: 9103, guid: 0000000000000000f000000000000000, type: 0} second: variants: - - keywords: UIE_FORCE_GAMMA + - keywords: passType: 0 - - first: {fileID: 19011, guid: 0000000000000000f000000000000000, type: 0} + - first: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} + second: + variants: + - keywords: _OUTPUT_DEPTH + passType: 0 + - first: {fileID: 4800000, guid: 65df88701913c224d95fc554db28381a, type: 3} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 4800000, guid: e7857e9d0c934dc4f83f270f8447b006, type: 3} second: variants: - keywords: @@ -68,10 +83,9 @@ ShaderVariantCollection: variants: - keywords: passType: 0 - - first: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} - second: - variants: - - keywords: + - keywords: _BLUE_NOISE _ORTHOGRAPHIC _SAMPLE_COUNT_MEDIUM _SOURCE_DEPTH_NORMALS + passType: 0 + - keywords: _BLUE_NOISE _SAMPLE_COUNT_MEDIUM _SOURCE_DEPTH_NORMALS passType: 0 - first: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} second: @@ -83,12 +97,16 @@ ShaderVariantCollection: variants: - keywords: passType: 8 - - keywords: _FORWARD_PLUS _LIGHT_LAYERS _MAIN_LIGHT_SHADOWS + - keywords: passType: 13 - - keywords: _FORWARD_PLUS _LIGHT_LAYERS _MAIN_LIGHT_SHADOWS _REFLECTION_PROBE_BLENDING - _REFLECTION_PROBE_BOX_PROJECTION + - keywords: _ADDITIONAL_LIGHT_SHADOWS _FORWARD_PLUS _MAIN_LIGHT_SHADOWS _REFLECTION_PROBE_BLENDING + _REFLECTION_PROBE_BOX_PROJECTION _SCREEN_SPACE_OCCLUSION passType: 13 - - first: {fileID: 4800000, guid: 36e335017ad71d54fbb10842863188ae, type: 3} + - keywords: _FORWARD_PLUS _LIGHT_LAYERS _MAIN_LIGHT_SHADOWS_CASCADE + passType: 13 + - keywords: _FORWARD_PLUS _MAIN_LIGHT_SHADOWS + passType: 13 + - first: {fileID: 4800000, guid: be26d7eaccb48ea43a343b69357edb55, type: 3} second: variants: - keywords: diff --git a/Client/Assets/HybridCLRGenerate/AOTGenericReferences.cs b/Client/Assets/HybridCLRGenerate/AOTGenericReferences.cs index 26683f5..22f6cf2 100644 --- a/Client/Assets/HybridCLRGenerate/AOTGenericReferences.cs +++ b/Client/Assets/HybridCLRGenerate/AOTGenericReferences.cs @@ -6,7 +6,6 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour public static readonly IReadOnlyList PatchedAOTAssemblyList = new List { "AlicizaX.Framework.Runtime.dll", - "System.Core.dll", "UniTask.Runtime.dll", "Unity.InputSystem.dll", "mscorlib.dll", @@ -18,8 +17,6 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour // {{ AOT generic types // AlicizaX.UI.Runtime.UITabWindow - // AlicizaX.UI.Runtime.UIWidget - // AlicizaX.UI.Runtime.UIWindow // Cysharp.Threading.Tasks.IUniTaskSource>>>>>>>>> // Cysharp.Threading.Tasks.IUniTaskSource>>>>>>>> // Cysharp.Threading.Tasks.IUniTaskSource>>>>>>> @@ -71,11 +68,8 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour // Cysharp.Threading.Tasks.UniTask>> // Cysharp.Threading.Tasks.UniTask> // Cysharp.Threading.Tasks.UniTask - // System.Action - // System.Action // System.Action // System.Action - // System.Action // System.Action // System.Action // System.Collections.Generic.ArraySortHelper @@ -114,9 +108,6 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour // System.Collections.Generic.EqualityComparer> // System.Collections.Generic.EqualityComparer // System.Collections.Generic.EqualityComparer - // System.Collections.Generic.HashSet.Enumerator - // System.Collections.Generic.HashSet - // System.Collections.Generic.HashSetEqualityComparer // System.Collections.Generic.ICollection> // System.Collections.Generic.ICollection> // System.Collections.Generic.ICollection @@ -133,7 +124,6 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour // System.Collections.Generic.IEnumerator // System.Collections.Generic.IEnumerator // System.Collections.Generic.IEqualityComparer - // System.Collections.Generic.IEqualityComparer // System.Collections.Generic.IList // System.Collections.Generic.IList // System.Collections.Generic.KeyValuePair @@ -211,23 +201,6 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour // System.Runtime.CompilerServices.ConfiguredTaskAwaitable>> // System.Runtime.CompilerServices.ConfiguredTaskAwaitable> // System.Runtime.CompilerServices.ConfiguredTaskAwaitable - // System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable.ConfiguredValueTaskAwaiter>>>>>>> - // System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable.ConfiguredValueTaskAwaiter>>>>>> - // System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable.ConfiguredValueTaskAwaiter>>>>> - // System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable.ConfiguredValueTaskAwaiter>>>> - // System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable.ConfiguredValueTaskAwaiter>>> - // System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable.ConfiguredValueTaskAwaiter>> - // System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable.ConfiguredValueTaskAwaiter> - // System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable.ConfiguredValueTaskAwaiter - // System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable>>>>>>>> - // System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable>>>>>>> - // System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable>>>>>> - // System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable>>>>> - // System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable>>>> - // System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable>>> - // System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable>> - // System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable> - // System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable // System.Runtime.CompilerServices.TaskAwaiter>>>>>>> // System.Runtime.CompilerServices.TaskAwaiter>>>>>> // System.Runtime.CompilerServices.TaskAwaiter>>>>> @@ -331,9 +304,8 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour { // object AlicizaX.Resource.Runtime.IResourceModule.LoadAsset(string,string) // Cysharp.Threading.Tasks.UniTask AlicizaX.Resource.Runtime.IResourceModule.LoadAssetAsync(string,System.Threading.CancellationToken,string) - // System.Void System.Array.Resize(GameLogic.Event.Generated.ModeChangedEventEventContainer.Handler[]&,int) - // System.Void System.Array.Resize(GameLogic.Event.Generated.ModeHGameChangedEventEventContainer.Handler[]&,int) - // System.Void System.Array.Resize(int[]&,int) + // Cysharp.Threading.Tasks.UniTask AlicizaX.UI.Runtime.IUIModule.ShowUI(object[]) + // object[] System.Array.Empty() // System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.AwaitUnsafeOnCompleted,GameLogic.HotfixEntry.d__4>(Cysharp.Threading.Tasks.UniTask.Awaiter&,GameLogic.HotfixEntry.d__4&) // System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.Startd__4>(GameLogic.HotfixEntry.d__4&) } diff --git a/Client/Assets/HybridCLRGenerate/link.xml b/Client/Assets/HybridCLRGenerate/link.xml index f81eb74..83a93b3 100644 --- a/Client/Assets/HybridCLRGenerate/link.xml +++ b/Client/Assets/HybridCLRGenerate/link.xml @@ -4,30 +4,25 @@ - - - + + - - - - - + @@ -37,9 +32,6 @@ - - - @@ -57,11 +49,11 @@ - + @@ -76,12 +68,14 @@ + + + - @@ -90,24 +84,19 @@ - - - - - @@ -115,7 +104,6 @@ - diff --git a/Client/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.meta b/Client/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.meta index 1a97dca..9b0c132 100644 --- a/Client/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.meta +++ b/Client/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.meta @@ -1,14 +1,49 @@ fileFormatVersion: 2 guid: 5651992cdad94894a3af7dc3f1da9170 -timeCreated: 1488828285 PluginImporter: - serializedVersion: 1 + externalObjects: {} + serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - Any: + - first: + : N3DS + second: + enabled: 1 + settings: {} + - first: + : PSM + second: + enabled: 1 + settings: {} + - first: + : PSP2 + second: + enabled: 1 + settings: {} + - first: + : SamsungTV + second: + enabled: 1 + settings: {} + - first: + : Tizen + second: + enabled: 1 + settings: {} + - first: + : WiiU + second: + enabled: 1 + settings: {} + - first: + Any: + second: enabled: 0 settings: Exclude Android: 1 @@ -33,45 +68,41 @@ PluginImporter: Exclude XboxOne: 0 Exclude iOS: 0 Exclude tvOS: 0 - Editor: + - first: + Editor: Editor + second: enabled: 0 settings: DefaultValueInitialized: true - N3DS: + - first: + PS4: PS4 + second: enabled: 1 settings: {} - PS4: - enabled: 1 + - first: + WebGL: WebGL + second: + enabled: 0 settings: {} - PSM: - enabled: 1 - settings: {} - PSP2: - enabled: 1 - settings: {} - SamsungTV: - enabled: 1 - settings: {} - Tizen: - enabled: 1 - settings: {} - WebGL: - enabled: 1 - settings: {} - WiiU: - enabled: 1 - settings: {} - WindowsStoreApps: + - first: + Windows Store Apps: WindowsStoreApps + second: enabled: 1 settings: CPU: AnyCPU - XboxOne: + - first: + XboxOne: XboxOne + second: enabled: 1 settings: {} - iOS: + - first: + iPhone: iOS + second: enabled: 1 settings: {} - tvOS: + - first: + tvOS: tvOS + second: enabled: 1 settings: {} userData: diff --git a/Client/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.meta b/Client/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.meta index 21e88ae..1638b90 100644 --- a/Client/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.meta +++ b/Client/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.meta @@ -1,14 +1,49 @@ fileFormatVersion: 2 guid: 5978f8f3dd274e848fbb7a123bde1fb9 -timeCreated: 1488828285 PluginImporter: - serializedVersion: 1 + externalObjects: {} + serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - Any: + - first: + : N3DS + second: + enabled: 1 + settings: {} + - first: + : PSM + second: + enabled: 1 + settings: {} + - first: + : PSP2 + second: + enabled: 1 + settings: {} + - first: + : SamsungTV + second: + enabled: 1 + settings: {} + - first: + : Tizen + second: + enabled: 1 + settings: {} + - first: + : WiiU + second: + enabled: 1 + settings: {} + - first: + Any: + second: enabled: 0 settings: Exclude Android: 1 @@ -33,45 +68,41 @@ PluginImporter: Exclude XboxOne: 0 Exclude iOS: 0 Exclude tvOS: 0 - Editor: + - first: + Editor: Editor + second: enabled: 0 settings: DefaultValueInitialized: true - N3DS: + - first: + PS4: PS4 + second: enabled: 1 settings: {} - PS4: - enabled: 1 + - first: + WebGL: WebGL + second: + enabled: 0 settings: {} - PSM: - enabled: 1 - settings: {} - PSP2: - enabled: 1 - settings: {} - SamsungTV: - enabled: 1 - settings: {} - Tizen: - enabled: 1 - settings: {} - WebGL: - enabled: 1 - settings: {} - WiiU: - enabled: 1 - settings: {} - WindowsStoreApps: + - first: + Windows Store Apps: WindowsStoreApps + second: enabled: 1 settings: CPU: AnyCPU - XboxOne: + - first: + XboxOne: XboxOne + second: enabled: 1 settings: {} - iOS: + - first: + iPhone: iOS + second: enabled: 1 settings: {} - tvOS: + - first: + tvOS: tvOS + second: enabled: 1 settings: {} userData: diff --git a/Client/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.meta b/Client/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.meta index ac8769d..6c4a4f0 100644 --- a/Client/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.meta +++ b/Client/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.meta @@ -1,17 +1,49 @@ fileFormatVersion: 2 guid: d2a8f0021d6b47c5923d8972dfb81ef1 -timeCreated: 1488828285 PluginImporter: - serializedVersion: 1 + externalObjects: {} + serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - Android: + - first: + : Linux + second: enabled: 1 settings: {} - Any: + - first: + : LinuxUniversal + second: + enabled: 1 + settings: {} + - first: + : OSXIntel + second: + enabled: 1 + settings: {} + - first: + : OSXIntel64 + second: + enabled: 1 + settings: {} + - first: + : PSM + second: + enabled: 0 + settings: {} + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: enabled: 0 settings: Exclude Android: 0 @@ -36,38 +68,44 @@ PluginImporter: Exclude XboxOne: 1 Exclude iOS: 1 Exclude tvOS: 1 - Editor: + - first: + Editor: Editor + second: enabled: 0 settings: DefaultValueInitialized: true - Linux: + - first: + Standalone: Linux64 + second: + enabled: 1 + settings: + CPU: + - first: + Standalone: OSXUniversal + second: + enabled: 1 + settings: + CPU: + - first: + Standalone: Win + second: + enabled: 1 + settings: + CPU: + - first: + Standalone: Win64 + second: + enabled: 1 + settings: + CPU: + - first: + WebGL: WebGL + second: enabled: 1 settings: {} - Linux64: - enabled: 1 - settings: {} - LinuxUniversal: - enabled: 1 - settings: {} - OSXIntel: - enabled: 1 - settings: {} - OSXIntel64: - enabled: 1 - settings: {} - OSXUniversal: - enabled: 1 - settings: {} - PSM: - enabled: 0 - settings: {} - Win: - enabled: 1 - settings: {} - Win64: - enabled: 1 - settings: {} - WindowsStoreApps: + - first: + Windows Store Apps: WindowsStoreApps + second: enabled: 0 settings: CPU: AnyCPU diff --git a/Client/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.meta b/Client/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.meta index f158c55..8f0dfab 100644 --- a/Client/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.meta +++ b/Client/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.meta @@ -1,17 +1,49 @@ fileFormatVersion: 2 guid: 1e0a9643dc0d4b46bf2321f72c4e503e -timeCreated: 1488828285 PluginImporter: - serializedVersion: 1 + externalObjects: {} + serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - Android: + - first: + : Linux + second: enabled: 1 settings: {} - Any: + - first: + : LinuxUniversal + second: + enabled: 1 + settings: {} + - first: + : OSXIntel + second: + enabled: 1 + settings: {} + - first: + : OSXIntel64 + second: + enabled: 1 + settings: {} + - first: + : PSM + second: + enabled: 0 + settings: {} + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: enabled: 0 settings: Exclude Android: 0 @@ -36,38 +68,44 @@ PluginImporter: Exclude XboxOne: 1 Exclude iOS: 1 Exclude tvOS: 1 - Editor: + - first: + Editor: Editor + second: enabled: 0 settings: DefaultValueInitialized: true - Linux: + - first: + Standalone: Linux64 + second: + enabled: 1 + settings: + CPU: + - first: + Standalone: OSXUniversal + second: + enabled: 1 + settings: + CPU: + - first: + Standalone: Win + second: + enabled: 1 + settings: + CPU: + - first: + Standalone: Win64 + second: + enabled: 1 + settings: + CPU: + - first: + WebGL: WebGL + second: enabled: 1 settings: {} - Linux64: - enabled: 1 - settings: {} - LinuxUniversal: - enabled: 1 - settings: {} - OSXIntel: - enabled: 1 - settings: {} - OSXIntel64: - enabled: 1 - settings: {} - OSXUniversal: - enabled: 1 - settings: {} - PSM: - enabled: 0 - settings: {} - Win: - enabled: 1 - settings: {} - Win64: - enabled: 1 - settings: {} - WindowsStoreApps: + - first: + Windows Store Apps: WindowsStoreApps + second: enabled: 0 settings: CPU: AnyCPU diff --git a/Client/Assets/Resources/Localization.meta b/Client/Assets/Resources/Localization.meta deleted file mode 100644 index b291c63..0000000 --- a/Client/Assets/Resources/Localization.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c6c2fcc11e4b7824aa1f24d503b804d9 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Client/Assets/Resources/ModuleDynamicBindInfo.bytes b/Client/Assets/Resources/ModuleDynamicBindInfo.bytes index 1c2a6fd..6103874 100644 --- a/Client/Assets/Resources/ModuleDynamicBindInfo.bytes +++ b/Client/Assets/Resources/ModuleDynamicBindInfo.bytes @@ -1 +1 @@ -{"DebuggerActiveWindowType":0,"ResMode":1,"Language":"ChineseSimplified"} \ No newline at end of file +{"DebuggerActiveWindowType":0,"ResMode":3,"Language":"ChineseSimplified"} diff --git a/Client/Assets/Scenes/Main.unity b/Client/Assets/Scenes/Main.unity index bf1432f..b86196c 100644 --- a/Client/Assets/Scenes/Main.unity +++ b/Client/Assets/Scenes/Main.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 10 + serializedVersion: 9 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -42,8 +42,8 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 13 - m_BakeOnSceneLoad: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -66,6 +66,9 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -130,7 +133,7 @@ GameObject: - component: {fileID: 954605702} - component: {fileID: 954605701} m_Layer: 0 - m_Name: GameObject + m_Name: Procedure m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/HotfixEntry.cs b/Client/Assets/Scripts/Hotfix/GameLogic/HotfixEntry.cs index 664812a..96974ef 100644 --- a/Client/Assets/Scripts/Hotfix/GameLogic/HotfixEntry.cs +++ b/Client/Assets/Scripts/Hotfix/GameLogic/HotfixEntry.cs @@ -31,15 +31,20 @@ namespace GameLogic public static void Entrance(object[] objects) { Log.Info("HotFix Logic Entry!"); - _hotfixAssembly = (List)objects[0]; UXComponentExtensionsHelper.SetLocalizationHelper(new UXLocalizationHelper()); - GameLocaizationTable table = GameApp.Resource.LoadAsset("LocalizationTable"); - GameApp.Localization.IncreAddLocalizationConfig(table); - GameApp.UI.ShowUI(); + Initlized().Forget(); } + public static async UniTaskVoid Initlized() + { + GameLocaizationTable table = await GameApp.Resource.LoadAssetAsync("LocalizationTable"); + GameApp.Localization.IncreAddLocalizationConfig(table); + Log.Info("加载多语言配置表完毕"); + await GameApp.UI.ShowUI(); + } + /// /// 加载二进制配置表 /// diff --git a/Client/Assets/Scripts/Startup/Procedure/PatchUpdater/ProcedureEntryState.cs b/Client/Assets/Scripts/Startup/Procedure/PatchUpdater/ProcedureEntryState.cs index d350699..4aa85de 100644 --- a/Client/Assets/Scripts/Startup/Procedure/PatchUpdater/ProcedureEntryState.cs +++ b/Client/Assets/Scripts/Startup/Procedure/PatchUpdater/ProcedureEntryState.cs @@ -28,6 +28,13 @@ namespace Unity.Startup.Procedure return; } + if (GameApp.Resource.PlayMode == EPlayMode.WebPlayMode) + { + HttpHelper.CDNUrl = "http://127.0.0.1:8080/CDN/WebGL"; + SwitchState(UpdateProcedureState.ProcedureInitPackageState); + return; + } + GetRemoteVersionInfo(); } diff --git a/Client/Assets/Scripts/Startup/Procedure/PatchUpdater/ProcedureInitPackageState.cs b/Client/Assets/Scripts/Startup/Procedure/PatchUpdater/ProcedureInitPackageState.cs index 949d7df..d670e51 100644 --- a/Client/Assets/Scripts/Startup/Procedure/PatchUpdater/ProcedureInitPackageState.cs +++ b/Client/Assets/Scripts/Startup/Procedure/PatchUpdater/ProcedureInitPackageState.cs @@ -16,11 +16,11 @@ namespace Unity.Startup.Procedure private async UniTask InitPackageAsync() { string hostUrl = string.Empty; - if (GameApp.Resource.PlayMode == EPlayMode.HostPlayMode) + if (GameApp.Resource.PlayMode == EPlayMode.HostPlayMode || GameApp.Resource.PlayMode == EPlayMode.WebPlayMode) { hostUrl = HttpHelper.CDNUrl; } - + Log.Info(hostUrl); await GameApp.Resource.InitPackageAsync(string.Empty, hostUrl, hostUrl); await UniTask.DelayFrame(); UpdateStaticVersion().Forget(); diff --git a/Client/Assets/Settings/Mobile_RPAsset.asset b/Client/Assets/Settings/Mobile_RPAsset.asset index 08a0815..e4129ef 100644 --- a/Client/Assets/Settings/Mobile_RPAsset.asset +++ b/Client/Assets/Settings/Mobile_RPAsset.asset @@ -33,14 +33,6 @@ MonoBehaviour: m_EnableLODCrossFade: 1 m_LODCrossFadeDitheringType: 1 m_ShEvalMode: 0 - m_LightProbeSystem: 0 - m_ProbeVolumeMemoryBudget: 1024 - m_ProbeVolumeBlendingMemoryBudget: 256 - m_SupportProbeVolumeGPUStreaming: 0 - m_SupportProbeVolumeDiskStreaming: 0 - m_SupportProbeVolumeScenarios: 0 - m_SupportProbeVolumeScenarioBlending: 0 - m_ProbeVolumeSHBands: 1 m_MainLightRenderingMode: 1 m_MainLightShadowsSupported: 1 m_MainLightShadowmapResolution: 1024 @@ -75,30 +67,21 @@ MonoBehaviour: m_SupportsLightLayers: 1 m_DebugLevel: 0 m_StoreActionsOptimization: 0 + m_EnableRenderGraph: 0 m_UseAdaptivePerformance: 1 m_ColorGradingMode: 0 m_ColorGradingLutSize: 32 - m_AllowPostProcessAlphaOutput: 0 m_UseFastSRGBLinearConversion: 1 m_SupportDataDrivenLensFlare: 1 - m_SupportScreenSpaceLensFlare: 1 - m_GPUResidentDrawerMode: 0 - m_SmallMeshScreenPercentage: 0 - m_GPUResidentDrawerEnableOcclusionCullingInCameras: 0 m_ShadowType: 1 m_LocalShadowsSupported: 0 m_LocalShadowsAtlasResolution: 256 m_MaxPixelLights: 0 m_ShadowAtlasResolution: 256 m_VolumeFrameworkUpdateMode: 0 - m_VolumeProfile: {fileID: 11400000, guid: 10fc4df2da32a41aaa32d77bc913491c, type: 2} - apvScenesData: - obsoleteSceneBounds: - m_Keys: [] - m_Values: [] - obsoleteHasProbeVolumes: - m_Keys: [] - m_Values: + m_Textures: + blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} + bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} m_PrefilteringModeMainLightShadows: 3 m_PrefilteringModeAdditionalLight: 0 m_PrefilteringModeAdditionalLightShadows: 0 @@ -109,7 +92,6 @@ MonoBehaviour: m_PrefilterDebugKeywords: 1 m_PrefilterWriteRenderingLayers: 1 m_PrefilterHDROutput: 1 - m_PrefilterAlphaOutput: 1 m_PrefilterSSAODepthNormals: 1 m_PrefilterSSAOSourceDepthLow: 1 m_PrefilterSSAOSourceDepthMedium: 1 @@ -128,9 +110,5 @@ MonoBehaviour: m_PrefilterSoftShadows: 0 m_PrefilterScreenCoord: 1 m_PrefilterNativeRenderPass: 1 - m_PrefilterUseLegacyLightmaps: 0 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 - m_Textures: - blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} - bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} diff --git a/Client/Assets/Settings/PC_RPAsset.asset b/Client/Assets/Settings/PC_RPAsset.asset index 1dc8001..bd172a6 100644 --- a/Client/Assets/Settings/PC_RPAsset.asset +++ b/Client/Assets/Settings/PC_RPAsset.asset @@ -33,14 +33,6 @@ MonoBehaviour: m_EnableLODCrossFade: 1 m_LODCrossFadeDitheringType: 1 m_ShEvalMode: 0 - m_LightProbeSystem: 0 - m_ProbeVolumeMemoryBudget: 1024 - m_ProbeVolumeBlendingMemoryBudget: 256 - m_SupportProbeVolumeGPUStreaming: 0 - m_SupportProbeVolumeDiskStreaming: 0 - m_SupportProbeVolumeScenarios: 0 - m_SupportProbeVolumeScenarioBlending: 0 - m_ProbeVolumeSHBands: 1 m_MainLightRenderingMode: 1 m_MainLightShadowsSupported: 1 m_MainLightShadowmapResolution: 2048 @@ -75,30 +67,21 @@ MonoBehaviour: m_SupportsLightLayers: 1 m_DebugLevel: 0 m_StoreActionsOptimization: 0 + m_EnableRenderGraph: 0 m_UseAdaptivePerformance: 1 m_ColorGradingMode: 0 m_ColorGradingLutSize: 32 - m_AllowPostProcessAlphaOutput: 0 m_UseFastSRGBLinearConversion: 0 m_SupportDataDrivenLensFlare: 1 - m_SupportScreenSpaceLensFlare: 1 - m_GPUResidentDrawerMode: 0 - m_SmallMeshScreenPercentage: 0 - m_GPUResidentDrawerEnableOcclusionCullingInCameras: 0 m_ShadowType: 1 m_LocalShadowsSupported: 0 m_LocalShadowsAtlasResolution: 256 m_MaxPixelLights: 0 m_ShadowAtlasResolution: 256 m_VolumeFrameworkUpdateMode: 0 - m_VolumeProfile: {fileID: 11400000, guid: 10fc4df2da32a41aaa32d77bc913491c, type: 2} - apvScenesData: - obsoleteSceneBounds: - m_Keys: [] - m_Values: [] - obsoleteHasProbeVolumes: - m_Keys: [] - m_Values: + m_Textures: + blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} + bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} m_PrefilteringModeMainLightShadows: 3 m_PrefilteringModeAdditionalLight: 0 m_PrefilteringModeAdditionalLightShadows: 2 @@ -109,7 +92,6 @@ MonoBehaviour: m_PrefilterDebugKeywords: 1 m_PrefilterWriteRenderingLayers: 1 m_PrefilterHDROutput: 1 - m_PrefilterAlphaOutput: 1 m_PrefilterSSAODepthNormals: 0 m_PrefilterSSAOSourceDepthLow: 1 m_PrefilterSSAOSourceDepthMedium: 1 @@ -128,9 +110,5 @@ MonoBehaviour: m_PrefilterSoftShadows: 0 m_PrefilterScreenCoord: 1 m_PrefilterNativeRenderPass: 1 - m_PrefilterUseLegacyLightmaps: 0 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 - m_Textures: - blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} - bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} diff --git a/Client/Assets/Test.meta b/Client/Assets/Test.meta deleted file mode 100644 index e006ed5..0000000 --- a/Client/Assets/Test.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: aaae90b7f7bb5354798414e44e6ff3fe -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Client/Assets/Test/GameBase.dll.bytes b/Client/Assets/Test/GameBase.dll.bytes deleted file mode 100644 index 94e447c..0000000 Binary files a/Client/Assets/Test/GameBase.dll.bytes and /dev/null differ diff --git a/Client/Assets/Test/GameBase.dll.bytes.meta b/Client/Assets/Test/GameBase.dll.bytes.meta deleted file mode 100644 index 13a478d..0000000 --- a/Client/Assets/Test/GameBase.dll.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 4c9854ad435261f428d1e798fc7c8794 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Client/Assets/Test/GameBase.pdb.bytes b/Client/Assets/Test/GameBase.pdb.bytes deleted file mode 100644 index 71b93f4..0000000 Binary files a/Client/Assets/Test/GameBase.pdb.bytes and /dev/null differ diff --git a/Client/Assets/Test/GameBase.pdb.bytes.meta b/Client/Assets/Test/GameBase.pdb.bytes.meta deleted file mode 100644 index 034f184..0000000 --- a/Client/Assets/Test/GameBase.pdb.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 1290740171caaf845a72f786738ba33d -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Client/Assets/Test/GameLib.dll.bytes b/Client/Assets/Test/GameLib.dll.bytes deleted file mode 100644 index 79da5c6..0000000 Binary files a/Client/Assets/Test/GameLib.dll.bytes and /dev/null differ diff --git a/Client/Assets/Test/GameLib.dll.bytes.meta b/Client/Assets/Test/GameLib.dll.bytes.meta deleted file mode 100644 index ee90c72..0000000 --- a/Client/Assets/Test/GameLib.dll.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f2edd2f5cea95574187eee33c8c2f6c4 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Client/Assets/Test/GameLib.pdb.bytes b/Client/Assets/Test/GameLib.pdb.bytes deleted file mode 100644 index b900c1c..0000000 Binary files a/Client/Assets/Test/GameLib.pdb.bytes and /dev/null differ diff --git a/Client/Assets/Test/GameLib.pdb.bytes.meta b/Client/Assets/Test/GameLib.pdb.bytes.meta deleted file mode 100644 index 971c18a..0000000 --- a/Client/Assets/Test/GameLib.pdb.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 44d43b915b1f8ba46b3b6ede7e23f3a5 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Client/Assets/Test/GameLogic.dll.bytes b/Client/Assets/Test/GameLogic.dll.bytes deleted file mode 100644 index 4229e2b..0000000 Binary files a/Client/Assets/Test/GameLogic.dll.bytes and /dev/null differ diff --git a/Client/Assets/Test/GameLogic.dll.bytes.meta b/Client/Assets/Test/GameLogic.dll.bytes.meta deleted file mode 100644 index fc89525..0000000 --- a/Client/Assets/Test/GameLogic.dll.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 923f7f8783263ff459ddf6c580af7019 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Client/Assets/Test/GameLogic.pdb.bytes b/Client/Assets/Test/GameLogic.pdb.bytes deleted file mode 100644 index a9f5438..0000000 Binary files a/Client/Assets/Test/GameLogic.pdb.bytes and /dev/null differ diff --git a/Client/Assets/Test/GameLogic.pdb.bytes.meta b/Client/Assets/Test/GameLogic.pdb.bytes.meta deleted file mode 100644 index 63c6082..0000000 --- a/Client/Assets/Test/GameLogic.pdb.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 67a92cde3fb41614db7182c6fbf9bf93 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Client/Assets/Test/GameProto.dll.bytes b/Client/Assets/Test/GameProto.dll.bytes deleted file mode 100644 index f16ec29..0000000 Binary files a/Client/Assets/Test/GameProto.dll.bytes and /dev/null differ diff --git a/Client/Assets/Test/GameProto.dll.bytes.meta b/Client/Assets/Test/GameProto.dll.bytes.meta deleted file mode 100644 index 82429d1..0000000 --- a/Client/Assets/Test/GameProto.dll.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ab1df13d4d6a864459ee6a57bca41e94 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Client/Assets/Test/GameProto.pdb.bytes b/Client/Assets/Test/GameProto.pdb.bytes deleted file mode 100644 index d993054..0000000 Binary files a/Client/Assets/Test/GameProto.pdb.bytes and /dev/null differ diff --git a/Client/Assets/Test/GameProto.pdb.bytes.meta b/Client/Assets/Test/GameProto.pdb.bytes.meta deleted file mode 100644 index ea01028..0000000 --- a/Client/Assets/Test/GameProto.pdb.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 57561e06a22e5dc4dbcbb5127c78e0e4 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Client/Bundles/WebGL/DefaultPackage/Simulate/DefaultPackage.version b/Client/Bundles/WebGL/DefaultPackage/Simulate/DefaultPackage.version new file mode 100644 index 0000000..de541bb --- /dev/null +++ b/Client/Bundles/WebGL/DefaultPackage/Simulate/DefaultPackage.version @@ -0,0 +1 @@ +Simulate \ No newline at end of file diff --git a/Client/Bundles/WebGL/DefaultPackage/Simulate/DefaultPackage_Simulate.bytes b/Client/Bundles/WebGL/DefaultPackage/Simulate/DefaultPackage_Simulate.bytes new file mode 100644 index 0000000..0cb2763 Binary files /dev/null and b/Client/Bundles/WebGL/DefaultPackage/Simulate/DefaultPackage_Simulate.bytes differ diff --git a/Client/Bundles/WebGL/DefaultPackage/Simulate/DefaultPackage_Simulate.hash b/Client/Bundles/WebGL/DefaultPackage/Simulate/DefaultPackage_Simulate.hash new file mode 100644 index 0000000..f462bd0 --- /dev/null +++ b/Client/Bundles/WebGL/DefaultPackage/Simulate/DefaultPackage_Simulate.hash @@ -0,0 +1 @@ +e021a2bf \ No newline at end of file diff --git a/Client/Bundles/WebGL/DefaultPackage/Simulate/DefaultPackage_Simulate.json b/Client/Bundles/WebGL/DefaultPackage/Simulate/DefaultPackage_Simulate.json new file mode 100644 index 0000000..2dfbeef --- /dev/null +++ b/Client/Bundles/WebGL/DefaultPackage/Simulate/DefaultPackage_Simulate.json @@ -0,0 +1,1664 @@ +{ + "FileVersion": "2025.9.30", + "EnableAddressable": true, + "SupportExtensionless": true, + "LocationToLower": false, + "IncludeAssetGUID": false, + "ReplaceAssetPathWithAddress": false, + "OutputNameStyle": 0, + "BuildBundleType": 1, + "BuildPipeline": "EditorSimulateBuildPipeline", + "PackageName": "DefaultPackage", + "PackageVersion": "Simulate", + "PackageNote": "2025/11/12 14:22:46", + "AssetList": [ + { + "Address": "A1", + "AssetPath": "Assets/Bundles/Audios/AudioClip/A1.ogg", + "AssetGUID": "", + "AssetTags": [ + "Audios" + ], + "BundleID": 0, + "DependBundleIDs": [] + }, + { + "Address": "A2", + "AssetPath": "Assets/Bundles/Audios/AudioClip/A2.ogg", + "AssetGUID": "", + "AssetTags": [ + "Audios" + ], + "BundleID": 0, + "DependBundleIDs": [] + }, + { + "Address": "A3", + "AssetPath": "Assets/Bundles/Audios/AudioClip/A3.ogg", + "AssetGUID": "", + "AssetTags": [ + "Audios" + ], + "BundleID": 0, + "DependBundleIDs": [] + }, + { + "Address": "A4", + "AssetPath": "Assets/Bundles/Audios/AudioClip/A4.ogg", + "AssetGUID": "", + "AssetTags": [ + "Audios" + ], + "BundleID": 0, + "DependBundleIDs": [] + }, + { + "Address": "AirDash_01", + "AssetPath": "Assets/Bundles/Audios/AudioClip/AirDash_01.ogg", + "AssetGUID": "", + "AssetTags": [ + "Audios" + ], + "BundleID": 0, + "DependBundleIDs": [] + }, + { + "Address": "tables_tbachievement", + "AssetPath": "Assets/Bundles/Configs/bytes/tables_tbachievement.bytes", + "AssetGUID": "", + "AssetTags": [ + "WEBGL_PRELOAD", + "Configs" + ], + "BundleID": 2, + "DependBundleIDs": [] + }, + { + "Address": "LocalizationTable", + "AssetPath": "Assets/Bundles/Configs/LocalizationTable.asset", + "AssetGUID": "", + "AssetTags": [ + "WEBGL_PRELOAD", + "Configs" + ], + "BundleID": 1, + "DependBundleIDs": [] + }, + { + "Address": "AlicizaX.Framework.Runtime.dll", + "AssetPath": "Assets/Bundles/DLL/AlicizaX.Framework.Runtime.dll.bytes", + "AssetGUID": "", + "AssetTags": [ + "DLL" + ], + "BundleID": 3, + "DependBundleIDs": [] + }, + { + "Address": "GameBase.dll", + "AssetPath": "Assets/Bundles/DLL/GameBase.dll.bytes", + "AssetGUID": "", + "AssetTags": [ + "DLL" + ], + "BundleID": 3, + "DependBundleIDs": [] + }, + { + "Address": "GameLib.dll", + "AssetPath": "Assets/Bundles/DLL/GameLib.dll.bytes", + "AssetGUID": "", + "AssetTags": [ + "DLL" + ], + "BundleID": 3, + "DependBundleIDs": [] + }, + { + "Address": "GameLogic.dll", + "AssetPath": "Assets/Bundles/DLL/GameLogic.dll.bytes", + "AssetGUID": "", + "AssetTags": [ + "DLL" + ], + "BundleID": 3, + "DependBundleIDs": [] + }, + { + "Address": "GameProto.dll", + "AssetPath": "Assets/Bundles/DLL/GameProto.dll.bytes", + "AssetGUID": "", + "AssetTags": [ + "DLL" + ], + "BundleID": 3, + "DependBundleIDs": [] + }, + { + "Address": "mscorlib.dll", + "AssetPath": "Assets/Bundles/DLL/mscorlib.dll.bytes", + "AssetGUID": "", + "AssetTags": [ + "DLL" + ], + "BundleID": 3, + "DependBundleIDs": [] + }, + { + "Address": "System.Core.dll", + "AssetPath": "Assets/Bundles/DLL/System.Core.dll.bytes", + "AssetGUID": "", + "AssetTags": [ + "DLL" + ], + "BundleID": 3, + "DependBundleIDs": [] + }, + { + "Address": "UniTask.Runtime.dll", + "AssetPath": "Assets/Bundles/DLL/UniTask.Runtime.dll.bytes", + "AssetGUID": "", + "AssetTags": [ + "DLL" + ], + "BundleID": 3, + "DependBundleIDs": [] + }, + { + "Address": "Unity.InputSystem.dll", + "AssetPath": "Assets/Bundles/DLL/Unity.InputSystem.dll.bytes", + "AssetGUID": "", + "AssetTags": [ + "DLL" + ], + "BundleID": 3, + "DependBundleIDs": [] + }, + { + "Address": "Map1000", + "AssetPath": "Assets/Bundles/Scenes/Map1000.unity", + "AssetGUID": "", + "AssetTags": [ + "Scenes" + ], + "BundleID": 4, + "DependBundleIDs": [] + }, + { + "Address": "MyShaderVariants", + "AssetPath": "Assets/Bundles/ShaderVariants/MyShaderVariants.shadervariants", + "AssetGUID": "", + "AssetTags": [ + "ShaderVariants" + ], + "BundleID": 10, + "DependBundleIDs": [] + }, + { + "Address": "UILoadUpdateWindow", + "AssetPath": "Assets/Bundles/UI/UILoadUpdateWindow.prefab", + "AssetGUID": "", + "AssetTags": [ + "UI" + ], + "BundleID": 5, + "DependBundleIDs": [] + }, + { + "Address": "add_hover", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/bg/add_hover.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 6, + "DependBundleIDs": [] + }, + { + "Address": "BottomLine", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/bg/BottomLine.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 6, + "DependBundleIDs": [] + }, + { + "Address": "BottomLine3D", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/bg/BottomLine3D.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 6, + "DependBundleIDs": [] + }, + { + "Address": "cloud01", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/bg/cloud01.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 6, + "DependBundleIDs": [] + }, + { + "Address": "cloud02", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/bg/cloud02.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 6, + "DependBundleIDs": [] + }, + { + "Address": "cloud03", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/bg/cloud03.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 6, + "DependBundleIDs": [] + }, + { + "Address": "TopLine3D", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/bg/TopLine3D.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 6, + "DependBundleIDs": [] + }, + { + "Address": "TopLineBack", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/bg/TopLineBack.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 6, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_GreatSword", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_GreatSword.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_GreatSword_RGBA", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_GreatSword_RGBA.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_01", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_01.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_02", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_02.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_03", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_03.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_04", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_04.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_05", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_05.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_06", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_06.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_A", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_A.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_Alt", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_Alt.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_Ctrl_Hold", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_Ctrl_Hold.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_D", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_D.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_E", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_E.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_Enter", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_Enter.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_ESC", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_ESC.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_ESC_Hold", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_ESC_Hold.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_F", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_F.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_F1", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_F1.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_G", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_G.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_LB_btn_Normal", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_LB_btn_Normal.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_Move_A", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_Move_A.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_Move_A_Hold", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_Move_A_Hold.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_Move_D", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_Move_D.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_Move_D_Hold", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_Move_D_Hold.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_Move_S", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_Move_S.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_Move_S_Hold", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_Move_S_Hold.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_Move_W", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_Move_W.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_Move_W_Hold", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_Move_W_Hold.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_Move_WASD", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_Move_WASD.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_Move_WASD_Hold", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_Move_WASD_Hold.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_Q", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_Q.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_R", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_R.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_RB_btn_Normal", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_RB_btn_Normal.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_S", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_S.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_Shift", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_Shift.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_Space", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_Space.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_Tab", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_Tab.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_Text", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_Text.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_U", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_U.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_V", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_V.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Keyboard_W", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Keyboard_W.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Mouse_L", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Mouse_L.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Mouse_L_Hold", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Mouse_L_Hold.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Mouse_LR_Hold", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Mouse_LR_Hold.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Mouse_Nokey", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Mouse_Nokey.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Mouse_R", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Mouse_R.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Mouse_R_Hold", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Mouse_R_Hold.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Mouse_Stop", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Mouse_Stop.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_MouseSmall_Wheel", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_MouseSmall_Wheel.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_MouseWheel_UpDown", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_MouseWheel_UpDown.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_MouseSmall_L", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Nonuse/GuideIcon_MouseSmall_L.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 8, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_MouseSmall_R", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Nonuse/GuideIcon_MouseSmall_R.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 8, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_Small_L", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Nonuse/GuideIcon_Xbox_Small_L.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 8, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_XboxSmall_A", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Nonuse/GuideIcon_XboxSmall_A.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 8, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Skill_Xbox_Left", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Skill_Xbox_Left.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_A", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_A.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_AClick", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_AClick.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_B", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_B.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_Back", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_Back.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_Dpad_All", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_Dpad_All.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_Dpad_Down", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_Dpad_Down.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_Dpad_Right", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_Dpad_Right.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_Dpad_Right_Left", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_Dpad_Right_Left.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_Dpad_Up", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_Dpad_Up.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_Dpad_Up_Down", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_Dpad_Up_Down.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_Hold", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_Hold.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_L", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_L.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_L_Click", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_L_Click.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_L_Down", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_L_Down.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_L_Down_Hold", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_L_Down_Hold.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_L_Left", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_L_Left.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_L_Left_Hold", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_L_Left_Hold.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_L_Right", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_L_Right.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_L_Right_Hold", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_L_Right_Hold.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_L_Up", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_L_Up.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_L_Up_Hold", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_L_Up_Hold.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_LB", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_LB.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_LeftStick_Hold", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_LeftStick_Hold.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_LT", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_LT.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_MENU", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_MENU.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_R", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_R.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_R_Click", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_R_Click.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_RB", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_RB.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_RB_Hold", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_RB_Hold.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_RB_RT_Hold", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_RB_RT_Hold.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_RB_RT_Stop", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_RB_RT_Stop.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_RT", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_RT.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_RT_Hold", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_RT_Hold.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_X", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_X.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "GuideIcon_Xbox_Y", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/GuideIcon/GuideIcon_Xbox_Y.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 7, + "DependBundleIDs": [] + }, + { + "Address": "add_normal", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/add_normal.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "btn_hover", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/btn_hover.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "btn_normal", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/btn_normal.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "btn_press", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/btn_press.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "btnLast", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/btnLast.PNG", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "btnNext", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/btnNext.PNG", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "cancel_40px", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/cancel_40px.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "cancel_hover", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/cancel_hover.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "cancel_normal", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/cancel_normal.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "catb_disable", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/catb_disable.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "catb_hover", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/catb_hover.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "check_hover", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/check_hover.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "check_normal", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/check_normal.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "defaul_normal", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/defaul_normal.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "default", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/default.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "default_hover", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/default_hover.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "default_press", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/default_press.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "hp_icon", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/hp_icon.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "item_hover", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/item_hover.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "item_normal", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/item_normal.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "item_press", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/item_press.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "list_disable", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/list_disable.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "list_hover", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/list_hover.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "list_normal", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/list_normal.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "list_press", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/list_press.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "list_select", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/list_select.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "ok_hover", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/ok_hover.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "ok_normal", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/ok_normal.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "panel_about", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/panel_about.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "panel_appearance", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/panel_appearance.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "panel_general", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/panel_general.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "panel_performance", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/panel_performance.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "panel_plugin", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/panel_plugin.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + }, + { + "Address": "panel_sound", + "AssetPath": "Assets/Bundles/UIRaw/Atlas/icon/panel_sound.png", + "AssetGUID": "", + "AssetTags": [ + "UIRaw" + ], + "BundleID": 9, + "DependBundleIDs": [] + } + ], + "BundleList": [ + { + "BundleName": "assets_bundles_audios_audioclip.bundle", + "UnityCRC": 0, + "FileHash": "8d31128acfd64044c8b36807e3106e7b", + "FileCRC": 0, + "FileSize": 268950, + "Encrypted": false, + "Tags": [ + "Audios" + ], + "DependBundleIDs": [] + }, + { + "BundleName": "assets_bundles_configs.bundle", + "UnityCRC": 0, + "FileHash": "e780bdbb47feafb03afa56caceea1a80", + "FileCRC": 0, + "FileSize": 4749, + "Encrypted": false, + "Tags": [ + "WEBGL_PRELOAD", + "Configs" + ], + "DependBundleIDs": [] + }, + { + "BundleName": "assets_bundles_configs_bytes.bundle", + "UnityCRC": 0, + "FileHash": "f3f9f6d4bf1e88f9cfce45c7f493c4c0", + "FileCRC": 0, + "FileSize": 281, + "Encrypted": false, + "Tags": [ + "WEBGL_PRELOAD", + "Configs" + ], + "DependBundleIDs": [] + }, + { + "BundleName": "assets_bundles_dll.bundle", + "UnityCRC": 0, + "FileHash": "c682ee3d42f3b12aa6b6693b881cfaa6", + "FileCRC": 0, + "FileSize": 4342272, + "Encrypted": false, + "Tags": [ + "DLL" + ], + "DependBundleIDs": [] + }, + { + "BundleName": "assets_bundles_scenes_map1000.bundle", + "UnityCRC": 0, + "FileHash": "1e38913f6eea0ec61a9fe3361eece165", + "FileCRC": 0, + "FileSize": 11828, + "Encrypted": false, + "Tags": [ + "Scenes" + ], + "DependBundleIDs": [] + }, + { + "BundleName": "assets_bundles_ui_uiloadupdatewindow.bundle", + "UnityCRC": 0, + "FileHash": "fc3adf5130ad40a882b176fbb9427049", + "FileCRC": 0, + "FileSize": 35909, + "Encrypted": false, + "Tags": [ + "UI" + ], + "DependBundleIDs": [] + }, + { + "BundleName": "assets_bundles_uiraw_atlas_bg.bundle", + "UnityCRC": 0, + "FileHash": "5196f25464238eded9918606ec1772bc", + "FileCRC": 0, + "FileSize": 551955, + "Encrypted": false, + "Tags": [ + "UIRaw" + ], + "DependBundleIDs": [] + }, + { + "BundleName": "assets_bundles_uiraw_atlas_guideicon.bundle", + "UnityCRC": 0, + "FileHash": "2aec4ec4b3cd6a0b5e910a6e144a71dd", + "FileCRC": 0, + "FileSize": 95314, + "Encrypted": false, + "Tags": [ + "UIRaw" + ], + "DependBundleIDs": [] + }, + { + "BundleName": "assets_bundles_uiraw_atlas_guideicon_guideicon_nonuse.bundle", + "UnityCRC": 0, + "FileHash": "4a409475449cd6a3489e11d3aaab9d83", + "FileCRC": 0, + "FileSize": 2686, + "Encrypted": false, + "Tags": [ + "UIRaw" + ], + "DependBundleIDs": [] + }, + { + "BundleName": "assets_bundles_uiraw_atlas_icon.bundle", + "UnityCRC": 0, + "FileHash": "a7f7fae78956debbdfd4729813447400", + "FileCRC": 0, + "FileSize": 203831, + "Encrypted": false, + "Tags": [ + "UIRaw" + ], + "DependBundleIDs": [] + }, + { + "BundleName": "unityshaders.bundle", + "UnityCRC": 0, + "FileHash": "1f5857b73460e7b8a3e56fc7702a4c6c", + "FileCRC": 0, + "FileSize": 3405, + "Encrypted": false, + "Tags": [ + "ShaderVariants" + ], + "DependBundleIDs": [] + } + ] +} \ No newline at end of file diff --git a/Client/Packages/com.alicizax.unity.framework b/Client/Packages/com.alicizax.unity.framework index 0ebddf1..e29c31b 160000 --- a/Client/Packages/com.alicizax.unity.framework +++ b/Client/Packages/com.alicizax.unity.framework @@ -1 +1 @@ -Subproject commit 0ebddf18ee3fb13fc935166d5a86e505917c7327 +Subproject commit e29c31ba87e057f818d366e4d3e2e300599c0826 diff --git a/Client/Packages/com.alicizax.unity.network b/Client/Packages/com.alicizax.unity.network deleted file mode 160000 index 0b74d88..0000000 --- a/Client/Packages/com.alicizax.unity.network +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0b74d889d80ee30139bd72d390bf2558826b3a96 diff --git a/Client/Packages/packages-lock.json b/Client/Packages/packages-lock.json index a932c1e..f17a1b2 100644 --- a/Client/Packages/packages-lock.json +++ b/Client/Packages/packages-lock.json @@ -39,14 +39,6 @@ "source": "embedded", "dependencies": {} }, - "com.alicizax.unity.network": { - "version": "file:com.alicizax.unity.network", - "depth": 0, - "source": "embedded", - "dependencies": { - "com.unity.nuget.newtonsoft-json": "3.2.1" - } - }, "com.alicizax.unity.packagemanager": { "version": "file:com.alicizax.unity.packagemanager", "depth": 0, @@ -77,7 +69,7 @@ "depth": 0, "source": "git", "dependencies": {}, - "hash": "d505624c78e6d1d2d53efd716abe7349b611681e" + "hash": "fcef6dfe8ed715cc60a7618a1d2ad62bcace3a80" }, "com.code-philosophy.luban": { "version": "http://101.34.252.46:3000/yuliuren/luban_unity.git", diff --git a/Client/ProjectSettings/GraphicsSettings.asset b/Client/ProjectSettings/GraphicsSettings.asset index fc69620..1e05660 100644 --- a/Client/ProjectSettings/GraphicsSettings.asset +++ b/Client/ProjectSettings/GraphicsSettings.asset @@ -37,7 +37,7 @@ GraphicsSettings: m_PreloadedShaders: [] m_PreloadShadersBatchTimeLimit: -1 m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_CustomRenderPipeline: {fileID: 11400000, guid: 4b83569d67af61e458304325a23e5dfd, type: 2} + m_CustomRenderPipeline: {fileID: 11400000, guid: 5e6cbd92db86f4b18aec3ed561671858, type: 2} m_TransparencySortMode: 0 m_TransparencySortAxis: {x: 0, y: 0, z: 1} m_DefaultRenderingPath: 1 @@ -45,7 +45,7 @@ GraphicsSettings: m_TierSettings: [] m_LightmapStripping: 0 m_FogStripping: 0 - m_InstancingStripping: 0 + m_InstancingStripping: 2 m_BrgStripping: 0 m_LightmapKeepPlain: 1 m_LightmapKeepDirCombined: 1 @@ -57,7 +57,7 @@ GraphicsSettings: m_FogKeepExp: 1 m_FogKeepExp2: 1 m_AlbedoSwatchInfos: [] - m_LightsUseLinearIntensity: 1 + m_LightsUseLinearIntensity: 0 m_LightsUseColorTemperature: 1 m_DefaultRenderingLayerMask: 1 m_LogWhenShaderIsCompiled: 0 diff --git a/Client/ProjectSettings/ProjectSettings.asset b/Client/ProjectSettings/ProjectSettings.asset index 1763cd9..e640b01 100644 --- a/Client/ProjectSettings/ProjectSettings.asset +++ b/Client/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 28 + serializedVersion: 26 productGUID: f69e31cc5f490a44d8bf493fbcb8692c AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -17,7 +17,7 @@ PlayerSettings: defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} - m_ShowUnitySplashScreen: 0 + m_ShowUnitySplashScreen: 1 m_ShowUnitySplashLogo: 1 m_SplashScreenOverlayOpacity: 1 m_SplashScreenAnimation: 1 @@ -42,14 +42,13 @@ PlayerSettings: m_SplashScreenLogos: [] m_VirtualRealitySplashScreen: {fileID: 0} m_HolographicTrackingLossScreen: {fileID: 0} - defaultScreenWidth: 1280 - defaultScreenHeight: 720 + defaultScreenWidth: 0 + defaultScreenHeight: 0 defaultScreenWidthWeb: 960 defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 - m_ActiveColorSpace: 1 + m_ActiveColorSpace: 0 unsupportedMSAAFallback: 0 - m_SpriteBatchMaxVertexCount: 65535 m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 @@ -71,18 +70,17 @@ PlayerSettings: androidRenderOutsideSafeArea: 1 androidUseSwappy: 0 androidBlitType: 0 - androidResizeableActivity: 1 + androidResizableWindow: 0 androidDefaultWindowWidth: 1920 androidDefaultWindowHeight: 1080 androidMinimumWindowWidth: 400 androidMinimumWindowHeight: 300 androidFullscreenMode: 1 androidAutoRotationBehavior: 1 - androidPredictiveBackSupport: 0 - androidApplicationEntry: 2 defaultIsNativeResolution: 1 macRetinaSupport: 1 - runInBackground: 1 + runInBackground: 0 + captureSingleScreen: 0 muteOtherAudioSources: 0 Prepare IOS For Recording: 0 Force IOS Speakers When Recording: 0 @@ -98,7 +96,6 @@ PlayerSettings: useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 1 - meshDeformation: 2 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 @@ -130,8 +127,10 @@ PlayerSettings: switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 - switchMaxWorkerMultiple: 8 switchNVNGraphicsFirmwareMemory: 32 + switchMaxWorkerMultiple: 8 + stadiaPresentMode: 0 + stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 vulkanEnablePreTransform: 1 @@ -161,7 +160,6 @@ PlayerSettings: resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.4 - androidMinAspectRatio: 1 applicationIdentifier: Android: com.UnityTechnologies.com.unity.template.urpblank Standalone: com.alicizax.unity.template @@ -183,16 +181,14 @@ PlayerSettings: ForceInternetPermission: 0 ForceSDCardPermission: 0 CreateWallpaper: 0 - androidSplitApplicationBinary: 0 + APKExpansionFiles: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 0 strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSSimulatorArchitecture: 0 iOSTargetOSVersionString: 13.0 tvOSSdkVersion: 0 - tvOSSimulatorArchitecture: 0 tvOSRequireExtendedGameController: 0 tvOSTargetOSVersionString: 13.0 VisionOSSdkVersion: 0 @@ -221,6 +217,7 @@ PlayerSettings: rgba: 0 iOSLaunchScreenFillPct: 100 iOSLaunchScreenSize: 100 + iOSLaunchScreenCustomXibPath: iOSLaunchScreeniPadType: 0 iOSLaunchScreeniPadImage: {fileID: 0} iOSLaunchScreeniPadBackgroundColor: @@ -228,6 +225,7 @@ PlayerSettings: rgba: 0 iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 + iOSLaunchScreeniPadCustomXibPath: iOSLaunchScreenCustomStoryboardPath: iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] @@ -264,12 +262,12 @@ PlayerSettings: useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 2 + AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: AndroidEnableArmv9SecurityFeatures: 0 - AndroidEnableArm64MTE: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 @@ -282,12 +280,11 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 + chromeosInputEmulation: 1 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 - AndroidReportGooglePlayAppDependencies: 1 - androidSymbolsSizeThreshold: 800 m_BuildTargetIcons: [] m_BuildTargetPlatformIcons: - m_BuildTarget: iPhone @@ -536,6 +533,9 @@ PlayerSettings: - m_BuildTarget: LinuxStandaloneSupport m_APIs: 1100000015000000 m_Automatic: 1 + - m_BuildTarget: WebGLSupport + m_APIs: 0b000000 + m_Automatic: 0 m_BuildTargetVRSettings: [] m_DefaultShaderChunkSizeInMB: 16 m_DefaultShaderChunkCount: 0 @@ -548,22 +548,22 @@ PlayerSettings: iPhone: 1 tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: - - serializedVersion: 2 - m_BuildTarget: Android + - m_BuildTarget: Android m_EncodingQuality: 1 + - m_BuildTarget: WebGL + m_EncodingQuality: 1 + m_BuildTargetGroupHDRCubemapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: - m_BuildTarget: Android m_Encoding: 1 m_BuildTargetDefaultTextureCompressionFormat: - - serializedVersion: 3 - m_BuildTarget: Android - m_Formats: 03000000 + - m_BuildTarget: Android + m_Format: 0 playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 - editorGfxJobOverride: 1 enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 enableCrashReportAPI: 0 @@ -709,14 +709,12 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchDisableHTCSPlayerConnection: 0 switchUseNewStyleFilepaths: 0 switchUseLegacyFmodPriorities: 0 switchUseMicroSleepForYield: 1 switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 switchRamDiskSpaceSize: 12 - switchUpgradedPlayerSettingsToNMETA: 0 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -801,14 +799,16 @@ PlayerSettings: webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 webGLShowDiagnostics: 0 - webGLDataCaching: 1 - webGLDebugSymbols: 0 - webGLEmscriptenArgs: + webGLDataCaching: 0 + webGLDebugSymbols: 1 + webGLEmscriptenArgs: ' -s EXPORTED_FUNCTIONS=_sbrk,_emscripten_stack_get_base,_emscripten_stack_get_end + -s ERROR_ON_UNDEFINED_SYMBOLS=0 -s TOTAL_MEMORY=256MB -s EXPORTED_RUNTIME_METHODS=''["ccall","cwrap","stackTrace","addRunDependency","removeRunDependency","FS_createPath","FS_createDataFile","stackTrace","writeStackCookie","checkStackCookie","lengthBytesUTF8","stringToUTF8"]'' + --profiling-funcs ' webGLModulesDirectory: - webGLTemplate: APPLICATION:Default + webGLTemplate: PROJECT:WXTemplate2022 webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 - webGLCompressionFormat: 0 + webGLCompressionFormat: 2 webGLWasmArithmeticExceptions: 0 webGLLinkerTarget: 1 webGLThreadsSupport: 0 @@ -819,16 +819,11 @@ PlayerSettings: webGLMemoryLinearGrowthStep: 16 webGLMemoryGeometricGrowthStep: 0.2 webGLMemoryGeometricGrowthCap: 96 - webGLEnableWebGPU: 0 webGLPowerPreference: 2 - webGLWebAssemblyTable: 0 - webGLWebAssemblyBigInt: 0 - webGLCloseOnQuit: 0 - webWasm2023: 0 scriptingDefineSymbols: Android: ENABLE_HYBRIDCLR;ENABLE_LOG - Standalone: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ENABLE_HYBRIDCLR;FANTASY_UNITY;ENABLE_LOG;Event_StrickCheck - WebGL: ENABLE_HYBRIDCLR;ENABLE_LOG + Standalone: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ENABLE_HYBRIDCLR;FANTASY_UNITY;ENABLE_LOG;Event_StrickCheck;UNITY_WEBGL;WEIXINMINIGAME + WebGL: ENABLE_HYBRIDCLR;ENABLE_LOG;UNITY_WEBGL;WEIXINMINIGAME;FANTASY_UNITY;Event_StrickCheck;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1 Windows Store Apps: ENABLE_HYBRIDCLR;ENABLE_LOG iPhone: ENABLE_HYBRIDCLR;ENABLE_LOG additionalCompilerArguments: {} @@ -837,8 +832,8 @@ PlayerSettings: Android: 1 Standalone: 1 il2cppCompilerConfiguration: {} - il2cppCodeGeneration: {} - il2cppStacktraceInformation: {} + il2cppCodeGeneration: + WebGL: 1 managedStrippingLevel: Android: 1 EmbeddedLinux: 1 @@ -864,7 +859,6 @@ PlayerSettings: gcIncremental: 0 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} - editorAssembliesCompatibilityLevel: 2 m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: Aliciza @@ -938,11 +932,9 @@ PlayerSettings: hmiPlayerDataPath: hmiForceSRGBBlit: 1 embeddedLinuxEnableGamepadInput: 0 - hmiCpuConfiguration: hmiLogStartupTiming: 0 - qnxGraphicConfPath: + hmiCpuConfiguration: apiCompatibilityLevel: 3 - captureStartupLogs: {} activeInputHandler: 2 windowsGamepadBackendHint: 0 cloudProjectId: @@ -956,5 +948,3 @@ PlayerSettings: platformRequiresReadableAssets: 0 virtualTexturingSupportEnabled: 0 insecureHttpOption: 2 - androidVulkanDenyFilterList: [] - androidVulkanAllowFilterList: [] diff --git a/Client/ProjectSettings/QualitySettings.asset b/Client/ProjectSettings/QualitySettings.asset index 0bf51f8..b7ff09a 100644 --- a/Client/ProjectSettings/QualitySettings.asset +++ b/Client/ProjectSettings/QualitySettings.asset @@ -6,7 +6,7 @@ QualitySettings: serializedVersion: 5 m_CurrentQuality: 1 m_QualitySettings: - - serializedVersion: 4 + - serializedVersion: 3 name: Mobile pixelLightCount: 2 shadows: 2 @@ -28,11 +28,8 @@ QualitySettings: realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 1 useLegacyDetailDistribution: 1 - adaptiveVsync: 0 vSyncCount: 0 realtimeGICPUUsage: 100 - adaptiveVsyncExtraA: 0 - adaptiveVsyncExtraB: 0 lodBias: 1 maximumLODLevel: 0 enableLODCrossFade: 1 @@ -58,7 +55,7 @@ QualitySettings: terrainFadeLength: 5 terrainMaxTrees: 50 excludedTargetPlatforms: [] - - serializedVersion: 4 + - serializedVersion: 3 name: PC pixelLightCount: 2 shadows: 2 @@ -80,11 +77,8 @@ QualitySettings: realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 1 useLegacyDetailDistribution: 1 - adaptiveVsync: 0 vSyncCount: 0 realtimeGICPUUsage: 100 - adaptiveVsyncExtraA: 0 - adaptiveVsyncExtraB: 0 lodBias: 2 maximumLODLevel: 0 enableLODCrossFade: 1 @@ -99,7 +93,7 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 - customRenderPipeline: {fileID: 11400000, guid: 4b83569d67af61e458304325a23e5dfd, type: 2} + customRenderPipeline: {fileID: 11400000, guid: 5e6cbd92db86f4b18aec3ed561671858, type: 2} terrainQualityOverrides: 0 terrainPixelError: 1 terrainDetailDensityScale: 1 diff --git a/Client/ProjectSettings/SceneTemplateSettings.json b/Client/ProjectSettings/SceneTemplateSettings.json index ede5887..1edced2 100644 --- a/Client/ProjectSettings/SceneTemplateSettings.json +++ b/Client/ProjectSettings/SceneTemplateSettings.json @@ -56,6 +56,11 @@ "type": "UnityEditor.MonoScript", "defaultInstantiationMode": 1 }, + { + "userAdded": false, + "type": "UnityEngine.PhysicMaterial", + "defaultInstantiationMode": 0 + }, { "userAdded": false, "type": "UnityEngine.PhysicsMaterial", diff --git a/Client/ProjectSettings/UnityConnectSettings.asset b/Client/ProjectSettings/UnityConnectSettings.asset index a88bee0..5eac22c 100644 --- a/Client/ProjectSettings/UnityConnectSettings.asset +++ b/Client/ProjectSettings/UnityConnectSettings.asset @@ -10,6 +10,8 @@ UnityConnectSettings: m_EventUrl: https://cdp.cloud.unity3d.com/v1/events m_ConfigUrl: https://config.uca.cloud.unity3d.com m_DashboardUrl: https://dashboard.unity3d.com + m_CNEventUrl: https://cdp.cloud.unity.cn/v1/events + m_CNConfigUrl: https://cdp.cloud.unity.cn/config m_TestInitMode: 0 CrashReportingSettings: m_EventUrl: https://perf-events.cloud.unity3d.com diff --git a/Client/TextToolDatas/slim/backup.txt b/Client/TextToolDatas/slim/backup.txt new file mode 100644 index 0000000..1ca5b69 Binary files /dev/null and b/Client/TextToolDatas/slim/backup.txt differ diff --git a/Client/UserSettings/EditorUserSettings.asset b/Client/UserSettings/EditorUserSettings.asset index a1b7b9b..fa8d297 100644 --- a/Client/UserSettings/EditorUserSettings.asset +++ b/Client/UserSettings/EditorUserSettings.asset @@ -9,29 +9,29 @@ EditorUserSettings: value: 18134705175a055722080a3115371d4a0d55006876786860616b0471b8b07a68ffab74f9ee2a3a30300cea1a11320d0beb1a0c25f7060f494b4cc80018eb09361fc211cb1f862d19c51d19dcc413d6ade0d8ddfcddf9f4d9d29195fcfde6ebeae6f0a9c9afa6f8c5b89ff7a1aacececac4eba4d7c9d28bda flags: 0 RecentlyUsedSceneGuid-0: - value: 5753515207050c035d5c5f7447720b44104e4b292a7a746875784d62e4e26d68 - flags: 0 - RecentlyUsedSceneGuid-1: value: 0154555f01030b02095c5f7746760d44434f407f2d7f76317d784d61b1e6313c flags: 0 - RecentlyUsedSceneGuid-2: + RecentlyUsedSceneGuid-1: value: 0004045001000a0b0e0f5f7449775d1146154f29787825652e784563e6b53669 flags: 0 - RecentlyUsedSceneGuid-3: + RecentlyUsedSceneGuid-2: value: 5a52050453545b59545f082143770d464e4f497c7c2e27672e2d1b35b2e4606c flags: 0 - RecentlyUsedSceneGuid-4: + RecentlyUsedSceneGuid-3: value: 5202055155065d0c0f0d597246770f45104f402e7f297e672f2d4d6abab2366b flags: 0 - RecentlyUsedSceneGuid-5: + RecentlyUsedSceneGuid-4: value: 5204045351045a025b5b542345770b45404f41787e7c25677c2f4563b7e26568 flags: 0 - RecentlyUsedSceneGuid-6: + RecentlyUsedSceneGuid-5: value: 0505045406565e080c59097440205d4444164f727d7d76367d7d1c63e3b9646d flags: 0 - RecentlyUsedSceneGuid-7: + RecentlyUsedSceneGuid-6: value: 5001560504060c590f5b0f7245725a44404f1d7c297e2233787e4a36b5e4666b flags: 0 + RecentlyUsedSceneGuid-7: + value: 5150560751510a0a5d58557541715b44121648737b7e27677d2a4b61e7b06068 + flags: 0 RecentlyUsedSceneGuid-8: value: 5a07065703500c59585e0e7748770d44444f4a737d2d7f35787d4f63e0b26668 flags: 0 @@ -57,4 +57,3 @@ EditorUserSettings: m_VCAllowAsyncUpdate: 1 m_VCScanLocalPackagesOnConnect: 1 m_ArtifactGarbageCollection: 1 - m_CompressAssetsOnImport: 1 diff --git a/Client/UserSettings/Layouts/default-2022.dwlt b/Client/UserSettings/Layouts/default-2022.dwlt new file mode 100644 index 0000000..158231f --- /dev/null +++ b/Client/UserSettings/Layouts/default-2022.dwlt @@ -0,0 +1,1356 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +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: 0 + y: 43 + width: 1920 + height: 997 + m_ShowMode: 4 + m_Title: Game + m_RootView: {fileID: 2} + m_MinSize: {x: 875, y: 300} + m_MaxSize: {x: 10000, y: 10000} + 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: 1 + m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 3} + - {fileID: 5} + - {fileID: 4} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1920 + height: 997 + m_MinSize: {x: 875, y: 300} + m_MaxSize: {x: 10000, y: 10000} + m_UseTopView: 1 + m_TopViewHeight: 30 + m_UseBottomView: 1 + m_BottomViewHeight: 20 +--- !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: 1 + m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1920 + height: 30 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} + m_LastLoadedLayoutName: +--- !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: 1 + m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 977 + width: 1920 + height: 20 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 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: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 6} + - {fileID: 7} + - {fileID: 10} + - {fileID: 11} + m_Position: + serializedVersion: 2 + x: 0 + y: 30 + width: 1920 + height: 947 + m_MinSize: {x: 400, y: 100} + m_MaxSize: {x: 32384, y: 16192} + vertical: 0 + controlID: 129 + draggingID: 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: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: SceneView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 241 + height: 947 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 14} + m_Panes: + - {fileID: 13} + - {fileID: 14} + m_Selected: 1 + m_LastSelected: 0 +--- !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: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 8} + - {fileID: 9} + m_Position: + serializedVersion: 2 + x: 241 + y: 0 + width: 673 + height: 947 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 8096, y: 16192} + vertical: 1 + controlID: 41 + 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: 0 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: SceneHierarchyWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 673 + height: 330 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 15} + m_Panes: + - {fileID: 15} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &9 +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: 330 + width: 673 + height: 617 + m_MinSize: {x: 52, y: 71} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 12} + m_Panes: + - {fileID: 12} + - {fileID: 16} + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &10 +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: 914 + y: 0 + width: 390 + height: 947 + m_MinSize: {x: 232, y: 271} + m_MaxSize: {x: 10002, y: 10021} + m_ActualView: {fileID: 17} + m_Panes: + - {fileID: 17} + m_Selected: 0 + m_LastSelected: 0 +--- !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: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: InspectorWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 1304 + y: 0 + width: 616 + height: 947 + m_MinSize: {x: 275, y: 50} + 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: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 50, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 241 + y: 403 + width: 671 + height: 596 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SerializedViewNames: [] + m_SerializedViewValues: [] + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 1920, y: 1080} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 03000000000000000000000000000000000000000000000000000000000000000000000000000000 + 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_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 1 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 671 + height: 575 + m_Scale: {x: 0.34947917, y: 0.34947917} + m_Translation: {x: 335.5, y: 287.5} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -960 + y: -822.6528 + width: 1920 + height: 1645.3055 + m_MinimalGUI: 1 + m_defaultScale: 0.34947917 + m_LastWindowPixelSize: {x: 671, y: 596} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 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: 12914, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animator + m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 79 + width: 365 + 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_OverlaysVisible: 1 + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: 528180310289601023, guid: 75db14477f59de44b96f358d16e02e73, type: 2} + m_ValueSerializationHelper: + - e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_PreviewAnimator: {fileID: 0} + m_AnimatorController: {fileID: 9100000, guid: 75db14477f59de44b96f358d16e02e73, type: 2} + m_BreadCrumbs: + - m_Target: {fileID: 528180310289601023, guid: 75db14477f59de44b96f358d16e02e73, type: 2} + m_ScrollPosition: {x: 0, y: 0} + stateMachineGraph: {fileID: 0} + stateMachineGraphGUI: {fileID: 0} + blendTreeGraph: {fileID: 0} + blendTreeGraphGUI: {fileID: 0} + m_AutoLiveLink: 1 + m_MiniTool: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentEditor: 1 + m_LayerEditor: + m_SelectedLayerIndex: 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: 1 + m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Scene + m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 73 + width: 240 + height: 926 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -152, y: -26} + snapOffsetDelta: {x: -22, y: 0} + snapCorner: 3 + id: Tool Settings + index: 0 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -179, y: 25} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-grid-and-snap-toolbar + index: 1 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-scene-view-toolbar + index: 0 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-search-toolbar + index: 1 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-toolbar__bottom + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 135} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-transform-toolbar + index: 0 + layout: 2 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 197} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-component-tools + index: 1 + layout: 2 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 24, y: 37} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Orientation + index: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Light Settings + index: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: -117} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 2 + id: Scene View/Camera + index: 1 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Constraints + index: 1 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Collisions + index: 2 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Navmesh Display + index: 4 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Agent Display + index: 5 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Obstacle Display + index: 6 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Occlusion Culling + index: 3 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Physics Debugger + index: 4 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Scene Visibility + index: 5 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Particles + index: 6 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap + index: 11 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Palette Helper + index: 12 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 24, y: 0} + snapCorner: 0 + id: Scene View/Open Tile Palette + index: 3 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 24, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Focus + index: 4 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -45, y: -54} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 2 + id: AINavigationOverlay + index: 7 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: APV Overlay + index: 8 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/TrailRenderer + index: 7 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: UnityEditor.SceneViewCameraOverlay + index: 10 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: UnityEditor.SceneViewCameraOverlay (0) + index: 11 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 24, y: 0} + snapCorner: 0 + id: Brush Attributes + index: 2 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 24, y: 25} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-scene-view-camera-mode-toolbar + index: 1 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-toolbar__left + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 24, y: 0} + snapCorner: 0 + id: Terrain Tools + index: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-toolbar__left + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 24, y: 0} + snapCorner: 0 + id: Brush Masks + index: 1 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 24, y: 0} + snapCorner: 0 + id: Scene View/Lighting Visualization Colors + index: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-toolbar__bottom + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -327, y: -56} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 3 + id: Overlays/OverlayMenu + index: 1 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 24, y: 0} + snapCorner: 0 + id: Scene View/Tile Palette Clipboard + index: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 24, y: 0} + snapCorner: 0 + id: Scene View/Tile Palette Brush Pick + index: 2 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 24, y: 0} + snapCorner: 0 + id: SceneView/CamerasOverlay + index: 8 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 24, y: 0} + snapCorner: 0 + id: Scene View/PBR Validation Settings + index: 9 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 24, y: 0} + snapCorner: 0 + id: unity-spline-inspector + index: 14 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + m_OverlaysVisible: 1 + m_WindowGUID: f6827acf47ff6e841a7f3bef03f3908f + m_Gizmos: 1 + m_OverrideSceneCullingMask: 6917529027641081856 + m_SceneIsLit: 0 + m_SceneLighting: 1 + m_2DMode: 0 + m_isRotationLocked: 0 + m_PlayAudio: 0 + m_AudioPlay: 0 + m_Position: + m_Target: {x: 0, y: 0, z: 0} + speed: 2 + m_Value: {x: 0, y: 0, z: 0} + m_RenderMode: 0 + m_CameraMode: + drawMode: 0 + name: Shaded + section: Shading Mode + m_ValidateTrueMetals: 0 + m_DoValidateTrueMetals: 0 + m_SceneViewState: + m_AlwaysRefresh: 0 + showFog: 1 + showSkybox: 0 + showFlares: 1 + showImageEffects: 1 + showParticleSystems: 1 + showVisualEffectGraphs: 1 + m_FxEnabled: 1 + m_Grid: + xGrid: + m_Fade: + m_Target: 0 + speed: 2 + 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: 0, y: 0} + yGrid: + m_Fade: + m_Target: 1 + speed: 2 + 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} + zGrid: + m_Fade: + m_Target: 0 + speed: 2 + 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} + m_ShowGrid: 1 + m_GridAxis: 1 + m_gridOpacity: 0.5 + m_Rotation: + m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + speed: 2 + m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_Size: + m_Target: 10 + speed: 2 + m_Value: 10 + m_Ortho: + m_Target: 0 + speed: 2 + m_Value: 0 + m_CameraSettings: + m_Speed: 2 + m_SpeedNormalized: 1 + m_SpeedMin: 0.01 + m_SpeedMax: 2 + m_EasingEnabled: 1 + m_EasingDuration: 0.4 + m_AccelerationEnabled: 1 + m_FieldOfViewHorizontalOrVertical: 60 + m_NearClip: 0.03 + m_FarClip: 10000 + m_DynamicClip: 1 + m_OcclusionCulling: 0 + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewOrtho: 0 + m_ReplacementShader: {fileID: 0} + m_ReplacementString: + m_SceneVisActive: 1 + m_LastLockedObject: {fileID: 0} + m_ViewIsLockedToObject: 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: 1 + m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Hierarchy + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 241 + y: 73 + width: 671 + height: 309 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SceneHierarchy: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 9e63ffffa663ffff1e9fffff269fffff64a1ffffbca3ffff06c7ffff14c8ffffb6cbfffffefafffff4ffffff1c9b000048a60000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: GameObject + m_OriginalName: GameObject + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: -5484 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 4 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 8} + m_SearchString: + m_ExpandedScenes: [] + m_CurrenRootInstanceID: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentSortingName: TransformSorting + m_WindowGUID: 85728a346145f5041b41bc3ce2f945c6 +--- !u!114 &16 +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: 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_Pos: + serializedVersion: 2 + x: 241 + y: 403 + width: 671 + height: 596 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 +--- !u!114 &17 +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: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: Project + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 914 + y: 73 + width: 388 + height: 926 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: [] + m_Globs: [] + m_OriginalText: + m_ImportLogFlags: 0 + m_FilterByTypeIntersection: 0 + m_ViewMode: 0 + m_StartGridSize: 96 + m_LastFolders: [] + m_LastFoldersGridSize: 16 + m_LastProjectPath: G:\UnityProject\Aliciza\Client + m_LockTracker: + m_IsLocked: 0 + m_FolderTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: e48c0000 + m_LastClickedID: 36068 + m_ExpandedIDs: 000000002c270000cc3300005c7f00005e7f0000607f0000627f0000647f0000667f0000687f00006a7f00006c7f00006e7f0000707f0000727f0000747f0000767f0000787f00007a7f00007c7f00007e7f0000807f0000827f0000847f0000867f0000887f00008a7f00008c7f00008e7f0000907f0000927f0000947f0000967f0000987f00009a7f00009c7f00009e7f0000a07f0000a27f0000a47f0000a67f0000a87f0000aa7f0000ac7f0000ae7f0000b07f0000b27f0000b47f0000b67f0000b87f0000ba7f0000bc7f0000be7f0000c07f0000c27f0000c47f0000c67f0000c87f0000ca7f0000cc7f0000ce7f0000d07f0000d27f0000d47f0000d67f0000d87f0000da7f0000dc7f0000de7f0000e07f0000e27f0000e47f0000e67f0000e87f0000ea7f0000ec7f0000ee7f0000f07f0000f27f0000f47f0000f67f0000f87f0000fa7f0000fc7f0000fe7f000000800000028000000480000006800000088000000a8000000c8000000e80000010800000128000001480000016800000188000001a8000001c8000001e80000020800000228000002480000026800000288000002a8000002c8000002e80000030800000328000003480000036800000388000003a8000003c8000003e80000040800000428000004480000046800000488000004a8000004c8000004e80000050800000528000005480000056800000588000005a8000005c8000005e80000060800000628000006480000066800000688000006a8000006c8000006e80000070800000728000007480000076800000788000007a8000007c8000007e80000080800000828000008480000086800000888000008a8000008c8000008e80000090800000928000009480000096800000988000009a8000009c8000009e800000a0800000a2800000a4800000a6800000a8800000aa800000ac800000ae800000b0800000b2800000b4800000b6800000b8800000ba800000bc800000be800000c0800000c2800000c4800000c6800000c8800000ca800000cc800000ce800000d0800000d2800000d4800000 + 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: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 340} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: ffffffff000000002c270000cc3300005c7f00005e7f0000607f0000627f0000647f0000667f0000687f00006a7f00006c7f00006e7f0000707f0000727f0000747f0000767f0000787f00007a7f00007c7f00007e7f0000807f0000827f0000847f0000867f0000887f00008a7f00008c7f00008e7f0000907f0000927f0000947f0000967f0000987f00009a7f00009c7f00009e7f0000a07f0000a27f0000a47f0000a67f0000a87f0000aa7f0000ac7f0000ae7f0000b07f0000b27f0000b47f0000b67f0000b87f0000ba7f0000bc7f0000be7f0000c07f0000c27f0000c47f0000c67f0000c87f0000ca7f0000cc7f0000ce7f0000d07f0000d27f0000d47f0000d67f0000d87f0000da7f0000dc7f0000de7f0000e07f0000e27f0000e47f0000e67f0000e87f0000ea7f0000ec7f0000ee7f0000f07f0000f27f0000f47f0000f67f0000f87f0000fa7f0000fc7f0000fe7f000000800000028000000480000006800000088000000a8000000c8000000e80000010800000128000001480000016800000188000001a8000001c8000001e80000020800000228000002480000026800000288000002a8000002c8000002e80000030800000328000003480000036800000388000003a8000003c8000003e80000040800000428000004480000046800000488000004a8000004c8000004e80000050800000528000005480000056800000588000005a8000005c8000005e80000060800000628000006480000066800000688000006a8000006c8000006e80000070800000728000007480000076800000788000007a8000007c8000007e80000080800000828000008480000086800000888000008a8000008c8000008e80000090800000928000009480000096800000988000009a8000009c8000009e800000a0800000a2800000a6800000a8800000aa800000ac800000ae800000b2800000b4800000b6800000b8800000ba800000bc800000be800000c0800000c2800000c4800000c6800000ca800000cc800000d0800000d48000004a810000588100005e8100004482000028830000b4830000ffffff7f + 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: 1 + m_ClientGUIView: {fileID: 10} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 0 + m_ExpandedInstanceIDs: 0c750000f2d60000 + 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: 1 + m_ClientGUIView: {fileID: 11} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 96 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 115 +--- !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: 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_Pos: + serializedVersion: 2 + x: 1304 + y: 73 + width: 615 + height: 926 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: 161 + 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}