Non-resource assets for final revision

Assets/Plugins/CivObservable.xml

@@ -157,6 +157,167 @@
              provides the feature about fixed/observable event
             </summary>
         </member>
+        <member name="T:CivObservable.NotifyingLinkedList`1">
+            <summary>
+            Represents a linked list that notifies its modification.
+            </summary>
+            <typeparam name="T">The type of elements.</typeparam>
+        </member>
+        <member name="M:CivObservable.NotifyingLinkedList`1.#ctor(System.Action)">
+            <summary>
+            Initializes a new instance of the <see cref="T:CivObservable.NotifyingLinkedList`1"/> class.
+            </summary>
+            <param name="notifyHandler">the handler to call on notification.</param>
+        </member>
+        <member name="M:CivObservable.NotifyingLinkedList`1.Contains(`0)">
+            <summary>
+            <see cref="T:System.Collections.Generic.ICollection`1" />에 항목을 추가합니다.
+            </summary>
+            <param name="item"><see cref="T:System.Collections.Generic.ICollection`1" />에 추가할 개체입니다.</param>
+        </member>
+        <member name="M:CivObservable.NotifyingLinkedList`1.CopyTo(`0[],System.Int32)">
+            <summary>
+            특정 <see cref="T:System.Collections.Generic.ICollection`1" /> 인덱스부터 시작하여 <see cref="T:System.Array" />의 요소를 <see cref="T:System.Array" />에 복사합니다.
+            </summary>
+            <param name="array"><see cref="T:System.Array" />에서 복사한 요소의 대상인 일차원 <see cref="T:System.Collections.Generic.ICollection`1" />입니다.
+            <see cref="T:System.Array" />에는 0부터 시작하는 인덱스가 있어야 합니다.</param>
+            <param name="index"><paramref name="array" />에서 복사가 시작되는 0부터 시작하는 인덱스입니다.</param>
+            <exception cref="T:System.ArgumentNullException">array</exception>
+            <exception cref="T:System.ArgumentOutOfRangeException">arrayIndex - arrayIndex is less than 0</exception>
+            <exception cref="T:System.ArgumentException">The available space from arrayIndex to the end of the destination array is not enough</exception>
+        </member>
+        <member name="M:CivObservable.NotifyingLinkedList`1.Find(`0)">
+            <summary>
+            Finds the specified value.
+            </summary>
+            <param name="value">The value.</param>
+            <returns></returns>
+        </member>
+        <member name="M:CivObservable.NotifyingLinkedList`1.FindLast(`0)">
+            <summary>
+            Finds the last.
+            </summary>
+            <param name="value">The value.</param>
+            <returns></returns>
+        </member>
+        <member name="M:CivObservable.NotifyingLinkedList`1.GetEnumerator">
+            <summary>
+            컬렉션을 반복하는 열거자를 반환합니다.
+            </summary>
+            <returns>
+            컬렉션을 반복하는 데 사용할 수 있는 열거자입니다.
+            </returns>
+        </member>
+        <member name="P:CivObservable.NotifyingLinkedList`1.Last">
+            <summary>
+            Gets the last.
+            </summary>
+            <value>
+            The last.
+            </value>
+        </member>
+        <member name="P:CivObservable.NotifyingLinkedList`1.First">
+            <summary>
+            Gets the first.
+            </summary>
+            <value>
+            The first.
+            </value>
+        </member>
+        <member name="P:CivObservable.NotifyingLinkedList`1.Count">
+            <summary>
+            <see cref="T:System.Collections.Generic.ICollection`1" />에 포함된 요소 수를 가져옵니다.
+            </summary>
+        </member>
+        <member name="P:CivObservable.NotifyingLinkedList`1.IsReadOnly">
+            <summary>
+            <see cref="T:System.Collections.Generic.ICollection`1" />가 읽기 전용인지 여부를 나타내는 값을 가져옵니다.
+            </summary>
+        </member>
+        <member name="M:CivObservable.NotifyingLinkedList`1.AddAfter(System.Collections.Generic.LinkedListNode{`0},`0)">
+            <summary>
+            Adds the after.
+            </summary>
+            <param name="node">The node.</param>
+            <param name="value">The value.</param>
+            <returns></returns>
+        </member>
+        <member name="M:CivObservable.NotifyingLinkedList`1.AddAfter(System.Collections.Generic.LinkedListNode{`0},System.Collections.Generic.LinkedListNode{`0})">
+            <summary>
+            Adds the after.
+            </summary>
+            <param name="node">The node.</param>
+            <param name="newNode">The new node.</param>
+        </member>
+        <member name="M:CivObservable.NotifyingLinkedList`1.AddBefore(System.Collections.Generic.LinkedListNode{`0},`0)">
+            <summary>
+            Adds the before.
+            </summary>
+            <param name="node">The node.</param>
+            <param name="value">The value.</param>
+            <returns></returns>
+        </member>
+        <member name="M:CivObservable.NotifyingLinkedList`1.AddBefore(System.Collections.Generic.LinkedListNode{`0},System.Collections.Generic.LinkedListNode{`0})">
+            <summary>
+            Adds the before.
+            </summary>
+            <param name="node">The node.</param>
+            <param name="newNode">The new node.</param>
+        </member>
+        <member name="M:CivObservable.NotifyingLinkedList`1.AddFirst(`0)">
+            <summary>
+            Adds the first.
+            </summary>
+            <param name="value">The value.</param>
+            <returns></returns>
+        </member>
+        <member name="M:CivObservable.NotifyingLinkedList`1.AddFirst(System.Collections.Generic.LinkedListNode{`0})">
+            <summary>
+            Adds the first.
+            </summary>
+            <param name="node">The node.</param>
+        </member>
+        <member name="M:CivObservable.NotifyingLinkedList`1.AddLast(`0)">
+            <summary>
+            Adds the last.
+            </summary>
+            <param name="value">The value.</param>
+            <returns></returns>
+        </member>
+        <member name="M:CivObservable.NotifyingLinkedList`1.AddLast(System.Collections.Generic.LinkedListNode{`0})">
+            <summary>
+            Adds the last.
+            </summary>
+            <param name="node">The node.</param>
+        </member>
+        <member name="M:CivObservable.NotifyingLinkedList`1.Clear">
+            <summary>
+            <see cref="T:System.Collections.Generic.ICollection`1" />에서 항목을 모두 제거합니다.
+            </summary>
+        </member>
+        <member name="M:CivObservable.NotifyingLinkedList`1.Remove(`0)">
+            <summary>
+            Removes the specified value.
+            </summary>
+            <param name="value">The value.</param>
+            <returns></returns>
+        </member>
+        <member name="M:CivObservable.NotifyingLinkedList`1.Remove(System.Collections.Generic.LinkedListNode{`0})">
+            <summary>
+            Removes the specified node.
+            </summary>
+            <param name="node">The node.</param>
+        </member>
+        <member name="M:CivObservable.NotifyingLinkedList`1.RemoveFirst">
+            <summary>
+            Removes the first.
+            </summary>
+        </member>
+        <member name="M:CivObservable.NotifyingLinkedList`1.RemoveLast">
+            <summary>
+            Removes the last.
+            </summary>
+        </member>
         <member name="T:CivObservable.Observable`1">
             <summary>
             Represents an object observable by observer interface.

Assets/Prefabs/AlarmContent.prefab

@@ -73,7 +73,6 @@ GameObject:
   - component: {fileID: 114166279479683586}
   - component: {fileID: 114629431975265818}
   - component: {fileID: 114099225236326680}
-  - component: {fileID: 82050683054055120}
   m_Layer: 5
   m_Name: AlarmContent
   m_TagString: AlarmContent
