Model Updated

모델 업데이트

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

 fileFormatVersion: 2
 guid: ff135e45559e4e54a9a94e32fe80925a
-timeCreated: 1519737123
+timeCreated: 1520003803
 licenseType: Free
 DefaultImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Plugins/Accord.Fuzzy.dll.meta

 fileFormatVersion: 2
 guid: 52c4c52d38c5bd44182e323297f447d3
-timeCreated: 1519736502
+timeCreated: 1520003785
 licenseType: Free
 PluginImporter:
+  externalObjects: {}
   serializedVersion: 2
   iconMap: {}
   executionOrder: {}
   isPreloaded: 0
   isOverridable: 0
   platformData:
-    data:
-      first:
+  - first:
       Any: 
     second:
       enabled: 1
       settings: {}
-    data:
-      first:
+  - first:
       Editor: Editor
     second:
       enabled: 0
       settings:
         DefaultValueInitialized: true
-    data:
-      first:
+  - first:
       Windows Store Apps: WindowsStoreApps
     second:
       enabled: 0

Assets/Plugins/Accord.Fuzzy.xml.meta

 fileFormatVersion: 2
 guid: 2b133cdf5e753fc4ea0eb90f2f64b5a5
-timeCreated: 1519738846
+timeCreated: 1520003797
 licenseType: Free
 TextScriptImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Plugins/Accord.dll.config.meta

 fileFormatVersion: 2
 guid: e0d041702e6ff4f4e83687d4db7c9e25
-timeCreated: 1519738838
+timeCreated: 1520003782
 licenseType: Free
 DefaultImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Plugins/Accord.dll.mdb.meta

 fileFormatVersion: 2
 guid: 826aae33090dd5441944694e652c8e9e
-timeCreated: 1519737123
+timeCreated: 1520003803
 licenseType: Free
 DefaultImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Plugins/Accord.dll.meta

 fileFormatVersion: 2
 guid: 3ef6ac3d70e4a1846a02abdc1b65b36f
-timeCreated: 1519736500
+timeCreated: 1520003784
 licenseType: Free
 PluginImporter:
+  externalObjects: {}
   serializedVersion: 2
   iconMap: {}
   executionOrder: {}
   isPreloaded: 0
   isOverridable: 0
   platformData:
-    data:
-      first:
+  - first:
       Any: 
     second:
       enabled: 1
       settings: {}
-    data:
-      first:
+  - first:
       Editor: Editor
     second:
       enabled: 0
       settings:
         DefaultValueInitialized: true
-    data:
-      first:
+  - first:
       Windows Store Apps: WindowsStoreApps
     second:
       enabled: 0

Assets/Plugins/Accord.xml.meta

 fileFormatVersion: 2
 guid: 8c89d2065368cd84cb2bacb1ae41da8e
-timeCreated: 1519738847
+timeCreated: 1520003797
 licenseType: Free
 TextScriptImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

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

 fileFormatVersion: 2
 guid: 06d1e9b94983c2b43b353b6afc3e4574
-timeCreated: 1519986380
+timeCreated: 1520003803
 licenseType: Free
 DefaultImporter:
   externalObjects: {}

Assets/Plugins/CivModel.AI.dll.meta

 fileFormatVersion: 2
 guid: 694fed3c9c5006f4cb3668450da7621a
-timeCreated: 1519736994
+timeCreated: 1520003786
 licenseType: Free
 PluginImporter:
+  externalObjects: {}
   serializedVersion: 2
   iconMap: {}
   executionOrder: {}
   isPreloaded: 0
   isOverridable: 0
   platformData:
-    data:
-      first:
+  - first:
       Any: 
     second:
       enabled: 1
       settings: {}
-    data:
-      first:
+  - first:
       Editor: Editor
     second:
       enabled: 0
       settings:
         DefaultValueInitialized: true
-    data:
-      first:
+  - first:
       Windows Store Apps: WindowsStoreApps
     second:
       enabled: 0

Assets/Plugins/CivModel.AI.xml.meta

 fileFormatVersion: 2
 guid: 91e8602f782f37648b45ecaca605ee48
-timeCreated: 1519738847
+timeCreated: 1520003797
 licenseType: Free
 TextScriptImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

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

 fileFormatVersion: 2
 guid: 14316eefeff7b8c4882dee9cb31df5f1
-timeCreated: 1519986380
+timeCreated: 1520003803
 licenseType: Free
 DefaultImporter:
   externalObjects: {}

Assets/Plugins/CivModel.Common.dll.meta

 fileFormatVersion: 2
 guid: f827a99d5e4488648bcb0d0b5b6a4ed2
-timeCreated: 1519736996
+timeCreated: 1520003791
 licenseType: Free
 PluginImporter:
+  externalObjects: {}
   serializedVersion: 2
   iconMap: {}
   executionOrder: {}
   isPreloaded: 0
   isOverridable: 0
   platformData:
