diff --git a/Assets/Meshes/Enviroment/Rocks_Bushes_Tree/Decals/Decal1 Crystal.mat b/Assets/Meshes/Enviroment/Rocks_Bushes_Tree/Decals/Decal1 Crystal.mat
index a8a8ff4c5..c6e328e3b 100644
--- a/Assets/Meshes/Enviroment/Rocks_Bushes_Tree/Decals/Decal1 Crystal.mat
+++ b/Assets/Meshes/Enviroment/Rocks_Bushes_Tree/Decals/Decal1 Crystal.mat
@@ -18,7 +18,7 @@ Material:
m_LightmapFlags: 1
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
+ m_CustomRenderQueue: 2000
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
@@ -79,7 +79,7 @@ Material:
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- - _AlphaPow: -0.84
+ - _AlphaPow: 0.53
- _BlendMode: 1
- _BumpScale: 1
- _Cutoff: 0
diff --git a/Assets/Meshes/scroll/scrollMat2D.mat b/Assets/Meshes/scroll/scrollMat2D.mat
index bbf10d1c5..b1fd95ada 100644
--- a/Assets/Meshes/scroll/scrollMat2D.mat
+++ b/Assets/Meshes/scroll/scrollMat2D.mat
@@ -138,7 +138,7 @@ Material:
- _MaxBrightness: 1
- _Metallic: 0
- _MinBrightness: 0
- - _NoiseScale: 1.7677656
+ - _NoiseScale: 1.387197
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueControl: 0
diff --git a/Assets/Prefabs/PlayerWithUI.prefab b/Assets/Prefabs/PlayerWithUI.prefab
index 9a5c646c2..59505beda 100644
--- a/Assets/Prefabs/PlayerWithUI.prefab
+++ b/Assets/Prefabs/PlayerWithUI.prefab
@@ -18456,17 +18456,17 @@ PrefabInstance:
type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
- objectReference: {fileID: 0}
+ objectReference: {fileID: 2100000, guid: c14fba9cc6c5edd4daaa74a8d0e7bf91, type: 2}
- target: {fileID: 4943514361991192492, guid: 60b79e23a507e0c48a94b7e3d5138383,
type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
- objectReference: {fileID: 0}
+ objectReference: {fileID: 2100000, guid: ac8af1ce4e0fca94d93a193521c6a325, type: 2}
- target: {fileID: 4943514361992416284, guid: 60b79e23a507e0c48a94b7e3d5138383,
type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
- objectReference: {fileID: 0}
+ objectReference: {fileID: 2100000, guid: 60dfb41bc8577914f8e54ccdc6ca9d41, type: 2}
- target: {fileID: 4967997804223717256, guid: 60b79e23a507e0c48a94b7e3d5138383,
type: 3}
propertyPath: powersArea
diff --git a/Assets/Prefabs/Spells/Fireball.prefab b/Assets/Prefabs/Spells/Fireball.prefab
index 212ab9fba..c704560ec 100644
--- a/Assets/Prefabs/Spells/Fireball.prefab
+++ b/Assets/Prefabs/Spells/Fireball.prefab
@@ -25,13 +25,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9330975819853216}
+ serializedVersion: 2
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: 11175768914768868}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!108 &118674766096030774
Light:
@@ -41,9 +41,8 @@ Light:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9330975819853216}
m_Enabled: 0
- serializedVersion: 10
+ serializedVersion: 11
m_Type: 2
- m_Shape: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 1
m_Range: 1
@@ -93,8 +92,12 @@ Light:
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_UseViewFrustumForShadowCasterCull: 1
+ m_ForceVisible: 0
m_ShadowRadius: 0
m_ShadowAngle: 0
+ m_LightUnit: 1
+ m_LuxAtDistance: 1
+ m_EnableSpotReflector: 1
--- !u!114 &655082475
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -107,14 +110,17 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Version: 1
+ m_Version: 3
m_UsePipelineSettings: 1
m_AdditionalLightsShadowResolutionTier: 2
m_LightLayerMask: 1
+ m_RenderingLayers: 1
m_CustomShadowLayers: 0
m_ShadowLayerMask: 1
+ m_ShadowRenderingLayers: 1
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
+ m_SoftShadowQuality: 1
--- !u!1 &11175768914930110
GameObject:
m_ObjectHideFlags: 0
@@ -138,6 +144,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 11175768914930110}
+ serializedVersion: 2
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}
@@ -147,7 +154,6 @@ Transform:
- {fileID: 11175768914667188}
- {fileID: 11175768914775456}
m_Father: {fileID: 11175768914742470}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &11175768915000364
GameObject:
@@ -174,13 +180,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 11175768915000364}
+ serializedVersion: 2
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: 11175768914742470}
- m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!198 &11175768934060926
ParticleSystem:
@@ -364,6 +370,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -393,6 +400,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
startSize:
@@ -606,6 +614,7 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 0
randomizeRotationDirection: 0
+ gravitySource: 0
maxNumParticles: 1000
customEmitterVelocity: {x: 0, y: 0, z: 0}
size3D: 0
@@ -1281,6 +1290,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 3
minGradient:
@@ -1310,6 +1320,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
UVModule:
@@ -3476,6 +3487,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -3505,6 +3517,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
range: {x: 0, y: 1}
@@ -3894,6 +3907,7 @@ ParticleSystem:
m_RotationOrder: 4
minVertexDistance: 0.2
textureMode: 0
+ textureScale: {x: 1, y: 1}
ribbonCount: 1
shadowBias: 0.5
worldSpace: 0
@@ -3936,6 +3950,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -3965,6 +3980,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
widthOverTrail:
@@ -4052,6 +4068,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -4081,6 +4098,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
CustomDataModule:
@@ -4119,6 +4137,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -4148,6 +4167,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
colorLabel0: Color
@@ -4401,6 +4421,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -4430,6 +4451,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
colorLabel1: Color
@@ -4667,6 +4689,9 @@ ParticleSystemRenderer:
m_ReflectionProbeUsage: 0
m_RayTracingMode: 0
m_RayTraceProcedural: 0
+ m_RayTracingAccelStructBuildFlagsOverride: 0
+ m_RayTracingAccelStructBuildFlags: 1
+ m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -4705,13 +4730,15 @@ ParticleSystemRenderer:
m_RenderAlignment: 0
m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0}
- m_UseCustomVertexStreams: 0
m_EnableGPUInstancing: 0
m_ApplyActiveColorSpace: 0
m_AllowRoll: 1
m_FreeformStretching: 0
m_RotateWithStretchDirection: 1
+ m_UseCustomVertexStreams: 0
m_VertexStreams: 0001030405
+ m_UseCustomTrailVertexStreams: 0
+ m_TrailVertexStreams: 00010304
m_Mesh: {fileID: 4300000, guid: 8bd3eb0b07deb2d469cd16861e4f37df, type: 3}
m_Mesh1: {fileID: 0}
m_Mesh2: {fileID: 0}
@@ -4746,13 +4773,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 11175768915012606}
+ serializedVersion: 2
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: 11175768914760146}
- m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &11175768914288558
AudioSource:
@@ -4765,6 +4792,7 @@ AudioSource:
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 6632b24a705d37d46863cddc8a84f80a, type: 3}
+ m_Resource: {fileID: 8300000, guid: 6632b24a705d37d46863cddc8a84f80a, type: 3}
m_PlayOnAwake: 1
m_Volume: 0.7
m_Pitch: 1
@@ -4912,6 +4940,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 11175768915021070}
+ serializedVersion: 2
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}
@@ -4924,7 +4953,6 @@ Transform:
- {fileID: 11175768914768868}
- {fileID: 8904350975885219224}
m_Father: {fileID: 11175768914668438}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &122223619685038434
MonoBehaviour:
@@ -4982,6 +5010,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 11175768915034902}
+ serializedVersion: 2
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}
@@ -4989,7 +5018,6 @@ Transform:
m_Children:
- {fileID: 11434463005471570}
m_Father: {fileID: 11175768914742470}
- m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!198 &11175768934169868
ParticleSystem:
@@ -5191,6 +5219,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -5220,6 +5249,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
startSize:
@@ -5469,6 +5499,7 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 0
randomizeRotationDirection: 0
+ gravitySource: 0
maxNumParticles: 1000
customEmitterVelocity: {x: 0, y: 0, z: 0}
size3D: 0
@@ -6180,6 +6211,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 3
minGradient:
@@ -6209,6 +6241,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
UVModule:
@@ -6324,8 +6357,8 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 4
speedRange: {x: 0, y: 1}
- tilesX: 1600
- tilesY: 800
+ tilesX: 511
+ tilesY: 511
animationType: 0
rowIndex: 0
cycles: 1
@@ -8411,6 +8444,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -8440,6 +8474,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
range: {x: 0, y: 1}
@@ -8829,6 +8864,7 @@ ParticleSystem:
m_RotationOrder: 4
minVertexDistance: 0.2
textureMode: 0
+ textureScale: {x: 1, y: 1}
ribbonCount: 1
shadowBias: 0.5
worldSpace: 0
@@ -8871,6 +8907,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -8900,6 +8937,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
widthOverTrail:
@@ -8987,6 +9025,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -9016,6 +9055,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
CustomDataModule:
@@ -9054,6 +9094,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -9083,6 +9124,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
colorLabel0: Color
@@ -9336,6 +9378,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -9365,6 +9408,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
colorLabel1: Color
@@ -9602,6 +9646,9 @@ ParticleSystemRenderer:
m_ReflectionProbeUsage: 0
m_RayTracingMode: 0
m_RayTraceProcedural: 0
+ m_RayTracingAccelStructBuildFlagsOverride: 0
+ m_RayTracingAccelStructBuildFlags: 1
+ m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -9640,13 +9687,15 @@ ParticleSystemRenderer:
m_RenderAlignment: 0
m_Pivot: {x: 0.2, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0}
- m_UseCustomVertexStreams: 0
m_EnableGPUInstancing: 0
m_ApplyActiveColorSpace: 0
m_AllowRoll: 1
m_FreeformStretching: 0
m_RotateWithStretchDirection: 1
+ m_UseCustomVertexStreams: 0
m_VertexStreams: 0001030405
+ m_UseCustomTrailVertexStreams: 0
+ m_TrailVertexStreams: 00010304
m_Mesh: {fileID: 0}
m_Mesh1: {fileID: 0}
m_Mesh2: {fileID: 0}
@@ -9681,13 +9730,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 11175768915086614}
+ serializedVersion: 2
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: 11175768914742470}
- m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!198 &11175768934175404
ParticleSystem:
@@ -9889,6 +9938,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 3
minGradient:
@@ -9918,6 +9968,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
startSize:
@@ -10167,6 +10218,7 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 0
randomizeRotationDirection: 0
+ gravitySource: 0
maxNumParticles: 1000
customEmitterVelocity: {x: 0, y: 0, z: 0}
size3D: 0
@@ -10887,6 +10939,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 3
minGradient:
@@ -10916,6 +10969,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
UVModule:
@@ -13118,6 +13172,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -13147,6 +13202,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
range: {x: 0, y: 1}
@@ -13536,6 +13592,7 @@ ParticleSystem:
m_RotationOrder: 4
minVertexDistance: 0.2
textureMode: 0
+ textureScale: {x: 1, y: 1}
ribbonCount: 1
shadowBias: 0.5
worldSpace: 0
@@ -13578,6 +13635,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -13607,6 +13665,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
widthOverTrail:
@@ -13694,6 +13753,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -13723,6 +13783,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
CustomDataModule:
@@ -13761,6 +13822,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -13790,6 +13852,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
colorLabel0: Color
@@ -14043,6 +14106,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -14072,6 +14136,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
colorLabel1: Color
@@ -14309,6 +14374,9 @@ ParticleSystemRenderer:
m_ReflectionProbeUsage: 0
m_RayTracingMode: 0
m_RayTraceProcedural: 0
+ m_RayTracingAccelStructBuildFlagsOverride: 0
+ m_RayTracingAccelStructBuildFlags: 1
+ m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -14347,13 +14415,15 @@ ParticleSystemRenderer:
m_RenderAlignment: 0
m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0}
- m_UseCustomVertexStreams: 0
m_EnableGPUInstancing: 0
m_ApplyActiveColorSpace: 0
m_AllowRoll: 1
m_FreeformStretching: 0
m_RotateWithStretchDirection: 1
+ m_UseCustomVertexStreams: 0
m_VertexStreams: 0001030405
+ m_UseCustomTrailVertexStreams: 0
+ m_TrailVertexStreams: 00010304
m_Mesh: {fileID: 0}
m_Mesh1: {fileID: 0}
m_Mesh2: {fileID: 0}
@@ -14388,13 +14458,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 11175768915086702}
+ serializedVersion: 2
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: 11175768914760146}
- m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &11175768914324062
AudioSource:
@@ -14407,6 +14477,7 @@ AudioSource:
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 2aadecf546529c642bd505685aa15cbc, type: 3}
+ m_Resource: {fileID: 8300000, guid: 2aadecf546529c642bd505685aa15cbc, type: 3}
m_PlayOnAwake: 1
m_Volume: 0.5
m_Pitch: 1
@@ -14554,13 +14625,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 11175768915103424}
+ serializedVersion: 2
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: 11175768914760146}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &11175768914270154
AudioSource:
@@ -14573,6 +14644,7 @@ AudioSource:
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 70b6e007003158e4fa167f9b0a084a77, type: 3}
+ m_Resource: {fileID: 8300000, guid: 70b6e007003158e4fa167f9b0a084a77, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 0.8
@@ -14683,13 +14755,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 11175768915110542}
+ serializedVersion: 2
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: 11175768914742470}
- m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!198 &11175768934080814
ParticleSystem:
@@ -14891,6 +14963,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -14920,6 +14993,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
startSize:
@@ -15133,6 +15207,7 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 0
randomizeRotationDirection: 0
+ gravitySource: 0
maxNumParticles: 1000
customEmitterVelocity: {x: 0, y: 0, z: 0}
size3D: 0
@@ -15844,6 +15919,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 3
minGradient:
@@ -15873,6 +15949,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
UVModule:
@@ -18075,6 +18152,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -18104,6 +18182,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
range: {x: 0, y: 1}
@@ -18493,6 +18572,7 @@ ParticleSystem:
m_RotationOrder: 4
minVertexDistance: 0.2
textureMode: 0
+ textureScale: {x: 1, y: 1}
ribbonCount: 1
shadowBias: 0.5
worldSpace: 0
@@ -18535,6 +18615,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -18564,6 +18645,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
widthOverTrail:
@@ -18651,6 +18733,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -18680,6 +18763,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
CustomDataModule:
@@ -18718,6 +18802,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -18747,6 +18832,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
colorLabel0: Color
@@ -19000,6 +19086,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -19029,6 +19116,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
colorLabel1: Color
@@ -19266,6 +19354,9 @@ ParticleSystemRenderer:
m_ReflectionProbeUsage: 0
m_RayTracingMode: 0
m_RayTraceProcedural: 0
+ m_RayTracingAccelStructBuildFlagsOverride: 0
+ m_RayTracingAccelStructBuildFlags: 1
+ m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -19304,13 +19395,15 @@ ParticleSystemRenderer:
m_RenderAlignment: 0
m_Pivot: {x: 0.2, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0}
- m_UseCustomVertexStreams: 1
m_EnableGPUInstancing: 0
m_ApplyActiveColorSpace: 0
m_AllowRoll: 1
m_FreeformStretching: 0
m_RotateWithStretchDirection: 1
+ m_UseCustomVertexStreams: 1
m_VertexStreams: 0001030405050809
+ m_UseCustomTrailVertexStreams: 0
+ m_TrailVertexStreams: 00010304
m_Mesh: {fileID: 0}
m_Mesh1: {fileID: 0}
m_Mesh2: {fileID: 0}
@@ -19344,6 +19437,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 11175768915115734}
+ serializedVersion: 2
m_LocalRotation: {x: -0.59636784, y: 0.3799282, z: 0.59636784, w: 0.3799282}
m_LocalPosition: {x: -0.98, y: 1.15, z: -0.01}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -19351,7 +19445,6 @@ Transform:
m_Children:
- {fileID: 11175768914742470}
m_Father: {fileID: 0}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: -115, y: 90, z: 0}
--- !u!114 &125968168626442320
MonoBehaviour:
@@ -19407,6 +19500,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6342057667361283447}
+ serializedVersion: 2
m_LocalRotation: {x: -0.000000014901158, y: -0.000000044703473, z: -0.000000014901158,
w: 1}
m_LocalPosition: {x: -0, y: 0, z: 0}
@@ -19414,7 +19508,6 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 11175768914742470}
- m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &1048820804215292913
MeshFilter:
@@ -19441,6 +19534,9 @@ MeshRenderer:
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
+ m_RayTracingAccelStructBuildFlagsOverride: 0
+ m_RayTracingAccelStructBuildFlags: 1
+ m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -19494,7 +19590,7 @@ MonoBehaviour:
hitReaction: 1
recoil_id: 0
reaction_id: 0
- damageType:
+ damageType: Spark
force: {x: 0, y: 0, z: 0}
overrideDamageSender: {fileID: 0}
layerToCollide:
@@ -19519,8 +19615,17 @@ CapsuleCollider:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6342057667361283447}
m_Material: {fileID: 0}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_LayerOverridePriority: 0
m_IsTrigger: 1
+ m_ProvidesContacts: 0
m_Enabled: 0
+ serializedVersion: 2
m_Radius: 1.6
m_Height: 0
m_Direction: 1
@@ -19532,10 +19637,21 @@ Rigidbody:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6342057667361283447}
- serializedVersion: 2
+ serializedVersion: 4
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
+ m_CenterOfMass: {x: 0, y: 0, z: 0}
+ m_InertiaTensor: {x: 1, y: 1, z: 1}
+ m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ImplicitCom: 1
+ m_ImplicitTensor: 1
m_UseGravity: 0
m_IsKinematic: 1
m_Interpolate: 0
diff --git a/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity b/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity
index 8b39e77fc..d9cee0932 100644
--- a/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity
+++ b/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity
@@ -3089,6 +3089,70 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
+--- !u!21 &13365535
+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!4 &13668954 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5192082777847111434, guid: 4992e6bf97894c548ade38ee1eefb3cb,
@@ -26493,6 +26557,171 @@ Transform:
- {fileID: 830642059}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!43 &83149038
+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: 7.5, y: 7.5, 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: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000
+ 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: 7.5, y: 7.5, 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 &83157821
PrefabInstance:
m_ObjectHideFlags: 0
@@ -65609,70 +65838,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1051614059}
m_PrefabAsset: {fileID: 0}
---- !u!21 &244232111
-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 &244249317
PrefabInstance:
m_ObjectHideFlags: 0
@@ -69921,39 +70086,6 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 1677089648}
m_PrefabAsset: {fileID: 0}
---- !u!21 &264145258
-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 &264553773
PrefabInstance:
m_ObjectHideFlags: 0
@@ -102319,6 +102451,39 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 2015636647}
m_PrefabAsset: {fileID: 0}
+--- !u!21 &399199760
+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 &399398345
PrefabInstance:
m_ObjectHideFlags: 0
@@ -219761,171 +219926,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a88fa99440bef9044a2da20b7b3aac10, type: 3}
---- !u!43 &836239831
-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: 7.5, y: 7.5, 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: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000
- 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: 7.5, y: 7.5, 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 &836455471
PrefabInstance:
m_ObjectHideFlags: 0
@@ -254776,131 +254776,6 @@ MonoBehaviour:
useVisualEffects: 1
useParticleSystems: 1
useAudioSources: 0
---- !u!21 &967471548
-Material:
- serializedVersion: 8
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: FireTrail Fireball (Instance)
- m_Shader: {fileID: 4800000, guid: 18cc8fe7d50c89741b56c1ae6a5baa66, type: 3}
- m_Parent: {fileID: 0}
- m_ModifiedSerializedProperties: 0
- m_ValidKeywords:
- - _BLENDMODE_BLEND
- - _FADING_ON
- - _FLIPBOOK_BLENDING
- m_InvalidKeywords:
- - BlendAlpha
- - Clip_ON
- - FrameBlend_ON
- - SoftParticles_ON
- - VertLight_OFF
- m_LightmapFlags: 5
- m_EnableInstancingVariants: 1
- m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
- stringTagMap: {}
- disabledShaderPasses: []
- m_LockedProperties:
- m_SavedProperties:
- serializedVersion: 3
- m_TexEnvs:
- - _BumpMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _CutoutTex:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _DetailAlbedoMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _DetailMask:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _DetailNormalMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _EmissionMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _MainTex:
- m_Texture: {fileID: 2800000, guid: 05839f1a8049db445b449455d3793590, type: 3}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _MetallicGlossMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _NoiseTex:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _OcclusionMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _ParallaxMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- m_Ints: []
- m_Floats:
- - DstMode: 10
- - SrcMode: 5
- - _BlendMode: 1
- - _BumpScale: 1
- - _CullMode: 0
- - _Cutoff: 0.5
- - _Cutout: 0.264
- - _CutoutThreshold: 0.015
- - _DetailNormalMapScale: 1
- - _DstBlend: 0
- - _DstMode: 10
- - _FresnelFadeFactor: 3
- - _FresnelPow: 5
- - _FresnelR0: 0.04
- - _Glossiness: 0.5
- - _InvFade: 3
- - _Metallic: 0
- - _Mode: 0
- - _OcclusionStrength: 1
- - _Parallax: 0.02
- - _SoftInverted: 0.285
- - _SrcBlend: 1
- - _SrcMode: 5
- - _UVSec: 0
- - _UseCutout: 0
- - _UseCutoutTex: 0
- - _UseCutoutThreshold: 0
- - _UseFrameBlending: 1
- - _UseFresnel: 0
- - _UseFresnelFading: 0
- - _UseNoiseDistortion: 0
- - _UseParticlesAlphaCutout: 0
- - _UseSoft: 1
- - _UseSoftCutout: 0
- - _UseVertexStreamRandom: 0
- - _ZWrite: 0
- - _ZWriteMode: 0
- m_Colors:
- - _Color: {r: 1, g: 1, b: 1, a: 1}
- - _CutoutColor: {r: 1, g: 1, b: 1, a: 1}
- - _DistortionSpeedScale: {r: 1, g: -1, b: 0.15, a: 0.15}
- - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- - _FogColorMultiplier: {r: 0, g: 0, b: 0, a: 0}
- - _FresnelColor: {r: 0.5, g: 0.5, b: 2, a: 1}
- - _Tiling: {r: 1600, g: 800, b: 16, a: 8}
- - _TintColor: {r: 0.40494832, g: 1.4494361, b: 3.4339623, a: 0.078431375}
- m_BuildTextureStacks: []
- m_AllowLocking: 1
--- !u!1001 &967673105
PrefabInstance:
m_ObjectHideFlags: 0
@@ -331657,171 +331532,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1355363950}
m_PrefabAsset: {fileID: 0}
---- !u!43 &1250057017
-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: 7.5, y: 7.5, 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: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000
- 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: 7.5, y: 7.5, 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!1 &1250387997
GameObject:
m_ObjectHideFlags: 0
@@ -454566,7 +454276,7 @@ PrefabInstance:
type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
- objectReference: {fileID: 967471548}
+ objectReference: {fileID: 2100000, guid: 3946a384ccd19304db09d2800957f992, type: 2}
- target: {fileID: 5938195661117737739, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: 'imagesToPulse.Array.data[0]'
@@ -532477,6 +532187,171 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1983513887}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!43 &1983753554
+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: 7.5, y: 7.5, 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: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000
+ 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: 7.5, y: 7.5, 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 &1983788846
PrefabInstance:
m_ObjectHideFlags: 0
@@ -624583,7 +624458,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 264145258}
+ - {fileID: 399199760}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -624676,7 +624551,7 @@ MonoBehaviour:
manualPositionAndScale: 0
renderPriority: 2
styledSpace0: 0
- overrideMaterial: {fileID: 244232111}
+ overrideMaterial: {fileID: 13365535}
overrideCamToVolumeDistance: Infinity
overrideVolumeDistanceFade: 0
version: 180
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 02b2ab506..3f93401fe 100644
--- a/Assets/Scenes/Land_01/Land_of_Death_River1_Valley02.unity
+++ b/Assets/Scenes/Land_01/Land_of_Death_River1_Valley02.unity
@@ -28453,6 +28453,70 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 196864724}
m_Mesh: {fileID: -2747707763487863864, guid: 160f0655a5466da4dab9b951199da54e, type: 3}
+--- !u!21 &197023067
+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 &197651392
PrefabInstance:
m_ObjectHideFlags: 0
@@ -49644,6 +49708,39 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 375555033}
m_PrefabAsset: {fileID: 0}
+--- !u!21 &376083146
+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 &376236298
PrefabInstance:
m_ObjectHideFlags: 0
@@ -79311,171 +79408,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1368126506}
m_PrefabAsset: {fileID: 0}
---- !u!43 &579268207
-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 &579962770
PrefabInstance:
m_ObjectHideFlags: 0
@@ -102183,6 +102115,171 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 662465304}
m_PrefabAsset: {fileID: 0}
+--- !u!43 &662537482
+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 &662698677
PrefabInstance:
m_ObjectHideFlags: 0
@@ -151180,6 +151277,11 @@ PrefabInstance:
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
+ - target: {fileID: 6783963330927412624, guid: 851e8e61247888340bdec90fc8aa37f5,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 6786312951323477463, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_IsActive
@@ -151525,6 +151627,11 @@ PrefabInstance:
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
+ - target: {fileID: 8978645585760688183, guid: 851e8e61247888340bdec90fc8aa37f5,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 8994930969737561605, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_Layer
@@ -155537,6 +155644,171 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1039927284}
m_PrefabAsset: {fileID: 0}
+--- !u!43 &1041180109
+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 &1041230637
PrefabInstance:
m_ObjectHideFlags: 0
@@ -230128,6 +230400,11 @@ PrefabInstance:
propertyPath: m_Name
value: Decal_Pine_forestQuad (5)
objectReference: {fileID: 0}
+ - target: {fileID: 8381830434338937929, guid: 4c366fbd8a4a92c4085521fe26428416,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -297719,171 +297996,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: af2ce62b64c1a7340ada0b2c3e5b9ee0, type: 3}
---- !u!43 &1743300869
-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 &1743445623
PrefabInstance:
m_ObjectHideFlags: 0
@@ -303165,70 +303277,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a63e2d74e7c10e541b3edf048c24e88b, type: 3}
---- !u!21 &1773415373
-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!4 &1773884606 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 400000, guid: 2e23f62ecf9b36944b60e3e5631c5c1a,
@@ -349052,39 +349100,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b5a63866acfb2e547ab2d5fd34950804, type: 3}
---- !u!21 &2068368600
-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!4 &2069159355 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1278025358329255097, guid: bab2793d8b5d9014da7a4a0161daa9e4,
@@ -426994,7 +427009,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2068368600}
+ - {fileID: 376083146}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -427087,7 +427102,7 @@ MonoBehaviour:
manualPositionAndScale: 0
renderPriority: 2
styledSpace0: 0
- overrideMaterial: {fileID: 1773415373}
+ overrideMaterial: {fileID: 197023067}
overrideCamToVolumeDistance: Infinity
overrideVolumeDistanceFade: 0
version: 180
diff --git a/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat b/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat
index fd9bcbb81..3375fde88 100644
--- a/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat
+++ b/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat
@@ -65,11 +65,11 @@ Material:
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- - _BlendOp: 2
+ - _BlendOp: 0
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- - _DstBlend: 10
+ - _DstBlend: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
diff --git a/Assets/ThirdParty/Invector-3rdPersonController/Basic Locomotion/Scripts/CharacterController/vThirdPersonAnimator.cs b/Assets/ThirdParty/Invector-3rdPersonController/Basic Locomotion/Scripts/CharacterController/vThirdPersonAnimator.cs
index 6702e93ce..516775ba1 100644
--- a/Assets/ThirdParty/Invector-3rdPersonController/Basic Locomotion/Scripts/CharacterController/vThirdPersonAnimator.cs
+++ b/Assets/ThirdParty/Invector-3rdPersonController/Basic Locomotion/Scripts/CharacterController/vThirdPersonAnimator.cs
@@ -99,6 +99,8 @@ namespace Invector.vCharacterController
// identify if the rolling animations is playing
isRolling = IsAnimatorTag("IsRolling");
+ if (isRolling)
+ Debug.Log("isRolling: " + isRolling);
// identify if a turn on spot animation is playing
isTurningOnSpot = IsAnimatorTag("TurnOnSpot");
// locks player movement while a animation with tag 'LockMovement' is playing
diff --git a/Assets/ThirdParty/Invector-3rdPersonController/Basic Locomotion/Scripts/CharacterController/vThirdPersonInput.cs b/Assets/ThirdParty/Invector-3rdPersonController/Basic Locomotion/Scripts/CharacterController/vThirdPersonInput.cs
index 1cceac63b..888fbfd2f 100644
--- a/Assets/ThirdParty/Invector-3rdPersonController/Basic Locomotion/Scripts/CharacterController/vThirdPersonInput.cs
+++ b/Assets/ThirdParty/Invector-3rdPersonController/Basic Locomotion/Scripts/CharacterController/vThirdPersonInput.cs
@@ -525,7 +525,7 @@ namespace Invector.vCharacterController
///
protected virtual bool RollConditions()
{
- return (!cc.isRolling || cc.canRollAgain) && cc.isGrounded && cc.input != Vector3.zero && !cc.customAction && cc.currentStamina > cc.rollStamina && !cc.isJumping && !cc.isSliding;
+ return (!cc.isRolling || cc.canRollAgain) && cc.isGrounded && /*cc.input != Vector3.zero && */!cc.customAction && cc.currentStamina > cc.rollStamina && !cc.isJumping && !cc.isSliding;
}
///
@@ -533,7 +533,8 @@ namespace Invector.vCharacterController
///
protected virtual void RollInput()
{
- if (rollInput.GetButtonDown() )//&& RollConditions())
+ //Debug.Log("RollInput, roll conditions: " + RollConditions());
+ if (rollInput.GetButtonDown() && RollConditions())
{
cc.Roll();
}
diff --git a/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Scripts/CharacterController/vMeleeCombatInput.cs b/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Scripts/CharacterController/vMeleeCombatInput.cs
index f5e607a00..a869e10bb 100644
--- a/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Scripts/CharacterController/vMeleeCombatInput.cs
+++ b/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Scripts/CharacterController/vMeleeCombatInput.cs
@@ -192,14 +192,14 @@ namespace Invector.vCharacterController
protected override bool RollConditions()
{
- return base.RollConditions() && !isAttacking && !cc.animator.IsInTransition(cc.upperBodyLayer) && !cc.animator.IsInTransition(cc.fullbodyLayer);
+ return base.RollConditions() && !isAttacking;// && !cc.animator.IsInTransition(cc.upperBodyLayer) && !cc.animator.IsInTransition(cc.fullbodyLayer);
}
#endregion
#region Update Animations
- protected virtual void UpdateMeleeAnimations()
+ protected virtual void UpdateMeleeAnimations()
{
if (cc.animator == null || meleeManager == null)
{
diff --git a/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Scripts/MeleeWeapon/vMeleeAttackControl.cs b/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Scripts/MeleeWeapon/vMeleeAttackControl.cs
index c69f2a1b8..3be4a4712 100644
--- a/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Scripts/MeleeWeapon/vMeleeAttackControl.cs
+++ b/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/Scripts/MeleeWeapon/vMeleeAttackControl.cs
@@ -1,301 +1,278 @@
using System;
-using System.Collections;
-using System.Collections.Generic;
-using Beyond;
-using Invector.vCharacterController.AI;
-using Invector.vCharacterController.AI.FSMBehaviour;
+using Beyond; // For Player (ensure Player.cs is in this namespace or adjust)
+using Invector.vCharacterController.AI.FSMBehaviour; // For vFSMBehaviourController
using UnityEngine;
+using System.Collections.Generic; // For List
namespace Invector.vMelee
{
- using vEventSystems;
+ using vEventSystems; // For vIAttackListener
public class vMeleeAttackControl : StateMachineBehaviour
{
- [Tooltip("normalizedTime of Active Damage")]
+ [Header("Damage Window")]
+ [Tooltip("NormalizedTime of Active Damage")]
public float startDamage = 0.05f;
-
- [Tooltip("normalizedTime of Disable Damage")]
+ [Tooltip("NormalizedTime of Disable Damage")]
public float endDamage = 0.9f;
- public int damageMultiplier;
+ [Header("Attack Properties")]
+ public int damageMultiplier = 1;
public int recoilID;
public int reactionID;
-
public vAttackType meleeAttackType = vAttackType.Unarmed;
-
[Tooltip("You can use a name as reference to trigger a custom HitDamageParticle")]
public string damageType;
+ [Tooltip("Body parts to activate for damage detection.")]
+ public List bodyParts = new List { "RightLowerArm" }; // Default, adjust as needed
- [HideInInspector] [Header("This work with vMeleeManager to active vMeleeAttackObject from bodyPart and id")]
- public List bodyParts = new List { "RightLowerArm" };
-
+ [Header("Hit Effects")]
public bool ignoreDefense;
public bool activeRagdoll;
+ [vHideInInspector("activeRagdoll")] // Assuming vHideInInspector is a valid attribute in your project
+ [Tooltip("Time to keep Ragdoll active if activeRagdoll is true.")]
+ public float senselessTime = 2f;
- [vHideInInspector("activeRagdoll"), Tooltip("Time to keep Ragdoll active")]
- public float senselessTime;
-
- [Tooltip("Check true in the last attack of your combo to reset the triggers")]
+ [Header("Attack Flow")]
+ [Tooltip("Check true in the last attack of your combo to reset the FSM attack triggers.")]
public bool resetAttackTrigger;
+ [Tooltip("Normalized time point to reset attack triggers if resetAttackTrigger is true.")]
+ public float resetTriggerBeforeTime = 0.8f; // Example: reset triggers before animation fully ends
- private bool isActive;
- public bool debug;
- private vIAttackListener mFighter;
- private bool isAttacking;
- //private bool slowMoActive = false;
+ [Header("Slow Motion Settings")]
+ [Tooltip("Enable slow motion effect during this attack based on conditions below.")]
public bool useAttackTimeScale = false;
- public float resetTriggerBeforeTime = 0.5f;
- public float attackTimeScale = 0.2f;
- public float attackTimeScaleStart = -1f;
- public float attackTimeScaleEnd = -1f;
- public float maxTargetDistance = 3f;
+ [Tooltip("Distance within which the current auto-target must be for slow motion to consider activating.")]
+ public float slowMoActivationDistance = 3f;
+ [Tooltip("Target health threshold below which slow motion might activate (if near).")]
public float lowHealthTh = 10f;
- private bool m_hasScaledTime = false;
+ [Tooltip("Time scale to apply during slow motion.")]
+ public float attackTimeScale = 0.2f;
+ [Tooltip("Normalized time to start the slow motion window. If < 0, uses 'startDamage'.")]
+ public float attackTimeScaleStart = -1f;
+ [Tooltip("Normalized time to end the slow motion window. If < 0, uses 'endDamage'.")]
+ public float attackTimeScaleEnd = -1f;
-
- public float degreeThreshold = 20;
+ [Header("Rotation Settings")]
+ [Tooltip("If true, the character will attempt to rotate towards the auto-target during this attack state.")]
public bool rotatePlayerTowardsTarget;
- private bool m_isRotating;
- public float rotationSpeed = 30f;
+ [Tooltip("The angle (in degrees from player's forward) within which the auto-target must be for rotation to engage.")]
+ public float rotationActivationAngle = 45f;
+
+ [Header("Debug")]
+ public bool debug = false;
+
+ // Private state variables
+ private bool isActive; // Is damage window active
+ private vIAttackListener mFighter;
+ private bool isAttacking; // Is this attack state logic considered "attacking" (for trigger resets, OnDisable)
+ private bool m_hasScaledTime; // Has slow motion been activated in this instance of the state
+ private AutoTargetting _autoTargettingInstance;
override public void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
{
mFighter = animator.GetComponent();
- isAttacking = true;
- //slowMoActive = false;
- if (mFighter != null)
- mFighter.OnEnableAttack();
- if (debug)
- Debug.Log("Enter " + damageType);
-
- if (attackTimeScaleStart < 0f)
+ if (Player.Instance != null)
{
- attackTimeScaleStart = startDamage;
+ _autoTargettingInstance = Player.Instance.AutoTarget;
}
-
- if (attackTimeScaleEnd < 0f)
- {
- attackTimeScaleEnd = endDamage;
- }
- }
-
- private void LerpRotation()
- {
- if (!rotatePlayerTowardsTarget)
- {
- return;
- }
-
- float minDist = Single.PositiveInfinity;
- var enemy = GetNearestEnemy(ref minDist);
-
- if (!IsEnemyInAngleRange(enemy))
- {
- return;
- }
-
- Transform playerTransform = Player.Instance.transform;
- var toEnemy = enemy.transform.position - playerTransform.position;
- toEnemy.y = 0f;
- toEnemy.Normalize();
- Quaternion targetRot =
- Quaternion.LookRotation(toEnemy);
-
- var rotation = playerTransform.rotation;
- rotation = Quaternion.Lerp(rotation, targetRot, Time.deltaTime * rotationSpeed);
- playerTransform.rotation = rotation;
- }
- private bool IsEnemyInAngleRange(vFSMBehaviourController ai)
- {
- if (ai == null)
+ if (_autoTargettingInstance == null && debug)
{
- return false;
+ Debug.LogWarning($"({damageType}) AutoTargetting instance not found via Player.Instance.AutoTarget on {animator.name}.");
}
- Vector3 playerFwd = Player.Instance.transform.forward;
- Vector3 target = (ai.transform.forward - playerFwd).normalized;
+ isAttacking = true; // Mark as actively in an attack process
+ isActive = false; // Damage window is not active yet
+ m_hasScaledTime = false; // Slow motion not yet activated for this state instance
- float dot = Vector3.Dot(playerFwd, target );
- float angle = 180f - Mathf.Acos(dot) * Mathf.Rad2Deg;
-
-
- if (angle > degreeThreshold)
+ if (mFighter != null)
{
- return false;
+ mFighter.OnEnableAttack(); // Notify listener attack is starting
}
- return true;
- }
+ if (debug) Debug.Log($"({damageType}) OnStateEnter: {animator.name}, Layer: {layerIndex}");
- public float NearTargertHealth()
- {
- float health = -1f;
- if (Player.Instance.LockOn.currentTarget != null)
- {
- var aic = Player.Instance.LockOn.currentTarget.GetComponent();
- if (aic != null)
- {
- health = aic.currentHealth;
- return health;
- }
- }
-
- float minDist = Single.PositiveInfinity;
-
- var ctrl = GetNearestEnemy(ref minDist);
-
- if (minDist < maxTargetDistance)
- {
- health = ctrl.aiController.currentHealth;
- }
-
- return health;
- }
-
- private bool NearHealthLow()
- {
- float h = NearTargertHealth();
- return h > 0f && h < lowHealthTh;
- }
-
- private vFSMBehaviourController GetNearestEnemy(ref float minDist)
- {
- var controllers = GameStateManager.Instance.GetActiveCombatcontrollers();
- Vector3 playerPos = Player.Instance.transform.position;
- vFSMBehaviourController ctrl = null;
- foreach (var aic in controllers)
- {
- var dist2 = aic.transform.position - Player.Instance.transform.position;
- dist2.y = 0f;
- if (dist2.magnitude < minDist)
- {
- ctrl = aic;
- minDist = dist2.magnitude;
- }
- }
-
- return ctrl;
- }
-
- public bool TargetNear()
- {
- var targets = Player.Instance.LockOn.GetNearbyTargets();
- if (targets.Count == 0)
- return false;
- else
- {
- var dist2 = targets[0].position - Player.Instance.transform.position;
- dist2.y = 0f;
- return dist2.magnitude < maxTargetDistance;
- }
- }
-
- private void UpdateSlowMo(float normalizedTime)
- {
- if (!m_hasScaledTime)
- {
- if (normalizedTime >= attackTimeScaleStart && normalizedTime <= attackTimeScaleEnd)
- {
- if (TargetNear() && (useAttackTimeScale || NearHealthLow()))
- {
- TimeController.Instance.SetTimeScaleForSec(attackTimeScale, attackTimeScaleEnd - normalizedTime);
- //Time.timeScale = attackTimeScale;
- m_hasScaledTime = true;
- }
- }
- } else if (normalizedTime > attackTimeScaleEnd)
- {
- m_hasScaledTime = false;
- }
+ // Initialize slow-mo start/end times if they are set to use damage window timings
+ if (attackTimeScaleStart < 0f) attackTimeScaleStart = startDamage;
+ if (attackTimeScaleEnd < 0f) attackTimeScaleEnd = endDamage;
}
override public void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
{
- float nTime = stateInfo.normalizedTime % 1;
+ // Normalized time within the current loop of the animation (0 to 1)
+ float currentNormalizedTime = stateInfo.normalizedTime % 1;
+ if (currentNormalizedTime == 0 && stateInfo.normalizedTime > 0.5f) currentNormalizedTime = 1f; // Handle end of non-looping anim
- //LerpRotation();
-
- if (nTime >= startDamage && nTime <= endDamage && !isActive)
+ // --- ROTATION LOGIC ---
+ if (rotatePlayerTowardsTarget && _autoTargettingInstance != null && _autoTargettingInstance.CurrentTarget != null)
{
- if (debug)
- Debug.Log(animator.name + " attack " + damageType + " enable damage in " +
- System.Math.Round(stateInfo.normalizedTime % 1, 2));
+ // animator.transform is the player's transform
+ if (_autoTargettingInstance.IsTargetInAngle(animator.transform, _autoTargettingInstance.CurrentTarget, rotationActivationAngle))
+ {
+ _autoTargettingInstance.ExecuteRotationTowardsCurrentTarget(Time.deltaTime);
+ }
+ }
+
+ // --- SLOW MOTION LOGIC ---
+ if (useAttackTimeScale) // Only process if slow-mo is enabled for this attack
+ {
+ UpdateSlowMotion(animator, stateInfo, currentNormalizedTime);
+ }
+
+ // --- DAMAGE WINDOW LOGIC ---
+ if (!isActive && currentNormalizedTime >= startDamage && currentNormalizedTime <= endDamage)
+ {
+ if (debug) Debug.Log($"({damageType}) Enable Damage: normTime={currentNormalizedTime:F2} (Start:{startDamage:F2}, End:{endDamage:F2})");
isActive = true;
ActiveDamage(animator, true);
- /*
- if (TargetNear() && (useAttackTimeScale || NearHealthLow()))
- {
- TimeController.Instance.SetTimeScaleForSec(attackTimeScale, endDamage - nTime);
- //Time.timeScale = attackTimeScale;
- m_hasScaledTime = true;
- }
- */
}
- else if (nTime > endDamage && isActive)
+ else if (isActive && currentNormalizedTime > endDamage)
{
- if (debug)
- Debug.Log(animator.name + " attack " + damageType + " disable damage in " +
- System.Math.Round(stateInfo.normalizedTime % 1, 2));
+ if (debug) Debug.Log($"({damageType}) Disable Damage: normTime={currentNormalizedTime:F2} > {endDamage:F2}");
isActive = false;
ActiveDamage(animator, false);
-
}
- if (nTime > endDamage && isAttacking)
+ // --- ATTACK STATE AND TRIGGER RESET LOGIC ---
+ // This section handles logic that should happen once conditions are met within the active attack.
+ if (isAttacking) // Only process these if we are still in the "attacking process" phase of this state
{
- isAttacking = false;
- if (mFighter != null)
- mFighter.OnDisableAttack();
+ // Condition to call OnDisableAttack (e.g., after damage window and before full exit)
+ if (currentNormalizedTime > endDamage)
+ {
+ if (mFighter != null) mFighter.OnDisableAttack();
+ isAttacking = false; // Mark that OnDisableAttack has been called for this state instance
+ if (debug) Debug.Log($"({damageType}) OnDisableAttack called: normTime={currentNormalizedTime:F2}");
+ }
+ // Condition to reset FSM attack triggers earlier in the animation if specified
+ else if (resetAttackTrigger && currentNormalizedTime >= resetTriggerBeforeTime)
+ {
+ if (mFighter != null) mFighter.ResetAttackTriggers();
+ // To prevent multiple calls if animation loops or stays in this normalized time range:
+ // One option is to rely on mFighter.ResetAttackTriggers being idempotent.
+ // Another is to set a flag, but since `isAttacking` might be turned false by OnDisableAttack,
+ // we might need a separate flag or ensure resetTriggerBeforeTime < endDamage if OnDisableAttack also resets.
+ // For simplicity, current Invector often handles ResetAttackTriggers robustly if called multiple times.
+ if (debug) Debug.Log($"({damageType}) ResetAttackTriggers called: normTime={currentNormalizedTime:F2}");
+ }
}
-
- if (nTime > .1f && nTime < resetTriggerBeforeTime && isAttacking)
- {
- if (mFighter != null)
- mFighter.ResetAttackTriggers();
- }
-
- //if (stateInfo.normalizedTime % 1 > allowRotationAt && isAttacking)
- //{
- // isAttacking = false;
- // if (mFighter != null)
- // mFighter.OnDisableAttack();
- //}
- //UpdateSlowMo(nTime);
}
-
+
override public void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
{
- if (debug)
- Debug.Log("Exit " + damageType);
+ if (debug) Debug.Log($"({damageType}) OnStateExit: {animator.name}");
- if (isActive)
+ // Ensure damage is disabled if state exits while damage window was active
+ if (isActive)
{
isActive = false;
ActiveDamage(animator, false);
+ if (debug) Debug.Log($"({damageType}) Damage disabled on StateExit.");
}
- if (isAttacking)
+ // Ensure OnDisableAttack is called if it hasn't been already (e.g., if state was exited prematurely)
+ if (isAttacking && mFighter != null)
{
- isAttacking = false;
- if (mFighter != null)
- mFighter.OnDisableAttack();
+ mFighter.OnDisableAttack();
+ if (debug) Debug.Log($"({damageType}) OnDisableAttack called on StateExit (fallback).");
}
+ isAttacking = false; // Reset for next entry
- if (mFighter != null && resetAttackTrigger)
- mFighter.ResetAttackTriggers();
+ // Reset slow motion flag
+ m_hasScaledTime = false;
- if (debug) Debug.Log(animator.name + " attack " + damageType + " stateExit");
+ // Invector's vMeleeManager or vIAttackListener typically handles final trigger resets on its own
+ // when an attack sequence ends or on certain conditions. Explicitly calling here might be redundant
+ // or interfere if `resetAttackTrigger` is meant for mid-combo resets via `resetTriggerBeforeTime`.
+ // If `resetAttackTrigger` specifically means "reset on exit of this state", then:
+ // if (mFighter != null && resetAttackTrigger) {
+ // mFighter.ResetAttackTriggers();
+ // }
+ }
+
+ private void UpdateSlowMotion(Animator animator, AnimatorStateInfo stateInfo, float currentNormalizedTime)
+ {
+ // This method is called only if useAttackTimeScale is true for the component.
+ if (_autoTargettingInstance == null) return; // No system to get target info from.
+
+ if (!m_hasScaledTime) // If slow motion hasn't been activated yet in this state instance
+ {
+ // Check if we are within the normalized time window for slow motion
+ if (currentNormalizedTime >= attackTimeScaleStart && currentNormalizedTime <= attackTimeScaleEnd)
+ {
+ bool triggerSlowMo = false;
+ if (_autoTargettingInstance.CurrentTarget != null)
+ {
+ // Check distance to CurrentTarget
+ float distSqr = (_autoTargettingInstance.CurrentTarget.transform.position - animator.transform.position).sqrMagnitude;
+ bool targetNear = distSqr <= slowMoActivationDistance * slowMoActivationDistance;
+
+ if (targetNear)
+ {
+ // If always use slow-mo when near, or if target health is low
+ float currentTargetHealth = _autoTargettingInstance.GetCurrentTargetHealth();
+ bool targetHealthLow = currentTargetHealth > 0f && currentTargetHealth < lowHealthTh;
+ // The original logic was: TargetNear() && (useAttackTimeScale || NearHealthLow())
+ // Since this whole UpdateSlowMotion is wrapped in `if (useAttackTimeScale)`,
+ // it means `useAttackTimeScale` (the bool field) is the main switch.
+ // The condition effectively becomes: if targetNear AND (this attack ALWAYS uses slowmo OR target health is low)
+ // The bool `useAttackTimeScale` on the component acts as the "always use slowmo if near" part.
+ if (targetHealthLow) // If health is low, it's an additional trigger.
+ {
+ triggerSlowMo = true;
+ }
+ else if(this.useAttackTimeScale) // if useAttackTimeScale is true, it means activate if near, regardless of health.
+ {
+ triggerSlowMo = true;
+ }
+
+ }
+ } else {
+ // No current target, so no target-dependent slow motion.
+ // If `useAttackTimeScale` implies slow-mo even without a target (e.g. for stylistic effect), that logic would go here.
+ // Based on parameters, it seems target-dependent.
+ }
+
+
+ if (triggerSlowMo)
+ {
+ if (TimeController.Instance != null)
+ {
+ float slowMoEffectDuration = (attackTimeScaleEnd - currentNormalizedTime) * stateInfo.length;
+ if (slowMoEffectDuration > 0.01f) // Ensure a meaningful duration
+ {
+ TimeController.Instance.SetTimeScaleForSec(attackTimeScale, slowMoEffectDuration);
+ if (debug) Debug.Log($"({damageType}) Slow-mo ACTIVATED. Target: {_autoTargettingInstance.CurrentTarget?.name ?? "N/A"}. Duration: {slowMoEffectDuration:F2}s. NormTime: {currentNormalizedTime:F2}");
+ }
+ else if (debug) Debug.Log($"({damageType}) Slow-mo trigger met, but calculated duration too short ({slowMoEffectDuration:F2}s). NormTime: {currentNormalizedTime:F2}");
+ }
+ m_hasScaledTime = true;
+ }
+ }
+ }
+ else if (currentNormalizedTime > attackTimeScaleEnd && m_hasScaledTime) // If slow-mo was active and window has passed
+ {
+ // TimeController.Instance is responsible for restoring time scale after its set duration.
+ // We just reset our flag for this state instance.
+ m_hasScaledTime = false;
+ if (debug) Debug.Log($"({damageType}) Slow-mo window ended (normTime={currentNormalizedTime:F2}). m_hasScaledTime reset.");
+ }
}
void ActiveDamage(Animator animator, bool value)
{
- var meleeManager = animator.GetComponent();
+ var meleeManager = animator.GetComponent(); // Invector's manager
if (meleeManager)
+ {
meleeManager.SetActiveAttack(bodyParts, meleeAttackType, value, damageMultiplier, recoilID, reactionID,
ignoreDefense, activeRagdoll, senselessTime, damageType);
+ }
+ else if(debug)
+ {
+ Debug.LogWarning($"({damageType}) vMeleeManager not found on {animator.name}. Cannot activate/deactivate damage.");
+ }
}
}
}
\ No newline at end of file
diff --git a/Assets/ThirdParty/PARTICLES/KriptoFX/Realistic Effects Pack v4/Effects/Materials/Effect4/DecalRing 3.mat b/Assets/ThirdParty/PARTICLES/KriptoFX/Realistic Effects Pack v4/Effects/Materials/Effect4/DecalRing 3.mat
index 3b46fee0d..694e90f34 100644
--- a/Assets/ThirdParty/PARTICLES/KriptoFX/Realistic Effects Pack v4/Effects/Materials/Effect4/DecalRing 3.mat
+++ b/Assets/ThirdParty/PARTICLES/KriptoFX/Realistic Effects Pack v4/Effects/Materials/Effect4/DecalRing 3.mat
@@ -9,6 +9,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: DecalRing 3
m_Shader: {fileID: 4800000, guid: d8f400148b999fe41bd30759b3a9126b, type: 3}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- USE_ALPHA_POW
- USE_CUTOUT
@@ -21,6 +23,7 @@ Material:
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
+ m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@@ -82,7 +85,7 @@ Material:
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- - _AlphaPow: -1.89
+ - _AlphaPow: 0.89
- _BlendMode: 1
- _BumpScale: 1
- _CullMode: 2
@@ -139,3 +142,4 @@ Material:
- _FresnelColor: {r: 1, g: 1, b: 1, a: 1}
- _TintColor: {r: 0.65675324, g: 2.435977, b: 6.0535507, a: 1}
m_BuildTextureStacks: []
+ m_AllowLocking: 1
diff --git a/Assets/testy/Marcin/TesttRenderer.asset b/Assets/testy/Marcin/TesttRenderer.asset
index f2f7f8564..1e9176d96 100644
--- a/Assets/testy/Marcin/TesttRenderer.asset
+++ b/Assets/testy/Marcin/TesttRenderer.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a1614fc811f8f184697d9bee70ab9fe5, type: 3}
m_Name: DecalRendererFeature
m_EditorClassIdentifier:
- m_Active: 1
+ m_Active: 0
m_Settings:
technique: 0
maxDrawDistance: 1000
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 6ea72e093..fce1c84a8 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
+ 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
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
+ 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
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
+ 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
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: {}