@@ -81,101 +80,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!82 &82050683054055120
-AudioSource:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1957132441411150}
-  m_Enabled: 1
-  serializedVersion: 4
-  OutputAudioMixerGroup: {fileID: 0}
-  m_audioClip: {fileID: 8300000, guid: 78a909749d24541b5a4dde1a4729c375, type: 3}
-  m_PlayOnAwake: 1
-  m_Volume: 0.5
-  m_Pitch: 1
-  Loop: 0
-  Mute: 0
-  Spatialize: 0
-  SpatializePostEffects: 0
-  Priority: 128
-  DopplerLevel: 1
-  MinDistance: 1
-  MaxDistance: 500
-  Pan2D: 0
-  rolloffMode: 0
-  BypassEffects: 0
-  BypassListenerEffects: 0
-  BypassReverbZones: 0
-  rolloffCustomCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 1
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    - serializedVersion: 3
-      time: 1
-      value: 0
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  panLevelCustomCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 0
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  spreadCustomCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 0
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  reverbZoneMixCustomCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 1
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
 --- !u!114 &114099225236326680
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Resources/Terrain/Materials/Materials/hill_texture.mat.meta → Assets/Prefabs/DeployRay.prefab.meta

 fileFormatVersion: 2
-guid: f04e803f8819b574d8fe6e3d96466079
+guid: da51c17b826f7604987e6f1e2cb81dc4
 NativeFormatImporter:
   externalObjects: {}
-  mainObjectFileID: 2100000
+  mainObjectFileID: 100100000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Resources/Terrain/Materials/Materials/ocean_texture 1.mat.meta → Assets/Prefabs/Fog.prefab.meta

 fileFormatVersion: 2
-guid: 67bd9f3dcec70a040b5c1d82951d50b2
+guid: 535e51a65748023489d6fd7c4bff5f1c
 NativeFormatImporter:
   externalObjects: {}
-  mainObjectFileID: 2100000
+  mainObjectFileID: 100100000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Prefabs/Prodcution.prefab

@@ -484,9 +484,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: d716ac8e5646a55448ac141489d12c16, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 2
-    m_MaxSize: 40
+    m_MaxSize: 24
     m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -979,7 +979,7 @@ MonoBehaviour:
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: d716ac8e5646a55448ac141489d12c16, type: 3}
-    m_FontSize: 30
+    m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 0
@@ -1387,6 +1387,6 @@ 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: 0}
+  m_AnchoredPosition: {x: -148.64505, y: 154.51868}
   m_SizeDelta: {x: 890, y: 90}
   m_Pivot: {x: 0, y: 1}

Assets/Prefabs/UltimatePrefab.prefab

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1045459382986280}
+  m_IsPrefabParent: 1
+--- !u!1 &1045459382986280
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224199697647104840}
+  - component: {fileID: 222921207199585318}
+  - component: {fileID: 114913365084626636}
+  - component: {fileID: 114944058923622046}
+  m_Layer: 5
+  m_Name: UltimatePrefab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1146481227971150
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224483068534089476}
+  - component: {fileID: 222710067804861058}
+  - component: {fileID: 114300513938852958}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &114300513938852958
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1146481227971150}
+  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: 12800000, guid: d716ac8e5646a55448ac141489d12c16, type: 3}
+    m_FontSize: 25
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 0
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: ResourceName
+--- !u!114 &114913365084626636
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1045459382986280}
+  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: 0}
+  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: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!114 &114944058923622046
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1045459382986280}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b3477e38f04bb4c4cad021b059cdf5a1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!222 &222710067804861058
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1146481227971150}
+--- !u!222 &222921207199585318
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1045459382986280}
+--- !u!224 &224199697647104840
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1045459382986280}
+  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:
+  - {fileID: 224483068534089476}
+  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: 350, y: 89.1}
+  m_Pivot: {x: 0, y: 1}
+--- !u!224 &224483068534089476
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1146481227971150}
+  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: 224199697647104840}
+  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.000076293945, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}

Assets/Resources/Terrain/Materials/Materials/ocean_texture 2.mat.meta → Assets/Prefabs/UltimatePrefab.prefab.meta

 fileFormatVersion: 2
-guid: 41fdaa9191fe9ed4f82449ff701f76ed
+guid: 51e183b1a606d4cedaa5cf90b8e2d8ee
 NativeFormatImporter:
   externalObjects: {}
-  mainObjectFileID: 2100000
+  mainObjectFileID: 100100000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Prefabs/UnitToProduce.prefab

@@ -283,7 +283,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 57eef24760736f94c81b892da8fa4718, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  unitInfoText: {fileID: 0}
 --- !u!114 &114305620023846986
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -757,7 +756,7 @@ 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: 0}
+  m_AnchoredPosition: {x: -162.06384, y: 482.05267}
   m_SizeDelta: {x: 640, y: 90}
   m_Pivot: {x: 0, y: 1}
 --- !u!224 &224411969505313536

Assets/Prefabs/hextile.prefab.meta

@@ -2,7 +2,7 @@ fileFormatVersion: 2
 guid: ef12b8f6d512e104b979d4a75f3e60c0
 NativeFormatImporter:
   externalObjects: {}
-  mainObjectFileID: 100100000
+  mainObjectFileID: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Scenes/Intro.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657898, g: 0.496413, b: 0.5748175, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -356,6 +356,130 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 948563886}
+--- !u!1 &1017155716
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 1017155718}
+  - component: {fileID: 1017155717}
+  m_Layer: 0
+  m_Name: BGM
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!82 &1017155717
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1017155716}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 8300000, guid: 566383e9ed5c2684899aa73b82735388, type: 3}
+  m_PlayOnAwake: 1
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 1
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+--- !u!4 &1017155718
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1017155716}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 587.17096, y: 357.30228, z: 246.125}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1045975245
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scenes/Loading.unity

@@ -140,7 +140,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 17a69fe1b2d304c64aaa0d2f7824b1dc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  progressBar: {fileID: 1155206179}
+  HwanprogressBar: {fileID: 1155206179}
+  FinnoprogressBar: {fileID: 1920196082}
+  progressBar: {fileID: 0}
 --- !u!4 &120043004
 Transform:
   m_ObjectHideFlags: 0
@@ -338,6 +340,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1155206178}
+  - {fileID: 1920196081}
   m_Father: {fileID: 954953868}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -390,7 +393,7 @@ GameObject:
   - component: {fileID: 1155206180}
   - component: {fileID: 1155206179}
   m_Layer: 5
-  m_Name: Image
+  m_Name: HwanImage
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -512,6 +515,74 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!1 &1920196080
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 1920196081}
+  - component: {fileID: 1920196083}
+  - component: {fileID: 1920196082}
+  m_Layer: 5
+  m_Name: FinnoImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1920196081
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1920196080}
+  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: 1119985966}
+  m_RootOrder: 1
+  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 &1920196082
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1920196080}
+  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: 21300000, guid: 40f0611053c667e43bb0cf81df72877f, type: 3}
+  m_Type: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 0
+  m_FillAmount: 0
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!222 &1920196083
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1920196080}
 --- !u!1 &1935237765
 GameObject:
   m_ObjectHideFlags: 0

Assets/Script/Camera/CameraControl.cs

