2018-08-10 Commit

Assets/Plugins/Accord.dll.config

-<!-- Mono library mapping mechanism -->
-<configuration>
-  <dllmap dll="ntdll.dll">
-    <dllentry os="osx" dll="libc.dylib"/>
-    <dllentry os="linux,solaris,freebsd" dll="libc.so.6"/>
-  </dllmap>
-</configuration>
+<!-- Mono library mapping mechanism -->
+<configuration>
+  <dllmap dll="ntdll.dll">
+    <dllentry os="osx" dll="libc.dylib"/>
+    <dllentry os="linux,solaris,freebsd" dll="libc.so.6"/>
+  </dllmap>
+</configuration>

Assets/Plugins/CivModel.Path.xml

-<?xml version="1.0" encoding="utf-8"?>
-<doc>
-<assembly><name>CivModel.Path</name></assembly>
-<members>
-</members>
-</doc>
+<?xml version="1.0" encoding="utf-8"?>
+<doc>
+<assembly><name>CivModel.Path</name></assembly>
+<members>
+</members>
+</doc>

Assets/Plugins/Accord.Fuzzy.dll.mdb.meta → Assets/Plugins/CivObservable.dll.mdb.meta

 fileFormatVersion: 2
-guid: c800ce5388c3bc444a6ef0af5bd6d2c8
+guid: f80345eb0e0414a00a9e302f66739002
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Plugins/CivObservable.dll.meta

+fileFormatVersion: 2
+guid: 928afdb00655c400d922231772a80f4e
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/CivObservable.xml.meta

+fileFormatVersion: 2
+guid: e450effeb9a85488fa369058402f0677
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/Accord.dll.mdb.meta → Assets/Plugins/CivPresenter.dll.mdb.meta

 fileFormatVersion: 2
-guid: 20c8b15f5d160ae46bb184ebb97e7b8c
+guid: 6a8889dbf5fa24711849885ae0808e43
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Plugins/CivPresenter.dll.meta

+fileFormatVersion: 2
+guid: 487ce1db678fa461780559050101f9cf
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/CivPresenter.xml.meta

+fileFormatVersion: 2
+guid: a4dac1e0564804a758c22cd3f7e0e63d
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/EndingMgr.cs

-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
 public class EndingMgr : MonoBehaviour {
+
+    public static EndingMgr instance = null;
 
-    public static EndingMgr instance = null;
-
-    public Image EndingImage;
-    public Sprite ImageSprite;
-
-
+    public Image EndingImage;
+    public Sprite ImageSprite;
+
+
     void Awake() {
-        if (instance == null)
-            instance = this;
-        else if (instance != this)
-            Destroy(gameObject);
-
+        if (instance == null)
+            instance = this;
+        else if (instance != this)
+            Destroy(gameObject);
+
         DontDestroyOnLoad(gameObject);
     }
     // Use this for initialization
-    void Start () {
-        EndingImage.sprite = ImageSprite;
-        ChangeSprite();
-	}
-	
-	// Update is called once per frame
-	void Update () {
-		
-	}
-
-    public void ChangeSprite()
-    {
-        if (GameManager.Instance.Game.PlayerInTurn.IsVictoried)
-        {
-            if (GameManager.Instance.Game.PlayerInTurn == GameManager.Instance.Game.Players[0])
-            {
-                ImageSprite = Resources.Load<Sprite>("Endings/Hwan_ending");
-            }
-            else
-            {
-                ImageSprite = Resources.Load<Sprite>("Endings/Finno_ending");
-            }
-        }
-        else if (GameManager.Instance.Game.PlayerInTurn.IsDefeated)
-        {
-            if (GameManager.Instance.Game.PlayerInTurn == GameManager.Instance.Game.Players[0])
-            {
-                ImageSprite = Resources.Load<Sprite>("Endings/Finno_ending");
-            }
-            else
-            {
-                EndingMgr.instance.ImageSprite = Resources.Load<Sprite>("Endings/Hwan_ending");
-            }
-        }
-        else if (GameManager.Instance.Game.PlayerInTurn.IsDrawed)
-        {
-            EndingMgr.instance.ImageSprite = Resources.Load<Sprite>("Endings/Draw_ending");
-        }
-    }
-}
+    void Start () {
+        EndingImage.sprite = ImageSprite;
+        ChangeSprite();
+	}
+	
+	// Update is called once per frame
+	void Update () {
+		
+	}
+
+    public void ChangeSprite()
+    {
+        if (GameManager.Instance.Game.PlayerInTurn.IsVictoried)
+        {
+            if (GameManager.Instance.Game.PlayerInTurn == GameManager.Instance.Game.Players[0])
+            {
+                ImageSprite = Resources.Load<Sprite>("Endings/Hwan_ending");
+            }
+            else
+            {
+                ImageSprite = Resources.Load<Sprite>("Endings/Finno_ending");
+            }
+        }
+        else if (GameManager.Instance.Game.PlayerInTurn.IsDefeated)
+        {
+            if (GameManager.Instance.Game.PlayerInTurn == GameManager.Instance.Game.Players[0])
+            {
+                ImageSprite = Resources.Load<Sprite>("Endings/Finno_ending");
+            }
+            else
+            {
+                EndingMgr.instance.ImageSprite = Resources.Load<Sprite>("Endings/Hwan_ending");
+            }
+        }
+        else if (GameManager.Instance.Game.PlayerInTurn.IsDrawed)
+        {
+            EndingMgr.instance.ImageSprite = Resources.Load<Sprite>("Endings/Draw_ending");
+        }
+    }
+}

