2018-08-21 Commit

Assets/Prefabs/unit.prefab → Assets/Resources/UnitModels/unit.prefab

@@ -21,7 +21,6 @@ GameObject:
   - component: {fileID: 4164349117385164}
   - component: {fileID: 33675704233413142}
   - component: {fileID: 23430415915558628}
-  - component: {fileID: 95116768080365986}
   - component: {fileID: 114555728656525668}
   m_Layer: 0
   m_Name: unit
@@ -49,7 +48,7 @@ MeshRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1994173042382988}
-  m_Enabled: 0
+  m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
@@ -85,24 +84,6 @@ MeshFilter:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1994173042382988}
   m_Mesh: {fileID: 4300000, guid: b30586820caa1de47b0e0ed1aa73c608, type: 3}
---- !u!95 &95116768080365986
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1994173042382988}
-  m_Enabled: 1
-  m_Avatar: {fileID: 9000000, guid: b30586820caa1de47b0e0ed1aa73c608, type: 3}
-  m_Controller: {fileID: 0}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!114 &114555728656525668
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Script/GameManager.cs

@@ -190,18 +190,14 @@ public class GameManager : MonoBehaviour {
                 }
 			}
 		}
-        
-        foreach (GameObject unit in unitToDelete)
-        {
-            Debug.Log("unit to delete :" + unit.ToString());
-            
-        }
+
         foreach(GameObject unit in unitToDelete) {
+            int unitOwnerNumber = unit.GetComponent<Unit>().unitOwnerNumber;
 
-            CivModel.Actor unitModel = unit.GetComponent<Unit>().unitModel;
-            if (unitModel.Owner == _game.PlayerInTurn)
+            if (unitOwnerNumber == _game.Players[GameInfo.UserPlayer].PlayerNumber)
             {
-            AlarmManager.Instance.AddAlarm(
+                CivModel.Unit unitModel = unit.GetComponent<Unit>().unitModel;
+                AlarmManager.Instance.AddAlarm(
                     Resources.Load(("Portraits/" + (ProductionFactoryTraits.GetPortName(unitModel)).ToLower()), typeof(Sprite)) as Sprite,
                     ProductionFactoryTraits.GetName(unitModel) + " 파괴됨",
                     null,
@@ -241,8 +237,9 @@ public class GameManager : MonoBehaviour {
                         unit.AddComponent<Unit>();
 
                         unit.name = String.Format("Unit({0},{1})", plyrIdx, untIdx);
-                        unit.GetComponent<Unit>().SetPoints(pt, pos);
                         unit.GetComponent<Unit>().unitModel = unt;
+                        unit.GetComponent<Unit>().SetPoints(pt, pos);
+                        unit.GetComponent<Unit>().unitOwnerNumber = unt.Owner.PlayerNumber;
                         _units.Add(unit);
                         unit.GetComponent<Unit>().unitModel.SkipFlag = true;
 
@@ -255,8 +252,9 @@ public class GameManager : MonoBehaviour {
                         GameObject ad_unit = Instantiate(UnitPrefab, ad_pos, Quaternion.identity);
                         ad_unit.AddComponent<Unit>();
                         ad_unit.name = String.Format("AdditionalUnit({0},{1})", plyrIdx, untIdx);
-                        ad_unit.GetComponent<Unit>().SetPoints(pt, ad_pos);
                         ad_unit.GetComponent<Unit>().unitModel = unt;
+                        ad_unit.GetComponent<Unit>().SetPoints(pt, ad_pos);
+                        ad_unit.GetComponent<Unit>().unitOwnerNumber = unt.Owner.PlayerNumber;
                         _additional_units.Add(ad_unit);
                         ad_unit.GetComponent<Unit>().unitModel.SkipFlag = true;
                     }
@@ -303,6 +301,8 @@ public class GameManager : MonoBehaviour {
         CheckCompletedQuest();
         // Update Unit Info
         UIManager.Instance.UpdateUnitInfo();
+        // Update Quest Queue
+        UIController.GetUIController().MakeQuestQueue();
     }
 
     bool IsSpyNear(CivModel.Position pt) {
@@ -501,10 +501,12 @@ public class GameManager : MonoBehaviour {
 
 					unit.name = String.Format("Unit({0},{1})", plyrIdx, untIdx);
                     additional_unit.name = String.Format("AdditionalUnit({0},{1})", plyrIdx, untIdx);
-					unit.GetComponent<Unit>().SetPoints(pt, pos);
-                    additional_unit.GetComponent<Unit>().SetPoints(pt, ad_pos);
                     unit.GetComponent<Unit>().unitModel = unt;
                     additional_unit.GetComponent<Unit>().unitModel = unt;
+					unit.GetComponent<Unit>().SetPoints(pt, pos);
+                    additional_unit.GetComponent<Unit>().SetPoints(pt, ad_pos);
+                    unit.GetComponent<Unit>().unitOwnerNumber = unt.Owner.PlayerNumber;
+                    additional_unit.GetComponent<Unit>().unitOwnerNumber = unt.Owner.PlayerNumber;
 					_units.Add(unit);
                     _additional_units.Add(additional_unit);
 				}
@@ -763,7 +765,7 @@ public class GameManager : MonoBehaviour {
             }
         }
 
-        GameUI.CheckEnd();
+        GameUI.Instance.CheckEnd();
     }
 
     // Check if there exist production that have finished.

Assets/Script/UI/AlarmManager.cs

@@ -58,19 +58,7 @@ public class AlarmManager : MonoBehaviour
     // Add new AlarmModel in Alarm Queue.
     public void AddAlarm(Sprite alarmImage, String alarmText, Action action, int leftTurn)
     {
-        GameObject alarm = (GameObject)Instantiate(alarmContent);
-        alarm.AddComponent<AlarmModel>();
-
-        alarm.GetComponent<AlarmModel>().SetProperties(alarmImage, alarmText, action, leftTurn);
-
-        if (alarm.GetComponent<AlarmModel>().leftTurn == 0)
-        {
-            ShowAlarm(alarm);
-        }
-        else
-        {
-            alarmQueue.Add(alarm);
-        }
+        AddAlarm(alarmImage, alarmText, action, leftTurn, false);
     }
 
     // Add new AlarmModel in Alarm Queue.

Assets/Script/UI/GameUI.cs

@@ -9,16 +9,30 @@ using UnityEngine.SceneManagement;
 
 public class GameUI : MonoBehaviour {
 
+    public static GameUI Instance = null;
+
     public GameObject mapUI;
     public GameObject EndTurn;
     public Text goldText, populationText, happinessText, researchText, laborText;
+    public GameObject endingScene;
 
     private UIController uicontroller;
     private ManagementController managementcontroller;
     private SpecialResourceView specialResourceView;
 
+    void Awake()
+    {
+        if (Instance == null)
+            Instance = this;
+        else if (Instance != this)
+            Destroy(gameObject);
+
+        DontDestroyOnLoad(gameObject);
+    }
+
     // Use this for initialization
     void Start () {
+        endingScene.SetActive(false);
         //mapUI = GameObject.Find("MapUI");
         uicontroller = UIController.GetUIController();
         managementcontroller = ManagementController.GetManagementController();
@@ -88,20 +102,38 @@ public class GameUI : MonoBehaviour {
         specialResourceView.begin();
     }
 
-    public static void CheckEnd()
+    public void CheckEnd()
     {
         if(GameManager.Instance.Game.PlayerInTurn.IsVictoried)
         {
-            SceneManager.LoadScene("Ending");
+            if (GameManager.Instance.Game.PlayerInTurn == GameManager.Instance.Game.Players[0])
+            {
+                endingScene.GetComponentInChildren<Image>().sprite = Resources.Load<Sprite>("Endings/Hwan_ending");
+            }
+            else
+            {
+                endingScene.GetComponentInChildren<Image>().sprite = Resources.Load<Sprite>("Endings/Finno_ending");
+            }
+            endingScene.SetActive(true);
         }
         else if (GameManager.Instance.Game.PlayerInTurn.IsDefeated)
         {
-            SceneManager.LoadScene("Ending");
+            if (GameManager.Instance.Game.PlayerInTurn == GameManager.Instance.Game.Players[0])
+            {
+                endingScene.GetComponentInChildren<Image>().sprite = Resources.Load<Sprite>("Endings/Finno_ending");
+            }
+            else
+            {
+                endingScene.GetComponentInChildren<Image>().sprite = Resources.Load<Sprite>("Endings/Hwan_ending");
+            }
+            endingScene.SetActive(true);
         }
         else if (GameManager.Instance.Game.PlayerInTurn.IsDrawed)
         {
-            SceneManager.LoadScene("Ending");
+            endingScene.GetComponentInChildren<Image>().sprite = Resources.Load<Sprite>("Endings/Draw_ending");
+            endingScene.SetActive(true);
         }
+
     }
 
     public void onClickNextTurn()
@@ -131,6 +163,7 @@ public class GameUI : MonoBehaviour {
                     GameManager.Instance.Game.StartTurn();
                 }
             }
+            AlarmManager.Instance.updateAlarmQueue();
 
             GameManager.Instance.UpdateMap();
             GameManager.Instance.UpdateUnit();
@@ -138,7 +171,6 @@ public class GameUI : MonoBehaviour {
             //UIManager.Instance.UpdateUnitInfo(); Done in UpdateUnit
             UIManager.Instance.ButtonInteractChange();
 
-            AlarmManager.Instance.updateAlarmQueue();
             GameManager.Instance.CheckCompletedProduction();
 
             managementcontroller.MakeProductionQ();

Assets/Script/UI/UIManager.cs

@@ -18,6 +18,9 @@ public class UIManager : MonoBehaviour
     public GameObject selectedActor;
     public GameObject SpecialSpec;
 
+    public GameObject spyPanel;
+    public GameObject spyContent;
+
     public GameObject UnitSelTab;
     public GameObject BuildingSelTab;
     public GameObject EpicTab, HighTab, IntermediateTab, LowTab;    // Unit production
@@ -79,6 +82,7 @@ public class UIManager : MonoBehaviour
         cityBuildingInfo.SetActive(false);
         mapUI.transform.GetChild(1).gameObject.SetActive(false);
         QuestComplete.SetActive(false);
+        spyPanel.SetActive(false);
         
     }
 
@@ -510,4 +514,10 @@ public class UIManager : MonoBehaviour
         QuestComplete.SetActive(false);
     }
 
+    public void OnClickBack()
+    {
+        spyPanel.SetActive(false);
+    }
+
+
 }
\ No newline at end of file

Assets/Script/Unit/Unit.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using UnityEngine;
 using CivModel;
 using UnityEngine.EventSystems;
+using UnityEngine.UI;
 
 public class Unit : MonoBehaviour
 {
@@ -18,6 +19,8 @@ public class Unit : MonoBehaviour
     // Associated With the Model, But as it's a pointer, Access is Required.
     public CivModel.Unit unitModel;
 
+    public int unitOwnerNumber;
+
     // Unit States. Move, Attack and Skill
     private bool _inMoveState = false;
     public bool MoveState { get { return _inMoveState; } }
@@ -40,6 +43,7 @@ public class Unit : MonoBehaviour
         this.point = p1;
         this.unityPoint = GameManager.ModelPntToUnityPnt(p1, 0);
         this.transform.position = this.unityPoint;
+        this.unitOwnerNumber = this.unitModel.Owner.PlayerNumber;
         // SetMaterial();
     }
     // Change Unit position to given CivModel.Terrain.Point value
@@ -322,6 +326,9 @@ public class Unit : MonoBehaviour
                 if (unitModel is CivModel.Hwan.Spy || unitModel is CivModel.Finno.Spy)
                 {
                     CivModel.Player SpiedPlayer = unitModel.PlacedPoint.Value.TileOwner;
+
+                    // 플레이어 이름
+                    string playerName = SpiedPlayer.PlayerName;
                     // 금 정보
                     double gold = SpiedPlayer.Gold;
                     double goldTurn = SpiedPlayer.GoldIncome;
@@ -336,14 +343,21 @@ public class Unit : MonoBehaviour
                     // 노동력 정보
                     double labor = SpiedPlayer.Labor;
 
-                    string text = "금: " + gold + "\n(턴당 " + goldTurn + ")\n" + "인구: " + population + "\n" + "행복: " + happiness + "\n(턴당 " + happinessTurn + ")\n" + "기술력: " + research + "\n(턴당 " + researchTurn + ")\n" + "노동력: " + labor;
+                    string text = "적국 이름: " + playerName + "\n\n금: " + gold + " (턴당 " + goldTurn + ")\n\n" + "인구: " + population + "\n\n" + "행복: " + happiness + " (턴당 " + happinessTurn + ")\n\n" + "기술력: " + research + "(턴당 " + researchTurn + ")\n\n" + "노동력: " + labor;
 
+                    UIManager.Instance.spyPanel.SetActive(true);
+                    UIManager.Instance.spyContent.GetComponent<Text>().text = text;
                 }
                 // 공통적인 부분
                 GameManager.Instance.selectedActor.SpecialActs[_currentSkill].Act(null);
                 GameManager.Instance.UpdateUnit();
                 // UIManager.Instance.UpdateUnitInfo(); Done in UpdateUnit
             }
+            else
+            {
+                Debug.Log("아직 사용할 수 없습니다");
+                AlarmManager.Instance.AddAlarm(UIManager.Instance.UnitPortrait.sprite, "스킬을 사용할 수 없습니다", () => GameManager.Focus(point), 0);
+            }
             _inSkillState = false;
             return;
         }
@@ -401,7 +415,7 @@ public class Unit : MonoBehaviour
                             unitToSkill.SpecialActs[_currentSkill].Act(destPoint);
 
                         }
-                        catch (System.Exception e) { }
+                        catch (System.Exception e) { Debug.Log(e); }
                         finally
                         {
                             SkillStateExit();

ProjectSettings/GraphicsSettings.asset

@@ -37,6 +37,7 @@ GraphicsSettings:
   - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}