@@ -28,14 +28,15 @@ public class CameraControl : MonoBehaviour {
     // Update is called once per frame
     void Update()
     {
-
+		//The earth is round
         if (Camera.main.transform.position.x < 0)
             Camera.main.transform.position = new Vector3(Camera.main.transform.position.x + Mathf.Sqrt(3) * GameManager.Instance.Game.Terrain.Width, Camera.main.transform.position.y, Camera.main.transform.position.z);
         if (Camera.main.transform.position.x > Mathf.Sqrt(3) * GameManager.Instance.Game.Terrain.Width)
             Camera.main.transform.position = new Vector3(Camera.main.transform.position.x - Mathf.Sqrt(3) * GameManager.Instance.Game.Terrain.Width, Camera.main.transform.position.y, Camera.main.transform.position.z);
 
-        if (!QuestUI.activeSelf && !ManagementUI.activeSelf)
+        if (!QuestUI.activeSelf && !ManagementUI.activeSelf && !UIManager.Instance.isTutorialActivated && !UIManager.Instance.AskToQuit.activeSelf)
         {
+			//Camera scaler
             if (Input.GetAxis("Mouse ScrollWheel") < 0 && ViewFieldSquareControl.ViewInstance.zoom_counter < 2)
             {
                 if (!EventSystem.current.IsPointerOverGameObject())
@@ -49,15 +50,13 @@ public class CameraControl : MonoBehaviour {
             }
 
 
-
+			//Camera movement by putting mouse on edge
             if (Input.mousePosition.x > screen_width - boundary && !Input.GetMouseButton(0))
                 Camera.main.transform.Translate(5 * speed * Time.deltaTime, 0, 0);
 
             if (Input.mousePosition.x < 0 + boundary && !Input.GetMouseButton(0))
                 Camera.main.transform.Translate(-5 * speed * Time.deltaTime, 0, 0);
 
-
-
             if (Input.mousePosition.y > screen_height - boundary && !Input.GetMouseButton(0))
             {
                 if (Camera.main.transform.position.z < -10 - (Camera.main.transform.position.y - 10) / Mathf.Sqrt(3))
@@ -66,26 +65,26 @@ public class CameraControl : MonoBehaviour {
             else if (Camera.main.transform.position.z > -10 - (Camera.main.transform.position.y - 10) / Mathf.Sqrt(3))
                 Camera.main.transform.position = new Vector3(Camera.main.transform.position.x, Camera.main.transform.position.y, -10 - (Camera.main.transform.position.y - 10) / Mathf.Sqrt(3));
 
-
-
             if (Input.mousePosition.y < 0 + boundary && !Input.GetMouseButton(0))
             {
-                if (Camera.main.transform.position.z > -130)
+                if (Camera.main.transform.position.z > -95)
                     Camera.main.transform.Translate(0, -3 * speed * Time.deltaTime * Mathf.Sqrt(2), -3 * speed * Time.deltaTime * Mathf.Sqrt(2));
             }
-            else if (Camera.main.transform.position.z < -130)
-                Camera.main.transform.position = new Vector3(Camera.main.transform.position.x, Camera.main.transform.position.y, -130);
+            else if (Camera.main.transform.position.z < -95)
+                Camera.main.transform.position = new Vector3(Camera.main.transform.position.x, Camera.main.transform.position.y, -95);
 
+			//Camera movement by mouse dragging
             if (Input.GetMouseButton(1) && !EventSystem.current.IsPointerOverGameObject())
             {
                 mouse_position = new Vector3(Input.GetAxis("Mouse X"), 0, Input.GetAxis("Mouse Y"));
                 Camera.main.transform.position -= mouse_position;
             }
 
+			//Camera movement by clicking minimap
             if (is_mouse_on_minimap() && MapUI.activeSelf)
             {
                 float adjust_by_zoom;
-                adjust_by_zoom = 24.5f - (2 - ViewFieldSquareControl.ViewInstance.zoom_counter) * 6;
+                adjust_by_zoom = 35 - (2 - ViewFieldSquareControl.ViewInstance.zoom_counter) * 8;
 
                 if (Input.GetMouseButton(0))
                 {

Assets/Script/EndingMgr.cs

@@ -17,7 +17,7 @@ public class EndingMgr : MonoBehaviour {
         else if (instance != this)
             Destroy(gameObject);
 
-        DontDestroyOnLoad(gameObject);
+        //DontDestroyOnLoad(gameObject);
     }
     // Use this for initialization
     void Start () {

Assets/Script/GameStarter.cs

@@ -14,12 +14,6 @@ public class GameStarter : MonoBehaviour
         GameInfo.SetPlayer(CivModel.Hwan.HwanPlayerNumber.Number);
     }
 
-    // Update is called once per frame
-    void Update()
-    {
-
-    }
-
     public void StartHwan()
     {
         GameInfo.SetPlayer(CivModel.Hwan.HwanPlayerNumber.Number);

Assets/Script/Loading/LoadingSceneMgr.cs

@@ -10,10 +10,14 @@ public class LoadingSceneMgr : MonoBehaviour
     public static string nextScene;
 
     [SerializeField]
-    Image progressBar;
+    Image HwanprogressBar, FinnoprogressBar, progressBar;
 
     private void Start()
     {
+		if (GameInfo.UserPlayer == 0)
+			progressBar = HwanprogressBar;
+		else
+			progressBar = FinnoprogressBar;
         StartCoroutine(LoadScene());
     }
 

Assets/Script/QuestInfo.cs

@@ -17,7 +17,7 @@ public class QuestInfo : MonoBehaviour {
 	}
 
 	static public string GetRequesterCountry(Quest qst) {
-        return qst.Requester.PlayerName;
+        return qst.Requester?.PlayerName ?? "(없음)";
 	}
 
     static public string GetQuestName(Quest qst)
@@ -64,9 +64,49 @@ public class QuestInfo : MonoBehaviour {
         {
             questName = "finno_main1";
         }
+        else if(qst is QuestHwanTuto1)
+        {
+            questName = "hwan_tuto1";
+        }
+        else if(qst is QuestHwanTuto2)
+        {
+            questName = "hwan_tuto2";
+        }
+        else if(qst is QuestHwanTuto3)
+        {
+            questName = "hwan_tuto3";
+        }
+        else if(qst is QuestHwanTuto4)
+        {
+            questName = "hwan_tuto4";
+        }
+        else if(qst is QuestHwanTuto5)
+        {
+            questName = "hwan_tuto5";
+        }
+        else if(qst is QuestFinnoTuto1)
+        {
+            questName = "finno_tuto1";
+        }
+        else if (qst is QuestFinnoTuto2)
+        {
+            questName = "finno_tuto2";
+        }
+        else if (qst is QuestFinnoTuto3)
+        {
+            questName = "finno_tuto3";
+        }
+        else if (qst is QuestFinnoTuto4)
+        {
+            questName = "finno_tuto4";
+        }
+        else if (qst is QuestFinnoTuto5)
+        {
+            questName = "finno_tuto5";
+        }
         else
         {
-            questName = "hwan_main1";
+            questName = "invisible";
             Debug.Log("Unknown Quest: " + qst.TextName);
         }
 
@@ -78,6 +118,42 @@ public class QuestInfo : MonoBehaviour {
 		return Resources.Load<Sprite>("Quests/" + questName);
 	}
 
+    static public Sprite GetRequesterPortraitImage(Quest qst) {
+        if (qst.Requester == null)
+            return Resources.Load<Sprite>("Quests/lemuria");
+
+        int requesterNumber = qst.Requester.PlayerNumber;
+        string requesterName = "";
+
+        switch (requesterNumber)
+        {
+            case 0:
+                requesterName = "hwan"; break;
+            case 1:
+                requesterName = "finno"; break;
+            case 2:
+                requesterName = "egypt"; break;
+            case 3:
+                requesterName = "atlantis"; break;
+            case 4:
+                requesterName = "fish"; break;
+            case 5:
+                requesterName = "emu"; break;
+            case 6:
+                requesterName = "shied"; break;
+            case 7:
+                requesterName = "lemuria"; break;
+            case 8:
+                requesterName = "easter"; break;
+            default:
+                requesterName = GetQuestName(qst);
+                Debug.Log("Unknown Requester");
+                break;
+        }
+        return Resources.Load<Sprite>("Quests/" + requesterName);
+    }
+    
+
     static public Sprite GetExplainImage(Quest qst)
     {
         string questName = GetQuestName(qst);
@@ -88,4 +164,6 @@ public class QuestInfo : MonoBehaviour {
 		return "";
 	}
 
+    
+
 }

Assets/Script/ResoureInfo.cs

@@ -108,8 +108,8 @@ public class ResourceInfo : MonoBehaviour {
         }
         else
         {
-            resourceSpriteName = "finno_crystal";
-            Debug.Log("Unknown Quest: " + qst.TextName);
+            resourceSpriteName = "questionmark";
+            //Debug.Log("Unknown Quest: " + qst.TextName);
         }
         return Resources.Load<Sprite>("SpecialResource/" + resourceSpriteName);
     }

Assets/Script/Tile/HexTile.cs

@@ -31,42 +31,8 @@ public class HexTile : MonoBehaviour
 	void Start() {
         SetTerrain();
 		SetBuilding();
-        SetColor();
-        terrains.GetChild((int)point.Type).GetComponent<Renderer>().material.color += color;
     }
     
-    //Set tile's color depending on owner.
-    private void SetColor()
-    {
-        var owner = point.TileOwner;
-        if (owner == GameManager.Instance.Game.Players[0])
-            color = Color.red / 2;
-        else if (owner == GameManager.Instance.Game.Players[1])
-            color = Color.blue * 1.5f;
-        else if (owner == GameManager.Instance.Game.Players[2])
-            color = Color.yellow / 3;
-        else if (owner == GameManager.Instance.Game.Players[3])
-            color = Color.cyan / 3;
-        else if (owner == GameManager.Instance.Game.Players[4])
-            color = Color.gray;
-        else if (owner == GameManager.Instance.Game.Players[5])
-            color = Color.magenta;
-        else if (owner == GameManager.Instance.Game.Players[6])
-            color = Color.magenta * 2;
-        else if (owner == GameManager.Instance.Game.Players[7])
-            color = Color.yellow / 2;
-        else if (owner == GameManager.Instance.Game.Players[8])
-            color = Color.green / 2;
-        else
-            color = new Color(0, 0, 0, 0);
-    }
-
-    public void UpdateColor()
-    {
-        terrains.GetChild((int)point.Type).GetComponent<Renderer>().material.color -= color;
-        SetColor();
-        terrains.GetChild((int)point.Type).GetComponent<Renderer>().material.color += color;
-    }
     // Change Tile position to given CivModel.Terrain.Point value
     // Default y position is -.0.05f
     public void SetPoints(CivModel.Terrain.Point p1) {
@@ -81,14 +47,12 @@ public class HexTile : MonoBehaviour
 
 	// Render Tile Terrain
 	public void SetTerrain() {
-        terrains = transform.GetChild(0).transform;
-		if (terrains != null) {
-            foreach (Transform child in terrains) {
-                child.gameObject.SetActive(false);
-            }
-
-			terrains.GetChild((int)point.Type).gameObject.SetActive(true);
-		}
+        int type = (int)point.Type;
+        int owner = GetPlayerNumber();
+        for(int i = 0; i < 8; i++)
+            for(int j = 0; j < 10; j++)
+                transform.GetChild(0).GetChild(i).GetChild(j).gameObject.SetActive(false);
+        transform.GetChild(0).GetChild(type).GetChild(owner).gameObject.SetActive(true);
 	}
 
     // Render Tile Building
@@ -134,13 +98,33 @@ public class HexTile : MonoBehaviour
 			side = buildings.GetChild(1);
 			side.GetChild(4).gameObject.SetActive(true);
 		}
+        else if(building is CivModel.Hwan.Preternaturality) {
+            side = buildings.GetChild(0);
+            side.GetChild(5).gameObject.SetActive(true);
+        }
+        else if(building is CivModel.Finno.Preternaturality) {
+            side = buildings.GetChild(0);
+            side.GetChild(5).gameObject.SetActive(true);
+        }
+	}
+
+    // Set player number which model didn't implemented
+    public int GetPlayerNumber()
+    {
+        var owner = point.TileOwner;
+        if (owner == null) return 9;
+        else
+            for (int i = 0; i < 9; i++)
+                if (owner == GameManager.Instance.Game.Players[i])
+                    return i;
+        return 9;
     }
 
     // Flicker Tile with White Color
     public void FlickerWhite()
     {
         isFlickerForSelect = true;
-        if (terrains.GetChild((int)point.Type).GetComponent<Renderer>() == null)
+        if (transform.GetChild(0).GetChild((int)point.Type).GetChild(GetPlayerNumber()).GetComponent<Renderer>() == null)
             return;
         _coroutine = Flicker(Color.white);
         StartCoroutine(_coroutine);
@@ -149,7 +133,7 @@ public class HexTile : MonoBehaviour
     public void FlickerCyan() {
         isFlickerForSelect = true;
         //Debug.Log(gameObject.name + " is flickering with cyan");
-		if (terrains.GetChild((int)point.Type).GetComponent<Renderer>() == null)
+        if (transform.GetChild(0).GetChild((int)point.Type).GetChild(GetPlayerNumber()).GetComponent<Renderer>() == null)
             return;
 		_coroutine = Flicker(Color.cyan);
 		StartCoroutine(_coroutine);
@@ -159,7 +143,7 @@ public class HexTile : MonoBehaviour
     {
         isFlickering = true;
         //Debug.Log(gameObject.name + " is flickering with blue");
-        if (terrains.GetChild((int)point.Type).GetComponent<Renderer>() == null)
+        if (transform.GetChild(0).GetChild((int)point.Type).GetChild(GetPlayerNumber()).GetComponent<Renderer>() == null)
             return;
         _coroutine = Flicker(Color.blue);
         StartCoroutine(_coroutine);
@@ -170,7 +154,7 @@ public class HexTile : MonoBehaviour
     {
         isFlickering = true;
         //Debug.Log(gameObject.name + " is flickering with red");
-        if (terrains.GetChild((int)point.Type).GetComponent<Renderer>() == null)
+        if (transform.GetChild(0).GetChild((int)point.Type).GetChild(GetPlayerNumber()).GetComponent<Renderer>() == null)
             return;
         _coroutine = Flicker(Color.red);
         StartCoroutine(_coroutine);
@@ -182,20 +166,18 @@ public class HexTile : MonoBehaviour
         isFlickering = false;
         isFlickerForSelect = false;
         //Debug.Log(gameObject.name + " stopped flickering");
-        if (terrains.GetChild((int)point.Type).GetComponent<Renderer>() == null)
+        if (transform.GetChild(0).GetChild((int)point.Type).GetChild(GetPlayerNumber()).GetComponent<Renderer>() == null)
             return;
         if (_coroutine == null)
             return;
         StopCoroutine(_coroutine);
-        Material mat = terrains.GetChild((int)point.Type).GetComponent<Renderer>().material;
-        mat.SetColor("_Color", Color.white);
-        terrains.GetChild((int)point.Type).GetComponent<Renderer>().material.color += color;
+        transform.GetChild(0).GetChild((int)point.Type).GetChild(GetPlayerNumber()).GetComponent<Renderer>().material.SetColor("_Color", Color.white);
     }
 
     // Make tile flicker with color c.
     IEnumerator Flicker(Color c)
     {
-        Material mat = terrains.GetChild((int)point.Type).GetComponent<Renderer>().material;
+        Material mat = transform.GetChild(0).GetChild((int)point.Type).GetChild(GetPlayerNumber()).GetComponent<Renderer>().material;
         Color delta = Color.white - c;
 
         while (true)

Assets/Script/UI/AlarmManager.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 using CivModel;
-using CivModel.Common;
 using System;
 using System.Linq;
 
@@ -22,8 +21,6 @@ public class AlarmManager : MonoBehaviour
     public AudioClip alarmSound;
     AudioSource alarmAudio;
 
-    int rowCount = 0;
-
     void Awake()
     {
         // Singleton
@@ -48,10 +45,13 @@ public class AlarmManager : MonoBehaviour
     void ActiveAlarm()
     {
         if (alarmViewPort.transform.childCount <= 0)
+        {
             alarmTab.SetActive(false);
+        }
         else
         {
             alarmTab.SetActive(true);
+            PlayAlarmSound();
         }
     }
 
@@ -83,13 +83,9 @@ public class AlarmManager : MonoBehaviour
     // Called After a Turn Starts.
     public void updateAlarmQueue()
     {   
-        rowCount = 0;
-
-        alarmViewPort.GetComponent<RectTransform>().sizeDelta = Vector2.zero;
-
-        foreach(Transform alarm in alarmViewPort.GetComponentsInChildren<Transform>().Skip(1))
+        for (int x = alarmViewPort.transform.childCount - 1; x >= 0; x--)
         {
-            Destroy(alarm.gameObject);
+            DeleteAlarm(alarmViewPort.transform.GetChild(x).gameObject);
         }
 
         List<GameObject> alarmToRemove = new List<GameObject>();
@@ -130,13 +126,14 @@ public class AlarmManager : MonoBehaviour
         alarm.transform.SetParent(alarmViewPort.transform, false);
         alarm.GetComponent<AlarmModel>().DispAlarmData(isDied);
 
-        alarmViewPort.GetComponent<GridLayoutGroup>().constraintCount = ++rowCount;
-        alarmViewPort.GetComponent<RectTransform>().sizeDelta += new Vector2(0, 20);
+        //alarmViewPort.GetComponent<GridLayoutGroup>().constraintCount = ++rowCount;
+        //alarmViewPort.GetComponent<RectTransform>().sizeDelta += new Vector2(0, 20);
         ActiveAlarm();
     }
 
     public void PlayAlarmSound()
     {
+        if (alarmAudio.isPlaying) return;
         alarmAudio.PlayOneShot(alarmSound);
     }
 

Assets/Script/UI/CityBuilding.cs

@@ -4,7 +4,6 @@ using UnityEngine;
 using UnityEngine.UI;
 using UnityEngine.EventSystems;
 using CivModel;
-using CivModel.Common;
 using System;
 
 public class CityBuilding : MonoBehaviour

Assets/Script/UI/InvestmentController.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 using CivModel;
-using CivModel.Common;
 
 public class InvestmentController : MonoBehaviour {
 
@@ -13,10 +12,10 @@ public class InvestmentController : MonoBehaviour {
     public GameObject TechInv;
     public GameObject Logistics;
 
-    private Slider taxSlider;
-    private Slider eiSlider;
-    private Slider tiSlider;
-    private Slider logiSlider;
+    public Slider taxSlider;
+    public Slider eiSlider;
+    public Slider tiSlider;
+    public Slider logiSlider;
 
     private Text taxRateText;
     private Text eiRateText;
@@ -116,62 +115,79 @@ public class InvestmentController : MonoBehaviour {
         }
     }
 
+    public void OnValueChanged()
+    {
+        GameUI.Instance.updatePanel();
+    }
+
     public void ChangeTaxValue(float adden)
     {
         taxSlider.value += adden;
+        GameUI.Instance.updatePanel();
     }
     public void ChangeEIValue(float adden)
     {
         eiSlider.value += adden;
+        GameUI.Instance.updatePanel();
     }
     public void ChangeTIValue(float adden)
     {
         tiSlider.value += adden;
+        GameUI.Instance.updatePanel();
     }
     public void ChangeLogiValue(float adden)
     {
         logiSlider.value += adden;
+        GameUI.Instance.updatePanel();
     }
 
     public void ChangeTaxPlus(float adden)
     {
         taxSlider.value += 0.01f;
         if (taxSlider.value > 1) taxSlider.value = 1;
+        GameUI.Instance.updatePanel();
     }
     public void ChangeEIPlus(float adden)
     {
         eiSlider.value += 0.01f;
         if (taxSlider.value > 2) taxSlider.value = 2;
+        GameUI.Instance.updatePanel();
     }
     public void ChangeTIPlus(float adden)
     {
         tiSlider.value += 0.01f;
         if (taxSlider.value > 2) taxSlider.value = 2;
+        GameUI.Instance.updatePanel();
     }
     public void ChangeLogiPlus(float adden)
     {
         logiSlider.value += 0.01f;
         if (taxSlider.value > 1) taxSlider.value = 1;
+        GameUI.Instance.updatePanel();
     }
 
     public void ChangeTaxMinus(float adden)
     {
         taxSlider.value -= 0.01f;
         if (taxSlider.value < 0) taxSlider.value = 0;
+        GameUI.Instance.updatePanel();
     }
     public void ChangeEIMinus(float adden)
     {
         eiSlider.value -= 0.01f;
         if (eiSlider.value < 0) eiSlider.value = 0;
+        GameUI.Instance.updatePanel();
     }
     public void ChangeTIMinus(float adden)
     {
         tiSlider.value -= 0.01f;
         if (taxSlider.value < 0) taxSlider.value = 0;
+        GameUI.Instance.updatePanel();
     }
     public void ChangeLogiMinus(float adden)
     {
         logiSlider.value -= 0.01f;
         if (taxSlider.value < 0) taxSlider.value = 0;
+        GameUI.Instance.updatePanel();
     }
 }
\ No newline at end of file

Assets/Script/UI/ManagementController.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 using CivModel;
-using CivModel.Common;
 using System.Linq;
 
 // 운영/내정 관련 큐 만들어서 프리팹 생성하는 컨트롤러
@@ -14,8 +13,8 @@ public class ManagementController : MonoBehaviour {
 
     public Canvas managementUI;
 
-    private LinkedList<Production> mProduction;
-    private LinkedList<Production> mDeployment;
+    private CivObservable.NotifyingLinkedList<Production> mProduction;
+    private CivObservable.NotifyingLinkedList<Production> mDeployment;
     private IReadOnlyList<IProductionFactory> facList;
 
     private GameObject gameManagerObject;
@@ -45,14 +44,14 @@ public class ManagementController : MonoBehaviour {
         MakeDeploymentQ();
         foreach (GameObject dq in DQlist)
         {
-            dq.GetComponent<DeployPrefab>().SetButton(DQlist.IndexOf(dq));
+            dq.GetComponent<DeployPrefab>().SetButton();
         }
 
     }
 
     void Awake()
     {
-        DontDestroyOnLoad(this);
+        // DontDestroyOnLoad(this);
         if (managementcontroller == null)
         {
             managementcontroller = this;
@@ -199,7 +198,7 @@ public class ManagementController : MonoBehaviour {
                         throw new MissingComponentException();
                 }
                 //Debug.Log("SelectionList: " + ASQlist.IndexOf(qlist) + "null");
-                var SPrefab = Instantiate(productablePrefab, new Vector3(0f, 0f, 0f), Quaternion.identity);
+                var SPrefab = Instantiate(productablePrefab, new Vector3(10f, 0f, 0f), Quaternion.identity);
                 SPrefab.transform.SetParent(productableQueue.transform);
                 SPrefab.transform.localScale = new Vector3(1f, 1f, 1f);
                 SPrefab.transform.localPosition = new Vector3(0f, 0f, 0f);
@@ -216,7 +215,7 @@ public class ManagementController : MonoBehaviour {
         {
             return null;
         }*/
-        var SPrefab = Instantiate(productablePrefab, new Vector3(0f, 0f, 0f), Quaternion.identity);
+        var SPrefab = Instantiate(productablePrefab, new Vector3(10f, 0f, 0f), Quaternion.identity);
         SPrefab.transform.SetParent(productableQueue.transform);
         SPrefab.transform.localScale = new Vector3(1f, 1f, 1f);
         SPrefab.transform.localPosition = new Vector3(0f, 0f, 0f);
@@ -291,7 +290,7 @@ public class ManagementController : MonoBehaviour {
 
         foreach (Production prod in ProductionDic.Keys)
         {
-            var PPrefab = Instantiate(proPrefab, new Vector3(0f, 0f, 0f), Quaternion.identity);
+            var PPrefab = Instantiate(proPrefab, new Vector3(10f, 0f, 0f), Quaternion.identity);
             PPrefab.transform.SetParent(proQueue.transform);
             PPrefab.transform.localScale = new Vector3(1f, 1f, 1f);
             PPrefab.transform.localPosition = new Vector3(0f, 0f, 0f);
@@ -300,7 +299,7 @@ public class ManagementController : MonoBehaviour {
 
         if (mProduction.Count == 0)
         {
-            var PPrefab = Instantiate(proPrefab, new Vector3(0f, 0f, 0f), Quaternion.identity);
+            var PPrefab = Instantiate(proPrefab, new Vector3(10f, 0f, 0f), Quaternion.identity);
             PPrefab.transform.SetParent(proQueue.transform);
             PPrefab.transform.localScale = new Vector3(1f, 1f, 1f);
             PPrefab.transform.localPosition = new Vector3(0f, 0f, 0f);
@@ -350,7 +349,7 @@ public class ManagementController : MonoBehaviour {
 
         foreach (Production prod in DeploymentDic.Keys)
         {
-            var DPrefab = Instantiate(depPrefab, new Vector3(0f, 0f, 0f), Quaternion.identity);
+            var DPrefab = Instantiate(depPrefab, new Vector3(10f, 0f, 0f), Quaternion.identity);
             DPrefab.transform.SetParent(depQueue.transform);
             DPrefab.transform.localScale = new Vector3(1f, 1f, 1f);
             DPrefab.transform.localPosition = new Vector3(0f, 0f, 0f);
@@ -360,7 +359,7 @@ public class ManagementController : MonoBehaviour {
         if (mDeployment.Count == 0)
         {
             //Debug.Log("DeploymentList null");
-            var DPrefab = Instantiate(depPrefab, new Vector3(0f, 0f, 0f), Quaternion.identity);
+            var DPrefab = Instantiate(depPrefab, new Vector3(10f, 0f, 0f), Quaternion.identity);
             DPrefab.transform.SetParent(depQueue.transform);
             DPrefab.transform.localScale = new Vector3(1f, 1f, 1f);
             DPrefab.transform.localPosition = new Vector3(0f, 0f, 0f);
@@ -369,9 +368,10 @@ public class ManagementController : MonoBehaviour {
         }
 
         DQlist = tempList;
+
         foreach (GameObject dq in DQlist)
         {
-            dq.GetComponent<DeployPrefab>().SetButton(DQlist.IndexOf(dq));
+            dq.GetComponent<DeployPrefab>().SetButton();
         }
     }
 
@@ -384,4 +384,20 @@ public class ManagementController : MonoBehaviour {
         }
         return managementcontroller;
     }
+
+	public void onClickAutoSet()
+	{
+		var _player = GameManager.Instance.Game.PlayerInTurn;
+		if(_player.Happiness <= 50)
+		{
+			GameManager.Instance.Game.PlayerInTurn.EconomicInvestmentRatio = 2;
+		}
+		else
+		{
+			GameManager.Instance.Game.PlayerInTurn.EconomicInvestmentRatio = 1;
+		}
+		var _const = GameManager.Instance.Game.Constants;
+		double taxrate = _const.GoldCoefficient;
+	}
+	
 }

Assets/Script/UI/Prefabs/DeployPrefab.cs

@@ -4,11 +4,9 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 using CivModel;
-using CivModel.Common;
 
 public class DeployPrefab : MonoBehaviour
 {
-
     private Text[] textarguments;
     private Image unitPrt;
     private Button[] buttons;
@@ -47,6 +45,7 @@ public class DeployPrefab : MonoBehaviour
 
     public GameObject MakeItem(Production prod, int numOfUnit)
     {
+        _deployment = prod; 
         string nameofProduction = ProductionFactoryTraits.GetFactoryName(prod.Factory);
         unitPrt.sprite = Resources.Load(("Portraits/" + (ProductionFactoryTraits.GetFacPortName(prod.Factory)).ToLower()), typeof(Sprite)) as Sprite;
         this.numOfUnit = numOfUnit;
@@ -68,6 +67,7 @@ public class DeployPrefab : MonoBehaviour
 
     public GameObject MakeItem()
     {
+        _deployment = null;
         unitPrt.enabled = false;
         foreach (Text txt in textarguments)
         {
@@ -93,9 +93,9 @@ public class DeployPrefab : MonoBehaviour
 
     }
 
-    public void SetButton(int i)
+    public void SetButton()
     {
-        if (i == -1)
+        if (_deployment == null)
         {
             foreach (Button but in buttons)
             {
@@ -104,19 +104,14 @@ public class DeployPrefab : MonoBehaviour
         }
         else
         {
-            LinkedListNode<Production> dep = GameManager.Instance.Game.PlayerInTurn.Deployment.First;
-            for (int k = 0; k < i; k++)
-            {
-                dep = dep.Next;
-            }
             foreach (Button but in buttons)
             {
                 switch (but.name)
                 {
                     case "Deploy":
-                        if (dep != null)
+                        if (_deployment != null)
                         {
-                            if (ProductionFactoryTraits.isCityBuilding(dep.Value.Factory))
+                            if (ProductionFactoryTraits.isCityBuilding(_deployment.Factory))
                             {
                                 but.onClick.AddListener(delegate ()
                                 {
@@ -126,7 +121,7 @@ public class DeployPrefab : MonoBehaviour
 
                                     while (nodeToDep != null)
                                     {
-                                        if (ProductionFactoryTraits.GetFactoryName(nodeToDep.Value.Factory) == ProductionFactoryTraits.GetFactoryName(dep.Value.Factory))
+                                        if (ProductionFactoryTraits.GetFactoryName(nodeToDep.Value.Factory) == ProductionFactoryTraits.GetFactoryName(_deployment.Factory))
                                         {
                                             prodToDepList.Add(nodeToDep.Value);
                                         }
@@ -147,7 +142,7 @@ public class DeployPrefab : MonoBehaviour
                     case "IndividualDeploy":
                         but.onClick.AddListener(delegate () {
                             List<Production> prodToDepList = new List<Production>();
-                            prodToDepList.Add(dep.Value);
+                            prodToDepList.Add(_deployment);
                             DeployItem(prodToDepList);
                         });
                         break;

Assets/Script/UI/Prefabs/ProductablePrefab.cs

@@ -4,7 +4,6 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 using CivModel;
-using CivModel.Common;
 using System.Linq;
 using UnityEngine.EventSystems;
 
@@ -96,7 +95,7 @@ public class ProductablePrefab : MonoBehaviour, IPointerClickHandler {
             switch (but.name)
             {
                 case "Deploy":
-                    but.onClick.AddListener(delegate () { ProduceItem(fac); });
+                    but.onClick.AddListener(delegate () { ProduceItem(fac); GameManager.Instance.CheckCompletedQuest(); });
                     break;
                 case "Up":
                     but.onClick.AddListener(delegate () { IncreseProduction(); });

Assets/Script/UI/Prefabs/ProductionPrefab.cs

@@ -4,7 +4,6 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 using CivModel;
-using CivModel.Common;
 
 public class ProductionPrefab : MonoBehaviour {
 

Assets/Script/UI/Prefabs/Quests.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 using CivModel;
-using CivModel.Common;
 
 public class Quests : MonoBehaviour {
 
@@ -51,7 +50,7 @@ public class Quests : MonoBehaviour {
 		foreach (Image img in images) {
 			switch (img.name) {
 				case "Portrait":
-					img.sprite = QuestInfo.GetPortraitImage(quest);
+					img.sprite = QuestInfo.GetRequesterPortraitImage(quest);
 					img.enabled = true;
 					break;
 				case "ResourceImage":
@@ -156,7 +155,7 @@ public class Quests : MonoBehaviour {
 		foreach (Image img in images) {
 			switch (img.name) {
 				case "Portrait":
-					img.sprite = QuestInfo.GetPortraitImage(quest);
+					img.sprite = QuestInfo.GetRequesterPortraitImage(quest);
 					img.enabled = true;
 					break;
 				case "ResourceImage":
@@ -250,7 +249,7 @@ public class Quests : MonoBehaviour {
 		foreach (Image img in images) {
 			switch (img.name) {
 				case "Portrait":
-					img.sprite = QuestInfo.GetPortraitImage(quest);
+					img.sprite = QuestInfo.GetRequesterPortraitImage(quest);
 					img.enabled = true;
 					break;
 				case "ResourceImage":

Assets/Script/UI/Prefabs/SpecialResourcePrefab.cs

@@ -4,7 +4,6 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 using CivModel;
-using CivModel.Common;
 
 public class SpecialResourcePrefab : MonoBehaviour {
     private Text[] textarguments;

Assets/Script/UI/ProductionFactoryTraits.cs

@@ -580,14 +580,18 @@ public class ProductionFactoryTraits : MonoBehaviour
                         result = "hwan_decentralized_soldier";
                     else if (unit.Owner == GameManager.Instance.Game.GetPlayerFinno())
                         result = "finno_decentralized_soldier";
-                    else result = name;
+                    else result = "jap_decentralized_soldier";
                 }
                 break;
             case "JackieChan":
                 result = "hwan_jackie";
                 break;
             case "LEOSpaceArmada":
+                {
+                    if (unit.Owner == GameManager.Instance.Game.GetPlayerHwan())
                         result = "hwan_spaceship";
+                    else result = "jap_spaceship";
+                }
                 break;
             case "ProtoNinja":
                 {
@@ -626,17 +630,57 @@ public class ProductionFactoryTraits : MonoBehaviour
                 result = "finno_genghis";
                 break;
             case "ArmedDivision":
-                result = "기갑사단";
+                result = "jap_armored_division";
                 break;
             case "InfantryDivision":
-                result = "보병사단";
+                result = "jap_infantry_division";
                 break;
             case "Padawan":
-                result = "파다완";
+                result = "jap_padawan";
                 break;
             case "ZapNinja":
-                result = "닌자";
+                result = "jap_pseudo_ninja";
+                break;
+
+            // 2. Normal Buildings
+
+            case "HwanEmpireFIRFortress": // 환 5차산업혁명요새
+                result = "Normal Buildings/hwan_FIR_fort";
+                break;
+            case "HwanEmpireIbiza": // 이비자
+                result = "Normal Buildings/hwan_ibiza";
+                break;
+            case "HwanEmpireKimchiFactory": // 김치팩토리
+                result = "Normal Buildings/hwan_kimchi_factory";
                 break;
+            case "HwanEmpireLatifundium": // 라티푼티움
+                result = "Normal Buildings/hwan_latifundium";
+                break;
+            case "AncientFinnoFineDustFactory": // 미세먼지공장
+                result = "Normal Buildings/finno_fine_dust_factory";
+                break;
+            case "AncientFinnoFIRFortress": // 피노 5차산업혁명요새
+                result = "Normal Buildings/finno_FIR_fort";
+                break;
+            case "AncientFinnoGermaniumMine": // 게르마늄광산
+                result = "Normal Buildings/finno_germanium_mine";
+                break;
+            case "AncientFinnoOctagon": // 옥타곤
+                result = "Normal Buildings/finno_ocatagon";
+                break;
+            case "Preternaturality": // 불가사의
+                result = "Normal Buildings/wonders";
+                break;
+            case "Casino": // 카지노
+                result = "Normal Buildings/Casino";
+                break;
+            case " ZapFactory": // 잡국 공장
+                result = "Normal Buildings/ZapFactory";
+                break;
+            case "FIRFortress": // 잡국 공장
+                result = "Normal Buildings/FIRFortress";
+                break;
+
             default:
                 result = name;
                 break;

Assets/Script/UI/SkillButton.cs

@@ -3,17 +3,89 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityEngine.EventSystems;
+using System;
+
+using static CivModel.Finno.FinnoPlayerNumber;
+using static CivModel.Hwan.HwanPlayerNumber;
 
 public class SkillButton : MonoBehaviour , IPointerEnterHandler, IPointerExitHandler
 {
     public void OnPointerEnter(PointerEventData pointerEventData)
     {
+        if(GameManager.Instance.selectedActor != null)
+        {
+            var skill = GameManager.Instance.selectedActor.ActiveSkills[Convert.ToInt32(gameObject.name[5] - '1')];
+            UIManager.Instance.skillDescription.transform.GetChild(0).GetComponent<Text>().text = skill.SkillName + ": " + skill.SkillDescription;
             UIManager.Instance.skillDescription.SetActive(true);
-        UIManager.Instance.skillDescription.transform.GetChild(0).GetComponent<Text>().text = GameManager.Instance.selectedActor.ActiveSkills[(int)(gameObject.name[5]) - 49].SkillDescription;
+        }
+
     }
 
     public void OnPointerExit(PointerEventData pointerEventData)
     {
         UIManager.Instance.skillDescription.SetActive(false);
     }
+
+    public static Sprite GetSkillIcon(CivModel.Actor unit, int idx)
+    {
+        char[] sep = { '.' };
+        string name = unit.ToString().Split(sep)[2];
+        string skillIconName;
+        switch (name)
+        {
+            case "JediKnight":
+                {
+                    if (unit.Owner == GameManager.Instance.Game.GetPlayerHwan())
+                        skillIconName = "hwan_jedi";
+                    else if (unit.Owner == GameManager.Instance.Game.GetPlayerFinno())
+                        skillIconName = "finno_jedi";
+                    else skillIconName = "hwan_jedi";
+                }
+                break;
+            case "JackieChan":
+                skillIconName = "hwan_jackie_chan";
+                break;
+            case "LEOSpaceArmada":
+                skillIconName = "hwan_spaceship";
+                break;
+            case "ProtoNinja":
+                {
+                    if (unit.Owner == GameManager.Instance.Game.GetPlayerHwan())
+                        skillIconName = "hwan_ninja";
+                    else if (unit.Owner == GameManager.Instance.Game.GetPlayerFinno())
+                        skillIconName = "finno_ninja";
+                    else skillIconName = "hwan_ninja";
+                }
+                break;
+            case "UnicornOrder":
+                skillIconName = "hwan_unicorn";
+                break;
+            case "Spy":
+                {
+                    if (unit.Owner == GameManager.Instance.Game.GetPlayerHwan())
+                        skillIconName = "hwan_spy";
+                    else if (unit.Owner == GameManager.Instance.Game.GetPlayerFinno())
+                        skillIconName = "finno_spy";
+                    else skillIconName = "hwan_spy";
+                }
+                break;
+            case "AncientSorcerer":
+                skillIconName = "finno_sorcerer";
+                break;
+            case "AutismBeamDrone":
+                skillIconName = "finno_autism";
+                break;
+            case "ElephantCavalry":
+                skillIconName = "finno_elephant";
+                break;
+            case "GenghisKhan":
+                skillIconName = "finno_genghis_khan";
+                break;
+            default:
+                skillIconName = "city_range_attack";
+                break;
+        }
+
+        return Resources.Load<Sprite>("SkillIcon/" + skillIconName);
+    }
 }

Assets/Script/UI/SpecialResourceView.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 using CivModel;
-using CivModel.Common;
 using System.Linq;
 
 public class SpecialResourceView : MonoBehaviour
@@ -17,7 +16,7 @@ public class SpecialResourceView : MonoBehaviour
     private List<GameObject> SRQlist;
     public GameObject SRQueue;
 
-    public CivModel.Player.SpecialResourceProxy mSRlist;
+    public IDictionary<ISpecialResource, int> mSRlist;
 
     public void begin()
     {
@@ -26,7 +25,7 @@ public class SpecialResourceView : MonoBehaviour
 
     void Awake()
     {
-        DontDestroyOnLoad(this);
+        // DontDestroyOnLoad(this);
         if (specialResourceView == null)
         {
             specialResourceView = this;

Assets/Script/UI/UIController.cs

@@ -24,10 +24,12 @@ public class UIController : MonoBehaviour {
     public GameObject QstExplain;
     public GameObject QstExplainBtn;
 
+    public GameObject _tutorialbutton;
+
 	private Text[] questInfotexts;
 
 	void Awake() {
-		DontDestroyOnLoad(this);
+		// DontDestroyOnLoad(this);
 		if (uicontroller == null) {
 			uicontroller = this;
 		}
@@ -79,28 +81,31 @@ public class UIController : MonoBehaviour {
 		questList = GameManager.Instance.Game.PlayerInTurn.Quests;
 		// Debug.Log("Quest: " + questList.Count);
 		foreach (Quest qst in questList) {
-			switch (qst.Status) {
+            if (qst.IsVisible)
+            {
+                switch (qst.Status)
+                {
                     case QuestStatus.Deployed:
-					var dqPrefab = Instantiate(DQPrefab, new Vector3(0f, 0f, 0f), Quaternion.identity);
+                        var dqPrefab = Instantiate(DQPrefab, new Vector3(10f, 0f, 0f), Quaternion.identity);
                         dqPrefab.transform.SetParent(DQQueue.transform, false);
                         dqPrefab.transform.localScale = new Vector3(1f, 1f, 1f);
-					dqPrefab.transform.localPosition = new Vector3(0f, 0f, 0f);
+                        dqPrefab.transform.localPosition = new Vector3(10f, 0f, 0f);
                         dqPrefab.name = "DQuest";
                         tempDList.Add(dqPrefab.GetComponent<Quests>().MakeDItem(qst));
                         break;
                     case QuestStatus.Accepted:
-					var aqPrefab = Instantiate(AQPrefab, new Vector3(0f, 0f, 0f), Quaternion.identity);
+                        var aqPrefab = Instantiate(AQPrefab, new Vector3(10f, 0f, 0f), Quaternion.identity);
                         aqPrefab.transform.SetParent(AQQueue.transform, false);
                         aqPrefab.transform.localScale = new Vector3(1f, 1f, 1f);
-					aqPrefab.transform.localPosition = new Vector3(0f, 0f, 0f);
+                        aqPrefab.transform.localPosition = new Vector3(10f, 0f, 0f);
                         aqPrefab.name = "AQuest";
                         tempAList.Add(aqPrefab.GetComponent<Quests>().MakeAItem(qst));
                         break;
                     case QuestStatus.Completed:
-					var cqPrefab = Instantiate(CQPrefab, new Vector3(0f, 0f, 0f), Quaternion.identity);
+                        var cqPrefab = Instantiate(CQPrefab, new Vector3(10f, 0f, 0f), Quaternion.identity);
                         cqPrefab.transform.SetParent(CQQueue.transform, false);
                         cqPrefab.transform.localScale = new Vector3(1f, 1f, 1f);
-					cqPrefab.transform.localPosition = new Vector3(0f, 0f, 0f);
+                        cqPrefab.transform.localPosition = new Vector3(10f, 0f, 0f);
                         cqPrefab.name = "CQuest";
                         tempCList.Add(cqPrefab.GetComponent<Quests>().MakeCItem(qst));
                         break;
@@ -111,31 +116,32 @@ public class UIController : MonoBehaviour {
                         Debug.Log("Undefined Status");
                         throw new System.Exception("Undefined Status");
                 }
+            }
 		}
 
 		if (tempDList.Count == 0) {
-			var dqPrefab = Instantiate(DQPrefab, new Vector3(0f, 0f, 0f), Quaternion.identity);
+			var dqPrefab = Instantiate(DQPrefab, new Vector3(10f, 0f, 0f), Quaternion.identity);
 			dqPrefab.transform.SetParent(DQQueue.transform, false);
 			dqPrefab.transform.localScale = new Vector3(1f, 1f, 1f);
-			dqPrefab.transform.localPosition = new Vector3(0f, 0f, 0f);
+			dqPrefab.transform.localPosition = new Vector3(10f, 0f, 0f);
 			dqPrefab.name = "DQuest_null";
 			tempDList.Add(dqPrefab.GetComponent<Quests>().MakeDItem());
 		}
 		DQQlist = tempDList;
 		if (tempAList.Count == 0) {
-			var aqPrefab = Instantiate(AQPrefab, new Vector3(0f, 0f, 0f), Quaternion.identity);
+			var aqPrefab = Instantiate(AQPrefab, new Vector3(10f, 0f, 0f), Quaternion.identity);
 			aqPrefab.transform.SetParent(AQQueue.transform, false);
 			aqPrefab.transform.localScale = new Vector3(1f, 1f, 1f);
-			aqPrefab.transform.localPosition = new Vector3(0f, 0f, 0f);
+			aqPrefab.transform.localPosition = new Vector3(10f, 0f, 0f);
 			aqPrefab.name = "AQuest_null";
 			tempAList.Add(aqPrefab.GetComponent<Quests>().MakeAItem());
 		}
 		AQQlist = tempAList;
 		if (tempCList.Count == 0) {
-			var cqPrefab = Instantiate(CQPrefab, new Vector3(0f, 0f, 0f), Quaternion.identity);
+			var cqPrefab = Instantiate(CQPrefab, new Vector3(10f, 0f, 0f), Quaternion.identity);
 			cqPrefab.transform.SetParent(CQQueue.transform, false);
 			cqPrefab.transform.localScale = new Vector3(1f, 1f, 1f);
-			cqPrefab.transform.localPosition = new Vector3(0f, 0f, 0f);
+			cqPrefab.transform.localPosition = new Vector3(10f, 0f, 0f);
 			cqPrefab.name = "CQuest_null";
 			tempCList.Add(cqPrefab.GetComponent<Quests>().MakeCItem());
 		}
@@ -214,11 +220,15 @@ public class UIController : MonoBehaviour {
     public void onClickExplain()
     {
         QstExplain.SetActive(true);
+        _tutorialbutton.SetActive(false);
+        UIManager.Instance.MenuButton.SetActive(false);
     }
 
     public void onClickExplainExit()
     {
         QstExplain.SetActive(false);
+        _tutorialbutton.SetActive(true);
+        UIManager.Instance.MenuButton.SetActive(true);
     }
 
     public void SetQstExplain(Quest qst)

Assets/Script/UI/ViewFieldSquareControl.cs

@@ -18,7 +18,7 @@ public class ViewFieldSquareControl : MonoBehaviour
     // Use this for initialization
     void Start()
     {
-        Scaler = new Vector3(0.22f, 0.22f, 0.22f);
+        Scaler = new Vector3(0.32f, 0.32f, 0.32f);
         _zoom_counter = 2;
     }
 

Assets/Script/Unit/UnitEnum.cs

@@ -21,7 +21,14 @@ public enum Units {
 	FinnoAncientSorcerer,
 	FinnoJediKnight,
 	FinnoAutismBeamDrone,
-	FinnoGenghisKhan
+	FinnoGenghisKhan,
+    ZapPioneer,
+    ZapArmoredDivision,
+    ZapPseudoNinja,
+    ZapPadawan,
+    ZapInfantry,
+    ZapDecentralizedMilitary,
+    ZapSpaceShip
 }
 
 public class UnitEnum {
@@ -77,8 +84,37 @@ public class UnitEnum {
 		else if (unit is CivModel.Finno.AutismBeamDrone) {
 			return Units.FinnoAutismBeamDrone;
 		}
-		else {
-			return Units.HwanBrainwashedEmuKnight;
+        else if (unit is CivModel.Zap.Pioneer)
+        {
+            return Units.ZapPioneer;
+        }
+        else if (unit is CivModel.Zap.ArmedDivision)
+        {
+            return Units.ZapArmoredDivision;
+        }
+        else if (unit is CivModel.Zap.InfantryDivision)
+        {
+            return Units.ZapInfantry;
+        }
+        else if (unit is CivModel.Zap.LEOSpaceArmada)
+        {
+            return Units.ZapSpaceShip;
+        }
+        else if (unit is CivModel.Zap.Padawan)
+        {
+            return Units.ZapPadawan;
+        }
+        else if (unit is CivModel.Zap.DecentralizedMilitary)
+        {
+            return Units.ZapDecentralizedMilitary;
+        }
+        else if (unit is CivModel.Zap.ZapNinja)
+        {
+            return Units.ZapPseudoNinja;
+        }
+        else
+        {
+            return Units.HwanLEO;
         }
     }
 
@@ -88,7 +124,7 @@ public class UnitEnum {
 
         if (unit is CivModel.Hwan.Pioneer)
         {
-            unitResourcePath = "hwan_burrow";
+            unitResourcePath = "hwan_pioneer";
         }
         else if (unit is CivModel.Hwan.BrainwashedEMUKnight)
         {
@@ -124,7 +160,7 @@ public class UnitEnum {
         }
         else if (unit is CivModel.Finno.Pioneer)
         {
-            unitResourcePath = "finno_burrow";
+            unitResourcePath = "finno_pioneer";
         }
         else if (unit is CivModel.Finno.EMUHorseArcher)
         {
@@ -158,9 +194,37 @@ public class UnitEnum {
         {
             unitResourcePath = "finno_genghis_khan";
         }
+        else if(unit is CivModel.Zap.Pioneer)
+        {
+            unitResourcePath = "jap_pioneer";
+        }
+        else if (unit is CivModel.Zap.ArmedDivision)
+        {
+            unitResourcePath = "jap_armored_division";
+        }
+        else if(unit is CivModel.Zap.InfantryDivision)
+        {
+            unitResourcePath = "jap_infantry_division";
+        }
+        else if(unit is CivModel.Zap.LEOSpaceArmada)
+        {
+            unitResourcePath = "jap_spaceship";
+        }
+        else if(unit is CivModel.Zap.Padawan)
+        {
+            unitResourcePath = "jap_padawan";
+        }
+        else if(unit is CivModel.Zap.DecentralizedMilitary)
+        {
+            unitResourcePath = "jap_decentralized_division";
+        }
+        else if(unit is CivModel.Zap.ZapNinja)
+        {
+            unitResourcePath = "jap_pseudo_ninja";
+        }
         else
         {
-            unitResourcePath = "hwan_spaceship";
+            unitResourcePath = "jap_infantry_division";
         }
 
         return Resources.Load<GameObject>("UnitModels/" + unitResourcePath);

ProjectSettings/DynamicsManager.asset

@@ -17,7 +17,7 @@ PhysicsManager:
   m_ClothInterCollisionDistance: 0
   m_ClothInterCollisionStiffness: 0
   m_ContactsGeneration: 1
-  m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+  m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc7ffffffa7ffffff97ffffff8fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
   m_AutoSimulation: 1
   m_AutoSyncTransforms: 1
   m_ClothInterCollisionSettingsToggle: 0