From a6bca4d46243bfae4f4197690bdbc4cf6d6004d5 Mon Sep 17 00:00:00 2001 From: rudderbucky Date: Thu, 10 Jan 2019 16:38:24 -0800 Subject: [PATCH] (Hopefully) final update before release --- .../Constructs/Air Constructs/Carrier.asset | 2 +- .../Constructs/Ground Constructs/Towers.meta | 8 ++++++++ Assets/DefaultResources.asset | 2 ++ Assets/Scenes/SampleScene.unity | 14 ++------------ .../Entity Definitions/Drone.cs | 2 +- .../Entity Definitions/Entity.cs | 1 + .../Entity Definitions/ShellCore.cs | 2 +- .../Entity Definitions/Tank.cs | 2 +- .../Entity Definitions/Turret.cs | 2 +- Assets/Scripts/SFX Scripts/Colors.cs | 6 +++--- .../Shellcore Sprites/coregreyscale.png.meta | 2 +- 11 files changed, 22 insertions(+), 21 deletions(-) create mode 100644 Assets/Blueprints/Entities/Constructs/Ground Constructs/Towers.meta diff --git a/Assets/Blueprints/Entities/Constructs/Air Constructs/Carrier.asset b/Assets/Blueprints/Entities/Constructs/Air Constructs/Carrier.asset index 015fbddc1..281f34b82 100644 --- a/Assets/Blueprints/Entities/Constructs/Air Constructs/Carrier.asset +++ b/Assets/Blueprints/Entities/Constructs/Air Constructs/Carrier.asset @@ -11,7 +11,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f7d7e5869cbeb124cb1b9b13d1ff34ec, type: 3} m_Name: Carrier m_EditorClassIdentifier: - coreSpriteID: core3_light + coreSpriteID: core1_light coreShellSpriteID: core3_shell intendedType: 8 parts: diff --git a/Assets/Blueprints/Entities/Constructs/Ground Constructs/Towers.meta b/Assets/Blueprints/Entities/Constructs/Ground Constructs/Towers.meta new file mode 100644 index 000000000..60fde5ac2 --- /dev/null +++ b/Assets/Blueprints/Entities/Constructs/Ground Constructs/Towers.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 007020fc26320bc458d25c444fe7718e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/DefaultResources.asset b/Assets/DefaultResources.asset index 989e0c9b6..b18b218d4 100644 --- a/Assets/DefaultResources.asset +++ b/Assets/DefaultResources.asset @@ -270,3 +270,5 @@ MonoBehaviour: obj: {fileID: 11400000, guid: b58b72d927d0c1a4995b6d7239d6315d, type: 2} - ID: missile_station_part obj: {fileID: 11400000, guid: 348c85c3551bade4aa8133dd50525626, type: 2} + - ID: material_color_swap + obj: {fileID: 2100000, guid: 11db0898634b08349860cff50279a55b, type: 2} diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index c8d821e99..cced51174 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -1193,6 +1193,8 @@ MonoBehaviour: obj: {fileID: 11400000, guid: b58b72d927d0c1a4995b6d7239d6315d, type: 2} - ID: missile_station_part obj: {fileID: 11400000, guid: 348c85c3551bade4aa8133dd50525626, type: 2} + - ID: material_color_swap + obj: {fileID: 2100000, guid: 11db0898634b08349860cff50279a55b, type: 2} fieldID: newObject: {fileID: 0} resourcePack: {fileID: 11400000, guid: 2de67eb71a4cb87438b3393e036d1bb3, type: 2} @@ -2993,7 +2995,6 @@ GameObject: m_Component: - component: {fileID: 2068204864} - component: {fileID: 1878101311} - - component: {fileID: 2068204860} m_Layer: 0 m_Name: PlayerCore m_TagString: Untagged @@ -3001,17 +3002,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &2068204860 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2068204859} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 086ca207494cfea4cb118cbeb62c64f6, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!4 &2068204864 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Game Object Definitions/Entity Definitions/Drone.cs b/Assets/Scripts/Game Object Definitions/Entity Definitions/Drone.cs index b06ca2330..b20d22ccf 100644 --- a/Assets/Scripts/Game Object Definitions/Entity Definitions/Drone.cs +++ b/Assets/Scripts/Game Object Definitions/Entity Definitions/Drone.cs @@ -31,7 +31,7 @@ public void SetOwner(IOwner owner) protected override void OnDeath() { - if(owner != null) + if(owner != null && !(owner.Equals(null))) owner.GetUnitsCommanding().Remove(this); base.OnDeath(); } diff --git a/Assets/Scripts/Game Object Definitions/Entity Definitions/Entity.cs b/Assets/Scripts/Game Object Definitions/Entity Definitions/Entity.cs index 060892aeb..cbdb5fdd7 100644 --- a/Assets/Scripts/Game Object Definitions/Entity Definitions/Entity.cs +++ b/Assets/Scripts/Game Object Definitions/Entity Definitions/Entity.cs @@ -117,6 +117,7 @@ protected virtual void BuildEntity() { SpriteRenderer renderer = gameObject.AddComponent(); renderer.material = ResourceManager.GetAsset("material_color_swap"); + renderer.color = FactionColors.colors[faction]; if (blueprint) { // check if it contains a blueprint (it should) if (blueprint.coreSpriteID == "" && blueprint.intendedType == EntityBlueprint.IntendedType.ShellCore) diff --git a/Assets/Scripts/Game Object Definitions/Entity Definitions/ShellCore.cs b/Assets/Scripts/Game Object Definitions/Entity Definitions/ShellCore.cs index 5a8b00b3c..84162d4a1 100644 --- a/Assets/Scripts/Game Object Definitions/Entity Definitions/ShellCore.cs +++ b/Assets/Scripts/Game Object Definitions/Entity Definitions/ShellCore.cs @@ -69,7 +69,7 @@ protected override void OnDestroy() protected override void Start() { intrinsicCommandLimit = 3; - if (carrier != null && carrier.GetIsInitialized()) + if ((carrier != null && !carrier.Equals(null)) && carrier.GetIsInitialized()) { spawnPoint = carrier.GetSpawnPoint(); } diff --git a/Assets/Scripts/Game Object Definitions/Entity Definitions/Tank.cs b/Assets/Scripts/Game Object Definitions/Entity Definitions/Tank.cs index 4b67c2b0b..ceeb89f43 100644 --- a/Assets/Scripts/Game Object Definitions/Entity Definitions/Tank.cs +++ b/Assets/Scripts/Game Object Definitions/Entity Definitions/Tank.cs @@ -96,7 +96,7 @@ public void SetOwner(IOwner owner) protected override void OnDeath() { - if(owner != null) + if(owner != null && !(owner.Equals(null))) owner.GetUnitsCommanding().Remove(this); base.OnDeath(); } diff --git a/Assets/Scripts/Game Object Definitions/Entity Definitions/Turret.cs b/Assets/Scripts/Game Object Definitions/Entity Definitions/Turret.cs index bd99076c8..b61379b07 100644 --- a/Assets/Scripts/Game Object Definitions/Entity Definitions/Turret.cs +++ b/Assets/Scripts/Game Object Definitions/Entity Definitions/Turret.cs @@ -21,7 +21,7 @@ protected override void Start() protected override void OnDeath() { - if(owner != null) + if(owner != null && !owner.Equals(null)) owner.GetUnitsCommanding().Remove(this); base.OnDeath(); } diff --git a/Assets/Scripts/SFX Scripts/Colors.cs b/Assets/Scripts/SFX Scripts/Colors.cs index 66e3f3c77..37cafd5ad 100644 --- a/Assets/Scripts/SFX Scripts/Colors.cs +++ b/Assets/Scripts/SFX Scripts/Colors.cs @@ -6,9 +6,9 @@ public struct FactionColors { public static Color[] colors = new Color[] { - new Color(0.05f, 95f, 0.05f, 0.8F), - new Color(95f, 0.05f, 0.05f, 0.8F), - new Color(0.05f, 0.05f, 95f, 0.8F), + new Color(0.05f, 0.95f, 0.05f, 0.8F), + new Color(0.95f, 0.05f, 0.05f, 0.8F), + new Color(0.05f, 0.05f, 0.95f, 0.8F), }; } diff --git a/Assets/Sprites/Entity Sprites/Shellcore Sprites/coregreyscale.png.meta b/Assets/Sprites/Entity Sprites/Shellcore Sprites/coregreyscale.png.meta index 2fbcba0bc..787f9d2bf 100644 --- a/Assets/Sprites/Entity Sprites/Shellcore Sprites/coregreyscale.png.meta +++ b/Assets/Sprites/Entity Sprites/Shellcore Sprites/coregreyscale.png.meta @@ -61,7 +61,7 @@ TextureImporter: - serializedVersion: 2 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 - resizeAlgorithm: 0 + resizeAlgorithm: 1 textureFormat: -1 textureCompression: 0 compressionQuality: 50