Unit Skip, Sleep Activated

유닛 스킵, 슬립 기능 구현.

Assets/Scenes/MainScene.unity

@@ -8723,6 +8723,7 @@ RectTransform:
   - {fileID: 2060510814}
   - {fileID: 2085815511}
   - {fileID: 886997709}
+  - {fileID: 1595623377}
   - {fileID: 1389254536}
   - {fileID: 1558743810}
   m_Father: {fileID: 531803468}
@@ -8730,8 +8731,8 @@ RectTransform:
   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: 430}
-  m_SizeDelta: {x: 140, y: 300}
+  m_AnchoredPosition: {x: 0, y: 470}
+  m_SizeDelta: {x: 140, y: 380}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &789072477
 MonoBehaviour:
@@ -8951,6 +8952,80 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 798699951}
+--- !u!1 &800084370
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 800084371}
+  - component: {fileID: 800084373}
+  - component: {fileID: 800084372}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &800084371
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 800084370}
+  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: 1595623377}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &800084372
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 800084370}
+  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: 30
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 60
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Sleep
+--- !u!222 &800084373
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 800084370}
 --- !u!1 &804112467
 GameObject:
   m_ObjectHideFlags: 0
@@ -9797,7 +9872,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 144}
+  m_AnchoredPosition: {x: 0, y: 216}
   m_SizeDelta: {x: 100, y: 60}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &886997710
@@ -9838,7 +9913,18 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 886997711}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 1056054510}
+        m_MethodName: WaitActive
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
 --- !u!114 &886997711
@@ -11510,6 +11596,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   MapUI: {fileID: 531803464}
+  Actions: {fileID: 789072475}
   ManagementUI: {fileID: 687281509}
   QuestUI: {fileID: 1243551243}
   GameEND: {fileID: 108006610}
@@ -11519,6 +11606,7 @@ MonoBehaviour:
   Technology: {fileID: 1494908599}
   Labor: {fileID: 798699953}
   UnitInfo: {fileID: 1452676922}
+  UnitPortrait: {fileID: 1003225430}
   UnitName: {fileID: 83997300}
   UnitAttack: {fileID: 964404866}
   UnitDefence: {fileID: 1481027123}
@@ -15127,11 +15215,11 @@ RectTransform:
   m_Children:
   - {fileID: 590967241}
   m_Father: {fileID: 789072476}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 76}
+  m_AnchoredPosition: {x: 0, y: 72}
   m_SizeDelta: {x: 100, y: 60}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &1389254537
@@ -16832,7 +16920,7 @@ RectTransform:
   - {fileID: 1939799845}
   - {fileID: 425950239}
   m_Father: {fileID: 789072476}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
@@ -17336,6 +17424,128 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1593502674}
+--- !u!1 &1595623376
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 1595623377}
+  - component: {fileID: 1595623380}
+  - component: {fileID: 1595623379}
+  - component: {fileID: 1595623378}
+  m_Layer: 5
+  m_Name: Sleep
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1595623377
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1595623376}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.00001, y: 1.00001, z: 1.00001}
+  m_Children:
+  - {fileID: 800084371}
+  m_Father: {fileID: 789072476}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 144}
+  m_SizeDelta: {x: 100, y: 60}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!114 &1595623378
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1595623376}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1595623379}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1056054510}
+        m_MethodName: SleepActive
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+--- !u!114 &1595623379
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1595623376}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!222 &1595623380
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1595623376}
 --- !u!1 &1601530494
 GameObject:
   m_ObjectHideFlags: 0
@@ -22192,7 +22402,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 288}
+  m_AnchoredPosition: {x: 0, y: 360}
   m_SizeDelta: {x: 100, y: 60}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &2060510815
@@ -22509,7 +22719,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0.000030517578, y: 216}
+  m_AnchoredPosition: {x: 0, y: 288}
   m_SizeDelta: {x: 100, y: 60}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &2085815512

Assets/Scripts/GameManager.cs

@@ -71,8 +71,10 @@ public class GameManager : MonoBehaviour {
 
         ObserverSet();
         DrawMap();
-
+        
         ProceedTurn();
+
+        UIManager.I.MakeUnitInfo();
     }
 	
 	// Update is called once per frame
@@ -198,10 +200,10 @@ public class GameManager : MonoBehaviour {
         }
     }
 
-    public void BuildBuilding(CivModel.Terrain.Point pos, TileBuilding building)
+    /*public void BuildBuilding(CivModel.Terrain.Point pos, TileBuilding building)
     {
 
-    }
+    }*/
     // Read game terrain and update hex tile resource
     void Render(CivModel.Terrain terrain)
     {

Assets/Scripts/ManagementUIController.cs

@@ -120,11 +120,7 @@ public class ManagementUIController : MonoBehaviour {
         DeleteAllSQ();
         foreach (IProductionFactory fac in facList)
         {
-            /*if(fac.ProductionResultType != null)
-            {
-                fac.ProductionResultType.GetInterface("battleclasslevel");
-                PartSelectionQ(EpicQlist, EpicQueue, fac);
-            }*/
+            
             PartSelectionQ(EpicQlist, EpicQueue, fac);
         }
         //내용물 없을 때 빈칸 채우기

Assets/Scripts/UIManager.cs

@@ -9,6 +9,7 @@ public class UIManager : MonoBehaviour {
 
     //// Resource bar UI ////
     public GameObject MapUI;
+    public GameObject Actions;
     public GameObject ManagementUI;
     public GameObject QuestUI;
     public GameObject GameEND;
@@ -99,13 +100,14 @@ public class UIManager : MonoBehaviour {
         if (GameManager.I.SelectedActor != null)
         {
             UnitInfo.SetActive(true);
-            //GameManager.I.SelectedActor.player
+            //(GameManager.I.SelectedActor.Owner == ) 
             //UnitPortrait.sprite = Resources.Load(("Quests/" + ParseQuest.GetQuestName(quest)).ToLower(), typeof(Sprite)) as Sprite;
             UnitName.text = ProductionFactoryTraits.GetName(GameManager.I.SelectedActor);
             UnitAttack.text = GameManager.I.SelectedActor.AttackPower.ToString();
             UnitDefence.text = GameManager.I.SelectedActor.DefencePower.ToString();
             UnitEffect.text = "";
             ActionPoint.text = GameManager.I.SelectedActor.RemainAP + "/" + GameManager.I.SelectedActor.MaxAP;
+            Actions.SetActive(true);
         }
         else
         {
@@ -115,6 +117,7 @@ public class UIManager : MonoBehaviour {
             UnitDefence.text = "";
             UnitEffect.text = "";
             ActionPoint.text = "";
+            Actions.SetActive(false);
         }
     }
     //// Resource bar UI ////
@@ -170,6 +173,22 @@ public class UIManager : MonoBehaviour {
         PseudoFSM.I.AttackStateEnter();
     }
 
+    public void WaitActive()
+    {
+        SkillSet.SetActive(false);
+        GameManager.I.SelectedActor.SkipFlag = true;
+        GameManager.I.SelectNextUnit();
+        MakeUnitInfo();
+        PseudoFSM.I.NormalStateEnter();
+    }
+    public void SleepActive()
+    {
+        SkillSet.SetActive(false);
+        GameManager.I.SelectedActor.SleepFlag = true;
+        GameManager.I.SelectNextUnit();
+        MakeUnitInfo();
+        PseudoFSM.I.NormalStateEnter();
+    }
     public void SkillSetActive()
     {
         SkillSet.SetActive(!SkillSet.activeSelf);