diff --git a/Assets/Audio/Effects/Player Bow.wav b/Assets/Audio/Effects/Player Bow.wav
new file mode 100644
index 0000000000000000000000000000000000000000..b39b520358c1814f660cd3f6bb326d9445ad8571
--- /dev/null
+++ b/Assets/Audio/Effects/Player Bow.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a50520d18707aa2ea35a02c927407ac3925c221d974895ac08c91fd5cee56100
+size 187480
diff --git a/Assets/Audio/Effects/Player Bow.wav.meta b/Assets/Audio/Effects/Player Bow.wav.meta
new file mode 100644
index 0000000000000000000000000000000000000000..adb8210e36780d1c15a8470692b5fc3d1c5a3fe5
--- /dev/null
+++ b/Assets/Audio/Effects/Player Bow.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 0a5dd97bd0604d44397959b4c9a0deb9
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Audio/Effects/Player Slash.wav b/Assets/Audio/Effects/Player Slash.wav
new file mode 100644
index 0000000000000000000000000000000000000000..2cd23ffe592ea3dfe33c4c768c3c8c6e1f3d9525
--- /dev/null
+++ b/Assets/Audio/Effects/Player Slash.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2a972a0ec0be751299ac6a834bec5a25baf610ff4a8e7353acb8584cbcf0aaab
+size 258792
diff --git a/Assets/Audio/Effects/Player Slash.wav.meta b/Assets/Audio/Effects/Player Slash.wav.meta
new file mode 100644
index 0000000000000000000000000000000000000000..8519f255443fdc719148fd242cc396771a9921b8
--- /dev/null
+++ b/Assets/Audio/Effects/Player Slash.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: ea3810a94c786994592b4af9547b4c46
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/Level_01.unity b/Assets/Scenes/Level_01.unity
index ca557349082d5a684da5080ed5ee2f19e51a2918..08c4c0bca5df1611957705a6717ac059ff1c9483 100644
--- a/Assets/Scenes/Level_01.unity
+++ b/Assets/Scenes/Level_01.unity
@@ -1052,7 +1052,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 491809538}
- m_RootOrder: 5
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -1619,6 +1619,8 @@ RectTransform:
- {fileID: 2087116902}
- {fileID: 1583886737}
- {fileID: 67812823}
+ - {fileID: 1201013129}
+ - {fileID: 1013198296}
- {fileID: 2030411491}
- {fileID: 1005111342}
- {fileID: 227527628}
@@ -2580,6 +2582,82 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 774339252}
m_CullTransparentMesh: 1
+--- !u!1 &777697889
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 777697890}
+ - component: {fileID: 777697892}
+ - component: {fileID: 777697891}
+ m_Layer: 5
+ m_Name: Fill
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &777697890
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 777697889}
+ 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_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 993013553}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 10, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &777697891
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 777697889}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &777697892
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 777697889}
+ m_CullTransparentMesh: 1
--- !u!1 &788122803
GameObject:
m_ObjectHideFlags: 0
@@ -2863,7 +2941,7 @@ RectTransform:
- {fileID: 788122804}
- {fileID: 840802841}
m_Father: {fileID: 491809538}
- m_RootOrder: 10
+ m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2892,8 +2970,10 @@ MonoBehaviour:
gunAudioSrc:
- {fileID: 8300000, guid: fa7f046ce321d4021b5e753bf1152916, type: 3}
- {fileID: 8300000, guid: ba7220d25e509f9409ceacf04b5962e2, type: 3}
- - {fileID: 0}
- - {fileID: 0}
+ - {fileID: 8300000, guid: ea3810a94c786994592b4af9547b4c46, type: 3}
+ - {fileID: 8300000, guid: 0a5dd97bd0604d44397959b4c9a0deb9, type: 3}
+ BowSliderIcon: {fileID: 1201013128}
+ BowSlider: {fileID: 1013198297}
--- !u!82 &880479557
AudioSource:
m_ObjectHideFlags: 0
@@ -8222,6 +8302,43 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 982955539}
m_CullTransparentMesh: 1
+--- !u!1 &993013552
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 993013553}
+ m_Layer: 5
+ m_Name: Fill Area
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &993013553
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 993013552}
+ 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_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 777697890}
+ m_Father: {fileID: 1013198296}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0.25}
+ m_AnchorMax: {x: 1, y: 0.75}
+ m_AnchoredPosition: {x: -5, y: 0}
+ m_SizeDelta: {x: -20, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &999659690
GameObject:
m_ObjectHideFlags: 0
@@ -8388,7 +8505,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 491809538}
- m_RootOrder: 4
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -8433,6 +8550,96 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1005111341}
m_CullTransparentMesh: 0
+--- !u!1 &1013198295
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1013198296}
+ - component: {fileID: 1013198297}
+ m_Layer: 5
+ m_Name: BowRangeSlider
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1013198296
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1013198295}
+ 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_ConstrainProportionsScale: 1
+ m_Children:
+ - {fileID: 1546305511}
+ - {fileID: 993013553}
+ m_Father: {fileID: 491809538}
+ m_RootOrder: 4
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 909.6, y: 42}
+ m_SizeDelta: {x: 160, y: 20}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1013198297
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1013198295}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_WrapAround: 0
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 0
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 0}
+ m_FillRect: {fileID: 777697890}
+ m_HandleRect: {fileID: 0}
+ m_Direction: 0
+ m_MinValue: 0
+ m_MaxValue: 100
+ m_WholeNumbers: 1
+ m_Value: 100
+ m_OnValueChanged:
+ m_PersistentCalls:
+ m_Calls: []
--- !u!1 &1036960977
GameObject:
m_ObjectHideFlags: 0
@@ -8914,6 +9121,82 @@ MonoBehaviour:
deathClip: {fileID: 8300000, guid: d36a393bca4582043982db9089e1694f, type: 3}
flashSpeed: 5
flashColour: {r: 1, g: 0, b: 0, a: 0.1}
+--- !u!1 &1201013128
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1201013129}
+ - component: {fileID: 1201013131}
+ - component: {fileID: 1201013130}
+ m_Layer: 5
+ m_Name: BowRange
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1201013129
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1201013128}
+ 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_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 491809538}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 799, y: 40.3}
+ m_SizeDelta: {x: 35.42, y: 35.419983}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1201013130
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1201013128}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 0
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: f4c9e32b62c4d414685139ac10c0bcb8, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1201013131
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1201013128}
+ m_CullTransparentMesh: 0
--- !u!1 &1244782546
GameObject:
m_ObjectHideFlags: 0
@@ -9147,7 +9430,7 @@ RectTransform:
- {fileID: 649544088}
- {fileID: 679650415}
m_Father: {fileID: 491809538}
- m_RootOrder: 7
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -9276,7 +9559,7 @@ RectTransform:
- {fileID: 819070688}
- {fileID: 1678682908}
m_Father: {fileID: 491809538}
- m_RootOrder: 6
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -9375,6 +9658,82 @@ RectTransform:
m_AnchoredPosition: {x: -5, y: 0}
m_SizeDelta: {x: -20, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &1546305510
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1546305511}
+ - component: {fileID: 1546305513}
+ - component: {fileID: 1546305512}
+ m_Layer: 5
+ m_Name: Background
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1546305511
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1546305510}
+ 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_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1013198296}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0.25}
+ m_AnchorMax: {x: 1, y: 0.75}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1546305512
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1546305510}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1546305513
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1546305510}
+ m_CullTransparentMesh: 1
--- !u!1 &1546708124
GameObject:
m_ObjectHideFlags: 0
@@ -10198,7 +10557,7 @@ RectTransform:
- {fileID: 1446248592}
- {fileID: 36682392}
m_Father: {fileID: 491809538}
- m_RootOrder: 9
+ m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -10583,7 +10942,7 @@ RectTransform:
- {fileID: 1579637355}
- {fileID: 1705535179}
m_Father: {fileID: 491809538}
- m_RootOrder: 8
+ m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -11313,7 +11672,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 491809538}
- m_RootOrder: 3
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
diff --git a/Assets/Scenes/Level_02.unity b/Assets/Scenes/Level_02.unity
index 49b45848243d9279d89390c0ddfe77b2910aece3..9e41dd61a55566907e1220ba2062588c59404ac1 100644
--- a/Assets/Scenes/Level_02.unity
+++ b/Assets/Scenes/Level_02.unity
@@ -1052,7 +1052,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 491809538}
- m_RootOrder: 5
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -1467,6 +1467,8 @@ RectTransform:
- {fileID: 2087116902}
- {fileID: 1583886737}
- {fileID: 67812823}
+ - {fileID: 1061111411}
+ - {fileID: 1262958772}
- {fileID: 2030411491}
- {fileID: 1005111342}
- {fileID: 227527628}
@@ -1506,6 +1508,82 @@ MonoBehaviour:
alertText: {fileID: 679650416}
fadeTime: 0.5
delayTime: 3
+--- !u!1 &523884926
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 523884927}
+ - component: {fileID: 523884929}
+ - component: {fileID: 523884928}
+ m_Layer: 5
+ m_Name: Background
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &523884927
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 523884926}
+ 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_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1262958772}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0.25}
+ m_AnchorMax: {x: 1, y: 0.75}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &523884928
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 523884926}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &523884929
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 523884926}
+ m_CullTransparentMesh: 1
--- !u!1 &529128668
GameObject:
m_ObjectHideFlags: 0
@@ -2460,6 +2538,13 @@ MonoBehaviour:
m_EditorClassIdentifier:
gunMode: 1
damagePerShot: 30
+ gunAudioSrc:
+ - {fileID: 8300000, guid: fa7f046ce321d4021b5e753bf1152916, type: 3}
+ - {fileID: 8300000, guid: ba7220d25e509f9409ceacf04b5962e2, type: 3}
+ - {fileID: 8300000, guid: ea3810a94c786994592b4af9547b4c46, type: 3}
+ - {fileID: 8300000, guid: 0a5dd97bd0604d44397959b4c9a0deb9, type: 3}
+ BowSliderIcon: {fileID: 1061111410}
+ BowSlider: {fileID: 1262958773}
--- !u!82 &880479557
AudioSource:
m_ObjectHideFlags: 0
@@ -7704,6 +7789,43 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 971458635}
m_CullTransparentMesh: 1
+--- !u!1 &994980453
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 994980454}
+ m_Layer: 5
+ m_Name: Fill Area
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &994980454
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 994980453}
+ 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_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 1666378707}
+ m_Father: {fileID: 1262958772}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0.25}
+ m_AnchorMax: {x: 1, y: 0.75}
+ m_AnchoredPosition: {x: -5, y: 0}
+ m_SizeDelta: {x: -20, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &999659690
GameObject:
m_ObjectHideFlags: 0
@@ -7870,7 +7992,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 491809538}
- m_RootOrder: 4
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -8054,6 +8176,82 @@ RectTransform:
m_AnchoredPosition: {x: -6, y: -84}
m_SizeDelta: {x: 500, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &1061111410
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1061111411}
+ - component: {fileID: 1061111413}
+ - component: {fileID: 1061111412}
+ m_Layer: 5
+ m_Name: BowRange
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1061111411
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1061111410}
+ 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_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 491809538}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 799, y: 40.29998}
+ m_SizeDelta: {x: 35.42, y: 35.419983}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1061111412
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1061111410}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 0
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: f4c9e32b62c4d414685139ac10c0bcb8, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1061111413
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1061111410}
+ m_CullTransparentMesh: 0
--- !u!1 &1084676474
GameObject:
m_ObjectHideFlags: 0
@@ -8427,6 +8625,96 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 230, z: 0}
+--- !u!1 &1262958771
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1262958772}
+ - component: {fileID: 1262958773}
+ m_Layer: 5
+ m_Name: BowRangeSlider
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1262958772
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1262958771}
+ 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_ConstrainProportionsScale: 1
+ m_Children:
+ - {fileID: 523884927}
+ - {fileID: 994980454}
+ m_Father: {fileID: 491809538}
+ m_RootOrder: 4
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 909.60004, y: 41.999992}
+ m_SizeDelta: {x: 160, y: 20}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1262958773
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1262958771}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_WrapAround: 0
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 0
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 0}
+ m_FillRect: {fileID: 1666378707}
+ m_HandleRect: {fileID: 0}
+ m_Direction: 0
+ m_MinValue: 0
+ m_MaxValue: 100
+ m_WholeNumbers: 1
+ m_Value: 100
+ m_OnValueChanged:
+ m_PersistentCalls:
+ m_Calls: []
--- !u!1 &1289363566
GameObject:
m_ObjectHideFlags: 0
@@ -8553,7 +8841,7 @@ RectTransform:
- {fileID: 649544088}
- {fileID: 679650415}
m_Father: {fileID: 491809538}
- m_RootOrder: 7
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -8606,7 +8894,7 @@ RectTransform:
- {fileID: 819070688}
- {fileID: 1678682908}
m_Father: {fileID: 491809538}
- m_RootOrder: 6
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -9347,7 +9635,6 @@ MonoBehaviour:
isShopOpen: 0
isShopping: 0
petFactory: {fileID: 607211381}
- pdm: {fileID: 630617449}
currentWeapon: 0
hudManager: {fileID: 491809539}
--- !u!114 &1644740160
@@ -9392,6 +9679,82 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
questMenu: {fileID: 1677828215}
+--- !u!1 &1666378706
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1666378707}
+ - component: {fileID: 1666378709}
+ - component: {fileID: 1666378708}
+ m_Layer: 5
+ m_Name: Fill
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1666378707
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1666378706}
+ 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_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 994980454}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 10, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1666378708
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1666378706}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1666378709
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1666378706}
+ m_CullTransparentMesh: 1
--- !u!1 &1677828215
GameObject:
m_ObjectHideFlags: 0
@@ -9426,7 +9789,7 @@ RectTransform:
- {fileID: 1446248592}
- {fileID: 36682392}
m_Father: {fileID: 491809538}
- m_RootOrder: 9
+ m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -9811,7 +10174,7 @@ RectTransform:
- {fileID: 1579637355}
- {fileID: 1705535179}
m_Father: {fileID: 491809538}
- m_RootOrder: 8
+ m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -10465,7 +10828,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 491809538}
- m_RootOrder: 3
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
diff --git a/Assets/Scenes/Level_Final.unity b/Assets/Scenes/Level_Final.unity
index 9081b3f5305da8bb98e2d64a4484c5a42a4a44fa..4e41358b5395fa07244af748fddf359dbaa3288f 100644
--- a/Assets/Scenes/Level_Final.unity
+++ b/Assets/Scenes/Level_Final.unity
@@ -637,7 +637,7 @@ RectTransform:
- {fileID: 136513749}
- {fileID: 1122634084}
m_Father: {fileID: 491809538}
- m_RootOrder: 8
+ m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -719,6 +719,82 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &147709075
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 147709076}
+ - component: {fileID: 147709078}
+ - component: {fileID: 147709077}
+ m_Layer: 5
+ m_Name: Fill
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &147709076
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 147709075}
+ 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_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1864229086}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 10, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &147709077
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 147709075}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &147709078
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 147709075}
+ m_CullTransparentMesh: 1
--- !u!1 &174293672
GameObject:
m_ObjectHideFlags: 0
@@ -1027,6 +1103,8 @@ RectTransform:
- {fileID: 2087116902}
- {fileID: 1583886737}
- {fileID: 67812823}
+ - {fileID: 1456880657}
+ - {fileID: 806967237}
- {fileID: 1733139685}
- {fileID: 2030411491}
- {fileID: 1444128284}
@@ -1620,6 +1698,96 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 679650414}
m_CullTransparentMesh: 1
+--- !u!1 &806967236
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 806967237}
+ - component: {fileID: 806967238}
+ m_Layer: 5
+ m_Name: BowRangeSlider
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &806967237
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 806967236}
+ 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_ConstrainProportionsScale: 1
+ m_Children:
+ - {fileID: 1853576962}
+ - {fileID: 1864229086}
+ m_Father: {fileID: 491809538}
+ m_RootOrder: 4
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 909.60004, y: 41.999992}
+ m_SizeDelta: {x: 160, y: 20}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &806967238
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 806967236}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_WrapAround: 0
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 0
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 0}
+ m_FillRect: {fileID: 147709076}
+ m_HandleRect: {fileID: 0}
+ m_Direction: 0
+ m_MinValue: 0
+ m_MaxValue: 100
+ m_WholeNumbers: 1
+ m_Value: 100
+ m_OnValueChanged:
+ m_PersistentCalls:
+ m_Calls: []
--- !u!1 &819070687
GameObject:
m_ObjectHideFlags: 0
@@ -1838,10 +2006,19 @@ MonoBehaviour:
gunMode: 1
damagePerShot: 30
gunAudioSrc:
+<<<<<<< HEAD
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
+=======
+ - {fileID: 8300000, guid: fa7f046ce321d4021b5e753bf1152916, type: 3}
+ - {fileID: 8300000, guid: ba7220d25e509f9409ceacf04b5962e2, type: 3}
+ - {fileID: 8300000, guid: ea3810a94c786994592b4af9547b4c46, type: 3}
+ - {fileID: 8300000, guid: 0a5dd97bd0604d44397959b4c9a0deb9, type: 3}
+ BowSliderIcon: {fileID: 1456880656}
+ BowSlider: {fileID: 806967238}
+>>>>>>> 91d4d968aed39017c46150f8bc493614eaf496cc
--- !u!82 &880479557
AudioSource:
m_ObjectHideFlags: 0
@@ -7802,7 +7979,7 @@ RectTransform:
- {fileID: 649544088}
- {fileID: 679650415}
m_Father: {fileID: 491809538}
- m_RootOrder: 6
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -8027,7 +8204,7 @@ RectTransform:
- {fileID: 819070688}
- {fileID: 1678682908}
m_Father: {fileID: 491809538}
- m_RootOrder: 5
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -8051,6 +8228,82 @@ MonoBehaviour:
petPanels: []
hudManager: {fileID: 491809539}
coins: {fileID: 1678682909}
+--- !u!1 &1456880656
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1456880657}
+ - component: {fileID: 1456880659}
+ - component: {fileID: 1456880658}
+ m_Layer: 5
+ m_Name: BowRange
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1456880657
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1456880656}
+ 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_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 491809538}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 799, y: 40.29998}
+ m_SizeDelta: {x: 35.42, y: 35.419983}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1456880658
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1456880656}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 0
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: f4c9e32b62c4d414685139ac10c0bcb8, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1456880659
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1456880656}
+ m_CullTransparentMesh: 0
--- !u!1 &1459372148
GameObject:
m_ObjectHideFlags: 0
@@ -9162,7 +9415,7 @@ RectTransform:
- {fileID: 1316030306}
- {fileID: 499867228}
m_Father: {fileID: 491809538}
- m_RootOrder: 3
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@@ -9253,7 +9506,7 @@ RectTransform:
- {fileID: 1579637355}
- {fileID: 1705535179}
m_Father: {fileID: 491809538}
- m_RootOrder: 7
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -9452,6 +9705,82 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1823918978}
m_CullTransparentMesh: 1
+--- !u!1 &1853576961
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1853576962}
+ - component: {fileID: 1853576964}
+ - component: {fileID: 1853576963}
+ m_Layer: 5
+ m_Name: Background
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1853576962
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1853576961}
+ 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_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 806967237}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0.25}
+ m_AnchorMax: {x: 1, y: 0.75}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1853576963
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1853576961}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1853576964
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1853576961}
+ m_CullTransparentMesh: 1
--- !u!1 &1857233380
GameObject:
m_ObjectHideFlags: 0
@@ -9721,6 +10050,43 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1859301094}
m_CullTransparentMesh: 0
+--- !u!1 &1864229085
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1864229086}
+ m_Layer: 5
+ m_Name: Fill Area
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1864229086
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1864229085}
+ 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_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 147709076}
+ m_Father: {fileID: 806967237}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0.25}
+ m_AnchorMax: {x: 1, y: 0.75}
+ m_AnchoredPosition: {x: -5, y: 0}
+ m_SizeDelta: {x: -20, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1871032086
GameObject:
m_ObjectHideFlags: 0
@@ -9907,7 +10273,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 491809538}
- m_RootOrder: 4
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
diff --git a/Assets/Scripts/Managers/PlayerDataManager.cs b/Assets/Scripts/Managers/PlayerDataManager.cs
index a4b7ec70f13e04f9d15ffacf315d12e53dd12456..dab2210d4a2d983b0e09be0b851a8c0e23acf2d3 100644
--- a/Assets/Scripts/Managers/PlayerDataManager.cs
+++ b/Assets/Scripts/Managers/PlayerDataManager.cs
@@ -106,14 +106,14 @@ public class PlayerDataManager : MonoBehaviour
public void SavePlayerData(int num_data) {
PlayerData data = GetNumData(num_data);
- data.datetime = DateTime.Now.ToString("dd/MM/yyyy");
+ data.timeStr = DateTime.Now.ToString("dd/MM/yyyy");
FileHandler.SaveToJsonPrefs<PlayerData>(data, "PlayerData" + num_data + ".json");
}
public void SavePlayerDataAll() {
- data1.datetime = DateTime.Now.ToString("dd/MM/yyyy");
- data2.datetime = DateTime.Now.ToString("dd/MM/yyyy");
- data3.datetime = DateTime.Now.ToString("dd/MM/yyyy");
+ data1.timeStr = DateTime.Now.ToString("dd/MM/yyyy");
+ data2.timeStr = DateTime.Now.ToString("dd/MM/yyyy");
+ data3.timeStr = DateTime.Now.ToString("dd/MM/yyyy");
FileHandler.SaveToJsonPrefs<PlayerData>(data1, "PlayerData1.json");
FileHandler.SaveToJsonPrefs<PlayerData>(data2, "PlayerData2.json");
FileHandler.SaveToJsonPrefs<PlayerData>(data3, "PlayerData3.json");
diff --git a/Assets/Scripts/Player/PlayerData.cs b/Assets/Scripts/Player/PlayerData.cs
index 0171429dd681d1ee04a5ab30a65020b0f469e455..b1971beddce04f4c5324b1266f1fc84c81407e0f 100644
--- a/Assets/Scripts/Player/PlayerData.cs
+++ b/Assets/Scripts/Player/PlayerData.cs
@@ -7,22 +7,22 @@ using UnityEngine;
public class PlayerData
{
public string name;
- public string datetime;
+ public string timeStr;
public string lastScene;
public int coins;
public float time;
// Start is called before the first frame update
public PlayerData() {
name = "save" + DateTime.Now.ToString("ddMMyyyy");
- datetime = DateTime.Now.ToString("dd/MM/yyyy");
+ timeStr = DateTime.Now.ToString("dd/MM/yyyy");
lastScene = "Level_01";
coins = 0;
time = 0;
}
- public PlayerData(string lastScene, int coins, float time, string name, string datetime) {
+ public PlayerData(string lastScene, int coins, float time, string name, string timeStr) {
this.name = name;
- this.datetime = datetime;
+ this.timeStr = timeStr;
this.lastScene = lastScene;
this.time = time;
this.coins = coins;
diff --git a/Assets/Scripts/Player/PlayerShooting.cs b/Assets/Scripts/Player/PlayerShooting.cs
index e2a662637513251668ddff57c47a840efe94b98b..6a6c1766a79b1b70274ddb53e666b668189b5b7e 100644
--- a/Assets/Scripts/Player/PlayerShooting.cs
+++ b/Assets/Scripts/Player/PlayerShooting.cs
@@ -1,4 +1,5 @@
using UnityEngine;
+using UnityEngine.UI;
Â
public class PlayerShooting : MonoBehaviour
{
@@ -10,9 +11,12 @@ public class PlayerShooting : MonoBehaviour
public int gunMode = 1;
public int damagePerShot = 30;
public AudioClip[] gunAudioSrc = new AudioClip[4];
+ public GameObject BowSliderIcon;
+ public Slider BowSlider;
private float timeBetweenBullets = 0.15f;
private float timeBulletsShot = 0.15f;
private float range = 100f;
+ private float maxRange = 100f;
float timer;
Ray shootRay = new Ray();
Ray[] shootRays = new Ray[5];
@@ -50,6 +54,10 @@ public class PlayerShooting : MonoBehaviour
{
gunMode = 3;
}
+ else if (Input.GetKeyDown("4"))
+ {
+ gunMode = 4;
+ }
}
void UpdateGunMode(int gunMode)
@@ -66,6 +74,16 @@ public class PlayerShooting : MonoBehaviour
timeBetweenBullets = 1f;
range = 10f;
break;
+ case 3:
+ damagePerShot = 80;
+ timeBetweenBullets = 0.5f;
+ range = 2f;
+ break;
+ case 4:
+ damagePerShot = 200;
+ timeBetweenBullets = 0.5f;
+ range = 0f;
+ break;
default:
damagePerShot = 80;
timeBetweenBullets = 0.5f;
@@ -74,15 +92,38 @@ public class PlayerShooting : MonoBehaviour
}
}
+ void UpdateBowRange() {
+ if (Input.GetMouseButton(1)) {
+ range = range <= maxRange ? range + 0.5f : maxRange;
+ BowSlider.value = range;
+ Debug.Log("range: " + range);
+ }
+ }
+
void Update ()
{
timer += Time.deltaTime;
+ int prevGunMode = gunMode;
SetGunMode();
- UpdateGunMode(gunMode);
+ if (prevGunMode != gunMode) {
+ UpdateGunMode(gunMode);
+ }
+ if (gunMode == 4) {
+ BowSlider.gameObject.SetActive(true);
+ BowSliderIcon.SetActive(true);
+ UpdateBowRange();
+ }
+ else {
+ BowSlider.gameObject.SetActive(false);
+ BowSliderIcon.SetActive(false);
+ }
if(Input.GetButton ("Fire1") && timer >= timeBetweenBullets && Time.timeScale != 0 && !GameManager.gameManager.isShopping)
{
Shoot ();
+ if (gunMode == 4) {
+ range = 0f;
+ }
}
if(timer >= timeBulletsShot * effectsDisplayTime)
@@ -188,6 +229,24 @@ public class PlayerShooting : MonoBehaviour
void SwordAttack() {
timer = 0f;
+ gunAudio.clip = gunAudioSrc[2];
+ gunAudio.Play ();
+
+ //Play gun particle
+ gunParticles.Stop ();
+ gunParticles.Play ();
+
+Â Â Â Â Â Â Â //enable Line renderer
+ gunLine.enabled = true;
+ gunLine.positionCount = 20;
+
+ for (int i = 0; i < 10; i++) {
+ shootRay.origin = transform.position;
+ shootRay.direction = Quaternion.Euler(0, (i * 36), 0) * transform.forward;
+ gunLine.SetPosition (2*i, shootRay.origin + shootRay.direction * range);
+ gunLine.SetPosition (2*i+1, shootRay.origin + Quaternion.Euler(0, 36, 0) * shootRay.direction * range);
+ }
+
enemiesHit = Physics.SphereCastAll(transform.position, range, transform.forward, 0, shootableMask);
for (int i = 0; i < enemiesHit.Length; i++) {
EnemyHealth enemyHealth = enemiesHit[i].collider.gameObject.GetComponent<EnemyHealth>();
@@ -199,12 +258,55 @@ public class PlayerShooting : MonoBehaviour
}
}
+ void BowAttack() {
+ timer = 0f;
+
+Â Â Â Â Â Â Â //Play audio
+ gunAudio.clip = gunAudioSrc[3];
+ gunAudio.Play ();
+
+Â Â Â Â Â Â Â //Play gun particle
+ gunParticles.Stop ();
+ gunParticles.Play ();
+
+Â Â Â Â Â Â Â //enable Line renderer
+ gunLine.enabled = true;
+ gunLine.positionCount = 2;
+ gunLine.SetPosition (0, transform.position);
+
+ // set shoot rays
+ shootRay.origin = transform.position;
+ shootRay.direction = transform.forward;
+ //Lakukan raycast jika mendeteksi id nemy hit apapun
+ if (Physics.Raycast (shootRay, out shootHit, range, shootableMask))
+ {
+Â Â Â Â Â Â Â Â Â Â Â //Lakukan raycast hit hace component Enemyhealth
+ EnemyHealth enemyHealth = shootHit.collider.GetComponent <EnemyHealth> ();
+
+ if(enemyHealth != null)
+ {
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â //Lakukan Take Damage
+ enemyHealth.TakeDamage (damagePerShot, shootHit.point);
+ }
+
+Â Â Â Â Â Â Â Â Â Â Â //Set line end position ke hit position
+ gunLine.SetPosition (1, shootHit.point);
+ }
+ else
+ {
+Â Â Â Â Â Â Â Â Â Â Â //set line end position ke range freom barrel
+ gunLine.SetPosition (1, shootRay.origin + shootRay.direction * range);
+ }
+ BowSlider.value = 0;
+ }
+
void Shoot ()
{
switch (gunMode) {
case 1: GunShoot(); break;
case 2: ShotgunShoot(); break;
case 3: SwordAttack(); break;
+ case 4: BowAttack(); break;
default: GunShoot(); break;
}
}
diff --git a/Assets/Textures/bow-arrow.png b/Assets/Textures/bow-arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..048c2892b559f1f0322522e0007b68f2a2a29aa4
--- /dev/null
+++ b/Assets/Textures/bow-arrow.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:58a0d811ad23cd827c86ba7825b4f75985fc6132540c0266a3e9080e61413eb1
+size 11947
diff --git a/Assets/Textures/bow-arrow.png.meta b/Assets/Textures/bow-arrow.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..ccc4a25ac088a4b73aef2d86594b5396e24c0efa
--- /dev/null
+++ b/Assets/Textures/bow-arrow.png.meta
@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: f4c9e32b62c4d414685139ac10c0bcb8
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 12
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMasterTextureLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 1
+ aniso: 1
+ mipBias: 0
+ wrapU: 1
+ wrapV: 1
+ wrapW: 0
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Server
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ nameFileIdTable: {}
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant: