Commit cd70ab84 authored by 18손재민's avatar 18손재민

이제 플레이어의 머리를 레이어를 변경하는 것으로 조작함. 발사 모드 시 메인 카메라에서는 보이지 않지만 거울에는 머리가 보이게 함

parent ba6b0e6d
......@@ -9,7 +9,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497185}
m_Layer: 0
m_Layer: 8
m_Name: thumbProximal.L
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -40,7 +40,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497187}
m_Layer: 0
m_Layer: 8
m_Name: thumbIntermediate.R
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -71,7 +71,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497189}
m_Layer: 0
m_Layer: 8
m_Name: toe.L
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -102,7 +102,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497191}
m_Layer: 0
m_Layer: 8
m_Name: thumbProximal.R
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -133,7 +133,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497193}
m_Layer: 0
m_Layer: 8
m_Name: toe.L_end_end
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -163,7 +163,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497195}
m_Layer: 0
m_Layer: 8
m_Name: toe.L_end
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -195,7 +195,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497197}
m_Layer: 0
m_Layer: 8
m_Name: toe.R_end
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -227,7 +227,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497199}
m_Layer: 0
m_Layer: 8
m_Name: toe.R
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -258,7 +258,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497201}
m_Layer: 0
m_Layer: 8
m_Name: thumbDistal.L
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -289,7 +289,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497203}
m_Layer: 0
m_Layer: 8
m_Name: spine
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -320,7 +320,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497205}
m_Layer: 0
m_Layer: 8
m_Name: thumbDistal.L_end_end
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -350,7 +350,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497207}
m_Layer: 0
m_Layer: 8
m_Name: thumbDistal.L_end
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -381,7 +381,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497209}
m_Layer: 0
m_Layer: 8
m_Name: thumbDistal.R_end
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -413,7 +413,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497211}
m_Layer: 0
m_Layer: 8
m_Name: thumbDistal.R
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -444,7 +444,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497213}
m_Layer: 0
m_Layer: 8
m_Name: thumbIntermediate.L
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -475,7 +475,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497215}
m_Layer: 0
m_Layer: 8
m_Name: thumbDistal.R_end_end
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -505,7 +505,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239496721}
m_Layer: 0
m_Layer: 8
m_Name: upperArm.L
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -536,7 +536,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239496723}
m_Layer: 0
m_Layer: 8
m_Name: toe.R_end_end
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -566,7 +566,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239496725}
m_Layer: 0
m_Layer: 8
m_Name: upperLeg.L
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -597,7 +597,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239496727}
m_Layer: 0
m_Layer: 8
m_Name: upperArm.R
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -628,7 +628,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239496731}
m_Layer: 0
m_Layer: 8
m_Name: upperLeg.R
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -659,7 +659,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497089}
m_Layer: 0
m_Layer: 8
m_Name: eye.R_end_end
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -689,7 +689,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497091}
m_Layer: 0
m_Layer: 8
m_Name: eye.R_end
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -721,7 +721,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497093}
m_Layer: 0
m_Layer: 8
m_Name: foot.R
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -752,7 +752,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497095}
m_Layer: 0
m_Layer: 8
m_Name: foot.L
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -783,7 +783,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497097}
m_Layer: 0
m_Layer: 8
m_Name: hand.L
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -816,7 +816,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497099}
m_Layer: 0
m_Layer: 8
m_Name: Generic Man
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -847,7 +847,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497101}
m_Layer: 0
m_Layer: 8
m_Name: head
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -880,7 +880,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497103}
m_Layer: 0
m_Layer: 8
m_Name: hand.R
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -913,7 +913,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497105}
m_Layer: 0
m_Layer: 8
m_Name: chest.Upper
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -946,7 +946,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497107}
m_Layer: 0
m_Layer: 8
m_Name: chest
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -978,7 +978,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497109}
m_Layer: 0
m_Layer: 8
m_Name: collarbone.R
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1009,7 +1009,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497111}
m_Layer: 0
m_Layer: 8
m_Name: collarbone.L
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1040,7 +1040,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497113}
m_Layer: 0
m_Layer: 8
m_Name: eye.L_end
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1072,7 +1072,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497115}
m_Layer: 0
m_Layer: 8
m_Name: eye.L
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1103,7 +1103,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497117}
m_Layer: 0
m_Layer: 8
m_Name: eye.R
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1134,7 +1134,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497119}
m_Layer: 0
m_Layer: 8
m_Name: eye.L_end_end
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1164,7 +1164,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497121}
m_Layer: 0
m_Layer: 8
m_Name: indexIntermediate.R
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1195,7 +1195,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497123}
m_Layer: 0
m_Layer: 8
m_Name: indexIntermediate.L
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1226,7 +1226,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497125}
m_Layer: 0
m_Layer: 8
m_Name: indexProximal.R
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1257,7 +1257,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497127}
m_Layer: 0
m_Layer: 8
m_Name: indexProximal.L
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1288,7 +1288,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497129}
m_Layer: 0
m_Layer: 8
m_Name: jaw
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1324,7 +1324,7 @@ GameObject:
- component: {fileID: 103473560334342872}
- component: {fileID: 9050027863979790995}
- component: {fileID: 6489731509539496108}
m_Layer: 0
m_Layer: 8
m_Name: jackson
m_TagString: Player
m_Icon: {fileID: 0}
......@@ -1445,7 +1445,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497133}
m_Layer: 0
m_Layer: 8
m_Name: jaw_end_end
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1475,7 +1475,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497135}
m_Layer: 0
m_Layer: 8
m_Name: jaw_end
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1506,7 +1506,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497137}
m_Layer: 0
m_Layer: 8
m_Name: hips
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1540,7 +1540,7 @@ GameObject:
m_Component:
- component: {fileID: 494213313239497139}
- component: {fileID: 494213313228417203}
m_Layer: 0
m_Layer: 8
m_Name: Head 19
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1676,7 +1676,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497141}
m_Layer: 0
m_Layer: 8
m_Name: indexDistal.L_end
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1708,7 +1708,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497143}
m_Layer: 0
m_Layer: 8
m_Name: indexDistal.L
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1739,7 +1739,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497145}
m_Layer: 0
m_Layer: 8
m_Name: indexDistal.R
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1770,7 +1770,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497147}
m_Layer: 0
m_Layer: 8
m_Name: indexDistal.L_end_end
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1800,7 +1800,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497149}
m_Layer: 0
m_Layer: 8
m_Name: indexDistal.R_end_end
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1830,7 +1830,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497151}
m_Layer: 0
m_Layer: 8
m_Name: indexDistal.R_end
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1862,7 +1862,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497153}
m_Layer: 0
m_Layer: 8
m_Name: middleDistal.R_end
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1894,7 +1894,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497155}
m_Layer: 0
m_Layer: 8
m_Name: middleDistal.R
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1925,7 +1925,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497157}
m_Layer: 0
m_Layer: 8
m_Name: middleIntermediate.L
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1956,7 +1956,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497159}
m_Layer: 0
m_Layer: 8
m_Name: middleDistal.R_end_end
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -1986,7 +1986,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497161}
m_Layer: 0
m_Layer: 8
m_Name: middleProximal.L
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -2017,7 +2017,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497163}
m_Layer: 0
m_Layer: 8
m_Name: middleIntermediate.R
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -2048,7 +2048,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497165}
m_Layer: 0
m_Layer: 8
m_Name: neck
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -2079,7 +2079,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497167}
m_Layer: 0
m_Layer: 8
m_Name: middleProximal.R
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -2110,7 +2110,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497169}
m_Layer: 0
m_Layer: 8
m_Name: lowerArm.R
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -2141,7 +2141,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497171}
m_Layer: 0
m_Layer: 8
m_Name: lowerArm.L
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -2172,7 +2172,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497173}
m_Layer: 0
m_Layer: 8
m_Name: lowerLeg.R
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -2203,7 +2203,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497175}
m_Layer: 0
m_Layer: 8
m_Name: lowerLeg.L
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -2234,7 +2234,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497177}
m_Layer: 0
m_Layer: 8
m_Name: middleDistal.L
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -2266,7 +2266,7 @@ GameObject:
m_Component:
- component: {fileID: 494213313239497179}
- component: {fileID: 494213313228417201}
m_Layer: 0
m_Layer: 8
m_Name: MA Body 2
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -2402,7 +2402,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497181}
m_Layer: 0
m_Layer: 8
m_Name: middleDistal.L_end_end
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -2432,7 +2432,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 494213313239497183}
m_Layer: 0
m_Layer: 8
m_Name: middleDistal.L_end
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -2464,7 +2464,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 7838800661811206189}
m_Layer: 0
m_Layer: 8
m_Name: rightAim
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -2495,7 +2495,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 7259129854443835404}
m_Layer: 0
m_Layer: 8
m_Name: Head
m_TagString: Untagged
m_Icon: {fileID: 0}
......
......@@ -288,10 +288,15 @@ PrefabInstance:
propertyPath: TextureSize
value: 768
objectReference: {fileID: 0}
- target: {fileID: 5956712601794644638, guid: 6cee9ce2ee605c54c957dc68c69cea90,
type: 3}
propertyPath: ReflectLayers.m_Bits
value: 5943
objectReference: {fileID: 0}
- target: {fileID: 5956712601804180398, guid: 6cee9ce2ee605c54c957dc68c69cea90,
type: 3}
propertyPath: m_CullingMask.m_Bits
value: 1335
value: 5431
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6cee9ce2ee605c54c957dc68c69cea90, type: 3}
......@@ -383,10 +388,15 @@ PrefabInstance:
propertyPath: TextureSize
value: 768
objectReference: {fileID: 0}
- target: {fileID: 5956712601794644638, guid: 6cee9ce2ee605c54c957dc68c69cea90,
type: 3}
propertyPath: ReflectLayers.m_Bits
value: 5943
objectReference: {fileID: 0}
- target: {fileID: 5956712601804180398, guid: 6cee9ce2ee605c54c957dc68c69cea90,
type: 3}
propertyPath: m_CullingMask.m_Bits
value: 1335
value: 5431
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6cee9ce2ee605c54c957dc68c69cea90, type: 3}
......
......@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 170076734}
m_IndirectSpecularColor: {r: 0.040508375, g: 0.050361775, b: 0.08322008, a: 1}
m_IndirectSpecularColor: {r: 0.040745974, g: 0.050543424, b: 0.08338426, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
......@@ -318,7 +318,7 @@ Camera:
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 3895
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
......@@ -788,6 +788,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 7277015661519863741, guid: 20dee07e28273f049a9093ae4453912f,
type: 3}
propertyPath: m_NavMeshData
value:
objectReference: {fileID: 0}
- target: {fileID: 7277015661519863740, guid: 20dee07e28273f049a9093ae4453912f,
type: 3}
propertyPath: m_Name
......@@ -798,11 +803,6 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7277015661519863741, guid: 20dee07e28273f049a9093ae4453912f,
type: 3}
propertyPath: m_NavMeshData
value:
objectReference: {fileID: 0}
- target: {fileID: 7277015661519863742, guid: 20dee07e28273f049a9093ae4453912f,
type: 3}
propertyPath: m_LocalPosition.x
......
......@@ -77,22 +77,23 @@ public class CameraController : MonoBehaviour
rotationX = transform.eulerAngles.y;
rotationY = transform.eulerAngles.x;
PlayerController.inst.isZooming = false;
PlayerController.inst.currentPlayer.GetComponent<Animator>().SetBool("isShooting", true);
PlayerController.inst.currentPlayer.GetComponent<Player>().head.SetActive(false);
player.anim.SetBool("isShooting", true);
player.head.transform.Find("Head 19").gameObject.layer = LayerMask.NameToLayer("Head");
}
/// <summary>
/// Zoom out from player.
/// </summary>
/// <returns></returns>
public IEnumerator ZoomOutFromPlayer()
public IEnumerator ZoomOutFromPlayer(Player player)
{
float startTime = Time.time;
Vector3 posDiff = (previousPos - transform.position) / 40;
float fovDiff = (mapFov - shootingFov) / 40f;
PlayerController.inst.isZooming = true;
PlayerController.inst.currentPlayer.GetComponent<Animator>().SetBool("isShooting", false);
PlayerController.inst.currentPlayer.GetComponent<Player>().head.SetActive(true);
player.anim.SetBool("isShooting", false);
player.head.transform.Find("Head 19").gameObject.layer = LayerMask.NameToLayer("Player");
player.head.SetActive(true);
Vector3 tempAngle = new Vector3(transform.eulerAngles.x > 180 ? transform.eulerAngles.x - 360 : transform.eulerAngles.x,
transform.eulerAngles.y > 180 ? transform.eulerAngles.y - 360 : transform.eulerAngles.y,
transform.eulerAngles.z > 180 ? transform.eulerAngles.z - 360 : transform.eulerAngles.z);
......
......@@ -15,7 +15,7 @@ public class Player : MonoBehaviour
public Transform shootingArm;
public GameObject shootingFinger;
public Quaternion armRotation;
Animator anim;
public Animator anim;
public Floor currentFloor;
......
......@@ -141,7 +141,7 @@ public class PlayerController : SingletonBehaviour<PlayerController>
}
else if (Input.GetMouseButtonDown(1) && isPlayerShooting)
{
StartCoroutine(Camera.main.GetComponent<CameraController>().ZoomOutFromPlayer());
StartCoroutine(Camera.main.GetComponent<CameraController>().ZoomOutFromPlayer(currentPlayer));
}
}
}
......
......@@ -20,7 +20,7 @@ TagManager:
- Wall
- PostProcessing
- RenderTexture
-
- Head
-
-
-
......
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