From 8cff61ae91c99cb59cd72b75fbe177be6ce838af Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Sun, 11 Dec 2016 13:32:21 +0700 Subject: [PATCH] little refactor --- .../Prefabs/Dragosha/Dungeon/TileA.prefab | 22 +- .../Examples/Prefabs/Kenney/Water4.prefab | 1243 ++++++++++++++--- .../Examples/Prefabs/Simple/Cube_1x1x1.prefab | 16 +- .../Examples/Prefabs/Simple/Cube_1x1x3.prefab | 16 +- .../Examples/Prefabs/Simple/Cube_1x3x1.prefab | 16 +- .../Examples/Prefabs/Simple/Cube_3x1x1.prefab | 16 +- .../Examples/Prefabs/Simple/Floor.prefab | 25 +- .../Examples/Prefabs/Simple/Floor_3x3.prefab | 16 +- .../Prefabs/Simple/Model_1x1x1.prefab | 347 +++-- .../Examples/Prefabs/Simple/Wall_l.prefab | 25 +- .../Examples/Prefabs/Simple/Wall_r.prefab | 25 +- .../Examples/Prefabs/Simple/Wallx3_l.prefab | 25 +- .../Examples/Prefabs/Simple/Wallx3_r.prefab | 25 +- .../IsoTools/Scripts/Internal/IsoAssocList.cs | 8 +- Assets/IsoTools/Scripts/Internal/IsoList.cs | 2 +- Assets/IsoTools/Scripts/Internal/IsoPool.cs | 11 +- Assets/IsoTools/Scripts/IsoWorld.cs | 4 +- ProjectSettings/GraphicsSettings.asset | 24 +- ProjectSettings/ProjectVersion.txt | 3 +- ProjectSettings/UnityAdsSettings.asset | 11 - ProjectSettings/UnityConnectSettings.asset | 15 + 21 files changed, 1447 insertions(+), 448 deletions(-) delete mode 100644 ProjectSettings/UnityAdsSettings.asset diff --git a/Assets/IsoTools/Examples/Prefabs/Dragosha/Dungeon/TileA.prefab b/Assets/IsoTools/Examples/Prefabs/Dragosha/Dungeon/TileA.prefab index 44d1ce7..d76cf10 100644 --- a/Assets/IsoTools/Examples/Prefabs/Dragosha/Dungeon/TileA.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Dragosha/Dungeon/TileA.prefab @@ -5,10 +5,10 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 490734} - - 212: {fileID: 21210794} + - component: {fileID: 490734} + - component: {fileID: 21210794} m_Layer: 0 m_Name: New Sprite m_TagString: Untagged @@ -21,10 +21,10 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 417424} - - 114: {fileID: 11472392} + - component: {fileID: 417424} + - component: {fileID: 11472392} m_Layer: 0 m_Name: TileA m_TagString: Untagged @@ -41,11 +41,11 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2.2000008, y: -3.3, z: 1.3000001} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 490734} m_Father: {fileID: 0} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &490734 Transform: m_ObjectHideFlags: 1 @@ -55,10 +55,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.011, y: 1.85, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 417424} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &11472392 MonoBehaviour: m_ObjectHideFlags: 1 @@ -89,7 +89,9 @@ SpriteRenderer: m_ReflectionProbeUsage: 0 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -97,7 +99,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 1 + m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/Assets/IsoTools/Examples/Prefabs/Kenney/Water4.prefab b/Assets/IsoTools/Examples/Prefabs/Kenney/Water4.prefab index b1832be..99b0504 100644 --- a/Assets/IsoTools/Examples/Prefabs/Kenney/Water4.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Kenney/Water4.prefab @@ -5,10 +5,10 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 458188} - - 212: {fileID: 21257460} + - component: {fileID: 458188} + - component: {fileID: 21257460} m_Layer: 0 m_Name: New Sprite m_TagString: Untagged @@ -21,11 +21,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 485082} - - 198: {fileID: 19803878} - - 199: {fileID: 19980090} + - component: {fileID: 485082} + - component: {fileID: 19803878} + - component: {fileID: 19980090} m_Layer: 0 m_Name: Particle System m_TagString: Untagged @@ -38,10 +38,10 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 410592} - - 114: {fileID: 11409182} + - component: {fileID: 410592} + - component: {fileID: 11409182} m_Layer: 0 m_Name: Water4 m_TagString: Untagged @@ -58,12 +58,12 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.64999974, y: -0.9749999, z: 3.125} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 458188} - {fileID: 485082} m_Father: {fileID: 0} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &458188 Transform: m_ObjectHideFlags: 1 @@ -73,10 +73,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 410592} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &485082 Transform: m_ObjectHideFlags: 1 @@ -86,10 +86,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.002, y: 0.731, z: -0.1} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 410592} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &11409182 MonoBehaviour: m_ObjectHideFlags: 1 @@ -112,19 +112,26 @@ ParticleSystem: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 122872} - serializedVersion: 4 + serializedVersion: 5 lengthInSec: 5 + speed: 1 + looping: 1 + prewarm: 0 + playOnAwake: 1 + autoRandomSeed: 1 startDelay: scalar: 0 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -135,12 +142,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -149,23 +158,20 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 minMaxState: 0 - speed: 1 - looping: 1 - prewarm: 0 - playOnAwake: 1 - moveWithTransform: 1 - autoRandomSeed: 1 + moveWithTransform: 0 + moveWithCustomTransform: {fileID: 0} scalingMode: 2 randomSeed: 0 InitialModule: - serializedVersion: 2 + serializedVersion: 3 enabled: 1 startLifetime: scalar: 1.5 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 @@ -176,7 +182,8 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0.6666667 inSlope: 0 outSlope: 0 @@ -190,12 +197,14 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -206,12 +215,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -263,6 +274,7 @@ ParticleSystem: atime5: 0 atime6: 0 atime7: 0 + m_Mode: 0 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -306,6 +318,7 @@ ParticleSystem: atime5: 0 atime6: 0 atime7: 0 + m_Mode: 0 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minColor: {r: 0.7019608, g: 1, b: 1, a: 0.37254903} @@ -316,7 +329,8 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 @@ -327,7 +341,8 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0.6666667 inSlope: 0 outSlope: 0 @@ -341,12 +356,14 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -357,12 +374,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -376,12 +395,14 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -392,12 +413,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -411,12 +434,14 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -427,12 +452,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -446,12 +473,14 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -462,12 +491,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -481,12 +512,14 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -497,12 +530,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -512,12 +547,50 @@ ParticleSystem: m_RotationOrder: 4 minMaxState: 0 randomizeRotationDirection: 0 - gravityModifier: 0 maxNumParticles: 1000 size3D: 0 rotation3D: 0 + gravityModifier: + scalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minMaxState: 0 ShapeModule: - serializedVersion: 2 + serializedVersion: 3 enabled: 1 type: 5 radius: 0.2 @@ -533,24 +606,28 @@ ParticleSystem: m_SkinnedMeshRenderer: {fileID: 0} m_MeshMaterialIndex: 0 m_MeshNormalOffset: 0 + m_MeshScale: 1 m_UseMeshMaterialIndex: 0 m_UseMeshColors: 1 - randomDirection: 0 + alignToDirection: 0 + randomDirectionAmount: 0 + sphericalDirectionAmount: 0 EmissionModule: enabled: 1 - serializedVersion: 2 - m_Type: 0 - rate: + serializedVersion: 3 + rateOverTime: scalar: 10.8 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -561,12 +638,53 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minMaxState: 0 + rateOverDistance: + scalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -595,12 +713,14 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -611,12 +731,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -630,12 +752,14 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -646,12 +770,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -665,12 +791,14 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -681,12 +809,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -703,12 +833,14 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -719,12 +851,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -738,12 +872,14 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -754,12 +890,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -773,12 +911,14 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -789,12 +929,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -849,6 +991,7 @@ ParticleSystem: atime5: 0 atime6: 0 atime7: 0 + m_Mode: 0 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -892,6 +1035,7 @@ ParticleSystem: atime5: 0 atime6: 0 atime7: 0 + m_Mode: 0 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minColor: {r: 1, g: 1, b: 1, a: 1} @@ -904,12 +1048,14 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 1 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 1 outSlope: 0 @@ -920,12 +1066,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 1 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 1 outSlope: 0 @@ -939,12 +1087,14 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -955,12 +1105,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -975,6 +1127,8 @@ ParticleSystem: rowIndex: 0 cycles: 1 uvChannelMask: -1 + flipU: 0 + flipV: 0 randomRow: 1 VelocityModule: enabled: 1 @@ -983,7 +1137,8 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: -1 inSlope: 0 outSlope: 0 @@ -994,7 +1149,8 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 @@ -1008,7 +1164,8 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0.8571429 inSlope: 0 outSlope: 0 @@ -1019,7 +1176,8 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 @@ -1033,7 +1191,8 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 @@ -1044,7 +1203,8 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 @@ -1062,12 +1222,14 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1078,12 +1240,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1099,12 +1263,14 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1115,12 +1281,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1134,12 +1302,14 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1150,12 +1320,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1169,12 +1341,14 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1185,12 +1359,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1211,12 +1387,14 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1227,12 +1405,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1246,12 +1426,14 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1262,12 +1444,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1281,12 +1465,14 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1297,12 +1483,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1316,12 +1504,14 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1332,12 +1522,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1349,19 +1541,21 @@ ParticleSystem: separateAxis: 0 inWorldSpace: 0 dampen: 1 - SizeBySpeedModule: + NoiseModule: enabled: 0 - curve: + strength: scalar: 1 maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1372,12 +1566,297 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minMaxState: 0 + strengthY: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minMaxState: 0 + strengthZ: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minMaxState: 0 + separateAxes: 0 + frequency: 0.5 + damping: 1 + octaves: 1 + octaveMultiplier: 0.5 + octaveScale: 2 + quality: 2 + scrollSpeed: + scalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minMaxState: 0 + remap: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: -1 + inSlope: 0 + outSlope: 2 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 2 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minMaxState: 1 + remapY: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: -1 + inSlope: 0 + outSlope: 2 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 2 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minMaxState: 1 + remapZ: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: -1 + inSlope: 0 + outSlope: 2 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 2 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minMaxState: 1 + remapEnabled: 0 + SizeBySpeedModule: + enabled: 0 + curve: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1391,12 +1870,14 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1407,12 +1888,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1426,12 +1909,14 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1442,12 +1927,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1465,12 +1952,14 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1481,12 +1970,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1500,12 +1991,14 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1516,12 +2009,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1535,12 +2030,14 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1551,12 +2048,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1612,6 +2111,7 @@ ParticleSystem: atime5: 0 atime6: 0 atime7: 0 + m_Mode: 0 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -1655,6 +2155,7 @@ ParticleSystem: atime5: 0 atime6: 0 atime7: 0 + m_Mode: 0 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minColor: {r: 1, g: 1, b: 1, a: 1} @@ -1677,12 +2178,14 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1693,12 +2196,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1712,12 +2217,14 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1728,12 +2235,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1747,12 +2256,14 @@ ParticleSystem: maxCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 0 outSlope: 0 @@ -1763,12 +2274,14 @@ ParticleSystem: minCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1803,15 +2316,376 @@ ParticleSystem: exit: 0 radiusScale: 1 SubModule: + serializedVersion: 2 enabled: 0 - subEmitterBirth: {fileID: 0} - subEmitterBirth1: {fileID: 0} - subEmitterCollision: {fileID: 0} - subEmitterCollision1: {fileID: 0} - subEmitterDeath: {fileID: 0} - subEmitterDeath1: {fileID: 0} + subEmitters: + - emitter: {fileID: 0} + type: 0 + properties: 0 + LightsModule: + enabled: 0 + ratio: 0 + light: {fileID: 0} + randomDistribution: 1 + color: 1 + range: 1 + intensity: 1 + rangeCurve: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minMaxState: 0 + intensityCurve: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minMaxState: 0 + maxLights: 20 + TrailModule: + enabled: 0 + ratio: 1 + lifetime: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minMaxState: 0 + minVertexDistance: 0.2 + textureMode: 0 + worldSpace: 0 + dieWithParticles: 1 + sizeAffectsWidth: 1 + sizeAffectsLifetime: 0 + inheritParticleColor: 1 + colorOverLifetime: + serializedVersion: 2 + maxGradient: + key0: + serializedVersion: 2 + rgba: 4294967295 + key1: + serializedVersion: 2 + rgba: 4294967295 + key2: + serializedVersion: 2 + rgba: 0 + key3: + serializedVersion: 2 + rgba: 0 + key4: + serializedVersion: 2 + rgba: 0 + key5: + serializedVersion: 2 + rgba: 0 + key6: + serializedVersion: 2 + rgba: 0 + key7: + serializedVersion: 2 + rgba: 0 + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minGradient: + key0: + serializedVersion: 2 + rgba: 4294967295 + key1: + serializedVersion: 2 + rgba: 4294967295 + key2: + serializedVersion: 2 + rgba: 0 + key3: + serializedVersion: 2 + rgba: 0 + key4: + serializedVersion: 2 + rgba: 0 + key5: + serializedVersion: 2 + rgba: 0 + key6: + serializedVersion: 2 + rgba: 0 + key7: + serializedVersion: 2 + rgba: 0 + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minColor: {r: 1, g: 1, b: 1, a: 1} + maxColor: {r: 1, g: 1, b: 1, a: 1} + minMaxState: 0 + widthOverTrail: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minMaxState: 0 + colorOverTrail: + serializedVersion: 2 + maxGradient: + key0: + serializedVersion: 2 + rgba: 4294967295 + key1: + serializedVersion: 2 + rgba: 4294967295 + key2: + serializedVersion: 2 + rgba: 0 + key3: + serializedVersion: 2 + rgba: 0 + key4: + serializedVersion: 2 + rgba: 0 + key5: + serializedVersion: 2 + rgba: 0 + key6: + serializedVersion: 2 + rgba: 0 + key7: + serializedVersion: 2 + rgba: 0 + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minGradient: + key0: + serializedVersion: 2 + rgba: 4294967295 + key1: + serializedVersion: 2 + rgba: 4294967295 + key2: + serializedVersion: 2 + rgba: 0 + key3: + serializedVersion: 2 + rgba: 0 + key4: + serializedVersion: 2 + rgba: 0 + key5: + serializedVersion: 2 + rgba: 0 + key6: + serializedVersion: 2 + rgba: 0 + key7: + serializedVersion: 2 + rgba: 0 + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minColor: {r: 1, g: 1, b: 1, a: 1} + maxColor: {r: 1, g: 1, b: 1, a: 1} + minMaxState: 0 --- !u!199 &19980090 ParticleSystemRenderer: + serializedVersion: 2 m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} @@ -1824,7 +2698,10 @@ ParticleSystemRenderer: m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_SubsetIndices: + - {fileID: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -1832,7 +2709,7 @@ ParticleSystemRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 @@ -1850,6 +2727,8 @@ ParticleSystemRenderer: m_NormalDirection: 1 m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} + m_UseCustomVertexStreams: 0 + m_VertexStreamMask: 27 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -1868,7 +2747,9 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -1876,7 +2757,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 1 + m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/Assets/IsoTools/Examples/Prefabs/Simple/Cube_1x1x1.prefab b/Assets/IsoTools/Examples/Prefabs/Simple/Cube_1x1x1.prefab index 6ddf975..03a1e0d 100644 --- a/Assets/IsoTools/Examples/Prefabs/Simple/Cube_1x1x1.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Simple/Cube_1x1x1.prefab @@ -5,11 +5,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 417528} - - 212: {fileID: 21217528} - - 114: {fileID: 11417528} + - component: {fileID: 417528} + - component: {fileID: 21217528} + - component: {fileID: 11417528} m_Layer: 0 m_Name: Cube_1x1x1 m_TagString: Untagged @@ -26,10 +26,10 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &11417528 MonoBehaviour: m_ObjectHideFlags: 1 @@ -60,7 +60,9 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -68,7 +70,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 1 + m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/Assets/IsoTools/Examples/Prefabs/Simple/Cube_1x1x3.prefab b/Assets/IsoTools/Examples/Prefabs/Simple/Cube_1x1x3.prefab index 1e069b0..e09c2e6 100644 --- a/Assets/IsoTools/Examples/Prefabs/Simple/Cube_1x1x3.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Simple/Cube_1x1x3.prefab @@ -5,11 +5,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 463702} - - 212: {fileID: 21263702} - - 114: {fileID: 11463702} + - component: {fileID: 463702} + - component: {fileID: 21263702} + - component: {fileID: 11463702} m_Layer: 0 m_Name: Cube_1x1x3 m_TagString: Untagged @@ -26,10 +26,10 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &11463702 MonoBehaviour: m_ObjectHideFlags: 1 @@ -60,7 +60,9 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -68,7 +70,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 1 + m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/Assets/IsoTools/Examples/Prefabs/Simple/Cube_1x3x1.prefab b/Assets/IsoTools/Examples/Prefabs/Simple/Cube_1x3x1.prefab index 9725e9c..9b5117b 100644 --- a/Assets/IsoTools/Examples/Prefabs/Simple/Cube_1x3x1.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Simple/Cube_1x3x1.prefab @@ -5,11 +5,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 453620} - - 212: {fileID: 21253620} - - 114: {fileID: 11453620} + - component: {fileID: 453620} + - component: {fileID: 21253620} + - component: {fileID: 11453620} m_Layer: 0 m_Name: Cube_1x3x1 m_TagString: Untagged @@ -26,10 +26,10 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &11453620 MonoBehaviour: m_ObjectHideFlags: 1 @@ -60,7 +60,9 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -68,7 +70,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 1 + m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/Assets/IsoTools/Examples/Prefabs/Simple/Cube_3x1x1.prefab b/Assets/IsoTools/Examples/Prefabs/Simple/Cube_3x1x1.prefab index ea07008..260b65d 100644 --- a/Assets/IsoTools/Examples/Prefabs/Simple/Cube_3x1x1.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Simple/Cube_3x1x1.prefab @@ -5,11 +5,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 462204} - - 212: {fileID: 21262204} - - 114: {fileID: 11462204} + - component: {fileID: 462204} + - component: {fileID: 21262204} + - component: {fileID: 11462204} m_Layer: 0 m_Name: Cube_3x1x1 m_TagString: Untagged @@ -26,10 +26,10 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &11462204 MonoBehaviour: m_ObjectHideFlags: 1 @@ -60,7 +60,9 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -68,7 +70,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 1 + m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/Assets/IsoTools/Examples/Prefabs/Simple/Floor.prefab b/Assets/IsoTools/Examples/Prefabs/Simple/Floor.prefab index 6831ac7..700d8b7 100644 --- a/Assets/IsoTools/Examples/Prefabs/Simple/Floor.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Simple/Floor.prefab @@ -5,11 +5,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 418276} - - 212: {fileID: 21218276} - - 114: {fileID: 11418276} + - component: {fileID: 418276} + - component: {fileID: 21218276} + - component: {fileID: 11418276} m_Layer: 0 m_Name: Floor m_TagString: Untagged @@ -29,6 +29,7 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &11418276 MonoBehaviour: m_ObjectHideFlags: 1 @@ -44,7 +45,6 @@ MonoBehaviour: _position: {x: 0, y: 0, z: 0} _mode: 0 _cacheRenderers: 1 - _isAlignment: 1 _isShowBounds: 0 --- !u!212 &21218276 SpriteRenderer: @@ -55,17 +55,22 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/Assets/IsoTools/Examples/Prefabs/Simple/Floor_3x3.prefab b/Assets/IsoTools/Examples/Prefabs/Simple/Floor_3x3.prefab index 4ab3eae..c77bb2e 100644 --- a/Assets/IsoTools/Examples/Prefabs/Simple/Floor_3x3.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Simple/Floor_3x3.prefab @@ -5,11 +5,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 453404} - - 212: {fileID: 21253404} - - 114: {fileID: 11453404} + - component: {fileID: 453404} + - component: {fileID: 21253404} + - component: {fileID: 11453404} m_Layer: 0 m_Name: Floor_3x3 m_TagString: Untagged @@ -26,10 +26,10 @@ Transform: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &11453404 MonoBehaviour: m_ObjectHideFlags: 1 @@ -60,7 +60,9 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -68,7 +70,7 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 1 + m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/Assets/IsoTools/Examples/Prefabs/Simple/Model_1x1x1.prefab b/Assets/IsoTools/Examples/Prefabs/Simple/Model_1x1x1.prefab index 91d9f71..b5abefb 100644 --- a/Assets/IsoTools/Examples/Prefabs/Simple/Model_1x1x1.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Simple/Model_1x1x1.prefab @@ -5,9 +5,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 445136} + - component: {fileID: 445136} m_Layer: 0 m_Name: CATLFingers1 m_TagString: Untagged @@ -20,9 +20,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 467712} + - component: {fileID: 467712} m_Layer: 0 m_Name: RShoulders_slot m_TagString: Untagged @@ -35,9 +35,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 440778} + - component: {fileID: 440778} m_Layer: 0 m_Name: WeaponSlot m_TagString: Untagged @@ -50,9 +50,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 408000} + - component: {fileID: 408000} m_Layer: 0 m_Name: CATLThumb1 m_TagString: Untagged @@ -65,11 +65,11 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 406600} - - 33: {fileID: 3394250} - - 23: {fileID: 2326052} + - component: {fileID: 406600} + - component: {fileID: 3394250} + - component: {fileID: 2326052} m_Layer: 0 m_Name: NPC_Tools_Axe_004 m_TagString: Untagged @@ -82,9 +82,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 429184} + - component: {fileID: 429184} m_Layer: 0 m_Name: CATRToe1 m_TagString: Untagged @@ -97,9 +97,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 439486} + - component: {fileID: 439486} m_Layer: 0 m_Name: CATRHand m_TagString: Untagged @@ -112,9 +112,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 431752} + - component: {fileID: 431752} m_Layer: 0 m_Name: CATNeck m_TagString: Untagged @@ -127,9 +127,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 499706} + - component: {fileID: 499706} m_Layer: 0 m_Name: WeaponSlotPelvis m_TagString: Untagged @@ -142,9 +142,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 474422} + - component: {fileID: 474422} m_Layer: 0 m_Name: CATLForearm m_TagString: Untagged @@ -157,9 +157,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 496856} + - component: {fileID: 496856} m_Layer: 0 m_Name: CATRThigh m_TagString: Untagged @@ -172,9 +172,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 482292} + - component: {fileID: 482292} m_Layer: 0 m_Name: CATLHand m_TagString: Untagged @@ -187,9 +187,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 496192} + - component: {fileID: 496192} m_Layer: 0 m_Name: LShoulders_slot m_TagString: Untagged @@ -202,9 +202,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 495680} + - component: {fileID: 495680} m_Layer: 0 m_Name: CATRForearm m_TagString: Untagged @@ -217,9 +217,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 464470} + - component: {fileID: 464470} m_Layer: 0 m_Name: Backet_Bone m_TagString: Untagged @@ -232,9 +232,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 400078} + - component: {fileID: 400078} m_Layer: 0 m_Name: CATRFingers1 m_TagString: Untagged @@ -247,9 +247,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 472916} + - component: {fileID: 472916} m_Layer: 0 m_Name: CATHead m_TagString: Untagged @@ -262,9 +262,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 450248} + - component: {fileID: 450248} m_Layer: 0 m_Name: CATRArm m_TagString: Untagged @@ -277,9 +277,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 402518} + - component: {fileID: 402518} m_Layer: 0 m_Name: Character001 m_TagString: Untagged @@ -292,9 +292,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 410220} + - component: {fileID: 410220} m_Layer: 0 m_Name: Head_slot m_TagString: Untagged @@ -307,9 +307,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 479078} + - component: {fileID: 479078} m_Layer: 0 m_Name: LBracers_slot m_TagString: Untagged @@ -322,9 +322,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 428938} + - component: {fileID: 428938} m_Layer: 0 m_Name: CATRFoot m_TagString: Untagged @@ -337,9 +337,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 494702} + - component: {fileID: 494702} m_Layer: 0 m_Name: RBracers_slot m_TagString: Untagged @@ -352,9 +352,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 454342} + - component: {fileID: 454342} m_Layer: 0 m_Name: CATSpine2 m_TagString: Untagged @@ -367,10 +367,10 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 408014} - - 137: {fileID: 13705018} + - component: {fileID: 408014} + - component: {fileID: 13705018} m_Layer: 0 m_Name: NPC_Man_Normal001 m_TagString: Untagged @@ -383,9 +383,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 400280} + - component: {fileID: 400280} m_Layer: 0 m_Name: ShieldBow_Slot m_TagString: Untagged @@ -398,9 +398,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 456330} + - component: {fileID: 456330} m_Layer: 0 m_Name: CATPelvis m_TagString: Untagged @@ -413,9 +413,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 465166} + - component: {fileID: 465166} m_Layer: 0 m_Name: CATRToe2 m_TagString: Untagged @@ -428,9 +428,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 441976} + - component: {fileID: 441976} m_Layer: 0 m_Name: CATRLegPlatform m_TagString: Untagged @@ -443,9 +443,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 409180} + - component: {fileID: 409180} m_Layer: 0 m_Name: CATRCalf m_TagString: Untagged @@ -458,11 +458,11 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 498674} - - 33: {fileID: 3375158} - - 23: {fileID: 2337538} + - component: {fileID: 498674} + - component: {fileID: 3375158} + - component: {fileID: 2337538} m_Layer: 0 m_Name: NPC_Beard_008 m_TagString: Untagged @@ -475,9 +475,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 452610} + - component: {fileID: 452610} m_Layer: 0 m_Name: CATLArm m_TagString: Untagged @@ -490,9 +490,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 468766} + - component: {fileID: 468766} m_Layer: 0 m_Name: CATRFingers2 m_TagString: Untagged @@ -505,9 +505,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 449928} + - component: {fileID: 449928} m_Layer: 0 m_Name: CATLClavicle m_TagString: Untagged @@ -520,9 +520,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 404156} + - component: {fileID: 404156} m_Layer: 0 m_Name: CATRigLLegDigit11 m_TagString: Untagged @@ -535,10 +535,10 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 478240} - - 114: {fileID: 11463918} + - component: {fileID: 478240} + - component: {fileID: 11463918} m_Layer: 0 m_Name: Model_1x1x1 m_TagString: Untagged @@ -551,9 +551,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 469500} + - component: {fileID: 469500} m_Layer: 0 m_Name: CATLFingers2 m_TagString: Untagged @@ -566,11 +566,11 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 459662} - - 33: {fileID: 3331792} - - 23: {fileID: 2391080} + - component: {fileID: 459662} + - component: {fileID: 3331792} + - component: {fileID: 2391080} m_Layer: 0 m_Name: NPC_Hair_009 m_TagString: Untagged @@ -583,9 +583,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 454910} + - component: {fileID: 454910} m_Layer: 0 m_Name: CATSpine1 m_TagString: Untagged @@ -598,9 +598,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 411672} + - component: {fileID: 411672} m_Layer: 0 m_Name: CATLThumb2 m_TagString: Untagged @@ -613,9 +613,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 448368} + - component: {fileID: 448368} m_Layer: 0 m_Name: CATRClavicle m_TagString: Untagged @@ -628,9 +628,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 496706} + - component: {fileID: 496706} m_Layer: 0 m_Name: CATLCalf m_TagString: Untagged @@ -643,9 +643,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 435810} + - component: {fileID: 435810} m_Layer: 0 m_Name: CATRigRArmIKTarget m_TagString: Untagged @@ -658,9 +658,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 454468} + - component: {fileID: 454468} m_Layer: 0 m_Name: CATRigLArmIKTarget m_TagString: Untagged @@ -673,9 +673,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 453240} + - component: {fileID: 453240} m_Layer: 0 m_Name: CATRThumb1 m_TagString: Untagged @@ -688,9 +688,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 457200} + - component: {fileID: 457200} m_Layer: 0 m_Name: CATLLegPlatform m_TagString: Untagged @@ -703,9 +703,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 404078} + - component: {fileID: 404078} m_Layer: 0 m_Name: CATRigLLegDigit12 m_TagString: Untagged @@ -718,9 +718,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 474778} + - component: {fileID: 474778} m_Layer: 0 m_Name: CATLThigh m_TagString: Untagged @@ -733,9 +733,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 406972} + - component: {fileID: 406972} m_Layer: 0 m_Name: CATLFoot m_TagString: Untagged @@ -748,9 +748,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 434332} + - component: {fileID: 434332} m_Layer: 0 m_Name: CATSpine3 m_TagString: Untagged @@ -763,9 +763,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 493646} + - component: {fileID: 493646} m_Layer: 0 m_Name: CATRThumb2 m_TagString: Untagged @@ -778,10 +778,10 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 481802} - - 137: {fileID: 13784090} + - component: {fileID: 481802} + - component: {fileID: 13784090} m_Layer: 0 m_Name: NPC_Bag_006 m_TagString: Untagged @@ -794,10 +794,10 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 402000} - - 95: {fileID: 9501918} + - component: {fileID: 402000} + - component: {fileID: 9501918} m_Layer: 0 m_Name: Lumberjack1 m_TagString: Untagged @@ -810,9 +810,9 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 484648} + - component: {fileID: 484648} m_Layer: 0 m_Name: Particle View 001 m_TagString: Untagged @@ -834,6 +834,7 @@ Transform: - {fileID: 468766} m_Father: {fileID: 439486} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &400280 Transform: m_ObjectHideFlags: 1 @@ -847,6 +848,7 @@ Transform: m_Children: [] m_Father: {fileID: 482292} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &402000 Transform: m_ObjectHideFlags: 1 @@ -868,6 +870,7 @@ Transform: - {fileID: 484648} m_Father: {fileID: 478240} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &402518 Transform: m_ObjectHideFlags: 1 @@ -880,6 +883,7 @@ Transform: m_Children: [] m_Father: {fileID: 402000} m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &404078 Transform: m_ObjectHideFlags: 1 @@ -892,6 +896,7 @@ Transform: m_Children: [] m_Father: {fileID: 404156} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &404156 Transform: m_ObjectHideFlags: 1 @@ -905,6 +910,7 @@ Transform: - {fileID: 404078} m_Father: {fileID: 406972} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &406600 Transform: m_ObjectHideFlags: 1 @@ -918,6 +924,7 @@ Transform: m_Children: [] m_Father: {fileID: 440778} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &406972 Transform: m_ObjectHideFlags: 1 @@ -931,6 +938,7 @@ Transform: - {fileID: 404156} m_Father: {fileID: 496706} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &408000 Transform: m_ObjectHideFlags: 1 @@ -944,6 +952,7 @@ Transform: - {fileID: 411672} m_Father: {fileID: 482292} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &408014 Transform: m_ObjectHideFlags: 1 @@ -956,6 +965,7 @@ Transform: m_Children: [] m_Father: {fileID: 402000} m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &409180 Transform: m_ObjectHideFlags: 1 @@ -969,6 +979,7 @@ Transform: - {fileID: 428938} m_Father: {fileID: 496856} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &410220 Transform: m_ObjectHideFlags: 1 @@ -983,6 +994,7 @@ Transform: - {fileID: 459662} m_Father: {fileID: 472916} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &411672 Transform: m_ObjectHideFlags: 1 @@ -995,6 +1007,7 @@ Transform: m_Children: [] m_Father: {fileID: 408000} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &428938 Transform: m_ObjectHideFlags: 1 @@ -1008,6 +1021,7 @@ Transform: - {fileID: 429184} m_Father: {fileID: 409180} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &429184 Transform: m_ObjectHideFlags: 1 @@ -1021,6 +1035,7 @@ Transform: - {fileID: 465166} m_Father: {fileID: 428938} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &431752 Transform: m_ObjectHideFlags: 1 @@ -1034,6 +1049,7 @@ Transform: - {fileID: 472916} m_Father: {fileID: 434332} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &434332 Transform: m_ObjectHideFlags: 1 @@ -1050,6 +1066,7 @@ Transform: - {fileID: 448368} m_Father: {fileID: 454342} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &435810 Transform: m_ObjectHideFlags: 1 @@ -1062,6 +1079,7 @@ Transform: m_Children: [] m_Father: {fileID: 402000} m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &439486 Transform: m_ObjectHideFlags: 1 @@ -1077,6 +1095,7 @@ Transform: - {fileID: 440778} m_Father: {fileID: 495680} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &440778 Transform: m_ObjectHideFlags: 1 @@ -1090,6 +1109,7 @@ Transform: - {fileID: 406600} m_Father: {fileID: 439486} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &441976 Transform: m_ObjectHideFlags: 1 @@ -1102,6 +1122,7 @@ Transform: m_Children: [] m_Father: {fileID: 402000} m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &445136 Transform: m_ObjectHideFlags: 1 @@ -1116,6 +1137,7 @@ Transform: - {fileID: 469500} m_Father: {fileID: 482292} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &448368 Transform: m_ObjectHideFlags: 1 @@ -1129,6 +1151,7 @@ Transform: - {fileID: 450248} m_Father: {fileID: 434332} m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &449928 Transform: m_ObjectHideFlags: 1 @@ -1142,6 +1165,7 @@ Transform: - {fileID: 452610} m_Father: {fileID: 434332} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &450248 Transform: m_ObjectHideFlags: 1 @@ -1156,6 +1180,7 @@ Transform: - {fileID: 467712} m_Father: {fileID: 448368} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &452610 Transform: m_ObjectHideFlags: 1 @@ -1170,6 +1195,7 @@ Transform: - {fileID: 496192} m_Father: {fileID: 449928} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &453240 Transform: m_ObjectHideFlags: 1 @@ -1183,6 +1209,7 @@ Transform: - {fileID: 493646} m_Father: {fileID: 439486} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &454342 Transform: m_ObjectHideFlags: 1 @@ -1196,6 +1223,7 @@ Transform: - {fileID: 434332} m_Father: {fileID: 454910} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &454468 Transform: m_ObjectHideFlags: 1 @@ -1208,6 +1236,7 @@ Transform: m_Children: [] m_Father: {fileID: 402000} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &454910 Transform: m_ObjectHideFlags: 1 @@ -1221,6 +1250,7 @@ Transform: - {fileID: 454342} m_Father: {fileID: 456330} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &456330 Transform: m_ObjectHideFlags: 1 @@ -1237,6 +1267,7 @@ Transform: - {fileID: 499706} m_Father: {fileID: 402000} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &457200 Transform: m_ObjectHideFlags: 1 @@ -1249,6 +1280,7 @@ Transform: m_Children: [] m_Father: {fileID: 402000} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &459662 Transform: m_ObjectHideFlags: 1 @@ -1261,6 +1293,7 @@ Transform: m_Children: [] m_Father: {fileID: 410220} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &464470 Transform: m_ObjectHideFlags: 1 @@ -1273,6 +1306,7 @@ Transform: m_Children: [] m_Father: {fileID: 434332} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &465166 Transform: m_ObjectHideFlags: 1 @@ -1285,6 +1319,7 @@ Transform: m_Children: [] m_Father: {fileID: 429184} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &467712 Transform: m_ObjectHideFlags: 1 @@ -1298,6 +1333,7 @@ Transform: m_Children: [] m_Father: {fileID: 450248} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &468766 Transform: m_ObjectHideFlags: 1 @@ -1311,6 +1347,7 @@ Transform: m_Children: [] m_Father: {fileID: 400078} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &469500 Transform: m_ObjectHideFlags: 1 @@ -1324,6 +1361,7 @@ Transform: m_Children: [] m_Father: {fileID: 445136} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &472916 Transform: m_ObjectHideFlags: 1 @@ -1337,6 +1375,7 @@ Transform: - {fileID: 410220} m_Father: {fileID: 431752} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &474422 Transform: m_ObjectHideFlags: 1 @@ -1351,6 +1390,7 @@ Transform: - {fileID: 479078} m_Father: {fileID: 452610} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &474778 Transform: m_ObjectHideFlags: 1 @@ -1364,6 +1404,7 @@ Transform: - {fileID: 496706} m_Father: {fileID: 456330} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &478240 Transform: m_ObjectHideFlags: 1 @@ -1377,6 +1418,7 @@ Transform: - {fileID: 402000} m_Father: {fileID: 0} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &479078 Transform: m_ObjectHideFlags: 1 @@ -1390,6 +1432,7 @@ Transform: m_Children: [] m_Father: {fileID: 474422} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &481802 Transform: m_ObjectHideFlags: 1 @@ -1402,6 +1445,7 @@ Transform: m_Children: [] m_Father: {fileID: 402000} m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &482292 Transform: m_ObjectHideFlags: 1 @@ -1417,6 +1461,7 @@ Transform: - {fileID: 400280} m_Father: {fileID: 474422} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &484648 Transform: m_ObjectHideFlags: 1 @@ -1429,6 +1474,7 @@ Transform: m_Children: [] m_Father: {fileID: 402000} m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &493646 Transform: m_ObjectHideFlags: 1 @@ -1441,6 +1487,7 @@ Transform: m_Children: [] m_Father: {fileID: 453240} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &494702 Transform: m_ObjectHideFlags: 1 @@ -1454,6 +1501,7 @@ Transform: m_Children: [] m_Father: {fileID: 495680} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &495680 Transform: m_ObjectHideFlags: 1 @@ -1468,6 +1516,7 @@ Transform: - {fileID: 494702} m_Father: {fileID: 450248} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &496192 Transform: m_ObjectHideFlags: 1 @@ -1480,6 +1529,7 @@ Transform: m_Children: [] m_Father: {fileID: 452610} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &496706 Transform: m_ObjectHideFlags: 1 @@ -1493,6 +1543,7 @@ Transform: - {fileID: 406972} m_Father: {fileID: 474778} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &496856 Transform: m_ObjectHideFlags: 1 @@ -1506,6 +1557,7 @@ Transform: - {fileID: 409180} m_Father: {fileID: 456330} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &498674 Transform: m_ObjectHideFlags: 1 @@ -1519,6 +1571,7 @@ Transform: m_Children: [] m_Father: {fileID: 410220} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &499706 Transform: m_ObjectHideFlags: 1 @@ -1531,6 +1584,7 @@ Transform: m_Children: [] m_Father: {fileID: 456330} m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &2326052 MeshRenderer: m_ObjectHideFlags: 1 @@ -1540,17 +1594,22 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: ac4dd9c2105f87e4699d893de025fa80, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 0 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 @@ -1566,17 +1625,22 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 1a34c8866473e084683a10fd69f98527, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 0 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 @@ -1592,17 +1656,22 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: cc7344c491726244d8684f42ea8658bd, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 0 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 @@ -1672,17 +1741,22 @@ SkinnedMeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 1cbc94e1e3ae9ef49aabde64feb5b073, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 0 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 @@ -1692,6 +1766,7 @@ SkinnedMeshRenderer: serializedVersion: 2 m_Quality: 0 m_UpdateWhenOffscreen: 0 + m_SkinnedMotionVectors: 1 m_Mesh: {fileID: 4300006, guid: 1b7945602ded3ec43804b120aa9ed037, type: 3} m_Bones: - {fileID: 482292} @@ -1739,17 +1814,22 @@ SkinnedMeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 22a364e606e45354bb981ef2bf74a19c, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 0 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 @@ -1759,6 +1839,7 @@ SkinnedMeshRenderer: serializedVersion: 2 m_Quality: 0 m_UpdateWhenOffscreen: 0 + m_SkinnedMotionVectors: 1 m_Mesh: {fileID: 4300008, guid: 1b7945602ded3ec43804b120aa9ed037, type: 3} m_Bones: - {fileID: 464470} diff --git a/Assets/IsoTools/Examples/Prefabs/Simple/Wall_l.prefab b/Assets/IsoTools/Examples/Prefabs/Simple/Wall_l.prefab index 56ac25b..9209e2a 100644 --- a/Assets/IsoTools/Examples/Prefabs/Simple/Wall_l.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Simple/Wall_l.prefab @@ -5,11 +5,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 424368} - - 212: {fileID: 21224368} - - 114: {fileID: 11424368} + - component: {fileID: 424368} + - component: {fileID: 21224368} + - component: {fileID: 11424368} m_Layer: 0 m_Name: Wall_l m_TagString: Untagged @@ -29,6 +29,7 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &11424368 MonoBehaviour: m_ObjectHideFlags: 1 @@ -44,7 +45,6 @@ MonoBehaviour: _position: {x: 0, y: 0, z: 0} _mode: 0 _cacheRenderers: 1 - _isAlignment: 1 _isShowBounds: 0 --- !u!212 &21224368 SpriteRenderer: @@ -55,17 +55,22 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/Assets/IsoTools/Examples/Prefabs/Simple/Wall_r.prefab b/Assets/IsoTools/Examples/Prefabs/Simple/Wall_r.prefab index fc31e6f..6b7420d 100644 --- a/Assets/IsoTools/Examples/Prefabs/Simple/Wall_r.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Simple/Wall_r.prefab @@ -5,11 +5,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 490292} - - 212: {fileID: 21290292} - - 114: {fileID: 11490292} + - component: {fileID: 490292} + - component: {fileID: 21290292} + - component: {fileID: 11490292} m_Layer: 0 m_Name: Wall_r m_TagString: Untagged @@ -29,6 +29,7 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &11490292 MonoBehaviour: m_ObjectHideFlags: 1 @@ -44,7 +45,6 @@ MonoBehaviour: _position: {x: 0, y: 0, z: 0} _mode: 0 _cacheRenderers: 1 - _isAlignment: 1 _isShowBounds: 0 --- !u!212 &21290292 SpriteRenderer: @@ -55,17 +55,22 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/Assets/IsoTools/Examples/Prefabs/Simple/Wallx3_l.prefab b/Assets/IsoTools/Examples/Prefabs/Simple/Wallx3_l.prefab index a71161f..9441e04 100644 --- a/Assets/IsoTools/Examples/Prefabs/Simple/Wallx3_l.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Simple/Wallx3_l.prefab @@ -5,11 +5,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 473450} - - 212: {fileID: 21273450} - - 114: {fileID: 11473450} + - component: {fileID: 473450} + - component: {fileID: 21273450} + - component: {fileID: 11473450} m_Layer: 0 m_Name: Wallx3_l m_TagString: Untagged @@ -29,6 +29,7 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &11473450 MonoBehaviour: m_ObjectHideFlags: 1 @@ -44,7 +45,6 @@ MonoBehaviour: _position: {x: -0, y: 0, z: 0} _mode: 0 _cacheRenderers: 1 - _isAlignment: 1 _isShowBounds: 0 --- !u!212 &21273450 SpriteRenderer: @@ -55,17 +55,22 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/Assets/IsoTools/Examples/Prefabs/Simple/Wallx3_r.prefab b/Assets/IsoTools/Examples/Prefabs/Simple/Wallx3_r.prefab index 3b0672d..e421cc1 100644 --- a/Assets/IsoTools/Examples/Prefabs/Simple/Wallx3_r.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Simple/Wallx3_r.prefab @@ -5,11 +5,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 412568} - - 212: {fileID: 21212568} - - 114: {fileID: 11412568} + - component: {fileID: 412568} + - component: {fileID: 21212568} + - component: {fileID: 11412568} m_Layer: 0 m_Name: Wallx3_r m_TagString: Untagged @@ -29,6 +29,7 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &11412568 MonoBehaviour: m_ObjectHideFlags: 1 @@ -44,7 +45,6 @@ MonoBehaviour: _position: {x: 0, y: 0, z: 0} _mode: 0 _cacheRenderers: 1 - _isAlignment: 1 _isShowBounds: 0 --- !u!212 &21212568 SpriteRenderer: @@ -55,17 +55,22 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/Assets/IsoTools/Scripts/Internal/IsoAssocList.cs b/Assets/IsoTools/Scripts/Internal/IsoAssocList.cs index 3d68183..1068760 100644 --- a/Assets/IsoTools/Scripts/Internal/IsoAssocList.cs +++ b/Assets/IsoTools/Scripts/Internal/IsoAssocList.cs @@ -42,7 +42,7 @@ namespace IsoTools.Internal { return false; } _dict.Add(item, _list.Count); - _list.Push(item); + _list.Add(item); return true; } @@ -60,6 +60,12 @@ namespace IsoTools.Internal { return false; } + public T Pop() { + var item = _list.Pop(); + _dict.Remove(item); + return item; + } + public void Clear() { _list.Clear(); _dict.Clear(); diff --git a/Assets/IsoTools/Scripts/Internal/IsoList.cs b/Assets/IsoTools/Scripts/Internal/IsoList.cs index 62e0452..8e43160 100644 --- a/Assets/IsoTools/Scripts/Internal/IsoList.cs +++ b/Assets/IsoTools/Scripts/Internal/IsoList.cs @@ -26,7 +26,7 @@ namespace IsoTools.Internal { } } - public void Push(T value) { + public void Add(T value) { if ( _size == _data.Length ) { var new_capacity = _size == 0 ? _defaultCapacity : _size * 2; diff --git a/Assets/IsoTools/Scripts/Internal/IsoPool.cs b/Assets/IsoTools/Scripts/Internal/IsoPool.cs index df4cd7a..2da1403 100644 --- a/Assets/IsoTools/Scripts/Internal/IsoPool.cs +++ b/Assets/IsoTools/Scripts/Internal/IsoPool.cs @@ -1,6 +1,4 @@ -using System; - -namespace IsoTools.Internal { +namespace IsoTools.Internal { public interface IsoIPool { T Take(); void Release(T item); @@ -12,7 +10,7 @@ namespace IsoTools.Internal { public IsoPool(int capacity) { _items = new IsoList(capacity); for ( var i = 0; i < capacity; ++i ) { - _items.Push(CreateItem()); + _items.Add(CreateItem()); } } @@ -23,11 +21,8 @@ namespace IsoTools.Internal { } public void Release(T item) { - if ( item == null ) { - throw new ArgumentNullException("item"); - } CleanUpItem(item); - _items.Push(item); + _items.Add(item); } public abstract T CreateItem(); diff --git a/Assets/IsoTools/Scripts/IsoWorld.cs b/Assets/IsoTools/Scripts/IsoWorld.cs index a72b343..6f801e7 100644 --- a/Assets/IsoTools/Scripts/IsoWorld.cs +++ b/Assets/IsoTools/Scripts/IsoWorld.cs @@ -562,7 +562,7 @@ namespace IsoTools { _sectors.Capacity = count; } while ( _sectors.Count < _sectors.Capacity ) { - _sectors.Push(new Sector()); + _sectors.Add(new Sector()); } } for ( int i = 0, e = _sectors.Count; i < e; ++i ) { @@ -581,7 +581,7 @@ namespace IsoTools { for ( var x = min.x; x < max.x; ++x ) { var sector = FindSector(x, y); if ( sector != null ) { - sector.objects.Push(iso_object); + sector.objects.Add(iso_object); } }} } diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 057c661..7016a0e 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 7 + serializedVersion: 9 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -38,22 +38,18 @@ GraphicsSettings: m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderSettings_Tier1: + m_TierSettings_Tier1: + renderingPath: 1 useCascadedShadowMaps: 1 - standardShaderQuality: 2 - useReflectionProbeBoxProjection: 1 - useReflectionProbeBlending: 1 - m_ShaderSettings_Tier2: + m_TierSettings_Tier2: + renderingPath: 1 useCascadedShadowMaps: 1 - standardShaderQuality: 2 - useReflectionProbeBoxProjection: 1 - useReflectionProbeBlending: 1 - m_ShaderSettings_Tier3: + m_TierSettings_Tier3: + renderingPath: 1 useCascadedShadowMaps: 1 - standardShaderQuality: 2 - useReflectionProbeBoxProjection: 1 - useReflectionProbeBlending: 1 - m_BuildTargetShaderSettings: [] + m_DefaultRenderingPath: 1 + m_DefaultMobileRenderingPath: 1 + m_TierSettings: [] m_LightmapStripping: 0 m_FogStripping: 0 m_LightmapKeepPlain: 1 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index ae41cb6..66e05aa 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1 @@ -m_EditorVersion: 5.4.2f2 -m_StandardAssetsVersion: 0 +m_EditorVersion: 5.5.0f3 diff --git a/ProjectSettings/UnityAdsSettings.asset b/ProjectSettings/UnityAdsSettings.asset deleted file mode 100644 index 224050c..0000000 --- a/ProjectSettings/UnityAdsSettings.asset +++ /dev/null @@ -1,11 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!292 &1 -UnityAdsSettings: - m_ObjectHideFlags: 0 - m_Enabled: 0 - m_InitializeOnStartup: 1 - m_TestMode: 0 - m_EnabledPlatforms: 4294967295 - m_IosGameId: - m_AndroidGameId: diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index 9b7a578..2943e44 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -3,6 +3,14 @@ --- !u!310 &1 UnityConnectSettings: m_ObjectHideFlags: 0 + m_Enabled: 0 + m_TestMode: 0 + m_TestEventUrl: + m_TestConfigUrl: + CrashReportingSettings: + m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes + m_Enabled: 0 + m_CaptureEditorExceptions: 1 UnityPurchasingSettings: m_Enabled: 0 m_TestMode: 0 @@ -12,3 +20,10 @@ UnityConnectSettings: m_TestMode: 0 m_TestEventUrl: m_TestConfigUrl: + UnityAdsSettings: + m_Enabled: 0 + m_InitializeOnStartup: 1 + m_TestMode: 0 + m_EnabledPlatforms: 4294967295 + m_IosGameId: + m_AndroidGameId: