ManagementUI elements added. On/Off enabled.

Assets/Prefabs/Deployment1.prefab

@@ -80,6 +80,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1870654457803296
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224316535290632934}
+  - component: {fileID: 222484041708961206}
+  - component: {fileID: 114861048883850446}
+  m_Layer: 5
+  m_Name: UnitName
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!114 &114119453995735154
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -235,12 +252,51 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114861048883850446
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1870654457803296}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Hwan Jedi Knights
 --- !u!222 &222307349340161390
 CanvasRenderer:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1039310774705828}
+--- !u!222 &222484041708961206
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1870654457803296}
 --- !u!222 &222753816676270096
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -278,6 +334,24 @@ RectTransform:
   m_AnchoredPosition: {x: -4, y: 0}
   m_SizeDelta: {x: 30, y: 30}
   m_Pivot: {x: 1, y: 0.5}
+--- !u!224 &224316535290632934
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1870654457803296}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 224370154200431468}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 50, y: 0}
+  m_SizeDelta: {x: 140, y: 16}
+  m_Pivot: {x: 0, y: 0.5}
 --- !u!224 &224370154200431468
 RectTransform:
   m_ObjectHideFlags: 1
@@ -290,14 +364,15 @@ RectTransform:
   m_Children:
   - {fileID: 224408663434191236}
   - {fileID: 224012884989332310}
+  - {fileID: 224316535290632934}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 280, y: 40}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_SizeDelta: {x: 354, y: 40}
+  m_Pivot: {x: 0, y: 1}
 --- !u!224 &224408663434191236
 RectTransform:
   m_ObjectHideFlags: 1

Assets/Prefabs/UnitToProduce.prefab.meta

+fileFormatVersion: 2
+guid: 9f61e44570415e14ea9363105b271b8e
+timeCreated: 1516797823
+licenseType: Free
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/ManagementUIController.cs

@@ -11,14 +11,15 @@ public class ManagementUIController : MonoBehaviour {
     public Canvas managementUI;
     public Button managementTab;
 
-    public LinkedList<Production> mProduction;
-    public LinkedList<Production> mDeployment;
+    private LinkedList<Production> mProduction;
+    private LinkedList<Production> mDeployment;
 
-    private Player mPlayer;
+    private IReadOnlyList<Player> mPlayers;
 
     private GameObject gameManagerObject;
     private CIVGameManager gameManager;
     private Presenter mPresenter;
+    private Game mGame;
 
     public GameObject[] PQlist;
     public GameObject[] DQlist;
@@ -27,50 +28,81 @@ public class ManagementUIController : MonoBehaviour {
     public GameObject depPrefab;        // prefab templates
     public Button pioneer;              // new unit production when clicked
 
-    public void setControlUI ()
+    public void SetManagementUI (bool val)
     {
-        if (managementTab == true)
-            managementUI.enabled = true;//            managementUI.gameObject.SetActive(true);
-        else
-            managementUI.enabled = false;//            managementUI.gameObject.SetActive(false);
+        Debug.Log("manUI : " + val);
+        managementUI.enabled = val;//            managementUI.gameObject.SetActive(true);//            managementUI.gameObject.SetActive(false);
     }
 
+    public void ManageButton()                                      // Management tab on/off button
+    {
+        if (mPresenter.State == Presenter.States.Normal)
+        {
+            mPresenter.CommandProductUI();
+        }
+        else if (mPresenter.State == Presenter.States.ProductUI)
+        {
+            mPresenter.CommandCancel();
+        }
+    }
 
     void Start()
     {
         gameManagerObject = CIVGameManager.GetGameManager();
         gameManager = gameManagerObject.GetComponent<CIVGameManager>();
         mPresenter = gameManager.GetPresenter();
+
+        mPlayers = mPresenter.Game.Players;
     }
 
     void Update()
     {
-        if (managementTab == true)
-            managementUI.enabled = true;
-        else
-            managementUI.enabled = false;
+        mProduction = mPresenter.Game.PlayerInTurn.Production;
+        mDeployment = mPresenter.Game.PlayerInTurn.Deployment;
 
-        mProduction = mPlayer.Production;       // The list of the not-finished productions of this player
-        mDeployment = mPlayer.Deployment;       // The list of the ready-to-deploy productions of this player
+        switch (mPresenter.State)//for debug
+        {
+            case CivPresenter.Presenter.States.Deploy:
+                {
+                    SetManagementUI(true);
+                    Debug.Log("State : Deploy");
+                    break;
+                }
+            case CivPresenter.Presenter.States.ProductUI:
+                {
+                    SetManagementUI(true);
+                    Debug.Log("State : ProductUI");
+                    break;
+                }
+            case CivPresenter.Presenter.States.ProductAdd:
+                {
+                    SetManagementUI(true);
+                    Debug.Log("State : ProductAdd");
+                    break;
+                }
+            default:
+                SetManagementUI(false);
+                break;
+        }
     }
     
 
-    public void productionQ()
+    public void MakeProductionQ()
     {
         for (int i = 0; i < mProduction.Count; i++)
         {
-            PQlist[i] = Instantiate(proPrefab) as GameObject;
+            PQlist[i] = Instantiate(proPrefab);
             PQlist[i].GetComponent<Text>().text = 3 + "턴 이후 종료";        // need to calculate how many turns are left
         }
         
         
     }
 
-    public void deploymentQ()
+    public void MakeDeploymentQ()
     {
         for (int i = 0; i < mDeployment.Count; i++)
         {
-            DQlist[i] = Instantiate(depPrefab) as GameObject;
+            DQlist[i] = Instantiate(depPrefab);
         }
 
     }