diff --git a/Assembly-CSharp-Editor.csproj b/Assembly-CSharp-Editor.csproj
index 7c16cd5..02b2a92 100644
--- a/Assembly-CSharp-Editor.csproj
+++ b/Assembly-CSharp-Editor.csproj
@@ -19,7 +19,7 @@
full
false
Temp\bin\Debug\
- DEBUG;TRACE;UNITY_5_3_0;UNITY_5_3;UNITY_5;ENABLE_NEW_BUGREPORTER;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_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_GAMECENTER;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_LOG_MIXED_STACKTRACE;ENABLE_UNITYWEBREQUEST;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX
+ DEBUG;TRACE;UNITY_5_3_1;UNITY_5_3;UNITY_5;ENABLE_NEW_BUGREPORTER;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_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_GAMECENTER;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_LOG_MIXED_STACKTRACE;ENABLE_UNITYWEBREQUEST;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX
prompt
4
0169
@@ -38,10 +38,10 @@
- /Applications/Unity_5.3/Unity.app/Contents/Frameworks/Managed/UnityEngine.dll
+ /Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEngine.dll
- /Applications/Unity_5.3/Unity.app/Contents/Frameworks/Managed/UnityEditor.dll
+ /Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEditor.dll
@@ -49,58 +49,58 @@
- /Applications/Unity_5.3/Unity.app/Contents/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll
+ /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll
- /Applications/Unity_5.3/Unity.app/Contents/UnityExtensions/Unity/EditorTestsRunner/Editor/nunit.framework.dll
+ /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/EditorTestsRunner/Editor/nunit.framework.dll
- /Applications/Unity_5.3/Unity.app/Contents/UnityExtensions/Unity/EditorTestsRunner/Editor/UnityEditor.EditorTestsRunner.dll
+ /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/EditorTestsRunner/Editor/UnityEditor.EditorTestsRunner.dll
- /Applications/Unity_5.3/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll
+ /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll
- /Applications/Unity_5.3/Unity.app/Contents/UnityExtensions/Unity/GUISystem/Editor/UnityEditor.UI.dll
+ /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/Editor/UnityEditor.UI.dll
- /Applications/Unity_5.3/Unity.app/Contents/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll
+ /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll
- /Applications/Unity_5.3/Unity.app/Contents/UnityExtensions/Unity/Networking/Editor/UnityEditor.Networking.dll
+ /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Networking/Editor/UnityEditor.Networking.dll
- /Applications/Unity_5.3/Unity.app/Contents/UnityExtensions/Unity/TreeEditor/Editor/UnityEditor.TreeEditor.dll
+ /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/TreeEditor/Editor/UnityEditor.TreeEditor.dll
- /Applications/Unity_5.3/Unity.app/Contents/Frameworks/Managed/UnityEditor.Graphs.dll
+ /Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEditor.Graphs.dll
- /Applications/Unity_5.3/PlaybackEngines/AndroidPlayer/UnityEditor.Android.Extensions.dll
+ /Applications/Unity/PlaybackEngines/AndroidPlayer/UnityEditor.Android.Extensions.dll
- /Applications/Unity_5.3/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.dll
+ /Applications/Unity/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.dll
+
+
+ /Applications/Unity/PlaybackEngines/AppleTVSupport/UnityEditor.AppleTV.Extensions.dll
- /Applications/Unity_5.3/PlaybackEngines/TizenPlayer/UnityEditor.Tizen.Extensions.dll
+ /Applications/Unity/PlaybackEngines/TizenPlayer/UnityEditor.Tizen.Extensions.dll
- /Applications/Unity_5.3/PlaybackEngines/STVPlayer/UnityEditor.SamsungTV.Extensions.dll
+ /Applications/Unity/PlaybackEngines/STVPlayer/UnityEditor.SamsungTV.Extensions.dll
- /Applications/Unity_5.3/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll
+ /Applications/Unity/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll
- /Applications/Unity_5.3/PlaybackEngines/LinuxStandaloneSupport/UnityEditor.LinuxStandalone.Extensions.dll
+ /Applications/Unity/PlaybackEngines/LinuxStandaloneSupport/UnityEditor.LinuxStandalone.Extensions.dll
- /Applications/Unity_5.3/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll
+ /Applications/Unity/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll
- /Applications/Unity_5.3/PlaybackEngines/MacStandaloneSupport/UnityEditor.OSXStandalone.Extensions.dll
-
-
- /Applications/Unity_5.3/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll
+ /Applications/Unity/PlaybackEngines/MacStandaloneSupport/UnityEditor.OSXStandalone.Extensions.dll
diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
index 582ad6e..7f530ca 100644
--- a/Assembly-CSharp.csproj
+++ b/Assembly-CSharp.csproj
@@ -19,7 +19,7 @@
full
false
Temp\bin\Debug\
- DEBUG;TRACE;UNITY_5_3_0;UNITY_5_3;UNITY_5;ENABLE_NEW_BUGREPORTER;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_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_GAMECENTER;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_LOG_MIXED_STACKTRACE;ENABLE_UNITYWEBREQUEST;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX
+ DEBUG;TRACE;UNITY_5_3_1;UNITY_5_3;UNITY_5;ENABLE_NEW_BUGREPORTER;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_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_GAMECENTER;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_LOG_MIXED_STACKTRACE;ENABLE_UNITYWEBREQUEST;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX
prompt
4
0169
@@ -38,10 +38,10 @@
- /Applications/Unity_5.3/Unity.app/Contents/Frameworks/Managed/UnityEngine.dll
+ /Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEngine.dll
- /Applications/Unity_5.3/Unity.app/Contents/Frameworks/Managed/UnityEditor.dll
+ /Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEditor.dll
@@ -64,16 +64,16 @@
+
+
+
- /Applications/Unity_5.3/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll
+ /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll
- /Applications/Unity_5.3/Unity.app/Contents/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll
-
-
- /Applications/Unity_5.3/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll
+ /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll
diff --git a/Assets/IsoTools/Scripts/IsoTile.cs b/Assets/IsoTools/Scripts/IsoTile.cs
new file mode 100644
index 0000000..07e9116
--- /dev/null
+++ b/Assets/IsoTools/Scripts/IsoTile.cs
@@ -0,0 +1,6 @@
+using UnityEngine;
+
+namespace IsoTools {
+ public class IsoTile : MonoBehaviour {
+ }
+} // namespace IsoTools
\ No newline at end of file
diff --git a/Assets/IsoTools/Scripts/IsoTile.cs.meta b/Assets/IsoTools/Scripts/IsoTile.cs.meta
new file mode 100644
index 0000000..f5112a1
--- /dev/null
+++ b/Assets/IsoTools/Scripts/IsoTile.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 6151a74ad7049489693493e10480103a
+timeCreated: 1453567204
+licenseType: Free
+MonoImporter:
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/IsoTools/Scripts/IsoTileLayer.cs b/Assets/IsoTools/Scripts/IsoTileLayer.cs
new file mode 100644
index 0000000..355126a
--- /dev/null
+++ b/Assets/IsoTools/Scripts/IsoTileLayer.cs
@@ -0,0 +1,6 @@
+using UnityEngine;
+
+namespace IsoTools {
+ public class IsoTileLayer : MonoBehaviour {
+ }
+} // namespace IsoTools
\ No newline at end of file
diff --git a/Assets/IsoTools/Scripts/IsoTileLayer.cs.meta b/Assets/IsoTools/Scripts/IsoTileLayer.cs.meta
new file mode 100644
index 0000000..0ad9f58
--- /dev/null
+++ b/Assets/IsoTools/Scripts/IsoTileLayer.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: a91f3c41a71c5484f9af8489443ef844
+timeCreated: 1453567185
+licenseType: Free
+MonoImporter:
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/IsoTools/Scripts/IsoTileMap.cs b/Assets/IsoTools/Scripts/IsoTileMap.cs
new file mode 100644
index 0000000..f48414a
--- /dev/null
+++ b/Assets/IsoTools/Scripts/IsoTileMap.cs
@@ -0,0 +1,7 @@
+using UnityEngine;
+
+namespace IsoTools {
+ [RequireComponent(typeof(IsoObject))]
+ public class IsoTileMap : MonoBehaviour {
+ }
+} // namespace IsoTools
\ No newline at end of file
diff --git a/Assets/IsoTools/Scripts/IsoTileMap.cs.meta b/Assets/IsoTools/Scripts/IsoTileMap.cs.meta
new file mode 100644
index 0000000..8a30280
--- /dev/null
+++ b/Assets/IsoTools/Scripts/IsoTileMap.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 65223c9354c874240a67280485a6b300
+timeCreated: 1453567172
+licenseType: Free
+MonoImporter:
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/IsoTools/Tiled/Examples/TiledScene.unity b/Assets/IsoTools/Tiled/Examples/TiledScene.unity
index 7be7095..a263c5b 100644
--- a/Assets/IsoTools/Tiled/Examples/TiledScene.unity
+++ b/Assets/IsoTools/Tiled/Examples/TiledScene.unity
@@ -85,6 +85,45 @@ NavMeshSettings:
cellSize: 0.16666667
manualCellSize: 0
m_NavMeshData: {fileID: 0}
+--- !u!1 &40999084
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ serializedVersion: 4
+ m_Component:
+ - 4: {fileID: 40999085}
+ - 114: {fileID: 40999086}
+ m_Layer: 0
+ m_Name: TileLayer1
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &40999085
+Transform:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 40999084}
+ 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: 1457742461}
+ m_RootOrder: 1
+--- !u!114 &40999086
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 40999084}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: a91f3c41a71c5484f9af8489443ef844, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &234184844
GameObject:
m_ObjectHideFlags: 0
@@ -183,9 +222,106 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 3f01619d3802e814f86f9e6bb965349a, type: 3}
m_Name:
m_EditorClassIdentifier:
- _tileSize: 32
+ _tileSize: 16
_tileRatio: 0.5
_tileAngle: 45
- _tileHeight: 32
+ _tileHeight: 16
_stepDepth: 0.1
_startDepth: 1
+--- !u!1 &1457742458
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ serializedVersion: 4
+ m_Component:
+ - 4: {fileID: 1457742461}
+ - 114: {fileID: 1457742460}
+ - 114: {fileID: 1457742459}
+ m_Layer: 0
+ m_Name: TileMap
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &1457742459
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1457742458}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 65223c9354c874240a67280485a6b300, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!114 &1457742460
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1457742458}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 9a9c584f9a39449438abc7ba59a68778, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ _mode: 0
+ _size: {x: 1, y: 1, z: 1}
+ _position: {x: 0, y: 0, z: 0}
+ _isAlignment: 1
+ _isShowBounds: 1
+--- !u!4 &1457742461
+Transform:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1457742458}
+ 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:
+ - {fileID: 1959786508}
+ - {fileID: 40999085}
+ m_Father: {fileID: 0}
+ m_RootOrder: 1
+--- !u!1 &1959786507
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ serializedVersion: 4
+ m_Component:
+ - 4: {fileID: 1959786508}
+ - 114: {fileID: 1959786509}
+ m_Layer: 0
+ m_Name: TileLayer0
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1959786508
+Transform:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1959786507}
+ 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: 1457742461}
+ m_RootOrder: 0
+--- !u!114 &1959786509
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1959786507}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: a91f3c41a71c5484f9af8489443ef844, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
diff --git a/Assets/IsoTools/Tiled/Internal/Editor/TiledMapAssetEditor.cs b/Assets/IsoTools/Tiled/Internal/Editor/TiledMapAssetEditor.cs
index e60baee..8a28894 100644
--- a/Assets/IsoTools/Tiled/Internal/Editor/TiledMapAssetEditor.cs
+++ b/Assets/IsoTools/Tiled/Internal/Editor/TiledMapAssetEditor.cs
@@ -14,7 +14,51 @@ namespace IsoTools.Tiled.Internal {
public override void OnInspectorGUI() {
DrawDefaultInspector();
if ( GUILayout.Button("Create prefab") ) {
+ //TestTestTest();
}
}
+
+ /*
+ void TestTestTest() {
+ foreach ( var layer in _asset.Data.Layers ) {
+ for ( var i = 0; i < _asset.Data.Height; ++i ) {
+ for ( var j = 0; j < _asset.Data.Width; ++j ) {
+ var tile_gid = layer.Tiles[i*_asset.Data.Width + j];
+ var tileset_data = FindTilesetByGid(tile_gid);
+ if ( tileset_data != null ) {
+ var sp_go = new GameObject();
+ var sp = sp_go.AddComponent();
+ var assets = AssetDatabase.LoadAllAssetsAtPath(
+ string.Format("Assets/IsoTools/Tiled/Examples/{0}",
+ tileset_data.ImageSource));
+
+ foreach ( var asset in assets ) {
+ var aaa = asset as Sprite;
+ if ( aaa && aaa.name == string.Format("{0}_{1}", Path.GetFileNameWithoutExtension(tileset_data.ImageSource), tile_gid) ) {
+ var go = new GameObject(string.Format("{0}_{1}", j, i));
+ var iso_object = go.AddComponent();
+ iso_object.position = new Vector3(-i, -j, 0.0f);
+ iso_object.size = Vector3.one;
+ //iso_object.isShowBounds = true;
+ sp.sprite = aaa;
+ sp.transform.SetParent(go.transform, false);
+ sp.transform.localPosition = new Vector3(tileset_data.TileOffsetX, tileset_data.TileOffsetY, 0.0f);
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ TiledMapTilesetData FindTilesetByGid(int gid) {
+ foreach ( var tileset in _asset.Data.Tilesets ) {
+ if ( gid >= tileset.FirstGid && gid < tileset.FirstGid + tileset.TileCount ) {
+ return tileset;
+ }
+ }
+ return null;
+ }*/
}
} // namespace IsoTools.Tiled.Internal
\ No newline at end of file
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 1ea5d58..c8c6165 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -68,6 +68,7 @@ PlayerSettings:
n3dsEnableSharedListOpt: 1
n3dsEnableVSync: 0
uiUse16BitDepthBuffer: 0
+ ignoreAlphaClear: 0
xboxOneResolution: 0
ps3SplashScreen: {fileID: 0}
videoMemoryForVertexBuffers: 0
@@ -133,6 +134,9 @@ PlayerSettings:
iPadLandscapeSplashScreen: {fileID: 0}
iPadHighResLandscapeSplashScreen: {fileID: 0}
appleTVSplashScreen: {fileID: 0}
+ tvOSSmallIconLayers: []
+ tvOSLargeIconLayers: []
+ tvOSTopShelfImageLayers: []
iOSLaunchScreenType: 0
iOSLaunchScreenPortrait: {fileID: 0}
iOSLaunchScreenLandscape: {fileID: 0}
@@ -421,6 +425,9 @@ PlayerSettings:
- iOS::Architecture
- iOS::EnableIncrementalBuildSupportForIl2cpp
- iOS::ScriptingBackend
+ - tvOS::Architecture
+ - tvOS::EnableIncrementalBuildSupportForIl2cpp
+ - tvOS::ScriptingBackend
Android::ScriptingBackend: 0
Standalone::ScriptingBackend: 0
WebGL::ScriptingBackend: 1
@@ -430,6 +437,9 @@ PlayerSettings:
iOS::Architecture: 0
iOS::EnableIncrementalBuildSupportForIl2cpp: 1
iOS::ScriptingBackend: 0
+ tvOS::Architecture: 1
+ tvOS::EnableIncrementalBuildSupportForIl2cpp: 0
+ tvOS::ScriptingBackend: 1
boolPropertyNames:
- WebGL::analyzeBuildSize
- WebGL::dataCaching
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
index 3c4cb34..961ebb9 100644
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 5.3.0f4
+m_EditorVersion: 5.3.1f1
m_StandardAssetsVersion: 0
diff --git a/UnityIso.userprefs b/UnityIso.userprefs
index 9845711..70e21fb 100644
--- a/UnityIso.userprefs
+++ b/UnityIso.userprefs
@@ -1,10 +1,12 @@
-
+
-
-
-
+
+
+
+
+