diff --git a/Assets/BuildingPressEvent.cs b/Assets/BuildingPressEvent.cs new file mode 100644 index 0000000..ed4cf53 --- /dev/null +++ b/Assets/BuildingPressEvent.cs @@ -0,0 +1,20 @@ +using UnityEngine; +using UnityEngine.Events; +using System.Collections; + +public class BuildingPressEvent : MonoBehaviour { + + public UnityEvent events; + + public + + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update () { + + } +} diff --git a/Assets/BuildingPressEvent.cs.meta b/Assets/BuildingPressEvent.cs.meta new file mode 100644 index 0000000..0535b6b --- /dev/null +++ b/Assets/BuildingPressEvent.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 0fb9a36b727bb4048b720fb8e1aad46a +timeCreated: 1450886541 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/CivMars/Buildings/Chest.cs b/Assets/CivMars/Buildings/Chest.cs index 83bc99b..5f99ec6 100644 --- a/Assets/CivMars/Buildings/Chest.cs +++ b/Assets/CivMars/Buildings/Chest.cs @@ -26,8 +26,6 @@ public class Chest : BuildingWGUI, IInventory, IBuildable, IRegystratabe, IHasGu public override void Awake() { base.Awake(); - Graphicks.SetActive(false); - this.Graphicks.transform.position = Vector3.zero; } public void OpenInventory() diff --git a/Assets/CivMars/Buildings/Furnace.cs b/Assets/CivMars/Buildings/Furnace.cs index fa82917..ca6b70b 100644 --- a/Assets/CivMars/Buildings/Furnace.cs +++ b/Assets/CivMars/Buildings/Furnace.cs @@ -88,8 +88,6 @@ void Update() public override void Awake() { base.Awake(); - Graphicks.SetActive(false); - this.Graphicks.transform.position = Vector3.zero; } public void OpenInventory() diff --git a/Assets/CivMars/Buildings/MainBuilding.cs b/Assets/CivMars/Buildings/MainBuilding.cs index be26f44..0765dab 100644 --- a/Assets/CivMars/Buildings/MainBuilding.cs +++ b/Assets/CivMars/Buildings/MainBuilding.cs @@ -32,8 +32,6 @@ enum States public override void Awake() { base.Awake(); - Graphicks.SetActive(false); - //this.Graphicks.transform.position = Vector3.zero; } public void OpenInventory() diff --git a/Assets/CivMars/Buildings/Miner.cs b/Assets/CivMars/Buildings/Miner.cs index d2ebd2d..a97c38f 100644 --- a/Assets/CivMars/Buildings/Miner.cs +++ b/Assets/CivMars/Buildings/Miner.cs @@ -27,8 +27,6 @@ public class Miner : BuildingWGUI, IInventory, IHasGui, IRegystratabe, IBuildabl public override void Awake() { base.Awake(); - Graphicks.SetActive(false); - this.Graphicks.transform.position = Vector3.zero; } public void OpenInventory() diff --git a/Assets/CivMars/Buildings/PlanedBuilding.cs b/Assets/CivMars/Buildings/PlanedBuilding.cs index a6b3686..2a32339 100644 --- a/Assets/CivMars/Buildings/PlanedBuilding.cs +++ b/Assets/CivMars/Buildings/PlanedBuilding.cs @@ -31,8 +31,6 @@ public class PlanedBuilding : BuildingWGUI, ISaveble, IRegystratabe public override void Awake() { base.Awake(); - Graphicks.SetActive(false); - this.Graphicks.transform.position = Vector3.zero; } void Start() diff --git a/Assets/CivMars/Buildings/Press.cs b/Assets/CivMars/Buildings/Press.cs index 3dc5f99..0d77eed 100644 --- a/Assets/CivMars/Buildings/Press.cs +++ b/Assets/CivMars/Buildings/Press.cs @@ -88,8 +88,6 @@ void Update() public override void Awake() { base.Awake(); - Graphicks.SetActive(false); - this.Graphicks.transform.position = Vector3.zero; } public void OpenInventory() diff --git a/Assets/CivMarsEngine/Building.cs b/Assets/CivMarsEngine/Building.cs index 7dd604f..330b595 100644 --- a/Assets/CivMarsEngine/Building.cs +++ b/Assets/CivMarsEngine/Building.cs @@ -13,7 +13,7 @@ public class Building : Tiled, ISaveble //public List buildingMaterials; - public GameObject Graphicks; + public GameObject graphics; public bool guion; public override void Awake() @@ -21,11 +21,7 @@ public override void Awake() base.Awake(); } - public void PositionUpdate() - { - Graphicks.SetActive(false); - this.Graphicks.transform.position = Vector3.zero; - } + diff --git a/Assets/CivMarsEngine/BuildingWGUI.cs b/Assets/CivMarsEngine/BuildingWGUI.cs index 9b93d74..58015cb 100644 --- a/Assets/CivMarsEngine/BuildingWGUI.cs +++ b/Assets/CivMarsEngine/BuildingWGUI.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Text; using CivMarsEngine; +using UnityEngine; using UnityEngine.EventSystems; namespace CivMarsEngine @@ -10,6 +11,14 @@ namespace CivMarsEngine public class BuildingWGUI : Building, IHasGui { + public GameObject SideMenu; + + public void PositionUpdate() + { + SideMenu.SetActive(false); + this.SideMenu.transform.position = Vector3.zero; + } + #region IhasGui public void TogelGui() { @@ -30,13 +39,13 @@ public void TogelGui() public virtual void Open() { guion = true; - Graphicks.SetActive(true); + SideMenu.SetActive(true); } public virtual void Close() { guion = false; - Graphicks.SetActive(false); + SideMenu.SetActive(false); } public int ClosingLevel() @@ -44,11 +53,12 @@ public int ClosingLevel() return 1; } + /* public void OnPointerClick(PointerEventData eventData) { - if (!eventData.rawPointerPress.transform.IsChildOf(Graphicks.transform)) - TogelGui(); + TogelGui(); } + */ #endregion } diff --git a/Assets/CivMarsEngine/GUI/GUIHandler.cs b/Assets/CivMarsEngine/GUI/GUIHandler.cs index 2cdf010..dd76a85 100644 --- a/Assets/CivMarsEngine/GUI/GUIHandler.cs +++ b/Assets/CivMarsEngine/GUI/GUIHandler.cs @@ -6,25 +6,38 @@ public class GUIHandler : MonoBehaviour { + GameController GameCon; + public AccesPanel AccesPanel; public InventoryDesplay defaultInventory; public GasDesplay defaultGas; public CraftingDesplay defaultCrafting; - /* + public Slider miningSlider; + public GameObject miningPlanel; + + // Use this for initialization void Start() { - - + GameCon = GameObject.FindGameObjectWithTag("GameController").GetComponent(); } // Update is called once per frame void Update() { - + if (GameCon.playerclass.miningTime > 0) + { + + miningPlanel.SetActive(true); + miningSlider.maxValue = GameCon.playerclass.fullMiningTime; + miningSlider.value = GameCon.playerclass.miningTime; + } + else + { + miningPlanel.SetActive(false); + } } - */ } diff --git a/Assets/CivMarsEngine/GUI/UITextures/GUI.Header.png.meta b/Assets/CivMarsEngine/GUI/UITextures/GUI.Header.png.meta index 54f8ad6..809ca23 100644 --- a/Assets/CivMarsEngine/GUI/UITextures/GUI.Header.png.meta +++ b/Assets/CivMarsEngine/GUI/UITextures/GUI.Header.png.meta @@ -7,7 +7,7 @@ TextureImporter: serializedVersion: 2 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 linearTexture: 0 correctGamma: 0 fadeOut: 0 @@ -17,7 +17,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -42,7 +42,7 @@ TextureImporter: spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 3, y: 3, z: 3, w: 3} spritePixelsToUnits: 2 alphaIsTransparency: 1 @@ -50,6 +50,7 @@ TextureImporter: buildTargetSettings: [] spriteSheet: sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/CivMarsEngine/GUI/UITextures/GUI.Inverted.png.meta b/Assets/CivMarsEngine/GUI/UITextures/GUI.Inverted.png.meta index 7b3dba9..f6bdaca 100644 --- a/Assets/CivMarsEngine/GUI/UITextures/GUI.Inverted.png.meta +++ b/Assets/CivMarsEngine/GUI/UITextures/GUI.Inverted.png.meta @@ -7,7 +7,7 @@ TextureImporter: serializedVersion: 2 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 linearTexture: 0 correctGamma: 0 fadeOut: 0 @@ -17,7 +17,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -42,7 +42,7 @@ TextureImporter: spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 3, y: 3, z: 3, w: 3} spritePixelsToUnits: 2 alphaIsTransparency: 1 @@ -50,6 +50,7 @@ TextureImporter: buildTargetSettings: [] spriteSheet: sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/CivMarsEngine/GUI/UITextures/GUI.Inverted2.png.meta b/Assets/CivMarsEngine/GUI/UITextures/GUI.Inverted2.png.meta index 9f1861d..31f7e28 100644 --- a/Assets/CivMarsEngine/GUI/UITextures/GUI.Inverted2.png.meta +++ b/Assets/CivMarsEngine/GUI/UITextures/GUI.Inverted2.png.meta @@ -7,7 +7,7 @@ TextureImporter: serializedVersion: 2 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 linearTexture: 0 correctGamma: 0 fadeOut: 0 @@ -17,7 +17,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -42,7 +42,7 @@ TextureImporter: spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 3, y: 3, z: 3, w: 3} spritePixelsToUnits: 2 alphaIsTransparency: 1 @@ -50,6 +50,7 @@ TextureImporter: buildTargetSettings: [] spriteSheet: sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/CivMarsEngine/GUI/UITextures/GUI.base.png.meta b/Assets/CivMarsEngine/GUI/UITextures/GUI.base.png.meta index e99c6a3..a39e2b9 100644 --- a/Assets/CivMarsEngine/GUI/UITextures/GUI.base.png.meta +++ b/Assets/CivMarsEngine/GUI/UITextures/GUI.base.png.meta @@ -7,7 +7,7 @@ TextureImporter: serializedVersion: 2 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 linearTexture: 0 correctGamma: 0 fadeOut: 0 @@ -17,7 +17,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -42,7 +42,7 @@ TextureImporter: spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 3, y: 3, z: 3, w: 3} spritePixelsToUnits: 2 alphaIsTransparency: 1 @@ -50,6 +50,7 @@ TextureImporter: buildTargetSettings: [] spriteSheet: sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/CivMarsEngine/GUI/UITextures/Ring.full.png.meta b/Assets/CivMarsEngine/GUI/UITextures/Ring.full.png.meta index a4087e2..2dfc264 100644 --- a/Assets/CivMarsEngine/GUI/UITextures/Ring.full.png.meta +++ b/Assets/CivMarsEngine/GUI/UITextures/Ring.full.png.meta @@ -7,7 +7,7 @@ TextureImporter: serializedVersion: 2 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 linearTexture: 0 correctGamma: 0 fadeOut: 0 diff --git a/Assets/CivMarsEngine/GUI/UITextures/Ring.png.meta b/Assets/CivMarsEngine/GUI/UITextures/Ring.png.meta index a2d489a..875e154 100644 --- a/Assets/CivMarsEngine/GUI/UITextures/Ring.png.meta +++ b/Assets/CivMarsEngine/GUI/UITextures/Ring.png.meta @@ -7,7 +7,7 @@ TextureImporter: serializedVersion: 2 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 linearTexture: 0 correctGamma: 0 fadeOut: 0 @@ -17,7 +17,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -42,7 +42,7 @@ TextureImporter: spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 256 alphaIsTransparency: 1 @@ -50,6 +50,7 @@ TextureImporter: buildTargetSettings: [] spriteSheet: sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/CivMarsEngine/GUI/UITextures/Ring2.png.meta b/Assets/CivMarsEngine/GUI/UITextures/Ring2.png.meta index a9eae88..e669304 100644 --- a/Assets/CivMarsEngine/GUI/UITextures/Ring2.png.meta +++ b/Assets/CivMarsEngine/GUI/UITextures/Ring2.png.meta @@ -7,7 +7,7 @@ TextureImporter: serializedVersion: 2 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 linearTexture: 0 correctGamma: 0 fadeOut: 0 @@ -17,7 +17,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -30,7 +30,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 wrapMode: 1 nPOTScale: 0 @@ -42,7 +42,7 @@ TextureImporter: spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 1 @@ -50,6 +50,7 @@ TextureImporter: buildTargetSettings: [] spriteSheet: sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/CivMarsEngine/Player/Player.cs b/Assets/CivMarsEngine/Player/Player.cs index 48c29af..817e5b9 100644 --- a/Assets/CivMarsEngine/Player/Player.cs +++ b/Assets/CivMarsEngine/Player/Player.cs @@ -22,6 +22,7 @@ public class Player : MonoBehaviour, IGasTank, IInventory public int speed; public float miningTime; + public float fullMiningTime; public void Start() { @@ -62,7 +63,7 @@ void Update() if (Input.GetButtonUp("Mine") && (GameCon.gameS == GameState.InGame) && mining == null) { Debug.Log("Mine"); - MineStar(); + StartMine(); } } @@ -106,7 +107,7 @@ public void Mine() } - public void MineStar() + public void StartMine() { TileVector pos = new TileVector((int)Mathf.Round(transform.position.x - 0.5f), -1 * (int)Mathf.Round(transform.position.y + 0.5f)); @@ -120,7 +121,8 @@ public void MineStar() { mining = ore; //GameCon.guiHandler.actions[0].Action(((OreTile)ore).GetMiningTime(), "Mine"); - miningTime = ((OreTile)ore).GetMiningTime(); + fullMiningTime = ((OreTile)ore).GetMiningTime(); + miningTime = fullMiningTime; } } diff --git a/Assets/Prefabs/Buildables/BuildableGui.prefab b/Assets/Prefabs/Buildables/BuildableGui.prefab index 94c0020..3c503a5 100644 Binary files a/Assets/Prefabs/Buildables/BuildableGui.prefab and b/Assets/Prefabs/Buildables/BuildableGui.prefab differ diff --git a/Assets/Prefabs/Inventory/DoubleInventoryElement.prefab b/Assets/Prefabs/Inventory/DoubleInventoryElement.prefab index 0535b04..1e2220b 100644 Binary files a/Assets/Prefabs/Inventory/DoubleInventoryElement.prefab and b/Assets/Prefabs/Inventory/DoubleInventoryElement.prefab differ diff --git a/Assets/Prefabs/Inventory/InventoryBack.prefab b/Assets/Prefabs/Inventory/InventoryBack.prefab index 781f3a0..100cee9 100644 Binary files a/Assets/Prefabs/Inventory/InventoryBack.prefab and b/Assets/Prefabs/Inventory/InventoryBack.prefab differ diff --git a/Assets/Prefabs/Inventory/InventoryElement.prefab b/Assets/Prefabs/Inventory/InventoryElement.prefab deleted file mode 100644 index eab19c8..0000000 Binary files a/Assets/Prefabs/Inventory/InventoryElement.prefab and /dev/null differ diff --git a/Assets/Prefabs/Inventory/InventoryElement.prefab.meta b/Assets/Prefabs/Inventory/InventoryElement.prefab.meta deleted file mode 100644 index 4b06bcc..0000000 --- a/Assets/Prefabs/Inventory/InventoryElement.prefab.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e39bc89fe3472e34cb67a768f02f25a8 -timeCreated: 1437832058 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefabs/Inventory/PayerInventoryElement.prefab b/Assets/Prefabs/Inventory/PayerInventoryElement.prefab index 81e5017..b58eb70 100644 Binary files a/Assets/Prefabs/Inventory/PayerInventoryElement.prefab and b/Assets/Prefabs/Inventory/PayerInventoryElement.prefab differ diff --git a/Assets/Resources/Buildings/Chest.prefab b/Assets/Resources/Buildings/Chest.prefab index a776c4c..cb84a01 100644 Binary files a/Assets/Resources/Buildings/Chest.prefab and b/Assets/Resources/Buildings/Chest.prefab differ diff --git a/Assets/Resources/Buildings/Furnance.prefab b/Assets/Resources/Buildings/Furnance.prefab index ba97e43..de785d7 100644 Binary files a/Assets/Resources/Buildings/Furnance.prefab and b/Assets/Resources/Buildings/Furnance.prefab differ diff --git a/Assets/Resources/Buildings/MainBuilding.prefab b/Assets/Resources/Buildings/MainBuilding.prefab index 0c937aa..6d5432c 100644 Binary files a/Assets/Resources/Buildings/MainBuilding.prefab and b/Assets/Resources/Buildings/MainBuilding.prefab differ diff --git a/Assets/Resources/Buildings/Miner.prefab b/Assets/Resources/Buildings/Miner.prefab index 5bb73bb..7c1c18d 100644 Binary files a/Assets/Resources/Buildings/Miner.prefab and b/Assets/Resources/Buildings/Miner.prefab differ diff --git a/Assets/Resources/Buildings/Press.prefab b/Assets/Resources/Buildings/Press.prefab index 8f32d7f..ecdf329 100644 Binary files a/Assets/Resources/Buildings/Press.prefab and b/Assets/Resources/Buildings/Press.prefab differ diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index f4c12e6..6e964ce 100644 Binary files a/Assets/Scenes/Main.unity and b/Assets/Scenes/Main.unity differ diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 3d72c30..48a07e2 100644 Binary files a/ProjectSettings/EditorBuildSettings.asset and b/ProjectSettings/EditorBuildSettings.asset differ