diff --git a/Assets/Scenes/Level_01.unity b/Assets/Scenes/Level_01.unity
index 28f1050b1599a0220011870d502fd17bb2ef9c84..e241b3fc3101934052b43cc15c69bcea727971e6 100644
--- a/Assets/Scenes/Level_01.unity
+++ b/Assets/Scenes/Level_01.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.45061505, g: 0.498609, b: 0.56437516, a: 1}
+ m_IndirectSpecularColor: {r: 0.4506148, g: 0.49860865, b: 0.56437486, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -151,7 +151,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 9
+ m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 130, z: 0}
--- !u!1001 &33458243
PrefabInstance:
@@ -250,7 +250,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 400080, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3}
propertyPath: m_RootOrder
- value: 7
+ value: 8
objectReference: {fileID: 0}
- target: {fileID: 400080, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3}
propertyPath: m_LocalPosition.x
@@ -539,7 +539,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 11
+ m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 230, z: 0}
--- !u!1 &38786124
GameObject:
@@ -705,6 +705,85 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4e16e79fec71a694c868a8a313711bcc, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!1 &71300037
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 71300038}
+ - component: {fileID: 71300040}
+ - component: {fileID: 71300039}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &71300038
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 71300037}
+ 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: 1075088085}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0.000013351, y: 25.29}
+ m_SizeDelta: {x: 298.479, y: 50.5807}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &71300039
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 71300037}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData:
+ m_Font: {fileID: 12800000, guid: 46238fb1ad7a7a84ba8954c1c860994c, type: 3}
+ m_FontSize: 35
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 2
+ m_MaxSize: 40
+ m_Alignment: 0
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: Weapon Upgrade
+--- !u!222 &71300040
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 71300037}
+ m_CullTransparentMesh: 1
--- !u!1 &180263584
GameObject:
m_ObjectHideFlags: 0
@@ -750,7 +829,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 12
+ m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &240257946
GameObject:
@@ -840,7 +919,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 8
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &387973548
GameObject:
@@ -945,7 +1024,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 10
+ m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 240, z: 0}
--- !u!1 &456675247
GameObject:
@@ -1026,6 +1105,151 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 456675247}
m_CullTransparentMesh: 1
+--- !u!1 &456813171
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 456813172}
+ - component: {fileID: 456813175}
+ - component: {fileID: 456813174}
+ - component: {fileID: 456813173}
+ m_Layer: 5
+ m_Name: FasterButton
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &456813172
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 456813171}
+ 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:
+ - {fileID: 1839814690}
+ m_Father: {fileID: 1075088085}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 127, y: -45}
+ m_SizeDelta: {x: 196, y: 42}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &456813173
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 456813171}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 1
+ 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: 456813174}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 581701021}
+ m_TargetAssemblyTypeName: PlayerShooting, Assembly-CSharp
+ m_MethodName: upgradeFaster
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+ - m_Target: {fileID: 2016991955}
+ m_TargetAssemblyTypeName: WeaponUpgradeZen, Assembly-CSharp
+ m_MethodName: Resume
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+--- !u!114 &456813174
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 456813171}
+ 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 &456813175
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 456813171}
+ m_CullTransparentMesh: 1
--- !u!1 &546248931
GameObject:
m_ObjectHideFlags: 0
@@ -6232,6 +6456,8 @@ MonoBehaviour:
timeBetweenBullets: 0.15
range: 100
text: {fileID: 1214467935}
+ diagonalVersion: 0
+ fasterVersion: 0
--- !u!1 &732164003
GameObject:
m_ObjectHideFlags: 0
@@ -6491,7 +6717,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 13
+ m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &857069320
GameObject:
@@ -6860,6 +7086,84 @@ MonoBehaviour:
m_EditorClassIdentifier:
target: {fileID: 33458250}
smoothing: 5
+--- !u!1 &1075088084
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1075088085}
+ - component: {fileID: 1075088087}
+ - component: {fileID: 1075088086}
+ m_Layer: 5
+ m_Name: WeaponUpgradePanel
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &1075088085
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1075088084}
+ 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:
+ - {fileID: 71300038}
+ - {fileID: 1521258347}
+ - {fileID: 456813172}
+ m_Father: {fileID: 2016991954}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: -289.8354, y: -236.7481}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1075088086
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1075088084}
+ 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: 0.392}
+ 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 &1075088087
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1075088084}
+ m_CullTransparentMesh: 1
--- !u!1 &1099601752
GameObject:
m_ObjectHideFlags: 0
@@ -7415,7 +7719,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 5.2500005, y: -100.00001}
m_SizeDelta: {x: 300, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1401845284
@@ -7539,6 +7843,151 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1408824053}
m_CullTransparentMesh: 1
+--- !u!1 &1521258346
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1521258347}
+ - component: {fileID: 1521258350}
+ - component: {fileID: 1521258349}
+ - component: {fileID: 1521258348}
+ m_Layer: 5
+ m_Name: DiagonalButton
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1521258347
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1521258346}
+ 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:
+ - {fileID: 1715887923}
+ m_Father: {fileID: 1075088085}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -131, y: -45}
+ m_SizeDelta: {x: 196, y: 42}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1521258348
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1521258346}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 1
+ 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: 1521258349}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 581701021}
+ m_TargetAssemblyTypeName: PlayerShooting, Assembly-CSharp
+ m_MethodName: upgradeDiagonal
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+ - m_Target: {fileID: 2016991955}
+ m_TargetAssemblyTypeName: WeaponUpgradeZen, Assembly-CSharp
+ m_MethodName: Resume
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+--- !u!114 &1521258349
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1521258346}
+ 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 &1521258350
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1521258346}
+ m_CullTransparentMesh: 1
--- !u!1001 &1687477066
PrefabInstance:
m_ObjectHideFlags: 0
@@ -7675,6 +8124,85 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1702970504}
m_CullTransparentMesh: 1
+--- !u!1 &1715887922
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1715887923}
+ - component: {fileID: 1715887925}
+ - component: {fileID: 1715887924}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1715887923
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1715887922}
+ 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: 1521258347}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1715887924
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1715887922}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 20
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 2
+ m_MaxSize: 40
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: Diagonal Weapon
+--- !u!222 &1715887925
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1715887922}
+ m_CullTransparentMesh: 1
--- !u!1 &1733453807
GameObject:
m_ObjectHideFlags: 0
@@ -7970,6 +8498,201 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1755254422}
m_CullTransparentMesh: 1
+--- !u!1 &1839814689
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1839814690}
+ - component: {fileID: 1839814692}
+ - component: {fileID: 1839814691}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1839814690
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1839814689}
+ 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: 456813172}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1839814691
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1839814689}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 20
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 2
+ m_MaxSize: 40
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: Faster weapon
+--- !u!222 &1839814692
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1839814689}
+ m_CullTransparentMesh: 1
+--- !u!1 &2016991950
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2016991954}
+ - component: {fileID: 2016991953}
+ - component: {fileID: 2016991952}
+ - component: {fileID: 2016991951}
+ - component: {fileID: 2016991955}
+ m_Layer: 5
+ m_Name: WeaponUpgradeCanvas
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &2016991951
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2016991950}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreReversedGraphics: 1
+ m_BlockingObjects: 0
+ m_BlockingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+--- !u!114 &2016991952
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2016991950}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_UiScaleMode: 0
+ m_ReferencePixelsPerUnit: 100
+ m_ScaleFactor: 1
+ m_ReferenceResolution: {x: 800, y: 600}
+ m_ScreenMatchMode: 0
+ m_MatchWidthOrHeight: 0
+ m_PhysicalUnit: 3
+ m_FallbackScreenDPI: 96
+ m_DefaultSpriteDPI: 96
+ m_DynamicPixelsPerUnit: 1
+ m_PresetInfoIsWorld: 0
+--- !u!223 &2016991953
+Canvas:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2016991950}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_RenderMode: 0
+ m_Camera: {fileID: 0}
+ m_PlaneDistance: 100
+ m_PixelPerfect: 1
+ m_ReceivesEvents: 1
+ m_OverrideSorting: 0
+ m_OverridePixelPerfect: 0
+ m_SortingBucketNormalizedSize: 0
+ m_AdditionalShaderChannelsFlag: 0
+ m_SortingLayerID: 0
+ m_SortingOrder: 0
+ m_TargetDisplay: 0
+--- !u!224 &2016991954
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2016991950}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0, y: 0, z: 0}
+ m_Children:
+ - {fileID: 1075088085}
+ m_Father: {fileID: 0}
+ m_RootOrder: 7
+ 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: 0, y: 0}
+ m_Pivot: {x: 0, y: 0}
+--- !u!114 &2016991955
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2016991950}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 00b54ba799d785e42a2e5758f8ecc1d2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ weaponUpgradePanel: {fileID: 1075088084}
+ HUDCanvas: {fileID: 38786124}
+ interval: 30
--- !u!1 &2051653143
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Player/PlayerShooting.cs b/Assets/Scripts/Player/PlayerShooting.cs
index 1301ca944d3af90b2f70556734079fa5cc4098ac..f3da9882765beb92ef3fa2b8c2260548e5951edf 100644
--- a/Assets/Scripts/Player/PlayerShooting.cs
+++ b/Assets/Scripts/Player/PlayerShooting.cs
@@ -10,15 +10,17 @@ public class PlayerShooting : MonoBehaviour
public Text text;
float timer;
- Ray shootRay = new Ray();
- RaycastHit shootHit;
+ Ray shootRay = new Ray();
+ RaycastHit shootHit;
int shootableMask;
ParticleSystem gunParticles;
- LineRenderer gunLine;
+ LineRenderer gunLine;
AudioSource gunAudio;
Light gunLight;
- float effectsDisplayTime = 0.2f;
-
+ float effectsDisplayTime = 0.2f;
+ public int diagonalVersion = 0;
+ public int fasterVersion = 0;
+
void Awake()
{
shootableMask = LayerMask.GetMask("Shootable");
@@ -34,7 +36,18 @@ public class PlayerShooting : MonoBehaviour
if (Input.GetButton("Fire1") && timer >= timeBetweenBullets && Time.timeScale != 0)
{
- Shoot();
+ switch(diagonalVersion)
+ {
+ case 0:
+ Shoot();
+ break;
+ case 1:
+ Shoot3Direction();
+ break;
+ case 2:
+ Shoot5Direction();
+ break;
+ }
}
if (timer >= timeBetweenBullets * effectsDisplayTime)
@@ -48,11 +61,13 @@ public class PlayerShooting : MonoBehaviour
public void DisableEffects()
{
gunLine.enabled = false;
+
gunLight.enabled = false;
}
public void Shoot()
{
+ gunLine.positionCount = 2;
timer = 0f;
gunAudio.Play();
@@ -84,6 +99,86 @@ public class PlayerShooting : MonoBehaviour
gunLine.SetPosition(1, shootRay.origin + shootRay.direction * range);
}
}
+
+ public void Shoot3Direction(){
+ Shoot();
+ gunLine.positionCount = 6;
+
+ gunLine.SetPosition(2, transform.position);
+ shootRay.direction = Quaternion.Euler(0,-15,0) * transform.forward;
+
+ if (Physics.Raycast(shootRay, out shootHit, range, shootableMask))
+ {
+ EnemyHealth enemyHealth = shootHit.collider.GetComponent<EnemyHealth>();
+ if (enemyHealth != null)
+ {
+ enemyHealth.TakeDamage(damagePerShot, shootHit.point);
+ }
+ gunLine.SetPosition(3, shootHit.point);
+ }
+ else
+ {
+ gunLine.SetPosition(3, shootRay.origin + shootRay.direction * range);
+ }
+
+ gunLine.SetPosition(4, transform.position);
+ shootRay.direction = Quaternion.Euler(0,15,0) * transform.forward;
+
+ if (Physics.Raycast(shootRay, out shootHit, range, shootableMask))
+ {
+ EnemyHealth enemyHealth = shootHit.collider.GetComponent<EnemyHealth>();
+ if (enemyHealth != null)
+ {
+ enemyHealth.TakeDamage(damagePerShot, shootHit.point);
+ }
+ gunLine.SetPosition(5, shootHit.point);
+ }
+ else
+ {
+ gunLine.SetPosition(5, shootRay.origin + shootRay.direction * range);
+ }
+
+ }
+
+ public void Shoot5Direction(){
+ Shoot3Direction();
+ gunLine.positionCount = 10;
+
+ gunLine.SetPosition(6, transform.position);
+ shootRay.direction = Quaternion.Euler(0,-30,0) * transform.forward;
+
+ if (Physics.Raycast(shootRay, out shootHit, range, shootableMask))
+ {
+ EnemyHealth enemyHealth = shootHit.collider.GetComponent<EnemyHealth>();
+ if (enemyHealth != null)
+ {
+ enemyHealth.TakeDamage(damagePerShot, shootHit.point);
+ }
+ gunLine.SetPosition(7, shootHit.point);
+ }
+ else
+ {
+ gunLine.SetPosition(7, shootRay.origin + shootRay.direction * range);
+ }
+
+ gunLine.SetPosition(8, transform.position);
+ shootRay.direction = Quaternion.Euler(0,30,0) * transform.forward;
+
+ if (Physics.Raycast(shootRay, out shootHit, range, shootableMask))
+ {
+ EnemyHealth enemyHealth = shootHit.collider.GetComponent<EnemyHealth>();
+ if (enemyHealth != null)
+ {
+ enemyHealth.TakeDamage(damagePerShot, shootHit.point);
+ }
+ gunLine.SetPosition(9, shootHit.point);
+ }
+ else
+ {
+ gunLine.SetPosition(9, shootRay.origin + shootRay.direction * range);
+ }
+ }
+
public void BoostPower(int amount){
int addedPower = damagePerShot + amount;
if (addedPower >= damagePerShotMax){
@@ -92,4 +187,28 @@ public class PlayerShooting : MonoBehaviour
damagePerShot = addedPower;
}
}
+
+ public void upgradeDiagonal(){
+ if (diagonalVersion < 2){
+ diagonalVersion++;
+ }
+ }
+
+ public void upgradeFaster(){
+ if (fasterVersion < 3){
+ fasterVersion++;
+ switch(fasterVersion)
+ {
+ case 1:
+ timeBetweenBullets = 0.08f;
+ break;
+ case 2:
+ timeBetweenBullets = 0.05f;
+ break;
+ case 3:
+ timeBetweenBullets = 0.03f;
+ break;
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/Assets/Scripts/Player/WeaponUpgradeZen.cs b/Assets/Scripts/Player/WeaponUpgradeZen.cs
new file mode 100644
index 0000000000000000000000000000000000000000..14f33cc4854d30fc4ed0f65ba1a6ffaa4b9b74a5
--- /dev/null
+++ b/Assets/Scripts/Player/WeaponUpgradeZen.cs
@@ -0,0 +1,58 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class WeaponUpgradeZen : MonoBehaviour
+{
+ public static bool GameIsPaused = false;
+ public GameObject weaponUpgradePanel;
+ public GameObject HUDCanvas;
+ float time;
+ public float interval = 30f;
+ int counter = 0;
+ GameObject player;
+
+ void Start()
+ {
+ player = GameObject.FindGameObjectWithTag ("Player");
+ InvokeRepeating("Pause", interval, interval);
+ }
+
+ void Update(){
+ if (counter > 4)
+ CancelInvoke();
+
+ PlayerHealth playerHealth = player.GetComponent<PlayerHealth>();
+ if (playerHealth.currentHealth == 0)
+ CancelInvoke();
+ }
+
+ public void Resume()
+ {
+ weaponUpgradePanel.SetActive(false);
+ HUDCanvas.SetActive(true);
+ Time.timeScale = 1f;
+ GameIsPaused = false;
+ }
+
+ void Pause()
+ {
+ counter++;
+ weaponUpgradePanel.SetActive(true);
+ GameObject diagonalButton = GameObject.Find("DiagonalButton");
+ GameObject gunBarrelEnd = GameObject.Find("GunBarrelEnd");
+ PlayerShooting playerShooting = gunBarrelEnd.GetComponent<PlayerShooting>();
+ if (diagonalButton!= null && playerShooting.diagonalVersion == 2){
+ diagonalButton.SetActive(false);
+ }
+ GameObject fasterButton = GameObject.Find("FasterButton");
+ if (fasterButton!= null && playerShooting.fasterVersion == 3){
+ fasterButton.SetActive(false);
+ }
+ HUDCanvas.SetActive(false);
+ Time.timeScale = 0f;
+ GameIsPaused = true;
+ }
+}
+
+
diff --git a/Assets/Scripts/Player/WeaponUpgradeZen.cs.meta b/Assets/Scripts/Player/WeaponUpgradeZen.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..2e797524b449e8e6be731a4624efd6f0e53bf95a
--- /dev/null
+++ b/Assets/Scripts/Player/WeaponUpgradeZen.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 00b54ba799d785e42a2e5758f8ecc1d2
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant: