diff --git a/Assembly-CSharp-Editor-vs.csproj b/Assembly-CSharp-Editor-vs.csproj index c105d37..e8aed2b 100644 --- a/Assembly-CSharp-Editor-vs.csproj +++ b/Assembly-CSharp-Editor-vs.csproj @@ -19,7 +19,7 @@ full false Temp\bin\Debug\ - DEBUG;TRACE;UNITY_5_1_1;UNITY_5_1;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_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_LICENSE;ENABLE_AUDIOMIXER_SUSPEND;ENABLE_EDITOR_METRICS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_GAMECENTER;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;DEVELOPMENT_BUILD;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX + DEBUG;TRACE;UNITY_5_1_1;UNITY_5_1;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_LICENSE;ENABLE_AUDIOMIXER_SUSPEND;ENABLE_EDITOR_METRICS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;UNITY_WEBGL;ENABLE_TEXTUREID_MAP;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_IL2CPP;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX;ENABLE_DUCK_TYPING prompt 4 0169 diff --git a/Assembly-CSharp-Editor.csproj b/Assembly-CSharp-Editor.csproj index 169dc63..96bbcdf 100644 --- a/Assembly-CSharp-Editor.csproj +++ b/Assembly-CSharp-Editor.csproj @@ -19,7 +19,7 @@ full false Temp\bin\Debug\ - DEBUG;TRACE;UNITY_5_1_1;UNITY_5_1;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_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_LICENSE;ENABLE_AUDIOMIXER_SUSPEND;ENABLE_EDITOR_METRICS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_GAMECENTER;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;DEVELOPMENT_BUILD;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX + DEBUG;TRACE;UNITY_5_1_1;UNITY_5_1;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_LICENSE;ENABLE_AUDIOMIXER_SUSPEND;ENABLE_EDITOR_METRICS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;UNITY_WEBGL;ENABLE_TEXTUREID_MAP;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_IL2CPP;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX;ENABLE_DUCK_TYPING prompt 4 0169 diff --git a/Assembly-CSharp-vs.csproj b/Assembly-CSharp-vs.csproj index 8bcfc66..c0ca901 100644 --- a/Assembly-CSharp-vs.csproj +++ b/Assembly-CSharp-vs.csproj @@ -19,7 +19,7 @@ full false Temp\bin\Debug\ - DEBUG;TRACE;UNITY_5_1_1;UNITY_5_1;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_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_LICENSE;ENABLE_AUDIOMIXER_SUSPEND;ENABLE_EDITOR_METRICS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_GAMECENTER;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;DEVELOPMENT_BUILD;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX + DEBUG;TRACE;UNITY_5_1_1;UNITY_5_1;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_LICENSE;ENABLE_AUDIOMIXER_SUSPEND;ENABLE_EDITOR_METRICS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;UNITY_WEBGL;ENABLE_TEXTUREID_MAP;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_IL2CPP;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX prompt 4 0169 diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 8bcfc66..c0ca901 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -19,7 +19,7 @@ full false Temp\bin\Debug\ - DEBUG;TRACE;UNITY_5_1_1;UNITY_5_1;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_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_LICENSE;ENABLE_AUDIOMIXER_SUSPEND;ENABLE_EDITOR_METRICS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_GAMECENTER;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;DEVELOPMENT_BUILD;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX + DEBUG;TRACE;UNITY_5_1_1;UNITY_5_1;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_LICENSE;ENABLE_AUDIOMIXER_SUSPEND;ENABLE_EDITOR_METRICS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;UNITY_WEBGL;ENABLE_TEXTUREID_MAP;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_IL2CPP;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX prompt 4 0169 diff --git a/Assets/AssetStoreTools.meta b/Assets/AssetStoreTools.meta new file mode 100644 index 0000000..f249c33 --- /dev/null +++ b/Assets/AssetStoreTools.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: b0264992f90e27e48beeee54b801c8f2 +folderAsset: yes +timeCreated: 1436707381 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AssetStoreTools/Editor.meta b/Assets/AssetStoreTools/Editor.meta new file mode 100644 index 0000000..9209087 --- /dev/null +++ b/Assets/AssetStoreTools/Editor.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 47c3c77b488bde14eac761a5144660ed +folderAsset: yes +timeCreated: 1436707381 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IsoTools/Examples/Prefabs/Kenney/AlienBall.prefab b/Assets/IsoTools/Examples/Prefabs/Kenney/AlienBall.prefab index a09f1fe..dd3f40b 100644 --- a/Assets/IsoTools/Examples/Prefabs/Kenney/AlienBall.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Kenney/AlienBall.prefab @@ -42,7 +42,7 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 124842} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 32.5472946, y: 60.6554718, z: 0} + m_LocalPosition: {x: -.966036558, y: 1.8369118, z: 14.0350876} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 491986} @@ -72,7 +72,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _size: {x: .5, y: .5, z: .5} - _position: {x: 4.27806997, y: 2.24386406, z: .529999971} + _position: {x: 1.55291343, y: 3.03912354, z: .529999971} _isAlignment: 0 _isShowBounds: 0 --- !u!114 &11439950 @@ -113,7 +113,7 @@ MonoBehaviour: m_EditorClassIdentifier: _material: {fileID: 0} _isTrigger: 0 - _size: {x: .5, y: .5, z: .5} + _size: {x: .519999981, y: .519999981, z: .519999981} _offset: {x: .25, y: .25, z: .25} --- !u!212 &21288996 SpriteRenderer: @@ -147,7 +147,11 @@ Prefab: serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} - m_Modifications: [] + m_Modifications: + - target: {fileID: 0} + propertyPath: _isShowBounds + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} m_RootGameObject: {fileID: 124842} diff --git a/Assets/IsoTools/Examples/Prefabs/Kenney/Building.prefab b/Assets/IsoTools/Examples/Prefabs/Kenney/Building.prefab index 346b51b..374547c 100644 --- a/Assets/IsoTools/Examples/Prefabs/Kenney/Building.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Kenney/Building.prefab @@ -83,7 +83,7 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 199876} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 16, y: 56, z: 52.7777863} + m_LocalPosition: {x: .649999976, y: 2.27499986, z: 52.7777863} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 492676} diff --git a/Assets/IsoTools/Examples/Prefabs/Kenney/Fence.prefab b/Assets/IsoTools/Examples/Prefabs/Kenney/Fence.prefab index 39fb419..5506a94 100644 --- a/Assets/IsoTools/Examples/Prefabs/Kenney/Fence.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Kenney/Fence.prefab @@ -51,7 +51,7 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 129934} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 8.47999954, z: 0} + m_LocalPosition: {x: 0, y: .344499975, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 403766} diff --git a/Assets/IsoTools/Examples/Prefabs/Kenney/Fence2.prefab b/Assets/IsoTools/Examples/Prefabs/Kenney/Fence2.prefab index dbcbdbf..5f5ded0 100644 --- a/Assets/IsoTools/Examples/Prefabs/Kenney/Fence2.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Kenney/Fence2.prefab @@ -51,7 +51,7 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 110900} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -28.8951912, y: 1.42384696, z: 0} + m_LocalPosition: {x: -1.17386711, y: .057843782, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 449742} diff --git a/Assets/IsoTools/Examples/Prefabs/Kenney/Player.prefab b/Assets/IsoTools/Examples/Prefabs/Kenney/Player.prefab index 35d7f2c..94067f4 100644 --- a/Assets/IsoTools/Examples/Prefabs/Kenney/Player.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Kenney/Player.prefab @@ -43,7 +43,7 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 121016} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -39.274662, y: 38.1394615, z: 26.5625} + m_LocalPosition: {x: -1.59553313, y: 1.54941559, z: 30.3571491} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 442418} @@ -126,7 +126,7 @@ MonoBehaviour: m_EditorClassIdentifier: _material: {fileID: 0} _isTrigger: 0 - _size: {x: .300000012, y: .300000012, z: .600000024} + _size: {x: .319999993, y: .319999993, z: .620000005} _offset: {x: .150000006, y: .150000006, z: .300000012} --- !u!212 &21204754 SpriteRenderer: diff --git a/Assets/IsoTools/Examples/Prefabs/Kenney/Tree.prefab b/Assets/IsoTools/Examples/Prefabs/Kenney/Tree.prefab index b888023..79413e0 100644 --- a/Assets/IsoTools/Examples/Prefabs/Kenney/Tree.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Kenney/Tree.prefab @@ -51,7 +51,7 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 128698} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 52.3754539, y: 64.95784, z: 43.75} + m_LocalPosition: {x: 2.12775278, y: 2.6389122, z: 43.75} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 461496} diff --git a/Assets/IsoTools/Examples/Scenes/Scene01.unity b/Assets/IsoTools/Examples/Scenes/Scene01.unity index 85d7025..85dc56e 100644 --- a/Assets/IsoTools/Examples/Scenes/Scene01.unity +++ b/Assets/IsoTools/Examples/Scenes/Scene01.unity @@ -4040,6 +4040,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9c4844f94ab7c465d89b59b1741b9f39, type: 3} m_Name: m_EditorClassIdentifier: + maxAlienCount: 10 alienBallPrefab: {fileID: 124842, guid: 06bcc27fb69e442558af5bdf0b8e6f86, type: 2} --- !u!4 &1378187733 Transform: @@ -4993,17 +4994,17 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1927620576} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 90} + m_LocalScale: {x: .0153061226, y: .0153061226, z: .0153061226} m_Children: - {fileID: 527780124} m_Father: {fileID: 0} m_RootOrder: 8 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 3} + m_SizeDelta: {x: 960, y: 600} + m_Pivot: {x: .5, y: .5} --- !u!114 &1927620578 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5049,7 +5050,7 @@ Canvas: m_GameObject: {fileID: 1927620576} m_Enabled: 1 serializedVersion: 2 - m_RenderMode: 1 + m_RenderMode: 2 m_Camera: {fileID: 1054981429} m_PlaneDistance: 100 m_PixelPerfect: 0 diff --git a/Assets/IsoTools/Examples/Scripts/AlienBallController.cs b/Assets/IsoTools/Examples/Scripts/AlienBallController.cs index 57384c7..72ce672 100644 --- a/Assets/IsoTools/Examples/Scripts/AlienBallController.cs +++ b/Assets/IsoTools/Examples/Scripts/AlienBallController.cs @@ -4,10 +4,15 @@ using System.Collections; namespace IsoTools.Examples { [RequireComponent(typeof(IsoRigidbody))] public class AlienBallController : MonoBehaviour { - + + IsoObject _isoObject = null; IsoRigidbody _isoRigidbody = null; void Start() { + _isoObject = GetComponent(); + if ( !_isoObject ) { + throw new UnityException("AlienBallController. IsoObject component not found!"); + } _isoRigidbody = GetComponent(); if ( !_isoRigidbody ) { throw new UnityException("AlienBallController. IsoRigidbody component not found!"); @@ -15,6 +20,12 @@ namespace IsoTools.Examples { StartCoroutine("AddRndForce"); } + void Update() { + if ( _isoObject.positionZ < 0.0f ) { + Destroy(gameObject); + } + } + IEnumerator AddRndForce() { while ( true ) { var dx = Random.Range(0.0f, 2.0f); diff --git a/Assets/IsoTools/Examples/Scripts/AlienBallSpawner.cs b/Assets/IsoTools/Examples/Scripts/AlienBallSpawner.cs index ab4e387..467f75c 100644 --- a/Assets/IsoTools/Examples/Scripts/AlienBallSpawner.cs +++ b/Assets/IsoTools/Examples/Scripts/AlienBallSpawner.cs @@ -4,6 +4,7 @@ using System.Collections; namespace IsoTools.Examples { public class AlienBallSpawner : MonoBehaviour { + public int maxAlienCount = 10; public GameObject alienBallPrefab = null; void Start() { @@ -12,11 +13,14 @@ namespace IsoTools.Examples { IEnumerator SpawnAlienBall() { while ( true ) { - var dx = Random.Range(1.0f, 4.0f); - var dy = Random.Range(1.0f, 4.0f); - var alien_ball_go = Instantiate(alienBallPrefab); - var alien_iso_obj = alien_ball_go.GetComponent(); - alien_iso_obj.position = new Vector3(dx, dy, 5.0f); + var aliens = GameObject.FindObjectsOfType(); + if ( aliens.Length < maxAlienCount ) { + var dx = Random.Range(1.0f, 4.0f); + var dy = Random.Range(1.0f, 4.0f); + var alien_ball_go = Instantiate(alienBallPrefab); + var alien_iso_obj = alien_ball_go.GetComponent(); + alien_iso_obj.position = new Vector3(dx, dy, 5.0f); + } yield return new WaitForSeconds(Random.Range(2.0f, 5.0f)); } } diff --git a/UnityIso-csharp.sln b/UnityIso-csharp.sln index 2b57d5d..7b3cecc 100644 --- a/UnityIso-csharp.sln +++ b/UnityIso-csharp.sln @@ -23,7 +23,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 c4c1fc0..f3593bd 100644 --- a/UnityIso.sln +++ b/UnityIso.sln @@ -23,7 +23,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution + GlobalSection(MonoDevelopProperties) = preSolution StartupItem = Assembly-CSharp.csproj Policies = $0 $0.TextStylePolicy = $1