diff --git a/Assets/GAME/Prefabs/Player/Player.prefab b/Assets/GAME/Prefabs/Player/Player.prefab index 8c66faa9..5c79f7d5 100644 --- a/Assets/GAME/Prefabs/Player/Player.prefab +++ b/Assets/GAME/Prefabs/Player/Player.prefab @@ -446,7 +446,7 @@ Transform: m_GameObject: {fileID: 5167716622245296089} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -42.71064, y: 17.5, z: -223.79941} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/GAME/Scenes/0_Init.unity b/Assets/GAME/Scenes/0_Init.unity index d8641b0f..73d1d603 100644 --- a/Assets/GAME/Scenes/0_Init.unity +++ b/Assets/GAME/Scenes/0_Init.unity @@ -290,8 +290,6 @@ MonoBehaviour: _prefab: Assets/GAME/Prefabs/Manager/Single/MusicManager.prefab - _gameObject: {fileID: 2017677975} _prefab: Assets/GAME/Prefabs/Manager/Single/DiscordPresenceManager.prefab - - _gameObject: {fileID: 2017677974} - _prefab: Assets/Plugins/IngameDebugConsole/IngameDebugConsole.prefab - _gameObject: {fileID: 2017677973} _prefab: Assets/GAME/Prefabs/Manager/Single/SteamManager.prefab - _gameObject: {fileID: 2017677972} @@ -310,6 +308,8 @@ MonoBehaviour: - _gameObject: {fileID: 461851942} _prefab: Assets/Plugins/Graphy - Ultimate Stats Monitor/Prefab/Internal/ADVANCED - Module.prefab + - _gameObject: {fileID: 1576311801} + _prefab: Assets/Plugins/IngameDebugConsole/IngameDebugConsole.prefab - _gameObject: {fileID: 932487655} _prefab: Assets/GAME/Prefabs/UI/SplashCanvas.prefab --- !u!4 &1431263255 @@ -327,6 +327,357 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1576311799 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2017677974} + m_Modifications: + - target: {fileID: 132536, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_Name + value: IngameDebugConsole + objectReference: {fileID: 0} + - target: {fileID: 11452418, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: startMinimized + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11452418, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: avoidScreenCutout + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11452418, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: toggleBinding.m_SingletonActionBindings.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11452418, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: toggleBinding.m_SingletonActionBindings.Array.data[1].m_Id + value: 9a4a3038-620d-42d1-accc-da88b7325931 + objectReference: {fileID: 0} + - target: {fileID: 11452418, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: toggleBinding.m_SingletonActionBindings.Array.data[1].m_Path + value: /f1 + objectReference: {fileID: 0} + - target: {fileID: 11452418, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: toggleBinding.m_SingletonActionBindings.Array.data[1].m_Action + value: Toggle Binding + objectReference: {fileID: 0} + - target: {fileID: 22400762, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.000015258789 + objectReference: {fileID: 0} + - target: {fileID: 22426080, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22426080, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22428984, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22455554, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22468896, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22488670, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22495692, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224619367409363176, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 958269219681220773, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 2369662702609791303, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 4760950775166374324, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 5379786813386287946, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 6275684029659916475, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 7682126221316033537, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 7917212057380179541, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 8026934286120355878, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 8276117061088563291, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 8949468901311314302, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} +--- !u!224 &1576311800 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 22457152, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + m_PrefabInstance: {fileID: 1576311799} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1576311801 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 132536, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 3} + m_PrefabInstance: {fileID: 1576311799} + m_PrefabAsset: {fileID: 0} --- !u!1 &1655756636 GameObject: m_ObjectHideFlags: 0 @@ -630,7 +981,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3491771655516329366, guid: 3fb44d71f7c08954d8dcf499eea57508, type: 3} propertyPath: m_Value - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3491771655516389002, guid: 3fb44d71f7c08954d8dcf499eea57508, type: 3} propertyPath: startMinimized @@ -644,6 +995,26 @@ PrefabInstance: propertyPath: avoidScreenCutout value: 1 objectReference: {fileID: 0} + - target: {fileID: 3491771655516389002, guid: 3fb44d71f7c08954d8dcf499eea57508, type: 3} + propertyPath: toggleBinding.m_SingletonActionBindings.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3491771655516389002, guid: 3fb44d71f7c08954d8dcf499eea57508, type: 3} + propertyPath: toggleBinding.m_SingletonActionBindings.Array.data[1].m_Id + value: 313595a2-7b75-4cf6-888a-5f3e9b6fb09f + objectReference: {fileID: 0} + - target: {fileID: 3491771655516389002, guid: 3fb44d71f7c08954d8dcf499eea57508, type: 3} + propertyPath: toggleBinding.m_SingletonActionBindings.Array.data[1].m_Path + value: /f1 + objectReference: {fileID: 0} + - target: {fileID: 3491771655516389002, guid: 3fb44d71f7c08954d8dcf499eea57508, type: 3} + propertyPath: toggleBinding.m_SingletonActionBindings.Array.data[1].m_Action + value: Toggle Binding + objectReference: {fileID: 0} + - target: {fileID: 3594514765744721400, guid: 3fb44d71f7c08954d8dcf499eea57508, type: 3} + propertyPath: embeddedEventSystem + value: + objectReference: {fileID: 0} - target: {fileID: 3705127471182616160, guid: 3fb44d71f7c08954d8dcf499eea57508, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -736,7 +1107,11 @@ PrefabInstance: - {fileID: 3491771655516414816, guid: 3fb44d71f7c08954d8dcf499eea57508, type: 3} m_RemovedGameObjects: - {fileID: 3491771655510529102, guid: 3fb44d71f7c08954d8dcf499eea57508, type: 3} - m_AddedGameObjects: [] + - {fileID: 3491771655510309680, guid: 3fb44d71f7c08954d8dcf499eea57508, type: 3} + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4965406541838574643, guid: 3fb44d71f7c08954d8dcf499eea57508, type: 3} + insertIndex: -1 + addedObject: {fileID: 1576311800} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fb44d71f7c08954d8dcf499eea57508, type: 3} --- !u!1 &2017677971 stripped @@ -754,9 +1129,9 @@ GameObject: m_CorrespondingSourceObject: {fileID: 8173437796775519831, guid: 3fb44d71f7c08954d8dcf499eea57508, type: 3} m_PrefabInstance: {fileID: 2017677970} m_PrefabAsset: {fileID: 0} ---- !u!1 &2017677974 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3491771655510309680, guid: 3fb44d71f7c08954d8dcf499eea57508, type: 3} +--- !u!4 &2017677974 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4965406541838574643, guid: 3fb44d71f7c08954d8dcf499eea57508, type: 3} m_PrefabInstance: {fileID: 2017677970} m_PrefabAsset: {fileID: 0} --- !u!1 &2017677975 stripped diff --git a/Assets/GAME/Scenes/MenuScene.unity b/Assets/GAME/Scenes/MenuScene.unity index bf9c7c35..d09dd5e7 100644 --- a/Assets/GAME/Scenes/MenuScene.unity +++ b/Assets/GAME/Scenes/MenuScene.unity @@ -63840,143 +63840,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 3608565221961673181, guid: ed38accba62b7c94184fc0834de42aa7, type: 3} m_PrefabInstance: {fileID: 583899353} m_PrefabAsset: {fileID: 0} ---- !u!1 &369762699 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 369762700} - - component: {fileID: 369762702} - - component: {fileID: 369762701} - m_Layer: 0 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &369762700 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 369762699} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1978709205} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 555.5403, y: 85.9916} - m_Pivot: {x: 0.5, y: 0} ---- !u!114 &369762701 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 369762699} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: New Text - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: dc221f629ad2625429da3920b6f9a348, type: 2} - m_sharedMaterial: {fileID: 3767062857633432899, guid: dc221f629ad2625429da3920b6f9a348, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_characterHorizontalScale: 1 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &369762702 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 369762699} - m_CullTransparentMesh: 1 --- !u!1 &369882767 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5742613051752623418, guid: 453c61853d2421c4eb5364e05deb7563, type: 3} @@ -132371,7 +132234,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22400004, guid: aab3513d9620f4d478744a2c0e04fa26, type: 3} propertyPath: m_LocalPosition.z - value: -165.70316 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22400004, guid: aab3513d9620f4d478744a2c0e04fa26, type: 3} propertyPath: m_LocalRotation.w @@ -136889,6 +136752,81 @@ GameObject: m_CorrespondingSourceObject: {fileID: 1209258679081589145, guid: e46782a874d9bd04aaafdfbe4719d4bc, type: 3} m_PrefabInstance: {fileID: 792101232} m_PrefabAsset: {fileID: 0} +--- !u!1 &792228874 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 792228875} + - component: {fileID: 792228877} + - component: {fileID: 792228876} + m_Layer: 0 + m_Name: Filled + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &792228875 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 792228874} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1871988010} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 0.000015258789} + m_SizeDelta: {x: 1002.2675, y: 48.2691} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &792228876 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 792228874} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + m_Material: {fileID: 0} + m_Color: {r: 0.7843138, g: 0.45882356, b: 0.18039216, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 303016f61ea9dd642a6b2812b80f428e, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 0 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!222 &792228877 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 792228874} + m_CullTransparentMesh: 1 --- !u!1001 &792276935 PrefabInstance: m_ObjectHideFlags: 0 @@ -326238,6 +326176,82 @@ Transform: m_CorrespondingSourceObject: {fileID: 7467596688601218676, guid: 72699399f6de5954aa85fd6e6fe905fe, type: 3} m_PrefabInstance: {fileID: 1871781708} m_PrefabAsset: {fileID: 0} +--- !u!1 &1871988009 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1871988010} + - component: {fileID: 1871988012} + - component: {fileID: 1871988011} + m_Layer: 0 + m_Name: Bg Slider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1871988010 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1871988009} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 792228875} + m_Father: {fileID: 1978709205} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 10.700012} + m_SizeDelta: {x: 1002.2675, y: 48.2691} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &1871988011 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1871988009} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: feb013a4b4d550142ae6612c1e7cb53f, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!222 &1871988012 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1871988009} + m_CullTransparentMesh: 1 --- !u!1 &1872329594 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3552718611955523198, guid: 56f986943fa82864394e61d72414fd0a, type: 3} @@ -343112,7 +343126,7 @@ RectTransform: m_Children: - {fileID: 1090701803} - {fileID: 764692950} - - {fileID: 369762700} + - {fileID: 1871988010} m_Father: {fileID: 1036516496} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -343181,7 +343195,7 @@ Canvas: m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 - m_SortingOrder: 8000 + m_SortingOrder: 500 m_TargetDisplay: 0 --- !u!114 &1978709209 MonoBehaviour: @@ -343195,7 +343209,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e417e8562dcadeb43933d3687febc562, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::Ashwild.UI.LoadingScreen - quoteLabel: {fileID: 369762701} + quoteLabel: {fileID: 0} quotes: {fileID: 0} fadeInDuration: 0.35 fadeOutDuration: 0.5 @@ -343205,6 +343219,12 @@ MonoBehaviour: settleDelay: 0.75 quoteDuration: 4 quoteFadeDuration: 0.4 + progressFill: {fileID: 792228876} + percentLabel: {fileID: 0} + fillDuration: 8 + fillCap: 0.9 + fillCompleteDuration: 0.35 + fillEase: 3 --- !u!225 &1978709210 CanvasGroup: m_ObjectHideFlags: 0 diff --git a/Assets/GAME/Scenes/TestScene.unity b/Assets/GAME/Scenes/TestScene.unity index 47a8d526..9cc60a61 100644 Binary files a/Assets/GAME/Scenes/TestScene.unity and b/Assets/GAME/Scenes/TestScene.unity differ diff --git a/Assets/GAME/Script/UI/LoadingScreen.cs b/Assets/GAME/Script/UI/LoadingScreen.cs index a32ec88c..5e902323 100644 --- a/Assets/GAME/Script/UI/LoadingScreen.cs +++ b/Assets/GAME/Script/UI/LoadingScreen.cs @@ -1,4 +1,5 @@ using UnityEngine; +using UnityEngine.UI; using TMPro; using DG.Tweening; using Ashwild.Player; @@ -55,6 +56,30 @@ namespace Ashwild.UI [Tooltip("Cross-fade duration when swapping one quote for the next.")] [SerializeField] private float quoteFadeDuration = 0.4f; + [Header("Progress Bar")] + [Tooltip("Filled Image (Image Type = Filled) that fills as a loading-percentage indicator. " + + "Optional — leave unassigned to disable the bar entirely.")] + [SerializeField] private Image progressFill; + + [Tooltip("Optional label that mirrors the slider as a whole-number percentage (e.g. \"42%\").")] + [SerializeField] private TextMeshProUGUI percentLabel; + + [Tooltip("Time the bar takes to ramp from empty to the fill cap while the network load runs. " + + "The load has no real progress signal, so the bar fills steadily toward the cap and " + + "only completes to 100% once the ready signal arrives.")] + [SerializeField] private float fillDuration = 8f; + + [Tooltip("Value (0–1) the ramp stalls at while loading, leaving headroom so the bar never sits " + + "at 100% before the scene is actually ready.")] + [Range(0f, 1f)] + [SerializeField] private float fillCap = 0.9f; + + [Tooltip("Time the bar takes to rush from the cap to 100% once the ready signal arrives, played " + + "during the curtain's hold before it fades out.")] + [SerializeField] private float fillCompleteDuration = 0.35f; + + [SerializeField] private Ease fillEase = Ease.OutSine; + #endregion #region State @@ -90,6 +115,7 @@ namespace Ashwild.UI private Tween curtainTween; private Sequence quoteSequence; + private Tween progressTween; #endregion @@ -156,6 +182,7 @@ namespace Ashwild.UI { curtainTween?.Kill(); quoteSequence?.Kill(); + progressTween?.Kill(); if (instance == this) instance = null; } @@ -255,6 +282,7 @@ namespace Ashwild.UI ShowNextQuote(instant: true); StartQuoteCycle(); + StartProgress(); } /// @@ -271,6 +299,8 @@ namespace Ashwild.UI float elapsed = Time.unscaledTime - shownAt; float delay = Mathf.Max(settleDelay, minimumDisplayTime - elapsed); + CompleteProgress(); + curtainTween?.Kill(); curtainTween = canvasGroup.DOFade(0f, fadeOutDuration) .SetDelay(delay) @@ -286,6 +316,53 @@ namespace Ashwild.UI #endregion + #region Progress Bar + + /// + /// Resets the bar to empty and starts the steady ramp toward over + /// . The network load exposes no real progress, so this is a paced + /// estimate that deliberately stops short of full — finishes it + /// once the scene is genuinely ready. Runs on unscaled time so it keeps moving while the load + /// freezes the timescale. No-op when no slider is assigned. + /// + private void StartProgress() + { + if (progressFill == null) return; + + progressTween?.Kill(); + SetProgress(0f); + + progressTween = DOTween.To(SetProgress, 0f, fillCap, fillDuration) + .SetEase(fillEase) + .SetUpdate(true); + } + + /// + /// Rushes the bar from wherever the ramp stalled up to 100%, played during the curtain's hold + /// before it fades out so the bar reads as a completed load. No-op when no slider is assigned. + /// + private void CompleteProgress() + { + if (progressFill == null) return; + + progressTween?.Kill(); + progressTween = DOTween.To(SetProgress, progressFill.fillAmount, 1f, fillCompleteDuration) + .SetEase(Ease.OutSine) + .SetUpdate(true); + } + + /// + /// Writes a 0–1 value to the filled image's fillAmount and mirrors it onto the optional + /// percentage label. + /// + private void SetProgress(float value) + { + if (progressFill != null) progressFill.fillAmount = value; + if (percentLabel != null) percentLabel.text = $"{Mathf.RoundToInt(value * 100f)}%"; + } + + #endregion + #region Quotes /// diff --git a/Assets/GAME/ScriptableObjects/Audio/NewPlaylist.asset b/Assets/GAME/ScriptableObjects/Audio/NewPlaylist.asset index 6bba3075..4aa69653 100644 --- a/Assets/GAME/ScriptableObjects/Audio/NewPlaylist.asset +++ b/Assets/GAME/ScriptableObjects/Audio/NewPlaylist.asset @@ -13,11 +13,6 @@ MonoBehaviour: m_Name: NewPlaylist m_EditorClassIdentifier: Assembly-CSharp::MusicPlaylist tracks: - - {fileID: 8300000, guid: c65436c94dfbf3445a2b806efd9505c2, type: 3} - - {fileID: 8300000, guid: bb089ef8b7ee26b459d43d52977ce19d, type: 3} - - {fileID: 8300000, guid: e03412f27548c1f4990b2feec47b3896, type: 3} - - {fileID: 8300000, guid: d4dadd67abcfb06459e953c3165cb8c6, type: 3} - - {fileID: 8300000, guid: fcd7efd193d34924dbad47b567b5332a, type: 3} - {fileID: 8300000, guid: 692e36d0b8b019344b6f7a28c60cd142, type: 3} - {fileID: 8300000, guid: 5023a6e13bbeb2c4ea50921d253d99e8, type: 3} - {fileID: 8300000, guid: a9d930c465e94fc4a8548f0aa1960893, type: 3} @@ -28,14 +23,6 @@ MonoBehaviour: - {fileID: 8300000, guid: c7cea3c5c612c134c8ec98d4e58b7ac6, type: 3} - {fileID: 8300000, guid: 23de3eaa1aba8b34eb631ca4dc3e51c1, type: 3} - {fileID: 8300000, guid: b3ea4d2aa8d764b469047c29dc9097a8, type: 3} - - {fileID: 8300000, guid: e6ffa39f49463d740805c8e20f915589, type: 3} - - {fileID: 8300000, guid: 9614152dbb195744cbcfe3797b531632, type: 3} - - {fileID: 8300000, guid: 0517edb404500554cbe2983b4750b811, type: 3} - - {fileID: 8300000, guid: 43eb46487a7708d4ba73ea18c40c6816, type: 3} - - {fileID: 8300000, guid: d27a84af3cb3ad941bd1dbdaca1a4042, type: 3} - - {fileID: 8300000, guid: 0016bca9d91d3cc4f86ee3e2adc95f83, type: 3} - - {fileID: 8300000, guid: f3cd986760cd77d42930d0507850fbe8, type: 3} - - {fileID: 8300000, guid: 9ae50ed6d76b9a64186121cf553113f1, type: 3} - {fileID: 8300000, guid: 077c2b6de58d0964884f7b8d46b15f7c, type: 3} - {fileID: 8300000, guid: 4f43252a7219d7c40852fd096f07ecc4, type: 3} - {fileID: 8300000, guid: ed8784121c5796a4fb11c695db0bcae1, type: 3}