2018-07-27 For Closed Alpha Testing

Assets/Scenes/Game.unity

@@ -1171,7 +1171,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 1841507267}
   m_Direction: 2
   m_Value: 0
-  m_Size: 0.99975574
+  m_Size: 0.858232
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -1941,8 +1941,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 776379107}
   m_HandleRect: {fileID: 776379106}
   m_Direction: 2
-  m_Value: 0
-  m_Size: 1
+  m_Value: 1
+  m_Size: 0.99999994
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -2501,7 +2501,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0.000061035156, y: 0.000043135544}
+  m_AnchoredPosition: {x: 0.000061035156, y: 0.000058394333}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &191355288
@@ -4745,8 +4745,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 87567203}
   m_HandleRect: {fileID: 87567202}
   m_Direction: 2
-  m_Value: 0
-  m_Size: 1
+  m_Value: 1
+  m_Size: 0.99999994
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -5315,7 +5315,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.000086878164, y: -0.0000012803172}
+  m_AnchoredPosition: {x: -0.000086878164, y: 42.530407}
   m_SizeDelta: {x: 0, y: 300}
   m_Pivot: {x: 0, y: 1}
 --- !u!1 &454209707
@@ -5393,8 +5393,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1992858619}
   m_HandleRect: {fileID: 1992858618}
   m_Direction: 2
-  m_Value: 0
-  m_Size: 1
+  m_Value: 1
+  m_Size: 0.99999994
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -6401,7 +6401,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 843334966}
   m_HandleRect: {fileID: 843334965}
   m_Direction: 2
-  m_Value: 1
+  m_Value: 0
   m_Size: 0.99999994
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -6874,7 +6874,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 733846992}
   m_Direction: 2
   m_Value: 0
-  m_Size: 1
+  m_Size: 0.99999994
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -9498,7 +9498,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.000016289343, y: -0.000031757605}
+  m_AnchoredPosition: {x: -0.00004056615, y: -0.000030229721}
   m_SizeDelta: {x: 0, y: 300}
   m_Pivot: {x: 0, y: 1}
 --- !u!1 &871265225
@@ -10545,7 +10545,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0.000044682376, y: -0.0000012803172}
+  m_AnchoredPosition: {x: 0.000044682376, y: 42.530407}
   m_SizeDelta: {x: 0, y: 300}
   m_Pivot: {x: 0, y: 1}
 --- !u!1 &1000204409
@@ -10694,7 +10694,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0, y: -0.00006866455}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1004629748
@@ -10904,7 +10904,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -0.000016540003, y: -0.000045719746}
+  m_AnchoredPosition: {x: -0.000016540003, y: -0.000010814213}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1014045368
@@ -11213,7 +11213,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -0.000065077096, y: 0}
+  m_AnchoredPosition: {x: -0.000065077096, y: 0.0000019705408}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1020118428
@@ -15299,7 +15299,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.00002153402, y: -0.0000012803172}
+  m_AnchoredPosition: {x: -0.00002153402, y: 42.530407}
   m_SizeDelta: {x: 0, y: 300}
   m_Pivot: {x: 0, y: 1}
 --- !u!1 &1465630758
@@ -15580,7 +15580,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -0.000016884433, y: -0.000045719746}
+  m_AnchoredPosition: {x: -0.000016884433, y: -0.000010814213}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1477095906
@@ -17781,7 +17781,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1903287045}
   m_HandleRect: {fileID: 1903287044}
   m_Direction: 2
-  m_Value: 1
+  m_Value: 0
   m_Size: 0.99999994
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -18702,7 +18702,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -0.00006326262, y: 0}
+  m_AnchoredPosition: {x: -0.00006326262, y: 0.0000019705408}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1770847184
@@ -19139,7 +19139,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 173016130}
   m_HandleRect: {fileID: 173016129}
   m_Direction: 2
-  m_Value: 1
+  m_Value: 0
   m_Size: 0.99999994
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -19234,6 +19234,7 @@ MonoBehaviour:
   selectedTile: {fileID: 0}
   selectedGameObject: {fileID: 0}
   isThereTodos: 0
+  isAdClicked: 1
 --- !u!4 &1802626829
 Transform:
   m_ObjectHideFlags: 0
@@ -20095,7 +20096,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -0.00001696274, y: -0.000045719746}
+  m_AnchoredPosition: {x: -0.00001696274, y: -0.000010814213}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1922030647
@@ -20545,7 +20546,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -0.00006363122, y: 0}
+  m_AnchoredPosition: {x: -0.00006363122, y: 0.0000019705408}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1946056457
@@ -22149,7 +22150,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 1833688073}
   m_Direction: 2
   m_Value: 0
