From 2e584dc7c255e5ca2c128812c82846dfe5962e64 Mon Sep 17 00:00:00 2001
From: redsuncore <yjh4645@naver.com>
Date: Fri, 2 Mar 2018 07:48:11 +0900
Subject: [PATCH] Quest Now Available
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Quest View 구현
---
Assets/Prefabs/Quest1.prefab | 52 +-
Assets/Prefabs/Quest2.prefab | 54 +-
Assets/Prefabs/Quest3.prefab | 54 +-
Assets/Scenes/MainScene.unity | 957 ++---------------------
Assets/Scripts/ManagementUIController.cs | 297 +++++--
Assets/Scripts/Prefabs/Quests.cs | 367 +++++++++
Assets/Scripts/Prefabs/Quests.cs.meta | 13 +
Assets/Scripts/UIManager.cs | 1 +
ProjectSettings/ProjectVersion.txt | 2 +-
9 files changed, 808 insertions(+), 989 deletions(-)
create mode 100644 Assets/Scripts/Prefabs/Quests.cs
create mode 100644 Assets/Scripts/Prefabs/Quests.cs.meta
diff --git a/Assets/Prefabs/Quest1.prefab b/Assets/Prefabs/Quest1.prefab
index 9d26cdb..bef83b5 100644
--- a/Assets/Prefabs/Quest1.prefab
+++ b/Assets/Prefabs/Quest1.prefab
@@ -21,7 +21,8 @@ GameObject:
- component: {fileID: 224220436238375300}
- component: {fileID: 222149782978612648}
- component: {fileID: 114409043827438454}
- - component: {fileID: 114103233515284930}
+ - component: {fileID: 114861490490872230}
+ - component: {fileID: 114115402801048756}
m_Layer: 5
m_Name: Quest1
m_TagString: Untagged
@@ -176,7 +177,7 @@ MonoBehaviour:
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
---- !u!114 &114103233515284930
+--- !u!114 &114115402801048756
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
@@ -184,9 +185,39 @@ MonoBehaviour:
m_GameObject: {fileID: 1018532165548420}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: bdf0fa739872652438abde0f4b5f6f2a, type: 3}
+ 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: 114409043827438454}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
--- !u!114 &114287023643772896
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -441,6 +472,17 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: X 1
+--- !u!114 &114861490490872230
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1018532165548420}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 6e9dcfa9a45da2f45bdcbdc531c3f51b, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!222 &222076202448385040
CanvasRenderer:
m_ObjectHideFlags: 1
@@ -563,8 +605,8 @@ RectTransform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 580, y: 90}
m_Pivot: {x: 0, y: 1}
diff --git a/Assets/Prefabs/Quest2.prefab b/Assets/Prefabs/Quest2.prefab
index a9d84f5..0eaec60 100644
--- a/Assets/Prefabs/Quest2.prefab
+++ b/Assets/Prefabs/Quest2.prefab
@@ -55,7 +55,8 @@ GameObject:
- component: {fileID: 224909143887976278}
- component: {fileID: 222356644950025438}
- component: {fileID: 114382879202268026}
- - component: {fileID: 114240139215805894}
+ - component: {fileID: 114345661672977162}
+ - component: {fileID: 114549949979896832}
m_Layer: 5
m_Name: Quest2
m_TagString: Untagged
@@ -114,7 +115,7 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!114 &114240139215805894
+--- !u!114 &114345661672977162
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
@@ -122,7 +123,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1751172803964366}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: bdf0fa739872652438abde0f4b5f6f2a, type: 3}
+ m_Script: {fileID: 11500000, guid: 6e9dcfa9a45da2f45bdcbdc531c3f51b, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &114382879202268026
@@ -211,7 +212,48 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: Ancient Egypt
+ m_Text: "\uBE44\uC5C8\uC74C"
+--- !u!114 &114549949979896832
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1751172803964366}
+ 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: 114382879202268026}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
--- !u!114 &114698826814877982
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -244,7 +286,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: X 1
+ m_Text:
--- !u!114 &114922993880147586
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -304,7 +346,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: "3 \uD134 \uB0A8\uC74C"
+ m_Text:
--- !u!222 &222143787408252210
CanvasRenderer:
m_ObjectHideFlags: 1
diff --git a/Assets/Prefabs/Quest3.prefab b/Assets/Prefabs/Quest3.prefab
index 30141b3..17dc121 100644
--- a/Assets/Prefabs/Quest3.prefab
+++ b/Assets/Prefabs/Quest3.prefab
@@ -106,7 +106,8 @@ GameObject:
- component: {fileID: 224218572548644340}
- component: {fileID: 222262096531738452}
- component: {fileID: 114137855164640326}
- - component: {fileID: 114657329043301410}
+ - component: {fileID: 114956457392117038}
+ - component: {fileID: 114763697980529176}
m_Layer: 5
m_Name: Quest3
m_TagString: Untagged
@@ -173,7 +174,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: Ancient Egypt
+ m_Text: "\uBE44\uC5C8\uC74C"
--- !u!114 &114314259769222040
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -206,7 +207,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: X 1
+ m_Text:
--- !u!114 &114330057817639758
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -266,7 +267,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: "3 \uD134\uC5D0 \uC644\uB8CC"
+ m_Text:
--- !u!114 &114644825157980132
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -294,7 +295,7 @@ MonoBehaviour:
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
---- !u!114 &114657329043301410
+--- !u!114 &114763697980529176
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
@@ -302,7 +303,48 @@ MonoBehaviour:
m_GameObject: {fileID: 1982589330345592}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: bdf0fa739872652438abde0f4b5f6f2a, type: 3}
+ 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: 114137855164640326}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+--- !u!114 &114956457392117038
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1982589330345592}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 6e9dcfa9a45da2f45bdcbdc531c3f51b, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!222 &222104265176523744
diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity
index 3f6cec2..97bf8a9 100644
--- a/Assets/Scenes/MainScene.unity
+++ b/Assets/Scenes/MainScene.unity
@@ -988,84 +988,6 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 52323587}
---- !u!1 &52404736
-GameObject:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 1473705897988054, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- serializedVersion: 5
- m_Component:
- - component: {fileID: 52404737}
- - component: {fileID: 52404739}
- - component: {fileID: 52404738}
- m_Layer: 5
- m_Name: TurnsLeft
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &52404737
-RectTransform:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 224952107812169900, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 52404736}
- 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: 2010621755}
- m_RootOrder: 5
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 1, y: 0.5}
- m_AnchorMax: {x: 1, y: 0.5}
- m_AnchoredPosition: {x: -100, y: 0}
- m_SizeDelta: {x: 90, y: 90}
- m_Pivot: {x: 1, y: 0.5}
---- !u!114 &52404738
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 114524370131282230, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 52404736}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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: 10102, guid: 0000000000000000e000000000000000, type: 0}
- m_FontSize: 22
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 2
- m_MaxSize: 40
- m_Alignment: 3
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: "3 \uD134 \uB0A8\uC74C"
---- !u!222 &52404739
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 222948486816892814, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 52404736}
--- !u!1 &60871968
GameObject:
m_ObjectHideFlags: 0
@@ -1464,72 +1386,6 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 83997298}
---- !u!1 &85905714
-GameObject:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 1018532165548420, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- serializedVersion: 5
- m_Component:
- - component: {fileID: 2010621755}
- - component: {fileID: 85905717}
- - component: {fileID: 85905716}
- - component: {fileID: 85905715}
- m_Layer: 5
- m_Name: Quest1
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!114 &85905715
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 114103233515284930, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 85905714}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 0}
- m_Name:
- m_EditorClassIdentifier:
---- !u!114 &85905716
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 114409043827438454, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 85905714}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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: 10907, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
---- !u!222 &85905717
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 222149782978612648, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 85905714}
--- !u!1 &97186194
GameObject:
m_ObjectHideFlags: 0
@@ -2466,111 +2322,6 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 222397092}
---- !u!1001 &225633580
-Prefab:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 494962731}
- m_Modifications:
- - target: {fileID: 224218572548644340, guid: 48cfcac8d3e645844b7a9c8192f5f020,
- type: 2}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 224218572548644340, guid: 48cfcac8d3e645844b7a9c8192f5f020,
- type: 2}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 224218572548644340, guid: 48cfcac8d3e645844b7a9c8192f5f020,
- type: 2}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 224218572548644340, guid: 48cfcac8d3e645844b7a9c8192f5f020,
- type: 2}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 224218572548644340, guid: 48cfcac8d3e645844b7a9c8192f5f020,
- type: 2}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 224218572548644340, guid: 48cfcac8d3e645844b7a9c8192f5f020,
- type: 2}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 224218572548644340, guid: 48cfcac8d3e645844b7a9c8192f5f020,
- type: 2}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 224218572548644340, guid: 48cfcac8d3e645844b7a9c8192f5f020,
- type: 2}
- propertyPath: m_RootOrder
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 224218572548644340, guid: 48cfcac8d3e645844b7a9c8192f5f020,
- type: 2}
- propertyPath: m_AnchoredPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 224218572548644340, guid: 48cfcac8d3e645844b7a9c8192f5f020,
- type: 2}
- propertyPath: m_AnchoredPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 224218572548644340, guid: 48cfcac8d3e645844b7a9c8192f5f020,
- type: 2}
- propertyPath: m_SizeDelta.x
- value: 580
- objectReference: {fileID: 0}
- - target: {fileID: 224218572548644340, guid: 48cfcac8d3e645844b7a9c8192f5f020,
- type: 2}
- propertyPath: m_SizeDelta.y
- value: 90
- objectReference: {fileID: 0}
- - target: {fileID: 224218572548644340, guid: 48cfcac8d3e645844b7a9c8192f5f020,
- type: 2}
- propertyPath: m_AnchorMin.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 224218572548644340, guid: 48cfcac8d3e645844b7a9c8192f5f020,
- type: 2}
- propertyPath: m_AnchorMin.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 224218572548644340, guid: 48cfcac8d3e645844b7a9c8192f5f020,
- type: 2}
- propertyPath: m_AnchorMax.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 224218572548644340, guid: 48cfcac8d3e645844b7a9c8192f5f020,
- type: 2}
- propertyPath: m_AnchorMax.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 224218572548644340, guid: 48cfcac8d3e645844b7a9c8192f5f020,
- type: 2}
- propertyPath: m_Pivot.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 224218572548644340, guid: 48cfcac8d3e645844b7a9c8192f5f020,
- type: 2}
- propertyPath: m_Pivot.y
- value: 1
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_ParentPrefab: {fileID: 100100000, guid: 48cfcac8d3e645844b7a9c8192f5f020, type: 2}
- m_IsPrefabParent: 0
---- !u!224 &225633581 stripped
-RectTransform:
- m_PrefabParentObject: {fileID: 224218572548644340, guid: 48cfcac8d3e645844b7a9c8192f5f020,
- type: 2}
- m_PrefabInternal: {fileID: 225633580}
--- !u!1 &227097195
GameObject:
m_ObjectHideFlags: 0
@@ -5882,84 +5633,6 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 447208727}
---- !u!1 &448828224
-GameObject:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 1489523738745046, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- serializedVersion: 5
- m_Component:
- - component: {fileID: 448828225}
- - component: {fileID: 448828227}
- - component: {fileID: 448828226}
- m_Layer: 5
- m_Name: NumberOfUnits
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &448828225
-RectTransform:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 224153696327587446, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 448828224}
- 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: 2010621755}
- m_RootOrder: 4
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 1, y: 0.5}
- m_AnchorMax: {x: 1, y: 0.5}
- m_AnchoredPosition: {x: -200, y: 0}
- m_SizeDelta: {x: 40, y: 90}
- m_Pivot: {x: 1, y: 0.5}
---- !u!114 &448828226
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 114798227534493962, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 448828224}
- 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: 10102, guid: 0000000000000000e000000000000000, type: 0}
- m_FontSize: 22
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 2
- m_MaxSize: 40
- m_Alignment: 3
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: X 1
---- !u!222 &448828227
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 222812760015091224, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 448828224}
--- !u!1 &452073330
GameObject:
m_ObjectHideFlags: 0
@@ -6238,15 +5911,14 @@ RectTransform:
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: 1133494614}
+ m_Children: []
m_Father: {fileID: 860634448}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 580, y: 90}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &480667145
MonoBehaviour:
@@ -6807,15 +6479,14 @@ RectTransform:
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: 225633581}
+ m_Children: []
m_Father: {fileID: 888451486}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 580, y: 90}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &494962732
MonoBehaviour:
@@ -8137,78 +7808,6 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 610596101}
---- !u!1 &641115508
-GameObject:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 1822306010928472, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- serializedVersion: 5
- m_Component:
- - component: {fileID: 641115509}
- - component: {fileID: 641115511}
- - component: {fileID: 641115510}
- m_Layer: 5
- m_Name: ResourceImage
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &641115509
-RectTransform:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 224374872216831892, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 641115508}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1.0000085, y: 1.0000085, z: 1.0000085}
- m_Children: []
- m_Father: {fileID: 2010621755}
- m_RootOrder: 3
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0.5}
- m_AnchorMax: {x: 0, y: 0.5}
- m_AnchoredPosition: {x: 260, y: 0}
- m_SizeDelta: {x: 65, y: 65}
- m_Pivot: {x: 0, y: 0.5}
---- !u!114 &641115510
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 114366599218319610, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 641115508}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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 &641115511
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 222778193336446598, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 641115508}
--- !u!1 &649437858
GameObject:
m_ObjectHideFlags: 0
@@ -11542,84 +11141,6 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1008685727}
---- !u!1 &1024384456
-GameObject:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 1236641505212004, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- serializedVersion: 5
- m_Component:
- - component: {fileID: 1024384457}
- - component: {fileID: 1024384459}
- - component: {fileID: 1024384458}
- m_Layer: 5
- m_Name: Country
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1024384457
-RectTransform:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 224100808160133870, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 1024384456}
- 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: 2010621755}
- m_RootOrder: 2
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0.5}
- m_AnchorMax: {x: 0, y: 0.5}
- m_AnchoredPosition: {x: 90, y: 0}
- m_SizeDelta: {x: 160, y: 90}
- m_Pivot: {x: 0, y: 0.5}
---- !u!114 &1024384458
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 114682522058169654, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 1024384456}
- 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: 10102, guid: 0000000000000000e000000000000000, type: 0}
- m_FontSize: 22
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 0
- m_MaxSize: 40
- m_Alignment: 3
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: Ancient Egypt
---- !u!222 &1024384459
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 222233196853871218, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 1024384456}
--- !u!1 &1030154599
GameObject:
m_ObjectHideFlags: 0
@@ -12037,10 +11558,16 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
managementUI: {fileID: 687281513}
+ DQPrefab: {fileID: 1018532165548420, guid: 8eb1ce4df7307bb4299ac484d65d4285, type: 2}
+ AQPrefab: {fileID: 1751172803964366, guid: c623d6d95f8c78c4fa78c18c9ab975b6, type: 2}
+ CQPrefab: {fileID: 1982589330345592, guid: 48cfcac8d3e645844b7a9c8192f5f020, type: 2}
proPrefab: {fileID: 1096080870604826, guid: 62be73fe945e14a4186bd461e4e98ef9, type: 2}
depPrefab: {fileID: 1800725053202814, guid: e251050c3a94e2a47be7fa8a4796fbbd, type: 2}
productablePrefab: {fileID: 1602855710582796, guid: 7ea57312cf6517248af0f571357df0f4,
type: 2}
+ DQQueue: {fileID: 1194642866}
+ AQQueue: {fileID: 480667143}
+ CQQueue: {fileID: 494962730}
proQueue: {fileID: 1681201286}
depQueue: {fileID: 1623971497}
EpicQueue: {fileID: 1447270533}
@@ -12050,6 +11577,7 @@ MonoBehaviour:
CityQueue: {fileID: 1340925456}
CityBuildingQueue: {fileID: 1289093026}
NormalBuildingQueue: {fileID: 436280704}
+ QuestInfo: {fileID: 2113206554}
--- !u!1001 &1060029827
Prefab:
m_ObjectHideFlags: 0
@@ -12619,142 +12147,37 @@ MonoBehaviour:
m_GameObject: {fileID: 1126581260}
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: 10102, guid: 0000000000000000e000000000000000, type: 0}
- m_FontSize: 40
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 0
- m_MaxSize: 50
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: "\uD134 \uC885\uB8CC"
---- !u!222 &1126581263
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 1126581260}
---- !u!1001 &1133494613
-Prefab:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 480667144}
- m_Modifications:
- - target: {fileID: 224909143887976278, guid: c623d6d95f8c78c4fa78c18c9ab975b6,
- type: 2}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 224909143887976278, guid: c623d6d95f8c78c4fa78c18c9ab975b6,
- type: 2}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 224909143887976278, guid: c623d6d95f8c78c4fa78c18c9ab975b6,
- type: 2}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 224909143887976278, guid: c623d6d95f8c78c4fa78c18c9ab975b6,
- type: 2}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 224909143887976278, guid: c623d6d95f8c78c4fa78c18c9ab975b6,
- type: 2}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 224909143887976278, guid: c623d6d95f8c78c4fa78c18c9ab975b6,
- type: 2}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 224909143887976278, guid: c623d6d95f8c78c4fa78c18c9ab975b6,
- type: 2}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 224909143887976278, guid: c623d6d95f8c78c4fa78c18c9ab975b6,
- type: 2}
- propertyPath: m_RootOrder
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 224909143887976278, guid: c623d6d95f8c78c4fa78c18c9ab975b6,
- type: 2}
- propertyPath: m_AnchoredPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 224909143887976278, guid: c623d6d95f8c78c4fa78c18c9ab975b6,
- type: 2}
- propertyPath: m_AnchoredPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 224909143887976278, guid: c623d6d95f8c78c4fa78c18c9ab975b6,
- type: 2}
- propertyPath: m_SizeDelta.x
- value: 580
- objectReference: {fileID: 0}
- - target: {fileID: 224909143887976278, guid: c623d6d95f8c78c4fa78c18c9ab975b6,
- type: 2}
- propertyPath: m_SizeDelta.y
- value: 90
- objectReference: {fileID: 0}
- - target: {fileID: 224909143887976278, guid: c623d6d95f8c78c4fa78c18c9ab975b6,
- type: 2}
- propertyPath: m_AnchorMin.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 224909143887976278, guid: c623d6d95f8c78c4fa78c18c9ab975b6,
- type: 2}
- propertyPath: m_AnchorMin.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 224909143887976278, guid: c623d6d95f8c78c4fa78c18c9ab975b6,
- type: 2}
- propertyPath: m_AnchorMax.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 224909143887976278, guid: c623d6d95f8c78c4fa78c18c9ab975b6,
- type: 2}
- propertyPath: m_AnchorMax.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 224909143887976278, guid: c623d6d95f8c78c4fa78c18c9ab975b6,
- type: 2}
- propertyPath: m_Pivot.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 224909143887976278, guid: c623d6d95f8c78c4fa78c18c9ab975b6,
- type: 2}
- propertyPath: m_Pivot.y
- value: 1
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_ParentPrefab: {fileID: 100100000, guid: c623d6d95f8c78c4fa78c18c9ab975b6, type: 2}
- m_IsPrefabParent: 0
---- !u!224 &1133494614 stripped
-RectTransform:
- m_PrefabParentObject: {fileID: 224909143887976278, guid: c623d6d95f8c78c4fa78c18c9ab975b6,
- type: 2}
- m_PrefabInternal: {fileID: 1133494613}
+ 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: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 40
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 0
+ m_MaxSize: 50
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\uD134 \uC885\uB8CC"
+--- !u!222 &1126581263
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1126581260}
--- !u!1 &1133696093
GameObject:
m_ObjectHideFlags: 0
@@ -12862,78 +12285,6 @@ CanvasRenderer:
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1133696093}
---- !u!1 &1140815819
-GameObject:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 1743336908019850, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- serializedVersion: 5
- m_Component:
- - component: {fileID: 1140815820}
- - component: {fileID: 1140815822}
- - component: {fileID: 1140815821}
- m_Layer: 5
- m_Name: Portrait
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1140815820
-RectTransform:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 224526507435140450, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 1140815819}
- 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: 2010621755}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0.5}
- m_AnchorMax: {x: 0, y: 0.5}
- m_AnchoredPosition: {x: 15, y: 0}
- m_SizeDelta: {x: 65, y: 65}
- m_Pivot: {x: 0, y: 0.5}
---- !u!114 &1140815821
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 114030843943203210, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 1140815819}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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 &1140815822
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 222202197206315964, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 1140815819}
--- !u!1 &1144131383
GameObject:
m_ObjectHideFlags: 0
@@ -13318,15 +12669,14 @@ RectTransform:
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: 2010621755}
+ m_Children: []
m_Father: {fileID: 415551725}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 580, y: 90}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &1194642868
MonoBehaviour:
@@ -15098,122 +14448,6 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1313675901}
---- !u!1 &1320531377
-GameObject:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 1255132643468478, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- serializedVersion: 5
- m_Component:
- - component: {fileID: 1320531378}
- - component: {fileID: 1320531381}
- - component: {fileID: 1320531380}
- - component: {fileID: 1320531379}
- m_Layer: 5
- m_Name: Take
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1320531378
-RectTransform:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 224183402562735034, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 1320531377}
- 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: 1564190312}
- m_Father: {fileID: 2010621755}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 1, y: 0.5}
- m_AnchorMax: {x: 1, y: 0.5}
- m_AnchoredPosition: {x: -15, y: 0}
- m_SizeDelta: {x: 65, y: 65}
- m_Pivot: {x: 1, y: 0.5}
---- !u!114 &1320531379
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 114385446297856416, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 1320531377}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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: 1320531380}
- m_OnClick:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
- Culture=neutral, PublicKeyToken=null
---- !u!114 &1320531380
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 114287023643772896, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 1320531377}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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: 10905, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
---- !u!222 &1320531381
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 222501145456896942, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 1320531377}
--- !u!1 &1332907349
GameObject:
m_ObjectHideFlags: 0
@@ -17723,84 +16957,6 @@ CanvasRenderer:
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1559029986}
---- !u!1 &1564190311
-GameObject:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 1582916256127388, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- serializedVersion: 5
- m_Component:
- - component: {fileID: 1564190312}
- - component: {fileID: 1564190314}
- - component: {fileID: 1564190313}
- m_Layer: 5
- m_Name: Deploytext
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1564190312
-RectTransform:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 224883646427157586, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 1564190311}
- 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: 1320531378}
- 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 &1564190313
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 114717537929520404, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 1564190311}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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: 10102, guid: 0000000000000000e000000000000000, type: 0}
- m_FontSize: 30
- m_FontStyle: 0
- m_BestFit: 0
- 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: '>>'
---- !u!222 &1564190314
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 222076202448385040, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 1564190311}
--- !u!1 &1564234280
GameObject:
m_ObjectHideFlags: 0
@@ -22608,31 +21764,6 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1986154316}
---- !u!224 &2010621755
-RectTransform:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 224220436238375300, guid: 8eb1ce4df7307bb4299ac484d65d4285,
- type: 2}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 85905714}
- 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: 1320531378}
- - {fileID: 1140815820}
- - {fileID: 1024384457}
- - {fileID: 641115509}
- - {fileID: 448828225}
- - {fileID: 52404737}
- m_Father: {fileID: 1194642867}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 580, y: 90}
- m_Pivot: {x: 0, y: 1}
--- !u!1 &2011525697
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/ManagementUIController.cs b/Assets/Scripts/ManagementUIController.cs
index bad61d8..3b43b1e 100644
--- a/Assets/Scripts/ManagementUIController.cs
+++ b/Assets/Scripts/ManagementUIController.cs
@@ -16,6 +16,7 @@ public class ManagementUIController : MonoBehaviour {
private LinkedList<Production> mDeployment;
//private IReadOnlyList<IProductionFactory> facList;
private IReadOnlyList<IProductionFactory> facList;
+ private IReadOnlyList<Quest> questList;
private GameObject gameManagerObject;
private GameManager gameManager;
@@ -26,15 +27,87 @@ public class ManagementUIController : MonoBehaviour {
private List<GameObject> EpicQlist, HighQlist, IntermediateQlist, LowQlist; // Unit production
private List<GameObject> CityQlist, CityBuildingQlist, NormalBuildingQlist;
private List<List<GameObject>> ASQlist;
+ private List<GameObject> DQQlist; //Deploied Quest Queue list
+ private List<GameObject> AQQlist; //Accepted Quest Queue list
+ private List<GameObject> CQQlist; //Completed Quset Queue list
+
+ public GameObject DQPrefab;
+ public GameObject AQPrefab;
+ public GameObject CQPrefab;
public GameObject proPrefab;
public GameObject depPrefab;
public GameObject productablePrefab; // prefab templates
+ public GameObject DQQueue;
+ public GameObject AQQueue;
+ public GameObject CQQueue;
public GameObject proQueue;
public GameObject depQueue;
public GameObject EpicQueue, HighQueue, IntermediateQueue, LowQueue; // Unit production
public GameObject CityQueue, CityBuildingQueue, NormalBuildingQueue; // Building production
+ public GameObject QuestInfo;
+ private Text[] questInfotexts;
+
+ //ManageMentUI ê°±ì‹ í•¨ìˆ˜
+ public void ManageFunction() // Management tab on/off button -> ManageMentUIActive
+ {
+ MakeSelectionQ();
+ MakeProductionQ();
+ MakeDeploymentQ();
+ foreach (GameObject dq in DQlist)
+ {
+ dq.GetComponent<DepPrefab>().SetButton(DQlist.IndexOf(dq));
+ }
+ }
+ void Awake()
+ {
+ DontDestroyOnLoad(this);
+ if (managementUIController == null)
+ {
+ managementUIController = this;
+ }
+ else
+ {
+ Destroy(this);
+ }
+ }
+
+ void Start()
+ {
+ if (managementUIController == this)
+ {
+ gameManager = GameManager.I;
+ game = gameManager.Game;
+ ASQlist = new List<List<GameObject>>();
+ ASQlist.Add(EpicQlist = new List<GameObject>());
+ ASQlist.Add(HighQlist = new List<GameObject>());
+ ASQlist.Add(IntermediateQlist = new List<GameObject>());
+ ASQlist.Add(LowQlist = new List<GameObject>());
+ ASQlist.Add(CityQlist = new List<GameObject>());
+ ASQlist.Add(CityBuildingQlist = new List<GameObject>());
+ ASQlist.Add(NormalBuildingQlist = new List<GameObject>());
+
+ PQlist = new List<GameObject>();
+ DQlist = new List<GameObject>();
+
+ DQQlist = new List<GameObject>();
+ AQQlist = new List<GameObject>();
+ CQQlist = new List<GameObject>();
+ questInfotexts = QuestInfo.GetComponentsInChildren<Text>();
+ }
+ else
+ {
+ Destroy(this);
+ }
+ }
+
+ void Update()
+ {
+ //Debug.Log(game);
+ mProduction = game.PlayerInTurn.Production;
+ mDeployment = game.PlayerInTurn.Deployment;
+ }
private void MakeSelectionQ()//ì„ íƒ í 프리팹 ìƒì„± 함수
{
@@ -55,12 +128,12 @@ public class ManagementUIController : MonoBehaviour {
PartSelectionQ(EpicQlist, EpicQueue, fac);
}
//내용물 ì—†ì„ ë•Œ 빈칸 채우기
- foreach(var qlist in ASQlist)
+ foreach (var qlist in ASQlist)
{
if (qlist.Count == 0)
{
GameObject productableQueue;
- switch(ASQlist.IndexOf(qlist))
+ switch (ASQlist.IndexOf(qlist))
{
case 0:
productableQueue = EpicQueue;
@@ -138,7 +211,7 @@ public class ManagementUIController : MonoBehaviour {
ASQlist.Add(NormalBuildingQlist = new List<GameObject>());
}
//ì„ íƒ í ì´ˆê¸°í™”ì— ì“°ì´ëŠ” 함수
- private void DeleteSQ(List<GameObject> SQlist)
+ private void DeleteSQ(List<GameObject> SQlist)
{
foreach (GameObject sq in SQlist)
{
@@ -147,61 +220,6 @@ public class ManagementUIController : MonoBehaviour {
SQlist.Clear();
}
- //ManageMentUI ê°±ì‹ í•¨ìˆ˜
- public void ManageFunction() // Management tab on/off button -> ManageMentUIActive
- {
- MakeSelectionQ();
- MakeProductionQ();
- MakeDeploymentQ();
- foreach (GameObject dq in DQlist)
- {
- dq.GetComponent<DepPrefab>().SetButton(DQlist.IndexOf(dq));
- }
- }
- void Awake()
- {
- DontDestroyOnLoad(this);
- if (managementUIController == null)
- {
- managementUIController = this;
- }
- else
- {
- Destroy(this);
- }
- }
-
- void Start()
- {
- if (managementUIController == this)
- {
- gameManager = GameManager.I;
- game = gameManager.Game;
- ASQlist = new List<List<GameObject>>();
- ASQlist.Add(EpicQlist = new List<GameObject>());
- ASQlist.Add(HighQlist = new List<GameObject>());
- ASQlist.Add(IntermediateQlist = new List<GameObject>());
- ASQlist.Add(LowQlist = new List<GameObject>());
- ASQlist.Add(CityQlist = new List<GameObject>());
- ASQlist.Add(CityBuildingQlist = new List<GameObject>());
- ASQlist.Add(NormalBuildingQlist = new List<GameObject>());
-
- PQlist = new List<GameObject>();
- DQlist = new List<GameObject>();
- }
- else
- {
- Destroy(this);
- }
- }
-
- void Update()
- {
- //Debug.Log(game);
- mProduction = game.PlayerInTurn.Production;
- mDeployment = game.PlayerInTurn.Deployment;
- }
-
public void MakeProductionQ()
{
List<GameObject> tempList = new List<GameObject>();
@@ -275,6 +293,169 @@ public class ManagementUIController : MonoBehaviour {
dq.GetComponent<DepPrefab>().SetButton(DQlist.IndexOf(dq));
}
}
+
+ public void MakeQuestQueue()
+ {
+ List<GameObject> tempDList = new List<GameObject>();
+ List<GameObject> tempAList = new List<GameObject>();
+ List<GameObject> tempCList = new List<GameObject>();
+ Debug.Log("QuestQueue making");
+ foreach (GameObject item in DQQlist)
+ {
+ Destroy(item);
+ }
+ DQQlist.Clear();
+ foreach (GameObject item in AQQlist)
+ {
+ Destroy(item);
+ }
+ AQQlist.Clear();
+ foreach (GameObject item in CQQlist)
+ {
+ Destroy(item);
+ }
+ CQQlist.Clear();
+ questList = game.PlayerInTurn.Quests;
+ Debug.Log("Quest : " + questList.Count);
+ foreach (Quest qst in questList)
+ {
+ switch (qst.Status)
+ {
+ case QuestStatus.Deployed:
+ var dqPrefab = Instantiate(DQPrefab, new Vector3(0f, 0f, 0f), Quaternion.identity);
+ dqPrefab.transform.SetParent(DQQueue.transform);
+ dqPrefab.transform.localScale = new Vector3(1f, 1f, 1f);
+ dqPrefab.transform.localPosition = new Vector3(0f, 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);
+ aqPrefab.transform.SetParent(AQQueue.transform);
+ aqPrefab.transform.localScale = new Vector3(1f, 1f, 1f);
+ aqPrefab.transform.localPosition = new Vector3(0f, 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);
+ cqPrefab.transform.SetParent(CQQueue.transform);
+ cqPrefab.transform.localScale = new Vector3(1f, 1f, 1f);
+ cqPrefab.transform.localPosition = new Vector3(0f, 0f, 0f);
+ cqPrefab.name = "CQuest";
+ tempCList.Add(cqPrefab.GetComponent<Quests>().MakeCItem(qst));
+ break;
+ case QuestStatus.Disabled:
+ break;
+
+ default:
+ Debug.Log("Undifined Status");
+ throw new System.Exception("Undifined Status");
+ }
+ }
+ if (tempDList.Count == 0)
+ {
+ var dqPrefab = Instantiate(DQPrefab, new Vector3(0f, 0f, 0f), Quaternion.identity);
+ dqPrefab.transform.SetParent(DQQueue.transform);
+ dqPrefab.transform.localScale = new Vector3(1f, 1f, 1f);
+ dqPrefab.transform.localPosition = new Vector3(0f, 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);
+ aqPrefab.transform.SetParent(AQQueue.transform);
+ aqPrefab.transform.localScale = new Vector3(1f, 1f, 1f);
+ aqPrefab.transform.localPosition = new Vector3(0f, 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);
+ cqPrefab.transform.SetParent(CQQueue.transform);
+ cqPrefab.transform.localScale = new Vector3(1f, 1f, 1f);
+ cqPrefab.transform.localPosition = new Vector3(0f, 0f, 0f);
+ cqPrefab.name = "CQuest_null";
+ tempCList.Add(cqPrefab.GetComponent<Quests>().MakeCItem());
+ }
+ CQQlist = tempCList;
+
+ foreach (GameObject dq in DQQlist)
+ {
+ dq.GetComponent<Quests>().SetDButton();
+ }
+ foreach (GameObject aq in AQQlist)
+ {
+ aq.GetComponent<Quests>().SetAButton();
+ }
+ foreach (GameObject cq in CQQlist)
+ {
+ cq.GetComponent<Quests>().SetCButton();
+ }
+
+ }
+ public void SetQuestInfo(Quest qst)
+ {
+ if (qst == null)
+ {
+ foreach(Text txt in questInfotexts)
+ {
+ switch(txt.name)
+ {
+ default: txt.text = "";
+ break;
+ }
+ }
+ QuestInfo.SetActive(false);
+ }
+ else
+ {
+
+ foreach (Text txt in questInfotexts)
+ {
+ switch (txt.name)
+ {
+ case "QuestName":
+ txt.text = qst.Name;
+ break;
+ case "Offered Turn":
+ txt.text = "ê²Œì‹œëœ í„´ : í„´ " + qst.PostingTurn; // qstì—ì„œ 불러올 수 ì—†ìŒ
+ if (qst.PostingTurn == -1)
+ txt.text = "ê²Œì‹œëœ í„´ : í„´ 1";
+ break;
+ case "Available Turns":
+ txt.text = "게시 기한 : " + qst.LeftTurn + "í„´ ë™ì•ˆ";
+ if (qst.LimitTurn == -1)
+ txt.text = "게시 기한 : ì˜êµ¬ížˆ";
+ break;
+ case "Deadline":
+ txt.text = "ì œí•œ 기한 : " + qst.LimitTurn +"까지";
+ if (qst.LimitTurn == -1)
+ txt.text = "ì œí•œ 기한 : ì—†ìŒ";
+ break;
+ case "Country Name":
+ //txt.text = "게시 êµê°€ : " + qst.Requester.ToString();
+ break;
+ case "Conditions":
+ txt.text = qst.GoalNotice;
+ break;
+ case "Rewards":
+ txt.text = qst.RewardNotice;
+ break;
+ default:
+ txt.text = "";
+ break;
+ }
+ }
+ QuestInfo.SetActive(true);
+ }
+ }
public static ManagementUIController GetManagementUIController()
{
if(managementUIController == null)
diff --git a/Assets/Scripts/Prefabs/Quests.cs b/Assets/Scripts/Prefabs/Quests.cs
new file mode 100644
index 0000000..3c2d903
--- /dev/null
+++ b/Assets/Scripts/Prefabs/Quests.cs
@@ -0,0 +1,367 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+using CivModel;
+using CivModel.Common;
+
+public class Quests : MonoBehaviour {
+
+ public Quest quest;
+
+ private Text[] textarguments;
+ private Image[] images;
+ private Button[] buttons;
+ // Use this for initialization
+ void Start () {
+ textarguments = gameObject.GetComponentsInChildren<Text>();
+ images = gameObject.GetComponentsInChildren<Image>();
+ buttons = gameObject.GetComponentsInChildren<Button>();
+ }
+
+ // Update is called once per frame
+ void Update () {
+
+ }
+
+ public void AcceptItem(Quest qst)
+ {
+ qst.Accept();
+ ManagementUIController.GetManagementUIController().MakeQuestQueue();
+ }
+
+ public void CompleteItem(Quest quest)
+ {
+ quest.Complete();
+ ManagementUIController.GetManagementUIController().MakeQuestQueue();
+ }
+
+
+ public GameObject MakeDItem(Quest quest)
+ {
+ textarguments = gameObject.GetComponentsInChildren<Text>();
+ images = gameObject.GetComponentsInChildren<Image>();
+ buttons = gameObject.GetComponentsInChildren<Button>();
+ this.quest = quest;
+ string leftturn;
+ if(quest.LeftTurn == -1)
+ {
+ leftturn = "ì˜êµ¬ì ";
+ }
+ else
+ {
+ leftturn = quest.LeftTurn.ToString() + "í„´ 남ìŒ";
+ }
+ //image관리
+ //.sprite = Resources.Load<Sprite>("Unit_portrait/" + nameofProduction + "_portrait");
+ foreach (Text txt in textarguments)
+ {
+ switch (txt.name)
+ {
+ case "Country":
+ //txt.text = quest.Requester.ToString();
+ break;
+ case "NumberOfUnits":
+ txt.text = "X 1";
+ break;
+ case "TurnsLeft":
+ txt.text = leftturn;
+ break;
+ }
+ }
+ return this.gameObject;
+ }
+
+ public GameObject MakeDItem()
+ {
+ textarguments = gameObject.GetComponentsInChildren<Text>();
+ images = gameObject.GetComponentsInChildren<Image>();
+ buttons = gameObject.GetComponentsInChildren<Button>();
+ quest = null;
+ foreach (Image img in images)
+ {
+ switch (img.name)
+ {
+ case "Portrait":
+ img.enabled = false;
+ break;
+ case "ResourceImage":
+ img.enabled = false;
+ break;
+ }
+ }
+
+ foreach (Text txt in textarguments)
+ {
+ switch (txt.name)
+ {
+ case "Country":
+ txt.text = "비었ìŒ";
+ break;
+ case "NumberOfUnits":
+ txt.text = "";
+ break;
+ case "TurnsLeft":
+ txt.text = "";
+ break;
+ }
+ }
+
+ foreach (Button but in buttons)
+ {
+ but.enabled = false;
+ }
+ return this.gameObject;
+ }
+
+ public void SetDButton()
+ {
+ if (quest == null)
+ {
+ foreach (Button but in buttons)
+ {
+ switch (but.name)
+ {
+ case "DQuest_null":
+ break;
+ default:
+ but.gameObject.SetActive(false);
+ break;
+ }
+ }
+ }
+ else
+ {
+ foreach (Button but in buttons)
+ {
+ switch (but.name)
+ {
+ case "Take":
+ but.onClick.AddListener(delegate () { AcceptItem(quest); });
+ break;
+ case "DQuest":
+ but.onClick.AddListener(delegate () { ShowInfoofQuest(quest); });
+ break;
+ default:
+ Debug.Log("Undifined Button : " + but.name);
+ break;
+ }
+ }
+ }
+ }
+
+ public GameObject MakeAItem(Quest quest)
+ {
+ textarguments = gameObject.GetComponentsInChildren<Text>();
+ images = gameObject.GetComponentsInChildren<Image>();
+ buttons = gameObject.GetComponentsInChildren<Button>();
+ this.quest = quest;
+ string leftturn;
+ if (quest.LeftTurn == -1)
+ {
+ leftturn = "ì˜êµ¬ì ";
+ }
+ else
+ {
+ leftturn = quest.LeftTurn.ToString() + "í„´ 남ìŒ";
+ }
+ //image관리
+ //.sprite = Resources.Load<Sprite>("Unit_portrait/" + nameofProduction + "_portrait");
+ foreach (Text txt in textarguments)
+ {
+ switch (txt.name)
+ {
+ case "Country":
+ //txt.text = quest.Requester.ToString();
+ break;
+ case "NumberOfUnits":
+ txt.text = "X 1";
+ break;
+ case "TurnsLeft":
+ txt.text = leftturn;
+ break;
+ }
+ }
+ return this.gameObject;
+ }
+
+ public GameObject MakeAItem()
+ {
+ textarguments = gameObject.GetComponentsInChildren<Text>();
+ images = gameObject.GetComponentsInChildren<Image>();
+ buttons = gameObject.GetComponentsInChildren<Button>();
+ quest = null;
+ foreach (Image img in images)
+ {
+ switch (img.name)
+ {
+ case "Portrait":
+ img.enabled = false;
+ break;
+ case "ResourceImage":
+ img.enabled = false;
+ break;
+ }
+ }
+
+ foreach (Text txt in textarguments)
+ {
+ switch (txt.name)
+ {
+ case "Country":
+ txt.text = "비었ìŒ";
+ break;
+ case "NumberOfUnits":
+ txt.text = "";
+ break;
+ case "TurnsLeft":
+ txt.text = "";
+ break;
+ }
+ }
+
+ foreach (Button but in buttons)
+ {
+ but.enabled = false;
+ }
+ return this.gameObject;
+ }
+
+ public void SetAButton()
+ {
+ if (quest == null)
+ {
+ foreach (Button but in buttons)
+ {
+ switch (but.name)
+ {
+ case "AQuest_null":
+ break;
+ default:
+ but.gameObject.SetActive(false);
+ break;
+ }
+ }
+ }
+ else
+ {
+ foreach (Button but in buttons)
+ {
+ switch (but.name)
+ {
+ case "AQuest":
+ but.onClick.AddListener(delegate () { ShowInfoofQuest(quest); });
+ break;
+ default:
+ Debug.Log("Undifined Button : " + but.name);
+ break;
+ }
+ }
+ }
+ }
+ public GameObject MakeCItem(Quest quest)
+ {
+ textarguments = gameObject.GetComponentsInChildren<Text>();
+ images = gameObject.GetComponentsInChildren<Image>();
+ buttons = gameObject.GetComponentsInChildren<Button>();
+ this.quest = quest;
+ //image관리
+ //.sprite = Resources.Load<Sprite>("Unit_portrait/" + nameofProduction + "_portrait");
+ foreach (Text txt in textarguments)
+ {
+ switch (txt.name)
+ {
+ case "Country":
+ //txt.text = quest.Requester.ToString();
+ break;
+ case "NumberOfUnits":
+ txt.text = "X 1";
+ break;
+ case "TurnsLeft":
+ txt.text = "종료ë¨";
+ //몇 í„´ì— ë났는지 ì½ì–´ì˜¬ 방법 ì—†ìŒ.
+ break;
+ }
+ }
+ return this.gameObject;
+ }
+ public GameObject MakeCItem()
+ {
+ textarguments = gameObject.GetComponentsInChildren<Text>();
+ images = gameObject.GetComponentsInChildren<Image>();
+ buttons = gameObject.GetComponentsInChildren<Button>();
+ quest = null;
+ foreach (Image img in images)
+ {
+ switch (img.name)
+ {
+ case "Portrait":
+ img.enabled = false;
+ break;
+ case "ResourceImage":
+ img.enabled = false;
+ break;
+ }
+ }
+
+ foreach (Text txt in textarguments)
+ {
+ switch (txt.name)
+ {
+ case "Country":
+ txt.text = "비었ìŒ";
+ break;
+ case "NumberOfUnits":
+ txt.text = "";
+ break;
+ case "TurnsLeft":
+ txt.text = "";
+ break;
+ }
+ }
+
+ foreach (Button but in buttons)
+ {
+ but.enabled = false;
+ }
+ return this.gameObject;
+ }
+
+ public void SetCButton()
+ {
+ if (quest == null)
+ {
+ foreach (Button but in buttons)
+ {
+ switch (but.name)
+ {
+ case "CQuest_null":
+ break;
+ default:
+ but.gameObject.SetActive(false);
+ break;
+ }
+ }
+ }
+ else
+ {
+ foreach (Button but in buttons)
+ {
+ switch (but.name)
+ {
+ case "CQuest":
+ but.onClick.AddListener(delegate () { ShowInfoofQuest(quest); });
+ break;
+ default:
+ Debug.Log("Undifined Button : " + but.name);
+ break;
+ }
+ }
+ }
+ }
+ public void ShowInfoofQuest(Quest quest)
+ {
+ ManagementUIController.GetManagementUIController().SetQuestInfo(quest);
+ return;
+ }
+}
diff --git a/Assets/Scripts/Prefabs/Quests.cs.meta b/Assets/Scripts/Prefabs/Quests.cs.meta
new file mode 100644
index 0000000..f95db8c
--- /dev/null
+++ b/Assets/Scripts/Prefabs/Quests.cs.meta
@@ -0,0 +1,13 @@
+fileFormatVersion: 2
+guid: 6e9dcfa9a45da2f45bdcbdc531c3f51b
+timeCreated: 1519904732
+licenseType: Free
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/UIManager.cs b/Assets/Scripts/UIManager.cs
index ce62db9..ea76641 100644
--- a/Assets/Scripts/UIManager.cs
+++ b/Assets/Scripts/UIManager.cs
@@ -135,6 +135,7 @@ public class UIManager : MonoBehaviour {
public void QuestUIActive() // Quest UI tab
{
SkillSet.SetActive(false);
+ uicontroller.MakeQuestQueue();
QuestUI.SetActive(true);
MapUI.SetActive(false);
ManagementUI.SetActive(false);
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
index c0a7b29..e6cd1f9 100644
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 2017.1.0p4
+m_EditorVersion: 2017.3.0f3
--
2.22.0