Commit 755664ce authored by 18손재민's avatar 18손재민

맵 에디터에서 이제 총알 및 목표 바닥을 추가할 수 있음

parent 53412f4b
......@@ -106,7 +106,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mapPos: {x: 1, y: 0}
isPassed: 0
isGoalFloor: 0
--- !u!1 &1634709099193762938
GameObject:
......@@ -214,7 +213,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mapPos: {x: -2, y: -1}
isPassed: 0
isGoalFloor: 0
--- !u!1 &1638206002697659172
GameObject:
......@@ -322,7 +320,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mapPos: {x: 1, y: 1}
isPassed: 0
isGoalFloor: 0
--- !u!1 &1737410653383664023
GameObject:
......@@ -378,6 +375,7 @@ MonoBehaviour:
- {fileID: 6317210441967747213}
- {fileID: 8692496119037193698}
- {fileID: 4002211523417806573}
initialBullets: 00000000010000000200000000000000010000000200000000000000010000000200000000000000
clearConditions:
- type: 0
count: 0
......@@ -491,7 +489,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mapPos: {x: 2, y: 0}
isPassed: 0
isGoalFloor: 0
--- !u!1 &2189700681577347922
GameObject:
......@@ -599,7 +596,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mapPos: {x: -2, y: 2}
isPassed: 0
isGoalFloor: 0
--- !u!1 &2292282653549884484
GameObject:
......@@ -707,7 +703,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mapPos: {x: -1, y: 2}
isPassed: 0
isGoalFloor: 0
--- !u!1 &2339437859421285817
GameObject:
......@@ -815,7 +810,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mapPos: {x: -2, y: -2}
isPassed: 0
isGoalFloor: 0
--- !u!1 &2681926362236754680
GameObject:
......@@ -923,7 +917,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mapPos: {x: 2, y: 1}
isPassed: 0
isGoalFloor: 0
--- !u!1 &3525591482656589422
GameObject:
......@@ -1031,7 +1024,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mapPos: {x: 2, y: -2}
isPassed: 0
isGoalFloor: 0
--- !u!1 &4007647678807291638
GameObject:
......@@ -1264,7 +1256,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mapPos: {x: 1, y: -2}
isPassed: 0
isGoalFloor: 0
--- !u!1 &4592160369612705167
GameObject:
......@@ -1372,7 +1363,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mapPos: {x: 1, y: -1}
isPassed: 0
isGoalFloor: 0
--- !u!1 &4709249395185914413
GameObject:
......@@ -1480,7 +1470,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mapPos: {x: 1, y: 2}
isPassed: 0
isGoalFloor: 0
--- !u!1 &4810397660174508062
GameObject:
......@@ -1588,7 +1577,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mapPos: {x: -1, y: -1}
isPassed: 0
isGoalFloor: 0
--- !u!1 &5069305046428251933
GameObject:
......@@ -1696,7 +1684,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mapPos: {x: -1, y: 0}
isPassed: 0
isGoalFloor: 0
--- !u!1 &5342110572568681991
GameObject:
......@@ -1804,7 +1791,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mapPos: {x: 0, y: -2}
isPassed: 0
isGoalFloor: 0
--- !u!1 &5390496715387352304
GameObject:
......@@ -2092,7 +2078,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mapPos: {x: 0, y: 1}
isPassed: 0
isGoalFloor: 0
--- !u!1 &6532917746544365902
GameObject:
......@@ -2234,7 +2219,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mapPos: {x: -2, y: 1}
isPassed: 0
isGoalFloor: 0
--- !u!1 &7141810549857698684
GameObject:
......@@ -2342,7 +2326,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mapPos: {x: 0, y: 0}
isPassed: 0
isGoalFloor: 0
--- !u!1 &7422189717627061705
GameObject:
......@@ -2575,7 +2558,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mapPos: {x: -2, y: 0}
isPassed: 0
isGoalFloor: 0
--- !u!1 &7560450311381198066
GameObject:
......@@ -2838,7 +2820,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mapPos: {x: -1, y: 1}
isPassed: 0
isGoalFloor: 0
--- !u!1 &8683807963293059402
GameObject:
......@@ -2946,7 +2927,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mapPos: {x: 0, y: 2}
isPassed: 0
isGoalFloor: 0
--- !u!1 &8695425579486219508
GameObject:
......@@ -3054,7 +3034,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mapPos: {x: 2, y: 2}
isPassed: 0
isGoalFloor: 0
--- !u!1 &8852115476851130467
GameObject:
......@@ -3162,7 +3141,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mapPos: {x: 0, y: -1}
isPassed: 0
isGoalFloor: 0
--- !u!1 &9046791506793280589
GameObject:
......@@ -3270,7 +3248,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mapPos: {x: -1, y: -2}
isPassed: 0
isGoalFloor: 0
--- !u!1 &9206324191454810788
GameObject:
......@@ -3378,5 +3355,4 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mapPos: {x: 2, y: -1}
isPassed: 0
isGoalFloor: 0
......@@ -190,11 +190,11 @@ RectTransform:
m_Children:
- {fileID: 1439117913}
m_Father: {fileID: 1444571407667829093}
m_RootOrder: 15
m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 125, y: -555}
m_AnchoredPosition: {x: 127, y: -787}
m_SizeDelta: {x: 200, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &591598821
......@@ -278,12 +278,12 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1444571408780882988}
m_MethodName: SwitchMode
m_MethodName: AddBulletToPlayer
m_Mode: 3
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 4
m_IntArgument: 2
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
......@@ -1147,7 +1147,7 @@ GameObject:
- component: {fileID: 1491349558}
- component: {fileID: 1491349557}
m_Layer: 5
m_Name: AddTruthBullet
m_Name: Add Truth Bullet
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
......@@ -1166,11 +1166,11 @@ RectTransform:
m_Children:
- {fileID: 956080829}
m_Father: {fileID: 1444571407667829093}
m_RootOrder: 13
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 125, y: -327}
m_AnchoredPosition: {x: 127, y: -559}
m_SizeDelta: {x: 200, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1491349559
......@@ -1254,12 +1254,12 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1444571408780882988}
m_MethodName: SwitchMode
m_MethodName: AddBulletToPlayer
m_Mode: 3
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 4
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
......@@ -2406,6 +2406,8 @@ RectTransform:
- {fileID: 1805658145}
- {fileID: 2948705042256650659}
- {fileID: 1313533564}
- {fileID: 6637246300491141862}
- {fileID: 2435886599595463046}
- {fileID: 1491349556}
- {fileID: 5029751123611918189}
- {fileID: 591598818}
......@@ -3495,6 +3497,85 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Camera
--- !u!1 &3619241379655890904
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7148314812127770413}
- component: {fileID: 6689574976004243146}
- component: {fileID: 1373361632609010931}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7148314812127770413
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3619241379655890904}
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: 6637246300491141862}
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!222 &6689574976004243146
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3619241379655890904}
m_CullTransparentMesh: 0
--- !u!114 &1373361632609010931
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3619241379655890904}
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: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 50
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Start Floor
--- !u!1 &3908733202205500169
GameObject:
m_ObjectHideFlags: 0
......@@ -3606,11 +3687,11 @@ RectTransform:
m_Children:
- {fileID: 2061816039799738020}
m_Father: {fileID: 1444571407667829093}
m_RootOrder: 14
m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 125, y: -441}
m_AnchoredPosition: {x: 127, y: -673}
m_SizeDelta: {x: 200, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3826560952422209129
......@@ -3690,6 +3771,138 @@ MonoBehaviour:
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 2845411011234001992}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1444571408780882988}
m_MethodName: AddBulletToPlayer
m_Mode: 3
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 1
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!1 &4719512598923252530
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6637246300491141862}
- component: {fileID: 204778065464148859}
- component: {fileID: 8397903675729489779}
- component: {fileID: 1657427873559484382}
m_Layer: 5
m_Name: Add Start Floor
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6637246300491141862
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4719512598923252530}
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: 7148314812127770413}
m_Father: {fileID: 1444571407667829093}
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 125, y: -327}
m_SizeDelta: {x: 200, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &204778065464148859
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4719512598923252530}
m_CullTransparentMesh: 0
--- !u!114 &8397903675729489779
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4719512598923252530}
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: 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
m_UseSpriteMesh: 0
--- !u!114 &1657427873559484382
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4719512598923252530}
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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Highlighted
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 8397903675729489779}
m_OnClick:
m_PersistentCalls:
m_Calls:
......@@ -3917,6 +4130,138 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: WMannequin
--- !u!1 &6503129987796123739
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2435886599595463046}
- component: {fileID: 9082710827489888098}
- component: {fileID: 5166022344905213218}
- component: {fileID: 3275578447202695653}
m_Layer: 5
m_Name: Add Goal Floor
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2435886599595463046
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6503129987796123739}
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: 4071196240039867282}
m_Father: {fileID: 1444571407667829093}
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 127, y: -441}
m_SizeDelta: {x: 200, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9082710827489888098
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6503129987796123739}
m_CullTransparentMesh: 0
--- !u!114 &5166022344905213218
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6503129987796123739}
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: 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
m_UseSpriteMesh: 0
--- !u!114 &3275578447202695653
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6503129987796123739}
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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Highlighted
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 5166022344905213218}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1444571408780882988}
m_MethodName: SwitchMode
m_Mode: 3
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 9
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!1 &7848140379936513276
GameObject:
m_ObjectHideFlags: 0
......@@ -4082,3 +4427,82 @@ Transform:
m_Father: {fileID: 1444571407667829093}
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &9161267794309280022
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4071196240039867282}
- component: {fileID: 7447194757884088976}
- component: {fileID: 2501654899637991879}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4071196240039867282
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9161267794309280022}
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: 2435886599595463046}
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!222 &7447194757884088976
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9161267794309280022}
m_CullTransparentMesh: 0
--- !u!114 &2501654899637991879
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9161267794309280022}
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: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 50
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Goal Floor
......@@ -253,48 +253,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1491349555, guid: 06619682524bc5149b5c3092da0722f2, type: 3}
propertyPath: m_Name
value: Add Truth Bullet
objectReference: {fileID: 0}
- target: {fileID: 939019771, guid: 06619682524bc5149b5c3092da0722f2, type: 3}
propertyPath: m_Name
value: Add False Bulltet
objectReference: {fileID: 0}
- target: {fileID: 771201811, guid: 06619682524bc5149b5c3092da0722f2, type: 3}
propertyPath: m_Name
value: Add Mirror Bullet
objectReference: {fileID: 0}
- target: {fileID: 1737354433, guid: 06619682524bc5149b5c3092da0722f2, type: 3}
propertyPath: m_Text
value: Add Mirror Bullet
objectReference: {fileID: 0}
- target: {fileID: 591598819, guid: 06619682524bc5149b5c3092da0722f2, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: AddBulletToPlayer
objectReference: {fileID: 0}
- target: {fileID: 591598819, guid: 06619682524bc5149b5c3092da0722f2, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1491349557, guid: 06619682524bc5149b5c3092da0722f2, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: AddBulletToPlayer
objectReference: {fileID: 0}
- target: {fileID: 1491349557, guid: 06619682524bc5149b5c3092da0722f2, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6056193433934831073, guid: 06619682524bc5149b5c3092da0722f2,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: AddBulletToPlayer
objectReference: {fileID: 0}
- target: {fileID: 6056193433934831073, guid: 06619682524bc5149b5c3092da0722f2,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 06619682524bc5149b5c3092da0722f2, type: 3}
--- !u!1 &797716766
......
......@@ -25,7 +25,7 @@ public class MapManager : SingletonBehaviour<MapManager>
public void LoadMap(Map _newMap)
{
if(currentMap != null)
if (currentMap != null)
Destroy(currentMap.gameObject);
currentMap = Instantiate(_newMap);
currentMap.transform.position = new Vector3(0, 0, 0);
......@@ -33,6 +33,8 @@ public class MapManager : SingletonBehaviour<MapManager>
GameManager.inst.SetClearIndex(currentMap);
for (int i = 0; i < currentMap.startFloors.Count; i++)
PlayerController.inst.CreatePlayer(currentMap.startFloors[i]);
for (int i = 0; i < currentMap.initialBullets.Count; i++)
PlayerController.inst.bulletList.Add(currentMap.initialBullets[i]);
}
public IEnumerator Rebaker()
{
......
......@@ -14,6 +14,7 @@ public class Map : MonoBehaviour
public GameObject walls;
public GameObject objects;
public List<Floor> startFloors;
public List<BulletCode> initialBullets;
public List<ClearCondition> clearConditions;
......
......@@ -98,7 +98,8 @@ public class MapEditor : SingletonBehaviour<MapEditor>
}
public void AddBulletToPlayer(int bulletMode)
{
PlayerController.inst.bulletList.Add((BulletCode)bulletMode);
currentMap.initialBullets.Add((BulletCode)bulletMode);
//PlayerController.inst.bulletList.Add((BulletCode)bulletMode);
}
private void Awake()
......@@ -107,6 +108,7 @@ public class MapEditor : SingletonBehaviour<MapEditor>
isEditorStarted = false;
isCreateMode = true;
startSigns = new Dictionary<Floor, GameObject>();
goalSigns = new Dictionary<Floor, GameObject>();
}
// Start is called before the first frame update
......@@ -189,7 +191,8 @@ public class MapEditor : SingletonBehaviour<MapEditor>
else
{
currentMap.GetFloorAtPos(clickedPos).isGoalFloor = true;
goalSigns.Add(currentMap.GetFloorAtPos(clickedPos), Instantiate(goalSign));
goalSigns.Add(currentMap.GetFloorAtPos(clickedPos),
Instantiate(goalSign));
goalSigns[currentMap.GetFloorAtPos(clickedPos)].transform.position = new Vector3(clickedPos.x, 2, clickedPos.y);
}
}
......
......@@ -70,16 +70,6 @@ public class PlayerController : SingletonBehaviour<PlayerController>
void Start()
{
prePos = MapPos;
bulletList.Add(BulletCode.Mirror);
bulletList.Add(BulletCode.False);
bulletList.Add(BulletCode.Mirror);
bulletList.Add(BulletCode.False);
bulletList.Add(BulletCode.Mirror);
bulletList.Add(BulletCode.False);
bulletList.Add(BulletCode.Mirror);
bulletList.Add(BulletCode.False);
bulletList.Add(BulletCode.Mirror);
bulletList.Add(BulletCode.False);
}
// Update is called once per frame
......
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