Commit af2e4094 authored by 18신대성's avatar 18신대성 Committed by 18손재민

잭슨이 총 쏠때의 방향으로 나가는 레이저 만듬

parent 331774ca
......@@ -9,8 +9,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: Mirror
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
m_LightmapFlags: 4
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION
m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
......@@ -62,9 +62,9 @@ Material:
- _DetailNormalMapScale: 1
- _DstBlend: 10
- _GlossMapScale: 1
- _Glossiness: 0.4
- _Glossiness: 1
- _GlossyReflections: 1
- _Metallic: 0.5
- _Metallic: 0
- _Mode: 3
- _OcclusionStrength: 1
- _Parallax: 0.02
......@@ -74,5 +74,5 @@ Material:
- _UVSec: 0
- _ZWrite: 0
m_Colors:
- _Color: {r: 1, g: 0.9890261, b: 0.82547176, a: 0.11764706}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _Color: {r: 0.41389284, g: 0.65451735, b: 0.6698113, a: 0.07058824}
- _EmissionColor: {r: 0.06827848, g: 0.06827848, b: 0.06827848, a: 1}
......@@ -1434,6 +1434,7 @@ MonoBehaviour:
head: {fileID: 3233955354714130270}
shootingArm: {fileID: 7838800661811206189}
shootingFinger: {fileID: 494213313239918045}
laser: {fileID: 4293599007436274797}
armRotation: {x: 0, y: 0, z: 0, w: 0}
anim: {fileID: 0}
currentFloor: {fileID: 0}
......@@ -2484,6 +2485,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 494213313239496727}
- {fileID: 4932195003942434066}
m_Father: {fileID: 494213313239497109}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: -0.43300003, y: 180.887, z: 116.005005}
......@@ -2518,3 +2520,131 @@ Transform:
m_Father: {fileID: 494213313239497131}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &4293599007436274797
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4932195003942434066}
- component: {fileID: 8078487471096021495}
m_Layer: 11
m_Name: Line
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &4932195003942434066
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4293599007436274797}
m_LocalRotation: {x: 0.000000087078654, y: -0.000000010710209, z: -0.000000029802319,
w: 1}
m_LocalPosition: {x: -0.00031520962, y: 0.0005835246, z: 0.007830794}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7838800661811206189}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!120 &8078487471096021495
LineRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4293599007436274797}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 0
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Positions:
- {x: 0, y: 0, z: 0}
- {x: 0, y: 0, z: 1}
m_Parameters:
serializedVersion: 3
widthMultiplier: 0.1
widthCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.09480286
value: 0.02083397
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
colorGradient:
serializedVersion: 2
key0: {r: 1, g: 0, b: 0, a: 1}
key1: {r: 1, g: 0, b: 0, a: 1}
key2: {r: 0, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0
ctime1: 65535
ctime2: 0
ctime3: 0
ctime4: 0
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 0
atime1: 65535
atime2: 0
atime3: 0
atime4: 0
atime5: 0
atime6: 0
atime7: 0
m_Mode: 0
m_NumColorKeys: 2
m_NumAlphaKeys: 2
numCornerVertices: 0
numCapVertices: 0
alignment: 0
textureMode: 0
shadowBias: 0.5
generateLightingData: 0
m_UseWorldSpace: 0
m_Loop: 0
......@@ -77,6 +77,7 @@ public class CameraController : MonoBehaviour
rotationX = transform.eulerAngles.y;
rotationY = transform.eulerAngles.x;
PlayerController.inst.isZooming = false;
player.laser.SetActive(true);
player.anim.SetBool("isShooting", true);
player.head.transform.Find("Head 19").gameObject.layer = LayerMask.NameToLayer("Head");
......@@ -93,6 +94,7 @@ public class CameraController : MonoBehaviour
float startTime = Time.time;
Vector3 posDiff = (previousPos - transform.position) / 40;
float fovDiff = (mapFov - shootingFov) / 40f;
player.laser.SetActive(false);
PlayerController.inst.isZooming = true;
player.anim.SetBool("isShooting", false);
player.head.transform.Find("Head 19").gameObject.layer = LayerMask.NameToLayer("Player");
......
......@@ -14,6 +14,7 @@ public class Player : MonoBehaviour
public GameObject head;
public Transform shootingArm;
public GameObject shootingFinger;
public GameObject laser;
public Quaternion armRotation;
public Animator anim;
......@@ -128,7 +129,7 @@ public class Player : MonoBehaviour
// Update is called once per frame
void Update()
{
{
laser.transform.position = shootingFinger.transform.position;
}
}
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