From 0386a7c7dd5679ee62ed571f1a902896d9f432b0 Mon Sep 17 00:00:00 2001 From: dpeter99 Date: Mon, 21 Dec 2015 15:29:56 +0100 Subject: [PATCH] - Some scripts moved to right place --- Assets/AssetsLoading/AssetsLoader.cs | 23 +- .../Buildings/Old.meta => BasicUtility.meta} | 4 +- Assets/{ => BasicUtility}/ScreenManagger.cs | 0 .../{ => BasicUtility}/ScreenManagger.cs.meta | 0 Assets/{ => BasicUtility}/TileMap.meta | 18 +- .../TileMap/SavedMapData.cs | 0 .../TileMap/SavedMapData.cs.meta | 0 .../{ => BasicUtility}/TileMap/SavedTile.cs | 0 .../TileMap/SavedTile.cs.meta | 0 Assets/{ => BasicUtility/TileMap}/Tile.meta | 0 .../TileMap}/Tile/Surface.meta | 18 +- .../TileMap}/Tile/Surface/Surface.cs | 34 +-- .../TileMap}/Tile/Surface/Surface.cs.meta | 24 +- .../TileMap}/Tile/Surface/Surface.prefab | Bin .../TileMap}/Tile/Surface/Surface.prefab.meta | 16 +- .../{ => BasicUtility/TileMap}/Tile/Tile.cs | 0 .../TileMap}/Tile/Tile.cs.meta | 0 Assets/{ => BasicUtility}/TileMap/TileMap.cs | 0 .../TileMap/TileMap.cs.meta | 24 +- .../TileMap/TileTransform.cs | 0 .../TileMap/TileTransform.cs.meta | 24 +- .../{ => BasicUtility}/TileMap/TileVector.cs | 0 .../TileMap/TileVector.cs.meta | 24 +- .../{ => BasicUtility}/TogleGroupAdvanced.cs | 0 .../TogleGroupAdvanced.cs.meta | 24 +- Assets/Behaviour.cs | 17 -- .../Buildings/Old/Miner.meta => CivMars.meta} | 4 +- Assets/CivMarsInit.cs | 75 +++--- Assets/Class1.cs | 13 -- Assets/GUI/Buildables/BuildingLister.cs | 8 +- .../{ => GUI/Crafting Desplay}/QueueItem.cs | 0 .../Crafting Desplay}/QueueItem.cs.meta | 24 +- Assets/{scripts.meta => GUI/Inventory.meta} | 4 +- Assets/{ => GUI/Inventory}/PlayerInventory.cs | 0 .../Inventory}/PlayerInventory.cs.meta | 24 +- .../PlayerInventoryDrawedElement.cs | 0 .../PlayerInventoryDrawedElement.cs.meta | 24 +- .../Buildings.meta => GUI/MapListing.meta} | 4 +- Assets/{ => GUI/MapListing}/NewMap.cs | 0 Assets/{ => GUI/MapListing}/NewMap.cs.meta | 0 Assets/{ => GUI/MapListing}/SavedMapLister.cs | 0 .../MapListing}/SavedMapLister.cs.meta | 0 Assets/{ => GUI}/PauseTab.cs | 0 Assets/{ => GUI}/PauseTab.cs.meta | 0 Assets/{ => GUI}/UITextures.meta | 18 +- Assets/{ => GUI}/UITextures/Animation.meta | 0 Assets/{ => GUI}/UITextures/Fonts.meta | 18 +- .../{ => GUI}/UITextures/Fonts/Consolas.meta | 18 +- .../UITextures/Fonts/Consolas/CONSOLA.TTF | Bin .../Fonts/Consolas/CONSOLA.TTF.meta | 38 +-- .../UITextures/Fonts/Consolas/CONSOLAB.TTF | Bin .../Fonts/Consolas/CONSOLAB.TTF.meta | 38 +-- .../UITextures/Fonts/Consolas/CONSOLAI.TTF | Bin .../Fonts/Consolas/CONSOLAI.TTF.meta | 38 +-- .../UITextures/Fonts/Consolas/CONSOLAZ.TTF | Bin .../Fonts/Consolas/CONSOLAZ.TTF.meta | 38 +-- Assets/{ => GUI}/UITextures/Fonts/Google.meta | 18 +- .../Fonts/Google/Aldrich-Regular.ttf | Bin .../Fonts/Google/Aldrich-Regular.ttf.meta | 38 +-- .../Fonts/Google/Electrolize-Regular.ttf | Bin .../Fonts/Google/Electrolize-Regular.ttf.meta | 38 +-- .../Fonts/Google/Orbitron-Regular.ttf | Bin .../Fonts/Google/Orbitron-Regular.ttf.meta | 38 +-- .../Fonts/Google/Quantico-Regular.ttf | Bin .../Fonts/Google/Quantico-Regular.ttf.meta | 38 +-- .../{ => GUI}/UITextures/Fonts/Michroma.ttf | Bin .../UITextures/Fonts/Michroma.ttf.meta | 0 Assets/{ => GUI}/UITextures/Fonts/Other.meta | 0 .../UITextures/Fonts/Other/Minecraft.ttf | Bin .../UITextures/Fonts/Other/Minecraft.ttf.meta | 0 .../Fonts/Other/Squares Bold Free.otf | Bin .../Fonts/Other/Squares Bold Free.otf.meta | 0 .../UITextures/Fonts/Other/monofonto.ttf | Bin .../UITextures/Fonts/Other/monofonto.ttf.meta | 0 Assets/{ => GUI}/UITextures/GUI.Header.png | Bin .../{ => GUI}/UITextures/GUI.Header.png.meta | 112 ++++----- Assets/{ => GUI}/UITextures/GUI.Inverted.png | Bin .../UITextures/GUI.Inverted.png.meta | 112 ++++----- Assets/{ => GUI}/UITextures/GUI.Inverted2.png | Bin .../UITextures/GUI.Inverted2.png.meta | 112 ++++----- Assets/{ => GUI}/UITextures/GUI.base.png | Bin Assets/{ => GUI}/UITextures/GUI.base.png.meta | 112 ++++----- Assets/{ => GUI}/UITextures/Noise.mat | Bin Assets/{ => GUI}/UITextures/Noise.mat.meta | 16 +- .../{ => GUI}/UITextures/NoiseEffectGrain.png | Bin .../UITextures/NoiseEffectGrain.png.meta | 112 ++++----- Assets/{ => GUI}/UITextures/Ring.full.png | Bin .../{ => GUI}/UITextures/Ring.full.png.meta | 0 Assets/{ => GUI}/UITextures/Ring.png | Bin Assets/{ => GUI}/UITextures/Ring.png.meta | 112 ++++----- Assets/{ => GUI}/UITextures/Ring2.png | Bin Assets/{ => GUI}/UITextures/Ring2.png.meta | 112 ++++----- Assets/{ => GUI}/UITextures/SideMenu.png | Bin Assets/{ => GUI}/UITextures/SideMenu.png.meta | 112 ++++----- Assets/{ => GUI}/UITextures/SideMenuv2.png | Bin .../{ => GUI}/UITextures/SideMenuv2.png.meta | 112 ++++----- Assets/{ => GUI}/UITextures/SideMenuv3.png | Bin .../{ => GUI}/UITextures/SideMenuv3.png.meta | 112 ++++----- ...video---noise-on-a-green-old-TV-screen.jpg | Bin ...---noise-on-a-green-old-TV-screen.jpg.meta | 112 ++++----- Assets/GameController.cs | 2 + Assets/{Tile => Interfaces}/IWorldGen.cs | 0 Assets/{Tile => Interfaces}/IWorldGen.cs.meta | 24 +- Assets/Map.cs | 4 +- Assets/NeedToBeImplemented/Old/Generato.cs | 34 +-- .../NeedToBeImplemented/Old/Miner/SpecMine.cs | 9 +- .../NeedToBeImplemented/Old/Oxigeneration.cs | 14 +- .../NeedToBeImplemented/Old/UniverzalMiner.cs | 3 +- .../OxigenRecoverer.cs | 0 .../OxigenRecoverer.cs.meta | 0 Assets/OLD/Generate/IronOreTile.prefab | Bin 7712 -> 0 bytes Assets/OLD/Generate/SandTile.prefab | Bin 7704 -> 0 bytes Assets/OLD/Generate/StoneOreTile.prefab | Bin 7712 -> 0 bytes Assets/OLD/Generate/StoneOreTile.prefab.meta | 8 - Assets/OLD/Generate/UraniumOreTile.prefab | Bin 7720 -> 0 bytes .../OLD/Generate/UraniumOreTile.prefab.meta | 8 - Assets/OLD/MapOld.cs | 221 ------------------ Assets/TerrainGen.cs | 64 ----- Assets/TileMap/SavedMap.cs | 104 --------- saves/asd/asd.bin | Bin 60263 -> 0 bytes saves/asd/asd.ddc | Bin 171 -> 0 bytes saves/fgh/fgh.bin | Bin 36220 -> 0 bytes saves/fgh/fgh.ddc | Bin 171 -> 0 bytes 123 files changed, 1059 insertions(+), 1490 deletions(-) rename Assets/{scripts/Buildings/Old.meta => BasicUtility.meta} (67%) rename Assets/{ => BasicUtility}/ScreenManagger.cs (100%) rename Assets/{ => BasicUtility}/ScreenManagger.cs.meta (100%) rename Assets/{ => BasicUtility}/TileMap.meta (95%) rename Assets/{ => BasicUtility}/TileMap/SavedMapData.cs (100%) rename Assets/{ => BasicUtility}/TileMap/SavedMapData.cs.meta (100%) rename Assets/{ => BasicUtility}/TileMap/SavedTile.cs (100%) rename Assets/{ => BasicUtility}/TileMap/SavedTile.cs.meta (100%) rename Assets/{ => BasicUtility/TileMap}/Tile.meta (100%) rename Assets/{ => BasicUtility/TileMap}/Tile/Surface.meta (95%) rename Assets/{ => BasicUtility/TileMap}/Tile/Surface/Surface.cs (92%) rename Assets/{ => BasicUtility/TileMap}/Tile/Surface/Surface.cs.meta (95%) rename Assets/{ => BasicUtility/TileMap}/Tile/Surface/Surface.prefab (100%) rename Assets/{ => BasicUtility/TileMap}/Tile/Surface/Surface.prefab.meta (95%) rename Assets/{ => BasicUtility/TileMap}/Tile/Tile.cs (100%) rename Assets/{ => BasicUtility/TileMap}/Tile/Tile.cs.meta (100%) rename Assets/{ => BasicUtility}/TileMap/TileMap.cs (100%) rename Assets/{ => BasicUtility}/TileMap/TileMap.cs.meta (96%) rename Assets/{ => BasicUtility}/TileMap/TileTransform.cs (100%) rename Assets/{ => BasicUtility}/TileMap/TileTransform.cs.meta (95%) rename Assets/{ => BasicUtility}/TileMap/TileVector.cs (100%) rename Assets/{ => BasicUtility}/TileMap/TileVector.cs.meta (95%) rename Assets/{ => BasicUtility}/TogleGroupAdvanced.cs (100%) rename Assets/{ => BasicUtility}/TogleGroupAdvanced.cs.meta (95%) delete mode 100644 Assets/Behaviour.cs rename Assets/{scripts/Buildings/Old/Miner.meta => CivMars.meta} (67%) delete mode 100644 Assets/Class1.cs rename Assets/{ => GUI/Crafting Desplay}/QueueItem.cs (100%) rename Assets/{ => GUI/Crafting Desplay}/QueueItem.cs.meta (95%) rename Assets/{scripts.meta => GUI/Inventory.meta} (67%) rename Assets/{ => GUI/Inventory}/PlayerInventory.cs (100%) rename Assets/{ => GUI/Inventory}/PlayerInventory.cs.meta (95%) rename Assets/{ => GUI/Inventory}/PlayerInventoryDrawedElement.cs (100%) rename Assets/{ => GUI/Inventory}/PlayerInventoryDrawedElement.cs.meta (95%) rename Assets/{scripts/Buildings.meta => GUI/MapListing.meta} (67%) rename Assets/{ => GUI/MapListing}/NewMap.cs (100%) rename Assets/{ => GUI/MapListing}/NewMap.cs.meta (100%) rename Assets/{ => GUI/MapListing}/SavedMapLister.cs (100%) rename Assets/{ => GUI/MapListing}/SavedMapLister.cs.meta (100%) rename Assets/{ => GUI}/PauseTab.cs (100%) rename Assets/{ => GUI}/PauseTab.cs.meta (100%) rename Assets/{ => GUI}/UITextures.meta (95%) rename Assets/{ => GUI}/UITextures/Animation.meta (100%) rename Assets/{ => GUI}/UITextures/Fonts.meta (95%) rename Assets/{ => GUI}/UITextures/Fonts/Consolas.meta (95%) rename Assets/{ => GUI}/UITextures/Fonts/Consolas/CONSOLA.TTF (100%) rename Assets/{ => GUI}/UITextures/Fonts/Consolas/CONSOLA.TTF.meta (95%) rename Assets/{ => GUI}/UITextures/Fonts/Consolas/CONSOLAB.TTF (100%) rename Assets/{ => GUI}/UITextures/Fonts/Consolas/CONSOLAB.TTF.meta (95%) rename Assets/{ => GUI}/UITextures/Fonts/Consolas/CONSOLAI.TTF (100%) rename Assets/{ => GUI}/UITextures/Fonts/Consolas/CONSOLAI.TTF.meta (95%) rename Assets/{ => GUI}/UITextures/Fonts/Consolas/CONSOLAZ.TTF (100%) rename Assets/{ => GUI}/UITextures/Fonts/Consolas/CONSOLAZ.TTF.meta (95%) rename Assets/{ => GUI}/UITextures/Fonts/Google.meta (95%) rename Assets/{ => GUI}/UITextures/Fonts/Google/Aldrich-Regular.ttf (100%) rename Assets/{ => GUI}/UITextures/Fonts/Google/Aldrich-Regular.ttf.meta (95%) rename Assets/{ => GUI}/UITextures/Fonts/Google/Electrolize-Regular.ttf (100%) rename Assets/{ => GUI}/UITextures/Fonts/Google/Electrolize-Regular.ttf.meta (95%) rename Assets/{ => GUI}/UITextures/Fonts/Google/Orbitron-Regular.ttf (100%) rename Assets/{ => GUI}/UITextures/Fonts/Google/Orbitron-Regular.ttf.meta (95%) rename Assets/{ => GUI}/UITextures/Fonts/Google/Quantico-Regular.ttf (100%) rename Assets/{ => GUI}/UITextures/Fonts/Google/Quantico-Regular.ttf.meta (95%) rename Assets/{ => GUI}/UITextures/Fonts/Michroma.ttf (100%) rename Assets/{ => GUI}/UITextures/Fonts/Michroma.ttf.meta (100%) rename Assets/{ => GUI}/UITextures/Fonts/Other.meta (100%) rename Assets/{ => GUI}/UITextures/Fonts/Other/Minecraft.ttf (100%) rename Assets/{ => GUI}/UITextures/Fonts/Other/Minecraft.ttf.meta (100%) rename Assets/{ => GUI}/UITextures/Fonts/Other/Squares Bold Free.otf (100%) rename Assets/{ => GUI}/UITextures/Fonts/Other/Squares Bold Free.otf.meta (100%) rename Assets/{ => GUI}/UITextures/Fonts/Other/monofonto.ttf (100%) rename Assets/{ => GUI}/UITextures/Fonts/Other/monofonto.ttf.meta (100%) rename Assets/{ => GUI}/UITextures/GUI.Header.png (100%) rename Assets/{ => GUI}/UITextures/GUI.Header.png.meta (95%) rename Assets/{ => GUI}/UITextures/GUI.Inverted.png (100%) rename Assets/{ => GUI}/UITextures/GUI.Inverted.png.meta (95%) rename Assets/{ => GUI}/UITextures/GUI.Inverted2.png (100%) rename Assets/{ => GUI}/UITextures/GUI.Inverted2.png.meta (95%) rename Assets/{ => GUI}/UITextures/GUI.base.png (100%) rename Assets/{ => GUI}/UITextures/GUI.base.png.meta (95%) rename Assets/{ => GUI}/UITextures/Noise.mat (100%) rename Assets/{ => GUI}/UITextures/Noise.mat.meta (95%) rename Assets/{ => GUI}/UITextures/NoiseEffectGrain.png (100%) rename Assets/{ => GUI}/UITextures/NoiseEffectGrain.png.meta (95%) rename Assets/{ => GUI}/UITextures/Ring.full.png (100%) rename Assets/{ => GUI}/UITextures/Ring.full.png.meta (100%) rename Assets/{ => GUI}/UITextures/Ring.png (100%) rename Assets/{ => GUI}/UITextures/Ring.png.meta (95%) rename Assets/{ => GUI}/UITextures/Ring2.png (100%) rename Assets/{ => GUI}/UITextures/Ring2.png.meta (95%) rename Assets/{ => GUI}/UITextures/SideMenu.png (100%) rename Assets/{ => GUI}/UITextures/SideMenu.png.meta (95%) rename Assets/{ => GUI}/UITextures/SideMenuv2.png (100%) rename Assets/{ => GUI}/UITextures/SideMenuv2.png.meta (95%) rename Assets/{ => GUI}/UITextures/SideMenuv3.png (100%) rename Assets/{ => GUI}/UITextures/SideMenuv3.png.meta (95%) rename Assets/{ => GUI}/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg (100%) rename Assets/{ => GUI}/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg.meta (95%) rename Assets/{Tile => Interfaces}/IWorldGen.cs (100%) rename Assets/{Tile => Interfaces}/IWorldGen.cs.meta (95%) rename Assets/{ => NeedToBeImplemented}/OxigenRecoverer.cs (100%) rename Assets/{ => NeedToBeImplemented}/OxigenRecoverer.cs.meta (100%) delete mode 100644 Assets/OLD/Generate/IronOreTile.prefab delete mode 100644 Assets/OLD/Generate/SandTile.prefab delete mode 100644 Assets/OLD/Generate/StoneOreTile.prefab delete mode 100644 Assets/OLD/Generate/StoneOreTile.prefab.meta delete mode 100644 Assets/OLD/Generate/UraniumOreTile.prefab delete mode 100644 Assets/OLD/Generate/UraniumOreTile.prefab.meta delete mode 100644 Assets/OLD/MapOld.cs delete mode 100644 Assets/TerrainGen.cs delete mode 100644 Assets/TileMap/SavedMap.cs delete mode 100644 saves/asd/asd.bin delete mode 100644 saves/asd/asd.ddc delete mode 100644 saves/fgh/fgh.bin delete mode 100644 saves/fgh/fgh.ddc diff --git a/Assets/AssetsLoading/AssetsLoader.cs b/Assets/AssetsLoading/AssetsLoader.cs index 7193efe..4c35574 100644 --- a/Assets/AssetsLoading/AssetsLoader.cs +++ b/Assets/AssetsLoading/AssetsLoader.cs @@ -1,18 +1,19 @@ -using System; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UI; +using UnityEngine; +using CivMars; -public class AssetsLoader : MonoBehaviour +namespace CivMarsEngine.Registry { - - public void CallRegister() + public class AssetsLoader : MonoBehaviour { - - CivMarsInit.Init(); + public void CallRegister() + { - } -} + CivMarsInit.Init(); + + } + + } +} \ No newline at end of file diff --git a/Assets/scripts/Buildings/Old.meta b/Assets/BasicUtility.meta similarity index 67% rename from Assets/scripts/Buildings/Old.meta rename to Assets/BasicUtility.meta index 301a1ce..b6b431c 100644 --- a/Assets/scripts/Buildings/Old.meta +++ b/Assets/BasicUtility.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: d09cb17d294bf204fa6cb5c50593bf21 +guid: 5245ae4032d6ec343986cbe1d3a70aab folderAsset: yes -timeCreated: 1445957826 +timeCreated: 1450702604 licenseType: Free DefaultImporter: userData: diff --git a/Assets/ScreenManagger.cs b/Assets/BasicUtility/ScreenManagger.cs similarity index 100% rename from Assets/ScreenManagger.cs rename to Assets/BasicUtility/ScreenManagger.cs diff --git a/Assets/ScreenManagger.cs.meta b/Assets/BasicUtility/ScreenManagger.cs.meta similarity index 100% rename from Assets/ScreenManagger.cs.meta rename to Assets/BasicUtility/ScreenManagger.cs.meta diff --git a/Assets/TileMap.meta b/Assets/BasicUtility/TileMap.meta similarity index 95% rename from Assets/TileMap.meta rename to Assets/BasicUtility/TileMap.meta index d761635..baf5efc 100644 --- a/Assets/TileMap.meta +++ b/Assets/BasicUtility/TileMap.meta @@ -1,9 +1,9 @@ -fileFormatVersion: 2 -guid: 81c0fb70137fcf34bbe321863914ae28 -folderAsset: yes -timeCreated: 1446149952 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 81c0fb70137fcf34bbe321863914ae28 +folderAsset: yes +timeCreated: 1446149952 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TileMap/SavedMapData.cs b/Assets/BasicUtility/TileMap/SavedMapData.cs similarity index 100% rename from Assets/TileMap/SavedMapData.cs rename to Assets/BasicUtility/TileMap/SavedMapData.cs diff --git a/Assets/TileMap/SavedMapData.cs.meta b/Assets/BasicUtility/TileMap/SavedMapData.cs.meta similarity index 100% rename from Assets/TileMap/SavedMapData.cs.meta rename to Assets/BasicUtility/TileMap/SavedMapData.cs.meta diff --git a/Assets/TileMap/SavedTile.cs b/Assets/BasicUtility/TileMap/SavedTile.cs similarity index 100% rename from Assets/TileMap/SavedTile.cs rename to Assets/BasicUtility/TileMap/SavedTile.cs diff --git a/Assets/TileMap/SavedTile.cs.meta b/Assets/BasicUtility/TileMap/SavedTile.cs.meta similarity index 100% rename from Assets/TileMap/SavedTile.cs.meta rename to Assets/BasicUtility/TileMap/SavedTile.cs.meta diff --git a/Assets/Tile.meta b/Assets/BasicUtility/TileMap/Tile.meta similarity index 100% rename from Assets/Tile.meta rename to Assets/BasicUtility/TileMap/Tile.meta diff --git a/Assets/Tile/Surface.meta b/Assets/BasicUtility/TileMap/Tile/Surface.meta similarity index 95% rename from Assets/Tile/Surface.meta rename to Assets/BasicUtility/TileMap/Tile/Surface.meta index 2640f3f..73a4047 100644 --- a/Assets/Tile/Surface.meta +++ b/Assets/BasicUtility/TileMap/Tile/Surface.meta @@ -1,9 +1,9 @@ -fileFormatVersion: 2 -guid: 3f806b90a6fab1f48bef970c6a37c1aa -folderAsset: yes -timeCreated: 1446325857 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 3f806b90a6fab1f48bef970c6a37c1aa +folderAsset: yes +timeCreated: 1446325857 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Tile/Surface/Surface.cs b/Assets/BasicUtility/TileMap/Tile/Surface/Surface.cs similarity index 92% rename from Assets/Tile/Surface/Surface.cs rename to Assets/BasicUtility/TileMap/Tile/Surface/Surface.cs index 0aa2e17..6c5717c 100644 --- a/Assets/Tile/Surface/Surface.cs +++ b/Assets/BasicUtility/TileMap/Tile/Surface/Surface.cs @@ -1,17 +1,17 @@ -using UnityEngine; -using System.Collections; - -public class Surface : Tiled { - - /* - // Use this for initialization - void Start () { - - } - - // Update is called once per frame - void Update () { - - } - */ -} +using UnityEngine; +using System.Collections; + +public class Surface : Tiled { + + /* + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update () { + + } + */ +} diff --git a/Assets/Tile/Surface/Surface.cs.meta b/Assets/BasicUtility/TileMap/Tile/Surface/Surface.cs.meta similarity index 95% rename from Assets/Tile/Surface/Surface.cs.meta rename to Assets/BasicUtility/TileMap/Tile/Surface/Surface.cs.meta index 235ef6d..ba46ad8 100644 --- a/Assets/Tile/Surface/Surface.cs.meta +++ b/Assets/BasicUtility/TileMap/Tile/Surface/Surface.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 1a52bc9f00fa2ac4ebb989f05239adbf -timeCreated: 1446234690 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 1a52bc9f00fa2ac4ebb989f05239adbf +timeCreated: 1446234690 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Tile/Surface/Surface.prefab b/Assets/BasicUtility/TileMap/Tile/Surface/Surface.prefab similarity index 100% rename from Assets/Tile/Surface/Surface.prefab rename to Assets/BasicUtility/TileMap/Tile/Surface/Surface.prefab diff --git a/Assets/Tile/Surface/Surface.prefab.meta b/Assets/BasicUtility/TileMap/Tile/Surface/Surface.prefab.meta similarity index 95% rename from Assets/Tile/Surface/Surface.prefab.meta rename to Assets/BasicUtility/TileMap/Tile/Surface/Surface.prefab.meta index 719367f..3ad6048 100644 --- a/Assets/Tile/Surface/Surface.prefab.meta +++ b/Assets/BasicUtility/TileMap/Tile/Surface/Surface.prefab.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: b9c22948c674e79498b9c92e06de87c8 -timeCreated: 1446234227 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: b9c22948c674e79498b9c92e06de87c8 +timeCreated: 1446234227 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Tile/Tile.cs b/Assets/BasicUtility/TileMap/Tile/Tile.cs similarity index 100% rename from Assets/Tile/Tile.cs rename to Assets/BasicUtility/TileMap/Tile/Tile.cs diff --git a/Assets/Tile/Tile.cs.meta b/Assets/BasicUtility/TileMap/Tile/Tile.cs.meta similarity index 100% rename from Assets/Tile/Tile.cs.meta rename to Assets/BasicUtility/TileMap/Tile/Tile.cs.meta diff --git a/Assets/TileMap/TileMap.cs b/Assets/BasicUtility/TileMap/TileMap.cs similarity index 100% rename from Assets/TileMap/TileMap.cs rename to Assets/BasicUtility/TileMap/TileMap.cs diff --git a/Assets/TileMap/TileMap.cs.meta b/Assets/BasicUtility/TileMap/TileMap.cs.meta similarity index 96% rename from Assets/TileMap/TileMap.cs.meta rename to Assets/BasicUtility/TileMap/TileMap.cs.meta index 7841546..c9ceaf4 100644 --- a/Assets/TileMap/TileMap.cs.meta +++ b/Assets/BasicUtility/TileMap/TileMap.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 9164dff99a7da7c43bafb1ba97602dad -timeCreated: 1446224690 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {fileID: 7250588514170254948, guid: 0000000000000000d000000000000000, type: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 9164dff99a7da7c43bafb1ba97602dad +timeCreated: 1446224690 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 7250588514170254948, guid: 0000000000000000d000000000000000, type: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TileMap/TileTransform.cs b/Assets/BasicUtility/TileMap/TileTransform.cs similarity index 100% rename from Assets/TileMap/TileTransform.cs rename to Assets/BasicUtility/TileMap/TileTransform.cs diff --git a/Assets/TileMap/TileTransform.cs.meta b/Assets/BasicUtility/TileMap/TileTransform.cs.meta similarity index 95% rename from Assets/TileMap/TileTransform.cs.meta rename to Assets/BasicUtility/TileMap/TileTransform.cs.meta index 1ff2f9c..7b47a65 100644 --- a/Assets/TileMap/TileTransform.cs.meta +++ b/Assets/BasicUtility/TileMap/TileTransform.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 3a510d09d4fef3f428aca1c7eb5cd212 -timeCreated: 1446133115 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 3a510d09d4fef3f428aca1c7eb5cd212 +timeCreated: 1446133115 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TileMap/TileVector.cs b/Assets/BasicUtility/TileMap/TileVector.cs similarity index 100% rename from Assets/TileMap/TileVector.cs rename to Assets/BasicUtility/TileMap/TileVector.cs diff --git a/Assets/TileMap/TileVector.cs.meta b/Assets/BasicUtility/TileMap/TileVector.cs.meta similarity index 95% rename from Assets/TileMap/TileVector.cs.meta rename to Assets/BasicUtility/TileMap/TileVector.cs.meta index 1950cb3..58fcc8b 100644 --- a/Assets/TileMap/TileVector.cs.meta +++ b/Assets/BasicUtility/TileMap/TileVector.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 64d5c9a1773d68948bfd954115a4aa4d -timeCreated: 1446139365 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 64d5c9a1773d68948bfd954115a4aa4d +timeCreated: 1446139365 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TogleGroupAdvanced.cs b/Assets/BasicUtility/TogleGroupAdvanced.cs similarity index 100% rename from Assets/TogleGroupAdvanced.cs rename to Assets/BasicUtility/TogleGroupAdvanced.cs diff --git a/Assets/TogleGroupAdvanced.cs.meta b/Assets/BasicUtility/TogleGroupAdvanced.cs.meta similarity index 95% rename from Assets/TogleGroupAdvanced.cs.meta rename to Assets/BasicUtility/TogleGroupAdvanced.cs.meta index e7920b1..7572d2b 100644 --- a/Assets/TogleGroupAdvanced.cs.meta +++ b/Assets/BasicUtility/TogleGroupAdvanced.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: e1e32676a7f0a6340a1ad226215a6275 -timeCreated: 1446128939 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: e1e32676a7f0a6340a1ad226215a6275 +timeCreated: 1446128939 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Behaviour.cs b/Assets/Behaviour.cs deleted file mode 100644 index cbf2792..0000000 --- a/Assets/Behaviour.cs +++ /dev/null @@ -1,17 +0,0 @@ -using UnityEngine; -using System.Collections; - -public class Behaviour : MonoBehaviour { - - public GameController GameCon; - - // Use this for initialization - void Start () { - GameCon = GameObject.FindGameObjectWithTag("GameController").GetComponent(); - } - - // Update is called once per frame - void Update () { - - } -} diff --git a/Assets/scripts/Buildings/Old/Miner.meta b/Assets/CivMars.meta similarity index 67% rename from Assets/scripts/Buildings/Old/Miner.meta rename to Assets/CivMars.meta index a0fcbd2..ddef1af 100644 --- a/Assets/scripts/Buildings/Old/Miner.meta +++ b/Assets/CivMars.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: a4b1a82bee9595649a13750df7982280 +guid: c5ab95ac4eb1cd24682e34df66e301d2 folderAsset: yes -timeCreated: 1445957826 +timeCreated: 1450702941 licenseType: Free DefaultImporter: userData: diff --git a/Assets/CivMarsInit.cs b/Assets/CivMarsInit.cs index 7d508b1..a1d64d3 100644 --- a/Assets/CivMarsInit.cs +++ b/Assets/CivMarsInit.cs @@ -4,52 +4,55 @@ using System.Text; using UnityEngine; -[Mod] -public static class CivMarsInit +namespace CivMars { - public const string ModSpace = "CivMars"; - public const string BlockSpace = "CivMars.block"; - public const string ItemSpace = "CivMars.item"; - - [ModInit] - public static void Init() + [Mod] + public static class CivMarsInit { - GameRegystry.RegisterItem("CivMars.IronIngot", new IronIngot()); - GameRegystry.RegisterItem("CivMars.IronPlate", new IronPlate()); - GameRegystry.RegisterItem("CivMars.GlassPlane", new GlassPlane()); - GameRegystry.RegisterItem("CivMars.IronPipe", new IronPipe()); - //GameRegystry.RegisterItem("CivMars.StoneBrick", new StoneBrick()); - //GameRegystry.RegisterItem("CivMars.InteriorPlate", new InteriorPlate()); - //GameRegystry.RegisterItem("CivMars.Roof", new Roof()); - //GameRegystry.RegisterItem("CuvMars.ControlCircuit", new ControlCircuit()); - //GameRegystry.RegisterItem("CuvMars.Piston", new Piston()); - //GameRegystry.RegisterItem("CuvMars.OxygenTank", new OxygenTank()); - - GameObject[] goBuild = Resources.LoadAll("Buildings"); - - foreach (GameObject item in goBuild) - { - IRegystratabe a = item.GetComponent(); + public const string ModSpace = "CivMars"; + public const string BlockSpace = "CivMars.block"; + public const string ItemSpace = "CivMars.item"; - if (a != null) + [ModInit] + public static void Init() + { + GameRegystry.RegisterItem("CivMars.IronIngot", new IronIngot()); + GameRegystry.RegisterItem("CivMars.IronPlate", new IronPlate()); + GameRegystry.RegisterItem("CivMars.GlassPlane", new GlassPlane()); + GameRegystry.RegisterItem("CivMars.IronPipe", new IronPipe()); + //GameRegystry.RegisterItem("CivMars.StoneBrick", new StoneBrick()); + //GameRegystry.RegisterItem("CivMars.InteriorPlate", new InteriorPlate()); + //GameRegystry.RegisterItem("CivMars.Roof", new Roof()); + //GameRegystry.RegisterItem("CuvMars.ControlCircuit", new ControlCircuit()); + //GameRegystry.RegisterItem("CuvMars.Piston", new Piston()); + //GameRegystry.RegisterItem("CuvMars.OxygenTank", new OxygenTank()); + + GameObject[] goBuild = Resources.LoadAll("Buildings"); + + foreach (GameObject item in goBuild) { - a.Regystrate(); - } - } + IRegystratabe a = item.GetComponent(); - GameObject[] goTiles = Resources.LoadAll("GeneratedTiles"); + if (a != null) + { + a.Regystrate(); + } + } - foreach (GameObject item in goTiles) - { - IRegystratabe a = item.GetComponent(); + GameObject[] goTiles = Resources.LoadAll("GeneratedTiles"); - if (a != null) + foreach (GameObject item in goTiles) { - a.Regystrate(); + IRegystratabe a = item.GetComponent(); + + if (a != null) + { + a.Regystrate(); + } } } - } -} + } +} \ No newline at end of file diff --git a/Assets/Class1.cs b/Assets/Class1.cs deleted file mode 100644 index 9aa5f14..0000000 --- a/Assets/Class1.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -public enum GUIState -{ - BuildingGui, - AccesPanel, - Building, - None -} - diff --git a/Assets/GUI/Buildables/BuildingLister.cs b/Assets/GUI/Buildables/BuildingLister.cs index 4d1c7a9..4479465 100644 --- a/Assets/GUI/Buildables/BuildingLister.cs +++ b/Assets/GUI/Buildables/BuildingLister.cs @@ -1,11 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Collections; -using System.Linq; -using System.Text; +using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; +using CivMarsEngine; + public class BuildingLister : MonoBehaviour, IHasGui { public GameObject buildableDrawElement; diff --git a/Assets/QueueItem.cs b/Assets/GUI/Crafting Desplay/QueueItem.cs similarity index 100% rename from Assets/QueueItem.cs rename to Assets/GUI/Crafting Desplay/QueueItem.cs diff --git a/Assets/QueueItem.cs.meta b/Assets/GUI/Crafting Desplay/QueueItem.cs.meta similarity index 95% rename from Assets/QueueItem.cs.meta rename to Assets/GUI/Crafting Desplay/QueueItem.cs.meta index f938bc2..8961923 100644 --- a/Assets/QueueItem.cs.meta +++ b/Assets/GUI/Crafting Desplay/QueueItem.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 232e9f834b9e33c469d296deb0600b54 -timeCreated: 1448726693 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 232e9f834b9e33c469d296deb0600b54 +timeCreated: 1448726693 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/scripts.meta b/Assets/GUI/Inventory.meta similarity index 67% rename from Assets/scripts.meta rename to Assets/GUI/Inventory.meta index 11d2037..81c09bd 100644 --- a/Assets/scripts.meta +++ b/Assets/GUI/Inventory.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 6363259cb6dda0e43a3261f13e54e2e4 +guid: b9993e6819173d14ca48149aad6b814a folderAsset: yes -timeCreated: 1445957826 +timeCreated: 1450702762 licenseType: Free DefaultImporter: userData: diff --git a/Assets/PlayerInventory.cs b/Assets/GUI/Inventory/PlayerInventory.cs similarity index 100% rename from Assets/PlayerInventory.cs rename to Assets/GUI/Inventory/PlayerInventory.cs diff --git a/Assets/PlayerInventory.cs.meta b/Assets/GUI/Inventory/PlayerInventory.cs.meta similarity index 95% rename from Assets/PlayerInventory.cs.meta rename to Assets/GUI/Inventory/PlayerInventory.cs.meta index cec5e59..1748c93 100644 --- a/Assets/PlayerInventory.cs.meta +++ b/Assets/GUI/Inventory/PlayerInventory.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 90f1701421bfcdb4980981a334136186 -timeCreated: 1449316567 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 90f1701421bfcdb4980981a334136186 +timeCreated: 1449316567 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PlayerInventoryDrawedElement.cs b/Assets/GUI/Inventory/PlayerInventoryDrawedElement.cs similarity index 100% rename from Assets/PlayerInventoryDrawedElement.cs rename to Assets/GUI/Inventory/PlayerInventoryDrawedElement.cs diff --git a/Assets/PlayerInventoryDrawedElement.cs.meta b/Assets/GUI/Inventory/PlayerInventoryDrawedElement.cs.meta similarity index 95% rename from Assets/PlayerInventoryDrawedElement.cs.meta rename to Assets/GUI/Inventory/PlayerInventoryDrawedElement.cs.meta index 84861a8..ded6546 100644 --- a/Assets/PlayerInventoryDrawedElement.cs.meta +++ b/Assets/GUI/Inventory/PlayerInventoryDrawedElement.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: e99515fb53cbfb24a8b6eb1f9f704e91 -timeCreated: 1449317235 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: e99515fb53cbfb24a8b6eb1f9f704e91 +timeCreated: 1449317235 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/scripts/Buildings.meta b/Assets/GUI/MapListing.meta similarity index 67% rename from Assets/scripts/Buildings.meta rename to Assets/GUI/MapListing.meta index f2ca6a3..b53be47 100644 --- a/Assets/scripts/Buildings.meta +++ b/Assets/GUI/MapListing.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 5c219a7a106001e4db3ac48786412de0 +guid: 0d55a1c3588edda4f8ecd747fa1fca5d folderAsset: yes -timeCreated: 1445957826 +timeCreated: 1450702701 licenseType: Free DefaultImporter: userData: diff --git a/Assets/NewMap.cs b/Assets/GUI/MapListing/NewMap.cs similarity index 100% rename from Assets/NewMap.cs rename to Assets/GUI/MapListing/NewMap.cs diff --git a/Assets/NewMap.cs.meta b/Assets/GUI/MapListing/NewMap.cs.meta similarity index 100% rename from Assets/NewMap.cs.meta rename to Assets/GUI/MapListing/NewMap.cs.meta diff --git a/Assets/SavedMapLister.cs b/Assets/GUI/MapListing/SavedMapLister.cs similarity index 100% rename from Assets/SavedMapLister.cs rename to Assets/GUI/MapListing/SavedMapLister.cs diff --git a/Assets/SavedMapLister.cs.meta b/Assets/GUI/MapListing/SavedMapLister.cs.meta similarity index 100% rename from Assets/SavedMapLister.cs.meta rename to Assets/GUI/MapListing/SavedMapLister.cs.meta diff --git a/Assets/PauseTab.cs b/Assets/GUI/PauseTab.cs similarity index 100% rename from Assets/PauseTab.cs rename to Assets/GUI/PauseTab.cs diff --git a/Assets/PauseTab.cs.meta b/Assets/GUI/PauseTab.cs.meta similarity index 100% rename from Assets/PauseTab.cs.meta rename to Assets/GUI/PauseTab.cs.meta diff --git a/Assets/UITextures.meta b/Assets/GUI/UITextures.meta similarity index 95% rename from Assets/UITextures.meta rename to Assets/GUI/UITextures.meta index 0c2aea8..5159e95 100644 --- a/Assets/UITextures.meta +++ b/Assets/GUI/UITextures.meta @@ -1,9 +1,9 @@ -fileFormatVersion: 2 -guid: 8c1a24996afdb234590f79fc13e9c81b -folderAsset: yes -timeCreated: 1448801260 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 8c1a24996afdb234590f79fc13e9c81b +folderAsset: yes +timeCreated: 1448801260 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/Animation.meta b/Assets/GUI/UITextures/Animation.meta similarity index 100% rename from Assets/UITextures/Animation.meta rename to Assets/GUI/UITextures/Animation.meta diff --git a/Assets/UITextures/Fonts.meta b/Assets/GUI/UITextures/Fonts.meta similarity index 95% rename from Assets/UITextures/Fonts.meta rename to Assets/GUI/UITextures/Fonts.meta index 5580765..6526470 100644 --- a/Assets/UITextures/Fonts.meta +++ b/Assets/GUI/UITextures/Fonts.meta @@ -1,9 +1,9 @@ -fileFormatVersion: 2 -guid: 04866a43f01a3d74590f4bf4206502d0 -folderAsset: yes -timeCreated: 1449001566 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 04866a43f01a3d74590f4bf4206502d0 +folderAsset: yes +timeCreated: 1449001566 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/Fonts/Consolas.meta b/Assets/GUI/UITextures/Fonts/Consolas.meta similarity index 95% rename from Assets/UITextures/Fonts/Consolas.meta rename to Assets/GUI/UITextures/Fonts/Consolas.meta index adce0b3..9d96ec6 100644 --- a/Assets/UITextures/Fonts/Consolas.meta +++ b/Assets/GUI/UITextures/Fonts/Consolas.meta @@ -1,9 +1,9 @@ -fileFormatVersion: 2 -guid: c87e1939091425348975b789273b5625 -folderAsset: yes -timeCreated: 1449001586 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: c87e1939091425348975b789273b5625 +folderAsset: yes +timeCreated: 1449001586 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/Fonts/Consolas/CONSOLA.TTF b/Assets/GUI/UITextures/Fonts/Consolas/CONSOLA.TTF similarity index 100% rename from Assets/UITextures/Fonts/Consolas/CONSOLA.TTF rename to Assets/GUI/UITextures/Fonts/Consolas/CONSOLA.TTF diff --git a/Assets/UITextures/Fonts/Consolas/CONSOLA.TTF.meta b/Assets/GUI/UITextures/Fonts/Consolas/CONSOLA.TTF.meta similarity index 95% rename from Assets/UITextures/Fonts/Consolas/CONSOLA.TTF.meta rename to Assets/GUI/UITextures/Fonts/Consolas/CONSOLA.TTF.meta index d6386b8..2595666 100644 --- a/Assets/UITextures/Fonts/Consolas/CONSOLA.TTF.meta +++ b/Assets/GUI/UITextures/Fonts/Consolas/CONSOLA.TTF.meta @@ -1,19 +1,19 @@ -fileFormatVersion: 2 -guid: eabdb8fe246655140bbb30fb1476f1de -timeCreated: 1448823422 -licenseType: Free -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - fallbackFontReferences: [] - customCharacters: - fontRenderingMode: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: eabdb8fe246655140bbb30fb1476f1de +timeCreated: 1448823422 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 2 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + use2xBehaviour: 0 + fontNames: [] + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/Fonts/Consolas/CONSOLAB.TTF b/Assets/GUI/UITextures/Fonts/Consolas/CONSOLAB.TTF similarity index 100% rename from Assets/UITextures/Fonts/Consolas/CONSOLAB.TTF rename to Assets/GUI/UITextures/Fonts/Consolas/CONSOLAB.TTF diff --git a/Assets/UITextures/Fonts/Consolas/CONSOLAB.TTF.meta b/Assets/GUI/UITextures/Fonts/Consolas/CONSOLAB.TTF.meta similarity index 95% rename from Assets/UITextures/Fonts/Consolas/CONSOLAB.TTF.meta rename to Assets/GUI/UITextures/Fonts/Consolas/CONSOLAB.TTF.meta index 4e6373a..874595b 100644 --- a/Assets/UITextures/Fonts/Consolas/CONSOLAB.TTF.meta +++ b/Assets/GUI/UITextures/Fonts/Consolas/CONSOLAB.TTF.meta @@ -1,19 +1,19 @@ -fileFormatVersion: 2 -guid: 9f1a9c7411c571e479dfe4eb81cd1368 -timeCreated: 1448823422 -licenseType: Free -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - fallbackFontReferences: [] - customCharacters: - fontRenderingMode: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 9f1a9c7411c571e479dfe4eb81cd1368 +timeCreated: 1448823422 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 2 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + use2xBehaviour: 0 + fontNames: [] + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/Fonts/Consolas/CONSOLAI.TTF b/Assets/GUI/UITextures/Fonts/Consolas/CONSOLAI.TTF similarity index 100% rename from Assets/UITextures/Fonts/Consolas/CONSOLAI.TTF rename to Assets/GUI/UITextures/Fonts/Consolas/CONSOLAI.TTF diff --git a/Assets/UITextures/Fonts/Consolas/CONSOLAI.TTF.meta b/Assets/GUI/UITextures/Fonts/Consolas/CONSOLAI.TTF.meta similarity index 95% rename from Assets/UITextures/Fonts/Consolas/CONSOLAI.TTF.meta rename to Assets/GUI/UITextures/Fonts/Consolas/CONSOLAI.TTF.meta index a7f3fc0..d656b9f 100644 --- a/Assets/UITextures/Fonts/Consolas/CONSOLAI.TTF.meta +++ b/Assets/GUI/UITextures/Fonts/Consolas/CONSOLAI.TTF.meta @@ -1,19 +1,19 @@ -fileFormatVersion: 2 -guid: 271a35a004b7f96459bd2dc62e3076ae -timeCreated: 1448823422 -licenseType: Free -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - fallbackFontReferences: [] - customCharacters: - fontRenderingMode: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 271a35a004b7f96459bd2dc62e3076ae +timeCreated: 1448823422 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 2 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + use2xBehaviour: 0 + fontNames: [] + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/Fonts/Consolas/CONSOLAZ.TTF b/Assets/GUI/UITextures/Fonts/Consolas/CONSOLAZ.TTF similarity index 100% rename from Assets/UITextures/Fonts/Consolas/CONSOLAZ.TTF rename to Assets/GUI/UITextures/Fonts/Consolas/CONSOLAZ.TTF diff --git a/Assets/UITextures/Fonts/Consolas/CONSOLAZ.TTF.meta b/Assets/GUI/UITextures/Fonts/Consolas/CONSOLAZ.TTF.meta similarity index 95% rename from Assets/UITextures/Fonts/Consolas/CONSOLAZ.TTF.meta rename to Assets/GUI/UITextures/Fonts/Consolas/CONSOLAZ.TTF.meta index c428bae..5a636ca 100644 --- a/Assets/UITextures/Fonts/Consolas/CONSOLAZ.TTF.meta +++ b/Assets/GUI/UITextures/Fonts/Consolas/CONSOLAZ.TTF.meta @@ -1,19 +1,19 @@ -fileFormatVersion: 2 -guid: 0bb9dbbefb31df54094b8044d3a152c8 -timeCreated: 1448823422 -licenseType: Free -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - fallbackFontReferences: [] - customCharacters: - fontRenderingMode: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 0bb9dbbefb31df54094b8044d3a152c8 +timeCreated: 1448823422 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 2 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + use2xBehaviour: 0 + fontNames: [] + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/Fonts/Google.meta b/Assets/GUI/UITextures/Fonts/Google.meta similarity index 95% rename from Assets/UITextures/Fonts/Google.meta rename to Assets/GUI/UITextures/Fonts/Google.meta index e95791c..bdbaad6 100644 --- a/Assets/UITextures/Fonts/Google.meta +++ b/Assets/GUI/UITextures/Fonts/Google.meta @@ -1,9 +1,9 @@ -fileFormatVersion: 2 -guid: 22138de56c4fe5d4faa7b031fe00f0da -folderAsset: yes -timeCreated: 1449001600 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 22138de56c4fe5d4faa7b031fe00f0da +folderAsset: yes +timeCreated: 1449001600 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/Fonts/Google/Aldrich-Regular.ttf b/Assets/GUI/UITextures/Fonts/Google/Aldrich-Regular.ttf similarity index 100% rename from Assets/UITextures/Fonts/Google/Aldrich-Regular.ttf rename to Assets/GUI/UITextures/Fonts/Google/Aldrich-Regular.ttf diff --git a/Assets/UITextures/Fonts/Google/Aldrich-Regular.ttf.meta b/Assets/GUI/UITextures/Fonts/Google/Aldrich-Regular.ttf.meta similarity index 95% rename from Assets/UITextures/Fonts/Google/Aldrich-Regular.ttf.meta rename to Assets/GUI/UITextures/Fonts/Google/Aldrich-Regular.ttf.meta index 8ff7661..3dfc8c9 100644 --- a/Assets/UITextures/Fonts/Google/Aldrich-Regular.ttf.meta +++ b/Assets/GUI/UITextures/Fonts/Google/Aldrich-Regular.ttf.meta @@ -1,19 +1,19 @@ -fileFormatVersion: 2 -guid: 393b1e2283a68b94f84e2bbaabc64318 -timeCreated: 1449001663 -licenseType: Free -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - fallbackFontReferences: [] - customCharacters: - fontRenderingMode: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 393b1e2283a68b94f84e2bbaabc64318 +timeCreated: 1449001663 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 2 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + use2xBehaviour: 0 + fontNames: [] + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/Fonts/Google/Electrolize-Regular.ttf b/Assets/GUI/UITextures/Fonts/Google/Electrolize-Regular.ttf similarity index 100% rename from Assets/UITextures/Fonts/Google/Electrolize-Regular.ttf rename to Assets/GUI/UITextures/Fonts/Google/Electrolize-Regular.ttf diff --git a/Assets/UITextures/Fonts/Google/Electrolize-Regular.ttf.meta b/Assets/GUI/UITextures/Fonts/Google/Electrolize-Regular.ttf.meta similarity index 95% rename from Assets/UITextures/Fonts/Google/Electrolize-Regular.ttf.meta rename to Assets/GUI/UITextures/Fonts/Google/Electrolize-Regular.ttf.meta index 2d2ebed..e79f43f 100644 --- a/Assets/UITextures/Fonts/Google/Electrolize-Regular.ttf.meta +++ b/Assets/GUI/UITextures/Fonts/Google/Electrolize-Regular.ttf.meta @@ -1,19 +1,19 @@ -fileFormatVersion: 2 -guid: e5759157bd675904a9ab0103173475c5 -timeCreated: 1449001642 -licenseType: Free -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - fallbackFontReferences: [] - customCharacters: - fontRenderingMode: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: e5759157bd675904a9ab0103173475c5 +timeCreated: 1449001642 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 2 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + use2xBehaviour: 0 + fontNames: [] + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/Fonts/Google/Orbitron-Regular.ttf b/Assets/GUI/UITextures/Fonts/Google/Orbitron-Regular.ttf similarity index 100% rename from Assets/UITextures/Fonts/Google/Orbitron-Regular.ttf rename to Assets/GUI/UITextures/Fonts/Google/Orbitron-Regular.ttf diff --git a/Assets/UITextures/Fonts/Google/Orbitron-Regular.ttf.meta b/Assets/GUI/UITextures/Fonts/Google/Orbitron-Regular.ttf.meta similarity index 95% rename from Assets/UITextures/Fonts/Google/Orbitron-Regular.ttf.meta rename to Assets/GUI/UITextures/Fonts/Google/Orbitron-Regular.ttf.meta index 87bbabd..32bb45b 100644 --- a/Assets/UITextures/Fonts/Google/Orbitron-Regular.ttf.meta +++ b/Assets/GUI/UITextures/Fonts/Google/Orbitron-Regular.ttf.meta @@ -1,19 +1,19 @@ -fileFormatVersion: 2 -guid: 30a2dd171e2e59440a734a603e640bb6 -timeCreated: 1449001540 -licenseType: Free -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - fallbackFontReferences: [] - customCharacters: - fontRenderingMode: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 30a2dd171e2e59440a734a603e640bb6 +timeCreated: 1449001540 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 2 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + use2xBehaviour: 0 + fontNames: [] + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/Fonts/Google/Quantico-Regular.ttf b/Assets/GUI/UITextures/Fonts/Google/Quantico-Regular.ttf similarity index 100% rename from Assets/UITextures/Fonts/Google/Quantico-Regular.ttf rename to Assets/GUI/UITextures/Fonts/Google/Quantico-Regular.ttf diff --git a/Assets/UITextures/Fonts/Google/Quantico-Regular.ttf.meta b/Assets/GUI/UITextures/Fonts/Google/Quantico-Regular.ttf.meta similarity index 95% rename from Assets/UITextures/Fonts/Google/Quantico-Regular.ttf.meta rename to Assets/GUI/UITextures/Fonts/Google/Quantico-Regular.ttf.meta index 13b8321..391b048 100644 --- a/Assets/UITextures/Fonts/Google/Quantico-Regular.ttf.meta +++ b/Assets/GUI/UITextures/Fonts/Google/Quantico-Regular.ttf.meta @@ -1,19 +1,19 @@ -fileFormatVersion: 2 -guid: f114ec948a28aac46a8a0baf8ff44612 -timeCreated: 1449001501 -licenseType: Free -TrueTypeFontImporter: - serializedVersion: 2 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 1 - characterPadding: 0 - includeFontData: 1 - use2xBehaviour: 0 - fontNames: [] - fallbackFontReferences: [] - customCharacters: - fontRenderingMode: 0 - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: f114ec948a28aac46a8a0baf8ff44612 +timeCreated: 1449001501 +licenseType: Free +TrueTypeFontImporter: + serializedVersion: 2 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 1 + characterPadding: 0 + includeFontData: 1 + use2xBehaviour: 0 + fontNames: [] + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/Fonts/Michroma.ttf b/Assets/GUI/UITextures/Fonts/Michroma.ttf similarity index 100% rename from Assets/UITextures/Fonts/Michroma.ttf rename to Assets/GUI/UITextures/Fonts/Michroma.ttf diff --git a/Assets/UITextures/Fonts/Michroma.ttf.meta b/Assets/GUI/UITextures/Fonts/Michroma.ttf.meta similarity index 100% rename from Assets/UITextures/Fonts/Michroma.ttf.meta rename to Assets/GUI/UITextures/Fonts/Michroma.ttf.meta diff --git a/Assets/UITextures/Fonts/Other.meta b/Assets/GUI/UITextures/Fonts/Other.meta similarity index 100% rename from Assets/UITextures/Fonts/Other.meta rename to Assets/GUI/UITextures/Fonts/Other.meta diff --git a/Assets/UITextures/Fonts/Other/Minecraft.ttf b/Assets/GUI/UITextures/Fonts/Other/Minecraft.ttf similarity index 100% rename from Assets/UITextures/Fonts/Other/Minecraft.ttf rename to Assets/GUI/UITextures/Fonts/Other/Minecraft.ttf diff --git a/Assets/UITextures/Fonts/Other/Minecraft.ttf.meta b/Assets/GUI/UITextures/Fonts/Other/Minecraft.ttf.meta similarity index 100% rename from Assets/UITextures/Fonts/Other/Minecraft.ttf.meta rename to Assets/GUI/UITextures/Fonts/Other/Minecraft.ttf.meta diff --git a/Assets/UITextures/Fonts/Other/Squares Bold Free.otf b/Assets/GUI/UITextures/Fonts/Other/Squares Bold Free.otf similarity index 100% rename from Assets/UITextures/Fonts/Other/Squares Bold Free.otf rename to Assets/GUI/UITextures/Fonts/Other/Squares Bold Free.otf diff --git a/Assets/UITextures/Fonts/Other/Squares Bold Free.otf.meta b/Assets/GUI/UITextures/Fonts/Other/Squares Bold Free.otf.meta similarity index 100% rename from Assets/UITextures/Fonts/Other/Squares Bold Free.otf.meta rename to Assets/GUI/UITextures/Fonts/Other/Squares Bold Free.otf.meta diff --git a/Assets/UITextures/Fonts/Other/monofonto.ttf b/Assets/GUI/UITextures/Fonts/Other/monofonto.ttf similarity index 100% rename from Assets/UITextures/Fonts/Other/monofonto.ttf rename to Assets/GUI/UITextures/Fonts/Other/monofonto.ttf diff --git a/Assets/UITextures/Fonts/Other/monofonto.ttf.meta b/Assets/GUI/UITextures/Fonts/Other/monofonto.ttf.meta similarity index 100% rename from Assets/UITextures/Fonts/Other/monofonto.ttf.meta rename to Assets/GUI/UITextures/Fonts/Other/monofonto.ttf.meta diff --git a/Assets/UITextures/GUI.Header.png b/Assets/GUI/UITextures/GUI.Header.png similarity index 100% rename from Assets/UITextures/GUI.Header.png rename to Assets/GUI/UITextures/GUI.Header.png diff --git a/Assets/UITextures/GUI.Header.png.meta b/Assets/GUI/UITextures/GUI.Header.png.meta similarity index 95% rename from Assets/UITextures/GUI.Header.png.meta rename to Assets/GUI/UITextures/GUI.Header.png.meta index 54f8ad6..c59e2a8 100644 --- a/Assets/UITextures/GUI.Header.png.meta +++ b/Assets/GUI/UITextures/GUI.Header.png.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: 0fac5183a68542f4585ed060192a365f -timeCreated: 1449315158 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: 0 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 3, y: 3, z: 3, w: 3} - spritePixelsToUnits: 2 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 0fac5183a68542f4585ed060192a365f +timeCreated: 1449315158 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 3, y: 3, z: 3, w: 3} + spritePixelsToUnits: 2 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/GUI.Inverted.png b/Assets/GUI/UITextures/GUI.Inverted.png similarity index 100% rename from Assets/UITextures/GUI.Inverted.png rename to Assets/GUI/UITextures/GUI.Inverted.png diff --git a/Assets/UITextures/GUI.Inverted.png.meta b/Assets/GUI/UITextures/GUI.Inverted.png.meta similarity index 95% rename from Assets/UITextures/GUI.Inverted.png.meta rename to Assets/GUI/UITextures/GUI.Inverted.png.meta index 7b3dba9..3b00b4c 100644 --- a/Assets/UITextures/GUI.Inverted.png.meta +++ b/Assets/GUI/UITextures/GUI.Inverted.png.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: 7068eaecd68c2f341b7386d155509882 -timeCreated: 1449314286 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: 0 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 3, y: 3, z: 3, w: 3} - spritePixelsToUnits: 2 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 7068eaecd68c2f341b7386d155509882 +timeCreated: 1449314286 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 3, y: 3, z: 3, w: 3} + spritePixelsToUnits: 2 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/GUI.Inverted2.png b/Assets/GUI/UITextures/GUI.Inverted2.png similarity index 100% rename from Assets/UITextures/GUI.Inverted2.png rename to Assets/GUI/UITextures/GUI.Inverted2.png diff --git a/Assets/UITextures/GUI.Inverted2.png.meta b/Assets/GUI/UITextures/GUI.Inverted2.png.meta similarity index 95% rename from Assets/UITextures/GUI.Inverted2.png.meta rename to Assets/GUI/UITextures/GUI.Inverted2.png.meta index 9f1861d..bb7ce03 100644 --- a/Assets/UITextures/GUI.Inverted2.png.meta +++ b/Assets/GUI/UITextures/GUI.Inverted2.png.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: 99cfc7bc65b4343478d39c84e04a0005 -timeCreated: 1449316125 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: 0 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 3, y: 3, z: 3, w: 3} - spritePixelsToUnits: 2 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 99cfc7bc65b4343478d39c84e04a0005 +timeCreated: 1449316125 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 3, y: 3, z: 3, w: 3} + spritePixelsToUnits: 2 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/GUI.base.png b/Assets/GUI/UITextures/GUI.base.png similarity index 100% rename from Assets/UITextures/GUI.base.png rename to Assets/GUI/UITextures/GUI.base.png diff --git a/Assets/UITextures/GUI.base.png.meta b/Assets/GUI/UITextures/GUI.base.png.meta similarity index 95% rename from Assets/UITextures/GUI.base.png.meta rename to Assets/GUI/UITextures/GUI.base.png.meta index e99c6a3..e2fbeda 100644 --- a/Assets/UITextures/GUI.base.png.meta +++ b/Assets/GUI/UITextures/GUI.base.png.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: 7fc277f0bb101e04ca1c0188b8f16d59 -timeCreated: 1449080092 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: 0 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 3, y: 3, z: 3, w: 3} - spritePixelsToUnits: 2 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 7fc277f0bb101e04ca1c0188b8f16d59 +timeCreated: 1449080092 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 3, y: 3, z: 3, w: 3} + spritePixelsToUnits: 2 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/Noise.mat b/Assets/GUI/UITextures/Noise.mat similarity index 100% rename from Assets/UITextures/Noise.mat rename to Assets/GUI/UITextures/Noise.mat diff --git a/Assets/UITextures/Noise.mat.meta b/Assets/GUI/UITextures/Noise.mat.meta similarity index 95% rename from Assets/UITextures/Noise.mat.meta rename to Assets/GUI/UITextures/Noise.mat.meta index 9ce9e12..d9ffeaa 100644 --- a/Assets/UITextures/Noise.mat.meta +++ b/Assets/GUI/UITextures/Noise.mat.meta @@ -1,8 +1,8 @@ -fileFormatVersion: 2 -guid: d6713d1ba52181a4486dc7cb3c150e82 -timeCreated: 1448806667 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: d6713d1ba52181a4486dc7cb3c150e82 +timeCreated: 1448806667 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/NoiseEffectGrain.png b/Assets/GUI/UITextures/NoiseEffectGrain.png similarity index 100% rename from Assets/UITextures/NoiseEffectGrain.png rename to Assets/GUI/UITextures/NoiseEffectGrain.png diff --git a/Assets/UITextures/NoiseEffectGrain.png.meta b/Assets/GUI/UITextures/NoiseEffectGrain.png.meta similarity index 95% rename from Assets/UITextures/NoiseEffectGrain.png.meta rename to Assets/GUI/UITextures/NoiseEffectGrain.png.meta index a9a1333..6f4b90a 100644 --- a/Assets/UITextures/NoiseEffectGrain.png.meta +++ b/Assets/GUI/UITextures/NoiseEffectGrain.png.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: ffa9c02760c2b4e8eb9814ec06c4b05b -timeCreated: 1448806696 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 2 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 1024 - textureSettings: - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapMode: 0 - nPOTScale: 1 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: 0 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: ffa9c02760c2b4e8eb9814ec06c4b05b +timeCreated: 1448806696 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 2 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapMode: 0 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: 0 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/Ring.full.png b/Assets/GUI/UITextures/Ring.full.png similarity index 100% rename from Assets/UITextures/Ring.full.png rename to Assets/GUI/UITextures/Ring.full.png diff --git a/Assets/UITextures/Ring.full.png.meta b/Assets/GUI/UITextures/Ring.full.png.meta similarity index 100% rename from Assets/UITextures/Ring.full.png.meta rename to Assets/GUI/UITextures/Ring.full.png.meta diff --git a/Assets/UITextures/Ring.png b/Assets/GUI/UITextures/Ring.png similarity index 100% rename from Assets/UITextures/Ring.png rename to Assets/GUI/UITextures/Ring.png diff --git a/Assets/UITextures/Ring.png.meta b/Assets/GUI/UITextures/Ring.png.meta similarity index 95% rename from Assets/UITextures/Ring.png.meta rename to Assets/GUI/UITextures/Ring.png.meta index a2d489a..947c889 100644 --- a/Assets/UITextures/Ring.png.meta +++ b/Assets/GUI/UITextures/Ring.png.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: 2da70774bb3fb1a4ca35de73be77aed9 -timeCreated: 1449241165 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: 2 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 256 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 2da70774bb3fb1a4ca35de73be77aed9 +timeCreated: 1449241165 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: 2 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 256 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/Ring2.png b/Assets/GUI/UITextures/Ring2.png similarity index 100% rename from Assets/UITextures/Ring2.png rename to Assets/GUI/UITextures/Ring2.png diff --git a/Assets/UITextures/Ring2.png.meta b/Assets/GUI/UITextures/Ring2.png.meta similarity index 95% rename from Assets/UITextures/Ring2.png.meta rename to Assets/GUI/UITextures/Ring2.png.meta index a9eae88..af6d751 100644 --- a/Assets/UITextures/Ring2.png.meta +++ b/Assets/GUI/UITextures/Ring2.png.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: bbc55cc13fc683247ad356f7da2bd5b4 -timeCreated: 1449255822 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: bbc55cc13fc683247ad356f7da2bd5b4 +timeCreated: 1449255822 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/SideMenu.png b/Assets/GUI/UITextures/SideMenu.png similarity index 100% rename from Assets/UITextures/SideMenu.png rename to Assets/GUI/UITextures/SideMenu.png diff --git a/Assets/UITextures/SideMenu.png.meta b/Assets/GUI/UITextures/SideMenu.png.meta similarity index 95% rename from Assets/UITextures/SideMenu.png.meta rename to Assets/GUI/UITextures/SideMenu.png.meta index 64d3edd..b3ebdd6 100644 --- a/Assets/UITextures/SideMenu.png.meta +++ b/Assets/GUI/UITextures/SideMenu.png.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: 52b199ad536282a44970513f637512c1 -timeCreated: 1448801260 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -3 - maxTextureSize: 2048 - textureSettings: - filterMode: 0 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 1 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 52b199ad536282a44970513f637512c1 +timeCreated: 1448801260 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 1 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/SideMenuv2.png b/Assets/GUI/UITextures/SideMenuv2.png similarity index 100% rename from Assets/UITextures/SideMenuv2.png rename to Assets/GUI/UITextures/SideMenuv2.png diff --git a/Assets/UITextures/SideMenuv2.png.meta b/Assets/GUI/UITextures/SideMenuv2.png.meta similarity index 95% rename from Assets/UITextures/SideMenuv2.png.meta rename to Assets/GUI/UITextures/SideMenuv2.png.meta index 1baae22..5008965 100644 --- a/Assets/UITextures/SideMenuv2.png.meta +++ b/Assets/GUI/UITextures/SideMenuv2.png.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: 6867f2a1f077fa548892daa44aacd7c2 -timeCreated: 1448802831 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -3 - maxTextureSize: 2048 - textureSettings: - filterMode: 0 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 0 - allowsAlphaSplitting: 0 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 1 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 6867f2a1f077fa548892daa44aacd7c2 +timeCreated: 1448802831 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 0 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 1 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/SideMenuv3.png b/Assets/GUI/UITextures/SideMenuv3.png similarity index 100% rename from Assets/UITextures/SideMenuv3.png rename to Assets/GUI/UITextures/SideMenuv3.png diff --git a/Assets/UITextures/SideMenuv3.png.meta b/Assets/GUI/UITextures/SideMenuv3.png.meta similarity index 95% rename from Assets/UITextures/SideMenuv3.png.meta rename to Assets/GUI/UITextures/SideMenuv3.png.meta index 5f4d3f3..f8f5a83 100644 --- a/Assets/UITextures/SideMenuv3.png.meta +++ b/Assets/GUI/UITextures/SideMenuv3.png.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: 81f19520dc61ae6448cc2dccd52581a9 -timeCreated: 1448904895 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: 0 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 1 - alphaIsTransparency: 1 - textureType: 8 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 81f19520dc61ae6448cc2dccd52581a9 +timeCreated: 1448904895 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: 0 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 1 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg b/Assets/GUI/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg similarity index 100% rename from Assets/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg rename to Assets/GUI/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg diff --git a/Assets/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg.meta b/Assets/GUI/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg.meta similarity index 95% rename from Assets/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg.meta rename to Assets/GUI/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg.meta index 19cfd73..81d6769 100644 --- a/Assets/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg.meta +++ b/Assets/GUI/UITextures/depositphotos_21124905-1920x1080-video---noise-on-a-green-old-TV-screen.jpg.meta @@ -1,56 +1,56 @@ -fileFormatVersion: 2 -guid: c213f44e2f12ef143a08457fad8b736c -timeCreated: 1448806884 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: -1 - aniso: 16 - mipBias: -1 - wrapMode: 1 - nPOTScale: 1 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: 0 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: c213f44e2f12ef143a08457fad8b736c +timeCreated: 1448806884 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: 0 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameController.cs b/Assets/GameController.cs index bee0eff..3339c54 100644 --- a/Assets/GameController.cs +++ b/Assets/GameController.cs @@ -8,6 +8,8 @@ using System.IO; using System.Collections.Generic; +using CivMarsEngine.Registry; + public class GameController : MonoBehaviour { diff --git a/Assets/Tile/IWorldGen.cs b/Assets/Interfaces/IWorldGen.cs similarity index 100% rename from Assets/Tile/IWorldGen.cs rename to Assets/Interfaces/IWorldGen.cs diff --git a/Assets/Tile/IWorldGen.cs.meta b/Assets/Interfaces/IWorldGen.cs.meta similarity index 95% rename from Assets/Tile/IWorldGen.cs.meta rename to Assets/Interfaces/IWorldGen.cs.meta index 7864fb8..7354591 100644 --- a/Assets/Tile/IWorldGen.cs.meta +++ b/Assets/Interfaces/IWorldGen.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 9e261beaea0c372429f7583c092894a3 -timeCreated: 1446131198 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 9e261beaea0c372429f7583c092894a3 +timeCreated: 1446131198 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Map.cs b/Assets/Map.cs index ab1cc0a..f27528e 100644 --- a/Assets/Map.cs +++ b/Assets/Map.cs @@ -50,10 +50,10 @@ public void AddBasicBuildings() int xMpos; xMpos = mapHeight / 2; - TileTransform mainBuilding = Instantiate(GameRegystry.buildings[MainBuilding.ID].gameObject).GetComponent(); + TileTransform mainBuilding = Instantiate(GameRegystry.buildings[CivMars.MainBuilding.ID].gameObject).GetComponent(); Buildings.SetTile(xMpos, xMpos, mainBuilding); - TileTransform chest = Instantiate(GameRegystry.buildings[Chest.ID].gameObject).GetComponent(); + TileTransform chest = Instantiate(GameRegystry.buildings[CivMars.Chest.ID].gameObject).GetComponent(); Buildings.SetTile(xMpos+5, xMpos+5, chest); } diff --git a/Assets/NeedToBeImplemented/Old/Generato.cs b/Assets/NeedToBeImplemented/Old/Generato.cs index d6bd9e9..d271fb7 100644 --- a/Assets/NeedToBeImplemented/Old/Generato.cs +++ b/Assets/NeedToBeImplemented/Old/Generato.cs @@ -3,24 +3,26 @@ using System.Linq; using System.Text; - - public class Generator:Building - { +namespace CivMars +{ + public class Generator : Building + { - public MainBuilding main; - public int internalsorage; + public MainBuilding main; + public int internalsorage; - public void Gen() - {} - + public void Gen() + { } - public void Transfer() - { - if (this.internalsorage > 1) - { - //main.Inventory =+ this.internalsorage; - } - } - } + public void Transfer() + { + if (this.internalsorage > 1) + { + //main.Inventory =+ this.internalsorage; + } + } + } + +} \ No newline at end of file diff --git a/Assets/NeedToBeImplemented/Old/Miner/SpecMine.cs b/Assets/NeedToBeImplemented/Old/Miner/SpecMine.cs index f03e57a..1324166 100644 --- a/Assets/NeedToBeImplemented/Old/Miner/SpecMine.cs +++ b/Assets/NeedToBeImplemented/Old/Miner/SpecMine.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - - - +/* public class SpecMine : Miner { //public OreType type; @@ -13,3 +7,4 @@ public class SpecMine : Miner } + */ \ No newline at end of file diff --git a/Assets/NeedToBeImplemented/Old/Oxigeneration.cs b/Assets/NeedToBeImplemented/Old/Oxigeneration.cs index a2f7121..7edc702 100644 --- a/Assets/NeedToBeImplemented/Old/Oxigeneration.cs +++ b/Assets/NeedToBeImplemented/Old/Oxigeneration.cs @@ -3,12 +3,14 @@ using System.Linq; using System.Text; - - public class Oxigenerator:Generator - { - public int speed; - public int capacity; +namespace CivMars +{ + public class Oxigenerator : Generator + { + public int speed; + public int capacity; - } + } +} \ No newline at end of file diff --git a/Assets/NeedToBeImplemented/Old/UniverzalMiner.cs b/Assets/NeedToBeImplemented/Old/UniverzalMiner.cs index 7456a6b..216bfa6 100644 --- a/Assets/NeedToBeImplemented/Old/UniverzalMiner.cs +++ b/Assets/NeedToBeImplemented/Old/UniverzalMiner.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Text; - + /* public class UniverzalMiner:Miner { @@ -13,3 +13,4 @@ public class UniverzalMiner:Miner } + */ \ No newline at end of file diff --git a/Assets/OxigenRecoverer.cs b/Assets/NeedToBeImplemented/OxigenRecoverer.cs similarity index 100% rename from Assets/OxigenRecoverer.cs rename to Assets/NeedToBeImplemented/OxigenRecoverer.cs diff --git a/Assets/OxigenRecoverer.cs.meta b/Assets/NeedToBeImplemented/OxigenRecoverer.cs.meta similarity index 100% rename from Assets/OxigenRecoverer.cs.meta rename to Assets/NeedToBeImplemented/OxigenRecoverer.cs.meta diff --git a/Assets/OLD/Generate/IronOreTile.prefab b/Assets/OLD/Generate/IronOreTile.prefab deleted file mode 100644 index 4e45171e87a634b65f434b76c0cfb18e35d2379c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7712 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 diff --git a/Assets/OLD/Generate/StoneOreTile.prefab.meta b/Assets/OLD/Generate/StoneOreTile.prefab.meta deleted file mode 100644 index 7156633..0000000 --- a/Assets/OLD/Generate/StoneOreTile.prefab.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4d601b73a3e3ab643affb27e2c2f6966 -timeCreated: 1446325067 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OLD/Generate/UraniumOreTile.prefab b/Assets/OLD/Generate/UraniumOreTile.prefab deleted file mode 100644 index b44d4a3f0fc6f3482ec646593cf5a0c0ca19e9ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7720 zcmeHMZEPGz8J_i5KA7D^J5OKU<}h)Wzp3u%*c9LI5M*T!EIN-^uZ_1z|Sw`On8 zwJWNgN*fh^R8bK~2vIqJ5GheXK?DRBZRc}_Rif+rO zqD0(M-)vUZlX%wxi0$;vU!|6SzZuUa+-z&1bQV3|jyl^n$M8<@Y(af>_)fRC)R87t z{aMJ<8fzct;d~5#oM%-Hw^TQH=0YBh(bGVlH8DKSv$lp?Y7uhY10K%sO}MQdJvQ}l z2XM}db2fU&W89a*ajyc-t6mT51k-qYT&!M==OFmM4Ib*BD{57xy|oki_=h54)Q2SyN+?7L-y<*73hK@FzIB_Tg`f9H$d+xU(HXU zq88+ri?L?Y!aw%>`I$4B-W|VRa&LH|yL;l<5A8bj+du63YJX($1RGx70BN z9y%|bl)+v*uf|71JXMDq=iOR|yJ7q5VmOn6AL7@?@c6tsh&Pzmy8$rZ_cdFE~D)<92Q=@ZC}l<$;V>!sAYRZpbO;O^bnYPbP5Z z91-#_*XDk4;qm=TA3Xfi^>^Oi`X@%7`$K^OOeW!Mg8%<*k6(as&}ogcsnsbl4o3c4 zfOD~FIC1>LAuikFSbG{V+tb1;ZPB!dE-P2DZ0@nuJod}?se9?b#7Dxtx2cZ-b5QBcyM?Up(3=lnA1|Ih>UqJipGEl$ z1bFzw`04h{&F4S%@`ZnX>Cuk%E?@y9qj0hIAi!r~5D#xWG^D^U}K$+v}tVujMuF0ClVU2#YBWs>x;QtXg$e+TEL@fMV z-_uezjvV37hxm1TrZrBU7f~k;>+W#e8-eqx*V}sq(|Fvj-dDpd1skts z!9$zffm@|h!gCCG0XXHMzAY8ur4YZV4xbJ2_t)Wmi0=&Xv02{@oKdHQz=qIv`Ej+^ zE(c?IJL}zBMwA?NG7k1Q5in#2j_=w9z8tGemz`jslyx(X)ESI3`|Kc-XHZ3piLx{3 z=JLUa?@ddSQD>%r&m#!g0!@_d9OJT7dT_$QcN6e3S`U<@XVIRO_fFaI=bVX2jx&Jm znve5N&_94$PbKgsCWq|#{pJu9!+J_N1b&&lp&PM%yXasRWq#LLi2@u0J+^+b)02-r zA)wO)-ivb4u-7X&5s^Iivj1oX|s*Ka%Se<&PFw7p@oOiB4Vm z6l>On`NQZZZa>T)8rS=hVO%YGb56E)@?==kqiccL1R=B^k!n~v z0~jdlccGN@Shemr1B1T4jE7c{{x{609;5RrwTL^5TZaYx?(-v00zpVXhllW_Nzui4 zUF!diJdfhtU98JHGAs4eQ~RaxB7VPt`Wd-3=VI>ft!#4?B0Yj9!{Pa6yrYP^yE?a^ zxe1vv(Omp_nkVmjJ~+Oe$8)=4qezg{NS%PeCFw&@7StQd4(VP zytxYQv~T+hH&se*u#n1P(JO@@X!tbq z(E8GEj4nA}UPce~Ix}^nU$&)~6Zn|tR*J*E!~YQIP&`oz>|D;tvQ7OJs>`S?@!H5o zFuwj#qw3zM%o6M7PQEcUGoGpQ*=QWoj!(0G@jk|Oh&^}uG`u~v4@^B6|0mpXF>Lj^ zb3?XY?wl@onZuotX4uE@vuv){lOt|NrhTL5mGZJZEu_ip`x=q1z-oGjzE5J_D=*qq ts<|%|$E=BYuAD#T7r&TxYx@tBlYCK228Zxlu()40_ly7LGPXqF{sk!mb^HJT diff --git a/Assets/OLD/Generate/UraniumOreTile.prefab.meta b/Assets/OLD/Generate/UraniumOreTile.prefab.meta deleted file mode 100644 index f305ec9..0000000 --- a/Assets/OLD/Generate/UraniumOreTile.prefab.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9830936db7341f64b84cad43527b9475 -timeCreated: 1446326106 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/OLD/MapOld.cs b/Assets/OLD/MapOld.cs deleted file mode 100644 index 1ba6ffd..0000000 --- a/Assets/OLD/MapOld.cs +++ /dev/null @@ -1,221 +0,0 @@ -using System; -using System.IO; -using UnityEngine; - -//public class Map -//{ -// public int mapHeight; -// public GeneratedTile[,] mapGenerated; -// public Building[,] mapBuilt; - -// public int seed; - -// public Map(GeneratedTile[,] inmap, int inputseed) -// { -// this.mapHeight = (int)Math.Sqrt(inmap.Length); - -// this.mapGenerated = new GeneratedTile[mapHeight, mapHeight]; - -// for (int i = 0; i < mapHeight; i++) -// { -// for (int j = 0; j < mapHeight; j++) -// { -// mapGenerated[i, j] = inmap[i, j]; -// } -// } -// mapBuilt = new Building[mapHeight, mapHeight]; - -// seed = inputseed; -// } - -// public Map(int inputseed, float h, float reduce, int maxOre, GameObject mapPiece) -// { -// Vector2 posMultiplyer = new Vector2((tileSize / 2), -(tileSize / 2)); - -// this.mapHeight = (int)Math.Sqrt(h); -// this.mapGenerated = new GeneratedTile[mapHeight, mapHeight]; -// seed = inputseed; - -// #region File -// FileStream file = new FileStream("./file.txt", FileMode.Create); -// StreamWriter wf = new StreamWriter(file); -// #endregion - -// int gen = 50; -// float[,] h2 = new float[,] { { 3f, 15f }, { 2f, 20f }, { 1f, 22f }, { 0.2f, 30f }, { 0.1f, 40f }, { 0.001f, 45 } }; - -// System.Random rand = new System.Random(seed); - -// GeneratedTile[,] map = new GeneratedTile[50, 50]; -// GeneratedTile initial; - - - -// for (int i = 0; i < gen; i++) -// { -// for (int j = 0; j < gen; j++) -// { -// initial = new OreTile(rand, i, j, maxOre); - -// h = h2[(int)initial.type, 0]; - -// reduce = h2[(int)initial.type, 1]; - -// if (rand.Next(0, 100) <= h) -// { -// map[i, j] = initial; - -// map = ((OreTile)map[i, j]).Spread(map, h, rand, reduce, rand.Next(1, maxOre)); -// } -// } -// wf.WriteLine(); -// } - -// for (int xPos = 0; xPos < gen; xPos++) -// { -// for (int yPos = 0; yPos < gen; yPos++) -// { -// if (map[xPos, yPos] == null) -// { -// map[xPos, yPos] = new GeneratedTile(xPos, yPos); -// } -// if (map[xPos, yPos] != null) -// { -// wf.Write((int)map[xPos, yPos].type + ","); -// } - -// Debug.Log(xPos + "," + yPos); - -// GameObject go = GameObject.Instantiate(mapPiece); -// go.name = "Tile_" + xPos + "_" + yPos; -// SpriteRenderer curr = go.GetComponent(); - -// Debug.Log(xPos + "," + yPos); -// curr.sprite = GeneratedSprites[((int)map.mapGenerated[xPos, yPos].type)]; - -// curr.transform.parent = showLay.transform; - -// Vector2 pos = new Vector3(yPos, -xPos) * tileSize; -// pos = pos + posMultiplyer; - -// curr.transform.localPosition = (pos); - -// Debug.Log("Tile Done"); - -// } -// } - -// wf.Close(); - - -// } - - - -// public Map() -// { } - -// public void GenerateBuildings() -// { -// int xMpos; -// xMpos = ((int)Math.Floor((double)mapHeight / 2)); - -// mapBuilt[xMpos, xMpos] = new MainBuilding(xMpos, xMpos); -// mapBuilt[xMpos + 5, xMpos - 5] = new Chest(xMpos + 5, xMpos - 5); - -// } - - -// public static void MapDraw(Map map, GameObject mapPiece, Sprite[] GeneratedSprites, GameObject[] BuildingPrefabs, float tileSize) -// { - -// Vector2 posMultiplyer = new Vector2((tileSize / 2), -(tileSize / 2)); -// GameObject allTile = new GameObject("AllTitle"); - -// Debug.Log("MapShowing started"); - -// GameObject showLay = new GameObject(""); -// showLay.transform.position = new Vector3(0, 0, 0); -// showLay.transform.parent = allTile.transform; - - -// if (map.mapGenerated != null) -// Debug.Log("OK"); - - - -// Debug.Log(map.seed); -// Debug.Log(map.mapHeight); - -// #region load generated -// for (int xPos = 0; xPos < map.mapHeight; xPos++) -// { - -// for (int yPos = 0; yPos < map.mapHeight; yPos++) -// { - -// Debug.Log(xPos + "," + yPos); - -// GameObject go = GameObject.Instantiate(mapPiece); -// go.name = "Tile_" + xPos + "_" + yPos; -// SpriteRenderer curr = go.GetComponent(); - -// Debug.Log(xPos + "," + yPos); -// curr.sprite = GeneratedSprites[((int)map.mapGenerated[xPos, yPos].type)]; - -// curr.transform.parent = showLay.transform; - -// Vector2 pos = new Vector3(yPos, -xPos) * tileSize; -// pos = pos + posMultiplyer; - -// curr.transform.localPosition = (pos); - -// Debug.Log("Tile Done"); -// } -// } -// #endregion - - -// #region Building load OUT DATED -// /* -// for (int xPos = 0; xPos < map.mapHeight; xPos++) -// { - -// for (int yPos = 0; yPos < map.mapHeight; yPos++) -// { -// if (map.mapBuilt[xPos, yPos] != null) -// { -// Debug.Log(xPos + "," + yPos); - -// foreach (GameObject i in BuildingPrefabs) -// { -// Debug.Log(map.mapBuilt[xPos, yPos].GetType().ToString()); -// if (i.name == map.mapBuilt[xPos, yPos].GetType().ToString()) -// { -// GameObject go = GameObject.Instantiate(i); - -// Vector3 pos = new Vector3(yPos + posMultiplyer.x, -xPos + posMultiplyer.y, -5) * tileSize; - -// go.transform.localPosition = (pos); - -// break; -// } -// } - - - - - -// Debug.Log("Tile Done"); -// } -// } -// } -// */ -// #endregion - - - -// } -//} - - diff --git a/Assets/TerrainGen.cs b/Assets/TerrainGen.cs deleted file mode 100644 index 524f110..0000000 --- a/Assets/TerrainGen.cs +++ /dev/null @@ -1,64 +0,0 @@ -using UnityEngine; -using System.Collections; -using System.IO; -/* -public class TerrainGen{ - - - - public static GeneratedTile[,] Generate(float h, float reduce , int seed,int maxOre) - { - - FileStream file = new FileStream("./file.txt", FileMode.Create); - StreamWriter wf = new StreamWriter(file); - - - int gen = 50; - float[,] h2 = new float[,] { {3f, 15f}, {2f,20f}, {1f,22f}, {0.2f,30f}, {0.1f,40f}, {0.001f,45}}; - System.Random rand = new System.Random(seed); - - GeneratedTile[,] map = new GeneratedTile[50, 50]; - GeneratedTile initial; - - bool t = false; - - - for (int i = 0; i < gen; i++) - { - for (int j = 0; j < gen; j++) - { - map[i, j] = new GeneratedTile(i, j); - } - } - - for (int i = 0; i < gen; i++) - { - for (int j = 0; j < gen; j++) - { - initial = new OreTile(rand, i, j, maxOre); - h = h2[(int)initial.type,0]; - reduce = h2[(int)initial.type, 1]; - if (rand.Next(0, 100) <= h && !t) - { - map[i, j] = initial; - - map = ((OreTile)map[i, j]).Spread(map, h, rand, reduce); - - t = false; - } - if (map[i, j] != null) - { - wf.Write((int)map[i, j].type + ","); - } - - } - wf.WriteLine(); - } - wf.Close(); - - return map; - - } - } - - */ diff --git a/Assets/TileMap/SavedMap.cs b/Assets/TileMap/SavedMap.cs deleted file mode 100644 index e53ee8c..0000000 --- a/Assets/TileMap/SavedMap.cs +++ /dev/null @@ -1,104 +0,0 @@ -/* -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.Serialization; -using System.Runtime.Serialization.Formatters.Binary; -using System.Text; -using UnityEngine; -using UnityEngine.Serialization; - -class SavedMap -{ - Map RealMap; - SavedMapData mapdata; - - public SavedMap(Map m) - { - RealMap = m; - //mapdata = new SavedMapData(); - mapdata.height = m.mapHeight; - mapdata.GeaneratedTiles = new SavedTile[m.mapHeight, m.mapHeight]; - } - - public SavedMap(string path, Map map) - { - RealMap = map; - IFormatter formatter = new BinaryFormatter(); - Stream stream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read); - SavedMapData obj = (SavedMapData)formatter.Deserialize(stream); - mapdata = obj; - stream.Close(); - } - - public void Refresh() - { - for (int i = 0; i < RealMap.mapHeight; i++) - { - for (int j = 0; j < RealMap.mapHeight; j++) - { - TileTransform tile = RealMap.Generated.GetTileOn(i, j); - if (tile != null) - { - Tiled t = tile.GetComponent(); - - if (t is ISaveble) - { - mapdata.GeaneratedTiles[i, j] = ((ISaveble)t).Save(); - } - } - - - tile = RealMap.Buildings.GetTileOn(i, j); - if (tile != null) - { - Tiled t = tile.GetComponent(); - - if (t is ISaveble) - { - mapdata.BuildingTiles[i, j] = ((ISaveble)t).Save(); - } - } - } - } - } - - public void LoadFromSave() - { - for (int i = 0; i < mapdata.height; i++) - { - for (int j = 0; j < mapdata.height; j++) - { - SavedTile tile = mapdata.GeaneratedTiles[i, j]; - if (tile != null) - { - if (tile is SavedOre) - { - TileTransform trans = GameObject.Instantiate(((ISaveble)GameRegystry.ores[tile.ID]).GetPrefab()).GetComponent(); - RealMap.GeneratedReloaded.SetTile(i, j, trans); - } - } - - tile = mapdata.BuildingTiles[i, j]; - if (tile != null) - { - TileTransform trans = GameObject.Instantiate(((ISaveble)GameRegystry.ores[tile.ID]).GetPrefab()).GetComponent(); - RealMap.Buildings.SetTile(i, j, trans); - } - } - } - } - - public void Save(string path) - { - Refresh(); - - IFormatter formatter = new BinaryFormatter(); - Stream stream = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.None); - formatter.Serialize(stream, mapdata); - stream.Close(); - } -} - -*/ \ No newline at end of file diff --git a/saves/asd/asd.bin b/saves/asd/asd.bin deleted file mode 100644 index 407a7a1f24d0acec103ccfb8a9056808c35eea51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 60263 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 diff --git a/saves/asd/asd.ddc b/saves/asd/asd.ddc deleted file mode 100644 index 9bff184555dfd5da1065ac881885095104e23021..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 171 zcmXv{TMEK35KL_viVyto(<2nyGl=;Wgq~o_E+&wc;0B?m@u<4{;lRu+%&=oBW6W2e zuGnuxj#p-yr?g&fV}Ms~G(C^-CcH!TP@waXbAr`VAxPXvZWoxz1&Ys5EEC~20hfoA m2yKQE^hwpW2VHQrNDYiA{t^D+tX!vlU>V~<3d(+p%kBrWrYRW! diff --git a/saves/fgh/fgh.bin b/saves/fgh/fgh.bin deleted file mode 100644 index 8af2bbd00bff46efcc4b6741944ef2d2685d03bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36220 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