Commit 2e584dc7 authored by redsuncore's avatar redsuncore

Quest Now Available

Quest View 구현
parent fae78858
......@@ -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}
......
......@@ -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
......
......@@ -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
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
fileFormatVersion: 2
guid: 6e9dcfa9a45da2f45bdcbdc531c3f51b
timeCreated: 1519904732
licenseType: Free
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
......@@ -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);
......
m_EditorVersion: 2017.1.0p4
m_EditorVersion: 2017.3.0f3
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment