Merge branch 'main' into diving-outrocinematic

This commit is contained in:
journaliciouz
2025-10-16 22:26:04 +02:00
91 changed files with 4083 additions and 718 deletions

View File

@@ -30,7 +30,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7090108953567368886}
- {fileID: 4689617562113187593}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5327225408302228741
@@ -45,8 +45,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 360f320f4d7a48e38f5fd7cdfa28144a, type: 3}
m_Name:
m_EditorClassIdentifier:
loadingScreen: {fileID: 3391437592962192360}
--- !u!1001 &6967569849783118800
--- !u!1001 &4881964705042195055
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
@@ -138,32 +137,13 @@ PrefabInstance:
propertyPath: m_Name
value: LoadingScreen
objectReference: {fileID: 0}
- target: {fileID: 4869161796575291839, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5737877680156686392, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
propertyPath: minimumDisplayTime
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
--- !u!114 &3391437592962192360 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5737877680156686392, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
m_PrefabInstance: {fileID: 6967569849783118800}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1494b10574e74acd880f9101b4248239, type: 3}
m_Name:
m_EditorClassIdentifier: AppleHillsScripts::UI.LoadingScreenController
--- !u!224 &7090108953567368886 stripped
--- !u!224 &4689617562113187593 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 204042265062571366, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
m_PrefabInstance: {fileID: 6967569849783118800}
m_PrefabInstance: {fileID: 4881964705042195055}
m_PrefabAsset: {fileID: 0}