-    data:
-      first:
+  - first:
       Any: 
     second:
       enabled: 1
       settings: {}
-    data:
-      first:
+  - first:
       Editor: Editor
     second:
       enabled: 0
       settings:
         DefaultValueInitialized: true
-    data:
-      first:
+  - first:
       Windows Store Apps: WindowsStoreApps
     second:
       enabled: 0

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

 fileFormatVersion: 2
-guid: 612aaaa3eb4457c4f85ae9548b65ad21
-timeCreated: 1519737123
+guid: 52d4b4bcbfe43994e999b8f5be390d82
+timeCreated: 1520003984
 licenseType: Free
 DefaultImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Plugins/CivModel.Finno.dll.meta

 fileFormatVersion: 2
-guid: 94a0800fdbb2b2e479c213e8f006fb73
-timeCreated: 1519736995
+guid: 239c20e7db84c5347aad669b9ef2d5cf
+timeCreated: 1520003972
 licenseType: Free
 PluginImporter:
+  externalObjects: {}
   serializedVersion: 2
   iconMap: {}
   executionOrder: {}
   isPreloaded: 0
   isOverridable: 0
   platformData:
-    data:
-      first:
+  - first:
       Any: 
     second:
       enabled: 1
       settings: {}
-    data:
-      first:
+  - first:
       Editor: Editor
     second:
       enabled: 0
       settings:
         DefaultValueInitialized: true
-    data:
-      first:
+  - first:
       Windows Store Apps: WindowsStoreApps
     second:
       enabled: 0

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

 fileFormatVersion: 2
-guid: 16f11d790a8122d4fae055c4bff69fa5
-timeCreated: 1519737123
+guid: 43a349a478a56d34f81309845b5fd7ca
+timeCreated: 1520003984
 licenseType: Free
 DefaultImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Plugins/CivModel.Hwan.dll.meta

 fileFormatVersion: 2
-guid: 26d5a9518d4356943818513438479470
-timeCreated: 1519736993
+guid: 59b8301ca866d8f48b782a6e896817c1
+timeCreated: 1520003973
 licenseType: Free
 PluginImporter:
+  externalObjects: {}
   serializedVersion: 2
   iconMap: {}
   executionOrder: {}
   isPreloaded: 0
   isOverridable: 0
   platformData:
-    data:
-      first:
+  - first:
       Any: 
     second:
       enabled: 1
       settings: {}
-    data:
-      first:
+  - first:
       Editor: Editor
     second:
       enabled: 0
       settings:
         DefaultValueInitialized: true
-    data:
-      first:
+  - first:
       Windows Store Apps: WindowsStoreApps
     second:
       enabled: 0

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

+fileFormatVersion: 2
+guid: 9cd8c45234b33194ab238aa2797329af
+timeCreated: 1520003984
+licenseType: Free
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/CivModel.Quest.dll.meta

+fileFormatVersion: 2
+guid: e96c73f91fb507349ad915451cd3b1a7
+timeCreated: 1520003974
+licenseType: Free
+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/CivModel.Zap.dll.mdb.meta

+fileFormatVersion: 2
+guid: f800f112e738c91408b1c549735a7597
+timeCreated: 1520003984
+licenseType: Free
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/CivModel.Zap.dll.meta

+fileFormatVersion: 2
+guid: 748cfc4bc8630ed4dbdf3f03af1de1f7
+timeCreated: 1520003974
+licenseType: Free
+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/CivModel.dll.mdb.meta

 fileFormatVersion: 2
 guid: 51a4ccfc53e3bd3489fedcd4adb9e458
-timeCreated: 1519986380
+timeCreated: 1520003803
 licenseType: Free
 DefaultImporter:
   externalObjects: {}

Assets/Plugins/CivModel.dll.meta

 fileFormatVersion: 2
 guid: 8deb64f2df3d02a45a45ef02887bb4cc
-timeCreated: 1519736995
+timeCreated: 1520003787
 licenseType: Free
 PluginImporter:
+  externalObjects: {}
   serializedVersion: 2
   iconMap: {}
   executionOrder: {}
   isPreloaded: 0
   isOverridable: 0
   platformData:
-    data:
-      first:
+  - first:
       Any: 
     second:
       enabled: 1
       settings: {}
-    data:
-      first:
+  - first:
       Editor: Editor
     second:
       enabled: 0
       settings:
         DefaultValueInitialized: true
-    data:
-      first:
+  - first:
       Windows Store Apps: WindowsStoreApps
     second:
       enabled: 0

Assets/Plugins/CivModel.xml

@@ -661,6 +661,12 @@
             The factory object of this instance.
             </summary>
         </member>
