2018-08-21 Commit

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

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

Assets/Scenes/Game.unity

@@ -160,6 +160,7 @@ MonoBehaviour:
   happinessText: {fileID: 656491822}
   researchText: {fileID: 1232325341}
   laborText: {fileID: 1237518059}
+  endingScene: {fileID: 1790415748}
 --- !u!1 &13953242
 GameObject:
   m_ObjectHideFlags: 0
@@ -1178,7 +1179,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 1841507267}
   m_Direction: 2
   m_Value: 0
-  m_Size: 0.99999994
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -1728,7 +1729,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 776379106}
   m_Direction: 2
   m_Value: 0
-  m_Size: 1
+  m_Size: 0.99999994
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -2145,7 +2146,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 265305998}
   m_Direction: 2
   m_Value: 0
-  m_Size: 1
+  m_Size: 0.99999994
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -2523,6 +2524,77 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 208660110}
+--- !u!1 &214476116
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 214476117}
+  - component: {fileID: 214476119}
+  - component: {fileID: 214476118}
+  m_Layer: 5
+  m_Name: SpyPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &214476117
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 214476116}
+  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: 1248662544}
+  - {fileID: 1125794043}
+  - {fileID: 275023391}
+  m_Father: {fileID: 437739942}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 600, y: 250}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &214476118
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 214476116}
+  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.392}
+  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: c614198a9b48a0246b444184079003a2, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!222 &214476119
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 214476116}
 --- !u!1 &234688782
 GameObject:
   m_ObjectHideFlags: 0
@@ -3257,6 +3329,196 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &275023390
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 275023391}
+  - component: {fileID: 275023394}
+  - component: {fileID: 275023393}
+  - component: {fileID: 275023392}
+  m_Layer: 5
+  m_Name: Back
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &275023391
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 275023390}
+  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: 1599399419}
+  m_Father: {fileID: 214476117}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -20, y: 20}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 1, y: 0}
+--- !u!114 &275023392
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 275023390}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 275023393}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 398836120}
+        m_MethodName: OnClickBack
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+--- !u!114 &275023393
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 275023390}
+  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: 269504748dd581048a091d2e922981e7, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!222 &275023394
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 275023390}
+--- !u!1 &278116934
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 278116935}
+  - component: {fileID: 278116937}
+  - component: {fileID: 278116936}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &278116935
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 278116934}
+  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: 1790415752}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &278116936
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 278116934}
+  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: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!222 &278116937
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 278116934}
 --- !u!1 &301180777
 GameObject:
   m_ObjectHideFlags: 0
@@ -4235,7 +4497,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 87567202}
   m_Direction: 2
   m_Value: 0
-  m_Size: 1
+  m_Size: 0.99999994
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -4571,6 +4833,8 @@ MonoBehaviour:
   questUI: {fileID: 698219116}
   selectedActor: {fileID: 0}
   SpecialSpec: {fileID: 2130223634}
+  spyPanel: {fileID: 214476116}
+  spyContent: {fileID: 1125794042}
   UnitSelTab: {fileID: 1352877605}
   BuildingSelTab: {fileID: 102389002}
   EpicTab: {fileID: 1969802946}
@@ -4884,7 +5148,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0.000061035156, y: 0}
+  m_AnchoredPosition: {x: 0.000061035156, y: -0.000022225882}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &428736661
@@ -5047,6 +5311,7 @@ RectTransform:
   - {fileID: 1577928241}
   - {fileID: 1633964636}
   - {fileID: 2086303724}
+  - {fileID: 214476117}
   m_Father: {fileID: 0}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -5161,7 +5426,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.000086878164, y: 0.000055359258}
+  m_AnchoredPosition: {x: -0.000086878164, y: 0.00004339218}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &449025874
@@ -5275,7 +5540,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 1992858618}
   m_Direction: 2
   m_Value: 0
-  m_Size: 1
+  m_Size: 0.99999994
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -6345,8 +6610,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 843334966}
   m_HandleRect: {fileID: 843334965}
   m_Direction: 2
-  m_Value: 1
-  m_Size: 0.9999999
+  m_Value: 0
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -6884,7 +7149,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 733846992}
   m_Direction: 2
   m_Value: 0
-  m_Size: 0.9999998
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -9250,8 +9515,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 249648925}
   m_HandleRect: {fileID: 249648924}
   m_Direction: 2
-  m_Value: 0
-  m_Size: 1
+  m_Value: 1
+  m_Size: 0.9999998
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -9431,7 +9696,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.000077235236, y: -0.00004297989}
+  m_AnchoredPosition: {x: 0.000021032238, y: 0.000049819824}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &868267704
@@ -10870,7 +11135,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0.000044682376, y: 0.000055359258}
+  m_AnchoredPosition: {x: 0.000044682376, y: 0.00004339218}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &998914692
@@ -11256,7 +11521,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0.000013977573, y: -0.000061035156}
+  m_AnchoredPosition: {x: -0.000047057583, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1014045368
@@ -11565,7 +11830,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -0.000012682933, y: 0}
+  m_AnchoredPosition: {x: -0.00004320051, y: 0.000030517578}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1020118428
@@ -12694,6 +12959,80 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1116916747}
+--- !u!1 &1125794042
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 1125794043}
+  - component: {fileID: 1125794045}
+  - component: {fileID: 1125794044}
+  m_Layer: 5
+  m_Name: Content
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1125794043
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1125794042}
+  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: 214476117}
+  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: -20}
+  m_SizeDelta: {x: -40, y: -80}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1125794044
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1125794042}
+  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: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\uB3C4\uC2DC \uC774\uB984 : \uC7A1\uAD6D"
+--- !u!222 &1125794045
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1125794042}
 --- !u!1 &1128823154
 GameObject:
   m_ObjectHideFlags: 0