-  m_Size: 0.99975574
+  m_Size: 0.858232
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -22308,7 +22309,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -0.00006339335, y: 0}
+  m_AnchoredPosition: {x: -0.00006339335, y: 0.0000019705408}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &2017007226
@@ -23123,7 +23124,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 145151053}
   m_Direction: 2
   m_Value: 0
-  m_Size: 0.99975574
+  m_Size: 0.858232
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -23238,8 +23239,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 664171019}
   m_HandleRect: {fileID: 664171018}
   m_Direction: 2
-  m_Value: 0
-  m_Size: 1
+  m_Value: 1
+  m_Size: 0.99999994
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -23575,7 +23576,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 1628171449}
   m_Direction: 2
   m_Value: 0
-  m_Size: 0.99999994
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:

Assets/Script/Camera/CameraControl.cs

@@ -11,7 +11,7 @@ public class CameraControl : MonoBehaviour {
 	private int screen_height = Screen.height;
 	private int screen_width = Screen.width;
 
-    public int MaxHeight = 30; //최대 높이
+    public int MaxHeight = 100; //최대 높이
     public int MinHeight = 15; //최소 높이
 
     private Vector3 mouse_position;

Assets/Script/GameManager.cs

@@ -66,6 +66,9 @@ public class GameManager : MonoBehaviour {
 
     public bool isThereTodos = false;
 
+    // Indicates whether Maptile or AdditionalMapTile is clicked.
+    public bool isAdClicked = true;
+
 	void Awake() {
 		// Singleton
 		if (_manager != null) {
@@ -575,6 +578,7 @@ public class GameManager : MonoBehaviour {
                 if (dep.IsPlacable(point))
                 {
                     Instance.Tiles[point.Position.X, point.Position.Y].GetComponent<HexTile>().FlickerBlue();
+                    Instance.AdditionalTiles[point.Position.X, point.Position.Y].GetComponent<HexTile>().FlickerBlue();
                 }
             }
         }
@@ -628,6 +632,7 @@ public class GameManager : MonoBehaviour {
             {
                 CivModel.Terrain.Point point = terrain.GetPoint(i, j);
                 Instance.Tiles[point.Position.X, point.Position.Y].GetComponent<HexTile>().StopFlickering();
+                Instance.AdditionalTiles[point.Position.X, point.Position.Y].GetComponent<HexTile>().StopFlickering();
             }
         }
         GameManager.Instance.UpdateUnit();

Assets/Script/UI/UIManager.cs

@@ -5,6 +5,7 @@ using UnityEngine.UI;
 using UnityEngine.EventSystems;
 using CivModel;
 using CivModel.Common;
+using System.Text.RegularExpressions;
 
 public class UIManager : MonoBehaviour
 {
@@ -56,10 +57,10 @@ public class UIManager : MonoBehaviour
     // Use this for initialization
     void Start()
     {
-        mapUI = GameObject.Find("MapUI");
+        /*mapUI = GameObject.Find("MapUI");
         managementUI = GameObject.Find("ManagementUI");
         questUI = GameObject.Find("QuestUI");
-        SpecialSpec = GameObject.Find("SpecialSpec");
+        SpecialSpec = GameObject.Find("SpecialSpec");*/
         skillSet = GameObject.Find("Skill Set");
         unitInfo = GameObject.Find("UnitInfo");
         UnitPortrait = GameObject.Find("Portrait").GetComponent<Image>();
@@ -75,6 +76,8 @@ public class UIManager : MonoBehaviour
         questUI.SetActive(false);
         SpecialSpec.SetActive(false);
         skillSet.SetActive(false);
+        mapUI.transform.GetChild(1).gameObject.SetActive(false);
+        
     }
 
     // Update is called once per frame
@@ -89,14 +92,22 @@ public class UIManager : MonoBehaviour
             {
                 selectedActor = hit.transform.gameObject;
                 HexTile tile = selectedActor.GetComponent<HexTile>();
-
+                Debug.Log("A: " + selectedActor.name);
                 // Update selectedTile
                 GameManager.Instance.selectedTile = tile;
                 // Update selectedPoint using tile information
                 GameManager.Instance.selectedPoint = tile.point;
 
+                Match isAdditionalclicked = Regex.Match(selectedActor.name, "Additional");
+
+                if (isAdditionalclicked.Success)
+                    GameManager.Instance.isAdClicked = true;
+                else
+                    GameManager.Instance.isAdClicked = false;
+                
                 if (tile.point.Unit != null && tile.point.TileBuilding != null)
                 {
+                    
                     if (tile.isFirstClick)
                     {
                         GameManager.Instance.selectedActor = tile.point.Unit;
@@ -141,8 +152,13 @@ public class UIManager : MonoBehaviour
            
         }
         if(SpecialSpec.activeSelf == true)
-        {
             SpecialSpec.transform.position = Input.mousePosition;
+
+        if (Input.GetKeyDown(KeyCode.Escape))
+        {
+            managementUI.SetActive(false);
+            questUI.SetActive(false);
+            mapUI.SetActive(true);
         }
     }
     // Set Unit Information

Assets/Script/UI/ViewFieldSquareControl.cs

 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.EventSystems;
 
-public class ViewFieldSquareControl : MonoBehaviour {
+public class ViewFieldSquareControl : MonoBehaviour
+{
     Vector3 Scaler;
     private int _zoom_counter;
     public int zoom_counter { get { return _zoom_counter; } }
@@ -14,14 +16,16 @@ public class ViewFieldSquareControl : MonoBehaviour {
         _view = this;
     }
     // Use this for initialization
-    void Start () {
+    void Start()
+    {
         Scaler = new Vector3(0.22f, 0.22f, 0.22f);
         _zoom_counter = 2;
     }
 
     // Update is called once per frame
-	void Update () {
-        if (!(Input.mousePosition.x > 705 * Screen.width / 1022 && Input.mousePosition.x < Screen.width && Input.mousePosition.y > 0 && Input.mousePosition.y < 172 * Screen.height / 639))
+    void Update()
+    {
+        if (!EventSystem.current.IsPointerOverGameObject())
         {
             if (Input.GetAxis("Mouse ScrollWheel") < 0 && _zoom_counter < 2)
             {
@@ -35,6 +39,7 @@ public class ViewFieldSquareControl : MonoBehaviour {
                 transform.Translate(0, 0, -2.5f);
                 _zoom_counter--;
             }
+
         }
     }
 }

Assets/Script/Unit/Unit.cs

@@ -103,11 +103,13 @@ public class Unit : MonoBehaviour
                 {
                     CivModel.Position pos = _parameterPoints[i].Value.Position;
                     GameManager.Instance.Tiles[pos.X, pos.Y].GetComponent<HexTile>().FlickerRed();
+                    GameManager.Instance.AdditionalTiles[pos.X, pos.Y].GetComponent<HexTile>().FlickerRed();
                 }
                 else if (GameManager.Instance.selectedActor.MoveAct != null && GameManager.Instance.selectedActor.MoveAct.IsActable(_parameterPoints[i]))
                 {
                     CivModel.Position pos = _parameterPoints[i].Value.Position;
                     GameManager.Instance.Tiles[pos.X, pos.Y].GetComponent<HexTile>().FlickerBlue();
+                    GameManager.Instance.AdditionalTiles[pos.X, pos.Y].GetComponent<HexTile>().FlickerBlue();
                 }
                 else
                 {
@@ -177,6 +179,7 @@ public class Unit : MonoBehaviour
             {
                 CivModel.Position pos = _parameterPoints[i].Value.Position;
                 GameManager.Instance.Tiles[pos.X, pos.Y].GetComponent<HexTile>().StopFlickering();
+                GameManager.Instance.AdditionalTiles[pos.X, pos.Y].GetComponent<HexTile>().StopFlickering();
             }
         }
         _parameterPoints = null;
@@ -212,6 +215,7 @@ public class Unit : MonoBehaviour
                 {
                     CivModel.Position pos = _parameterPoints[i].Value.Position;
                     GameManager.Instance.Tiles[pos.X, pos.Y].GetComponent<HexTile>().FlickerRed();
+                    GameManager.Instance.AdditionalTiles[pos.X, pos.Y].GetComponent<HexTile>().FlickerRed();
                     Debug.Log(pos.X + " " + pos.Y + " Filcker Red");
                 }
                 else
@@ -314,6 +318,7 @@ public class Unit : MonoBehaviour
                         CivModel.Position pos = pnt.Value.Position;
                         // Debug.Log("Skill @ ( " + pos.X + " ," + pos.Y + " )");
                         GameManager.Instance.Tiles[pos.X, pos.Y].GetComponent<HexTile>().FlickerBlue();
+                        GameManager.Instance.AdditionalTiles[pos.X, pos.Y].GetComponent<HexTile>().FlickerBlue();
                         _skillParameterPoints.Add(pnt.Value);
                     }
                 }
@@ -376,6 +381,7 @@ public class Unit : MonoBehaviour
         {
             CivModel.Position pos = pnt.Position;
             GameManager.Instance.Tiles[pos.X, pos.Y].GetComponent<HexTile>().StopFlickering();
+            GameManager.Instance.AdditionalTiles[pos.X, pos.Y].GetComponent<HexTile>().StopFlickering();
         }
         _skillParameterPoints.Clear();
     }