diff --git a/.vs/CultivationOfBrewing-2/FileContentIndex/3f086063-6aa3-40d5-b40e-9d1971984be8.vsidx b/.vs/CultivationOfBrewing-2/FileContentIndex/0ce729df-69c7-4f12-b4a6-fe990d977ae1.vsidx similarity index 95% rename from .vs/CultivationOfBrewing-2/FileContentIndex/3f086063-6aa3-40d5-b40e-9d1971984be8.vsidx rename to .vs/CultivationOfBrewing-2/FileContentIndex/0ce729df-69c7-4f12-b4a6-fe990d977ae1.vsidx index 6f85415..cd91c6a 100644 Binary files a/.vs/CultivationOfBrewing-2/FileContentIndex/3f086063-6aa3-40d5-b40e-9d1971984be8.vsidx and b/.vs/CultivationOfBrewing-2/FileContentIndex/0ce729df-69c7-4f12-b4a6-fe990d977ae1.vsidx differ diff --git a/.vs/CultivationOfBrewing-2/FileContentIndex/19baa885-fcde-4f7d-91c0-5b194150b165.vsidx b/.vs/CultivationOfBrewing-2/FileContentIndex/19baa885-fcde-4f7d-91c0-5b194150b165.vsidx new file mode 100644 index 0000000..8243711 Binary files /dev/null and b/.vs/CultivationOfBrewing-2/FileContentIndex/19baa885-fcde-4f7d-91c0-5b194150b165.vsidx differ diff --git a/.vs/CultivationOfBrewing-2/FileContentIndex/25e4d604-0634-41ee-b82f-f1007b54275d.vsidx b/.vs/CultivationOfBrewing-2/FileContentIndex/25e4d604-0634-41ee-b82f-f1007b54275d.vsidx deleted file mode 100644 index 998a464..0000000 Binary files a/.vs/CultivationOfBrewing-2/FileContentIndex/25e4d604-0634-41ee-b82f-f1007b54275d.vsidx and /dev/null differ diff --git a/.vs/CultivationOfBrewing-2/FileContentIndex/8f7a3cfe-2bf4-4f28-ab5e-dcc14627aa35.vsidx b/.vs/CultivationOfBrewing-2/FileContentIndex/8f7a3cfe-2bf4-4f28-ab5e-dcc14627aa35.vsidx new file mode 100644 index 0000000..2acd54a Binary files /dev/null and b/.vs/CultivationOfBrewing-2/FileContentIndex/8f7a3cfe-2bf4-4f28-ab5e-dcc14627aa35.vsidx differ diff --git a/.vs/CultivationOfBrewing-2/FileContentIndex/9c1dc26d-92cc-4f2a-86da-3b62f5074064.vsidx b/.vs/CultivationOfBrewing-2/FileContentIndex/9c1dc26d-92cc-4f2a-86da-3b62f5074064.vsidx deleted file mode 100644 index fbb16e3..0000000 Binary files a/.vs/CultivationOfBrewing-2/FileContentIndex/9c1dc26d-92cc-4f2a-86da-3b62f5074064.vsidx and /dev/null differ diff --git a/Assets/HQB/Scene/LiveScene.unity b/Assets/HQB/Scene/10002_2002_03_LiveScene.unity similarity index 100% rename from Assets/HQB/Scene/LiveScene.unity rename to Assets/HQB/Scene/10002_2002_03_LiveScene.unity diff --git a/Assets/HQB/Scene/LiveScene.unity.meta b/Assets/HQB/Scene/10002_2002_03_LiveScene.unity.meta similarity index 100% rename from Assets/HQB/Scene/LiveScene.unity.meta rename to Assets/HQB/Scene/10002_2002_03_LiveScene.unity.meta diff --git a/Assets/Scripts/ProjectBase/ScenesManager/ScenesManager.cs b/Assets/Scripts/ProjectBase/ScenesManager/ScenesManager.cs index 8b2a108..b901652 100644 --- a/Assets/Scripts/ProjectBase/ScenesManager/ScenesManager.cs +++ b/Assets/Scripts/ProjectBase/ScenesManager/ScenesManager.cs @@ -45,7 +45,7 @@ public class ScenesManager : BaseManager LoadSceneMode loadSceneMode = LoadSceneMode.Single) { E_SceneType currentSceneName; - if (sceneName.Contains("03_OfficeScene")) + if (sceneName.Contains("03_LiveScene")) { currentSceneName = E_SceneType.Office; } diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 81edcdd..1b0a1c3 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -24,14 +24,14 @@ EditorUserSettings: value: 0550025e01010c0c0f5d54704175074444154073752d7733757d4a30b2e2366a flags: 0 RecentlyUsedSceneGuid-6: - value: 020355555607505e0e0b097b4821594412161a7f2f2b24672b701c65b1e5353c - flags: 0 - RecentlyUsedSceneGuid-7: value: 055302565656080e0f575d2346260644404e192c757c22357d794e65e3b9373e flags: 0 - RecentlyUsedSceneGuid-8: + RecentlyUsedSceneGuid-7: value: 020207045d025c580b565f2047225c44424e4d7d2a2a74317b7f1e6ae7b26260 flags: 0 + RecentlyUsedSceneGuid-8: + value: 020355555607505e0e0b097b4821594412161a7f2f2b24672b701c65b1e5353c + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0 diff --git a/obj/Debug/Assembly-CSharp-Editor-firstpass.csproj.AssemblyReference.cache b/obj/Debug/Assembly-CSharp-Editor-firstpass.csproj.AssemblyReference.cache index e99937b..15bed8c 100644 Binary files a/obj/Debug/Assembly-CSharp-Editor-firstpass.csproj.AssemblyReference.cache and b/obj/Debug/Assembly-CSharp-Editor-firstpass.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache b/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache new file mode 100644 index 0000000..6743576 Binary files /dev/null and b/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/Assembly-CSharp-firstpass.csproj.AssemblyReference.cache b/obj/Debug/Assembly-CSharp-firstpass.csproj.AssemblyReference.cache index 0481c89..fa80633 100644 Binary files a/obj/Debug/Assembly-CSharp-firstpass.csproj.AssemblyReference.cache and b/obj/Debug/Assembly-CSharp-firstpass.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache b/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache index 0481c89..e34d57b 100644 Binary files a/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache and b/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 57da9ba..674e1fe 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/obj/Debug/Sirenix.OdinInspector.Modules.UnityMathematics.csproj.AssemblyReference.cache b/obj/Debug/Sirenix.OdinInspector.Modules.UnityMathematics.csproj.AssemblyReference.cache new file mode 100644 index 0000000..5809e00 Binary files /dev/null and b/obj/Debug/Sirenix.OdinInspector.Modules.UnityMathematics.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/UniRx.csproj.AssemblyReference.cache b/obj/Debug/UniRx.csproj.AssemblyReference.cache new file mode 100644 index 0000000..fc9cf6f Binary files /dev/null and b/obj/Debug/UniRx.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/UniTask.Addressables.csproj.AssemblyReference.cache b/obj/Debug/UniTask.Addressables.csproj.AssemblyReference.cache index 1b75841..3cf987d 100644 Binary files a/obj/Debug/UniTask.Addressables.csproj.AssemblyReference.cache and b/obj/Debug/UniTask.Addressables.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/UniTask.DOTween.csproj.AssemblyReference.cache b/obj/Debug/UniTask.DOTween.csproj.AssemblyReference.cache index 1b75841..3cf987d 100644 Binary files a/obj/Debug/UniTask.DOTween.csproj.AssemblyReference.cache and b/obj/Debug/UniTask.DOTween.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/UniTask.Editor.csproj.AssemblyReference.cache b/obj/Debug/UniTask.Editor.csproj.AssemblyReference.cache index a510d1f..efe6b24 100644 Binary files a/obj/Debug/UniTask.Editor.csproj.AssemblyReference.cache and b/obj/Debug/UniTask.Editor.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/UniTask.Linq.csproj.AssemblyReference.cache b/obj/Debug/UniTask.Linq.csproj.AssemblyReference.cache index 1b75841..3cf987d 100644 Binary files a/obj/Debug/UniTask.Linq.csproj.AssemblyReference.cache and b/obj/Debug/UniTask.Linq.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/UniTask.TextMeshPro.csproj.AssemblyReference.cache b/obj/Debug/UniTask.TextMeshPro.csproj.AssemblyReference.cache index ac0986a..039ba9d 100644 Binary files a/obj/Debug/UniTask.TextMeshPro.csproj.AssemblyReference.cache and b/obj/Debug/UniTask.TextMeshPro.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/UniTask.csproj.AssemblyReference.cache b/obj/Debug/UniTask.csproj.AssemblyReference.cache index 1b75841..3cf987d 100644 Binary files a/obj/Debug/UniTask.csproj.AssemblyReference.cache and b/obj/Debug/UniTask.csproj.AssemblyReference.cache differ