@@ -13927,6 +14266,80 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1237518057}
+--- !u!1 &1248662543
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 1248662544}
+  - component: {fileID: 1248662546}
+  - component: {fileID: 1248662545}
+  m_Layer: 5
+  m_Name: Title
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1248662544
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1248662543}
+  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: 214476117}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -15}
+  m_SizeDelta: {x: -40, y: 30}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!114 &1248662545
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1248662543}
+  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: 30
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\uC2A4\uD30C\uC774\uAC00 \uC801\uAD6D\uC758 \uC815\uBCF4\uB97C \uC54C\uC544\uB0C8\uC2B5\uB2C8\uB2E4!"
+--- !u!222 &1248662546
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1248662543}
 --- !u!1 &1253427100
 GameObject:
   m_ObjectHideFlags: 0
@@ -15074,7 +15487,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.00002153402, y: -0.00004425505}
+  m_AnchoredPosition: {x: -0.00002153402, y: -0.000010013524}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1458767123
@@ -15390,7 +15803,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0.000013633144, y: -0.000061035156}
+  m_AnchoredPosition: {x: -0.000047402013, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1477095906
@@ -16866,6 +17279,80 @@ MonoBehaviour:
       m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI,
         Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   delegates: []
+--- !u!1 &1599399418
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 1599399419}
+  - component: {fileID: 1599399421}
+  - component: {fileID: 1599399420}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1599399419
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1599399418}
+  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: 275023391}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1599399420
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1599399418}
+  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: 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_FontData:
+    m_Font: {fileID: 12800000, guid: d716ac8e5646a55448ac141489d12c16, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\uD655\uC778"
+--- !u!222 &1599399421
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1599399418}
 --- !u!1 &1600006368
 GameObject:
   m_ObjectHideFlags: 0
@@ -16974,7 +17461,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -0.0001912831, y: 0}
+  m_AnchoredPosition: {x: -0.0000005482434, y: 0.000030517578}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1603600460
@@ -18082,8 +18569,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1903287045}
   m_HandleRect: {fileID: 1903287044}
   m_Direction: 2
-  m_Value: 1
-  m_Size: 0.9999999
+  m_Value: 0
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -18774,7 +19261,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -0.0000017145067, y: 0}
+  m_AnchoredPosition: {x: -0.000032232085, y: 0.000030517578}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1770847184
@@ -18987,6 +19474,100 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1778627411}
+--- !u!1 &1790415748
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 1790415752}
+  - component: {fileID: 1790415751}
+  - component: {fileID: 1790415750}
+  - component: {fileID: 1790415749}
+  m_Layer: 5
+  m_Name: EndingScene
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1790415749
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1790415748}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &1790415750
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1790415748}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 1
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 1920, y: 1080}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+--- !u!223 &1790415751
+Canvas:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1790415748}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!224 &1790415752
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1790415748}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_Children:
+  - {fileID: 278116935}
+  m_Father: {fileID: 0}
+  m_RootOrder: 18
+  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: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
 --- !u!1 &1797784853
 GameObject:
   m_ObjectHideFlags: 0
@@ -19211,8 +19792,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 173016130}
   m_HandleRect: {fileID: 173016129}
   m_Direction: 2
-  m_Value: 1
-  m_Size: 0.9999999
+  m_Value: 0
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -20278,7 +20859,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0.00001355484, y: -0.000061035156}
+  m_AnchoredPosition: {x: -0.000047480316, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1922030647
@@ -20652,7 +21233,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -0.000011237054, y: 0}
+  m_AnchoredPosition: {x: -0.000041754633, y: 0.000030517578}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1946056457
@@ -22054,7 +22635,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 1833688073}
   m_Direction: 2
   m_Value: 0
-  m_Size: 0.99999976
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -22213,7 +22794,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -0.0000063706684, y: 0}
+  m_AnchoredPosition: {x: -0.000036888247, y: 0.000030517578}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &2017007226
@@ -22895,7 +23476,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 145151053}
   m_Direction: 2
   m_Value: 0
-  m_Size: 0.99999976
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -23011,7 +23592,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 664171018}
   m_Direction: 2
   m_Value: 0
-  m_Size: 1
+  m_Size: 0.99999994
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:

Assets/Script/GameManager.cs

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

Assets/Script/UI/AlarmManager.cs

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

Assets/Script/UI/GameUI.cs

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

Assets/Script/UI/UIManager.cs

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

Assets/Script/Unit/Unit.cs

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

ProjectSettings/GraphicsSettings.asset

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