Commit 2598cd3e authored by 18신대성's avatar 18신대성

셀렉트창 스크롤로 바꿈, 멘트들 인코딩 다 바꿈, 스테이지 넘어가는게 이상한 오류 해결, 전역 빛 추가

parent bee32991
This diff is collapsed.
{"objects":[{"tag":0,"xPos":10.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":0.0},{"tag":9,"xPos":0.0,"yPos":0.0},{"tag":4,"xPos":-1.0,"yPos":-1.0}],"clears":[{"type":0,"goal":1}],"cases":[],"bullets":[],"comments":"캐릭터를 클릭하고 이동할 칸을 클릭하여 이동시킬 수 있습니다.\n오른쪽 위의 목표를 수행하십시오."} {"objects":[{"tag":0,"xPos":10.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":0.0},{"tag":9,"xPos":0.0,"yPos":0.0},{"tag":4,"xPos":-1.0,"yPos":-1.0}],"clears":[{"type":0,"goal":1}],"cases":[],"bullets":[],"comments":"캐릭터를 클릭하고 이동할 칸을 클릭하여 이동시킬 수 있습니다.\n오른쪽 위의 목표를 수행하십시오."}
\ No newline at end of file \ No newline at end of file
{"objects":[{"tag":0,"xPos":10.0,"yPos":0.0},{"tag":2,"xPos":-1.0,"yPos":-0.5},{"tag":1,"xPos":-1.0,"yPos":0.0},{"tag":9,"xPos":-1.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":0.0},{"tag":4,"xPos":-1.0,"yPos":-1.0}],"clears":[{"type":0,"goal":1}],"cases":[],"bullets":[],"comments":"화면을 오른쪽 버튼 드래그, 휠 버튼 드래그하여 맵을 둘러볼 수 있습니다."} {"objects":[{"tag":0,"xPos":10.0,"yPos":0.0},{"tag":2,"xPos":-1.0,"yPos":-0.5},{"tag":1,"xPos":-1.0,"yPos":0.0},{"tag":9,"xPos":-1.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":0.0},{"tag":4,"xPos":-1.0,"yPos":-1.0}],"clears":[{"type":0,"goal":1}],"cases":[],"bullets":[],"comments":"화면을 오른쪽 버튼 드래그, 휠 버튼 드래그하여 맵을 둘러볼 수 있습니다."}
\ No newline at end of file \ No newline at end of file
{"objects":[{"tag":0,"xPos":10.0,"yPos":0.0},{"tag":2,"xPos":-1.0,"yPos":-0.5},{"tag":3,"xPos":0.0,"yPos":-0.5},{"tag":1,"xPos":-1.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":0.0},{"tag":9,"xPos":0.0,"yPos":0.0},{"tag":4,"xPos":-1.0,"yPos":-1.0}],"clears":[{"type":0,"goal":1}],"cases":[],"bullets":[0],"comments":"캐릭터를 1.5초간 클릭하여 발사모드로 전환할 수 있습니다.\n발사모드에서 왼쪽 클릭으로 발사, 오른쪽 클릭으로 발사모드를 종료합니다.\n녹색 '진실탄'으로 거울을 파괴할 수 있습니다."} {"objects":[{"tag":0,"xPos":10.0,"yPos":0.0},{"tag":2,"xPos":-1.0,"yPos":-0.5},{"tag":3,"xPos":0.0,"yPos":-0.5},{"tag":1,"xPos":-1.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":0.0},{"tag":9,"xPos":0.0,"yPos":0.0},{"tag":4,"xPos":-1.0,"yPos":-1.0}],"clears":[{"type":0,"goal":1}],"cases":[],"bullets":[0],"comments":"캐릭터를 1.5초간 클릭하여 발사모드로 전환할 수 있습니다.\n발사모드에서 왼쪽 클릭으로 발사, 오른쪽 클릭으로 발사모드를 종료합니다.\n녹색 '진실탄'으로 거울을 파괴할 수 있습니다."}
\ No newline at end of file \ No newline at end of file
{"objects":[{"tag":0,"xPos":25.0,"yPos":0.0},{"tag":2,"xPos":-1.0,"yPos":-0.5},{"tag":3,"xPos":0.0,"yPos":-0.5},{"tag":1,"xPos":-1.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":0.0},{"tag":1,"xPos":1.0,"yPos":-1.0},{"tag":1,"xPos":1.0,"yPos":-2.0},{"tag":1,"xPos":1.0,"yPos":2.0},{"tag":9,"xPos":1.0,"yPos":2.0},{"tag":4,"xPos":-1.0,"yPos":-1.0}],"clears":[{"type":0,"goal":1}],"cases":[],"bullets":[1],"comments":"빨간색 '거짓탄'을 거울에 발사하면 거울에 비치던 것이 실재가 됩니다.\n탄환은 우측 하단에 표시되어있습니다."} {"objects":[{"tag":0,"xPos":25.0,"yPos":0.0},{"tag":2,"xPos":-1.0,"yPos":-0.5},{"tag":3,"xPos":0.0,"yPos":-0.5},{"tag":1,"xPos":-1.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":0.0},{"tag":1,"xPos":1.0,"yPos":-1.0},{"tag":1,"xPos":1.0,"yPos":-2.0},{"tag":1,"xPos":1.0,"yPos":2.0},{"tag":9,"xPos":1.0,"yPos":2.0},{"tag":4,"xPos":-1.0,"yPos":-1.0}],"clears":[{"type":0,"goal":1}],"cases":[],"bullets":[1],"comments":"빨간색 '거짓탄'을 거울에 발사하면 거울에 비치던 것이 실재가 됩니다.\n탄환은 우측 하단에 표시되어있습니다."}
\ No newline at end of file \ No newline at end of file
{"objects":[{"tag":0,"xPos":15.0,"yPos":0.0},{"tag":2,"xPos":-1.0,"yPos":0.5},{"tag":3,"xPos":0.0,"yPos":0.5},{"tag":2,"xPos":1.0,"yPos":0.5},{"tag":1,"xPos":-1.0,"yPos":1.0},{"tag":1,"xPos":-1.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":0.0},{"tag":1,"xPos":0.0,"yPos":1.0},{"tag":1,"xPos":1.0,"yPos":1.0},{"tag":9,"xPos":1.0,"yPos":1.0},{"tag":1,"xPos":1.0,"yPos":0.0},{"tag":1,"xPos":1.0,"yPos":-1.0},{"tag":4,"xPos":-1.0,"yPos":-1.0},{"tag":5,"xPos":0.0,"yPos":-1.0}],"clears":[{"type":0,"goal":1}],"cases":[0],"bullets":[],"comments":"어떤 서류가방은 탄을 제공합니다.\n획득한 탄은 가장 마지막에 발사합니다."} {"objects":[{"tag":0,"xPos":15.0,"yPos":0.0},{"tag":2,"xPos":-1.0,"yPos":0.5},{"tag":3,"xPos":0.0,"yPos":0.5},{"tag":2,"xPos":1.0,"yPos":0.5},{"tag":1,"xPos":-1.0,"yPos":1.0},{"tag":1,"xPos":-1.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":0.0},{"tag":1,"xPos":0.0,"yPos":1.0},{"tag":1,"xPos":1.0,"yPos":1.0},{"tag":9,"xPos":1.0,"yPos":1.0},{"tag":1,"xPos":1.0,"yPos":0.0},{"tag":1,"xPos":1.0,"yPos":-1.0},{"tag":4,"xPos":-1.0,"yPos":-1.0},{"tag":5,"xPos":0.0,"yPos":-1.0}],"clears":[{"type":0,"goal":1}],"cases":[0],"bullets":[],"comments":"어떤 서류가방은 탄을 제공합니다.\n획득한 탄은 가장 마지막에 발사합니다."}
\ No newline at end of file \ No newline at end of file
...@@ -120,6 +120,97 @@ NavMeshSettings: ...@@ -120,6 +120,97 @@ NavMeshSettings:
debug: debug:
m_Flags: 0 m_Flags: 0
m_NavMeshData: {fileID: 0} m_NavMeshData: {fileID: 0}
--- !u!1 &145515414
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 145515416}
- component: {fileID: 145515415}
m_Layer: 0
m_Name: Directional Light (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!108 &145515415
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 145515414}
m_Enabled: 1
serializedVersion: 9
m_Type: 1
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 0.8
m_Range: 10
m_SpotAngle: 30
m_InnerSpotAngle: 21.80208
m_CookieSize: 10
m_Shadows:
m_Type: 0
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_CullingMatrixOverride:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_UseCullingMatrixOverride: 0
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingLayerMask: 1
m_Lightmapping: 4
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!4 &145515416
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 145515414}
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
m_LocalPosition: {x: 818.7727, y: 911.3884, z: -299.6}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &158856767 --- !u!1 &158856767
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -235,7 +326,7 @@ RectTransform: ...@@ -235,7 +326,7 @@ RectTransform:
- {fileID: 238561069} - {fileID: 238561069}
- {fileID: 1839944656} - {fileID: 1839944656}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 8 m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
...@@ -658,41 +749,6 @@ CanvasRenderer: ...@@ -658,41 +749,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 342512061} m_GameObject: {fileID: 342512061}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!84 &447253776
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
serializedVersion: 3
m_Width: 1920
m_Height: 1080
m_AntiAliasing: 1
m_MipCount: -1
m_DepthFormat: 1
m_ColorFormat: 4
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 1
m_UseDynamicScale: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
--- !u!1 &448150607 --- !u!1 &448150607
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -739,7 +795,7 @@ Transform: ...@@ -739,7 +795,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 7 m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &534669902 --- !u!1 &534669902
GameObject: GameObject:
...@@ -826,7 +882,7 @@ Transform: ...@@ -826,7 +882,7 @@ Transform:
m_Children: m_Children:
- {fileID: 1548020011} - {fileID: 1548020011}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 4 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 30, y: 45, z: 0} m_LocalEulerAnglesHint: {x: 30, y: 45, z: 0}
--- !u!114 &534669906 --- !u!114 &534669906
MonoBehaviour: MonoBehaviour:
...@@ -930,8 +986,8 @@ MonoBehaviour: ...@@ -930,8 +986,8 @@ MonoBehaviour:
sourceCamera: {fileID: 534669904} sourceCamera: {fileID: 534669904}
outlineCamera: {fileID: 1548020010} outlineCamera: {fileID: 1548020010}
outlineShaderMaterial: {fileID: 0} outlineShaderMaterial: {fileID: 0}
renderTexture: {fileID: 855292323} renderTexture: {fileID: 2113008409}
extraRenderTexture: {fileID: 447253776} extraRenderTexture: {fileID: 1288887672}
--- !u!1 &666076611 --- !u!1 &666076611
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1268,41 +1324,6 @@ RectTransform: ...@@ -1268,41 +1324,6 @@ RectTransform:
m_AnchoredPosition: {x: 895, y: -490} m_AnchoredPosition: {x: 895, y: -490}
m_SizeDelta: {x: 100, y: 60} m_SizeDelta: {x: 100, y: 60}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!84 &855292323
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
serializedVersion: 3
m_Width: 1920
m_Height: 1080
m_AntiAliasing: 1
m_MipCount: -1
m_DepthFormat: 1
m_ColorFormat: 4
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 1
m_UseDynamicScale: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
--- !u!1 &1015578410 --- !u!1 &1015578410
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1339,6 +1360,41 @@ RectTransform: ...@@ -1339,6 +1360,41 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!84 &1288887672
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
serializedVersion: 3
m_Width: 1920
m_Height: 1080
m_AntiAliasing: 1
m_MipCount: -1
m_DepthFormat: 1
m_ColorFormat: 4
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 1
m_UseDynamicScale: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
--- !u!1 &1463021448 --- !u!1 &1463021448
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1622,7 +1678,7 @@ Camera: ...@@ -1622,7 +1678,7 @@ Camera:
serializedVersion: 2 serializedVersion: 2
m_Bits: 0 m_Bits: 0
m_RenderingPath: 1 m_RenderingPath: 1
m_TargetTexture: {fileID: 855292323} m_TargetTexture: {fileID: 2113008409}
m_TargetDisplay: 0 m_TargetDisplay: 0
m_TargetEye: 3 m_TargetEye: 3
m_HDR: 0 m_HDR: 0
...@@ -2011,8 +2067,43 @@ Transform: ...@@ -2011,8 +2067,43 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 5 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!84 &2113008409
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
serializedVersion: 3
m_Width: 1920
m_Height: 1080
m_AntiAliasing: 1
m_MipCount: -1
m_DepthFormat: 1
m_ColorFormat: 4
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 1
m_UseDynamicScale: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
--- !u!1 &2123597349 --- !u!1 &2123597349
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -2235,7 +2326,7 @@ PrefabInstance: ...@@ -2235,7 +2326,7 @@ PrefabInstance:
- target: {fileID: 52444459818764335, guid: 42247a938bb6e554eb00dc08303a72d6, - target: {fileID: 52444459818764335, guid: 42247a938bb6e554eb00dc08303a72d6,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 3 value: 4
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 52444459818764335, guid: 42247a938bb6e554eb00dc08303a72d6, - target: {fileID: 52444459818764335, guid: 42247a938bb6e554eb00dc08303a72d6,
type: 3} type: 3}
...@@ -2304,7 +2395,7 @@ PrefabInstance: ...@@ -2304,7 +2395,7 @@ PrefabInstance:
- target: {fileID: 7144820693024262881, guid: e84ad2e2416a25447b16b00fbe19964e, - target: {fileID: 7144820693024262881, guid: e84ad2e2416a25447b16b00fbe19964e,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 6 value: 7
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7144820693024262881, guid: e84ad2e2416a25447b16b00fbe19964e, - target: {fileID: 7144820693024262881, guid: e84ad2e2416a25447b16b00fbe19964e,
type: 3} type: 3}
...@@ -2373,7 +2464,7 @@ PrefabInstance: ...@@ -2373,7 +2464,7 @@ PrefabInstance:
- target: {fileID: 6014610519130626206, guid: 11285456de5f1854d947bea83275646f, - target: {fileID: 6014610519130626206, guid: 11285456de5f1854d947bea83275646f,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 2 value: 3
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6014610519130626206, guid: 11285456de5f1854d947bea83275646f, - target: {fileID: 6014610519130626206, guid: 11285456de5f1854d947bea83275646f,
type: 3} type: 3}
......
...@@ -211,6 +211,12 @@ Transform: ...@@ -211,6 +211,12 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!224 &951927008 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 5421729354975795796, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
m_PrefabInstance: {fileID: 6319119020553528021}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1484773285 --- !u!1 &1484773285
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -547,5 +553,205 @@ PrefabInstance: ...@@ -547,5 +553,205 @@ PrefabInstance:
propertyPath: categoryTitles.Array.data[5] propertyPath: categoryTitles.Array.data[5]
value: SPECIAL value: SPECIAL
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5996849666618765155, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: scrollTransform
value:
objectReference: {fileID: 951927008}
- target: {fileID: 1440005115911453239, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 3118619846235340696, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3118619846235340696, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3118619846235340696, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 7048702541935387415, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7048702541935387415, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 258173575055405371, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 258173575055405371, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 5425276407562068249, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 1720
objectReference: {fileID: 0}
- target: {fileID: 5425276407562068249, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.00082536
objectReference: {fileID: 0}
- target: {fileID: 897257125831446336, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 897257125831446336, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 171363907119900777, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 171363907119900777, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 171363907119900777, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1181889721223809434, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5087174722634247129, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5087174722634247129, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5087174722634247129, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5087174722634247129, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7846908744249493343, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7846908744249493343, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6752718958491270595, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6752718958491270595, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5179437734568748028, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_ScrollSensitivity
value: 100
objectReference: {fileID: 0}
- target: {fileID: 5421729354975795796, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5421729354975795796, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5421729354975795796, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5421729354975795796, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5421729354975795796, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5421729354975795796, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5421729354975795796, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 248823964391770101, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4272016153226539519, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4272016153226539519, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4272016153226539519, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2556932691767309594, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2556932691767309594, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2556932691767309594, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8115fd4d1a1025b4fb05e45fc5fa6578, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 8115fd4d1a1025b4fb05e45fc5fa6578, type: 3}
...@@ -134,15 +134,14 @@ public class GameManager : SingletonBehaviour<GameManager> ...@@ -134,15 +134,14 @@ public class GameManager : SingletonBehaviour<GameManager>
public void LoadNextStage() public void LoadNextStage()
{ {
StageSelector.selectedStage = StageSelector.nextStage; StageSelector.selectedStage = StageSelector.nextStage;
StageSelector.inst.stageIdx++;
if (StageSelector.inst.stageIdxs.Count > StageSelector.inst.stageIdx + 1) if (StageSelector.inst.stageIdxs.Count > StageSelector.inst.stageIdx + 1)
{ {
StageSelector.nextStage = StageSelector.inst.stageIdxs[StageSelector.inst.stageIdx + 1]; StageSelector.nextStage = StageSelector.inst.stageIdxs[StageSelector.inst.stageIdx + 1];
StageSelector.inst.stageIdx++;
} }
else else
{ {
StageSelector.nextStage = "1_1"; StageSelector.nextStage = "1_1";
StageSelector.inst.stageIdx = 0;
} }
StartCoroutine(RestartStage()); StartCoroutine(RestartStage());
......
...@@ -23,6 +23,7 @@ public class StageSelector : SingletonBehaviour<StageSelector> ...@@ -23,6 +23,7 @@ public class StageSelector : SingletonBehaviour<StageSelector>
[Header("UI Settings")] [Header("UI Settings")]
public GameObject buttonUI; public GameObject buttonUI;
public GameObject titleUI; public GameObject titleUI;
public Transform scrollTransform;
public Sprite tutorialFalse; public Sprite tutorialFalse;
public Color tutorialFalseColor = new Color(1f, 0.9921569f, 0.8666667f); public Color tutorialFalseColor = new Color(1f, 0.9921569f, 0.8666667f);
public Sprite tutorialTrue; public Sprite tutorialTrue;
...@@ -32,8 +33,8 @@ public class StageSelector : SingletonBehaviour<StageSelector> ...@@ -32,8 +33,8 @@ public class StageSelector : SingletonBehaviour<StageSelector>
public Sprite mainTrue; public Sprite mainTrue;
public Color mainTrueColor = new Color(0.1921569f, 1f, 0.3843138f); public Color mainTrueColor = new Color(0.1921569f, 1f, 0.3843138f);
int maxRow = 8; // y-=155 int maxRow = 8; // y-=155
private Vector3 generatePoint = new Vector3(-470, 360); // x+=160 private Vector3 generatePoint = new Vector3(-470, -220); // x+=160
private Vector3 titleGeneratePoint = new Vector3(-770, 360); private Vector3 titleGeneratePoint = new Vector3(-770, -220);
public void GenerateStageUI() public void GenerateStageUI()
{ {
...@@ -41,7 +42,7 @@ public class StageSelector : SingletonBehaviour<StageSelector> ...@@ -41,7 +42,7 @@ public class StageSelector : SingletonBehaviour<StageSelector>
int stageIdxCounter = 0; int stageIdxCounter = 0;
for (int i = 0; i < categoryCounts.Length; i++) // "Stagei-j" for (int i = 0; i < categoryCounts.Length; i++) // "Stagei-j"
{ {
var nameInst = Instantiate(titleUI, transform); var nameInst = Instantiate(titleUI, scrollTransform);
nameInst.transform.localPosition = titleGeneratePoint; nameInst.transform.localPosition = titleGeneratePoint;
nameInst.GetComponent<Text>().text = categoryTitles[i]; nameInst.GetComponent<Text>().text = categoryTitles[i];
if (isColorSel < 0) nameInst.GetComponent<Text>().color = tutorialTrueColor; if (isColorSel < 0) nameInst.GetComponent<Text>().color = tutorialTrueColor;
...@@ -50,7 +51,7 @@ public class StageSelector : SingletonBehaviour<StageSelector> ...@@ -50,7 +51,7 @@ public class StageSelector : SingletonBehaviour<StageSelector>
int rowCount = 0; int rowCount = 0;
for (int j = 0; j < categoryCounts[i]; j++) for (int j = 0; j < categoryCounts[i]; j++)
{ {
var uiInst = Instantiate(buttonUI, transform); var uiInst = Instantiate(buttonUI, scrollTransform);
var uiText = uiInst.GetComponentInChildren<Text>(); var uiText = uiInst.GetComponentInChildren<Text>();
string uiStage = (i + 1) + "_" + (j + 1); string uiStage = (i + 1) + "_" + (j + 1);
stageIdxs.Add(uiStage); stageIdxs.Add(uiStage);
......
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