From 90997492b7fd3f22fa2d95f2a914f7a2574c935f Mon Sep 17 00:00:00 2001 From: Chris Cunningham Date: Thu, 18 Feb 2016 10:37:50 -0400 Subject: [PATCH] managed improve the framerate on android by more than 2x with a lot of optimizations to culling, particles and fixing issues with static colliders --- Assets/Prefabs/Boat.prefab | 304 ++++++++---------- Assets/Prefabs/Demons/ArmorDemon.prefab | 120 +++---- Assets/Prefabs/Demons/BestDemon.prefab | 25 ++ Assets/Prefabs/Demons/SpeedDemon.prefab | 148 ++++----- Assets/Prefabs/Demons/WellRoundedDemon.prefab | 134 ++++---- Assets/Prefabs/Fire.prefab | 6 +- Assets/Prefabs/FirstPersonCam.prefab | 61 ++-- Assets/Prefabs/HUDCanvas.prefab | 6 +- Assets/Scenes/Main.unity | 201 +++--------- Assets/Scripts/BoatWaveData.cs | 3 - ProjectSettings/ProjectSettings.asset | 4 +- ProjectSettings/QualitySettings.asset | 141 +------- 12 files changed, 445 insertions(+), 708 deletions(-) diff --git a/Assets/Prefabs/Boat.prefab b/Assets/Prefabs/Boat.prefab index 89b62dd..b877e0a 100644 --- a/Assets/Prefabs/Boat.prefab +++ b/Assets/Prefabs/Boat.prefab @@ -228,6 +228,7 @@ GameObject: - 65: {fileID: 6577552} - 65: {fileID: 6536068} - 82: {fileID: 8282712} + - 54: {fileID: 5477818} m_Layer: 0 m_Name: Boat m_TagString: Untagged @@ -577,6 +578,21 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 114730} m_Mesh: {fileID: 4300008, guid: 35b563fb2f01940359a9441112a02b2d, type: 3} +--- !u!54 &5477818 +Rigidbody: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 181798} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!65 &6536068 BoxCollider: m_ObjectHideFlags: 1 @@ -806,7 +822,7 @@ ParticleSystem: serializedVersion: 2 enabled: 1 startLifetime: - scalar: 2 + scalar: 1 maxCurve: serializedVersion: 2 m_Curve: @@ -815,31 +831,21 @@ ParticleSystem: inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 - m_RotationOrder: 4 + m_RotationOrder: 0 minCurve: serializedVersion: 2 m_Curve: - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 + value: 0.8 inSlope: 0 outSlope: 0 tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 + m_RotationOrder: 0 + minMaxState: 3 startSpeed: scalar: 3.5 maxCurve: @@ -1111,7 +1117,7 @@ ParticleSystem: minMaxState: 0 randomizeRotationDirection: 0.5 gravityModifier: 0 - maxNumParticles: 1000 + maxNumParticles: 500 rotation3D: 1 ShapeModule: serializedVersion: 2 @@ -1147,13 +1153,13 @@ ParticleSystem: inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 0.22644684 - value: 1 + - time: 0.20114145 + value: 0.501139 inSlope: 0.01686853 outSlope: 0.01686853 tangentMode: 0 - time: 1 - value: 1 + value: 0.5034169 inSlope: 0.021367867 outSlope: 0.021367867 tangentMode: 0 @@ -1197,23 +1203,23 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0.06829268 - value: 1 + - time: 0.38766444 + value: 0.99658316 inSlope: -0.9695949 outSlope: -0.9695949 tangentMode: 0 - - time: 0.21725425 - value: 0.638729 + - time: 0.501722 + value: 0.6330342 inSlope: -1.0647887 outSlope: -1.0647887 tangentMode: 0 - - time: 0.3853658 - value: 0.17567565 + - time: 0.64844835 + value: 0.2751909 inSlope: -0.9234235 outSlope: -0.9234235 tangentMode: 0 - - time: 0.71219516 - value: 0 + - time: 0.99584043 + value: 0.1972103 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -1346,7 +1352,7 @@ ParticleSystem: minMaxState: 0 separateAxes: 0 ColorModule: - enabled: 0 + enabled: 1 gradient: maxGradient: key0: @@ -1382,15 +1388,15 @@ ParticleSystem: ctime6: 0 ctime7: 0 atime0: 0 - atime1: 65535 - atime2: 0 + atime1: 42212 + atime2: 65535 atime3: 0 atime4: 0 atime5: 0 atime6: 0 atime7: 0 m_NumColorKeys: 2 - m_NumAlphaKeys: 2 + m_NumAlphaKeys: 3 minGradient: key0: serializedVersion: 2 @@ -1730,7 +1736,7 @@ ParticleSystem: inWorldSpace: 0 randomizePerFrame: 0 ExternalForcesModule: - enabled: 1 + enabled: 0 multiplier: 1 ClampVelocityModule: enabled: 0 @@ -2310,7 +2316,7 @@ ParticleSystem: serializedVersion: 2 enabled: 1 startLifetime: - scalar: 2 + scalar: 1 maxCurve: serializedVersion: 2 m_Curve: @@ -2319,31 +2325,21 @@ ParticleSystem: inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 - m_RotationOrder: 4 + m_RotationOrder: 0 minCurve: serializedVersion: 2 m_Curve: - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 + value: 0.8 inSlope: 0 outSlope: 0 tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 + m_RotationOrder: 0 + minMaxState: 3 startSpeed: scalar: 3.5 maxCurve: @@ -2651,13 +2647,13 @@ ParticleSystem: inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 0.22644684 - value: 1 + - time: 0.24738924 + value: 0.35421413 inSlope: 0.01686853 outSlope: 0.01686853 tangentMode: 0 - time: 1 - value: 1 + value: 0.35421413 inSlope: 0.021367867 outSlope: 0.021367867 tangentMode: 0 @@ -2701,22 +2697,22 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0.06829268 + - time: 0.30738518 value: 1 inSlope: -0.9695949 outSlope: -0.9695949 tangentMode: 0 - - time: 0.21725425 + - time: 0.45634675 value: 0.638729 inSlope: -1.0647887 outSlope: -1.0647887 tangentMode: 0 - - time: 0.3853658 + - time: 0.6244583 value: 0.17567565 inSlope: -0.9234235 outSlope: -0.9234235 tangentMode: 0 - - time: 0.71219516 + - time: 0.9512876 value: 0 inSlope: 0 outSlope: 0 @@ -2850,7 +2846,7 @@ ParticleSystem: minMaxState: 0 separateAxes: 0 ColorModule: - enabled: 0 + enabled: 1 gradient: maxGradient: key0: @@ -2886,15 +2882,15 @@ ParticleSystem: ctime6: 0 ctime7: 0 atime0: 0 - atime1: 65535 - atime2: 0 + atime1: 40863 + atime2: 65535 atime3: 0 atime4: 0 atime5: 0 atime6: 0 atime7: 0 m_NumColorKeys: 2 - m_NumAlphaKeys: 2 + m_NumAlphaKeys: 3 minGradient: key0: serializedVersion: 2 @@ -3234,7 +3230,7 @@ ParticleSystem: inWorldSpace: 0 randomizePerFrame: 0 ExternalForcesModule: - enabled: 1 + enabled: 0 multiplier: 1 ClampVelocityModule: enabled: 0 @@ -3814,7 +3810,7 @@ ParticleSystem: serializedVersion: 2 enabled: 1 startLifetime: - scalar: 2 + scalar: 1 maxCurve: serializedVersion: 2 m_Curve: @@ -3823,31 +3819,21 @@ ParticleSystem: inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 - m_RotationOrder: 4 + m_RotationOrder: 0 minCurve: serializedVersion: 2 m_Curve: - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 + value: 0.8 inSlope: 0 outSlope: 0 tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 + m_RotationOrder: 0 + minMaxState: 3 startSpeed: scalar: 3.5 maxCurve: @@ -4155,13 +4141,13 @@ ParticleSystem: inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 0.22644684 - value: 1 + - time: 0.22819205 + value: 0.49886107 inSlope: 0.01686853 outSlope: 0.01686853 tangentMode: 0 - time: 1 - value: 1 + value: 0.49886107 inSlope: 0.021367867 outSlope: 0.021367867 tangentMode: 0 @@ -4205,22 +4191,22 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0.06829268 + - time: 0.3518878 value: 1 inSlope: -0.9695949 outSlope: -0.9695949 tangentMode: 0 - - time: 0.21725425 - value: 0.638729 + - time: 0.49735898 + value: 0.6262005 inSlope: -1.0647887 outSlope: -1.0647887 tangentMode: 0 - - time: 0.3853658 - value: 0.17567565 + - time: 0.66547054 + value: 0.16314717 inSlope: -0.9234235 outSlope: -0.9234235 tangentMode: 0 - - time: 0.71219516 + - time: 0.9922999 value: 0 inSlope: 0 outSlope: 0 @@ -4354,7 +4340,7 @@ ParticleSystem: minMaxState: 0 separateAxes: 0 ColorModule: - enabled: 0 + enabled: 1 gradient: maxGradient: key0: @@ -4390,15 +4376,15 @@ ParticleSystem: ctime6: 0 ctime7: 0 atime0: 0 - atime1: 65535 - atime2: 0 + atime1: 47031 + atime2: 65535 atime3: 0 atime4: 0 atime5: 0 atime6: 0 atime7: 0 m_NumColorKeys: 2 - m_NumAlphaKeys: 2 + m_NumAlphaKeys: 3 minGradient: key0: serializedVersion: 2 @@ -4738,7 +4724,7 @@ ParticleSystem: inWorldSpace: 0 randomizePerFrame: 0 ExternalForcesModule: - enabled: 1 + enabled: 0 multiplier: 1 ClampVelocityModule: enabled: 0 @@ -5318,7 +5304,7 @@ ParticleSystem: serializedVersion: 2 enabled: 1 startLifetime: - scalar: 2 + scalar: 1 maxCurve: serializedVersion: 2 m_Curve: @@ -5327,31 +5313,21 @@ ParticleSystem: inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 - m_RotationOrder: 4 + m_RotationOrder: 0 minCurve: serializedVersion: 2 m_Curve: - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 + value: 0.8 inSlope: 0 outSlope: 0 tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 + m_RotationOrder: 0 + minMaxState: 3 startSpeed: scalar: 5 maxCurve: @@ -5482,7 +5458,7 @@ ParticleSystem: rgba: 2216075745 minMaxState: 0 startSize: - scalar: 10 + scalar: 15 maxCurve: serializedVersion: 2 m_Curve: @@ -5650,7 +5626,7 @@ ParticleSystem: serializedVersion: 2 m_Type: 0 rate: - scalar: 10 + scalar: 5 maxCurve: serializedVersion: 2 m_Curve: @@ -6809,7 +6785,7 @@ ParticleSystem: speed: 1 randomSeed: 0 looping: 1 - prewarm: 1 + prewarm: 0 playOnAwake: 1 moveWithTransform: 0 scalingMode: 1 @@ -6817,7 +6793,7 @@ ParticleSystem: serializedVersion: 2 enabled: 1 startLifetime: - scalar: 6 + scalar: 0.8 maxCurve: serializedVersion: 2 m_Curve: @@ -6833,14 +6809,14 @@ ParticleSystem: serializedVersion: 2 m_Curve: - time: 0 - value: 0.25 + value: 0.625 inSlope: 0 outSlope: 0 tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 0 - minMaxState: 0 + minMaxState: 3 startSpeed: scalar: 1 maxCurve: @@ -6955,13 +6931,13 @@ ParticleSystem: m_NumAlphaKeys: 2 minColor: serializedVersion: 2 - rgba: 4294967295 + rgba: 436207615 maxColor: serializedVersion: 2 - rgba: 4294967295 + rgba: 536870911 minMaxState: 0 startSize: - scalar: 0.5 + scalar: 1 maxCurve: serializedVersion: 2 m_Curve: @@ -6977,7 +6953,7 @@ ParticleSystem: serializedVersion: 2 m_Curve: - time: 0 - value: 0.6 + value: 0.75 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -7119,7 +7095,7 @@ ParticleSystem: serializedVersion: 2 m_Type: 0 rate: - scalar: 250 + scalar: 75 maxCurve: serializedVersion: 2 m_Curve: @@ -7179,7 +7155,7 @@ ParticleSystem: outSlope: 0 tangentMode: 0 - time: 1 - value: 0 + value: 0.59908885 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -7317,13 +7293,13 @@ ParticleSystem: maxGradient: key0: serializedVersion: 2 - rgba: 1946157055 + rgba: 3120562175 key1: serializedVersion: 2 - rgba: 16777215 + rgba: 1946157055 key2: serializedVersion: 2 - rgba: 0 + rgba: 1929379840 key3: serializedVersion: 2 rgba: 0 @@ -7348,15 +7324,15 @@ ParticleSystem: ctime6: 0 ctime7: 0 atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 + atime1: 23323 + atime2: 48573 + atime3: 65535 atime4: 0 atime5: 0 atime6: 0 atime7: 0 m_NumColorKeys: 2 - m_NumAlphaKeys: 2 + m_NumAlphaKeys: 4 minGradient: key0: serializedVersion: 2 @@ -7706,7 +7682,7 @@ ParticleSystem: inWorldSpace: 1 randomizePerFrame: 0 ExternalForcesModule: - enabled: 1 + enabled: 0 multiplier: 1 ClampVelocityModule: enabled: 1 @@ -8291,7 +8267,7 @@ ParticleSystem: serializedVersion: 2 enabled: 1 startLifetime: - scalar: 2 + scalar: 1 maxCurve: serializedVersion: 2 m_Curve: @@ -8300,31 +8276,21 @@ ParticleSystem: inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 - m_RotationOrder: 4 + m_RotationOrder: 0 minCurve: serializedVersion: 2 m_Curve: - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 + value: 0.8 inSlope: 0 outSlope: 0 tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 + m_RotationOrder: 0 + minMaxState: 3 startSpeed: scalar: 3.5 maxCurve: @@ -8632,13 +8598,13 @@ ParticleSystem: inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 0.22644684 - value: 1 + - time: 0.28142065 + value: 0.3029613 inSlope: 0.01686853 outSlope: 0.01686853 tangentMode: 0 - time: 1 - value: 1 + value: 0.3029613 inSlope: 0.021367867 outSlope: 0.021367867 tangentMode: 0 @@ -8682,23 +8648,23 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0.06829268 + - time: 0.4129698 value: 1 inSlope: -0.9695949 outSlope: -0.9695949 tangentMode: 0 - - time: 0.21725425 - value: 0.638729 + - time: 0.519174 + value: 0.805016 inSlope: -1.0647887 outSlope: -1.0647887 tangentMode: 0 - - time: 0.3853658 - value: 0.17567565 + - time: 0.6872855 + value: 0.34196264 inSlope: -0.9234235 outSlope: -0.9234235 tangentMode: 0 - - time: 0.71219516 - value: 0 + - time: 1 + value: 0.1981777 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -8831,7 +8797,7 @@ ParticleSystem: minMaxState: 0 separateAxes: 0 ColorModule: - enabled: 0 + enabled: 1 gradient: maxGradient: key0: @@ -8867,15 +8833,15 @@ ParticleSystem: ctime6: 0 ctime7: 0 atime0: 0 - atime1: 65535 - atime2: 0 + atime1: 55319 + atime2: 65535 atime3: 0 atime4: 0 atime5: 0 atime6: 0 atime7: 0 m_NumColorKeys: 2 - m_NumAlphaKeys: 2 + m_NumAlphaKeys: 3 minGradient: key0: serializedVersion: 2 @@ -9215,7 +9181,7 @@ ParticleSystem: inWorldSpace: 0 randomizePerFrame: 0 ExternalForcesModule: - enabled: 1 + enabled: 0 multiplier: 1 ClampVelocityModule: enabled: 0 @@ -9748,8 +9714,8 @@ ParticleSystemRenderer: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 171426} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 m_Materials: - {fileID: 2100000, guid: 1f6cd8422334343f79297f73ba6c1138, type: 2} m_SubsetIndices: @@ -9789,8 +9755,8 @@ ParticleSystemRenderer: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 109034} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 m_Materials: - {fileID: 2100000, guid: 3792f11f1fed34a8cbc281b1b67e6a52, type: 2} m_SubsetIndices: @@ -9830,8 +9796,8 @@ ParticleSystemRenderer: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 120510} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 m_Materials: - {fileID: 2100000, guid: 3792f11f1fed34a8cbc281b1b67e6a52, type: 2} m_SubsetIndices: @@ -9871,8 +9837,8 @@ ParticleSystemRenderer: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 145426} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 m_Materials: - {fileID: 2100000, guid: 1f6cd8422334343f79297f73ba6c1138, type: 2} m_SubsetIndices: @@ -9912,8 +9878,8 @@ ParticleSystemRenderer: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 138446} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 m_Materials: - {fileID: 2100000, guid: ffbc8bc3b0bdbe64cbc4e14cb5e8cd02, type: 2} m_SubsetIndices: @@ -9953,8 +9919,8 @@ ParticleSystemRenderer: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 120308} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 m_Materials: - {fileID: 2100000, guid: c908f236db68d40d2a58337ce7ef39bb, type: 2} m_SubsetIndices: @@ -10126,6 +10092,14 @@ Prefab: propertyPath: Loop value: 0 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_IsKinematic + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_UseGravity + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} m_RootGameObject: {fileID: 181798} diff --git a/Assets/Prefabs/Demons/ArmorDemon.prefab b/Assets/Prefabs/Demons/ArmorDemon.prefab index 5ed4d62..ff4e493 100644 --- a/Assets/Prefabs/Demons/ArmorDemon.prefab +++ b/Assets/Prefabs/Demons/ArmorDemon.prefab @@ -28,6 +28,7 @@ GameObject: - 65: {fileID: 6500134} - 114: {fileID: 11490252} - 82: {fileID: 8229816} + - 54: {fileID: 5489074} m_Layer: 0 m_Name: ArmorDemon m_TagString: Untagged @@ -153,6 +154,21 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 181636} m_Mesh: {fileID: 4300000, guid: 9984b038cd18949d8abe89064ec9b38e, type: 3} +--- !u!54 &5489074 +Rigidbody: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 181368} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!65 &6500134 BoxCollider: m_ObjectHideFlags: 1 @@ -309,7 +325,7 @@ ParticleSystem: serializedVersion: 2 enabled: 1 startLifetime: - scalar: 1.5 + scalar: 1 maxCurve: serializedVersion: 2 m_Curve: @@ -318,31 +334,21 @@ ParticleSystem: inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 - m_RotationOrder: 4 + m_RotationOrder: 0 minCurve: serializedVersion: 2 m_Curve: - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 + value: 0.75 inSlope: 0 outSlope: 0 tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 + m_RotationOrder: 0 + minMaxState: 3 startSpeed: scalar: 1.5 maxCurve: @@ -641,7 +647,7 @@ ParticleSystem: serializedVersion: 2 m_Type: 0 rate: - scalar: 200 + scalar: 75 maxCurve: serializedVersion: 2 m_Curve: @@ -690,22 +696,22 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0.06829268 + - time: 0.47056144 value: 1 inSlope: -0.9695949 outSlope: -0.9695949 tangentMode: 0 - - time: 0.30607003 + - time: 0.7083388 value: 0.78398037 inSlope: -1.0647887 outSlope: -1.0647887 tangentMode: 0 - - time: 0.42155004 + - time: 0.8238188 value: 0.3712064 inSlope: -0.9234235 outSlope: -0.9234235 tangentMode: 0 - - time: 0.5543004 + - time: 0.9565692 value: 0 inSlope: 0 outSlope: 0 @@ -839,7 +845,7 @@ ParticleSystem: minMaxState: 0 separateAxes: 0 ColorModule: - enabled: 0 + enabled: 1 gradient: maxGradient: key0: @@ -875,15 +881,15 @@ ParticleSystem: ctime6: 0 ctime7: 0 atime0: 0 - atime1: 65535 - atime2: 0 + atime1: 57440 + atime2: 65535 atime3: 0 atime4: 0 atime5: 0 atime6: 0 atime7: 0 m_NumColorKeys: 2 - m_NumAlphaKeys: 2 + m_NumAlphaKeys: 3 minGradient: key0: serializedVersion: 2 @@ -1223,7 +1229,7 @@ ParticleSystem: inWorldSpace: 0 randomizePerFrame: 0 ExternalForcesModule: - enabled: 1 + enabled: 0 multiplier: 1 ClampVelocityModule: enabled: 0 @@ -1803,7 +1809,7 @@ ParticleSystem: serializedVersion: 2 enabled: 1 startLifetime: - scalar: 1.5 + scalar: 0.8 maxCurve: serializedVersion: 2 m_Curve: @@ -1812,31 +1818,21 @@ ParticleSystem: inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 - m_RotationOrder: 4 + m_RotationOrder: 0 minCurve: serializedVersion: 2 m_Curve: - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 + value: 0.75 inSlope: 0 outSlope: 0 tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 + m_RotationOrder: 0 + minMaxState: 3 startSpeed: scalar: 1.5 maxCurve: @@ -1967,7 +1963,7 @@ ParticleSystem: rgba: 251658239 minMaxState: 0 startSize: - scalar: 0.5 + scalar: 0.75 maxCurve: serializedVersion: 2 m_Curve: @@ -2135,7 +2131,7 @@ ParticleSystem: serializedVersion: 2 m_Type: 0 rate: - scalar: 120 + scalar: 40 maxCurve: serializedVersion: 2 m_Curve: @@ -2184,22 +2180,22 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0.06829268 - value: 1 + - time: 0.48801345 + value: 0.9851936 inSlope: -0.9695949 outSlope: -0.9695949 tangentMode: 0 - - time: 0.30607003 - value: 0.78398037 + - time: 0.7257908 + value: 0.769174 inSlope: -1.0647887 outSlope: -1.0647887 tangentMode: 0 - - time: 0.42155004 - value: 0.3712064 + - time: 0.8412708 + value: 0.3564 inSlope: -0.9234235 outSlope: -0.9234235 tangentMode: 0 - - time: 0.5543004 + - time: 0.9740212 value: 0 inSlope: 0 outSlope: 0 @@ -2333,7 +2329,7 @@ ParticleSystem: minMaxState: 0 separateAxes: 0 ColorModule: - enabled: 0 + enabled: 1 gradient: maxGradient: key0: @@ -2369,15 +2365,15 @@ ParticleSystem: ctime6: 0 ctime7: 0 atime0: 0 - atime1: 65535 - atime2: 0 + atime1: 57825 + atime2: 65535 atime3: 0 atime4: 0 atime5: 0 atime6: 0 atime7: 0 m_NumColorKeys: 2 - m_NumAlphaKeys: 2 + m_NumAlphaKeys: 3 minGradient: key0: serializedVersion: 2 @@ -2717,7 +2713,7 @@ ParticleSystem: inWorldSpace: 0 randomizePerFrame: 0 ExternalForcesModule: - enabled: 1 + enabled: 0 multiplier: 1 ClampVelocityModule: enabled: 0 @@ -3250,8 +3246,8 @@ ParticleSystemRenderer: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 192848} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 m_Materials: - {fileID: 2100000, guid: f93e574cdd49441e3b9f103d7ca2b2f4, type: 2} m_SubsetIndices: @@ -3291,8 +3287,8 @@ ParticleSystemRenderer: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 132732} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 m_Materials: - {fileID: 2100000, guid: f93e574cdd49441e3b9f103d7ca2b2f4, type: 2} m_SubsetIndices: @@ -3396,6 +3392,14 @@ Prefab: propertyPath: scream value: objectReference: {fileID: 8229816} + - target: {fileID: 0} + propertyPath: m_IsKinematic + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_UseGravity + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} m_RootGameObject: {fileID: 181368} diff --git a/Assets/Prefabs/Demons/BestDemon.prefab b/Assets/Prefabs/Demons/BestDemon.prefab index 27fb0fc..d160e52 100644 --- a/Assets/Prefabs/Demons/BestDemon.prefab +++ b/Assets/Prefabs/Demons/BestDemon.prefab @@ -65,6 +65,7 @@ GameObject: - 65: {fileID: 6564122} - 114: {fileID: 11433064} - 82: {fileID: 8243124} + - 54: {fileID: 5498342} m_Layer: 0 m_Name: BestDemon m_TagString: Untagged @@ -222,6 +223,21 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 150320} m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!54 &5498342 +Rigidbody: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 199716} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!65 &6564122 BoxCollider: m_ObjectHideFlags: 1 @@ -323,6 +339,7 @@ MonoBehaviour: demonBaseSpeed: 5 demonRenderer: {fileID: 0} particles: [] + scream: {fileID: 0} --- !u!136 &13661442 CapsuleCollider: m_ObjectHideFlags: 1 @@ -393,6 +410,14 @@ Prefab: propertyPath: m_audioClip value: objectReference: {fileID: 8300000, guid: 853e66dc19fdc4f1197db9c20d46319e, type: 3} + - target: {fileID: 0} + propertyPath: m_UseGravity + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_IsKinematic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} m_RootGameObject: {fileID: 199716} diff --git a/Assets/Prefabs/Demons/SpeedDemon.prefab b/Assets/Prefabs/Demons/SpeedDemon.prefab index 8fde146..70b4109 100644 --- a/Assets/Prefabs/Demons/SpeedDemon.prefab +++ b/Assets/Prefabs/Demons/SpeedDemon.prefab @@ -45,6 +45,7 @@ GameObject: - 65: {fileID: 6597768} - 114: {fileID: 11405694} - 82: {fileID: 8234712} + - 54: {fileID: 5448528} m_Layer: 0 m_Name: SpeedDemon m_TagString: Untagged @@ -153,6 +154,21 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 195408} m_Mesh: {fileID: 4300000, guid: 5bf2057d88df94dc6a8cd924bcaf6cfc, type: 3} +--- !u!54 &5448528 +Rigidbody: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 178524} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!65 &6597768 BoxCollider: m_ObjectHideFlags: 1 @@ -311,7 +327,7 @@ ParticleSystem: serializedVersion: 2 enabled: 1 startLifetime: - scalar: 1.5 + scalar: 1 maxCurve: serializedVersion: 2 m_Curve: @@ -320,31 +336,21 @@ ParticleSystem: inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 - m_RotationOrder: 4 + m_RotationOrder: 0 minCurve: serializedVersion: 2 m_Curve: - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 + value: 0.8 inSlope: 0 outSlope: 0 tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 + m_RotationOrder: 0 + minMaxState: 3 startSpeed: scalar: 1 maxCurve: @@ -355,30 +361,20 @@ ParticleSystem: inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 - m_RotationOrder: 4 + m_RotationOrder: 0 minCurve: serializedVersion: 2 m_Curve: - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 + value: 0.8 inSlope: 0 outSlope: 0 tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 - m_RotationOrder: 4 + m_RotationOrder: 0 minMaxState: 0 startColor: maxGradient: @@ -472,10 +468,10 @@ ParticleSystem: rgba: 4294967295 maxColor: serializedVersion: 2 - rgba: 251658239 + rgba: 385875967 minMaxState: 0 startSize: - scalar: 0.5 + scalar: 0.75 maxCurve: serializedVersion: 2 m_Curve: @@ -643,7 +639,7 @@ ParticleSystem: serializedVersion: 2 m_Type: 0 rate: - scalar: 50 + scalar: 30 maxCurve: serializedVersion: 2 m_Curve: @@ -692,22 +688,22 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0.06829268 - value: 1 + - time: 0.49499425 + value: 0.9817768 inSlope: -0.9695949 outSlope: -0.9695949 tangentMode: 0 - - time: 0.30607003 - value: 0.78398037 + - time: 0.73277164 + value: 0.76575714 inSlope: -1.0647887 outSlope: -1.0647887 tangentMode: 0 - - time: 0.42155004 - value: 0.3712064 + - time: 0.8482516 + value: 0.35298318 inSlope: -0.9234235 outSlope: -0.9234235 tangentMode: 0 - - time: 0.5543004 + - time: 0.981002 value: 0 inSlope: 0 outSlope: 0 @@ -841,18 +837,18 @@ ParticleSystem: minMaxState: 0 separateAxes: 0 ColorModule: - enabled: 0 + enabled: 1 gradient: maxGradient: key0: serializedVersion: 2 - rgba: 4294967295 + rgba: 16777215 key1: serializedVersion: 2 rgba: 4294967295 key2: serializedVersion: 2 - rgba: 0 + rgba: 4278190080 key3: serializedVersion: 2 rgba: 0 @@ -877,15 +873,15 @@ ParticleSystem: ctime6: 0 ctime7: 0 atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 + atime1: 3084 + atime2: 58403 + atime3: 65535 atime4: 0 atime5: 0 atime6: 0 atime7: 0 m_NumColorKeys: 2 - m_NumAlphaKeys: 2 + m_NumAlphaKeys: 4 minGradient: key0: serializedVersion: 2 @@ -1225,7 +1221,7 @@ ParticleSystem: inWorldSpace: 0 randomizePerFrame: 0 ExternalForcesModule: - enabled: 1 + enabled: 0 multiplier: 1 ClampVelocityModule: enabled: 0 @@ -1805,7 +1801,7 @@ ParticleSystem: serializedVersion: 2 enabled: 1 startLifetime: - scalar: 1.5 + scalar: 1 maxCurve: serializedVersion: 2 m_Curve: @@ -1814,31 +1810,21 @@ ParticleSystem: inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 - m_RotationOrder: 4 + m_RotationOrder: 0 minCurve: serializedVersion: 2 m_Curve: - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 + value: 0.8 inSlope: 0 outSlope: 0 tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 + m_RotationOrder: 0 + minMaxState: 3 startSpeed: scalar: 1 maxCurve: @@ -2137,7 +2123,7 @@ ParticleSystem: serializedVersion: 2 m_Type: 0 rate: - scalar: 50 + scalar: 30 maxCurve: serializedVersion: 2 m_Curve: @@ -2186,22 +2172,22 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0.06829268 - value: 1 + - time: 0.49761206 + value: 0.9863326 inSlope: -0.9695949 outSlope: -0.9695949 tangentMode: 0 - - time: 0.30607003 - value: 0.78398037 + - time: 0.7353894 + value: 0.77031296 inSlope: -1.0647887 outSlope: -1.0647887 tangentMode: 0 - - time: 0.42155004 - value: 0.3712064 + - time: 0.8508694 + value: 0.357539 inSlope: -0.9234235 outSlope: -0.9234235 tangentMode: 0 - - time: 0.5543004 + - time: 0.9836198 value: 0 inSlope: 0 outSlope: 0 @@ -2335,7 +2321,7 @@ ParticleSystem: minMaxState: 0 separateAxes: 0 ColorModule: - enabled: 0 + enabled: 1 gradient: maxGradient: key0: @@ -2371,15 +2357,15 @@ ParticleSystem: ctime6: 0 ctime7: 0 atime0: 0 - atime1: 65535 - atime2: 0 + atime1: 59945 + atime2: 65535 atime3: 0 atime4: 0 atime5: 0 atime6: 0 atime7: 0 m_NumColorKeys: 2 - m_NumAlphaKeys: 2 + m_NumAlphaKeys: 3 minGradient: key0: serializedVersion: 2 @@ -3252,8 +3238,8 @@ ParticleSystemRenderer: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 115930} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 m_Materials: - {fileID: 2100000, guid: fd1aca715a5d045259c6275f993e7a93, type: 2} m_SubsetIndices: @@ -3293,8 +3279,8 @@ ParticleSystemRenderer: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 174726} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 m_Materials: - {fileID: 2100000, guid: fd1aca715a5d045259c6275f993e7a93, type: 2} m_SubsetIndices: @@ -3402,6 +3388,14 @@ Prefab: propertyPath: scream value: objectReference: {fileID: 8234712} + - target: {fileID: 0} + propertyPath: m_UseGravity + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_IsKinematic + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} m_RootGameObject: {fileID: 178524} diff --git a/Assets/Prefabs/Demons/WellRoundedDemon.prefab b/Assets/Prefabs/Demons/WellRoundedDemon.prefab index dd20e75..c9b31fc 100644 --- a/Assets/Prefabs/Demons/WellRoundedDemon.prefab +++ b/Assets/Prefabs/Demons/WellRoundedDemon.prefab @@ -11,6 +11,7 @@ GameObject: - 65: {fileID: 6578690} - 114: {fileID: 11451698} - 82: {fileID: 8234558} + - 54: {fileID: 5485896} m_Layer: 0 m_Name: WellRoundedDemon m_TagString: Untagged @@ -153,6 +154,21 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 182450} m_Mesh: {fileID: 4300000, guid: 1b90a024a20bc4a02a75265544d9b8e4, type: 3} +--- !u!54 &5485896 +Rigidbody: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 108910} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!65 &6578690 BoxCollider: m_ObjectHideFlags: 1 @@ -311,7 +327,7 @@ ParticleSystem: serializedVersion: 2 enabled: 1 startLifetime: - scalar: 1.5 + scalar: 1 maxCurve: serializedVersion: 2 m_Curve: @@ -320,31 +336,21 @@ ParticleSystem: inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 - m_RotationOrder: 4 + m_RotationOrder: 0 minCurve: serializedVersion: 2 m_Curve: - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 + value: 0.8 inSlope: 0 outSlope: 0 tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 + m_RotationOrder: 0 + minMaxState: 3 startSpeed: scalar: 1 maxCurve: @@ -475,7 +481,7 @@ ParticleSystem: rgba: 4294967295 minMaxState: 0 startSize: - scalar: 0.5 + scalar: 0.75 maxCurve: serializedVersion: 2 m_Curve: @@ -692,22 +698,22 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0.06829268 - value: 1 + - time: 0.50022984 + value: 0.9692483 inSlope: -0.9695949 outSlope: -0.9695949 tangentMode: 0 - - time: 0.30607003 - value: 0.78398037 + - time: 0.7380072 + value: 0.75322866 inSlope: -1.0647887 outSlope: -1.0647887 tangentMode: 0 - - time: 0.42155004 - value: 0.3712064 + - time: 0.8534872 + value: 0.3404547 inSlope: -0.9234235 outSlope: -0.9234235 tangentMode: 0 - - time: 0.5543004 + - time: 0.9862376 value: 0 inSlope: 0 outSlope: 0 @@ -841,18 +847,18 @@ ParticleSystem: minMaxState: 0 separateAxes: 0 ColorModule: - enabled: 0 + enabled: 1 gradient: maxGradient: key0: serializedVersion: 2 - rgba: 4294967295 + rgba: 16777215 key1: serializedVersion: 2 rgba: 4294967295 key2: serializedVersion: 2 - rgba: 0 + rgba: 4278190080 key3: serializedVersion: 2 rgba: 0 @@ -877,15 +883,15 @@ ParticleSystem: ctime6: 0 ctime7: 0 atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 + atime1: 2699 + atime2: 61873 + atime3: 65535 atime4: 0 atime5: 0 atime6: 0 atime7: 0 m_NumColorKeys: 2 - m_NumAlphaKeys: 2 + m_NumAlphaKeys: 4 minGradient: key0: serializedVersion: 2 @@ -1225,7 +1231,7 @@ ParticleSystem: inWorldSpace: 0 randomizePerFrame: 0 ExternalForcesModule: - enabled: 1 + enabled: 0 multiplier: 1 ClampVelocityModule: enabled: 0 @@ -1805,7 +1811,7 @@ ParticleSystem: serializedVersion: 2 enabled: 1 startLifetime: - scalar: 1.5 + scalar: 1 maxCurve: serializedVersion: 2 m_Curve: @@ -1814,31 +1820,21 @@ ParticleSystem: inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 - m_RotationOrder: 4 + m_RotationOrder: 0 minCurve: serializedVersion: 2 m_Curve: - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 + value: 0.75 inSlope: 0 outSlope: 0 tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 + m_RotationOrder: 0 + minMaxState: 3 startSpeed: scalar: 1 maxCurve: @@ -2137,7 +2133,7 @@ ParticleSystem: serializedVersion: 2 m_Type: 0 rate: - scalar: 100 + scalar: 35 maxCurve: serializedVersion: 2 m_Curve: @@ -2186,23 +2182,23 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0.06829268 + - time: 0.50022984 value: 1 inSlope: -0.9695949 outSlope: -0.9695949 tangentMode: 0 - - time: 0.30607003 - value: 0.78398037 + - time: 0.7380072 + value: 0.7862582 inSlope: -1.0647887 outSlope: -1.0647887 tangentMode: 0 - - time: 0.42155004 - value: 0.3712064 + - time: 0.8534872 + value: 0.37348425 inSlope: -0.9234235 outSlope: -0.9234235 tangentMode: 0 - - time: 0.5543004 - value: 0 + - time: 0.9862376 + value: 0.002277851 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -2335,18 +2331,18 @@ ParticleSystem: minMaxState: 0 separateAxes: 0 ColorModule: - enabled: 0 + enabled: 1 gradient: maxGradient: key0: serializedVersion: 2 - rgba: 4294967295 + rgba: 16777215 key1: serializedVersion: 2 rgba: 4294967295 key2: serializedVersion: 2 - rgba: 0 + rgba: 4278190080 key3: serializedVersion: 2 rgba: 0 @@ -2371,15 +2367,15 @@ ParticleSystem: ctime6: 0 ctime7: 0 atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 + atime1: 2699 + atime2: 60524 + atime3: 65535 atime4: 0 atime5: 0 atime6: 0 atime7: 0 m_NumColorKeys: 2 - m_NumAlphaKeys: 2 + m_NumAlphaKeys: 4 minGradient: key0: serializedVersion: 2 @@ -3252,8 +3248,8 @@ ParticleSystemRenderer: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 184324} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 m_Materials: - {fileID: 2100000, guid: c908f236db68d40d2a58337ce7ef39bb, type: 2} m_SubsetIndices: @@ -3293,8 +3289,8 @@ ParticleSystemRenderer: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 140632} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 m_Materials: - {fileID: 2100000, guid: c908f236db68d40d2a58337ce7ef39bb, type: 2} m_SubsetIndices: @@ -3382,6 +3378,14 @@ Prefab: propertyPath: scream value: objectReference: {fileID: 8234558} + - target: {fileID: 0} + propertyPath: m_IsKinematic + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_UseGravity + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} m_RootGameObject: {fileID: 108910} diff --git a/Assets/Prefabs/Fire.prefab b/Assets/Prefabs/Fire.prefab index 9f5b236..af3fadc 100644 --- a/Assets/Prefabs/Fire.prefab +++ b/Assets/Prefabs/Fire.prefab @@ -41,7 +41,7 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 150834} m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071067} - m_LocalPosition: {x: 14.243793, y: -10, z: -14.880142} + m_LocalPosition: {x: 25.93298, y: 12.167769, z: -31.30574} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 460648} @@ -418,7 +418,7 @@ ParticleSystem: minMaxState: 0 randomizeRotationDirection: 0.5 gravityModifier: 0 - maxNumParticles: 1000 + maxNumParticles: 100 rotation3D: 1 ShapeModule: serializedVersion: 2 @@ -445,7 +445,7 @@ ParticleSystem: serializedVersion: 2 m_Type: 0 rate: - scalar: 35 + scalar: 20 maxCurve: serializedVersion: 2 m_Curve: diff --git a/Assets/Prefabs/FirstPersonCam.prefab b/Assets/Prefabs/FirstPersonCam.prefab index 5132541..9f853bb 100644 --- a/Assets/Prefabs/FirstPersonCam.prefab +++ b/Assets/Prefabs/FirstPersonCam.prefab @@ -2028,7 +2028,7 @@ Camera: m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 0 - m_OcclusionCulling: 1 + m_OcclusionCulling: 0 m_StereoConvergence: 10 m_StereoSeparation: 0.022 m_StereoMirrorMode: 0 @@ -2370,7 +2370,7 @@ ParticleSystem: serializedVersion: 2 enabled: 1 startLifetime: - scalar: 1 + scalar: 0.8 maxCurve: serializedVersion: 2 m_Curve: @@ -2379,31 +2379,21 @@ ParticleSystem: inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 - m_RotationOrder: 4 + m_RotationOrder: 0 minCurve: serializedVersion: 2 m_Curve: - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 + value: 0.75 inSlope: 0 outSlope: 0 tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 - m_RotationOrder: 4 - minMaxState: 0 + m_RotationOrder: 0 + minMaxState: 3 startSpeed: scalar: 3.5 maxCurve: @@ -2534,7 +2524,7 @@ ParticleSystem: rgba: 4294967295 minMaxState: 0 startSize: - scalar: 0.5 + scalar: 2 maxCurve: serializedVersion: 2 m_Curve: @@ -2702,7 +2692,7 @@ ParticleSystem: serializedVersion: 2 m_Type: 0 rate: - scalar: 75 + scalar: 35 maxCurve: serializedVersion: 2 m_Curve: @@ -2756,22 +2746,27 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0.06829268 + - time: 0 + value: 0.7858769 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 0.3553782 value: 1 - inSlope: -0.9695949 - outSlope: -0.9695949 + inSlope: -0.018988563 + outSlope: -0.018988563 tangentMode: 0 - - time: 0.21725425 - value: 0.638729 + - time: 0.50433975 + value: 0.590893 inSlope: -1.0647887 outSlope: -1.0647887 tangentMode: 0 - - time: 0.3853658 - value: 0.17567565 + - time: 0.6724513 + value: 0.12783964 inSlope: -0.9234235 outSlope: -0.9234235 tangentMode: 0 - - time: 0.71219516 + - time: 0.9992807 value: 0 inSlope: 0 outSlope: 0 @@ -2905,7 +2900,7 @@ ParticleSystem: minMaxState: 0 separateAxes: 0 ColorModule: - enabled: 0 + enabled: 1 gradient: maxGradient: key0: @@ -2941,15 +2936,15 @@ ParticleSystem: ctime6: 0 ctime7: 0 atime0: 0 - atime1: 65535 - atime2: 0 + atime1: 39514 + atime2: 65535 atime3: 0 atime4: 0 atime5: 0 atime6: 0 atime7: 0 m_NumColorKeys: 2 - m_NumAlphaKeys: 2 + m_NumAlphaKeys: 3 minGradient: key0: serializedVersion: 2 @@ -3289,7 +3284,7 @@ ParticleSystem: inWorldSpace: 1 randomizePerFrame: 0 ExternalForcesModule: - enabled: 1 + enabled: 0 multiplier: 1 ClampVelocityModule: enabled: 0 @@ -3822,8 +3817,8 @@ ParticleSystemRenderer: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 134072} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 m_Materials: - {fileID: 2100000, guid: 3792f11f1fed34a8cbc281b1b67e6a52, type: 2} m_SubsetIndices: diff --git a/Assets/Prefabs/HUDCanvas.prefab b/Assets/Prefabs/HUDCanvas.prefab index 382ee7c..5410251 100644 --- a/Assets/Prefabs/HUDCanvas.prefab +++ b/Assets/Prefabs/HUDCanvas.prefab @@ -1680,7 +1680,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1894,7 +1894,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2350,7 +2350,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 80a8866..d523fdb 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -41,7 +41,7 @@ RenderSettings: LightmapSettings: m_ObjectHideFlags: 0 serializedVersion: 6 - m_GIWorkflowMode: 0 + m_GIWorkflowMode: 1 m_LightmapsMode: 1 m_GISettings: serializedVersion: 2 @@ -182,7 +182,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 22454250, guid: 667e52f3e33d0405aa88fd3809137573, type: 2} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 22454250, guid: 667e52f3e33d0405aa88fd3809137573, type: 2} propertyPath: m_AnchoredPosition.x @@ -306,6 +306,10 @@ Prefab: propertyPath: m_IsTrigger value: 1 objectReference: {fileID: 0} + - target: {fileID: 100000, guid: e174a597dfff98d4fa6d9f1dbd099816, type: 2} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 6400000, guid: e174a597dfff98d4fa6d9f1dbd099816, type: 2} m_ParentPrefab: {fileID: 100100000, guid: e174a597dfff98d4fa6d9f1dbd099816, type: 2} @@ -377,7 +381,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!4 &687226198 Transform: @@ -439,7 +443,7 @@ Camera: m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 0 - m_OcclusionCulling: 1 + m_OcclusionCulling: 0 m_StereoConvergence: 10 m_StereoSeparation: 0.022 m_StereoMirrorMode: 0 @@ -593,6 +597,30 @@ Prefab: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 766dc6c8b0b7646bbbee0dd810ccb597, type: 2} + - target: {fileID: 100010, guid: 32cf8dfbba5aa457f95ff719bf2708ed, type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: 32cf8dfbba5aa457f95ff719bf2708ed, type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 32cf8dfbba5aa457f95ff719bf2708ed, type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} + - target: {fileID: 100006, guid: 32cf8dfbba5aa457f95ff719bf2708ed, type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} + - target: {fileID: 100004, guid: 32cf8dfbba5aa457f95ff719bf2708ed, type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} + - target: {fileID: 100008, guid: 32cf8dfbba5aa457f95ff719bf2708ed, type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 32cf8dfbba5aa457f95ff719bf2708ed, type: 3} m_IsPrefabParent: 0 @@ -638,100 +666,6 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 18367096ef150464a9845586ba6d32bd, type: 2} m_IsPrefabParent: 0 ---- !u!1001 &1126376306 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1580836016} - m_Modifications: - - target: {fileID: 400000, guid: 8ba14aabdbe89437bb3e641e7d4521fd, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 8ba14aabdbe89437bb3e641e7d4521fd, type: 2} - propertyPath: m_LocalPosition.y - value: -0.571 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 8ba14aabdbe89437bb3e641e7d4521fd, type: 2} - propertyPath: m_LocalPosition.z - value: -8.46 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 8ba14aabdbe89437bb3e641e7d4521fd, type: 2} - propertyPath: m_LocalRotation.x - value: 0.005138637 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 8ba14aabdbe89437bb3e641e7d4521fd, type: 2} - propertyPath: m_LocalRotation.y - value: 0.98092127 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 8ba14aabdbe89437bb3e641e7d4521fd, type: 2} - propertyPath: m_LocalRotation.z - value: -0.19375211 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 8ba14aabdbe89437bb3e641e7d4521fd, type: 2} - propertyPath: m_LocalRotation.w - value: -0.015071889 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 8ba14aabdbe89437bb3e641e7d4521fd, type: 2} - propertyPath: m_LocalEulerAnglesHint.z - value: 56.491486 - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 8ba14aabdbe89437bb3e641e7d4521fd, type: 2} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 10800000, guid: 8ba14aabdbe89437bb3e641e7d4521fd, type: 2} - propertyPath: m_Intensity - value: 0.94 - objectReference: {fileID: 0} - - target: {fileID: 10800000, guid: 8ba14aabdbe89437bb3e641e7d4521fd, type: 2} - propertyPath: m_ActuallyLightmapped - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 10800000, guid: 8ba14aabdbe89437bb3e641e7d4521fd, type: 2} - propertyPath: m_Color.r - value: 0.625 - objectReference: {fileID: 0} - - target: {fileID: 10800000, guid: 8ba14aabdbe89437bb3e641e7d4521fd, type: 2} - propertyPath: m_Color.g - value: 0.625 - objectReference: {fileID: 0} - - target: {fileID: 10800000, guid: 8ba14aabdbe89437bb3e641e7d4521fd, type: 2} - propertyPath: m_Color.b - value: 0.625 - objectReference: {fileID: 0} - - target: {fileID: 10800000, guid: 8ba14aabdbe89437bb3e641e7d4521fd, type: 2} - propertyPath: m_BounceIntensity - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 10800000, guid: 8ba14aabdbe89437bb3e641e7d4521fd, type: 2} - propertyPath: m_Lightmapping - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 8ba14aabdbe89437bb3e641e7d4521fd, type: 2} - propertyPath: m_LocalScale.x - value: 1.0064967 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 8ba14aabdbe89437bb3e641e7d4521fd, type: 2} - propertyPath: m_LocalScale.y - value: 4.46748 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 8ba14aabdbe89437bb3e641e7d4521fd, type: 2} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 8ba14aabdbe89437bb3e641e7d4521fd, type: 2} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 8ba14aabdbe89437bb3e641e7d4521fd, type: 2} - propertyPath: m_LocalScale.z - value: 4.4658732 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 8ba14aabdbe89437bb3e641e7d4521fd, type: 2} - m_IsPrefabParent: 0 --- !u!1001 &1151858808 Prefab: m_ObjectHideFlags: 0 @@ -917,7 +851,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!4 &1580836016 Transform: @@ -930,7 +864,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 687226198} - - {fileID: 1738876680} m_Father: {fileID: 0} m_RootOrder: 2 --- !u!1 &1600137746 @@ -1008,7 +941,7 @@ Camera: m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 0 - m_OcclusionCulling: 1 + m_OcclusionCulling: 0 m_StereoConvergence: 10 m_StereoSeparation: 0.022 m_StereoMirrorMode: 0 @@ -1371,7 +1304,7 @@ Transform: - {fileID: 1525463722} - {fileID: 1196761909} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 --- !u!114 &1731272130 stripped MonoBehaviour: m_PrefabParentObject: {fileID: 11495132, guid: 05ca14c2fb040475797d4c0d25579f9c, @@ -1382,68 +1315,6 @@ MonoBehaviour: Transform: m_PrefabParentObject: {fileID: 459270, guid: 05ca14c2fb040475797d4c0d25579f9c, type: 2} m_PrefabInternal: {fileID: 1151858808} ---- !u!1 &1738876678 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100000, guid: 8ba14aabdbe89437bb3e641e7d4521fd, type: 2} - m_PrefabInternal: {fileID: 1126376306} - serializedVersion: 4 - m_Component: - - 4: {fileID: 1738876680} - - 108: {fileID: 1738876679} - m_Layer: 0 - m_Name: DirectionalLight - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!108 &1738876679 -Light: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 10800000, guid: 8ba14aabdbe89437bb3e641e7d4521fd, - type: 2} - m_PrefabInternal: {fileID: 1126376306} - m_GameObject: {fileID: 1738876678} - m_Enabled: 1 - serializedVersion: 6 - m_Type: 1 - m_Color: {r: 0.625, g: 0.625, b: 0.625, a: 1} - m_Intensity: 0.94 - m_Range: 10 - m_SpotAngle: 30 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_Lightmapping: 4 - m_BounceIntensity: 1 - m_ShadowRadius: 0 - m_ShadowAngle: 0 - m_AreaSize: {x: 1, y: 1} ---- !u!4 &1738876680 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 400000, guid: 8ba14aabdbe89437bb3e641e7d4521fd, type: 2} - m_PrefabInternal: {fileID: 1126376306} - m_GameObject: {fileID: 1738876678} - m_LocalRotation: {x: 0.005138637, y: 0.98092127, z: -0.19375211, w: -0.015071889} - m_LocalPosition: {x: 0, y: -0.571, z: -8.46} - m_LocalScale: {x: 1.0064967, y: 4.46748, z: 4.4658732} - m_Children: [] - m_Father: {fileID: 1580836016} - m_RootOrder: 1 --- !u!1 &1749088705 GameObject: m_ObjectHideFlags: 0 @@ -1504,7 +1375,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 --- !u!1 &2057165882 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/BoatWaveData.cs b/Assets/Scripts/BoatWaveData.cs index 5de5a8d..71879b1 100644 --- a/Assets/Scripts/BoatWaveData.cs +++ b/Assets/Scripts/BoatWaveData.cs @@ -1,6 +1,3 @@ -using UnityEngine; -using System.Collections; - public class BoatWaveData { protected float[] speeds = new float[3] {2.0F, 5.0F, 8.0F}; diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 15c0224..5d57039 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -90,14 +90,14 @@ PlayerSettings: 16:9: 1 Others: 1 bundleIdentifier: com.vanitymetrics.mournfulhorn - bundleVersion: 1.1 + bundleVersion: 1.2 preloadedAssets: [] metroEnableIndependentInputSource: 0 metroEnableLowLatencyPresentationAPI: 0 xboxOneDisableKinectGpuReservation: 0 virtualRealitySupported: 0 productGUID: 80d6da34e80ef4e6980a482d35e0a770 - AndroidBundleVersionCode: 2 + AndroidBundleVersionCode: 3 AndroidMinSdkVersion: 18 AndroidPreferredInstallLocation: 1 aotOptions: diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 861e617..d402c8b 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -4,7 +4,7 @@ QualitySettings: m_ObjectHideFlags: 0 serializedVersion: 5 - m_CurrentQuality: 5 + m_CurrentQuality: 0 m_QualitySettings: - serializedVersion: 2 name: Fastest @@ -17,8 +17,8 @@ QualitySettings: shadowNearPlaneOffset: 2 shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - blendWeights: 1 - textureQuality: 1 + blendWeights: 2 + textureQuality: 2 anisotropicTextures: 0 antiAliasing: 0 softParticles: 0 @@ -32,134 +32,7 @@ QualitySettings: asyncUploadTimeSlice: 2 asyncUploadBufferSize: 4 excludedTargetPlatforms: [] - - serializedVersion: 2 - name: Fast - pixelLightCount: 0 - shadows: 0 - shadowResolution: 0 - shadowProjection: 1 - shadowCascades: 1 - shadowDistance: 20 - shadowNearPlaneOffset: 2 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - blendWeights: 2 - textureQuality: 0 - anisotropicTextures: 0 - antiAliasing: 0 - softParticles: 0 - softVegetation: 0 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - vSyncCount: 0 - lodBias: 0.4 - maximumLODLevel: 0 - particleRaycastBudget: 16 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: Simple - pixelLightCount: 1 - shadows: 1 - shadowResolution: 0 - shadowProjection: 1 - shadowCascades: 1 - shadowDistance: 20 - shadowNearPlaneOffset: 2 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - blendWeights: 2 - textureQuality: 0 - anisotropicTextures: 1 - antiAliasing: 0 - softParticles: 0 - softVegetation: 0 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - vSyncCount: 0 - lodBias: 0.7 - maximumLODLevel: 0 - particleRaycastBudget: 64 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: Good - pixelLightCount: 2 - shadows: 2 - shadowResolution: 1 - shadowProjection: 1 - shadowCascades: 2 - shadowDistance: 40 - shadowNearPlaneOffset: 2 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - blendWeights: 2 - textureQuality: 0 - anisotropicTextures: 1 - antiAliasing: 0 - softParticles: 0 - softVegetation: 1 - realtimeReflectionProbes: 1 - billboardsFaceCameraPosition: 1 - vSyncCount: 1 - lodBias: 1 - maximumLODLevel: 0 - particleRaycastBudget: 256 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: Beautiful - pixelLightCount: 3 - shadows: 2 - shadowResolution: 2 - shadowProjection: 1 - shadowCascades: 2 - shadowDistance: 70 - shadowNearPlaneOffset: 2 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - blendWeights: 4 - textureQuality: 0 - anisotropicTextures: 2 - antiAliasing: 2 - softParticles: 1 - softVegetation: 1 - realtimeReflectionProbes: 1 - billboardsFaceCameraPosition: 1 - vSyncCount: 1 - lodBias: 1.5 - maximumLODLevel: 0 - particleRaycastBudget: 1024 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: Fantastic - pixelLightCount: 4 - shadows: 2 - shadowResolution: 2 - shadowProjection: 1 - shadowCascades: 4 - shadowDistance: 150 - shadowNearPlaneOffset: 2 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - blendWeights: 4 - textureQuality: 0 - anisotropicTextures: 2 - antiAliasing: 2 - softParticles: 1 - softVegetation: 1 - realtimeReflectionProbes: 1 - billboardsFaceCameraPosition: 1 - vSyncCount: 1 - lodBias: 2 - maximumLODLevel: 0 - particleRaycastBudget: 4096 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 4 - excludedTargetPlatforms: [] - m_PerPlatformDefaultQuality: {} + m_PerPlatformDefaultQuality: + Android: 0 + Standalone: 0 + Web: 0