Skip to content

W
WidowmakerSimulator
Commit 1e1153e7 authored by 15박보승's avatar 15박보승
Browse files
Options

무기 사운드 작업

parent f35b08a1
Hide whitespace changes
Inline Side-by-side
Showing with 267 additions and 26 deletions
Grapplers/Assets/Prefabs/Player.prefab
View file @ 1e1153e7
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1 &767696755
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 767696756}
- component: {fileID: 767696757}
m_Layer: 8
m_Name: GunRR
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &767696756
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 767696755}
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: 6749310162749802334}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &767696757
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 767696755}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fca66d583ea0184bbb60459c15a1d97, type: 3}
m_Name:
m_EditorClassIdentifier:
clips:
- {fileID: 8300000, guid: 3def6dd83cd1bfa44be7b17626eced69, type: 3}
volume: 1
polyphony: 1
--- !u!1 &1934759802
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1934759803}
- component: {fileID: 1934759804}
m_Layer: 8
m_Name: KnifeRR
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1934759803
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1934759802}
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: 6749310162749802334}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1934759804
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1934759802}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fca66d583ea0184bbb60459c15a1d97, type: 3}
m_Name:
m_EditorClassIdentifier:
clips:
- {fileID: 8300000, guid: 57e4a7d0d1a3e834caa7600ebe6832bc, type: 3}
- {fileID: 8300000, guid: a38e743645d4cfd46a7ab3c137a738fa, type: 3}
- {fileID: 8300000, guid: 41741eca352ec594d92c5b669c6ab279, type: 3}
volume: 1
polyphony: 1
--- !u!1 &6749310161183525925 --- !u!1 &6749310161183525925
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -5099,6 +5195,8 @@ Transform: ...@@ -5099,6 +5195,8 @@ Transform:
- {fileID: 6749310161355989484} - {fileID: 6749310161355989484}
- {fileID: 6749310161704840022} - {fileID: 6749310161704840022}
- {fileID: 6749310161183525924} - {fileID: 6749310161183525924}
- {fileID: 1934759803}
- {fileID: 767696756}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -5257,6 +5355,9 @@ MonoBehaviour: ...@@ -5257,6 +5355,9 @@ MonoBehaviour:
blockMask: blockMask:
serializedVersion: 2 serializedVersion: 2
m_Bits: 55 m_Bits: 55
weaponAudioRRs:
- {fileID: 767696757}
- {fileID: 1934759804}
--- !u!114 &6749310162749802327 --- !u!114 &6749310162749802327
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -5299,11 +5400,6 @@ PrefabInstance: ...@@ -5299,11 +5400,6 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: Player Model value: Player Model
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -1671727974146666381, guid: 24022008ff631394abed491c25e5b06c,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: -5420008163957686366, guid: 24022008ff631394abed491c25e5b06c, - target: {fileID: -5420008163957686366, guid: 24022008ff631394abed491c25e5b06c,
type: 3} type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
...@@ -5524,11 +5620,6 @@ PrefabInstance: ...@@ -5524,11 +5620,6 @@ PrefabInstance:
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
value: 0.99277604 value: 0.99277604
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -6057140222963153312, guid: 24022008ff631394abed491c25e5b06c,
type: 3}
propertyPath: m_Controller
value:
objectReference: {fileID: 9100000, guid: 7529a3eded9b7ea479f57a56b39fe5b7, type: 2}
- target: {fileID: -6057140222963153312, guid: 24022008ff631394abed491c25e5b06c, - target: {fileID: -6057140222963153312, guid: 24022008ff631394abed491c25e5b06c,
type: 3} type: 3}
propertyPath: m_Avatar propertyPath: m_Avatar
...@@ -5536,9 +5627,9 @@ PrefabInstance: ...@@ -5536,9 +5627,9 @@ PrefabInstance:
objectReference: {fileID: 9000000, guid: 8150194469ea2d94abaa506f38aaf14e, type: 3} objectReference: {fileID: 9000000, guid: 8150194469ea2d94abaa506f38aaf14e, type: 3}
- target: {fileID: -6057140222963153312, guid: 24022008ff631394abed491c25e5b06c, - target: {fileID: -6057140222963153312, guid: 24022008ff631394abed491c25e5b06c,
type: 3} type: 3}
propertyPath: m_ApplyRootMotion propertyPath: m_Controller
value: 0 value:
objectReference: {fileID: 0} objectReference: {fileID: 9100000, guid: 7529a3eded9b7ea479f57a56b39fe5b7, type: 2}
- target: {fileID: -5696235270323981043, guid: 24022008ff631394abed491c25e5b06c, - target: {fileID: -5696235270323981043, guid: 24022008ff631394abed491c25e5b06c,
type: 3} type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
...@@ -6451,6 +6542,12 @@ PrefabInstance: ...@@ -6451,6 +6542,12 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 24022008ff631394abed491c25e5b06c, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 24022008ff631394abed491c25e5b06c, type: 3}
--- !u!4 &1073402266526822479 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -3220319501169496967, guid: 24022008ff631394abed491c25e5b06c,
type: 3}
m_PrefabInstance: {fileID: 6749310162469215286}
m_PrefabAsset: {fileID: 0}
--- !u!1 &3439439037733337190 stripped --- !u!1 &3439439037733337190 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 8219362072142390352, guid: 24022008ff631394abed491c25e5b06c, m_CorrespondingSourceObject: {fileID: 8219362072142390352, guid: 24022008ff631394abed491c25e5b06c,
...@@ -6469,9 +6566,3 @@ Transform: ...@@ -6469,9 +6566,3 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 6749310162469215286} m_PrefabInstance: {fileID: 6749310162469215286}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!4 &1073402266526822479 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -3220319501169496967, guid: 24022008ff631394abed491c25e5b06c,
type: 3}
m_PrefabInstance: {fileID: 6749310162469215286}
m_PrefabAsset: {fileID: 0}
Grapplers/Assets/Scenes/Ingame.unity
View file @ 1e1153e7
...@@ -6415,6 +6415,54 @@ MeshFilter: ...@@ -6415,6 +6415,54 @@ MeshFilter:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 574331029} m_GameObject: {fileID: 574331029}
m_Mesh: {fileID: -2147986788092759894, guid: 411bd59afc31b864fa0a48603370e3b8, type: 3} m_Mesh: {fileID: -2147986788092759894, guid: 411bd59afc31b864fa0a48603370e3b8, type: 3}
--- !u!1 &586467537
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 586467540}
- component: {fileID: 586467538}
m_Layer: 12
m_Name: PostProcessing
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &586467538
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 586467537}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3}
m_Name:
m_EditorClassIdentifier:
sharedProfile: {fileID: 11400000, guid: d45a34a0cc05cfc4fbba32fb1541a35f, type: 2}
isGlobal: 1
blendDistance: 0
weight: 1
priority: 0
--- !u!4 &586467540
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 586467537}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -285.2105, y: -75.69934, z: -496.3156}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &617244813 stripped --- !u!4 &617244813 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9, m_CorrespondingSourceObject: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
...@@ -7066,6 +7114,7 @@ GameObject: ...@@ -7066,6 +7114,7 @@ GameObject:
- component: {fileID: 963194229} - component: {fileID: 963194229}
- component: {fileID: 963194230} - component: {fileID: 963194230}
- component: {fileID: 963194231} - component: {fileID: 963194231}
- component: {fileID: 963194232}
m_Layer: 0 m_Layer: 0
m_Name: Main Camera m_Name: Main Camera
m_TagString: MainCamera m_TagString: MainCamera
...@@ -7273,6 +7322,66 @@ Animator: ...@@ -7273,6 +7322,66 @@ Animator:
m_HasTransformHierarchy: 1 m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1 m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0 m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &963194232
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 963194225}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3}
m_Name:
m_EditorClassIdentifier:
volumeTrigger: {fileID: 963194228}
volumeLayer:
serializedVersion: 2
m_Bits: 4096
stopNaNPropagation: 1
finalBlitToCameraTarget: 0
antialiasingMode: 0
temporalAntialiasing:
jitterSpread: 0.75
sharpness: 0.25
stationaryBlending: 0.95
motionBlending: 0.85
subpixelMorphologicalAntialiasing:
quality: 2
fastApproximateAntialiasing:
fastMode: 0
keepAlpha: 0
fog:
enabled: 1
excludeSkybox: 1
debugLayer:
lightMeter:
width: 512
height: 256
showCurves: 1
histogram:
width: 512
height: 256
channel: 3
waveform:
exposure: 0.12
height: 256
vectorscope:
size: 256
exposure: 0.12
overlaySettings:
linearDepth: 0
motionColorIntensity: 4
motionGridSize: 64
colorBlindnessType: 0
colorBlindnessStrength: 1
m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2}
m_ShowToolkit: 0
m_ShowCustomSorter: 0
breakBeforeColorGrading: 0
m_BeforeTransparentBundles: []
m_BeforeStackBundles: []
m_AfterStackBundles: []
--- !u!1 &968624424 --- !u!1 &968624424
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
Grapplers/Assets/Scenes/Mapwork_Profiles/Main Camera Profile.asset
View file @ 1e1153e7
...@@ -18,7 +18,7 @@ MonoBehaviour: ...@@ -18,7 +18,7 @@ MonoBehaviour:
value: 1 value: 1
intensity: intensity:
overrideState: 1 overrideState: 1
value: 17.69 value: 10
threshold: threshold:
overrideState: 0 overrideState: 0
value: 1 value: 1
...@@ -1380,6 +1380,34 @@ MonoBehaviour: ...@@ -1380,6 +1380,34 @@ MonoBehaviour:
sampleCount: sampleCount:
overrideState: 1 overrideState: 1
value: 5 value: 5
--- !u!114 &-7653435643296087632
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 556797029e73b2347956b6579e77e05b, type: 3}
m_Name: DepthOfField
m_EditorClassIdentifier:
active: 1
enabled:
overrideState: 1
value: 1
focusDistance:
overrideState: 1
value: 5
aperture:
overrideState: 1
value: 7.6
focalLength:
overrideState: 1
value: 67
kernelSize:
overrideState: 1
value: 0
--- !u!114 &11400000 --- !u!114 &11400000
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1397,6 +1425,7 @@ MonoBehaviour: ...@@ -1397,6 +1425,7 @@ MonoBehaviour:
- {fileID: -7753695407939056566} - {fileID: -7753695407939056566}
- {fileID: -8621508592174753373} - {fileID: -8621508592174753373}
- {fileID: 4882075946469032659} - {fileID: 4882075946469032659}
- {fileID: -7653435643296087632}
--- !u!114 &4882075946469032659 --- !u!114 &4882075946469032659
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 3 m_ObjectHideFlags: 3
......
Grapplers/Assets/Scripts/WeaponBehaviour.cs
View file @ 1e1153e7
...@@ -24,9 +24,14 @@ public class WeaponBehaviour : MonoBehaviour ...@@ -24,9 +24,14 @@ public class WeaponBehaviour : MonoBehaviour
private ParticleSystem knifeEffect; private ParticleSystem knifeEffect;
[SerializeField] [SerializeField]
private LayerMask enemyMask, blockMask; private LayerMask enemyMask, blockMask;
private IWeapon weapon { get { return weaponList[weaponIndex]; } } private IWeapon weapon { get { return weaponList[weaponIndex]; } }
private List<IWeapon> weaponList = new List<IWeapon>(); private List<IWeapon> weaponList = new List<IWeapon>();
private int weaponIndex = 0; private int weaponIndex = 0;
[SerializeField]
private List<RoundRobin> weaponAudioRRs = new List<RoundRobin>();
private void Start() private void Start()
{ {
IngameUIManager.inst.UpdateWeaponTypeUI(WeaponType.GUN); IngameUIManager.inst.UpdateWeaponTypeUI(WeaponType.GUN);
...@@ -43,7 +48,10 @@ public class WeaponBehaviour : MonoBehaviour ...@@ -43,7 +48,10 @@ public class WeaponBehaviour : MonoBehaviour
} }
Enemy[] hitEnemies = weapon.WeaponLockOn(enemyMask, blockMask); Enemy[] hitEnemies = weapon.WeaponLockOn(enemyMask, blockMask);
weapon.UseWeapon(hitEnemies); if (weapon.UseWeapon(hitEnemies))
{
weaponAudioRRs[weaponIndex].Play();
}
if (Input.GetKeyDown(KeyCode.Tab)) if (Input.GetKeyDown(KeyCode.Tab))
{ {
...@@ -65,7 +73,7 @@ public class WeaponBehaviour : MonoBehaviour ...@@ -65,7 +73,7 @@ public class WeaponBehaviour : MonoBehaviour
public interface IWeapon public interface IWeapon
{ {
void UseWeapon(Enemy[] hitEnemies); bool UseWeapon(Enemy[] hitEnemies);
void UseSkill(); void UseSkill();
Enemy[] WeaponLockOn(LayerMask enemyMask, LayerMask blockMask); Enemy[] WeaponLockOn(LayerMask enemyMask, LayerMask blockMask);
void UpdateWeapon(); void UpdateWeapon();
...@@ -88,10 +96,10 @@ public class Gun : IWeapon ...@@ -88,10 +96,10 @@ public class Gun : IWeapon
this.effect = effect; this.effect = effect;
} }
public void UseWeapon(Enemy[] hitEnemies) public bool UseWeapon(Enemy[] hitEnemies)
{ {
if (timer > 0) if (timer > 0)
return; return false;
if (Input.GetMouseButton(0)) if (Input.GetMouseButton(0))
{ {
effect.transform.rotation = Camera.main.transform.rotation; effect.transform.rotation = Camera.main.transform.rotation;
...@@ -102,7 +110,9 @@ public class Gun : IWeapon ...@@ -102,7 +110,9 @@ public class Gun : IWeapon
IngameUIManager.inst.UpdateComboUI(weaponDamage); IngameUIManager.inst.UpdateComboUI(weaponDamage);
} }
timer = gunShotInterval; timer = gunShotInterval;
return true;
} }
return false;
} }
public Enemy[] WeaponLockOn(LayerMask enemyMask, LayerMask blockMask) public Enemy[] WeaponLockOn(LayerMask enemyMask, LayerMask blockMask)
...@@ -155,7 +165,7 @@ public class Knife : IWeapon ...@@ -155,7 +165,7 @@ public class Knife : IWeapon
this.player = player; this.player = player;
} }
public void UseWeapon(Enemy[] hitEnemies) public bool UseWeapon(Enemy[] hitEnemies)
{ {
if (Input.GetMouseButtonDown(0)) if (Input.GetMouseButtonDown(0))
{ {
...@@ -168,7 +178,9 @@ public class Knife : IWeapon ...@@ -168,7 +178,9 @@ public class Knife : IWeapon
if (enemy.IsDead) if (enemy.IsDead)
skillTimer = 0; skillTimer = 0;
} }
return true;
} }
return false;
} }
public Enemy[] WeaponLockOn(LayerMask enemyMask, LayerMask blockMask) public Enemy[] WeaponLockOn(LayerMask enemyMask, LayerMask blockMask)
......
Grapplers/ProjectSettings/TagManager.asset
View file @ 1e1153e7
...@@ -18,7 +18,7 @@ TagManager: ...@@ -18,7 +18,7 @@ TagManager:
- PlayerPassable - PlayerPassable
- Enemy - Enemy
- Terrain - Terrain
- - PostProcessing
- -
- -
- -
......
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