Skip to content

M
man-in-the-mirror
Commit 8365f34f authored by 18신대성's avatar 18신대성 Committed by 18손재민
Browse files
Options

총알 속도 3배로, 

코멘트창 길게
parent a602447d
Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 13 deletions
Assets/Prefabs/Objects/camera.prefab
View file @ 8365f34f
......@@ -19,7 +19,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &6414805480913208774
Transform:
m_ObjectHideFlags: 0
......@@ -32,7 +32,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6001025753464593565}
m_RootOrder: 9
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 15, y: 269.996, z: 0}
--- !u!20 &4077819126459348598
Camera:
......@@ -436,7 +436,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &7134766044296489300
Transform:
m_ObjectHideFlags: 0
......@@ -449,7 +449,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6001025753464593565}
m_RootOrder: 7
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 15, y: 180, z: 0}
--- !u!20 &869595211499020756
Camera:
......@@ -767,6 +767,7 @@ Transform:
- {fileID: 4932238493637441718}
- {fileID: 2709598100183060115}
- {fileID: 1002121977587821162}
- {fileID: 8124299437520056710}
- {fileID: 3976494268823007624}
- {fileID: 7134766044296489300}
- {fileID: 2001876799535360147}
......@@ -1006,6 +1007,97 @@ Light:
m_UseBoundingSphereOverride: 0
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!1 &6856240290620152149
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8124299437520056710}
- component: {fileID: 3103882304729573508}
m_Layer: 0
m_Name: Point Light
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8124299437520056710
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6856240290620152149}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0.5, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6001025753464593565}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!108 &3103882304729573508
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6856240290620152149}
m_Enabled: 1
serializedVersion: 9
m_Type: 2
m_Color: {r: 1, g: 0, b: 0, a: 1}
m_Intensity: 1
m_Range: 0.7
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: 1
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!1 &7133794604445264538
GameObject:
m_ObjectHideFlags: 0
......@@ -1025,7 +1117,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &3976494268823007624
Transform:
m_ObjectHideFlags: 0
......@@ -1038,7 +1130,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6001025753464593565}
m_RootOrder: 6
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 15, y: 0, z: 0}
--- !u!20 &8777706456126280217
Camera:
......@@ -1260,7 +1352,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &2001876799535360147
Transform:
m_ObjectHideFlags: 0
......@@ -1273,7 +1365,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6001025753464593565}
m_RootOrder: 8
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 15, y: 89.996, z: 0}
--- !u!20 &7418796258877344207
Camera:
......
Assets/Resources/Stages/stage6.json
View file @ 8365f34f
{"objects":[{"tag":0,"xPos":20.0,"yPos":0.0},{"tag":2,"xPos":0.0,"yPos":0.5},{"tag":2,"xPos":1.0,"yPos":0.5},{"tag":2,"xPos":-0.5,"yPos":-1.0},{"tag":2,"xPos":0.5,"yPos":-2.0},{"tag":3,"xPos":-2.0,"yPos":0.5},{"tag":1,"xPos":-2.0,"yPos":1.0},{"tag":1,"xPos":-2.0,"yPos":-1.0},{"tag":1,"xPos":-1.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":1.0},{"tag":1,"xPos":-2.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":-2.0},{"tag":1,"xPos":0.0,"yPos":-1.0},{"tag":1,"xPos":-1.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":-2.0},{"tag":1,"xPos":1.0,"yPos":-2.0},{"tag":1,"xPos":1.0,"yPos":-1.0},{"tag":1,"xPos":1.0,"yPos":0.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":1,"xPos":-2.0,"yPos":-2.0},{"tag":4,"xPos":-2.0,"yPos":-1.0},{"tag":6,"xPos":-2.0,"yPos":1.0},{"tag":6,"xPos":0.0,"yPos":-1.0},{"tag":6,"xPos":-1.0,"yPos":-2.0},{"tag":5,"xPos":-1.0,"yPos":1.0},{"tag":8,"xPos":1.0,"yPos":1.0},{"tag":8,"xPos":1.0,"yPos":-2.0}],"clears":[{"type":7,"goal":1},{"type":8,"goal":1}],"cases":[0],"bullets":[0,0],"comments":"어떤 서류가방은 탄을 제공합니다. 서류가방 밑에 제공하는 탄의 종류가 표시되어있습니다.\n'진실탄'은 검은색 마네킹을 희게 만듭니다."}
\ No newline at end of file
{"objects":[{"tag":0,"xPos":20.0,"yPos":0.0},{"tag":2,"xPos":0.0,"yPos":0.5},{"tag":2,"xPos":1.0,"yPos":0.5},{"tag":2,"xPos":-0.5,"yPos":-1.0},{"tag":2,"xPos":0.5,"yPos":-2.0},{"tag":3,"xPos":-2.0,"yPos":0.5},{"tag":1,"xPos":-2.0,"yPos":1.0},{"tag":1,"xPos":-2.0,"yPos":-1.0},{"tag":1,"xPos":-1.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":1.0},{"tag":1,"xPos":-2.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":-2.0},{"tag":1,"xPos":0.0,"yPos":-1.0},{"tag":1,"xPos":-1.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":-2.0},{"tag":1,"xPos":1.0,"yPos":-2.0},{"tag":1,"xPos":1.0,"yPos":-1.0},{"tag":1,"xPos":1.0,"yPos":0.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":1,"xPos":-2.0,"yPos":-2.0},{"tag":4,"xPos":-2.0,"yPos":-1.0},{"tag":6,"xPos":-2.0,"yPos":1.0},{"tag":6,"xPos":0.0,"yPos":-1.0},{"tag":6,"xPos":-1.0,"yPos":-2.0},{"tag":5,"xPos":-1.0,"yPos":1.0},{"tag":8,"xPos":1.0,"yPos":1.0},{"tag":8,"xPos":1.0,"yPos":-2.0}],"clears":[{"type":7,"goal":1},{"type":8,"goal":1}],"cases":[0],"bullets":[0,0],"comments":"어떤 서류가방은 탄을 제공합니다.\n서류가방 밑에 제공하는 탄의 종류가 표시되어있습니다.\n'진실탄'은 검은색 마네킹을 희게 만듭니다."}
\ No newline at end of file
Assets/Resources/Stages/stage9.json
View file @ 8365f34f
{"objects":[{"tag":0,"xPos":15.0,"yPos":0.0},{"tag":3,"xPos":-0.5,"yPos":-1.0},{"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":1,"xPos":1.0,"yPos":-1.0},{"tag":9,"xPos":1.0,"yPos":-1.0},{"tag":1,"xPos":1.0,"yPos":0.0},{"tag":4,"xPos":1.0,"yPos":-1.0},{"tag":6,"xPos":0.0,"yPos":1.0}],"clears":[{"type":0,"goal":2}],"cases":[],"bullets":[1],"comments":"'거짓탄'으로 거울을 맞추면 거울이 파괴되며, 거울에 보이던 시야가 그대로 유지됩니다."}
\ No newline at end of file
{"objects":[{"tag":0,"xPos":15.0,"yPos":0.0},{"tag":3,"xPos":-0.5,"yPos":-1.0},{"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":1,"xPos":1.0,"yPos":-1.0},{"tag":9,"xPos":1.0,"yPos":-1.0},{"tag":1,"xPos":1.0,"yPos":0.0},{"tag":4,"xPos":1.0,"yPos":-1.0},{"tag":6,"xPos":0.0,"yPos":1.0}],"clears":[{"type":0,"goal":2}],"cases":[],"bullets":[1],"comments":"'거짓탄'으로 거울을 맞추면 거울이 파괴되며,\n거울에 보이던 시야가 그대로 유지됩니다."}
\ No newline at end of file
Assets/Scenes/PlayStage.unity
View file @ 8365f34f
......@@ -399,7 +399,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 950, y: 130}
m_SizeDelta: {x: 1150, y: 130}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &342512063
MonoBehaviour:
......@@ -831,7 +831,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 240}
m_SizeDelta: {x: 1000, y: 150}
m_SizeDelta: {x: 1200, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1547091491
MonoBehaviour:
......
Assets/Scripts/Player.cs
View file @ 8365f34f
......@@ -124,7 +124,7 @@ public class Player : MonoBehaviour
Bullet newBullet = MapManager.inst.bulletFactory.MakeBullet(bulletCode);
newBullet.transform.position = shootingFinger.transform.position;
newBullet.transform.LookAt(shootingArm.transform.forward + newBullet.transform.position);
newBullet.Init(shootingArm.transform.forward);
newBullet.Init(shootingArm.transform.forward * 3);
PlayerController.inst.bulletList.RemoveAt(0);
GameManager.inst.bulletUIGenerator.RemoveBulletUI();
}
......
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