diff --git a/Assets/Meshes/Terrain/Terrain_Land01_village.asset b/Assets/Meshes/Terrain/Terrain_Land01_village.asset index 9fa4b83b3..c9027906e 100644 Binary files a/Assets/Meshes/Terrain/Terrain_Land01_village.asset and b/Assets/Meshes/Terrain/Terrain_Land01_village.asset differ diff --git a/Assets/Prefabs/Environments/Nature/GreenEgg.prefab b/Assets/Prefabs/Environments/Nature/GreenEgg.prefab index 273a40cc9..469846ca3 100644 --- a/Assets/Prefabs/Environments/Nature/GreenEgg.prefab +++ b/Assets/Prefabs/Environments/Nature/GreenEgg.prefab @@ -30519,7 +30519,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0.6176824, y: 0.3441926, z: 0.3441926, w: 0.6176824} m_LocalPosition: {x: 0.41991615, y: 0.32107258, z: 1.3643008} - m_LocalScale: {x: 8, y: 4.6779547, z: 8} + m_LocalScale: {x: 6.58576, y: 3.850986, z: 6.58576} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4944508980274447850} @@ -30574,7 +30574,7 @@ MonoBehaviour: m_IsGlobal: 0 priority: 3 blendDistance: 5.49 - weight: 0.899 + weight: 0.743 sharedProfile: {fileID: 11400000, guid: f282b232d2a8b1e48bfd456ba129af71, type: 2} --- !u!1 &7676145511433927241 GameObject: diff --git a/Assets/Scenes/Land_01/Land_01/Land_012Ok 1.asset b/Assets/Scenes/Land_01/Land_01/Land_012Ok 1.asset index 2aface869..3a7d9c8f0 100644 --- a/Assets/Scenes/Land_01/Land_01/Land_012Ok 1.asset +++ b/Assets/Scenes/Land_01/Land_01/Land_012Ok 1.asset @@ -477,10 +477,10 @@ MonoBehaviour: active: 1 postExposure: m_OverrideState: 1 - m_Value: 1.18 + m_Value: 1.1 contrast: m_OverrideState: 1 - m_Value: 20 + m_Value: 26.5 colorFilter: m_OverrideState: 1 m_Value: {r: 1, g: 1, b: 1, a: 1} @@ -505,7 +505,7 @@ MonoBehaviour: active: 1 shadows: m_OverrideState: 1 - m_Value: {x: 0.94859684, y: 0.9696311, z: 1, w: 0.064948425} + m_Value: {x: 0.94859684, y: 0.9696311, z: 1, w: 0.0035987287} midtones: m_OverrideState: 1 m_Value: {x: 1, y: 0.9743214, z: 0.95878255, w: -0.10620759} diff --git a/Assets/Scenes/Land_01/Land_of_Death_River1_Valley02.unity b/Assets/Scenes/Land_01/Land_of_Death_River1_Valley02.unity index b762638a6..e4564240e 100644 --- a/Assets/Scenes/Land_01/Land_of_Death_River1_Valley02.unity +++ b/Assets/Scenes/Land_01/Land_of_Death_River1_Valley02.unity @@ -4186,7 +4186,7 @@ PrefabInstance: - target: {fileID: 1177601340121348818, guid: b64493b656965604b9e7eb94f190ee24, type: 3} propertyPath: m_LocalPosition.y - value: 39.07 + value: 38.399 objectReference: {fileID: 0} - target: {fileID: 1177601340121348818, guid: b64493b656965604b9e7eb94f190ee24, type: 3} @@ -6869,7 +6869,7 @@ PrefabInstance: type: 3} propertyPath: m_prefab value: - objectReference: {fileID: 7479598640678843761, guid: 1f3424d248237724ba9b7ca0e29cd1a9, + objectReference: {fileID: 2630972141247152421, guid: 23fbd3dee7be3884884891f6396507cf, type: 3} - target: {fileID: 5278190478906961763, guid: dbf14178717e1164086bd444126f4446, type: 3} @@ -12503,94 +12503,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b2b70fedf993c12469ae1554983e5841, type: 3} ---- !u!1001 &91580586 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1417546807} - m_Modifications: - - target: {fileID: 2540626768985676435, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - propertyPath: m_Name - value: Decal_poison (2) - objectReference: {fileID: 0} - - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - propertyPath: m_RootOrder - value: 44 - objectReference: {fileID: 0} - - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - propertyPath: m_LocalScale.x - value: 4.666175 - objectReference: {fileID: 0} - - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - propertyPath: m_LocalScale.y - value: 0.9757126 - objectReference: {fileID: 0} - - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - propertyPath: m_LocalScale.z - value: 4.6661754 - objectReference: {fileID: 0} - - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - propertyPath: m_LocalPosition.x - value: -43.50502 - objectReference: {fileID: 0} - - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - propertyPath: m_LocalPosition.y - value: 40.262993 - objectReference: {fileID: 0} - - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - propertyPath: m_LocalPosition.z - value: -20.669682 - objectReference: {fileID: 0} - - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.80392027 - objectReference: {fileID: 0} - - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - propertyPath: m_LocalRotation.x - value: -0.002398014 - objectReference: {fileID: 0} - - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.59401995 - objectReference: {fileID: 0} - - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - propertyPath: m_LocalRotation.z - value: 0.02910119 - objectReference: {fileID: 0} - - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 85.711 - objectReference: {fileID: 0} - - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 38.297 - objectReference: {fileID: 0} - - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 40.868 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 24b4e22eae3cdd44682bdc50832a3605, type: 3} --- !u!1 &92244449 GameObject: m_ObjectHideFlags: 0 @@ -23663,115 +23575,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1023324000239602924} m_PrefabAsset: {fileID: 0} ---- !u!1001 &172192401 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1772018477} - m_Modifications: - - target: {fileID: 3025423361018253935, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, - type: 3} - propertyPath: m_LocalScale.x - value: 0.77903 - objectReference: {fileID: 0} - - target: {fileID: 3025423361018253935, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, - type: 3} - propertyPath: m_LocalScale.y - value: 0.77903 - objectReference: {fileID: 0} - - target: {fileID: 3025423361018253935, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, - type: 3} - propertyPath: m_LocalScale.z - value: 0.77903 - objectReference: {fileID: 0} - - target: {fileID: 3025423361018253935, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, - type: 3} - propertyPath: m_LocalPosition.x - value: -1.294 - objectReference: {fileID: 0} - - target: {fileID: 3025423361018253935, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.109 - objectReference: {fileID: 0} - - target: {fileID: 3025423361018253935, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.782 - objectReference: {fileID: 0} - - target: {fileID: 3729385275159174759, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, - type: 3} - propertyPath: m_Name - value: Rock5 (2) - objectReference: {fileID: 0} - - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, - type: 3} - propertyPath: m_RootOrder - value: 87 - objectReference: {fileID: 0} - - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, - type: 3} - propertyPath: m_LocalPosition.x - value: 5.254 - objectReference: {fileID: 0} - - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, - type: 3} - propertyPath: m_LocalPosition.y - value: 39.348 - objectReference: {fileID: 0} - - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, - type: 3} - propertyPath: m_LocalPosition.z - value: -34.318 - objectReference: {fileID: 0} - - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.6058212 - objectReference: {fileID: 0} - - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, - type: 3} - propertyPath: m_LocalRotation.x - value: 0.0000000493504 - objectReference: {fileID: 0} - - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.79560083 - objectReference: {fileID: 0} - - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, - type: 3} - propertyPath: m_LocalRotation.z - value: 0.000000064809925 - objectReference: {fileID: 0} - - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 105.424 - objectReference: {fileID: 0} - - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} ---- !u!4 &172192402 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, - type: 3} - m_PrefabInstance: {fileID: 172192401} - m_PrefabAsset: {fileID: 0} --- !u!1001 &172562274 PrefabInstance: m_ObjectHideFlags: 0 @@ -24305,7 +24108,7 @@ PrefabInstance: type: 3} propertyPath: m_prefab value: - objectReference: {fileID: 5963552318248859825, guid: f46fb9cb75148f84c80b7bb847f8117a, + objectReference: {fileID: 2630972141247152421, guid: 23fbd3dee7be3884884891f6396507cf, type: 3} - target: {fileID: 5278190478906961763, guid: dbf14178717e1164086bd444126f4446, type: 3} @@ -30574,6 +30377,11 @@ PrefabInstance: propertyPath: m_onDestroy.m_PersistentCalls.m_Calls.Array.data[6].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 7960253313066402878, guid: e0402218295b495438786c5ee96c208d, + type: 3} + propertyPath: weight + value: 0.532 + objectReference: {fileID: 0} - target: {fileID: 8538364527326545888, guid: e0402218295b495438786c5ee96c208d, type: 3} propertyPath: m_Name @@ -39636,6 +39444,11 @@ PrefabInstance: propertyPath: m_Name value: Wood_Element1 (7) objectReference: {fileID: 0} + - target: {fileID: 5806634706403905305, guid: c9e27421d89b7b74d9d9be5e2845122b, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6619903516781090211, guid: c9e27421d89b7b74d9d9be5e2845122b, type: 3} propertyPath: m_RootOrder @@ -39659,17 +39472,17 @@ PrefabInstance: - target: {fileID: 6619903516781090211, guid: c9e27421d89b7b74d9d9be5e2845122b, type: 3} propertyPath: m_LocalPosition.x - value: 10.625004 + value: 10.628 objectReference: {fileID: 0} - target: {fileID: 6619903516781090211, guid: c9e27421d89b7b74d9d9be5e2845122b, type: 3} propertyPath: m_LocalPosition.y - value: 38.568 + value: 38.631 objectReference: {fileID: 0} - target: {fileID: 6619903516781090211, guid: c9e27421d89b7b74d9d9be5e2845122b, type: 3} propertyPath: m_LocalPosition.z - value: -37.60201 + value: -37.605 objectReference: {fileID: 0} - target: {fileID: 6619903516781090211, guid: c9e27421d89b7b74d9d9be5e2845122b, type: 3} @@ -39707,9 +39520,14 @@ PrefabInstance: value: -3.917 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] + m_RemovedGameObjects: + - {fileID: 7726217996659579571, guid: c9e27421d89b7b74d9d9be5e2845122b, type: 3} m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1433047083084476401, guid: c9e27421d89b7b74d9d9be5e2845122b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1538498412} m_SourcePrefab: {fileID: 100100000, guid: c9e27421d89b7b74d9d9be5e2845122b, type: 3} --- !u!1001 &291435874 PrefabInstance: @@ -48525,7 +48343,7 @@ PrefabInstance: - target: {fileID: 5278190478906961760, guid: dbf14178717e1164086bd444126f4446, type: 3} propertyPath: m_LocalPosition.x - value: -76.2 + value: -75.43 objectReference: {fileID: 0} - target: {fileID: 5278190478906961760, guid: dbf14178717e1164086bd444126f4446, type: 3} @@ -48535,7 +48353,7 @@ PrefabInstance: - target: {fileID: 5278190478906961760, guid: dbf14178717e1164086bd444126f4446, type: 3} propertyPath: m_LocalPosition.z - value: 20.15 + value: 18.52 objectReference: {fileID: 0} - target: {fileID: 5278190478906961760, guid: dbf14178717e1164086bd444126f4446, type: 3} @@ -52783,7 +52601,7 @@ PrefabInstance: - target: {fileID: 5278190478906961760, guid: dbf14178717e1164086bd444126f4446, type: 3} propertyPath: m_LocalPosition.x - value: -70.394 + value: -73.95 objectReference: {fileID: 0} - target: {fileID: 5278190478906961760, guid: dbf14178717e1164086bd444126f4446, type: 3} @@ -52793,7 +52611,7 @@ PrefabInstance: - target: {fileID: 5278190478906961760, guid: dbf14178717e1164086bd444126f4446, type: 3} propertyPath: m_LocalPosition.z - value: -10.686 + value: -12.3 objectReference: {fileID: 0} - target: {fileID: 5278190478906961760, guid: dbf14178717e1164086bd444126f4446, type: 3} @@ -61469,12 +61287,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 467108971} m_PrefabAsset: {fileID: 0} ---- !u!4 &467822546 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - m_PrefabInstance: {fileID: 91580586} - m_PrefabAsset: {fileID: 0} --- !u!1001 &468657215 PrefabInstance: m_ObjectHideFlags: 0 @@ -86501,6 +86313,39 @@ Transform: type: 3} m_PrefabInstance: {fileID: 587190324} m_PrefabAsset: {fileID: 0} +--- !u!21 &588704354 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Height Fog Global + m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3002 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _HeightFogGlobal: 1 + - _IsHeightFogShader: 1 + - _IsStandardPipeline: 0 + - _TITLE: 1 + - _TransparentQueue: 3000 + m_Colors: [] + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!1001 &588971889 PrefabInstance: m_ObjectHideFlags: 0 @@ -107366,7 +107211,7 @@ PrefabInstance: - target: {fileID: 5278190478906961760, guid: dbf14178717e1164086bd444126f4446, type: 3} propertyPath: m_LocalPosition.x - value: -67.897 + value: -69.3 objectReference: {fileID: 0} - target: {fileID: 5278190478906961760, guid: dbf14178717e1164086bd444126f4446, type: 3} @@ -107376,7 +107221,7 @@ PrefabInstance: - target: {fileID: 5278190478906961760, guid: dbf14178717e1164086bd444126f4446, type: 3} propertyPath: m_LocalPosition.z - value: -6.238 + value: -7.1 objectReference: {fileID: 0} - target: {fileID: 5278190478906961760, guid: dbf14178717e1164086bd444126f4446, type: 3} @@ -109552,6 +109397,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 31.084 objectReference: {fileID: 0} + - target: {fileID: 8218090407829835384, guid: 9414801c66e87d040869cdecc1364808, + type: 3} + propertyPath: m_LODs.Array.data[0].screenRelativeHeight + value: 0.33315232 + objectReference: {fileID: 0} + - target: {fileID: 8218090407829835384, guid: 9414801c66e87d040869cdecc1364808, + type: 3} + propertyPath: m_LODs.Array.data[1].screenRelativeHeight + value: 0.11152204 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -114362,6 +114217,100 @@ Transform: type: 3} m_PrefabInstance: {fileID: 752227738} m_PrefabAsset: {fileID: 0} +--- !u!1001 &752852957 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1240060777} + m_Modifications: + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_RootOrder + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalScale.x + value: 2.5556 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalScale.y + value: 1.6175419 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalScale.z + value: 2.5556002 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalPosition.x + value: 17.25 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalPosition.y + value: 43.26 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalPosition.z + value: -39.83 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.6338567 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.11468164 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.3444807 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.68293995 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -18.974 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 38.861 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 87.522 + objectReference: {fileID: 0} + - target: {fileID: 3065803138502786464, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_Name + value: Wood_012 (6) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a63e2d74e7c10e541b3edf048c24e88b, type: 3} +--- !u!4 &752852958 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + m_PrefabInstance: {fileID: 752852957} + m_PrefabAsset: {fileID: 0} --- !u!1001 &752985018 PrefabInstance: m_ObjectHideFlags: 0 @@ -124449,17 +124398,17 @@ PrefabInstance: - target: {fileID: 1177601340121348818, guid: b64493b656965604b9e7eb94f190ee24, type: 3} propertyPath: m_LocalScale.x - value: 0.63467675 + value: 0.6514957 objectReference: {fileID: 0} - target: {fileID: 1177601340121348818, guid: b64493b656965604b9e7eb94f190ee24, type: 3} propertyPath: m_LocalScale.y - value: 0.63467675 + value: 0.6514957 objectReference: {fileID: 0} - target: {fileID: 1177601340121348818, guid: b64493b656965604b9e7eb94f190ee24, type: 3} propertyPath: m_LocalScale.z - value: 0.63467675 + value: 0.6514957 objectReference: {fileID: 0} - target: {fileID: 1177601340121348818, guid: b64493b656965604b9e7eb94f190ee24, type: 3} @@ -131559,6 +131508,100 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 93df9ac68a065764891ad55f590b4104, type: 3} +--- !u!1001 &887999315 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1240060777} + m_Modifications: + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_RootOrder + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalScale.x + value: 2.5556 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalScale.y + value: 1.6175419 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalScale.z + value: 2.5556002 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalPosition.x + value: 15.69 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalPosition.y + value: 43.22 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalPosition.z + value: -41.82 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.6338567 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.11468164 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.3444807 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.68293995 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -18.974 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 38.861 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 87.522 + objectReference: {fileID: 0} + - target: {fileID: 3065803138502786464, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_Name + value: Wood_012 (9) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a63e2d74e7c10e541b3edf048c24e88b, type: 3} +--- !u!4 &887999316 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + m_PrefabInstance: {fileID: 887999315} + m_PrefabAsset: {fileID: 0} --- !u!1001 &888542285 PrefabInstance: m_ObjectHideFlags: 0 @@ -136125,7 +136168,7 @@ Light: m_Enabled: 1 serializedVersion: 11 m_Type: 0 - m_Color: {r: 0.67058825, g: 0.3569424, b: 0.20392156, a: 1} + m_Color: {r: 0.6132076, g: 0.31299642, b: 0.09545213, a: 1} m_Intensity: 29.8 m_Range: 10 m_SpotAngle: 144.41061 @@ -140920,89 +140963,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 962082849} m_PrefabAsset: {fileID: 0} ---- !u!1001 &962269306 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2390633670769597160, guid: 4c366fbd8a4a92c4085521fe26428416, - type: 3} - propertyPath: m_LocalScale.x - value: 7.934632 - objectReference: {fileID: 0} - - target: {fileID: 2390633670769597160, guid: 4c366fbd8a4a92c4085521fe26428416, - type: 3} - propertyPath: m_LocalScale.y - value: 0.659972 - objectReference: {fileID: 0} - - target: {fileID: 2390633670769597160, guid: 4c366fbd8a4a92c4085521fe26428416, - type: 3} - propertyPath: m_LocalScale.z - value: 7.9346285 - objectReference: {fileID: 0} - - target: {fileID: 2390633670769597160, guid: 4c366fbd8a4a92c4085521fe26428416, - type: 3} - propertyPath: m_LocalPosition.x - value: 4.102 - objectReference: {fileID: 0} - - target: {fileID: 2390633670769597160, guid: 4c366fbd8a4a92c4085521fe26428416, - type: 3} - propertyPath: m_LocalPosition.y - value: 39.387 - objectReference: {fileID: 0} - - target: {fileID: 2390633670769597160, guid: 4c366fbd8a4a92c4085521fe26428416, - type: 3} - propertyPath: m_LocalPosition.z - value: -32.405 - objectReference: {fileID: 0} - - target: {fileID: 2390633670769597160, guid: 4c366fbd8a4a92c4085521fe26428416, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.9991327 - objectReference: {fileID: 0} - - target: {fileID: 2390633670769597160, guid: 4c366fbd8a4a92c4085521fe26428416, - type: 3} - propertyPath: m_LocalRotation.x - value: -0.027399234 - objectReference: {fileID: 0} - - target: {fileID: 2390633670769597160, guid: 4c366fbd8a4a92c4085521fe26428416, - type: 3} - propertyPath: m_LocalRotation.y - value: -0.030244641 - objectReference: {fileID: 0} - - target: {fileID: 2390633670769597160, guid: 4c366fbd8a4a92c4085521fe26428416, - type: 3} - propertyPath: m_LocalRotation.z - value: -0.008270382 - objectReference: {fileID: 0} - - target: {fileID: 2390633670769597160, guid: 4c366fbd8a4a92c4085521fe26428416, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -3.167 - objectReference: {fileID: 0} - - target: {fileID: 2390633670769597160, guid: 4c366fbd8a4a92c4085521fe26428416, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -3.444 - objectReference: {fileID: 0} - - target: {fileID: 2390633670769597160, guid: 4c366fbd8a4a92c4085521fe26428416, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -0.853 - objectReference: {fileID: 0} - - target: {fileID: 8381830434338937929, guid: 4c366fbd8a4a92c4085521fe26428416, - type: 3} - propertyPath: m_Name - value: Decal_Pine_forestQuad (4) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4c366fbd8a4a92c4085521fe26428416, type: 3} --- !u!1001 &963760622 PrefabInstance: m_ObjectHideFlags: 0 @@ -177412,6 +177372,7 @@ Transform: - {fileID: 219226116} - {fileID: 427490603} - {fileID: 407542271} + - {fileID: 1977345278} - {fileID: 72264822} - {fileID: 2054817625} - {fileID: 2011405286} @@ -177421,6 +177382,8 @@ Transform: - {fileID: 844227865} - {fileID: 1190142014} - {fileID: 415260373} + - {fileID: 752852958} + - {fileID: 887999316} - {fileID: 1291806354} - {fileID: 139764964} - {fileID: 2037188399} @@ -177794,6 +177757,171 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cca74970622327a489f2273db8862c0e, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!43 &1244003988 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 9.72, z: 13.65} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 768 + _typelessdata: 000020c11f851bc166665a41000000800000803f000000800000803f0000803f000020411f851bc166665a41000000800000803f00000080000000000000803f000020411f851bc166665ac1000000800000803f000000800000000000000000000020c11f851bc166665ac1000000800000803f000000800000803f00000000000020c11f851b4166665ac10000803f00000080000000800000803f0000803f000020c11f851b4166665a410000803f0000008000000080000000000000803f000020c11f851bc166665a410000803f00000080000000800000000000000000000020c11f851bc166665ac10000803f00000080000000800000803f00000000000020c11f851b4166665a410000008000000080000080bf0000803f0000803f000020411f851b4166665a410000008000000080000080bf000000000000803f000020411f851bc166665a410000008000000080000080bf0000000000000000000020c11f851bc166665a410000008000000080000080bf0000803f00000000000020411f851b4166665ac100000080000000800000803f0000803f0000803f000020c11f851b4166665ac100000080000000800000803f000000000000803f000020c11f851bc166665ac100000080000000800000803f0000000000000000000020411f851bc166665ac100000080000000800000803f0000803f00000000000020411f851b4166665a41000080bf00000080000000800000803f0000803f000020411f851b4166665ac1000080bf0000008000000080000000000000803f000020411f851bc166665ac1000080bf00000080000000800000000000000000000020411f851bc166665a41000080bf00000080000000800000803f00000000000020c11f851b4166665ac100000080000080bf000000800000803f0000803f000020411f851b4166665ac100000080000080bf00000080000000000000803f000020411f851b4166665a4100000080000080bf000000800000000000000000000020c11f851b4166665a4100000080000080bf000000800000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 9.72, z: 13.65} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1001 &1244316040 PrefabInstance: m_ObjectHideFlags: 0 @@ -194976,70 +195104,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 539417832} m_PrefabAsset: {fileID: 0} ---- !u!21 &1393047223 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Override - m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - _DIRECTIONALL: 1 - - _DirectionalFalloff: 2 - - _DirectionalIntensity: 1 - - _DirectionalMode: 1 - - _FOGG: 1 - - _FogAxisMode: 1 - - _FogColorDuo: 1 - - _FogDistanceEnd: 200 - - _FogDistanceFalloff: 2 - - _FogDistanceStart: -200 - - _FogHeightEnd: 200 - - _FogHeightFalloff: 2 - - _FogHeightStart: 0 - - _FogIntensity: 1 - - _FogLayersMode: 0 - - _IsHeightFogPreset: 1 - - _IsHeightFogShader: 1 - - _IsStandardPipeline: 0 - - _NOISEE: 1 - - _NoiseDistanceEnd: 50 - - _NoiseIntensity: 1 - - _NoiseMode: 2 - - _NoiseModeBlend: 1 - - _NoiseScale: 30 - - _SKYBOXX: 1 - - _SkyboxFogFalloff: 1 - - _SkyboxFogFill: 1 - - _SkyboxFogHeight: 1 - - _SkyboxFogIntensity: 1 - - _TITLE: 1 - m_Colors: - - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1} - - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0} - - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0} - - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1} - - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1} - - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1001 &1393251706 PrefabInstance: m_ObjectHideFlags: 0 @@ -195223,6 +195287,171 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1023324000510186130} m_PrefabAsset: {fileID: 0} +--- !u!43 &1394192170 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 10, z: 9} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 768 + _typelessdata: 000020c1000020c100001041000000800000803f000000800000803f0000803f00002041000020c100001041000000800000803f00000080000000000000803f00002041000020c1000010c1000000800000803f000000800000000000000000000020c1000020c1000010c1000000800000803f000000800000803f00000000000020c100002041000010c10000803f00000080000000800000803f0000803f000020c100002041000010410000803f0000008000000080000000000000803f000020c1000020c1000010410000803f00000080000000800000000000000000000020c1000020c1000010c10000803f00000080000000800000803f00000000000020c100002041000010410000008000000080000080bf0000803f0000803f0000204100002041000010410000008000000080000080bf000000000000803f00002041000020c1000010410000008000000080000080bf0000000000000000000020c1000020c1000010410000008000000080000080bf0000803f000000000000204100002041000010c100000080000000800000803f0000803f0000803f000020c100002041000010c100000080000000800000803f000000000000803f000020c1000020c1000010c100000080000000800000803f000000000000000000002041000020c1000010c100000080000000800000803f0000803f00000000000020410000204100001041000080bf00000080000000800000803f0000803f0000204100002041000010c1000080bf0000008000000080000000000000803f00002041000020c1000010c1000080bf0000008000000080000000000000000000002041000020c100001041000080bf00000080000000800000803f00000000000020c100002041000010c100000080000080bf000000800000803f0000803f0000204100002041000010c100000080000080bf00000080000000000000803f00002041000020410000104100000080000080bf000000800000000000000000000020c1000020410000104100000080000080bf000000800000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 10, z: 9} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1001 &1394201867 PrefabInstance: m_ObjectHideFlags: 0 @@ -197374,7 +197603,6 @@ Transform: - {fileID: 678498779} - {fileID: 165023857} - {fileID: 186179977} - - {fileID: 467822546} - {fileID: 123610059} - {fileID: 1410954675} - {fileID: 356848435} @@ -197390,7 +197618,6 @@ Transform: - {fileID: 1764129115} - {fileID: 674050792} - {fileID: 1923897829} - - {fileID: 1624309471} - {fileID: 165185356} - {fileID: 1475863588} - {fileID: 1026256511} @@ -212667,6 +212894,34 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1538392951} m_PrefabAsset: {fileID: 0} +--- !u!1 &1538498408 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1433047083084476401, guid: c9e27421d89b7b74d9d9be5e2845122b, + type: 3} + m_PrefabInstance: {fileID: 290170045} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1538498412 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1538498408} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: -4418436678396203463, guid: 040637dc80b9e134facbd3dae38502bf, type: 3} --- !u!1001 &1539185607 PrefabInstance: m_ObjectHideFlags: 0 @@ -215174,39 +215429,6 @@ MonoBehaviour: _disableOnStart: 0 _useDistanceFade: 0 _fadeRange: 5 ---- !u!21 &1558724173 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Height Fog Global - m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3002 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - _HeightFogGlobal: 1 - - _IsHeightFogShader: 1 - - _IsStandardPipeline: 0 - - _TITLE: 1 - - _TransparentQueue: 3000 - m_Colors: [] - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1001 &1558765221 PrefabInstance: m_ObjectHideFlags: 0 @@ -219222,7 +219444,7 @@ PrefabInstance: - target: {fileID: 4944508980274447850, guid: e0402218295b495438786c5ee96c208d, type: 3} propertyPath: m_LocalPosition.x - value: -67.39 + value: -63.127 objectReference: {fileID: 0} - target: {fileID: 4944508980274447850, guid: e0402218295b495438786c5ee96c208d, type: 3} @@ -219232,7 +219454,7 @@ PrefabInstance: - target: {fileID: 4944508980274447850, guid: e0402218295b495438786c5ee96c208d, type: 3} propertyPath: m_LocalPosition.z - value: -7.03 + value: -6.881 objectReference: {fileID: 0} - target: {fileID: 4944508980274447850, guid: e0402218295b495438786c5ee96c208d, type: 3} @@ -222900,12 +223122,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 988219952} m_PrefabAsset: {fileID: 0} ---- !u!4 &1624309471 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8125406853110145922, guid: 232547a1ab55be542899e60c13f6f60d, - type: 3} - m_PrefabInstance: {fileID: 1616431598774705371} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1624326416 PrefabInstance: m_ObjectHideFlags: 0 @@ -297882,7 +298098,6 @@ Transform: - {fileID: 1376641764} - {fileID: 1011597466} - {fileID: 3112342770459379120} - - {fileID: 172192402} - {fileID: 609690953} - {fileID: 305771002} - {fileID: 1126630005} @@ -298159,32 +298374,32 @@ PrefabInstance: - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, type: 3} propertyPath: m_LocalScale.x - value: 2.5555997 + value: 2.8267486 objectReference: {fileID: 0} - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, type: 3} propertyPath: m_LocalScale.y - value: 2.5555995 + value: 2.8267484 objectReference: {fileID: 0} - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, type: 3} propertyPath: m_LocalScale.z - value: 2.5555997 + value: 2.8267486 objectReference: {fileID: 0} - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, type: 3} propertyPath: m_LocalPosition.x - value: 22.050001 + value: 21.95 objectReference: {fileID: 0} - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, type: 3} propertyPath: m_LocalPosition.y - value: 37.523 + value: 37.51 objectReference: {fileID: 0} - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, type: 3} propertyPath: m_LocalPosition.z - value: -48.55 + value: -48.6 objectReference: {fileID: 0} - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, type: 3} @@ -313143,10 +313358,6 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 4244166613272205838, guid: 02b59c5ebf2a67441ac28dcad1988fa4, - type: 3} - insertIndex: -1 - addedObject: {fileID: 7616135941901765259} - targetCorrespondingSourceObject: {fileID: 4244166613272205838, guid: 02b59c5ebf2a67441ac28dcad1988fa4, type: 3} insertIndex: -1 @@ -316276,6 +316487,70 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1913413134} m_PrefabAsset: {fileID: 0} +--- !u!21 &1913433643 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Override + m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _DIRECTIONALL: 1 + - _DirectionalFalloff: 2 + - _DirectionalIntensity: 1 + - _DirectionalMode: 1 + - _FOGG: 1 + - _FogAxisMode: 1 + - _FogColorDuo: 1 + - _FogDistanceEnd: 200 + - _FogDistanceFalloff: 2 + - _FogDistanceStart: -200 + - _FogHeightEnd: 200 + - _FogHeightFalloff: 2 + - _FogHeightStart: 0 + - _FogIntensity: 1 + - _FogLayersMode: 0 + - _IsHeightFogPreset: 1 + - _IsHeightFogShader: 1 + - _IsStandardPipeline: 0 + - _NOISEE: 1 + - _NoiseDistanceEnd: 50 + - _NoiseIntensity: 1 + - _NoiseMode: 2 + - _NoiseModeBlend: 1 + - _NoiseScale: 30 + - _SKYBOXX: 1 + - _SkyboxFogFalloff: 1 + - _SkyboxFogFill: 1 + - _SkyboxFogHeight: 1 + - _SkyboxFogIntensity: 1 + - _TITLE: 1 + m_Colors: + - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1} + - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0} + - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0} + - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1} + - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1} + - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!1001 &1914348936 PrefabInstance: m_ObjectHideFlags: 0 @@ -323752,17 +324027,17 @@ PrefabInstance: - target: {fileID: 6785242412794091529, guid: 919f4c6c61ceb094fb62ea8a2b6e44ba, type: 3} propertyPath: m_LocalPosition.x - value: 14.689999 + value: 14.667 objectReference: {fileID: 0} - target: {fileID: 6785242412794091529, guid: 919f4c6c61ceb094fb62ea8a2b6e44ba, type: 3} propertyPath: m_LocalPosition.y - value: 37.54 + value: 37.032 objectReference: {fileID: 0} - target: {fileID: 6785242412794091529, guid: 919f4c6c61ceb094fb62ea8a2b6e44ba, type: 3} propertyPath: m_LocalPosition.z - value: -39.45999 + value: -39.449 objectReference: {fileID: 0} - target: {fileID: 6785242412794091529, guid: 919f4c6c61ceb094fb62ea8a2b6e44ba, type: 3} @@ -325102,8 +325377,8 @@ Light: m_Enabled: 1 serializedVersion: 11 m_Type: 1 - m_Color: {r: 0.990566, g: 0.84810615, b: 0.75226945, a: 1} - m_Intensity: 2.47 + m_Color: {r: 1, g: 0.8254717, b: 0.7122642, a: 1} + m_Intensity: 2 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 @@ -325283,6 +325558,110 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} +--- !u!1001 &1977345277 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1240060777} + m_Modifications: + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_RootOrder + value: 14 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalScale.x + value: 2.8267486 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalScale.y + value: 2.8267484 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalScale.z + value: 2.8267486 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalPosition.x + value: 21.132 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalPosition.y + value: 36.8 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalPosition.z + value: -43.618 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9944376 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.057563946 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.020204453 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.0858609 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 6.774 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -1.748 + objectReference: {fileID: 0} + - target: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 9.766 + objectReference: {fileID: 0} + - target: {fileID: 2538599480209857048, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3065803138502786464, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_Name + value: Wood_012 (17) + objectReference: {fileID: 0} + - target: {fileID: 4709742621407351620, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a63e2d74e7c10e541b3edf048c24e88b, type: 3} +--- !u!4 &1977345278 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2432008784169412378, guid: a63e2d74e7c10e541b3edf048c24e88b, + type: 3} + m_PrefabInstance: {fileID: 1977345277} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1977861191 PrefabInstance: m_ObjectHideFlags: 0 @@ -327242,7 +327621,7 @@ PrefabInstance: type: 3} propertyPath: m_prefab value: - objectReference: {fileID: 7479598640678843761, guid: 1f3424d248237724ba9b7ca0e29cd1a9, + objectReference: {fileID: 2630972141247152421, guid: 23fbd3dee7be3884884891f6396507cf, type: 3} - target: {fileID: 5278190478906961763, guid: dbf14178717e1164086bd444126f4446, type: 3} @@ -403862,79 +404241,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5200b3e50470f2b429132041250b6210, type: 3} ---- !u!1001 &1616431598774705371 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1417546807} - m_Modifications: - - target: {fileID: 8125406853110145922, guid: 232547a1ab55be542899e60c13f6f60d, - type: 3} - propertyPath: m_RootOrder - value: 64 - objectReference: {fileID: 0} - - target: {fileID: 8125406853110145922, guid: 232547a1ab55be542899e60c13f6f60d, - type: 3} - propertyPath: m_LocalPosition.x - value: -64.95822 - objectReference: {fileID: 0} - - target: {fileID: 8125406853110145922, guid: 232547a1ab55be542899e60c13f6f60d, - type: 3} - propertyPath: m_LocalPosition.y - value: 40.806572 - objectReference: {fileID: 0} - - target: {fileID: 8125406853110145922, guid: 232547a1ab55be542899e60c13f6f60d, - type: 3} - propertyPath: m_LocalPosition.z - value: -4.565386 - objectReference: {fileID: 0} - - target: {fileID: 8125406853110145922, guid: 232547a1ab55be542899e60c13f6f60d, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8125406853110145922, guid: 232547a1ab55be542899e60c13f6f60d, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8125406853110145922, guid: 232547a1ab55be542899e60c13f6f60d, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8125406853110145922, guid: 232547a1ab55be542899e60c13f6f60d, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8125406853110145922, guid: 232547a1ab55be542899e60c13f6f60d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8125406853110145922, guid: 232547a1ab55be542899e60c13f6f60d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8125406853110145922, guid: 232547a1ab55be542899e60c13f6f60d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8125406853110145932, guid: 232547a1ab55be542899e60c13f6f60d, - type: 3} - propertyPath: m_Name - value: Flara_Poison - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 232547a1ab55be542899e60c13f6f60d, type: 3} --- !u!23 &1711813855585486000 MeshRenderer: m_ObjectHideFlags: 0 @@ -420819,7 +421125,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 1558724173} + - {fileID: 588704354} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -420912,7 +421218,7 @@ MonoBehaviour: manualPositionAndScale: 0 renderPriority: 2 styledSpace0: 0 - overrideMaterial: {fileID: 1393047223} + overrideMaterial: {fileID: 1913433643} overrideCamToVolumeDistance: Infinity overrideVolumeDistanceFade: 0 version: 180 @@ -437395,100 +437701,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7558998862282593155} m_PrefabAsset: {fileID: 0} ---- !u!1001 &7616135941901765258 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1117302759} - m_Modifications: - - target: {fileID: 2540626768985676435, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - propertyPath: m_Name - value: Decal_poison - objectReference: {fileID: 0} - - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - propertyPath: m_LocalScale.x - value: 4.205703 - objectReference: {fileID: 0} - - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - propertyPath: m_LocalScale.y - value: 0.70886153 - objectReference: {fileID: 0} - - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - propertyPath: m_LocalScale.z - value: 4.205703 - objectReference: {fileID: 0} - - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - propertyPath: m_LocalPosition.x - value: -10.252 - objectReference: {fileID: 0} - - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - propertyPath: m_LocalPosition.y - value: 11.463 - objectReference: {fileID: 0} - - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - propertyPath: m_LocalPosition.z - value: -0.467 - objectReference: {fileID: 0} - - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - propertyPath: m_LocalRotation.x - value: 0.70710677 - objectReference: {fileID: 0} - - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - propertyPath: m_LocalRotation.y - value: -0.000000029802322 - objectReference: {fileID: 0} - - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - propertyPath: m_LocalRotation.z - value: -0.000000059604645 - objectReference: {fileID: 0} - - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 24b4e22eae3cdd44682bdc50832a3605, type: 3} ---- !u!4 &7616135941901765259 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, - type: 3} - m_PrefabInstance: {fileID: 7616135941901765258} - m_PrefabAsset: {fileID: 0} --- !u!1001 &8169468482313081077 PrefabInstance: m_ObjectHideFlags: 0 @@ -438696,7 +438908,6 @@ SceneRoots: - {fileID: 1501827169} - {fileID: 845533075} - {fileID: 138949244} - - {fileID: 962269306} - {fileID: 1493087139} - {fileID: 717939344} - {fileID: 567684731} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index fce1c84a8..6ea72e093 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -845,7 +845,7 @@ PlayerSettings: webWasm2023: 0 scriptingDefineSymbols: : UNITY_POST_PROCESSING_STACK_V2 - Android: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT;USE_TIMELINE;USE_NEW_INPUT;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER;TMP_PRESENT;MOBILE_INPUT + Android: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT;USE_TIMELINE;USE_NEW_INPUT;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER;TMP_PRESENT CloudRendering: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER EmbeddedLinux: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER GameCoreScarlett: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER @@ -860,9 +860,9 @@ PlayerSettings: Standalone: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT;INVECTOR_BASIC;INVECTOR_MELEE;TOUCH_REACT;GAIA_2_PRESENT;INVECTOR_AI_TEMPLATE;UPPipeline;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER;URP_OUTLINE;ODIN_INSPECTOR;ODIN_INSPECTOR_3;TMP_PRESENT;USE_TIMELINE;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3 VisionOS: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER WebGL: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER - Windows Store Apps: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER;MOBILE_INPUT + Windows Store Apps: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER XboxOne: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER - iPhone: CROSS_PLATFORM_INPUT;INVECTOR_BASIC;INVECTOR_MELEE;GAIA_2_PRESENT;GAIA_PRO_PRESENT;UPPipeline;UNITY_POST_PROCESSING_STACK_V2;TOUCH_REACT;INVECTOR_AI_TEMPLATE;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER;URP_OUTLINE;ODIN_INSPECTOR;ODIN_INSPECTOR_3;TMP_PRESENT;USE_INVECTOR_INVENTORY;USE_TIMELINE;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;MOBILE_INPUT + iPhone: CROSS_PLATFORM_INPUT;INVECTOR_BASIC;INVECTOR_MELEE;GAIA_2_PRESENT;GAIA_PRO_PRESENT;UPPipeline;UNITY_POST_PROCESSING_STACK_V2;TOUCH_REACT;INVECTOR_AI_TEMPLATE;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER;URP_OUTLINE;ODIN_INSPECTOR;ODIN_INSPECTOR_3;TMP_PRESENT;USE_INVECTOR_INVENTORY;USE_TIMELINE;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3 tvOS: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER additionalCompilerArguments: {} platformArchitecture: {}