Factory Name Parsing(WIP)

생산 이름 파싱 중

Assets/Plugins/CivModel.AI.dll.mdb.meta

 fileFormatVersion: 2
 guid: 06d1e9b94983c2b43b353b6afc3e4574
-timeCreated: 1520012438
+timeCreated: 1520020079
 licenseType: Free
 DefaultImporter:
   externalObjects: {}

Assets/Plugins/CivModel.Common.dll.mdb.meta

 fileFormatVersion: 2
 guid: 14316eefeff7b8c4882dee9cb31df5f1
-timeCreated: 1520012438
+timeCreated: 1520020079
 licenseType: Free
 DefaultImporter:
   externalObjects: {}

Assets/Plugins/CivModel.Finno.dll.mdb.meta

 fileFormatVersion: 2
 guid: 52d4b4bcbfe43994e999b8f5be390d82
-timeCreated: 1520012438
+timeCreated: 1520023678
 licenseType: Free
 DefaultImporter:
   externalObjects: {}

Assets/Plugins/CivModel.Hwan.dll.mdb.meta

 fileFormatVersion: 2
 guid: 43a349a478a56d34f81309845b5fd7ca
-timeCreated: 1520012438
+timeCreated: 1520023678
 licenseType: Free
 DefaultImporter:
   externalObjects: {}

Assets/Plugins/CivModel.Quest.dll.mdb.meta

 fileFormatVersion: 2
 guid: 9cd8c45234b33194ab238aa2797329af
-timeCreated: 1520012438
+timeCreated: 1520024484
 licenseType: Free
 DefaultImporter:
   externalObjects: {}

Assets/Plugins/CivModel.Zap.dll.mdb.meta

 fileFormatVersion: 2
 guid: f800f112e738c91408b1c549735a7597
-timeCreated: 1520012438
+timeCreated: 1520020079
 licenseType: Free
 DefaultImporter:
   externalObjects: {}

Assets/Plugins/CivModel.dll.mdb.meta

 fileFormatVersion: 2
 guid: 51a4ccfc53e3bd3489fedcd4adb9e458
-timeCreated: 1520012438
+timeCreated: 1520020079
 licenseType: Free
 DefaultImporter:
   externalObjects: {}

Assets/Scripts/HexTile.cs

@@ -71,7 +71,7 @@ public class HexTile : MonoBehaviour
 
         if (building is CivModel.CityBase)
         {
-            Debug.Log(building.Owner.Team);
+            //Debug.Log(building.Owner.Team);
             buildings.GetChild(2).gameObject.SetActive(true);
             side = buildings.GetChild((building.Owner.Team + 1) %  2);
             side.GetChild(0).gameObject.SetActive(true);

Assets/Scripts/ManagementUIController.cs

@@ -149,7 +149,8 @@ public class ManagementUIController : MonoBehaviour {
             }
             else if(typeof(TileObject).IsAssignableFrom(fac.ResultType))
             {
-                if(typeof(CityBase).IsAssignableFrom(fac.ResultType))
+                Debug.Log(fac.ToString());
+                if (typeof(CityBase).IsAssignableFrom(fac.ResultType))
                 {
                     PartSelectionQ(CityQlist, CityQueue, fac);
                 }

Assets/Scripts/UIManager.cs

@@ -73,27 +73,36 @@ public class UIManager : MonoBehaviour {
     }
     void Update()
     {
-        if (GameManager.I.isThereTodos && !PseudoFSM.I.DepState)
+        if (GameManager.I.Game.PlayerInTurn.IsAIControlled)
         {
-            MapUI.transform.Find("EndTurn").GetComponentInChildren<Text>().text = "유닛이 명령을 기다리고 있습니다";
+            MapUI.transform.Find("EndTurn").GetComponentInChildren<Button>().enabled = false;
+            MapUI.transform.Find("EndTurn").GetComponentInChildren<Text>().text = "다른 플레이어가 턴 진행 중입니다. 기다려 주십시오.";
             MapUI.transform.Find("EndTurn").GetComponentInChildren<Text>().fontSize = Screen.height / 40;
         }
-        else if (PseudoFSM.I.DepState)
-        {
-            MapUI.transform.Find("EndTurn").GetComponentInChildren<Text>().text = "배치 취소";
-            MapUI.transform.Find("EndTurn").GetComponentInChildren<Text>().fontSize = Screen.height / 25;
-        }
         else
         {
-            MapUI.transform.Find("EndTurn").GetComponentInChildren<Text>().text = "다음 턴";
-            MapUI.transform.Find("EndTurn").GetComponentInChildren<Text>().fontSize = Screen.height / 25;
+            MapUI.transform.Find("EndTurn").GetComponentInChildren<Button>().enabled = true;
+            if (GameManager.I.isThereTodos && !PseudoFSM.I.DepState)
+            {
+                MapUI.transform.Find("EndTurn").GetComponentInChildren<Text>().text = "유닛이 명령을 기다리고 있습니다";
+                MapUI.transform.Find("EndTurn").GetComponentInChildren<Text>().fontSize = Screen.height / 40;
+            }
+            else if (PseudoFSM.I.DepState)
+            {
+                MapUI.transform.Find("EndTurn").GetComponentInChildren<Text>().text = "배치 취소";
+                MapUI.transform.Find("EndTurn").GetComponentInChildren<Text>().fontSize = Screen.height / 25;
+            }
+            else
+            {
+                MapUI.transform.Find("EndTurn").GetComponentInChildren<Text>().text = "다음 턴";
+                MapUI.transform.Find("EndTurn").GetComponentInChildren<Text>().fontSize = Screen.height / 25;
+            }
+            Gold.text = "금 : " + GameManager.I.Game.PlayerInTurn.Gold + "(+" + GameManager.I.Game.PlayerInTurn.GoldIncome + ")";
+            Population.text = "인구 : " + GameManager.I.Game.PlayerInTurn.Population;
+            Happiness.text = "행복 : " + GameManager.I.Game.PlayerInTurn.Happiness;
+            Technology.text = "기술력 : " + GameManager.I.Game.PlayerInTurn.Research;
+            Labor.text = "노동력 : " + GameManager.I.Game.PlayerInTurn.Labor;
         }
-
-        Gold.text = "금 : " + GameManager.I.Game.PlayerInTurn.Gold + "(+" + GameManager.I.Game.PlayerInTurn.GoldIncome + ")";
-        Population.text = "인구 : " + GameManager.I.Game.PlayerInTurn.Population;
-        Happiness.text = "행복 : " + GameManager.I.Game.PlayerInTurn.Happiness;
-        Technology.text = "기술력 : " + GameManager.I.Game.PlayerInTurn.Research;
-        Labor.text = "노동력 : " + GameManager.I.Game.PlayerInTurn.Labor;
     }
     public void MakeUnitInfo()
     {
@@ -265,7 +274,6 @@ public class UIManager : MonoBehaviour {
         else
         {
             GameManager.I.ProceedTurn();
-            MakeUnitInfo();
         }
     }
 
@@ -378,4 +386,10 @@ public class UIManager : MonoBehaviour {
         CityBuildingTab.SetActive(false);
         NormalBuildingTab.SetActive(true);
     }
+    public void WaitTurn()
+    {
+        MapUI.SetActive(true);
+        ManagementUI.SetActive(false);
+        QuestUI.SetActive(false);
+    }
 }

civiii-model-proto @ f5782386

-Subproject commit 81ffd2d0ad01bfff8538d8a8790207035689ef5b
+Subproject commit f57823866e8f7427a7c2434466af713c10ca4ed2