diff --git a/Assembly-CSharp-vs.csproj b/Assembly-CSharp-vs.csproj index 0c01949..1df20d1 100644 --- a/Assembly-CSharp-vs.csproj +++ b/Assembly-CSharp-vs.csproj @@ -19,7 +19,7 @@ full false Temp\bin\Debug\ - DEBUG;TRACE;UNITY_4_6_0;UNITY_4_6;UNITY_STANDALONE_OSX;ENABLE_MICROPHONE;ENABLE_TEXTUREID_MAP;ENABLE_UNITYEVENTS;ENABLE_NEW_HIERARCHY ;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_MONO;ENABLE_TERRAIN;ENABLE_SUBSTANCE;ENABLE_GENERICS;INCLUDE_WP8SUPPORT;ENABLE_MOVIES;ENABLE_WWW;ENABLE_IMAGEEFFECTS;ENABLE_4_6_FEATURES;INCLUDE_WP_BLUE_SUPPORT;ENABLE_WEBCAM;INCLUDE_METROSUPPORT;RENDER_SOFTWARE_CURSOR;ENABLE_NETWORK;ENABLE_PHYSICS;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_2D_PHYSICS;ENABLE_GAMECENTER;ENABLE_SHADOWS;ENABLE_AUDIO;ENABLE_NAVMESH_CARVING;ENABLE_DUCK_TYPING;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_OSX;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE + DEBUG;TRACE;UNITY_5_0_0;UNITY_5_0;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_NEW_HIERARCHY;ENABLE_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_AUDIOMIXER_SUSPEND;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_GAMECENTER;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_MONO;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE prompt 4 0169 @@ -51,7 +51,7 @@ - /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/4.6.0/UnityEngine.UI.dll + /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 0c01949..1df20d1 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -19,7 +19,7 @@ full false Temp\bin\Debug\ - DEBUG;TRACE;UNITY_4_6_0;UNITY_4_6;UNITY_STANDALONE_OSX;ENABLE_MICROPHONE;ENABLE_TEXTUREID_MAP;ENABLE_UNITYEVENTS;ENABLE_NEW_HIERARCHY ;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_MONO;ENABLE_TERRAIN;ENABLE_SUBSTANCE;ENABLE_GENERICS;INCLUDE_WP8SUPPORT;ENABLE_MOVIES;ENABLE_WWW;ENABLE_IMAGEEFFECTS;ENABLE_4_6_FEATURES;INCLUDE_WP_BLUE_SUPPORT;ENABLE_WEBCAM;INCLUDE_METROSUPPORT;RENDER_SOFTWARE_CURSOR;ENABLE_NETWORK;ENABLE_PHYSICS;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_2D_PHYSICS;ENABLE_GAMECENTER;ENABLE_SHADOWS;ENABLE_AUDIO;ENABLE_NAVMESH_CARVING;ENABLE_DUCK_TYPING;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_OSX;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE + DEBUG;TRACE;UNITY_5_0_0;UNITY_5_0;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_NEW_HIERARCHY;ENABLE_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_AUDIOMIXER_SUSPEND;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_GAMECENTER;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_MONO;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE prompt 4 0169 @@ -51,7 +51,7 @@ - /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/4.6.0/UnityEngine.UI.dll + /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll diff --git a/Assets/AssetStoreTools.meta b/Assets/AssetStoreTools.meta deleted file mode 100644 index 7bb4385..0000000 --- a/Assets/AssetStoreTools.meta +++ /dev/null @@ -1,5 +0,0 @@ -fileFormatVersion: 2 -guid: b0264992f90e27e48beeee54b801c8f2 -folderAsset: yes -DefaultImporter: - userData: diff --git a/Assets/AssetStoreTools/Editor.meta b/Assets/AssetStoreTools/Editor.meta deleted file mode 100644 index 8ae97df..0000000 --- a/Assets/AssetStoreTools/Editor.meta +++ /dev/null @@ -1,5 +0,0 @@ -fileFormatVersion: 2 -guid: 47c3c77b488bde14eac761a5144660ed -folderAsset: yes -DefaultImporter: - userData: diff --git a/Assets/IsoTools/Examples/Scenes/Scene3.unity b/Assets/IsoTools/Examples/Scenes/Scene3.unity new file mode 100644 index 0000000..ec4c91f --- /dev/null +++ b/Assets/IsoTools/Examples/Scenes/Scene3.unity @@ -0,0 +1,1100 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +SceneSettings: + m_ObjectHideFlags: 0 + m_PVSData: + m_PVSObjectsArray: [] + m_PVSPortalsArray: [] + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: .25 + backfaceThreshold: 100 +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 5 + m_Fog: 0 + m_FogColor: {r: .5, g: .5, b: .5, a: 1} + m_FogMode: 3 + m_FogDensity: .00999999978 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: .200000003, g: .200000003, b: .200000003, a: 1} + m_AmbientEquatorColor: {r: .200000003, g: .200000003, b: .200000003, a: 1} + m_AmbientGroundColor: {r: .200000003, g: .200000003, b: .200000003, a: 1} + m_AmbientIntensity: 1 + m_AmbientProbe: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_AmbientProbeInGamma: + sh[ 0]: 0 + sh[ 1]: 0 + sh[ 2]: 0 + sh[ 3]: 0 + sh[ 4]: 0 + sh[ 5]: 0 + sh[ 6]: 0 + sh[ 7]: 0 + sh[ 8]: 0 + sh[ 9]: 0 + sh[10]: 0 + sh[11]: 0 + sh[12]: 0 + sh[13]: 0 + sh[14]: 0 + sh[15]: 0 + sh[16]: 0 + sh[17]: 0 + sh[18]: 0 + sh[19]: 0 + sh[20]: 0 + sh[21]: 0 + sh[22]: 0 + sh[23]: 0 + sh[24]: 0 + sh[25]: 0 + sh[26]: 0 + m_AmbientMode: 3 + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: .5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_GeneratedSkyboxReflection: {fileID: 0} + m_Sun: {fileID: 0} +--- !u!127 &3 +LevelGameManager: + m_ObjectHideFlags: 0 +--- !u!157 &4 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 4 + m_GIWorkflowMode: 1 + m_LightmapsModeLegacy: 1 + m_LightmapsMode: 1 + m_UseDualLightmapsInForward: 0 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_TemporalCoherenceThreshold: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 3 + m_Resolution: 2 + m_BakeResolution: 50 + m_TextureWidth: 1024 + m_TextureHeight: 1024 + m_AOMaxDistance: 1 + m_Padding: 2 + m_CompAOExponent: 0 + m_LightmapParameters: {fileID: 0} + m_TextureCompression: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 1024 + m_LightmapSnapshot: {fileID: 0} + m_RuntimeCPUUsage: 25 +--- !u!196 &5 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentRadius: .5 + agentHeight: 2 + agentSlope: 45 + agentClimb: .400000006 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + accuratePlacement: 0 + minRegionArea: 2 + cellSize: .166666657 + manualCellSize: 0 + m_NavMeshData: {fileID: 0} +--- !u!1001 &107877590 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalPosition.z + value: 1.50000024 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_RootOrder + value: 14 + objectReference: {fileID: 0} + - target: {fileID: 11418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: _position.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: _position.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + m_IsPrefabParent: 0 +--- !u!1 &112541529 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 112541534} + - 20: {fileID: 112541533} + - 124: {fileID: 112541532} + - 92: {fileID: 112541531} + - 81: {fileID: 112541530} + - 114: {fileID: 112541535} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &112541530 +AudioListener: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 112541529} + m_Enabled: 1 +--- !u!92 &112541531 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 112541529} + m_Enabled: 1 +--- !u!124 &112541532 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 112541529} + m_Enabled: 1 +--- !u!20 &112541533 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 112541529} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: .192156866, g: .301960796, b: .474509805, a: .0196078438} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: -.300000012 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 75 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_HDR: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: .0219999999 +--- !u!4 &112541534 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 112541529} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 16 +--- !u!114 &112541535 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 112541529} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3f01619d3802e814f86f9e6bb965349a, type: 3} + m_Name: + m_EditorClassIdentifier: + TileType: 0 + TileSize: 16 + StartDepth: 0 + StepDepth: .100000001 +--- !u!1001 &300381428 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalPosition.x + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalPosition.y + value: -24 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: _position.x + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 11417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: _position.y + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 11417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: _alignment + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: _sorting + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: _size.x + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &371058989 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalPosition.x + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalPosition.y + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalPosition.z + value: .900000095 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 11418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: _position.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: _position.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 118276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_Name + value: Floor 6 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &377678825 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalPosition.x + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalPosition.y + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalPosition.z + value: 1.30000019 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_RootOrder + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 11418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: _position.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: _position.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 118276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_Name + value: Floor 2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &390169999 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalPosition.x + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalPosition.y + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalPosition.z + value: 1.40000021 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 11418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: _position.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: _position.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 118276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_Name + value: Floor 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &467528637 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2} + propertyPath: m_LocalPosition.x + value: 64 + objectReference: {fileID: 0} + - target: {fileID: 453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2} + propertyPath: m_LocalPosition.z + value: .400000006 + objectReference: {fileID: 0} + - target: {fileID: 453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 11453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2} + propertyPath: _position.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2} + propertyPath: _position.y + value: -2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &887349160 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalPosition.x + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalPosition.z + value: 1.10000014 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 11418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: _position.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: _position.y + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 118276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_Name + value: Floor 4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1196886063 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_LocalPosition.x + value: 64 + objectReference: {fileID: 0} + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_LocalPosition.y + value: -32 + objectReference: {fileID: 0} + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_LocalPosition.z + value: .5 + objectReference: {fileID: 0} + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: _position.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: _position.y + value: -4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1397206436 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_LocalPosition.x + value: -32 + objectReference: {fileID: 0} + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_LocalPosition.y + value: -32 + objectReference: {fileID: 0} + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_LocalPosition.z + value: .300000012 + objectReference: {fileID: 0} + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: _position.x + value: -3 + objectReference: {fileID: 0} + - target: {fileID: 11453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: _position.y + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 153404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_Name + value: Floor_3x4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1681212022 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 463702, guid: 6dac6372d911f0646a34e2e83f03c30c, type: 2} + propertyPath: m_LocalPosition.x + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 463702, guid: 6dac6372d911f0646a34e2e83f03c30c, type: 2} + propertyPath: m_LocalPosition.y + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 463702, guid: 6dac6372d911f0646a34e2e83f03c30c, type: 2} + propertyPath: m_LocalPosition.z + value: .600000024 + objectReference: {fileID: 0} + - target: {fileID: 463702, guid: 6dac6372d911f0646a34e2e83f03c30c, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 463702, guid: 6dac6372d911f0646a34e2e83f03c30c, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 463702, guid: 6dac6372d911f0646a34e2e83f03c30c, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 463702, guid: 6dac6372d911f0646a34e2e83f03c30c, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 463702, guid: 6dac6372d911f0646a34e2e83f03c30c, type: 2} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 11463702, guid: 6dac6372d911f0646a34e2e83f03c30c, type: 2} + propertyPath: _position.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11463702, guid: 6dac6372d911f0646a34e2e83f03c30c, type: 2} + propertyPath: _position.y + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 6dac6372d911f0646a34e2e83f03c30c, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1704193016 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalPosition.x + value: 48 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalPosition.y + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalPosition.z + value: 1.20000017 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_RootOrder + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 11418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: _position.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: _position.y + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 118276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_Name + value: Floor 3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1835238580 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalPosition.x + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalPosition.y + value: -8 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalPosition.z + value: 1.00000012 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 11418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: _position.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: _position.y + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 118276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_Name + value: Floor 5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1841183179 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalPosition.x + value: -16 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalPosition.y + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalPosition.z + value: .700000048 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 11418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: _position.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: _position.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 118276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_Name + value: Floor 8 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &2027506887 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2} + propertyPath: m_LocalPosition.x + value: -32 + objectReference: {fileID: 0} + - target: {fileID: 462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2} + propertyPath: m_LocalPosition.z + value: .200000003 + objectReference: {fileID: 0} + - target: {fileID: 462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 11462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2} + propertyPath: _position.x + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 11462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2} + propertyPath: _position.y + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &2047544752 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalPosition.y + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalPosition.z + value: .800000072 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 11418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: _position.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11418276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: _position.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 118276, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + propertyPath: m_Name + value: Floor 7 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 31944869327494e44ad0bf31bbbaa122, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &2143542914 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_LocalPosition.x + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_LocalPosition.y + value: -56 + objectReference: {fileID: 0} + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_LocalPosition.z + value: .100000001 + objectReference: {fileID: 0} + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: _position.x + value: -3 + objectReference: {fileID: 0} + - target: {fileID: 11453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: _position.y + value: -4 + objectReference: {fileID: 0} + - target: {fileID: 153404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_Name + value: Floor_3x5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + m_IsPrefabParent: 0 diff --git a/Assets/IsoTools/Examples/Scenes/Scene3.unity.meta b/Assets/IsoTools/Examples/Scenes/Scene3.unity.meta new file mode 100644 index 0000000..1ab4bc3 --- /dev/null +++ b/Assets/IsoTools/Examples/Scenes/Scene3.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 11ea09039680944f5a209ed6ed266880 +timeCreated: 1424000856 +licenseType: Pro +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IsoTools/Scripts/IsoObject.cs b/Assets/IsoTools/Scripts/IsoObject.cs index 9be9ed4..858e41c 100644 --- a/Assets/IsoTools/Scripts/IsoObject.cs +++ b/Assets/IsoTools/Scripts/IsoObject.cs @@ -5,161 +5,155 @@ using UnityEditor; #endif namespace IsoTools { -[ExecuteInEditMode] -public class IsoObject : MonoBehaviour { - - Transform _transform = null; - Vector3 _lastPosition = Vector3.zero; - Vector3 _lastTransform = Vector3.zero; + [ExecuteInEditMode] + public class IsoObject : MonoBehaviour { + + Transform _transform = null; + Vector3 _lastTransform = Vector3.zero; + Vector3 _lastPosition = Vector3.zero; + Vector3 _lastSize = Vector3.zero; + bool _lastSorting = false; + bool _lastAlignment = false; - [SerializeField] - Vector3 _position = Vector3.zero; - /// Isometric object position. - public Vector3 Position { - get { return _position; } - set { - _position = value; - if ( Alignment ) { - FixAlignment(); - } else { + [SerializeField] + Vector3 _position = Vector3.zero; + /// Isometric object position. + public Vector3 Position { + get { return _position; } + set { + _position = value; FixTransform(); } + } + + [SerializeField] + Vector3 _size = Vector3.one; + /// Isometric object size. + public Vector3 Size { + get { return _size; } + set { + _size = value; + FixTransform(); + } + } + + [SerializeField] + bool _sorting = true; + /// Auto sorting tile. + public bool Sorting { + get { return _sorting; } + set { + _sorting = value; + FixTransform(); + } + } + + [SerializeField] + bool _alignment = true; + /// Auto alignment position by isometric tile size. + public bool Alignment { + get { return _alignment; } + set { + _alignment = value; + FixTransform(); + } + } + + [SerializeField] + /// Isometric object tile position. + public Vector3 TilePosition { + get { + return new Vector3( + Mathf.Round(Position.x), + Mathf.Round(Position.y), + Mathf.Round(Position.z)); + } + set { + Position = value; + } + } + + IsoWorld _iso_world = null; + public IsoWorld GetIsoWorld() { + if ( !_iso_world ) { + _iso_world = GameObject.FindObjectOfType(); + } + if ( !_iso_world ) { + throw new UnityException("IsoObject. IsoWorld not found!"); + } + return _iso_world; + } + + public void ResetIsoWorld() { + _iso_world = null; + } + + public void FixTransform() { + if ( Application.isEditor && Alignment ) { + _position = TilePosition; + } + var iso_world = GetIsoWorld(); + if ( iso_world && _transform ) { + Vector3 trans = iso_world.IsoToScreen(Position); + trans.z = _transform.position.z; + _transform.position = trans; + FixLastProperties(trans); + } MartDirtyIsoWorld(); MarkEditorObjectDirty(); } - } - [SerializeField] - Vector3 _size = Vector3.one; - /// Isometric object size. - public Vector3 Size { - get { return _size; } - set { - _size = value; - if ( Alignment ) { - FixAlignment(); - } else { - FixTransform(); + public void FixIsoPosition() { + var iso_world = GetIsoWorld(); + if ( iso_world && _transform ) { + Vector2 trans = _transform.position; + Position = iso_world.ScreenToIso(trans, Position.z); } - MartDirtyIsoWorld(); - MarkEditorObjectDirty(); } - } - [SerializeField] - bool _alignment = true; - /// Auto alignment position by isometric tile size. - public bool Alignment { - get { return _alignment; } - set { - _alignment = value; - if ( Alignment ) { - FixAlignment(); - } else { - FixTransform(); - } - MartDirtyIsoWorld(); - MarkEditorObjectDirty(); - } - } - - [SerializeField] - bool _sorting = true; - /// Auto sorting tile. - public bool Sorting { - get { return _sorting; } - set { - _sorting = value; - MartDirtyIsoWorld(); - MarkEditorObjectDirty(); - } - } - - public Vector3 TilePosition { - get { - return new Vector3( - Mathf.Round(Position.x), - Mathf.Round(Position.y), - Mathf.Round(Position.z)); - } - } - - IsoWorld _iso_world = null; - public IsoWorld GetIsoWorld() { - if ( !_iso_world ) { - _iso_world = GameObject.FindObjectOfType(); - } - if ( !_iso_world ) { - throw new UnityException("IsoObject. IsoWorld not found!"); - } - return _iso_world; - } - - public void ResetIsoWorld() { - _iso_world = null; - } - - public void FixAlignment() { - _position = TilePosition; - FixTransform(); - MartDirtyIsoWorld(); - MarkEditorObjectDirty(); - } - - public void FixTransform() { - var iso_world = GetIsoWorld(); - if ( iso_world && _transform ) { - Vector3 trans = iso_world.IsoToScreen(Position); - trans.z = _transform.position.z; - _transform.position = trans; - _lastPosition = Position; + void FixLastProperties(Vector3 trans) { _lastTransform = trans; + _lastPosition = Position; + _lastSize = Size; + _lastSorting = Sorting; + _lastAlignment = Alignment; } - } - public void FixIsoPosition() { - var iso_world = GetIsoWorld(); - if ( iso_world && _transform ) { - Vector2 trans = _transform.position; - Position = iso_world.ScreenToIso(trans, Position.z); - FixTransform(); + void MartDirtyIsoWorld() { + var iso_world = GetIsoWorld(); + if ( iso_world && Sorting ) { + iso_world.MarkDirty(); + } } - } - void MartDirtyIsoWorld() { - var iso_world = GetIsoWorld(); - if ( iso_world && Sorting ) { - iso_world.MarkDirty(); - } - } - - void MarkEditorObjectDirty() { + void MarkEditorObjectDirty() { #if UNITY_EDITOR - if ( Application.isEditor ) { - EditorUtility.SetDirty(this); - } + if ( Application.isEditor ) { + EditorUtility.SetDirty(this); + } #endif - } - - void Awake() { - _transform = gameObject.transform; - _lastPosition = Position; - _lastTransform = _transform.position; - FixIsoPosition(); - MartDirtyIsoWorld(); - } - - void Update() { - if ( _lastPosition != _position ) { - Position = _position; } - if ( _lastTransform != _transform.position ) { + + void Awake() { + _transform = gameObject.transform; + FixLastProperties(_transform.position); FixIsoPosition(); } - } + + void Update() { + if ( _lastTransform != _transform.position ) { + FixIsoPosition(); + } + if ( Application.isEditor ) { + if ( _lastPosition != _position ) Position = _position; + if ( _lastSize != _size ) Size = _size; + if ( _lastSorting != _sorting ) Sorting = _sorting; + if ( _lastAlignment != _alignment ) Alignment = _alignment; + } + } - void OnEnable() { - MartDirtyIsoWorld(); + void OnEnable() { + MartDirtyIsoWorld(); + } } -} } // namespace IsoTools \ No newline at end of file diff --git a/Assets/IsoTools/Scripts/IsoWorld.cs b/Assets/IsoTools/Scripts/IsoWorld.cs index 2d6a4fb..357b1d2 100644 --- a/Assets/IsoTools/Scripts/IsoWorld.cs +++ b/Assets/IsoTools/Scripts/IsoWorld.cs @@ -2,234 +2,234 @@ using System.Collections.Generic; namespace IsoTools { -[ExecuteInEditMode] -public class IsoWorld : MonoBehaviour { - - /// World tile types. - public enum TileTypes { - Isometric, - UpDown - } - - /// World tile type. - public TileTypes TileType = TileTypes.Isometric; - /// Isometric tile size. - public float TileSize = 32.0f; - /// Start sorting depth value. - public float StartDepth = 0.0f; - /// Step sorting depth value. - public float StepDepth = 0.1f; + [ExecuteInEditMode] + public class IsoWorld : MonoBehaviour { + + /// World tile types. + public enum TileTypes { + Isometric, + UpDown + } + + /// World tile type. + public TileTypes TileType = TileTypes.Isometric; + /// Isometric tile size. + public float TileSize = 32.0f; + /// Start sorting depth value. + public float StartDepth = 0.0f; + /// Step sorting depth value. + public float StepDepth = 0.1f; - class ObjectInfo { - public IsoObject IsoObject; - public bool Visited; - public int BeginDepend; - public int EndDepend; - public ObjectInfo(IsoObject obj) { - IsoObject = obj; - } - public void Reset(int first_depend) { - Visited = false; - BeginDepend = first_depend; - EndDepend = first_depend; - } - } - - bool _dirty = true; - float _lastTileSize = 0.0f; - TileTypes _lastTileType = TileTypes.Isometric; - - // ------------------------------------------------------------------------ - /// - /// Marks world for resorting. - /// - // ------------------------------------------------------------------------ - public void MarkDirty() { - _dirty = true; - } - - // ------------------------------------------------------------------------ - /// - /// Convert isometric coordinates to screen coordinates - /// - /// Screen coordinates - /// Isometric coordinates. - // ------------------------------------------------------------------------ - public Vector2 IsoToScreen(Vector3 pos) { - switch ( TileType ) { - case TileTypes.Isometric: - return new Vector2( - (pos.x - pos.y), - (pos.x + pos.y) * 0.5f + pos.z) * TileSize; - case TileTypes.UpDown: - return new Vector2( - pos.x, - pos.y + pos.z) * TileSize; - default: - throw new UnityException("IsoWorld. Type is wrong!"); - } - } - - // ------------------------------------------------------------------------ - /// - /// Convert screen coordinates to isometric coordinates - /// - /// Isometric coordinates - /// Screen coordinates. - // ------------------------------------------------------------------------ - public Vector3 ScreenToIso(Vector2 pos) { - switch ( TileType ) { - case TileTypes.Isometric: - return new Vector3( - (pos.x * 0.5f + pos.y), - (pos.y - pos.x * 0.5f), - 0.0f) / TileSize; - case TileTypes.UpDown: - return new Vector3( - pos.x, - pos.y, - 0.0f) / TileSize; - default: - throw new UnityException("IsoWorld. Type is wrong!"); - } - } - - // ------------------------------------------------------------------------ - /// - /// Convert screen coordinates to isometric coordinates with specified isometric height - /// - /// Isometric coordinates - /// Screen coordinates. - /// Point isometric height. - // ------------------------------------------------------------------------ - public Vector3 ScreenToIso(Vector2 pos, float iso_z) { - switch ( TileType ) { - case TileTypes.Isometric: { - var iso_pos = ScreenToIso(new Vector2(pos.x, pos.y - iso_z * TileSize)); - iso_pos.z = iso_z; - return iso_pos; + class ObjectInfo { + public IsoObject IsoObject; + public bool Visited; + public int BeginDepend; + public int EndDepend; + public ObjectInfo(IsoObject obj) { + IsoObject = obj; } - case TileTypes.UpDown: { - var iso_pos = ScreenToIso(new Vector2(pos.x, pos.y - iso_z * TileSize)); - iso_pos.z = iso_z; - return iso_pos; - } - default: - throw new UnityException("IsoWorld. Type is wrong!"); - } - } - - void _fixAllTransforms() { - var objects = _scanObjects(false); - foreach ( var obj in objects ) { - obj.IsoObject.FixTransform(); - } - } - - void _fixTileSize() { - _fixAllTransforms(); - _lastTileSize = TileSize; - } - - void _fixTileType() { - _fixAllTransforms(); - _lastTileType = TileType; - } - - void _fixDirty() { - _manualSort(); - _dirty = false; - } - - void _fixDisable() { - var objects = _scanObjects(false); - foreach ( var obj in objects ) { - obj.IsoObject.ResetIsoWorld(); - } - } - - IList _scanObjects(bool onlySorting) { - IsoObject[] iso_objects = GameObject.FindObjectsOfType(); - var objects = new List(iso_objects.Length); - foreach ( var iso_object in iso_objects ) { - if ( !onlySorting || iso_object.Sorting ) { - var info = new ObjectInfo(iso_object); - objects.Add(info); + public void Reset(int first_depend) { + Visited = false; + BeginDepend = first_depend; + EndDepend = first_depend; } } - return objects; - } - IList _scanDepends(IList objects) { - var depends = new List(objects.Count); - foreach ( var obj_a in objects ) { - obj_a.Reset(depends.Count); - var obj_ao = obj_a.IsoObject; - var max_ax = obj_ao.Position.x + obj_ao.Size.x; - var max_ay = obj_ao.Position.y + obj_ao.Size.y; - for ( int i = 0; i < objects.Count; ++i ) { - var obj_bo = objects[i].IsoObject; - if ( obj_ao != obj_bo ) { - if ( obj_bo.Position.x < max_ax && obj_bo.Position.y < max_ay ) { - var max_bz = obj_bo.Position.z + obj_bo.Size.z; - if ( obj_ao.Position.z < max_bz ) { - depends.Add(i); - ++obj_a.EndDepend; + bool _dirty = true; + float _lastTileSize = 0.0f; + TileTypes _lastTileType = TileTypes.Isometric; + + // ------------------------------------------------------------------------ + /// + /// Marks world for resorting. + /// + // ------------------------------------------------------------------------ + public void MarkDirty() { + _dirty = true; + } + + // ------------------------------------------------------------------------ + /// + /// Convert isometric coordinates to screen coordinates + /// + /// Screen coordinates + /// Isometric coordinates. + // ------------------------------------------------------------------------ + public Vector2 IsoToScreen(Vector3 pos) { + switch ( TileType ) { + case TileTypes.Isometric: + return new Vector2( + (pos.x - pos.y), + (pos.x + pos.y) * 0.5f + pos.z) * TileSize; + case TileTypes.UpDown: + return new Vector2( + pos.x, + pos.y + pos.z) * TileSize; + default: + throw new UnityException("IsoWorld. Type is wrong!"); + } + } + + // ------------------------------------------------------------------------ + /// + /// Convert screen coordinates to isometric coordinates + /// + /// Isometric coordinates + /// Screen coordinates. + // ------------------------------------------------------------------------ + public Vector3 ScreenToIso(Vector2 pos) { + switch ( TileType ) { + case TileTypes.Isometric: + return new Vector3( + (pos.x * 0.5f + pos.y), + (pos.y - pos.x * 0.5f), + 0.0f) / TileSize; + case TileTypes.UpDown: + return new Vector3( + pos.x, + pos.y, + 0.0f) / TileSize; + default: + throw new UnityException("IsoWorld. Type is wrong!"); + } + } + + // ------------------------------------------------------------------------ + /// + /// Convert screen coordinates to isometric coordinates with specified isometric height + /// + /// Isometric coordinates + /// Screen coordinates. + /// Point isometric height. + // ------------------------------------------------------------------------ + public Vector3 ScreenToIso(Vector2 pos, float iso_z) { + switch ( TileType ) { + case TileTypes.Isometric: { + var iso_pos = ScreenToIso(new Vector2(pos.x, pos.y - iso_z * TileSize)); + iso_pos.z = iso_z; + return iso_pos; + } + case TileTypes.UpDown: { + var iso_pos = ScreenToIso(new Vector2(pos.x, pos.y - iso_z * TileSize)); + iso_pos.z = iso_z; + return iso_pos; + } + default: + throw new UnityException("IsoWorld. Type is wrong!"); + } + } + + void _fixAllTransforms() { + var objects = _scanObjects(false); + foreach ( var obj in objects ) { + obj.IsoObject.FixTransform(); + } + } + + void _fixTileSize() { + _fixAllTransforms(); + _lastTileSize = TileSize; + } + + void _fixTileType() { + _fixAllTransforms(); + _lastTileType = TileType; + } + + void _fixDirty() { + _manualSort(); + _dirty = false; + } + + void _fixDisable() { + var objects = _scanObjects(false); + foreach ( var obj in objects ) { + obj.IsoObject.ResetIsoWorld(); + } + } + + IList _scanObjects(bool onlySorting) { + var iso_objects = GameObject.FindObjectsOfType(); + var objects = new List(iso_objects.Length); + foreach ( var iso_object in iso_objects ) { + if ( !onlySorting || iso_object.Sorting ) { + var info = new ObjectInfo(iso_object); + objects.Add(info); + } + } + return objects; + } + + IList _scanDepends(IList objects) { + var depends = new List(objects.Count); + foreach ( var obj_a in objects ) { + obj_a.Reset(depends.Count); + var obj_ao = obj_a.IsoObject; + var max_ax = obj_ao.Position.x + obj_ao.Size.x; + var max_ay = obj_ao.Position.y + obj_ao.Size.y; + for ( int i = 0; i < objects.Count; ++i ) { + var obj_bo = objects[i].IsoObject; + if ( obj_ao != obj_bo ) { + if ( obj_bo.Position.x < max_ax && obj_bo.Position.y < max_ay ) { + var max_bz = obj_bo.Position.z + obj_bo.Size.z; + if ( obj_ao.Position.z < max_bz ) { + depends.Add(i); + ++obj_a.EndDepend; + } } } } } + return depends; } - return depends; - } - void _manualSort() { - var objects = _scanObjects(true); - var depends = _scanDepends(objects); - var depth = StartDepth; - foreach ( var info in objects ) { - _placeObject(info, objects, depends, ref depth); - } - } - - void _placeObject(IsoObject obj, float depth) { - var pos = obj.gameObject.transform.position; - obj.gameObject.transform.position = new Vector3(pos.x, pos.y, depth); - } - - void _placeObject(ObjectInfo info, IList objects, IList depends, ref float depth) { - if ( !info.Visited ) { - info.Visited = true; - for ( int i = info.BeginDepend; i < info.EndDepend && i < depends.Count; ++i ) { - var object_index = depends[i]; - var obj = objects[object_index]; - _placeObject(obj, objects, depends, ref depth); + void _manualSort() { + var objects = _scanObjects(true); + var depends = _scanDepends(objects); + var depth = StartDepth; + foreach ( var info in objects ) { + _placeObject(info, objects, depends, ref depth); } - _placeObject(info.IsoObject, depth); - depth += StepDepth; } - } - void Start() { - _fixTileSize(); - _fixTileType(); - _fixDirty(); - } + void _placeObject(IsoObject obj, float depth) { + var pos = obj.gameObject.transform.position; + obj.gameObject.transform.position = new Vector3(pos.x, pos.y, depth); + } - void LateUpdate() { - if ( _lastTileSize != TileSize ) { + void _placeObject(ObjectInfo info, IList objects, IList depends, ref float depth) { + if ( !info.Visited ) { + info.Visited = true; + for ( int i = info.BeginDepend; i < info.EndDepend && i < depends.Count; ++i ) { + var object_index = depends[i]; + var obj = objects[object_index]; + _placeObject(obj, objects, depends, ref depth); + } + _placeObject(info.IsoObject, depth); + depth += StepDepth; + } + } + + void Start() { _fixTileSize(); - } - if ( _lastTileType != TileType ) { _fixTileType(); - } - if ( _dirty ) { _fixDirty(); } - } - void OnDisable() { - _fixDisable(); + void LateUpdate() { + if ( _lastTileSize != TileSize ) { + _fixTileSize(); + } + if ( _lastTileType != TileType ) { + _fixTileType(); + } + if ( _dirty ) { + _fixDirty(); + } + } + + void OnDisable() { + _fixDisable(); + } } -} } // namespace IsoTools \ No newline at end of file diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 7bb5d16..280a9fd 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,8 +3,27 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 2 + serializedVersion: 3 + m_Deferred: + m_Mode: 1 + m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} + m_LegacyDeferred: + m_Mode: 1 + m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0} m_AlwaysIncludedShaders: - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0} + m_PreloadedShaders: [] + m_LightmapStripping: 0 + m_LightmapKeepPlain: 1 + m_LightmapKeepDirCombined: 1 + m_LightmapKeepDirSeparate: 1 + m_LightmapKeepDynamic: 1 + m_FogStripping: 0 + m_FogKeepLinear: 1 + m_FogKeepExp: 1 + m_FogKeepExp2: 1 diff --git a/ProjectSettings/NavMeshAreas.asset b/ProjectSettings/NavMeshAreas.asset new file mode 100644 index 0000000..79cb3ae --- /dev/null +++ b/ProjectSettings/NavMeshAreas.asset @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!126 &1 +NavMeshLayers: + m_ObjectHideFlags: 0 + Built-in Layer 0: + name: Default + cost: 1 + editType: 2 + Built-in Layer 1: + name: Not Walkable + cost: 1 + editType: 0 + Built-in Layer 2: + name: Jump + cost: 2 + editType: 2 + User Layer 0: + name: + cost: 1 + editType: 3 + User Layer 1: + name: + cost: 1 + editType: 3 + User Layer 2: + name: + cost: 1 + editType: 3 + User Layer 3: + name: + cost: 1 + editType: 3 + User Layer 4: + name: + cost: 1 + editType: 3 + User Layer 5: + name: + cost: 1 + editType: 3 + User Layer 6: + name: + cost: 1 + editType: 3 + User Layer 7: + name: + cost: 1 + editType: 3 + User Layer 8: + name: + cost: 1 + editType: 3 + User Layer 9: + name: + cost: 1 + editType: 3 + User Layer 10: + name: + cost: 1 + editType: 3 + User Layer 11: + name: + cost: 1 + editType: 3 + User Layer 12: + name: + cost: 1 + editType: 3 + User Layer 13: + name: + cost: 1 + editType: 3 + User Layer 14: + name: + cost: 1 + editType: 3 + User Layer 15: + name: + cost: 1 + editType: 3 + User Layer 16: + name: + cost: 1 + editType: 3 + User Layer 17: + name: + cost: 1 + editType: 3 + User Layer 18: + name: + cost: 1 + editType: 3 + User Layer 19: + name: + cost: 1 + editType: 3 + User Layer 20: + name: + cost: 1 + editType: 3 + User Layer 21: + name: + cost: 1 + editType: 3 + User Layer 22: + name: + cost: 1 + editType: 3 + User Layer 23: + name: + cost: 1 + editType: 3 + User Layer 24: + name: + cost: 1 + editType: 3 + User Layer 25: + name: + cost: 1 + editType: 3 + User Layer 26: + name: + cost: 1 + editType: 3 + User Layer 27: + name: + cost: 1 + editType: 3 + User Layer 28: + name: + cost: 1 + editType: 3 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index fce0731..10de8c5 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,15 +3,17 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 3 + serializedVersion: 6 AndroidProfiler: 0 defaultScreenOrientation: 4 targetDevice: 2 targetGlesGraphics: 1 + targetIOSGraphics: -1 targetResolution: 0 accelerometerFrequency: 60 companyName: DefaultCompany productName: UnityIso + cloudProjectId: defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} defaultScreenWidth: 1024 @@ -27,6 +29,7 @@ PlayerSettings: m_Stereoscopic3D: 0 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 + iosAppInBackgroundBehavior: 0 displayResolutionDialog: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 @@ -34,16 +37,16 @@ PlayerSettings: allowedAutorotateToLandscapeLeft: 1 useOSAutorotation: 1 use32BitDisplayBuffer: 1 - use24BitDepthBuffer: 1 + disableDepthAndStencilBuffers: 0 defaultIsFullScreen: 1 defaultIsNativeResolution: 1 runInBackground: 0 captureSingleScreen: 0 Override IPod Music: 0 Prepare IOS For Recording: 0 - enableHWStatistics: 1 + submitAnalytics: 1 usePlayerLog: 1 - stripPhysics: 0 + bakeCollisionMeshes: 0 forceSingleInstance: 0 resizableWindow: 0 useMacAppStoreValidation: 0 @@ -56,22 +59,28 @@ PlayerSettings: visibleInBackground: 0 macFullscreenMode: 2 d3d9FullscreenMode: 1 - d3d11ForceExclusiveMode: 0 + d3d11FullscreenMode: 1 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0 + xboxOneResolution: 0 + ps3SplashScreen: {fileID: 0} videoMemoryForVertexBuffers: 0 + psp2PowerMode: 0 + psp2AcquireBGM: 1 m_SupportedAspectRatios: 4:3: 1 5:4: 1 16:10: 1 16:9: 1 Others: 1 - iPhoneBundleIdentifier: com.Company.ProductName + bundleIdentifier: com.Company.ProductName + bundleVersion: 1.0 + preloadedAssets: [] metroEnableIndependentInputSource: 0 metroEnableLowLatencyPresentationAPI: 0 + xboxOneDisableKinectGpuReservation: 0 productGUID: 0ae4d8e5611a65d45bd97550aa4471af - iPhoneBundleVersion: 1.0 AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 9 AndroidPreferredInstallLocation: 1 @@ -83,9 +92,10 @@ PlayerSettings: ForceSDCardPermission: 0 CreateWallpaper: 0 APKExpansionFiles: 0 + preloadShaders: 0 StripUnusedMeshComponents: 0 iPhoneSdkVersion: 988 - iPhoneTargetOSVersion: 16 + iPhoneTargetOSVersion: 22 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIStatusBarHidden: 1 @@ -101,15 +111,34 @@ PlayerSettings: iPadHighResPortraitSplashScreen: {fileID: 0} iPadLandscapeSplashScreen: {fileID: 0} iPadHighResLandscapeSplashScreen: {fileID: 0} + iOSCustomLaunchScreenType: 0 + iOSLaunchScreenPortrait: {fileID: 0} + iOSLaunchScreenLandscape: {fileID: 0} + iOSLaunchScreenBackgroundColor: + serializedVersion: 2 + rgba: 0 + iOSLaunchScreenFillPct: 1 + iOSLaunchScreenCustomXibPath: AndroidTargetDevice: 0 AndroidSplashScreenScale: 0 AndroidKeystoreName: AndroidKeyaliasName: + AndroidTVCompatibility: 1 + AndroidIsGame: 1 + androidEnableBanner: 1 + m_AndroidBanners: + - width: 320 + height: 180 + banner: {fileID: 0} resolutionDialogBanner: {fileID: 0} m_BuildTargetIcons: [] m_BuildTargetBatching: [] webPlayerTemplate: APPLICATION:Default m_TemplateCustomTags: {} + actionOnDotNetUnhandledException: 1 + enableInternalProfiler: 0 + logObjCUncaughtExceptions: 1 + enableCrashReportAPI: 0 locationUsageDescription: XboxTitleId: XboxImageXexPath: @@ -126,6 +155,7 @@ PlayerSettings: ps3ThumbnailPath: ps3BackgroundPath: ps3SoundPath: + ps3NPAgeRating: 12 ps3TrophyCommId: ps3NpCommunicationPassphrase: ps3TrophyPackagePath: @@ -133,15 +163,65 @@ PlayerSettings: ps3TrophyCommSig: ps3SaveGameSlots: 1 ps3TrialMode: 0 + ps3VideoMemoryForAudio: 0 + ps3EnableVerboseMemoryStats: 0 + ps3UseSPUForUmbra: 0 + ps3EnableMoveSupport: 1 + ps3DisableDolbyEncoding: 0 + ps4NPAgeRating: 12 + ps4NPTitleSecret: + ps4NPTrophyPackPath: + ps4ParentalLevel: 1 + ps4ContentID: ED1633-NPXX51362_00-0000000000000000 + ps4Category: 0 + ps4MasterVersion: 01.00 + ps4AppVersion: 01.00 + ps4AppType: 0 + ps4ParamSfxPath: + ps4VideoOutPixelFormat: 0 + ps4VideoOutResolution: 4 + ps4PronunciationXMLPath: + ps4PronunciationSIGPath: + ps4BackgroundImagePath: + ps4StartupImagePath: + ps4SaveDataImagePath: + ps4BGMPath: + ps4ShareFilePath: + ps4NPtitleDatPath: + ps4RemotePlayKeyAssignment: -1 + ps4EnterButtonAssignment: 1 + ps4ApplicationParam1: 0 + ps4ApplicationParam2: 0 + ps4ApplicationParam3: 0 + ps4ApplicationParam4: 0 + ps4Passcode: pRt5wtCRyeac8JJA3aoWdPQ0NhGppEkN + ps4pnSessions: 1 + ps4pnPresence: 1 + ps4pnFriends: 1 + ps4pnGameCustomData: 1 + playerPrefsSupport: 0 + monoEnv: psp2Splashimage: {fileID: 0} - psp2LiveAreaGate: {fileID: 0} - psp2LiveAreaBackround: {fileID: 0} psp2NPTrophyPackPath: + psp2NPSupportGBMorGJP: 0 + psp2NPAgeRating: 12 psp2NPCommsID: + psp2NPCommunicationsID: psp2NPCommsPassphrase: psp2NPCommsSig: psp2ParamSfxPath: + psp2ManualPath: + psp2LiveAreaGatePath: + psp2LiveAreaBackroundPath: + psp2LiveAreaPath: + psp2LiveAreaTrialPath: + psp2PatchChangeInfoPath: + psp2PatchOriginalPackage: psp2PackagePassword: + psp2KeystoneFile: + psp2DRMType: 0 + psp2StorageType: 0 + psp2MediaCapacity: 0 psp2DLCConfigPath: psp2ThumbnailPath: psp2BackgroundPath: @@ -149,7 +229,23 @@ PlayerSettings: psp2TrophyCommId: psp2TrophyPackagePath: psp2PackagedResourcesPath: - flashStrippingLevel: 2 + psp2SaveDataQuota: 10240 + psp2ParentalLevel: 1 + psp2ShortTitle: Not Set + psp2ContentID: IV0000-ABCD12345_00-0123456789ABCDEF + psp2Category: 0 + psp2MasterVersion: 01.00 + psp2AppVersion: 01.00 + psp2TVBootMode: 0 + psp2EnterButtonAssignment: 2 + psp2TVDisableEmu: 0 + psp2AllowTwitterDialog: 1 + psp2Upgradable: 0 + psp2HealthWarning: 0 + psp2UseLibLocation: 0 + psp2InfoBarOnStartup: 0 + psp2InfoBarColor: 0 + psmSplashimage: {fileID: 0} spritePackerPolicy: scriptingDefineSymbols: {} metroPackageName: UnityIso @@ -213,8 +309,10 @@ PlayerSettings: metroTileBackgroundColor: {r: 0, g: 0, b: 0, a: 1} metroSplashScreenBackgroundColor: {r: 0, g: 0, b: 0, a: 1} metroSplashScreenUseBackgroundColor: 0 - metroCapabilities: {} - metroUnprocessedPlugins: [] + platformCapabilities: {} + metroFTAName: + metroFTAFileTypes: [] + metroProtocolName: metroCompilationOverrides: 1 blackberryDeviceAddress: blackberryDevicePassword: @@ -222,10 +320,8 @@ PlayerSettings: blackberryTokenExires: blackberryTokenAuthor: blackberryTokenAuthorId: - blackberryAuthorId: blackberryCskPassword: blackberrySaveLogPath: - blackberryAuthorIdOveride: 0 blackberrySharedPermissions: 0 blackberryCameraPermissions: 0 blackberryGPSPermissions: 0 @@ -243,7 +339,47 @@ PlayerSettings: tizenGPSPermissions: 0 tizenMicrophonePermissions: 0 stvDeviceAddress: + stvProductDescription: + stvProductAuthor: + stvProductAuthorEmail: + stvProductLink: + stvProductCategory: 0 + XboxOneProductId: + XboxOneUpdateKey: + XboxOneSandboxId: + XboxOneContentId: + XboxOneTitleId: + XboxOneSCId: + XboxOneGameOsOverridePath: + XboxOnePackagingOverridePath: + XboxOneAppManifestOverridePath: + XboxOnePackageEncryption: 0 + XboxOneDescription: + XboxOneIsContentPackage: 0 + XboxOneEnableGPUVariability: 0 + XboxOneSockets: {} + XboxOneSplashScreen: {fileID: 0} + XboxOneAllowedProductIds: [] + XboxOnePersistentLocalStorageSize: 0 + intPropertyNames: + - WebGL::ScriptingBackend + - WebGL::audioCompressionFormat + - WebGL::exceptionSupport + - WebGL::memorySize + - iOS::Architecture + - iOS::ScriptingBackend + WebGL::ScriptingBackend: 1 + WebGL::audioCompressionFormat: 4 + WebGL::exceptionSupport: 0 + WebGL::memorySize: 256 + iOS::Architecture: 2 + iOS::ScriptingBackend: 0 + boolPropertyNames: + - WebGL::dataCaching + WebGL::dataCaching: 0 + stringPropertyNames: + - WebGL::emscriptenArgs + - WebGL::template + WebGL::emscriptenArgs: + WebGL::template: APPLICATION:Default firstStreamedLevelWithResources: 0 - unityRebuildLibraryVersion: 9 - unityForwardCompatibleVersion: 39 - unityStandardAssetsVersion: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt new file mode 100644 index 0000000..e7c3e83 --- /dev/null +++ b/ProjectSettings/ProjectVersion.txt @@ -0,0 +1,2 @@ +m_EditorVersion: 5.0.0f1 +m_StandardAssetsVersion: 0 diff --git a/UnityIso-csharp.sln b/UnityIso-csharp.sln index 9a77d46..7e11405 100644 --- a/UnityIso-csharp.sln +++ b/UnityIso-csharp.sln @@ -17,7 +17,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution + GlobalSection(MonoDevelopProperties) = preSolution StartupItem = Assembly-CSharp.csproj Policies = $0 $0.TextStylePolicy = $1 diff --git a/UnityIso.sln b/UnityIso.sln index e2c808e..dc2eebb 100644 --- a/UnityIso.sln +++ b/UnityIso.sln @@ -17,7 +17,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution + GlobalSection(MonoDevelopProperties) = preSolution StartupItem = Assembly-CSharp.csproj Policies = $0 $0.TextStylePolicy = $1 diff --git a/UnityIso.userprefs b/UnityIso.userprefs index a9016ef..9d1e2af 100644 --- a/UnityIso.userprefs +++ b/UnityIso.userprefs @@ -1,9 +1,9 @@  - + - - + +