Assets/Script/GameManager.cs

@@ -71,6 +71,9 @@ public class GameManager : MonoBehaviour {
 
     public Camera minimap_camera;
 
+    static List<Quest> AlarmedQuests = new List<Quest>();
+    static List<Production> AlarmedProduction = new List<Production>();
+
 	void Awake() {
 		// Singleton
 		if (_manager != null) {
@@ -601,7 +604,7 @@ public class GameManager : MonoBehaviour {
     {
         while (true)
         {
-            if (!EventSystem.current.IsPointerOverGameObject() && Input.GetMouseButtonDown(0))
+            if (!EventSystem.current.IsPointerOverGameObject() && Input.GetMouseButtonUp(0))
             {
                 if (Instance.selectedTile == null)
                     yield return new WaitUntil(() => Instance.selectedTile != null);
@@ -655,7 +658,6 @@ public class GameManager : MonoBehaviour {
     // Check if there exist quest that have finished.
     public void CheckCompletedQuest()
     {
-        List<Quest> AlarmedQuests = new List<Quest>();
         foreach (Quest qst in GameManager.Instance.Game.PlayerInTurn.Quests)
         {
             switch (qst.Status)
@@ -683,7 +685,6 @@ public class GameManager : MonoBehaviour {
     // Check if there exist production that have finished.
     public void CheckCompletedProduction()
     {
-        List<Production> AlarmedProduction = new List<Production>();
 
         foreach (Production prod in GameManager.Instance.Game.PlayerInTurn.Deployment)
         {

Assets/Script/UI/UIController.cs

@@ -70,7 +70,7 @@ public class UIController : MonoBehaviour {
 		CQQlist.Clear();
 
 		questList = GameManager.Instance.Game.PlayerInTurn.Quests;
-		Debug.Log("Quest: " + questList.Count);
+		// Debug.Log("Quest: " + questList.Count);
 		foreach (Quest qst in questList) {
 			switch (qst.Status) {
 				case QuestStatus.Deployed:

Assets/Script/UI/UIManager.cs

@@ -5,7 +5,6 @@ using UnityEngine.UI;
 using UnityEngine.EventSystems;
 using CivModel;
 using CivModel.Common;
-using System.Text.RegularExpressions;
 using System.Linq;
 
 public class UIManager : MonoBehaviour
@@ -94,13 +93,6 @@ public class UIManager : MonoBehaviour
                 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)
                 {
@@ -429,6 +421,7 @@ public class UIManager : MonoBehaviour
         // SkillButton
         if (GameManager.Instance.selectedActor is CivModel.Actor && GameManager.Instance.selectedActor.Owner == GameManager.Instance.Game.PlayerInTurn)
         {
+            skillSet.SetActive(false);
             if (GameManager.Instance.selectedActor.SpecialActs != null)
             {
                 skillBtn.GetComponent<Button>().interactable = true;

Assets/Script/UltimateMgr.cs

-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using CivModel;
-
-public class UltimateMgr : MonoBehaviour {
-
-	// Use this for initialization
-	void Start () {
-		
-	}
-	
-	// Update is called once per frame
-	void Update () {
-		
-	}
-}
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using CivModel;
+
+public class UltimateMgr : MonoBehaviour {
+
+	// Use this for initialization
+	void Start () {
+		
+	}
+	
+	// Update is called once per frame
+	void Update () {
+		
+	}
+}

Assets/Script/Unit/Unit.cs

@@ -33,11 +33,6 @@ public class Unit : MonoBehaviour
     private CivModel.Terrain.Point?[] _parameterPoints;
     private List<CivModel.Terrain.Point> _skillParameterPoints = new List<CivModel.Terrain.Point>();
 
-    // Use this for initialization
-    void Start()
-    {
-    }
-
     // Change Unit position to given CivModel.Terrain.Point value
     // Default y position is 1.25f
     public void SetPoints(CivModel.Terrain.Point p1)
@@ -133,6 +128,7 @@ public class Unit : MonoBehaviour
                 // Flicker하고 있는 Tile을 선택했을 때
                 if (GameManager.Instance.selectedTile.isFlickering)
                 {
+                    UIManager.Instance.updateSelectedInfo(unitToMove);
                     if (unitToMove.MovingAttackAct != null && unitToMove.MovingAttackAct.IsActable(destPoint))
                     {
                         unitToMove.MovingAttackAct.Act(destPoint);
@@ -157,6 +153,7 @@ public class Unit : MonoBehaviour
                 // Flicker 하지 않는 타일 선택
                 else
                 {
+                    UIManager.Instance.updateSelectedInfo(unitToMove);
                     MoveStateExit();
                     break;
                 }
@@ -240,6 +237,7 @@ public class Unit : MonoBehaviour
                 // Flicker하고 있는 Tile을 선택했을 때
                 if (GameManager.Instance.selectedTile.isFlickering)
                 {
+                    UIManager.Instance.updateSelectedInfo(unitToMove);
                     if (unitToMove.HoldingAttackAct != null && unitToMove.HoldingAttackAct.IsActable(destPoint))
                     {
                         unitToMove.HoldingAttackAct.Act(destPoint);
@@ -251,6 +249,7 @@ public class Unit : MonoBehaviour
                 // Flicker 하지 않는 타일 선택
                 else
                 {
+                    UIManager.Instance.updateSelectedInfo(unitToMove);
                     MoveStateExit();
                     break;
                 }
@@ -325,6 +324,8 @@ public class Unit : MonoBehaviour
             if (_skillParameterPoints.Count != 0)
             {
                 IEnumerator _coroutine = SkillUnit(GameManager.Instance.selectedActor);
+                var _tile = GameManager.Instance.selectedTile;
+                var _gameObject = GameManager.Instance.selectedGameObject;
                 StartCoroutine(_coroutine);
             }
             else
@@ -346,6 +347,7 @@ public class Unit : MonoBehaviour
                 if (GameManager.Instance.selectedTile.isFlickering)
                 {
                     CivModel.Terrain.Point destPoint = GameManager.Instance.selectedPoint;
+                    UIManager.Instance.updateSelectedInfo(unitToSkill);
                     if (unitToSkill.SpecialActs[_currentSkill].IsActable(destPoint))
                     {
                         unitToSkill.SpecialActs[_currentSkill].Act(destPoint);
@@ -362,6 +364,7 @@ public class Unit : MonoBehaviour
                 // Flicker 하지 않는 타일 선택
                 else
                 {
+                    UIManager.Instance.updateSelectedInfo(unitToSkill);
                     SkillStateExit();
                     break;
                 }