+        <member name="M:CivModel.IGameScheme.OnAfterInitialized(CivModel.Game)">
+            <summary>
+            Called after the game is initialized.
+            </summary>
+            <param name="game">The <see cref="T:CivModel.Game"/> object.</param>
+        </member>
         <member name="T:CivModel.IGameStartupScheme">
             <summary>
             The interface represents <see cref="T:CivModel.IGameScheme"/> for startup settings.
@@ -1997,7 +2003,7 @@
             Gets the applied exclusive scheme.
             </summary>
             <typeparam name="T">The type of exclusive scheme.</typeparam>
-            <returns>The applied scheme</returns>
+            <returns>The applied scheme. <c>null</c> if there is no scheme of given type.</returns>
         </member>
         <member name="M:CivModel.SchemeLoader.GetOverlappableScheme``1">
             <summary>

Assets/Plugins/CivModel.xml.meta

 fileFormatVersion: 2
 guid: 2413c1b1e7b93b84a957f43c0249b262
-timeCreated: 1519738846
+timeCreated: 1520003797
 licenseType: Free
 TextScriptImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Plugins/FSharp.Core.dll.meta

 fileFormatVersion: 2
 guid: 217df20479bf25f4d875219899eec26d
-timeCreated: 1519736656
+timeCreated: 1520003783
 licenseType: Free
 PluginImporter:
+  externalObjects: {}
   serializedVersion: 2
   iconMap: {}
   executionOrder: {}
   isPreloaded: 0
   isOverridable: 0
   platformData:
-    data:
-      first:
+  - first:
       Any: 
     second:
       enabled: 1
       settings: {}
-    data:
-      first:
+  - first:
       Editor: Editor
     second:
       enabled: 0
       settings:
         DefaultValueInitialized: true
-    data:
-      first:
+  - first:
       Windows Store Apps: WindowsStoreApps
     second:
       enabled: 0

Assets/Plugins/FSharp.Core.xml.meta

 fileFormatVersion: 2
 guid: 82052a2180f59a54b897f737ddd0432a
-timeCreated: 1519738846
+timeCreated: 1520003797
 licenseType: Free
 TextScriptImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Plugins/System.ValueTuple.dll.meta

 fileFormatVersion: 2
 guid: e60396c5e7648224598d445fc0f9f2e4
-timeCreated: 1519736659
+timeCreated: 1520003788
 licenseType: Free
 PluginImporter:
+  externalObjects: {}
   serializedVersion: 2
   iconMap: {}
   executionOrder: {}
   isPreloaded: 0
   isOverridable: 0
   platformData:
-    data:
-      first:
+  - first:
       Any: 
     second:
       enabled: 1
       settings: {}
-    data:
-      first:
+  - first:
       Editor: Editor
     second:
       enabled: 0
       settings:
         DefaultValueInitialized: true
-    data:
-      first:
+  - first:
       Windows Store Apps: WindowsStoreApps
     second:
       enabled: 0

Assets/Plugins/System.ValueTuple.xml.meta

 fileFormatVersion: 2
 guid: 7df5f73f906b83643996e151578c943d
-timeCreated: 1519738846
+timeCreated: 1520003797
 licenseType: Free
 TextScriptImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Plugins/ko.meta

@@ -4,6 +4,7 @@ folderAsset: yes
 timeCreated: 1519738838
 licenseType: Free
 DefaultImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Plugins/ko/FSharp.Core.resources.dll.meta

 fileFormatVersion: 2
 guid: f1cdfb9a65019044284f960a4eca40f9
-timeCreated: 1519738841
+timeCreated: 1520003790
 licenseType: Free
 PluginImporter:
+  externalObjects: {}
   serializedVersion: 2
   iconMap: {}
   executionOrder: {}
   isPreloaded: 0
   isOverridable: 0
   platformData:
-    data:
-      first:
+  - first:
       Any: 
     second:
       enabled: 1
       settings: {}
-    data:
-      first:
+  - first:
       Editor: Editor
     second:
       enabled: 0
       settings:
         DefaultValueInitialized: true
-    data:
-      first:
+  - first:
       Windows Store Apps: WindowsStoreApps
     second:
       enabled: 0

Assets/Scripts/UIManager.cs

@@ -20,6 +20,7 @@ public class UIManager : MonoBehaviour {
     public Text Labor;
 
     public GameObject UnitInfo;
+    public Image UnitPortrait;
     public Text UnitName;
     public Text UnitAttack;
     public Text UnitDefence;
@@ -98,7 +99,8 @@ public class UIManager : MonoBehaviour {
         if (GameManager.I.SelectedActor != null)
         {
             UnitInfo.SetActive(true);
-            //UnitPortrait.sprite = Resources.Load<Sprite>("Hwan Units/Portraits/hwan_jedi.png");
+            //GameManager.I.SelectedActor.player
+            //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();

civiii-model-proto @ bbd78e8b

-Subproject commit ac5ef696bdb34f377882f9279e12de1864fe7174
+Subproject commit bbd78e8be6c0c154dd4758e7aef115666a257689