diff --git a/Assets/HybridCLRGenerate/AOTGenericReferences.cs b/Assets/HybridCLRGenerate/AOTGenericReferences.cs index db67bd6..f1f94cf 100644 --- a/Assets/HybridCLRGenerate/AOTGenericReferences.cs +++ b/Assets/HybridCLRGenerate/AOTGenericReferences.cs @@ -10,7 +10,6 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour "MyScripts.Runtime.dll", "System.Core.dll", "Unity.InputSystem.dll", - "Unity.RenderPipelines.Core.Runtime.dll", "UnityEngine.CoreModule.dll", "UnityEngine.JSONSerializeModule.dll", "YooAsset.dll", @@ -258,13 +257,23 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour // System.Action // System.Collections.Generic.ArraySortHelper // System.Collections.Generic.Comparer + // System.Collections.Generic.Dictionary.Enumerator + // System.Collections.Generic.Dictionary.KeyCollection.Enumerator + // System.Collections.Generic.Dictionary.KeyCollection + // System.Collections.Generic.Dictionary.ValueCollection.Enumerator + // System.Collections.Generic.Dictionary.ValueCollection + // System.Collections.Generic.Dictionary // System.Collections.Generic.EqualityComparer + // System.Collections.Generic.ICollection> // System.Collections.Generic.ICollection // System.Collections.Generic.IComparer + // System.Collections.Generic.IEnumerable> // System.Collections.Generic.IEnumerable + // System.Collections.Generic.IEnumerator> // System.Collections.Generic.IEnumerator // System.Collections.Generic.IEqualityComparer // System.Collections.Generic.IList + // System.Collections.Generic.KeyValuePair // System.Collections.Generic.List.Enumerator // System.Collections.Generic.List // System.Collections.Generic.ObjectComparer @@ -389,8 +398,6 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour // object UnityEngine.Object.Instantiate(object) // object UnityEngine.Object.Instantiate(object,UnityEngine.Transform) // object UnityEngine.Object.Instantiate(object,UnityEngine.Transform,bool) - // bool UnityEngine.Rendering.VolumeProfile.TryGet(System.Type,object&) - // bool UnityEngine.Rendering.VolumeProfile.TryGet(object&) // YooAsset.AssetHandle YooAsset.ResourcePackage.LoadAssetAsync(string,uint) // YooAsset.AssetHandle YooAsset.YooAssets.LoadAssetAsync(string,uint) } diff --git a/Assets/HybridCLRGenerate/link.xml b/Assets/HybridCLRGenerate/link.xml index 90cdaad..f4beda5 100644 --- a/Assets/HybridCLRGenerate/link.xml +++ b/Assets/HybridCLRGenerate/link.xml @@ -75,6 +75,7 @@ + @@ -94,11 +95,9 @@ - - @@ -206,6 +205,7 @@ + diff --git a/Assets/Res/Main/HotUpdateDll/Main.bytes b/Assets/Res/Main/HotUpdateDll/Main.bytes index b6eb482..8c25339 100644 Binary files a/Assets/Res/Main/HotUpdateDll/Main.bytes and b/Assets/Res/Main/HotUpdateDll/Main.bytes differ diff --git a/Assets/Res/Main/UIPanel/SettingsWindow.prefab b/Assets/Res/Main/UIPanel/SettingsWindow.prefab index 5edafbc..b7624aa 100644 --- a/Assets/Res/Main/UIPanel/SettingsWindow.prefab +++ b/Assets/Res/Main/UIPanel/SettingsWindow.prefab @@ -5561,7 +5561,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Content: {fileID: 2682018696799193970} - m_Horizontal: 1 + m_Horizontal: 0 m_Vertical: 1 m_MovementType: 1 m_Elasticity: 0.1 diff --git a/Assets/Res/Preload/HotUpdateDll/Preload.bytes b/Assets/Res/Preload/HotUpdateDll/Preload.bytes index 938e216..06a87e2 100644 Binary files a/Assets/Res/Preload/HotUpdateDll/Preload.bytes and b/Assets/Res/Preload/HotUpdateDll/Preload.bytes differ diff --git a/Assets/Scripts/HotUpdate/Main/GameSystem.cs b/Assets/Scripts/HotUpdate/Main/GameSystem.cs index ef92cad..1d4cecf 100644 --- a/Assets/Scripts/HotUpdate/Main/GameSystem.cs +++ b/Assets/Scripts/HotUpdate/Main/GameSystem.cs @@ -4,6 +4,7 @@ using UnityEngine; public class GameSystem : Singleton { + public NetWorkThirdCharacterController localPlayer; public void Init() { UIManager.Inst.Init(); @@ -11,4 +12,11 @@ public class GameSystem : Singleton GraphicsManager.Inst.Init(); AudioManager.Inst.Init(); } + public void UpdateCursorState(bool value) + { + if (localPlayer != null) + { + localPlayer.UpdateCursorState(value); + } + } } diff --git a/Assets/Scripts/HotUpdate/Main/Player/NetWorkThirdCharacterController.cs b/Assets/Scripts/HotUpdate/Main/Player/NetWorkThirdCharacterController.cs index 2eed224..adcf41b 100644 --- a/Assets/Scripts/HotUpdate/Main/Player/NetWorkThirdCharacterController.cs +++ b/Assets/Scripts/HotUpdate/Main/Player/NetWorkThirdCharacterController.cs @@ -29,6 +29,7 @@ public class NetWorkThirdCharacterController : NetworkBehaviour private Vector3 verticalVelocity; private Vector2 moveInput; private bool isGrounded; + [SerializeField] private bool isCursorLocked = true; void Awake() @@ -45,6 +46,12 @@ public class NetWorkThirdCharacterController : NetworkBehaviour RotateModel(); UpdateAnimator(); } + public void UpdateCursorState(bool value) + { + if (!isLocalPlayer) return; + isCursorLocked = value; + UpdateCursorState(); + } private void UpdateCursorState() { if (!isLocalPlayer) return; @@ -119,8 +126,6 @@ public class NetWorkThirdCharacterController : NetworkBehaviour if (!isLocalPlayer) return; if (context.performed) { - isCursorLocked = !isCursorLocked; - UpdateCursorState(); if (UIManager.Inst.CheckShow(nameof(SettingsWindow))) { UIManager.Inst.HideWindow(nameof(SettingsWindow)); @@ -195,6 +200,7 @@ public class NetWorkThirdCharacterController : NetworkBehaviour public override void OnStartLocalPlayer() { Debug.Log("OnStartLocalPlayer"); + GameSystem.Inst.localPlayer = this; vCam.Priority = 15; UpdateCursorState(); } diff --git a/Assets/Scripts/HotUpdate/Main/Player/ThirdCharacterController.cs b/Assets/Scripts/HotUpdate/Main/Player/ThirdCharacterController.cs index 1546d11..d4a42ec 100644 --- a/Assets/Scripts/HotUpdate/Main/Player/ThirdCharacterController.cs +++ b/Assets/Scripts/HotUpdate/Main/Player/ThirdCharacterController.cs @@ -48,6 +48,12 @@ public class ThirdCharacterController : MonoBehaviour RotateModel(); UpdateAnimator(); } + public void UpdateCursorState(bool value) + { + if (!isLocalPlayer) return; + isCursorLocked = value; + UpdateCursorState(); + } private void UpdateCursorState() { if (!isLocalPlayer) return; @@ -113,8 +119,6 @@ public class ThirdCharacterController : MonoBehaviour if (!isLocalPlayer) return; if (context.performed) { - isCursorLocked = !isCursorLocked; - UpdateCursorState(); if (UIManager.Inst.CheckShow(nameof(SettingsWindow))) { UIManager.Inst.HideWindow(nameof(SettingsWindow)); diff --git a/Assets/Scripts/HotUpdate/Main/UI/SettingWindow/GraphicsManager.cs b/Assets/Scripts/HotUpdate/Main/UI/SettingWindow/GraphicsManager.cs index fd37924..b9989f7 100644 --- a/Assets/Scripts/HotUpdate/Main/UI/SettingWindow/GraphicsManager.cs +++ b/Assets/Scripts/HotUpdate/Main/UI/SettingWindow/GraphicsManager.cs @@ -79,7 +79,7 @@ public class GraphicsSetting public float renderScale = 1.0f; public bool isCustom = false; - public int resolutionIndex = 0; + public int resolutionIndex = Screen.resolutions.Length - 1; public bool fullscreen = true; public bool borderless = false; public int displayIndex = 0; diff --git a/Assets/Scripts/HotUpdate/Main/UI/SettingWindow/SettingsWindow.cs b/Assets/Scripts/HotUpdate/Main/UI/SettingWindow/SettingsWindow.cs index adc249a..5aeb39b 100644 --- a/Assets/Scripts/HotUpdate/Main/UI/SettingWindow/SettingsWindow.cs +++ b/Assets/Scripts/HotUpdate/Main/UI/SettingWindow/SettingsWindow.cs @@ -37,8 +37,12 @@ public class SettingsWindow : UIBaseWindow } SwitchPanel(generalPanel); base.OnShow(); + GameSystem.Inst.UpdateCursorState(false); + } + protected override void OnHide() + { + GameSystem.Inst.UpdateCursorState(true); } - private void SwitchPanel(UIBasePanel newPanel) { if (currentPanel != null) diff --git a/Assets/StreamingAssets/yoo/Preload/BuildinCatalog.bytes b/Assets/StreamingAssets/yoo/Preload/BuildinCatalog.bytes index 9976f95..3e6e11f 100644 Binary files a/Assets/StreamingAssets/yoo/Preload/BuildinCatalog.bytes and b/Assets/StreamingAssets/yoo/Preload/BuildinCatalog.bytes differ diff --git a/Assets/StreamingAssets/yoo/Preload/BuildinCatalog.json b/Assets/StreamingAssets/yoo/Preload/BuildinCatalog.json index 001d6df..9555924 100644 --- a/Assets/StreamingAssets/yoo/Preload/BuildinCatalog.json +++ b/Assets/StreamingAssets/yoo/Preload/BuildinCatalog.json @@ -1,23 +1,23 @@ { "FileVersion": "1.0.0", "PackageName": "Preload", - "PackageVersion": "2025-09-22-640", + "PackageVersion": "2025-10-09-554", "Wrappers": [ { - "BundleGUID": "5c45d5d7c6e6ebb6f60de2012a1c7246", - "FileName": "preload_assets_res_preload_hotupdatedll_5c45d5d7c6e6ebb6f60de2012a1c7246.bundle" + "BundleGUID": "fa4a44515183a01f3ab367e78b06c4bf", + "FileName": "preload_assets_res_preload_hotupdatedll_fa4a44515183a01f3ab367e78b06c4bf.bundle" }, { - "BundleGUID": "df78f44a334e4d20f2fdbf50e349402e", - "FileName": "preload_assets_res_preload_uipanel_df78f44a334e4d20f2fdbf50e349402e.bundle" + "BundleGUID": "3af8985a0950e33249e822a39aa0ccc6", + "FileName": "preload_assets_res_preload_uipanel_3af8985a0950e33249e822a39aa0ccc6.bundle" }, { - "BundleGUID": "f1cb6e8982352f1930694c45f971c27e", - "FileName": "preload_share_assets_res_preload_uipanelart_f1cb6e8982352f1930694c45f971c27e.bundle" + "BundleGUID": "219ff435ccd8a01117a1abb146297be0", + "FileName": "preload_share_assets_res_preload_uipanelart_219ff435ccd8a01117a1abb146297be0.bundle" }, { - "BundleGUID": "6b7786486d6709e770ada5979e84a4fc", - "FileName": "preload_unityshaders_6b7786486d6709e770ada5979e84a4fc.bundle" + "BundleGUID": "4e1243970ec9c75cdb3d1f2552618719", + "FileName": "preload_unityshaders_4e1243970ec9c75cdb3d1f2552618719.bundle" } ] } \ No newline at end of file diff --git a/Assets/StreamingAssets/yoo/Preload/Preload.version b/Assets/StreamingAssets/yoo/Preload/Preload.version index 0b44726..cffb1cf 100644 --- a/Assets/StreamingAssets/yoo/Preload/Preload.version +++ b/Assets/StreamingAssets/yoo/Preload/Preload.version @@ -1 +1 @@ -2025-09-22-640 \ No newline at end of file +2025-10-09-554 \ No newline at end of file diff --git a/Assets/StreamingAssets/yoo/Preload/Preload_2025-09-22-640.bytes b/Assets/StreamingAssets/yoo/Preload/Preload_2025-09-22-640.bytes deleted file mode 100644 index 1d4f550..0000000 Binary files a/Assets/StreamingAssets/yoo/Preload/Preload_2025-09-22-640.bytes and /dev/null differ diff --git a/Assets/StreamingAssets/yoo/Preload/Preload_2025-09-22-640.hash b/Assets/StreamingAssets/yoo/Preload/Preload_2025-09-22-640.hash deleted file mode 100644 index 610e5b2..0000000 --- a/Assets/StreamingAssets/yoo/Preload/Preload_2025-09-22-640.hash +++ /dev/null @@ -1 +0,0 @@ -8c021d6a \ No newline at end of file diff --git a/Assets/StreamingAssets/yoo/Preload/Preload_2025-10-09-554.bytes b/Assets/StreamingAssets/yoo/Preload/Preload_2025-10-09-554.bytes new file mode 100644 index 0000000..6ff3846 Binary files /dev/null and b/Assets/StreamingAssets/yoo/Preload/Preload_2025-10-09-554.bytes differ diff --git a/Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_hotupdatedll_5c45d5d7c6e6ebb6f60de2012a1c7246.bundle.meta b/Assets/StreamingAssets/yoo/Preload/Preload_2025-10-09-554.bytes.meta similarity index 74% rename from Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_hotupdatedll_5c45d5d7c6e6ebb6f60de2012a1c7246.bundle.meta rename to Assets/StreamingAssets/yoo/Preload/Preload_2025-10-09-554.bytes.meta index 1f5468e..70ef976 100644 --- a/Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_hotupdatedll_5c45d5d7c6e6ebb6f60de2012a1c7246.bundle.meta +++ b/Assets/StreamingAssets/yoo/Preload/Preload_2025-10-09-554.bytes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 111f22950bcdf8d429fb792fa6abb732 +guid: 0eed98ff87cd99e4d9f4006580f636dc DefaultImporter: externalObjects: {} userData: diff --git a/Assets/StreamingAssets/yoo/Preload/Preload_2025-10-09-554.hash b/Assets/StreamingAssets/yoo/Preload/Preload_2025-10-09-554.hash new file mode 100644 index 0000000..65040a7 --- /dev/null +++ b/Assets/StreamingAssets/yoo/Preload/Preload_2025-10-09-554.hash @@ -0,0 +1 @@ +999dce39 \ No newline at end of file diff --git a/Assets/StreamingAssets/yoo/Preload/Preload_2025-09-22-640.bytes.meta b/Assets/StreamingAssets/yoo/Preload/Preload_2025-10-09-554.hash.meta similarity index 74% rename from Assets/StreamingAssets/yoo/Preload/Preload_2025-09-22-640.bytes.meta rename to Assets/StreamingAssets/yoo/Preload/Preload_2025-10-09-554.hash.meta index c5808ad..99954c9 100644 --- a/Assets/StreamingAssets/yoo/Preload/Preload_2025-09-22-640.bytes.meta +++ b/Assets/StreamingAssets/yoo/Preload/Preload_2025-10-09-554.hash.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9586cc28e4ee5fc4299a84a139ea0423 +guid: bbef88cf5f7804147a516e01df75d1d9 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_hotupdatedll_5c45d5d7c6e6ebb6f60de2012a1c7246.bundle b/Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_hotupdatedll_5c45d5d7c6e6ebb6f60de2012a1c7246.bundle deleted file mode 100644 index 3af567c..0000000 Binary files a/Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_hotupdatedll_5c45d5d7c6e6ebb6f60de2012a1c7246.bundle and /dev/null differ diff --git a/Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_hotupdatedll_fa4a44515183a01f3ab367e78b06c4bf.bundle b/Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_hotupdatedll_fa4a44515183a01f3ab367e78b06c4bf.bundle new file mode 100644 index 0000000..e5fe586 Binary files /dev/null and b/Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_hotupdatedll_fa4a44515183a01f3ab367e78b06c4bf.bundle differ diff --git a/Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_uipanel_df78f44a334e4d20f2fdbf50e349402e.bundle.meta b/Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_hotupdatedll_fa4a44515183a01f3ab367e78b06c4bf.bundle.meta similarity index 74% rename from Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_uipanel_df78f44a334e4d20f2fdbf50e349402e.bundle.meta rename to Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_hotupdatedll_fa4a44515183a01f3ab367e78b06c4bf.bundle.meta index 03cac9f..cdeffe2 100644 --- a/Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_uipanel_df78f44a334e4d20f2fdbf50e349402e.bundle.meta +++ b/Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_hotupdatedll_fa4a44515183a01f3ab367e78b06c4bf.bundle.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 04010696ec3cfe144b23692fcd62633d +guid: 2134e25b264154542817e0d0fa647c44 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_uipanel_df78f44a334e4d20f2fdbf50e349402e.bundle b/Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_uipanel_3af8985a0950e33249e822a39aa0ccc6.bundle similarity index 99% rename from Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_uipanel_df78f44a334e4d20f2fdbf50e349402e.bundle rename to Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_uipanel_3af8985a0950e33249e822a39aa0ccc6.bundle index b997bc2..1969740 100644 Binary files a/Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_uipanel_df78f44a334e4d20f2fdbf50e349402e.bundle and b/Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_uipanel_3af8985a0950e33249e822a39aa0ccc6.bundle differ diff --git a/Assets/StreamingAssets/yoo/Preload/Preload_2025-09-22-640.hash.meta b/Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_uipanel_3af8985a0950e33249e822a39aa0ccc6.bundle.meta similarity index 74% rename from Assets/StreamingAssets/yoo/Preload/Preload_2025-09-22-640.hash.meta rename to Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_uipanel_3af8985a0950e33249e822a39aa0ccc6.bundle.meta index 2bcacae..149abd5 100644 --- a/Assets/StreamingAssets/yoo/Preload/Preload_2025-09-22-640.hash.meta +++ b/Assets/StreamingAssets/yoo/Preload/preload_assets_res_preload_uipanel_3af8985a0950e33249e822a39aa0ccc6.bundle.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 04fe4546b23221b4bab3b29a9db35c05 +guid: 66ea3c090f5d3bb499958493f772d8a6 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/StreamingAssets/yoo/Preload/preload_share_assets_res_preload_uipanelart_f1cb6e8982352f1930694c45f971c27e.bundle b/Assets/StreamingAssets/yoo/Preload/preload_share_assets_res_preload_uipanelart_219ff435ccd8a01117a1abb146297be0.bundle similarity index 99% rename from Assets/StreamingAssets/yoo/Preload/preload_share_assets_res_preload_uipanelart_f1cb6e8982352f1930694c45f971c27e.bundle rename to Assets/StreamingAssets/yoo/Preload/preload_share_assets_res_preload_uipanelart_219ff435ccd8a01117a1abb146297be0.bundle index a68e0ab..1bfa4da 100644 Binary files a/Assets/StreamingAssets/yoo/Preload/preload_share_assets_res_preload_uipanelart_f1cb6e8982352f1930694c45f971c27e.bundle and b/Assets/StreamingAssets/yoo/Preload/preload_share_assets_res_preload_uipanelart_219ff435ccd8a01117a1abb146297be0.bundle differ diff --git a/Assets/StreamingAssets/yoo/Preload/preload_share_assets_res_preload_uipanelart_219ff435ccd8a01117a1abb146297be0.bundle.meta b/Assets/StreamingAssets/yoo/Preload/preload_share_assets_res_preload_uipanelart_219ff435ccd8a01117a1abb146297be0.bundle.meta new file mode 100644 index 0000000..f2a43d8 --- /dev/null +++ b/Assets/StreamingAssets/yoo/Preload/preload_share_assets_res_preload_uipanelart_219ff435ccd8a01117a1abb146297be0.bundle.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bd4c4686e96cbde4dbdd0fdc3b76c8f1 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/yoo/Preload/preload_share_assets_res_preload_uipanelart_f1cb6e8982352f1930694c45f971c27e.bundle.meta b/Assets/StreamingAssets/yoo/Preload/preload_share_assets_res_preload_uipanelart_f1cb6e8982352f1930694c45f971c27e.bundle.meta deleted file mode 100644 index ac14f98..0000000 --- a/Assets/StreamingAssets/yoo/Preload/preload_share_assets_res_preload_uipanelart_f1cb6e8982352f1930694c45f971c27e.bundle.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: c908038fb03d4f440affd087c74a2322 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/StreamingAssets/yoo/Preload/preload_unityshaders_4e1243970ec9c75cdb3d1f2552618719.bundle b/Assets/StreamingAssets/yoo/Preload/preload_unityshaders_4e1243970ec9c75cdb3d1f2552618719.bundle new file mode 100644 index 0000000..683ded8 Binary files /dev/null and b/Assets/StreamingAssets/yoo/Preload/preload_unityshaders_4e1243970ec9c75cdb3d1f2552618719.bundle differ diff --git a/Assets/StreamingAssets/yoo/Preload/preload_unityshaders_4e1243970ec9c75cdb3d1f2552618719.bundle.meta b/Assets/StreamingAssets/yoo/Preload/preload_unityshaders_4e1243970ec9c75cdb3d1f2552618719.bundle.meta new file mode 100644 index 0000000..9130819 --- /dev/null +++ b/Assets/StreamingAssets/yoo/Preload/preload_unityshaders_4e1243970ec9c75cdb3d1f2552618719.bundle.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2caec77def88e2f45aee1d5665c10ecf +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/yoo/Preload/preload_unityshaders_6b7786486d6709e770ada5979e84a4fc.bundle b/Assets/StreamingAssets/yoo/Preload/preload_unityshaders_6b7786486d6709e770ada5979e84a4fc.bundle deleted file mode 100644 index 7845b97..0000000 Binary files a/Assets/StreamingAssets/yoo/Preload/preload_unityshaders_6b7786486d6709e770ada5979e84a4fc.bundle and /dev/null differ diff --git a/Assets/StreamingAssets/yoo/Preload/preload_unityshaders_6b7786486d6709e770ada5979e84a4fc.bundle.meta b/Assets/StreamingAssets/yoo/Preload/preload_unityshaders_6b7786486d6709e770ada5979e84a4fc.bundle.meta deleted file mode 100644 index e43faef..0000000 --- a/Assets/StreamingAssets/yoo/Preload/preload_unityshaders_6b7786486d6709e770ada5979e84a4fc.bundle.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 6e5b0d7c0b0372145b2f4ed7e42985b9 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 7a6f40b..b852362 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.62f1 -m_EditorVersionWithRevision: 2022.3.62f1 (4af31df58517) +m_EditorVersion: 2022.3.62f2 +m_EditorVersionWithRevision: 2022.3.62f2 (7670c08855a9) diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index b11d9ee..dc61e57 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -15,9 +15,9 @@ MonoBehaviour: m_PixelRect: serializedVersion: 2 x: 0 - y: 43 - width: 2560 - height: 1349 + y: 43.2 + width: 2048 + height: 1188.8 m_ShowMode: 4 m_Title: Hierarchy m_RootView: {fileID: 2} @@ -44,8 +44,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 2560 - height: 1349 + width: 2048 + height: 1188.8 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -69,7 +69,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 2560 + width: 2048 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -90,8 +90,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 1329 - width: 2560 + y: 1168.8 + width: 2048 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -114,12 +114,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 2560 - height: 1299 + width: 2048 + height: 1138.8 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 88 + controlID: 42 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -140,8 +140,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1877 - height: 1299 + width: 1501.6 + height: 1138.8 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 @@ -166,8 +166,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1877 - height: 853 + width: 1501.6 + height: 748 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 @@ -190,8 +190,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 407 - height: 853 + width: 325.6 + height: 748 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 14} @@ -209,18 +209,18 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 407 + x: 325.6 y: 0 - width: 1470 - height: 853 + width: 1176 + height: 748 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 13} + m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} - {fileID: 13} @@ -229,8 +229,8 @@ MonoBehaviour: - {fileID: 18} - {fileID: 19} - {fileID: 20} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -247,9 +247,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 853 - width: 1877 - height: 446 + y: 748 + width: 1501.6 + height: 390.80005 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 24} @@ -276,12 +276,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1877 + x: 1501.6 y: 0 - width: 683 - height: 1299 - m_MinSize: {x: 275, y: 100} - m_MaxSize: {x: 4000, y: 4000} + width: 546.4 + height: 1138.8 + m_MinSize: {x: 276, y: 121} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 25} m_Panes: - {fileID: 25} @@ -304,7 +304,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Audio Mixer - m_Image: {fileID: 2344599766593239149, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -3283902137440876849, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: @@ -487,15 +487,15 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, + m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 407 - y: 73 - width: 1468 - height: 832 + x: 325.6 + y: 73.6 + width: 1174 + height: 727 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -527,10 +527,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -1280 - m_HBaseRangeMax: 1280 - m_VBaseRangeMin: -720 - m_VBaseRangeMax: 720 + m_HBaseRangeMin: -1024 + m_HBaseRangeMax: 1024 + m_VBaseRangeMin: -576 + m_VBaseRangeMax: 576 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -539,7 +539,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -548,23 +548,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1468 - height: 811 - m_Scale: {x: 0.56319445, y: 0.56319445} - m_Translation: {x: 734, y: 405.5} + width: 1174 + height: 706 + m_Scale: {x: 0.5732422, y: 0.5732422} + m_Translation: {x: 587, y: 353} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1303.2799 - y: -720 - width: 2606.5598 - height: 1440 + x: -1024 + y: -615.7956 + width: 2048 + height: 1231.5912 m_MinimalGUI: 1 - m_defaultScale: 0.56319445 - m_LastWindowPixelSize: {x: 1468, y: 832} + m_defaultScale: 0.5732422 + m_LastWindowPixelSize: {x: 1467.5, y: 908.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000001000000000000 @@ -587,15 +587,15 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Hierarchy - m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 x: 0 - y: 73 - width: 406 - height: 832 + y: 73.6 + width: 324.6 + height: 727 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -611,7 +611,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: e4acffff68f6ffff08fbffff + m_ExpandedIDs: 1ccdfffff0dcffff08fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -651,15 +651,15 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Scene - m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, + m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 407 - y: 73 - width: 1468 - height: 832 + x: 325.6 + y: 73.6 + width: 1174 + height: 727 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1026,14 +1026,14 @@ MonoBehaviour: m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 - m_2DMode: 1 + m_2DMode: 0 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 1842.445, y: 522.76733, z: -0.025670284} + m_Target: {x: 19.634562, y: 9998.109, z: 120.83349} speed: 2 - m_Value: {x: 1842.445, y: 522.76733, z: -0.025670284} + m_Value: {x: 19.634562, y: 9998.109, z: 120.83349} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1061,17 +1061,17 @@ MonoBehaviour: m_Size: {x: 1, y: 1} yGrid: m_Fade: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} zGrid: m_Fade: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} @@ -1079,17 +1079,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0, y: 0, z: 0, w: 1} + m_Target: {x: 0.06827203, y: 0.9264379, z: -0.30805007, w: 0.20532306} speed: 2 - m_Value: {x: 0, y: 0, z: 0, w: 1} + m_Value: {x: 0.06827201, y: 0.92643756, z: -0.30804995, w: 0.20532298} m_Size: - m_Target: 1267.0481 + m_Target: 10.240305 speed: 2 - m_Value: 1267.0481 + m_Value: 10.240305 m_Ortho: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_CameraSettings: m_Speed: 0.8805599 m_SpeedNormalized: 0.43999997 @@ -1103,7 +1103,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 0 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewRotation: {x: 0.06827203, y: 0.9264379, z: -0.30805007, w: 0.20532306} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -1126,7 +1126,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Package Manager - m_Image: {fileID: -2824328813065806953, guid: 0000000000000000d000000000000000, + m_Image: {fileID: 5076950121296946556, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: @@ -1265,7 +1265,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Asset Store - m_Image: {fileID: -8693916549880196297, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -7444545952099596278, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: @@ -1300,15 +1300,15 @@ MonoBehaviour: m_MaxSize: {x: 10000, y: 10000} m_TitleContent: m_Text: Project - m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 x: 0 - y: 926 - width: 1876 - height: 425 + y: 821.60004 + width: 1500.6 + height: 369.80005 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1330,7 +1330,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Res/Main/UIPanel m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1338,16 +1338,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets + - Assets/Res/Main/UIPanel m_LastFoldersGridSize: 16 - m_LastProjectPath: C:\UnityProject\BlueArchiveMiniGame + m_LastProjectPath: D:\UnityProject\BlueArchiveMiniGame m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 79} - m_SelectedIDs: 4c810000 - m_LastClickedID: 33100 - m_ExpandedIDs: 000000004c8100004e81000050810000528100005481000056810000588100006c8100008681000000ca9a3b + m_SelectedIDs: 54850000 + m_LastClickedID: 34132 + m_ExpandedIDs: 000000004e810000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1375,7 +1375,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000004c8100004e8100005081000052810000548100005681000058810000 + m_ExpandedIDs: 000000004e810000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1400,24 +1400,24 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: f6810000 - m_LastClickedInstanceID: 33270 + m_SelectedInstanceIDs: 62e60000 + m_LastClickedInstanceID: 58978 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000068f1200828d00000c8d0000121d050042e40400b2930000c4fa0400ae0e0500f2ef0400682a4200802a42008a17420050a10000ee090500bc130500eccd000032030000bef80000c2a300000000000040f500007a860000647c0600f2b606001cb7060010170100b6290100e8ae00000aae0400447f0000d283000082ae0000d4beffff m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: ForTest - m_OriginalName: ForTest + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 33270 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 10} m_CreateAssetUtility: @@ -1447,7 +1447,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Animator - m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, + m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: @@ -1571,7 +1571,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Animation - m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: @@ -1592,7 +1592,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: -21258 + m_LastSelectedObjectID: 59486 --- !u!114 &24 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1609,15 +1609,15 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Console - m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 x: 0 - y: 926 - width: 1876 - height: 425 + y: 821.60004 + width: 1500.6 + height: 369.80005 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1644,15 +1644,15 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Inspector - m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1877 - y: 73 - width: 682 - height: 1278 + x: 1501.6 + y: 73.6 + width: 545.4 + height: 1117.8 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1692,7 +1692,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Lighting - m_Image: {fileID: -1347227620855488341, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -1477008817101679558, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: