From ad4e4438d965daaa1da06a290023c3ca7c77224d Mon Sep 17 00:00:00 2001 From: vladalexan <51922137+vladalexan@users.noreply.github.com> Date: Mon, 14 Feb 2022 19:23:33 +0200 Subject: [PATCH 1/3] Created a Molotov cocktail, which is a projectile thrown in an arc and generates an area of damage where it lands. --- UnityClient/.vsconfig | 6 + UnityClient/Assets/Graphics.meta | 8 + UnityClient/Assets/Graphics/Effects.meta | 8 + .../Assets/Graphics/Effects/Flames.meta | 8 + .../Assets/Graphics/Effects/Flames/Flame.anim | 95 ++ .../Graphics/Effects/Flames/Flame.anim.meta | 8 + .../Graphics/Effects/Flames/Flames.controller | 72 ++ .../Effects/Flames/Flames.controller.meta | 8 + .../Effects/Flames/frame_00_delay-0.1s.gif | 3 + .../Flames/frame_00_delay-0.1s.gif.meta | 96 ++ .../Effects/Flames/frame_01_delay-0.1s.gif | 3 + .../Flames/frame_01_delay-0.1s.gif.meta | 96 ++ .../Effects/Flames/frame_02_delay-0.1s.gif | 3 + .../Flames/frame_02_delay-0.1s.gif.meta | 96 ++ .../Effects/Flames/frame_03_delay-0.1s.gif | 3 + .../Flames/frame_03_delay-0.1s.gif.meta | 96 ++ .../Effects/Flames/frame_04_delay-0.1s.gif | 3 + .../Flames/frame_04_delay-0.1s.gif.meta | 96 ++ .../Effects/Flames/frame_05_delay-0.1s.gif | 3 + .../Flames/frame_05_delay-0.1s.gif.meta | 96 ++ .../Effects/Flames/frame_06_delay-0.1s.gif | 3 + .../Flames/frame_06_delay-0.1s.gif.meta | 96 ++ .../Effects/Flames/frame_07_delay-0.1s.gif | 3 + .../Flames/frame_07_delay-0.1s.gif.meta | 96 ++ .../Effects/Flames/frame_08_delay-0.1s.gif | 3 + .../Flames/frame_08_delay-0.1s.gif.meta | 96 ++ .../Effects/Flames/frame_09_delay-0.1s.gif | 3 + .../Flames/frame_09_delay-0.1s.gif.meta | 96 ++ UnityClient/Assets/Graphics/Projectiles.meta | 8 + .../Assets/Graphics/Projectiles/Molotov.meta | 8 + .../Graphics/Projectiles/Molotov/Burn.anim | 77 ++ .../Projectiles/Molotov/Burn.anim.meta | 8 + .../Molotov/Molotov Controller.controller | 133 +++ .../Molotov Controller.controller.meta | 8 + .../Molotov/frame_0_delay-0.3s.gif | 3 + .../Molotov/frame_0_delay-0.3s.gif.meta | 96 ++ .../Molotov/frame_1_delay-0.2s.gif | 3 + .../Molotov/frame_1_delay-0.2s.gif.meta | 96 ++ .../Molotov/frame_2_delay-0.3s.gif | 3 + .../Molotov/frame_2_delay-0.3s.gif.meta | 96 ++ .../Molotov/frame_3_delay-0.3s.gif | 3 + .../Molotov/frame_3_delay-0.3s.gif.meta | 96 ++ UnityClient/Assets/Molotov_demo.unity | 913 ++++++++++++++++++ UnityClient/Assets/Molotov_demo.unity.meta | 7 + UnityClient/Assets/Prefabs.meta | 8 + UnityClient/Assets/Prefabs/Ammo Pickup.prefab | 125 +++ .../Assets/Prefabs/Ammo Pickup.prefab.meta | 7 + UnityClient/Assets/Prefabs/Flames.prefab | 145 +++ UnityClient/Assets/Prefabs/Flames.prefab.meta | 7 + UnityClient/Assets/Prefabs/Molotov.prefab | 194 ++++ .../Assets/Prefabs/Molotov.prefab.meta | 7 + UnityClient/Assets/Prefabs/Player.prefab | 241 +++++ UnityClient/Assets/Prefabs/Player.prefab.meta | 7 + UnityClient/Assets/Scripts.meta | 8 + UnityClient/Assets/Scripts/Characters.meta | 8 + .../Scripts/Characters/CharacterStats.cs | 34 + .../Scripts/Characters/CharacterStats.cs.meta | 11 + .../Assets/Scripts/MockPlayerController.cs | 32 + .../Scripts/MockPlayerController.cs.meta | 11 + UnityClient/Assets/Scripts/Molotov.meta | 8 + .../Assets/Scripts/Molotov/AmmoPickup.cs | 13 + .../Assets/Scripts/Molotov/AmmoPickup.cs.meta | 11 + UnityClient/Assets/Scripts/Molotov/Flames.cs | 28 + .../Assets/Scripts/Molotov/Flames.cs.meta | 11 + UnityClient/Assets/Scripts/Molotov/Molotov.cs | 37 + .../Assets/Scripts/Molotov/Molotov.cs.meta | 11 + .../Assets/Scripts/Molotov/Projectile.cs | 41 + .../Assets/Scripts/Molotov/Projectile.cs.meta | 11 + UnityClient/Packages/manifest.json | 14 +- UnityClient/Packages/packages-lock.json | 80 +- .../ProjectSettings/EditorSettings.asset | 4 +- .../ProjectSettings/InputManager.asset | 4 +- .../PackageManagerSettings.asset | 4 +- .../ProjectSettings/Physics2DSettings.asset | 2 +- .../ProjectSettings/ProjectSettings.asset | 4 +- .../ProjectSettings/ProjectVersion.txt | 4 +- UnityClient/ProjectSettings/TagManager.asset | 4 +- .../VersionControlSettings.asset | 3 + .../UserSettings/EditorUserSettings.asset | 3 + 79 files changed, 3875 insertions(+), 28 deletions(-) create mode 100644 UnityClient/.vsconfig create mode 100644 UnityClient/Assets/Graphics.meta create mode 100644 UnityClient/Assets/Graphics/Effects.meta create mode 100644 UnityClient/Assets/Graphics/Effects/Flames.meta create mode 100644 UnityClient/Assets/Graphics/Effects/Flames/Flame.anim create mode 100644 UnityClient/Assets/Graphics/Effects/Flames/Flame.anim.meta create mode 100644 UnityClient/Assets/Graphics/Effects/Flames/Flames.controller create mode 100644 UnityClient/Assets/Graphics/Effects/Flames/Flames.controller.meta create mode 100644 UnityClient/Assets/Graphics/Effects/Flames/frame_00_delay-0.1s.gif create mode 100644 UnityClient/Assets/Graphics/Effects/Flames/frame_00_delay-0.1s.gif.meta create mode 100644 UnityClient/Assets/Graphics/Effects/Flames/frame_01_delay-0.1s.gif create mode 100644 UnityClient/Assets/Graphics/Effects/Flames/frame_01_delay-0.1s.gif.meta create mode 100644 UnityClient/Assets/Graphics/Effects/Flames/frame_02_delay-0.1s.gif create mode 100644 UnityClient/Assets/Graphics/Effects/Flames/frame_02_delay-0.1s.gif.meta create mode 100644 UnityClient/Assets/Graphics/Effects/Flames/frame_03_delay-0.1s.gif create mode 100644 UnityClient/Assets/Graphics/Effects/Flames/frame_03_delay-0.1s.gif.meta create mode 100644 UnityClient/Assets/Graphics/Effects/Flames/frame_04_delay-0.1s.gif create mode 100644 UnityClient/Assets/Graphics/Effects/Flames/frame_04_delay-0.1s.gif.meta create mode 100644 UnityClient/Assets/Graphics/Effects/Flames/frame_05_delay-0.1s.gif create mode 100644 UnityClient/Assets/Graphics/Effects/Flames/frame_05_delay-0.1s.gif.meta create mode 100644 UnityClient/Assets/Graphics/Effects/Flames/frame_06_delay-0.1s.gif create mode 100644 UnityClient/Assets/Graphics/Effects/Flames/frame_06_delay-0.1s.gif.meta create mode 100644 UnityClient/Assets/Graphics/Effects/Flames/frame_07_delay-0.1s.gif create mode 100644 UnityClient/Assets/Graphics/Effects/Flames/frame_07_delay-0.1s.gif.meta create mode 100644 UnityClient/Assets/Graphics/Effects/Flames/frame_08_delay-0.1s.gif create mode 100644 UnityClient/Assets/Graphics/Effects/Flames/frame_08_delay-0.1s.gif.meta create mode 100644 UnityClient/Assets/Graphics/Effects/Flames/frame_09_delay-0.1s.gif create mode 100644 UnityClient/Assets/Graphics/Effects/Flames/frame_09_delay-0.1s.gif.meta create mode 100644 UnityClient/Assets/Graphics/Projectiles.meta create mode 100644 UnityClient/Assets/Graphics/Projectiles/Molotov.meta create mode 100644 UnityClient/Assets/Graphics/Projectiles/Molotov/Burn.anim create mode 100644 UnityClient/Assets/Graphics/Projectiles/Molotov/Burn.anim.meta create mode 100644 UnityClient/Assets/Graphics/Projectiles/Molotov/Molotov Controller.controller create mode 100644 UnityClient/Assets/Graphics/Projectiles/Molotov/Molotov Controller.controller.meta create mode 100644 UnityClient/Assets/Graphics/Projectiles/Molotov/frame_0_delay-0.3s.gif create mode 100644 UnityClient/Assets/Graphics/Projectiles/Molotov/frame_0_delay-0.3s.gif.meta create mode 100644 UnityClient/Assets/Graphics/Projectiles/Molotov/frame_1_delay-0.2s.gif create mode 100644 UnityClient/Assets/Graphics/Projectiles/Molotov/frame_1_delay-0.2s.gif.meta create mode 100644 UnityClient/Assets/Graphics/Projectiles/Molotov/frame_2_delay-0.3s.gif create mode 100644 UnityClient/Assets/Graphics/Projectiles/Molotov/frame_2_delay-0.3s.gif.meta create mode 100644 UnityClient/Assets/Graphics/Projectiles/Molotov/frame_3_delay-0.3s.gif create mode 100644 UnityClient/Assets/Graphics/Projectiles/Molotov/frame_3_delay-0.3s.gif.meta create mode 100644 UnityClient/Assets/Molotov_demo.unity create mode 100644 UnityClient/Assets/Molotov_demo.unity.meta create mode 100644 UnityClient/Assets/Prefabs.meta create mode 100644 UnityClient/Assets/Prefabs/Ammo Pickup.prefab create mode 100644 UnityClient/Assets/Prefabs/Ammo Pickup.prefab.meta create mode 100644 UnityClient/Assets/Prefabs/Flames.prefab create mode 100644 UnityClient/Assets/Prefabs/Flames.prefab.meta create mode 100644 UnityClient/Assets/Prefabs/Molotov.prefab create mode 100644 UnityClient/Assets/Prefabs/Molotov.prefab.meta create mode 100644 UnityClient/Assets/Prefabs/Player.prefab create mode 100644 UnityClient/Assets/Prefabs/Player.prefab.meta create mode 100644 UnityClient/Assets/Scripts.meta create mode 100644 UnityClient/Assets/Scripts/Characters.meta create mode 100644 UnityClient/Assets/Scripts/Characters/CharacterStats.cs create mode 100644 UnityClient/Assets/Scripts/Characters/CharacterStats.cs.meta create mode 100644 UnityClient/Assets/Scripts/MockPlayerController.cs create mode 100644 UnityClient/Assets/Scripts/MockPlayerController.cs.meta create mode 100644 UnityClient/Assets/Scripts/Molotov.meta create mode 100644 UnityClient/Assets/Scripts/Molotov/AmmoPickup.cs create mode 100644 UnityClient/Assets/Scripts/Molotov/AmmoPickup.cs.meta create mode 100644 UnityClient/Assets/Scripts/Molotov/Flames.cs create mode 100644 UnityClient/Assets/Scripts/Molotov/Flames.cs.meta create mode 100644 UnityClient/Assets/Scripts/Molotov/Molotov.cs create mode 100644 UnityClient/Assets/Scripts/Molotov/Molotov.cs.meta create mode 100644 UnityClient/Assets/Scripts/Molotov/Projectile.cs create mode 100644 UnityClient/Assets/Scripts/Molotov/Projectile.cs.meta create mode 100644 UnityClient/ProjectSettings/VersionControlSettings.asset create mode 100644 UnityClient/UserSettings/EditorUserSettings.asset diff --git a/UnityClient/.vsconfig b/UnityClient/.vsconfig new file mode 100644 index 0000000..d70cd98 --- /dev/null +++ b/UnityClient/.vsconfig @@ -0,0 +1,6 @@ +{ + "version": "1.0", + "components": [ + "Microsoft.VisualStudio.Workload.ManagedGame" + ] +} diff --git a/UnityClient/Assets/Graphics.meta b/UnityClient/Assets/Graphics.meta new file mode 100644 index 0000000..c9877b5 --- /dev/null +++ b/UnityClient/Assets/Graphics.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ecccad7cb0e9bd64c8d6f604be66379f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Graphics/Effects.meta b/UnityClient/Assets/Graphics/Effects.meta new file mode 100644 index 0000000..2eb4d4b --- /dev/null +++ b/UnityClient/Assets/Graphics/Effects.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 89e0ccb4fe73a484eb3bb9daec04ebbb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Graphics/Effects/Flames.meta b/UnityClient/Assets/Graphics/Effects/Flames.meta new file mode 100644 index 0000000..ff6459f --- /dev/null +++ b/UnityClient/Assets/Graphics/Effects/Flames.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5ae118808712f2a49b5a1a96f66ceb8a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Graphics/Effects/Flames/Flame.anim b/UnityClient/Assets/Graphics/Effects/Flames/Flame.anim new file mode 100644 index 0000000..77f5bdf --- /dev/null +++ b/UnityClient/Assets/Graphics/Effects/Flames/Flame.anim @@ -0,0 +1,95 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Flame + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: 54a4d6d98001a354194a43b0ddadd058, type: 3} + - time: 0.06666667 + value: {fileID: 21300000, guid: 91b8761304caab149a3adc603a4131ee, type: 3} + - time: 0.13333334 + value: {fileID: 21300000, guid: d7df2d4fb984a74428d4b4e9b9fa247f, type: 3} + - time: 0.2 + value: {fileID: 21300000, guid: 65659b610bf21a6429821c3e973b69d6, type: 3} + - time: 0.26666668 + value: {fileID: 21300000, guid: c344b5e8cf3660b4588be001aad0d351, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 91f7ee34f9bcd66448d2b293efcb9053, type: 3} + - time: 0.4 + value: {fileID: 21300000, guid: d5ec0e60ccec4a04796439370d69fed0, type: 3} + - time: 0.46666667 + value: {fileID: 21300000, guid: d6932dce4384f0442a2e293d2b25a993, type: 3} + - time: 0.53333336 + value: {fileID: 21300000, guid: f02ed13ee825d9148ac111699b373393, type: 3} + - time: 0.6 + value: {fileID: 21300000, guid: 816aeaaf815119d42a4ac1955689274b, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: 54a4d6d98001a354194a43b0ddadd058, type: 3} + - {fileID: 21300000, guid: 91b8761304caab149a3adc603a4131ee, type: 3} + - {fileID: 21300000, guid: d7df2d4fb984a74428d4b4e9b9fa247f, type: 3} + - {fileID: 21300000, guid: 65659b610bf21a6429821c3e973b69d6, type: 3} + - {fileID: 21300000, guid: c344b5e8cf3660b4588be001aad0d351, type: 3} + - {fileID: 21300000, guid: 91f7ee34f9bcd66448d2b293efcb9053, type: 3} + - {fileID: 21300000, guid: d5ec0e60ccec4a04796439370d69fed0, type: 3} + - {fileID: 21300000, guid: d6932dce4384f0442a2e293d2b25a993, type: 3} + - {fileID: 21300000, guid: f02ed13ee825d9148ac111699b373393, type: 3} + - {fileID: 21300000, guid: 816aeaaf815119d42a4ac1955689274b, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.6166667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/UnityClient/Assets/Graphics/Effects/Flames/Flame.anim.meta b/UnityClient/Assets/Graphics/Effects/Flames/Flame.anim.meta new file mode 100644 index 0000000..f7213b1 --- /dev/null +++ b/UnityClient/Assets/Graphics/Effects/Flames/Flame.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9d13238533a7bd0409825eb55650fd27 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Graphics/Effects/Flames/Flames.controller b/UnityClient/Assets/Graphics/Effects/Flames/Flames.controller new file mode 100644 index 0000000..7235b54 --- /dev/null +++ b/UnityClient/Assets/Graphics/Effects/Flames/Flames.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-1356330789260356466 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 3616649970633465096} + m_Position: {x: 265.26562, y: 164.75662, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 3616649970633465096} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Flames + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -1356330789260356466} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &3616649970633465096 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Flame + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 9d13238533a7bd0409825eb55650fd27, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/UnityClient/Assets/Graphics/Effects/Flames/Flames.controller.meta b/UnityClient/Assets/Graphics/Effects/Flames/Flames.controller.meta new file mode 100644 index 0000000..aa01c42 --- /dev/null +++ b/UnityClient/Assets/Graphics/Effects/Flames/Flames.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 01d78d64cf1ce7d49aa7d5474d07e843 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_00_delay-0.1s.gif b/UnityClient/Assets/Graphics/Effects/Flames/frame_00_delay-0.1s.gif new file mode 100644 index 0000000..2760066 --- /dev/null +++ b/UnityClient/Assets/Graphics/Effects/Flames/frame_00_delay-0.1s.gif @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb35ccafce04dc64e605b8357645c913a97a191180cfb561576df482868b8342 +size 3123 diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_00_delay-0.1s.gif.meta b/UnityClient/Assets/Graphics/Effects/Flames/frame_00_delay-0.1s.gif.meta new file mode 100644 index 0000000..3784f64 --- /dev/null +++ b/UnityClient/Assets/Graphics/Effects/Flames/frame_00_delay-0.1s.gif.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 54a4d6d98001a354194a43b0ddadd058 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + 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: 1 + 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 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_01_delay-0.1s.gif b/UnityClient/Assets/Graphics/Effects/Flames/frame_01_delay-0.1s.gif new file mode 100644 index 0000000..eb2700c --- /dev/null +++ b/UnityClient/Assets/Graphics/Effects/Flames/frame_01_delay-0.1s.gif @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:beace7810f9e4c4fdadcfcd6f0b67025dcc6e35330e1df6dfc84259c161e9428 +size 3087 diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_01_delay-0.1s.gif.meta b/UnityClient/Assets/Graphics/Effects/Flames/frame_01_delay-0.1s.gif.meta new file mode 100644 index 0000000..472238b --- /dev/null +++ b/UnityClient/Assets/Graphics/Effects/Flames/frame_01_delay-0.1s.gif.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 91b8761304caab149a3adc603a4131ee +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + 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: 1 + 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 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_02_delay-0.1s.gif b/UnityClient/Assets/Graphics/Effects/Flames/frame_02_delay-0.1s.gif new file mode 100644 index 0000000..7068791 --- /dev/null +++ b/UnityClient/Assets/Graphics/Effects/Flames/frame_02_delay-0.1s.gif @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31135a67bf6cfd17add2e481e4bd07c1ef289ff705adfced025aa1525898beb5 +size 2941 diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_02_delay-0.1s.gif.meta b/UnityClient/Assets/Graphics/Effects/Flames/frame_02_delay-0.1s.gif.meta new file mode 100644 index 0000000..05c986b --- /dev/null +++ b/UnityClient/Assets/Graphics/Effects/Flames/frame_02_delay-0.1s.gif.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: d7df2d4fb984a74428d4b4e9b9fa247f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + 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: 1 + 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 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_03_delay-0.1s.gif b/UnityClient/Assets/Graphics/Effects/Flames/frame_03_delay-0.1s.gif new file mode 100644 index 0000000..b0d8471 --- /dev/null +++ b/UnityClient/Assets/Graphics/Effects/Flames/frame_03_delay-0.1s.gif @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e8b2d81070e3539fa541e161e95226298ab3f1b32fe7bf07775c0602e6faa263 +size 3322 diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_03_delay-0.1s.gif.meta b/UnityClient/Assets/Graphics/Effects/Flames/frame_03_delay-0.1s.gif.meta new file mode 100644 index 0000000..df8250f --- /dev/null +++ b/UnityClient/Assets/Graphics/Effects/Flames/frame_03_delay-0.1s.gif.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 65659b610bf21a6429821c3e973b69d6 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + 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: 1 + 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 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_04_delay-0.1s.gif b/UnityClient/Assets/Graphics/Effects/Flames/frame_04_delay-0.1s.gif new file mode 100644 index 0000000..eb1fa39 --- /dev/null +++ b/UnityClient/Assets/Graphics/Effects/Flames/frame_04_delay-0.1s.gif @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c3c947faebf3213cfa1f0ca89137693960e595b74aed5516aa6496815f4754cb +size 3028 diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_04_delay-0.1s.gif.meta b/UnityClient/Assets/Graphics/Effects/Flames/frame_04_delay-0.1s.gif.meta new file mode 100644 index 0000000..dbf3c7e --- /dev/null +++ b/UnityClient/Assets/Graphics/Effects/Flames/frame_04_delay-0.1s.gif.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: c344b5e8cf3660b4588be001aad0d351 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + 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: 1 + 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 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_05_delay-0.1s.gif b/UnityClient/Assets/Graphics/Effects/Flames/frame_05_delay-0.1s.gif new file mode 100644 index 0000000..ee75db7 --- /dev/null +++ b/UnityClient/Assets/Graphics/Effects/Flames/frame_05_delay-0.1s.gif @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11fa43dd82a7c6c3944071bbce27aa629d5c9f5281a14c0835d97b5ffd346e78 +size 3274 diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_05_delay-0.1s.gif.meta b/UnityClient/Assets/Graphics/Effects/Flames/frame_05_delay-0.1s.gif.meta new file mode 100644 index 0000000..715fa66 --- /dev/null +++ b/UnityClient/Assets/Graphics/Effects/Flames/frame_05_delay-0.1s.gif.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 91f7ee34f9bcd66448d2b293efcb9053 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + 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: 1 + 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 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_06_delay-0.1s.gif b/UnityClient/Assets/Graphics/Effects/Flames/frame_06_delay-0.1s.gif new file mode 100644 index 0000000..9c0ed06 --- /dev/null +++ b/UnityClient/Assets/Graphics/Effects/Flames/frame_06_delay-0.1s.gif @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18cd5c70f833257f494e7d1a3a938f42e8b63f4ef1edda6787d013e84073b6a8 +size 3158 diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_06_delay-0.1s.gif.meta b/UnityClient/Assets/Graphics/Effects/Flames/frame_06_delay-0.1s.gif.meta new file mode 100644 index 0000000..4e4de57 --- /dev/null +++ b/UnityClient/Assets/Graphics/Effects/Flames/frame_06_delay-0.1s.gif.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: d5ec0e60ccec4a04796439370d69fed0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + 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: 1 + 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 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_07_delay-0.1s.gif b/UnityClient/Assets/Graphics/Effects/Flames/frame_07_delay-0.1s.gif new file mode 100644 index 0000000..e04c330 --- /dev/null +++ b/UnityClient/Assets/Graphics/Effects/Flames/frame_07_delay-0.1s.gif @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e67c7baf8cf33bd32130591fb9d37ab9e5ddcd9dc05cc708c56552a8c0109d5 +size 3325 diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_07_delay-0.1s.gif.meta b/UnityClient/Assets/Graphics/Effects/Flames/frame_07_delay-0.1s.gif.meta new file mode 100644 index 0000000..a72b95b --- /dev/null +++ b/UnityClient/Assets/Graphics/Effects/Flames/frame_07_delay-0.1s.gif.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: d6932dce4384f0442a2e293d2b25a993 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + 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: 1 + 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 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_08_delay-0.1s.gif b/UnityClient/Assets/Graphics/Effects/Flames/frame_08_delay-0.1s.gif new file mode 100644 index 0000000..63576fe --- /dev/null +++ b/UnityClient/Assets/Graphics/Effects/Flames/frame_08_delay-0.1s.gif @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a2388ed3ed81fb17f1b6976fc2a1472f4e0e72b55fb39788387afab8ecf4404 +size 3286 diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_08_delay-0.1s.gif.meta b/UnityClient/Assets/Graphics/Effects/Flames/frame_08_delay-0.1s.gif.meta new file mode 100644 index 0000000..3380a66 --- /dev/null +++ b/UnityClient/Assets/Graphics/Effects/Flames/frame_08_delay-0.1s.gif.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: f02ed13ee825d9148ac111699b373393 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + 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: 1 + 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 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_09_delay-0.1s.gif b/UnityClient/Assets/Graphics/Effects/Flames/frame_09_delay-0.1s.gif new file mode 100644 index 0000000..e1603ad --- /dev/null +++ b/UnityClient/Assets/Graphics/Effects/Flames/frame_09_delay-0.1s.gif @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e5540f9742a0e82c4f7abbe9cd19007b16c5192a734f3d0ec1a8ef75aab3617b +size 3299 diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_09_delay-0.1s.gif.meta b/UnityClient/Assets/Graphics/Effects/Flames/frame_09_delay-0.1s.gif.meta new file mode 100644 index 0000000..fde0c44 --- /dev/null +++ b/UnityClient/Assets/Graphics/Effects/Flames/frame_09_delay-0.1s.gif.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 816aeaaf815119d42a4ac1955689274b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + 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: 1 + 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 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Graphics/Projectiles.meta b/UnityClient/Assets/Graphics/Projectiles.meta new file mode 100644 index 0000000..42dd5dc --- /dev/null +++ b/UnityClient/Assets/Graphics/Projectiles.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7f980205b81537a4287219dffd353aa2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Graphics/Projectiles/Molotov.meta b/UnityClient/Assets/Graphics/Projectiles/Molotov.meta new file mode 100644 index 0000000..17fa0f5 --- /dev/null +++ b/UnityClient/Assets/Graphics/Projectiles/Molotov.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0ea7736fd47dd174eb51b18706ce3374 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Graphics/Projectiles/Molotov/Burn.anim b/UnityClient/Assets/Graphics/Projectiles/Molotov/Burn.anim new file mode 100644 index 0000000..c84f7bc --- /dev/null +++ b/UnityClient/Assets/Graphics/Projectiles/Molotov/Burn.anim @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Burn + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: a2d4b37f8a3892c498bca1a22f95dc6e, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: 0957a420b255d084993ab93406a854d3, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 06dd78c4b004fcf44b7a3be710756ea2, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: 6b4f968b84194e042901c7548f63f192, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: a2d4b37f8a3892c498bca1a22f95dc6e, type: 3} + - {fileID: 21300000, guid: 0957a420b255d084993ab93406a854d3, type: 3} + - {fileID: 21300000, guid: 06dd78c4b004fcf44b7a3be710756ea2, type: 3} + - {fileID: 21300000, guid: 6b4f968b84194e042901c7548f63f192, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.26666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/UnityClient/Assets/Graphics/Projectiles/Molotov/Burn.anim.meta b/UnityClient/Assets/Graphics/Projectiles/Molotov/Burn.anim.meta new file mode 100644 index 0000000..2746ce4 --- /dev/null +++ b/UnityClient/Assets/Graphics/Projectiles/Molotov/Burn.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4e88a18d81a01154991d61e02df9620d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Graphics/Projectiles/Molotov/Molotov Controller.controller b/UnityClient/Assets/Graphics/Projectiles/Molotov/Molotov Controller.controller new file mode 100644 index 0000000..527ceff --- /dev/null +++ b/UnityClient/Assets/Graphics/Projectiles/Molotov/Molotov Controller.controller @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-7028359251579541287 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Stop + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4351611062592259304} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.06250005 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-1398236957832658423 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Burn + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -7028359251579541287} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 4e88a18d81a01154991d61e02df9620d, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Molotov Controller + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: Stop + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 2948836980924381335} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &2948836980924381335 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -1398236957832658423} + m_Position: {x: 390, y: 140, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4351611062592259304} + m_Position: {x: 580, y: 20, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -1398236957832658423} +--- !u!1102 &4351611062592259304 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New State + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/UnityClient/Assets/Graphics/Projectiles/Molotov/Molotov Controller.controller.meta b/UnityClient/Assets/Graphics/Projectiles/Molotov/Molotov Controller.controller.meta new file mode 100644 index 0000000..a99e7ee --- /dev/null +++ b/UnityClient/Assets/Graphics/Projectiles/Molotov/Molotov Controller.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c86edf9c27e7f4f47ab3c717f4fb6d6a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_0_delay-0.3s.gif b/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_0_delay-0.3s.gif new file mode 100644 index 0000000..32ac461 --- /dev/null +++ b/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_0_delay-0.3s.gif @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:112e6950e23c1b5a9814218713f7d0124c1cfdfc7859237bf8a22639ebc2b84b +size 1642 diff --git a/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_0_delay-0.3s.gif.meta b/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_0_delay-0.3s.gif.meta new file mode 100644 index 0000000..6768191 --- /dev/null +++ b/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_0_delay-0.3s.gif.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: a2d4b37f8a3892c498bca1a22f95dc6e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + 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: 1 + 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 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_1_delay-0.2s.gif b/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_1_delay-0.2s.gif new file mode 100644 index 0000000..557196e --- /dev/null +++ b/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_1_delay-0.2s.gif @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9326878b1c4af06a8324f2795243b3a04adb5e304344cf4294f62db2030350c9 +size 1588 diff --git a/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_1_delay-0.2s.gif.meta b/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_1_delay-0.2s.gif.meta new file mode 100644 index 0000000..ef03d44 --- /dev/null +++ b/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_1_delay-0.2s.gif.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 0957a420b255d084993ab93406a854d3 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + 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: 1 + 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 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_2_delay-0.3s.gif b/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_2_delay-0.3s.gif new file mode 100644 index 0000000..caec73e --- /dev/null +++ b/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_2_delay-0.3s.gif @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5cfb4bde3f133f93393c7cb066bd0bd7c53fda84f27b7dfecf2998425687473e +size 1649 diff --git a/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_2_delay-0.3s.gif.meta b/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_2_delay-0.3s.gif.meta new file mode 100644 index 0000000..986186c --- /dev/null +++ b/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_2_delay-0.3s.gif.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 06dd78c4b004fcf44b7a3be710756ea2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + 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: 1 + 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 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_3_delay-0.3s.gif b/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_3_delay-0.3s.gif new file mode 100644 index 0000000..9d3755d --- /dev/null +++ b/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_3_delay-0.3s.gif @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3715394ce5b259d89a5253ce3f73fea6829a9b01260e7b6334eb4645e490b4c4 +size 1634 diff --git a/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_3_delay-0.3s.gif.meta b/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_3_delay-0.3s.gif.meta new file mode 100644 index 0000000..3e6b0ca --- /dev/null +++ b/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_3_delay-0.3s.gif.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 6b4f968b84194e042901c7548f63f192 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + 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: 1 + 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 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Molotov_demo.unity b/UnityClient/Assets/Molotov_demo.unity new file mode 100644 index 0000000..7cd4bc9 --- /dev/null +++ b/UnityClient/Assets/Molotov_demo.unity @@ -0,0 +1,913 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &484440627 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 484440628} + - component: {fileID: 484440630} + - component: {fileID: 484440629} + m_Layer: 5 + m_Name: Ammo Counter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &484440628 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 484440627} + 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: 1456423275} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 10, y: -17.3} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0, y: 1} +--- !u!114 &484440629 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 484440627} + 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: 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_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: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: +--- !u!222 &484440630 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 484440627} + m_CullTransparentMesh: 1 +--- !u!1001 &567096546 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5486316016187593859, guid: a37698053683d464aa3d880ab872443e, + type: 3} + propertyPath: maxHealth + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5486316016187593866, guid: a37698053683d464aa3d880ab872443e, + type: 3} + propertyPath: m_Name + value: Player + objectReference: {fileID: 0} + - target: {fileID: 5486316016187593868, guid: a37698053683d464aa3d880ab872443e, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5486316016187593868, guid: a37698053683d464aa3d880ab872443e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.39607173 + objectReference: {fileID: 0} + - target: {fileID: 5486316016187593868, guid: a37698053683d464aa3d880ab872443e, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.23 + objectReference: {fileID: 0} + - target: {fileID: 5486316016187593868, guid: a37698053683d464aa3d880ab872443e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5486316016187593868, guid: a37698053683d464aa3d880ab872443e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5486316016187593868, guid: a37698053683d464aa3d880ab872443e, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5486316016187593868, guid: a37698053683d464aa3d880ab872443e, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5486316016187593868, guid: a37698053683d464aa3d880ab872443e, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5486316016187593868, guid: a37698053683d464aa3d880ab872443e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5486316016187593868, guid: a37698053683d464aa3d880ab872443e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5486316016187593868, guid: a37698053683d464aa3d880ab872443e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5486316016187593871, guid: a37698053683d464aa3d880ab872443e, + type: 3} + propertyPath: m_Constraints + value: 4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a37698053683d464aa3d880ab872443e, type: 3} +--- !u!1 &853045174 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 853045177} + - component: {fileID: 853045176} + - component: {fileID: 853045175} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &853045175 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 853045174} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &853045176 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 853045174} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &853045177 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 853045174} + 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: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1345686627 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1345686630} + - component: {fileID: 1345686629} + - component: {fileID: 1345686628} + m_Layer: 0 + m_Name: Square + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &1345686628 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1345686627} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.012336016, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 13.311366, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 2 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 13.311367, y: 1} + m_EdgeRadius: 0 +--- !u!212 &1345686629 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1345686627} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 2 + m_Size: {x: 13.311366, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1345686630 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1345686627} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.0136, y: -0.39950678, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1453379377 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1453379380} + - component: {fileID: 1453379379} + - component: {fileID: 1453379378} + - component: {fileID: 1453379381} + m_Layer: 0 + m_Name: Ammo Pickup + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &1453379378 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1453379377} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.1785444, y: -0.023805916} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 2.56, y: 2.56} + newSize: {x: 2.56, y: 2.56} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.679332, y: 1.7029866} + m_EdgeRadius: 0 +--- !u!212 &1453379379 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1453379377} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: a2d4b37f8a3892c498bca1a22f95dc6e, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.56, y: 2.56} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1453379380 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1453379377} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 3.36, y: 0.98, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1453379381 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1453379377} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2149affa40a03df42b66d844e20aa90c, type: 3} + m_Name: + m_EditorClassIdentifier: + amount: 3 +--- !u!1 &1456423271 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1456423275} + - component: {fileID: 1456423274} + - component: {fileID: 1456423273} + - component: {fileID: 1456423272} + m_Layer: 5 + m_Name: Canvas + m_TagString: MolotovDisplay + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1456423272 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1456423271} + 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 &1456423273 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1456423271} + 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 &1456423274 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1456423271} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + 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 &1456423275 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1456423271} + 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: 484440628} + m_Father: {fileID: 0} + 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: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!1 &1686919469 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1686919472} + - component: {fileID: 1686919471} + - component: {fileID: 1686919470} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &1686919470 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1686919469} + m_Enabled: 1 +--- !u!20 &1686919471 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1686919469} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1686919472 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1686919469} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1744823857 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1744823861} + - component: {fileID: 1744823860} + - component: {fileID: 1744823859} + - component: {fileID: 1744823858} + - component: {fileID: 1744823862} + m_Layer: 6 + m_Name: MockEnemy + m_TagString: Character + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1744823858 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1744823857} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 00d7f0bf3e485a948bd016b37e467769, type: 3} + m_Name: + m_EditorClassIdentifier: + maxHealth: 5 + maxAmmo: 0 + currentAmmo: 0 +--- !u!61 &1744823859 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1744823857} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!212 &1744823860 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1744823857} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1744823861 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1744823857} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -5.68, y: 0.63, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!50 &1744823862 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1744823857} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 1 + m_Constraints: 0 diff --git a/UnityClient/Assets/Molotov_demo.unity.meta b/UnityClient/Assets/Molotov_demo.unity.meta new file mode 100644 index 0000000..9864c25 --- /dev/null +++ b/UnityClient/Assets/Molotov_demo.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0e7cc5c9e69d66c42bbc5927bee4393c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Prefabs.meta b/UnityClient/Assets/Prefabs.meta new file mode 100644 index 0000000..114b5e0 --- /dev/null +++ b/UnityClient/Assets/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 58d16bc6c673f2841bbbe63cd4beb6ac +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Prefabs/Ammo Pickup.prefab b/UnityClient/Assets/Prefabs/Ammo Pickup.prefab new file mode 100644 index 0000000..6667887 --- /dev/null +++ b/UnityClient/Assets/Prefabs/Ammo Pickup.prefab @@ -0,0 +1,125 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4277948825328799301 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4277948825328799296} + - component: {fileID: 4277948825328799303} + - component: {fileID: 4277948825328799302} + - component: {fileID: 4277948825328799297} + m_Layer: 0 + m_Name: Ammo Pickup + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4277948825328799296 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4277948825328799301} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 3.36, y: 0.98, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4277948825328799303 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4277948825328799301} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: a2d4b37f8a3892c498bca1a22f95dc6e, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.56, y: 2.56} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!61 &4277948825328799302 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4277948825328799301} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.1785444, y: -0.023805916} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 2.56, y: 2.56} + newSize: {x: 2.56, y: 2.56} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.679332, y: 1.7029866} + m_EdgeRadius: 0 +--- !u!114 &4277948825328799297 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4277948825328799301} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2149affa40a03df42b66d844e20aa90c, type: 3} + m_Name: + m_EditorClassIdentifier: + amount: 3 diff --git a/UnityClient/Assets/Prefabs/Ammo Pickup.prefab.meta b/UnityClient/Assets/Prefabs/Ammo Pickup.prefab.meta new file mode 100644 index 0000000..d98a5d9 --- /dev/null +++ b/UnityClient/Assets/Prefabs/Ammo Pickup.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2098973f6f19ce6418cfb70bcee7badb +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Prefabs/Flames.prefab b/UnityClient/Assets/Prefabs/Flames.prefab new file mode 100644 index 0000000..a977f3b --- /dev/null +++ b/UnityClient/Assets/Prefabs/Flames.prefab @@ -0,0 +1,145 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5140604217474004996 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5140604217474004997} + - component: {fileID: 5140604217474004999} + - component: {fileID: 5140604217474004998} + - component: {fileID: 5140604217474004992} + - component: {fileID: 1325772569395079330} + m_Layer: 0 + m_Name: Flames + m_TagString: Fire + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5140604217474004997 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5140604217474004996} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.902511, y: 3.0712414, z: -1.7597134} + m_LocalScale: {x: 0.3, y: 0.3, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &5140604217474004999 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5140604217474004996} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 01d78d64cf1ce7d49aa7d5474d07e843, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!212 &5140604217474004998 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5140604217474004996} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 2 + m_Size: {x: 0.3, y: 0.3} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &5140604217474004992 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5140604217474004996} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2933d1953c76e7944b55f2050c7259b2, type: 3} + m_Name: + m_EditorClassIdentifier: + timer: 3 +--- !u!61 &1325772569395079330 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5140604217474004996} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.09974101, y: -1.1345448} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 5, y: 5} + newSize: {x: 5, y: 5} + adaptiveTilingThreshold: 0.5 + drawMode: 2 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1.9974048, y: 2.281301} + m_EdgeRadius: 0 diff --git a/UnityClient/Assets/Prefabs/Flames.prefab.meta b/UnityClient/Assets/Prefabs/Flames.prefab.meta new file mode 100644 index 0000000..9598974 --- /dev/null +++ b/UnityClient/Assets/Prefabs/Flames.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 556934f6352c8df4fafd9fb90d266fe4 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Prefabs/Molotov.prefab b/UnityClient/Assets/Prefabs/Molotov.prefab new file mode 100644 index 0000000..6bf4ee8 --- /dev/null +++ b/UnityClient/Assets/Prefabs/Molotov.prefab @@ -0,0 +1,194 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8890863666239807986 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8890863666239807987} + - component: {fileID: 8890863666239807996} + - component: {fileID: 8890863666239807997} + - component: {fileID: 3327155398121314351} + - component: {fileID: 1703603106425229586} + - component: {fileID: 7244945457419589060} + - component: {fileID: 2344842626350697671} + m_Layer: 7 + m_Name: Molotov + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8890863666239807987 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8890863666239807986} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.26155037, y: 2.065, z: 0.14211704} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &8890863666239807996 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8890863666239807986} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: c86edf9c27e7f4f47ab3c717f4fb6d6a, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!212 &8890863666239807997 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8890863666239807986} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.56, y: 2.56} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!61 &3327155398121314351 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8890863666239807986} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: -0.020513415} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1.0410268} + m_EdgeRadius: 0 +--- !u!50 &1703603106425229586 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8890863666239807986} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 1 + m_Constraints: 4 +--- !u!61 &7244945457419589060 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8890863666239807986} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.0026251078, y: 0.0107547045} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.89825046, y: 0.87123656} + m_EdgeRadius: 0 +--- !u!114 &2344842626350697671 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8890863666239807986} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 79552c7c313a7334aa106b6c660948d9, type: 3} + m_Name: + m_EditorClassIdentifier: + flames: {fileID: 5140604217474004996, guid: 556934f6352c8df4fafd9fb90d266fe4, type: 3} diff --git a/UnityClient/Assets/Prefabs/Molotov.prefab.meta b/UnityClient/Assets/Prefabs/Molotov.prefab.meta new file mode 100644 index 0000000..5c48b7c --- /dev/null +++ b/UnityClient/Assets/Prefabs/Molotov.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9ef18683b6022244fa2586d76eead531 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Prefabs/Player.prefab b/UnityClient/Assets/Prefabs/Player.prefab new file mode 100644 index 0000000..d14c1f5 --- /dev/null +++ b/UnityClient/Assets/Prefabs/Player.prefab @@ -0,0 +1,241 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5486316014925922627 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5486316014925922626} + m_Layer: 6 + m_Name: ThrowPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5486316014925922626 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5486316014925922627} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.82, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5486316016187593868} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5486316016187593866 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5486316016187593868} + - component: {fileID: 5486316016187593870} + - component: {fileID: 5486316016187593871} + - component: {fileID: 8935607496275591613} + - component: {fileID: 5486316016187593859} + - component: {fileID: 5486316016187593857} + m_Layer: 6 + m_Name: Player + m_TagString: Character + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5486316016187593868 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5486316016187593866} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.39607173, y: 1.23, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 5486316014925922626} + - {fileID: 5486316016711929583} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &5486316016187593870 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5486316016187593866} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!50 &5486316016187593871 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5486316016187593866} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 1 + m_Constraints: 4 +--- !u!114 &8935607496275591613 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5486316016187593866} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 496eaef5c210b174380963d5776c83bf, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &5486316016187593859 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5486316016187593866} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 00d7f0bf3e485a948bd016b37e467769, type: 3} + m_Name: + m_EditorClassIdentifier: + maxHealth: 5 + maxAmmo: 5 + currentAmmo: 0 +--- !u!114 &5486316016187593857 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5486316016187593866} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4ba61bd5979b91043bb99dc8f082d790, type: 3} + m_Name: + m_EditorClassIdentifier: + bottle: {fileID: 8890863666239807986, guid: 9ef18683b6022244fa2586d76eead531, type: 3} + throwPoint: {fileID: 5486316014925922627} + ammoDisplay: {fileID: 0} +--- !u!1 &5486316016711929580 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5486316016711929583} + - component: {fileID: 5486316016711929582} + m_Layer: 6 + m_Name: Graphics + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5486316016711929583 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5486316016711929580} + 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: 5486316016187593868} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5486316016711929582 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5486316016711929580} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/UnityClient/Assets/Prefabs/Player.prefab.meta b/UnityClient/Assets/Prefabs/Player.prefab.meta new file mode 100644 index 0000000..c09f3c2 --- /dev/null +++ b/UnityClient/Assets/Prefabs/Player.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a37698053683d464aa3d880ab872443e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Scripts.meta b/UnityClient/Assets/Scripts.meta new file mode 100644 index 0000000..4e3a747 --- /dev/null +++ b/UnityClient/Assets/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9e385226d8cdcdf43903ac166b17e22d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Scripts/Characters.meta b/UnityClient/Assets/Scripts/Characters.meta new file mode 100644 index 0000000..3841400 --- /dev/null +++ b/UnityClient/Assets/Scripts/Characters.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6b169fb825688a34092036fc7e1acea6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Scripts/Characters/CharacterStats.cs b/UnityClient/Assets/Scripts/Characters/CharacterStats.cs new file mode 100644 index 0000000..4b3f6eb --- /dev/null +++ b/UnityClient/Assets/Scripts/Characters/CharacterStats.cs @@ -0,0 +1,34 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class CharacterStats : MonoBehaviour +{ + public int maxHealth; + int currentHealth; + public int maxAmmo; + public int currentAmmo; + + public void Start() + { + currentHealth = maxHealth; + currentAmmo = maxAmmo; + } + public void Update() + { + if (currentHealth <= 0) + { + Destroy(gameObject); + } + } + + public void GetAmmo(int ammo) + { + currentAmmo = Mathf.Min(maxAmmo, currentAmmo + ammo); + } + + public void TakeDamage(int damage) + { + currentHealth -= damage; + } +} diff --git a/UnityClient/Assets/Scripts/Characters/CharacterStats.cs.meta b/UnityClient/Assets/Scripts/Characters/CharacterStats.cs.meta new file mode 100644 index 0000000..0803529 --- /dev/null +++ b/UnityClient/Assets/Scripts/Characters/CharacterStats.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 00d7f0bf3e485a948bd016b37e467769 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Scripts/MockPlayerController.cs b/UnityClient/Assets/Scripts/MockPlayerController.cs new file mode 100644 index 0000000..1416334 --- /dev/null +++ b/UnityClient/Assets/Scripts/MockPlayerController.cs @@ -0,0 +1,32 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class MockPlayerController : MonoBehaviour +{ + bool facingRight=true; + // Start is called before the first frame update + + // Update is called once per frame + void Update() + { + if((facingRight && Input.GetKeyDown(KeyCode.A)) || (!facingRight && Input.GetKeyDown(KeyCode.D))) + { + Flip(); + } + + float inputX = Input.GetAxis("Horizontal"); + float inputY = Input.GetAxis("Vertical"); + + GetComponent().velocity= new Vector2(5 * inputX, 5 * inputY); + + } + + void Flip() + { + facingRight = !facingRight; + + transform.Rotate(0, 180, 0); + + } +} diff --git a/UnityClient/Assets/Scripts/MockPlayerController.cs.meta b/UnityClient/Assets/Scripts/MockPlayerController.cs.meta new file mode 100644 index 0000000..5b2b0bc --- /dev/null +++ b/UnityClient/Assets/Scripts/MockPlayerController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 496eaef5c210b174380963d5776c83bf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Scripts/Molotov.meta b/UnityClient/Assets/Scripts/Molotov.meta new file mode 100644 index 0000000..6670c2f --- /dev/null +++ b/UnityClient/Assets/Scripts/Molotov.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c28e40175af693648aa566e1c700e2c8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Scripts/Molotov/AmmoPickup.cs b/UnityClient/Assets/Scripts/Molotov/AmmoPickup.cs new file mode 100644 index 0000000..8f1fa68 --- /dev/null +++ b/UnityClient/Assets/Scripts/Molotov/AmmoPickup.cs @@ -0,0 +1,13 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class AmmoPickup : MonoBehaviour +{ + public int amount=3; + private void OnTriggerEnter2D(Collider2D collision) + { + collision.GetComponent().GetAmmo(amount); + Destroy(gameObject); + } +} diff --git a/UnityClient/Assets/Scripts/Molotov/AmmoPickup.cs.meta b/UnityClient/Assets/Scripts/Molotov/AmmoPickup.cs.meta new file mode 100644 index 0000000..795cf82 --- /dev/null +++ b/UnityClient/Assets/Scripts/Molotov/AmmoPickup.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2149affa40a03df42b66d844e20aa90c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Scripts/Molotov/Flames.cs b/UnityClient/Assets/Scripts/Molotov/Flames.cs new file mode 100644 index 0000000..a748fa8 --- /dev/null +++ b/UnityClient/Assets/Scripts/Molotov/Flames.cs @@ -0,0 +1,28 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Flames : MonoBehaviour +{ + [SerializeField] float timer = 3; + + private void Update() + { + timer -= Time.deltaTime; + + if (timer <= 0) + { + Destroy(gameObject); + } + } + + IEnumerator OnTriggerEnter2D(Collider2D collider) + { + var col = collider.GetComponent(); + if (col) + { + col.TakeDamage(1); + yield return new WaitForSeconds(1f); + } + } +} diff --git a/UnityClient/Assets/Scripts/Molotov/Flames.cs.meta b/UnityClient/Assets/Scripts/Molotov/Flames.cs.meta new file mode 100644 index 0000000..b9eaf53 --- /dev/null +++ b/UnityClient/Assets/Scripts/Molotov/Flames.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2933d1953c76e7944b55f2050c7259b2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Scripts/Molotov/Molotov.cs b/UnityClient/Assets/Scripts/Molotov/Molotov.cs new file mode 100644 index 0000000..a67b9b9 --- /dev/null +++ b/UnityClient/Assets/Scripts/Molotov/Molotov.cs @@ -0,0 +1,37 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class Molotov : MonoBehaviour +{ + public GameObject bottle; + public GameObject throwPoint; + public Text ammoDisplay; + + private void Start() + { + var text = GameObject.FindGameObjectWithTag("MolotovDisplay"); + ammoDisplay = text?.GetComponentInChildren(); + } + + public void Update() + { + if (Input.GetButtonDown("Throw")) + { + ThrowBottle(); + } + + ammoDisplay.text = "Ammo: " + GetComponent().currentAmmo.ToString(); + } + + public void ThrowBottle() + { + if (GetComponent().currentAmmo > 0) + { + var projectile = Instantiate(bottle, throwPoint.transform.position, throwPoint.transform.rotation); + projectile.GetComponent().AddForce(new Vector2(throwPoint.transform.right.x*300, 200)); + GetComponent().currentAmmo--; + } + } +} diff --git a/UnityClient/Assets/Scripts/Molotov/Molotov.cs.meta b/UnityClient/Assets/Scripts/Molotov/Molotov.cs.meta new file mode 100644 index 0000000..811d6b6 --- /dev/null +++ b/UnityClient/Assets/Scripts/Molotov/Molotov.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4ba61bd5979b91043bb99dc8f082d790 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Assets/Scripts/Molotov/Projectile.cs b/UnityClient/Assets/Scripts/Molotov/Projectile.cs new file mode 100644 index 0000000..f8a6151 --- /dev/null +++ b/UnityClient/Assets/Scripts/Molotov/Projectile.cs @@ -0,0 +1,41 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Projectile : MonoBehaviour +{ + public GameObject flames; + + private void OnCollisionEnter2D(Collision2D collision) + { + if (collision.gameObject.tag == "Character") + { + Physics2D.IgnoreCollision(collision.collider, collision.otherCollider); + } + } + + private void OnTriggerEnter2D(Collider2D collision) + { + if (collision.gameObject.tag != "Character" && collision.gameObject.tag != "Fire") + { + var position = transform.position; + var rotation = transform.rotation; + GetComponent().SetTrigger("Stop"); + StartCoroutine(Spawn(position, rotation)); + } + + } + + IEnumerator Spawn(Vector3 position, Quaternion rotation) + { + Instantiate(flames, position + new Vector3(0, 0.5f, 0), rotation); + for (int i = 1; i < 3; i++) + { + yield return new WaitForSeconds(0.15f); + Debug.Log("benis"); + Instantiate(flames, position + new Vector3(0.6f * i, 0.5f, 0), rotation); + Instantiate(flames, position + new Vector3(-0.6f * i, 0.5f, 0), rotation); + } + Destroy(gameObject); + } +} diff --git a/UnityClient/Assets/Scripts/Molotov/Projectile.cs.meta b/UnityClient/Assets/Scripts/Molotov/Projectile.cs.meta new file mode 100644 index 0000000..2ff3599 --- /dev/null +++ b/UnityClient/Assets/Scripts/Molotov/Projectile.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 79552c7c313a7334aa106b6c660948d9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityClient/Packages/manifest.json b/UnityClient/Packages/manifest.json index bbb2150..8bcb979 100644 --- a/UnityClient/Packages/manifest.json +++ b/UnityClient/Packages/manifest.json @@ -1,11 +1,13 @@ { "dependencies": { - "com.unity.collab-proxy": "1.2.16", - "com.unity.ide.rider": "1.1.4", - "com.unity.ide.vscode": "1.2.2", - "com.unity.test-framework": "1.1.18", - "com.unity.textmeshpro": "2.1.1", - "com.unity.timeline": "1.2.17", + "com.unity.2d.animation": "5.0.10", + "com.unity.collab-proxy": "1.9.0", + "com.unity.ide.rider": "2.0.7", + "com.unity.ide.visualstudio": "2.0.11", + "com.unity.ide.vscode": "1.2.4", + "com.unity.test-framework": "1.1.29", + "com.unity.textmeshpro": "3.0.6", + "com.unity.timeline": "1.4.8", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/UnityClient/Packages/packages-lock.json b/UnityClient/Packages/packages-lock.json index 92686fd..dd4c2d4 100644 --- a/UnityClient/Packages/packages-lock.json +++ b/UnityClient/Packages/packages-lock.json @@ -1,21 +1,50 @@ { "dependencies": { + "com.unity.2d.animation": { + "version": "5.0.10", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.2d.common": "4.0.4", + "com.unity.mathematics": "1.1.0", + "com.unity.2d.sprite": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.uielements": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.2d.common": { + "version": "4.0.4", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.2d.sprite": "1.0.0", + "com.unity.modules.uielements": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.2d.sprite": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, "com.unity.collab-proxy": { - "version": "1.2.16", + "version": "1.9.0", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { - "version": "1.0.0", + "version": "1.0.6", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "1.1.4", + "version": "2.0.7", "depth": 0, "source": "registry", "dependencies": { @@ -23,26 +52,42 @@ }, "url": "https://packages.unity.com" }, + "com.unity.ide.visualstudio": { + "version": "2.0.11", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.9" + }, + "url": "https://packages.unity.com" + }, "com.unity.ide.vscode": { - "version": "1.2.2", + "version": "1.2.4", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.mathematics": { + "version": "1.1.0", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.test-framework": { - "version": "1.1.18", + "version": "1.1.29", "depth": 0, "source": "registry", "dependencies": { - "com.unity.ext.nunit": "1.0.0", + "com.unity.ext.nunit": "1.0.6", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "2.1.1", + "version": "3.0.6", "depth": 0, "source": "registry", "dependencies": { @@ -51,10 +96,15 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.2.17", + "version": "1.4.8", "depth": 0, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.modules.director": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0" + }, "url": "https://packages.unity.com" }, "com.unity.ugui": { @@ -199,6 +249,18 @@ "depth": 0, "source": "builtin", "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.uielementsnative": "1.0.0" + } + }, + "com.unity.modules.uielementsnative": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" } diff --git a/UnityClient/ProjectSettings/EditorSettings.asset b/UnityClient/ProjectSettings/EditorSettings.asset index 5efaa5e..bbded03 100644 --- a/UnityClient/ProjectSettings/EditorSettings.asset +++ b/UnityClient/ProjectSettings/EditorSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7b662e8e7fc62d2e84d07b2aaf868f17b58c023fb041efcdf9aacff6537030a -size 1107 +oid sha256:b169f6dd7b6e38b22fdb7be2f921b3c73cc750b276c607892b4b366d5c477396 +size 1250 diff --git a/UnityClient/ProjectSettings/InputManager.asset b/UnityClient/ProjectSettings/InputManager.asset index 25262d8..43fb810 100644 --- a/UnityClient/ProjectSettings/InputManager.asset +++ b/UnityClient/ProjectSettings/InputManager.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1fb1c30f8a1615cf9a4220be6d18a33eccd3a09cc4cd0a3c7cd0a38a7c083134 -size 5793 +oid sha256:0c411b8576f341ca50b9dafc043562128cd43e22b89595e75a71fa4aa5e35859 +size 6116 diff --git a/UnityClient/ProjectSettings/PackageManagerSettings.asset b/UnityClient/ProjectSettings/PackageManagerSettings.asset index e5c938b..7658c79 100644 --- a/UnityClient/ProjectSettings/PackageManagerSettings.asset +++ b/UnityClient/ProjectSettings/PackageManagerSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b67e5b5e8b74f980d8cb2bcf4b51384843fd5d6b4e4037dda68c3262df587deb -size 881 +oid sha256:a7dabba589abe7fc2b45bd3d3fba3fe9be97043492703f716da2d9131c13a807 +size 1003 diff --git a/UnityClient/ProjectSettings/Physics2DSettings.asset b/UnityClient/ProjectSettings/Physics2DSettings.asset index bfd2526..9b1dd78 100644 --- a/UnityClient/ProjectSettings/Physics2DSettings.asset +++ b/UnityClient/ProjectSettings/Physics2DSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d57a0fe55659c33879e8b70bc01c5ea9cdf082069dab649905c6c5138531e6eb +oid sha256:7a639c244d0afd7ec8f31050d3b2cad880b4edec16cba3e77a6bfea9267e4cbc size 2028 diff --git a/UnityClient/ProjectSettings/ProjectSettings.asset b/UnityClient/ProjectSettings/ProjectSettings.asset index 4b33dac..bd340e7 100644 --- a/UnityClient/ProjectSettings/ProjectSettings.asset +++ b/UnityClient/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4642f1130407ff863aabb1bfab8804a1572241db0975763fa8ec2aa28803facc -size 18851 +oid sha256:fc06f63eb5e83831ece223a4244c6197a7741e167597fb6614cabb59df712e2c +size 19592 diff --git a/UnityClient/ProjectSettings/ProjectVersion.txt b/UnityClient/ProjectSettings/ProjectVersion.txt index 66132d0..39e9125 100644 --- a/UnityClient/ProjectSettings/ProjectVersion.txt +++ b/UnityClient/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.4.13f1 -m_EditorVersionWithRevision: 2019.4.13f1 (518737b1de84) +m_EditorVersion: 2020.3.19f1 +m_EditorVersionWithRevision: 2020.3.19f1 (68f137dc9bbe) diff --git a/UnityClient/ProjectSettings/TagManager.asset b/UnityClient/ProjectSettings/TagManager.asset index 4b69f59..afde655 100644 --- a/UnityClient/ProjectSettings/TagManager.asset +++ b/UnityClient/ProjectSettings/TagManager.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e18b1c820e9c09e16bbd1f1b7842e9fb3b0158a0921b0964e0b8fa12c6e2c01 -size 378 +oid sha256:e96f52e7f8f185c68c406b5d4d6b9a3057414527305a7c2917e12bb54ea72be0 +size 437 diff --git a/UnityClient/ProjectSettings/VersionControlSettings.asset b/UnityClient/ProjectSettings/VersionControlSettings.asset new file mode 100644 index 0000000..6e1e402 --- /dev/null +++ b/UnityClient/ProjectSettings/VersionControlSettings.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7bda45bf7a394745fee1316e6c71fa676004d591ad1f3aa247fd3e4ceb86071 +size 188 diff --git a/UnityClient/UserSettings/EditorUserSettings.asset b/UnityClient/UserSettings/EditorUserSettings.asset new file mode 100644 index 0000000..6ea316a --- /dev/null +++ b/UnityClient/UserSettings/EditorUserSettings.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bcc223100ab62f0f3b8b1207878d85c66266667f14e5737e08fc618ba0b0da19 +size 725 From 40a2fbea27b25ca30cfeaf6d162272e8c5c72a51 Mon Sep 17 00:00:00 2001 From: vladalexan <51922137+vladalexan@users.noreply.github.com> Date: Mon, 14 Feb 2022 19:38:50 +0200 Subject: [PATCH 2/3] remove comments --- UnityClient/Assets/Scripts/Molotov/Projectile.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/UnityClient/Assets/Scripts/Molotov/Projectile.cs b/UnityClient/Assets/Scripts/Molotov/Projectile.cs index f8a6151..6a89489 100644 --- a/UnityClient/Assets/Scripts/Molotov/Projectile.cs +++ b/UnityClient/Assets/Scripts/Molotov/Projectile.cs @@ -32,7 +32,6 @@ IEnumerator Spawn(Vector3 position, Quaternion rotation) for (int i = 1; i < 3; i++) { yield return new WaitForSeconds(0.15f); - Debug.Log("benis"); Instantiate(flames, position + new Vector3(0.6f * i, 0.5f, 0), rotation); Instantiate(flames, position + new Vector3(-0.6f * i, 0.5f, 0), rotation); } From e77e3ddf9ef7b305facd9b9b2793b59bf9878bb9 Mon Sep 17 00:00:00 2001 From: vladalexan <51922137+vladalexan@users.noreply.github.com> Date: Tue, 15 Feb 2022 19:08:30 +0200 Subject: [PATCH 3/3] placed files in _DEV folder --- UnityClient/Assets/{ => _DEV}/Graphics.meta | 0 UnityClient/Assets/{ => _DEV}/Graphics/Effects.meta | 0 UnityClient/Assets/{ => _DEV}/Graphics/Effects/Flames.meta | 0 .../Assets/{ => _DEV}/Graphics/Effects/Flames/Flame.anim | 0 .../Assets/{ => _DEV}/Graphics/Effects/Flames/Flame.anim.meta | 0 .../{ => _DEV}/Graphics/Effects/Flames/Flames.controller | 0 .../{ => _DEV}/Graphics/Effects/Flames/Flames.controller.meta | 0 .../Graphics/Effects/Flames/frame_00_delay-0.1s.gif | 0 .../Graphics/Effects/Flames/frame_00_delay-0.1s.gif.meta | 0 .../Graphics/Effects/Flames/frame_01_delay-0.1s.gif | 0 .../Graphics/Effects/Flames/frame_01_delay-0.1s.gif.meta | 0 .../Graphics/Effects/Flames/frame_02_delay-0.1s.gif | 0 .../Graphics/Effects/Flames/frame_02_delay-0.1s.gif.meta | 0 .../Graphics/Effects/Flames/frame_03_delay-0.1s.gif | 0 .../Graphics/Effects/Flames/frame_03_delay-0.1s.gif.meta | 0 .../Graphics/Effects/Flames/frame_04_delay-0.1s.gif | 0 .../Graphics/Effects/Flames/frame_04_delay-0.1s.gif.meta | 0 .../Graphics/Effects/Flames/frame_05_delay-0.1s.gif | 0 .../Graphics/Effects/Flames/frame_05_delay-0.1s.gif.meta | 0 .../Graphics/Effects/Flames/frame_06_delay-0.1s.gif | 0 .../Graphics/Effects/Flames/frame_06_delay-0.1s.gif.meta | 0 .../Graphics/Effects/Flames/frame_07_delay-0.1s.gif | 0 .../Graphics/Effects/Flames/frame_07_delay-0.1s.gif.meta | 0 .../Graphics/Effects/Flames/frame_08_delay-0.1s.gif | 0 .../Graphics/Effects/Flames/frame_08_delay-0.1s.gif.meta | 0 .../Graphics/Effects/Flames/frame_09_delay-0.1s.gif | 0 .../Graphics/Effects/Flames/frame_09_delay-0.1s.gif.meta | 0 UnityClient/Assets/{ => _DEV}/Graphics/Projectiles.meta | 0 .../Assets/{ => _DEV}/Graphics/Projectiles/Molotov.meta | 0 .../Assets/{ => _DEV}/Graphics/Projectiles/Molotov/Burn.anim | 0 .../{ => _DEV}/Graphics/Projectiles/Molotov/Burn.anim.meta | 0 .../Projectiles/Molotov/Molotov Controller.controller | 0 .../Projectiles/Molotov/Molotov Controller.controller.meta | 0 .../Graphics/Projectiles/Molotov/frame_0_delay-0.3s.gif | 0 .../Graphics/Projectiles/Molotov/frame_0_delay-0.3s.gif.meta | 0 .../Graphics/Projectiles/Molotov/frame_1_delay-0.2s.gif | 0 .../Graphics/Projectiles/Molotov/frame_1_delay-0.2s.gif.meta | 0 .../Graphics/Projectiles/Molotov/frame_2_delay-0.3s.gif | 0 .../Graphics/Projectiles/Molotov/frame_2_delay-0.3s.gif.meta | 0 .../Graphics/Projectiles/Molotov/frame_3_delay-0.3s.gif | 0 .../Graphics/Projectiles/Molotov/frame_3_delay-0.3s.gif.meta | 0 UnityClient/Assets/{ => _DEV}/Molotov_demo.unity | 0 UnityClient/Assets/{ => _DEV}/Molotov_demo.unity.meta | 0 UnityClient/Assets/{ => _DEV}/Prefabs.meta | 0 UnityClient/Assets/{ => _DEV}/Prefabs/Ammo Pickup.prefab | 0 UnityClient/Assets/{ => _DEV}/Prefabs/Ammo Pickup.prefab.meta | 0 UnityClient/Assets/{ => _DEV}/Prefabs/Flames.prefab | 0 UnityClient/Assets/{ => _DEV}/Prefabs/Flames.prefab.meta | 0 UnityClient/Assets/{ => _DEV}/Prefabs/Molotov.prefab | 0 UnityClient/Assets/{ => _DEV}/Prefabs/Molotov.prefab.meta | 0 UnityClient/Assets/{ => _DEV}/Prefabs/Player.prefab | 0 UnityClient/Assets/{ => _DEV}/Prefabs/Player.prefab.meta | 0 UnityClient/Assets/{ => _DEV}/Scripts.meta | 0 UnityClient/Assets/{ => _DEV}/Scripts/Characters.meta | 0 .../Assets/{ => _DEV}/Scripts/Characters/CharacterStats.cs | 0 .../{ => _DEV}/Scripts/Characters/CharacterStats.cs.meta | 0 UnityClient/Assets/{ => _DEV}/Scripts/MockPlayerController.cs | 0 .../Assets/{ => _DEV}/Scripts/MockPlayerController.cs.meta | 0 UnityClient/Assets/{ => _DEV}/Scripts/Molotov.meta | 0 UnityClient/Assets/{ => _DEV}/Scripts/Molotov/AmmoPickup.cs | 0 .../Assets/{ => _DEV}/Scripts/Molotov/AmmoPickup.cs.meta | 0 UnityClient/Assets/{ => _DEV}/Scripts/Molotov/Flames.cs | 0 UnityClient/Assets/{ => _DEV}/Scripts/Molotov/Flames.cs.meta | 0 UnityClient/Assets/{ => _DEV}/Scripts/Molotov/Molotov.cs | 0 UnityClient/Assets/{ => _DEV}/Scripts/Molotov/Molotov.cs.meta | 0 UnityClient/Assets/{ => _DEV}/Scripts/Molotov/Projectile.cs | 0 .../Assets/{ => _DEV}/Scripts/Molotov/Projectile.cs.meta | 0 UnityClient/UserSettings/EditorUserSettings.asset | 4 ++-- 68 files changed, 2 insertions(+), 2 deletions(-) rename UnityClient/Assets/{ => _DEV}/Graphics.meta (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Effects.meta (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Effects/Flames.meta (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Effects/Flames/Flame.anim (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Effects/Flames/Flame.anim.meta (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Effects/Flames/Flames.controller (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Effects/Flames/Flames.controller.meta (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Effects/Flames/frame_00_delay-0.1s.gif (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Effects/Flames/frame_00_delay-0.1s.gif.meta (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Effects/Flames/frame_01_delay-0.1s.gif (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Effects/Flames/frame_01_delay-0.1s.gif.meta (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Effects/Flames/frame_02_delay-0.1s.gif (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Effects/Flames/frame_02_delay-0.1s.gif.meta (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Effects/Flames/frame_03_delay-0.1s.gif (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Effects/Flames/frame_03_delay-0.1s.gif.meta (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Effects/Flames/frame_04_delay-0.1s.gif (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Effects/Flames/frame_04_delay-0.1s.gif.meta (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Effects/Flames/frame_05_delay-0.1s.gif (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Effects/Flames/frame_05_delay-0.1s.gif.meta (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Effects/Flames/frame_06_delay-0.1s.gif (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Effects/Flames/frame_06_delay-0.1s.gif.meta (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Effects/Flames/frame_07_delay-0.1s.gif (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Effects/Flames/frame_07_delay-0.1s.gif.meta (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Effects/Flames/frame_08_delay-0.1s.gif (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Effects/Flames/frame_08_delay-0.1s.gif.meta (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Effects/Flames/frame_09_delay-0.1s.gif (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Effects/Flames/frame_09_delay-0.1s.gif.meta (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Projectiles.meta (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Projectiles/Molotov.meta (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Projectiles/Molotov/Burn.anim (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Projectiles/Molotov/Burn.anim.meta (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Projectiles/Molotov/Molotov Controller.controller (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Projectiles/Molotov/Molotov Controller.controller.meta (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Projectiles/Molotov/frame_0_delay-0.3s.gif (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Projectiles/Molotov/frame_0_delay-0.3s.gif.meta (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Projectiles/Molotov/frame_1_delay-0.2s.gif (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Projectiles/Molotov/frame_1_delay-0.2s.gif.meta (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Projectiles/Molotov/frame_2_delay-0.3s.gif (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Projectiles/Molotov/frame_2_delay-0.3s.gif.meta (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Projectiles/Molotov/frame_3_delay-0.3s.gif (100%) rename UnityClient/Assets/{ => _DEV}/Graphics/Projectiles/Molotov/frame_3_delay-0.3s.gif.meta (100%) rename UnityClient/Assets/{ => _DEV}/Molotov_demo.unity (100%) rename UnityClient/Assets/{ => _DEV}/Molotov_demo.unity.meta (100%) rename UnityClient/Assets/{ => _DEV}/Prefabs.meta (100%) rename UnityClient/Assets/{ => _DEV}/Prefabs/Ammo Pickup.prefab (100%) rename UnityClient/Assets/{ => _DEV}/Prefabs/Ammo Pickup.prefab.meta (100%) rename UnityClient/Assets/{ => _DEV}/Prefabs/Flames.prefab (100%) rename UnityClient/Assets/{ => _DEV}/Prefabs/Flames.prefab.meta (100%) rename UnityClient/Assets/{ => _DEV}/Prefabs/Molotov.prefab (100%) rename UnityClient/Assets/{ => _DEV}/Prefabs/Molotov.prefab.meta (100%) rename UnityClient/Assets/{ => _DEV}/Prefabs/Player.prefab (100%) rename UnityClient/Assets/{ => _DEV}/Prefabs/Player.prefab.meta (100%) rename UnityClient/Assets/{ => _DEV}/Scripts.meta (100%) rename UnityClient/Assets/{ => _DEV}/Scripts/Characters.meta (100%) rename UnityClient/Assets/{ => _DEV}/Scripts/Characters/CharacterStats.cs (100%) rename UnityClient/Assets/{ => _DEV}/Scripts/Characters/CharacterStats.cs.meta (100%) rename UnityClient/Assets/{ => _DEV}/Scripts/MockPlayerController.cs (100%) rename UnityClient/Assets/{ => _DEV}/Scripts/MockPlayerController.cs.meta (100%) rename UnityClient/Assets/{ => _DEV}/Scripts/Molotov.meta (100%) rename UnityClient/Assets/{ => _DEV}/Scripts/Molotov/AmmoPickup.cs (100%) rename UnityClient/Assets/{ => _DEV}/Scripts/Molotov/AmmoPickup.cs.meta (100%) rename UnityClient/Assets/{ => _DEV}/Scripts/Molotov/Flames.cs (100%) rename UnityClient/Assets/{ => _DEV}/Scripts/Molotov/Flames.cs.meta (100%) rename UnityClient/Assets/{ => _DEV}/Scripts/Molotov/Molotov.cs (100%) rename UnityClient/Assets/{ => _DEV}/Scripts/Molotov/Molotov.cs.meta (100%) rename UnityClient/Assets/{ => _DEV}/Scripts/Molotov/Projectile.cs (100%) rename UnityClient/Assets/{ => _DEV}/Scripts/Molotov/Projectile.cs.meta (100%) diff --git a/UnityClient/Assets/Graphics.meta b/UnityClient/Assets/_DEV/Graphics.meta similarity index 100% rename from UnityClient/Assets/Graphics.meta rename to UnityClient/Assets/_DEV/Graphics.meta diff --git a/UnityClient/Assets/Graphics/Effects.meta b/UnityClient/Assets/_DEV/Graphics/Effects.meta similarity index 100% rename from UnityClient/Assets/Graphics/Effects.meta rename to UnityClient/Assets/_DEV/Graphics/Effects.meta diff --git a/UnityClient/Assets/Graphics/Effects/Flames.meta b/UnityClient/Assets/_DEV/Graphics/Effects/Flames.meta similarity index 100% rename from UnityClient/Assets/Graphics/Effects/Flames.meta rename to UnityClient/Assets/_DEV/Graphics/Effects/Flames.meta diff --git a/UnityClient/Assets/Graphics/Effects/Flames/Flame.anim b/UnityClient/Assets/_DEV/Graphics/Effects/Flames/Flame.anim similarity index 100% rename from UnityClient/Assets/Graphics/Effects/Flames/Flame.anim rename to UnityClient/Assets/_DEV/Graphics/Effects/Flames/Flame.anim diff --git a/UnityClient/Assets/Graphics/Effects/Flames/Flame.anim.meta b/UnityClient/Assets/_DEV/Graphics/Effects/Flames/Flame.anim.meta similarity index 100% rename from UnityClient/Assets/Graphics/Effects/Flames/Flame.anim.meta rename to UnityClient/Assets/_DEV/Graphics/Effects/Flames/Flame.anim.meta diff --git a/UnityClient/Assets/Graphics/Effects/Flames/Flames.controller b/UnityClient/Assets/_DEV/Graphics/Effects/Flames/Flames.controller similarity index 100% rename from UnityClient/Assets/Graphics/Effects/Flames/Flames.controller rename to UnityClient/Assets/_DEV/Graphics/Effects/Flames/Flames.controller diff --git a/UnityClient/Assets/Graphics/Effects/Flames/Flames.controller.meta b/UnityClient/Assets/_DEV/Graphics/Effects/Flames/Flames.controller.meta similarity index 100% rename from UnityClient/Assets/Graphics/Effects/Flames/Flames.controller.meta rename to UnityClient/Assets/_DEV/Graphics/Effects/Flames/Flames.controller.meta diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_00_delay-0.1s.gif b/UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_00_delay-0.1s.gif similarity index 100% rename from UnityClient/Assets/Graphics/Effects/Flames/frame_00_delay-0.1s.gif rename to UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_00_delay-0.1s.gif diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_00_delay-0.1s.gif.meta b/UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_00_delay-0.1s.gif.meta similarity index 100% rename from UnityClient/Assets/Graphics/Effects/Flames/frame_00_delay-0.1s.gif.meta rename to UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_00_delay-0.1s.gif.meta diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_01_delay-0.1s.gif b/UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_01_delay-0.1s.gif similarity index 100% rename from UnityClient/Assets/Graphics/Effects/Flames/frame_01_delay-0.1s.gif rename to UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_01_delay-0.1s.gif diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_01_delay-0.1s.gif.meta b/UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_01_delay-0.1s.gif.meta similarity index 100% rename from UnityClient/Assets/Graphics/Effects/Flames/frame_01_delay-0.1s.gif.meta rename to UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_01_delay-0.1s.gif.meta diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_02_delay-0.1s.gif b/UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_02_delay-0.1s.gif similarity index 100% rename from UnityClient/Assets/Graphics/Effects/Flames/frame_02_delay-0.1s.gif rename to UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_02_delay-0.1s.gif diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_02_delay-0.1s.gif.meta b/UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_02_delay-0.1s.gif.meta similarity index 100% rename from UnityClient/Assets/Graphics/Effects/Flames/frame_02_delay-0.1s.gif.meta rename to UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_02_delay-0.1s.gif.meta diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_03_delay-0.1s.gif b/UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_03_delay-0.1s.gif similarity index 100% rename from UnityClient/Assets/Graphics/Effects/Flames/frame_03_delay-0.1s.gif rename to UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_03_delay-0.1s.gif diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_03_delay-0.1s.gif.meta b/UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_03_delay-0.1s.gif.meta similarity index 100% rename from UnityClient/Assets/Graphics/Effects/Flames/frame_03_delay-0.1s.gif.meta rename to UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_03_delay-0.1s.gif.meta diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_04_delay-0.1s.gif b/UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_04_delay-0.1s.gif similarity index 100% rename from UnityClient/Assets/Graphics/Effects/Flames/frame_04_delay-0.1s.gif rename to UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_04_delay-0.1s.gif diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_04_delay-0.1s.gif.meta b/UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_04_delay-0.1s.gif.meta similarity index 100% rename from UnityClient/Assets/Graphics/Effects/Flames/frame_04_delay-0.1s.gif.meta rename to UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_04_delay-0.1s.gif.meta diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_05_delay-0.1s.gif b/UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_05_delay-0.1s.gif similarity index 100% rename from UnityClient/Assets/Graphics/Effects/Flames/frame_05_delay-0.1s.gif rename to UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_05_delay-0.1s.gif diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_05_delay-0.1s.gif.meta b/UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_05_delay-0.1s.gif.meta similarity index 100% rename from UnityClient/Assets/Graphics/Effects/Flames/frame_05_delay-0.1s.gif.meta rename to UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_05_delay-0.1s.gif.meta diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_06_delay-0.1s.gif b/UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_06_delay-0.1s.gif similarity index 100% rename from UnityClient/Assets/Graphics/Effects/Flames/frame_06_delay-0.1s.gif rename to UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_06_delay-0.1s.gif diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_06_delay-0.1s.gif.meta b/UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_06_delay-0.1s.gif.meta similarity index 100% rename from UnityClient/Assets/Graphics/Effects/Flames/frame_06_delay-0.1s.gif.meta rename to UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_06_delay-0.1s.gif.meta diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_07_delay-0.1s.gif b/UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_07_delay-0.1s.gif similarity index 100% rename from UnityClient/Assets/Graphics/Effects/Flames/frame_07_delay-0.1s.gif rename to UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_07_delay-0.1s.gif diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_07_delay-0.1s.gif.meta b/UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_07_delay-0.1s.gif.meta similarity index 100% rename from UnityClient/Assets/Graphics/Effects/Flames/frame_07_delay-0.1s.gif.meta rename to UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_07_delay-0.1s.gif.meta diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_08_delay-0.1s.gif b/UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_08_delay-0.1s.gif similarity index 100% rename from UnityClient/Assets/Graphics/Effects/Flames/frame_08_delay-0.1s.gif rename to UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_08_delay-0.1s.gif diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_08_delay-0.1s.gif.meta b/UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_08_delay-0.1s.gif.meta similarity index 100% rename from UnityClient/Assets/Graphics/Effects/Flames/frame_08_delay-0.1s.gif.meta rename to UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_08_delay-0.1s.gif.meta diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_09_delay-0.1s.gif b/UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_09_delay-0.1s.gif similarity index 100% rename from UnityClient/Assets/Graphics/Effects/Flames/frame_09_delay-0.1s.gif rename to UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_09_delay-0.1s.gif diff --git a/UnityClient/Assets/Graphics/Effects/Flames/frame_09_delay-0.1s.gif.meta b/UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_09_delay-0.1s.gif.meta similarity index 100% rename from UnityClient/Assets/Graphics/Effects/Flames/frame_09_delay-0.1s.gif.meta rename to UnityClient/Assets/_DEV/Graphics/Effects/Flames/frame_09_delay-0.1s.gif.meta diff --git a/UnityClient/Assets/Graphics/Projectiles.meta b/UnityClient/Assets/_DEV/Graphics/Projectiles.meta similarity index 100% rename from UnityClient/Assets/Graphics/Projectiles.meta rename to UnityClient/Assets/_DEV/Graphics/Projectiles.meta diff --git a/UnityClient/Assets/Graphics/Projectiles/Molotov.meta b/UnityClient/Assets/_DEV/Graphics/Projectiles/Molotov.meta similarity index 100% rename from UnityClient/Assets/Graphics/Projectiles/Molotov.meta rename to UnityClient/Assets/_DEV/Graphics/Projectiles/Molotov.meta diff --git a/UnityClient/Assets/Graphics/Projectiles/Molotov/Burn.anim b/UnityClient/Assets/_DEV/Graphics/Projectiles/Molotov/Burn.anim similarity index 100% rename from UnityClient/Assets/Graphics/Projectiles/Molotov/Burn.anim rename to UnityClient/Assets/_DEV/Graphics/Projectiles/Molotov/Burn.anim diff --git a/UnityClient/Assets/Graphics/Projectiles/Molotov/Burn.anim.meta b/UnityClient/Assets/_DEV/Graphics/Projectiles/Molotov/Burn.anim.meta similarity index 100% rename from UnityClient/Assets/Graphics/Projectiles/Molotov/Burn.anim.meta rename to UnityClient/Assets/_DEV/Graphics/Projectiles/Molotov/Burn.anim.meta diff --git a/UnityClient/Assets/Graphics/Projectiles/Molotov/Molotov Controller.controller b/UnityClient/Assets/_DEV/Graphics/Projectiles/Molotov/Molotov Controller.controller similarity index 100% rename from UnityClient/Assets/Graphics/Projectiles/Molotov/Molotov Controller.controller rename to UnityClient/Assets/_DEV/Graphics/Projectiles/Molotov/Molotov Controller.controller diff --git a/UnityClient/Assets/Graphics/Projectiles/Molotov/Molotov Controller.controller.meta b/UnityClient/Assets/_DEV/Graphics/Projectiles/Molotov/Molotov Controller.controller.meta similarity index 100% rename from UnityClient/Assets/Graphics/Projectiles/Molotov/Molotov Controller.controller.meta rename to UnityClient/Assets/_DEV/Graphics/Projectiles/Molotov/Molotov Controller.controller.meta diff --git a/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_0_delay-0.3s.gif b/UnityClient/Assets/_DEV/Graphics/Projectiles/Molotov/frame_0_delay-0.3s.gif similarity index 100% rename from UnityClient/Assets/Graphics/Projectiles/Molotov/frame_0_delay-0.3s.gif rename to UnityClient/Assets/_DEV/Graphics/Projectiles/Molotov/frame_0_delay-0.3s.gif diff --git a/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_0_delay-0.3s.gif.meta b/UnityClient/Assets/_DEV/Graphics/Projectiles/Molotov/frame_0_delay-0.3s.gif.meta similarity index 100% rename from UnityClient/Assets/Graphics/Projectiles/Molotov/frame_0_delay-0.3s.gif.meta rename to UnityClient/Assets/_DEV/Graphics/Projectiles/Molotov/frame_0_delay-0.3s.gif.meta diff --git a/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_1_delay-0.2s.gif b/UnityClient/Assets/_DEV/Graphics/Projectiles/Molotov/frame_1_delay-0.2s.gif similarity index 100% rename from UnityClient/Assets/Graphics/Projectiles/Molotov/frame_1_delay-0.2s.gif rename to UnityClient/Assets/_DEV/Graphics/Projectiles/Molotov/frame_1_delay-0.2s.gif diff --git a/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_1_delay-0.2s.gif.meta b/UnityClient/Assets/_DEV/Graphics/Projectiles/Molotov/frame_1_delay-0.2s.gif.meta similarity index 100% rename from UnityClient/Assets/Graphics/Projectiles/Molotov/frame_1_delay-0.2s.gif.meta rename to UnityClient/Assets/_DEV/Graphics/Projectiles/Molotov/frame_1_delay-0.2s.gif.meta diff --git a/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_2_delay-0.3s.gif b/UnityClient/Assets/_DEV/Graphics/Projectiles/Molotov/frame_2_delay-0.3s.gif similarity index 100% rename from UnityClient/Assets/Graphics/Projectiles/Molotov/frame_2_delay-0.3s.gif rename to UnityClient/Assets/_DEV/Graphics/Projectiles/Molotov/frame_2_delay-0.3s.gif diff --git a/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_2_delay-0.3s.gif.meta b/UnityClient/Assets/_DEV/Graphics/Projectiles/Molotov/frame_2_delay-0.3s.gif.meta similarity index 100% rename from UnityClient/Assets/Graphics/Projectiles/Molotov/frame_2_delay-0.3s.gif.meta rename to UnityClient/Assets/_DEV/Graphics/Projectiles/Molotov/frame_2_delay-0.3s.gif.meta diff --git a/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_3_delay-0.3s.gif b/UnityClient/Assets/_DEV/Graphics/Projectiles/Molotov/frame_3_delay-0.3s.gif similarity index 100% rename from UnityClient/Assets/Graphics/Projectiles/Molotov/frame_3_delay-0.3s.gif rename to UnityClient/Assets/_DEV/Graphics/Projectiles/Molotov/frame_3_delay-0.3s.gif diff --git a/UnityClient/Assets/Graphics/Projectiles/Molotov/frame_3_delay-0.3s.gif.meta b/UnityClient/Assets/_DEV/Graphics/Projectiles/Molotov/frame_3_delay-0.3s.gif.meta similarity index 100% rename from UnityClient/Assets/Graphics/Projectiles/Molotov/frame_3_delay-0.3s.gif.meta rename to UnityClient/Assets/_DEV/Graphics/Projectiles/Molotov/frame_3_delay-0.3s.gif.meta diff --git a/UnityClient/Assets/Molotov_demo.unity b/UnityClient/Assets/_DEV/Molotov_demo.unity similarity index 100% rename from UnityClient/Assets/Molotov_demo.unity rename to UnityClient/Assets/_DEV/Molotov_demo.unity diff --git a/UnityClient/Assets/Molotov_demo.unity.meta b/UnityClient/Assets/_DEV/Molotov_demo.unity.meta similarity index 100% rename from UnityClient/Assets/Molotov_demo.unity.meta rename to UnityClient/Assets/_DEV/Molotov_demo.unity.meta diff --git a/UnityClient/Assets/Prefabs.meta b/UnityClient/Assets/_DEV/Prefabs.meta similarity index 100% rename from UnityClient/Assets/Prefabs.meta rename to UnityClient/Assets/_DEV/Prefabs.meta diff --git a/UnityClient/Assets/Prefabs/Ammo Pickup.prefab b/UnityClient/Assets/_DEV/Prefabs/Ammo Pickup.prefab similarity index 100% rename from UnityClient/Assets/Prefabs/Ammo Pickup.prefab rename to UnityClient/Assets/_DEV/Prefabs/Ammo Pickup.prefab diff --git a/UnityClient/Assets/Prefabs/Ammo Pickup.prefab.meta b/UnityClient/Assets/_DEV/Prefabs/Ammo Pickup.prefab.meta similarity index 100% rename from UnityClient/Assets/Prefabs/Ammo Pickup.prefab.meta rename to UnityClient/Assets/_DEV/Prefabs/Ammo Pickup.prefab.meta diff --git a/UnityClient/Assets/Prefabs/Flames.prefab b/UnityClient/Assets/_DEV/Prefabs/Flames.prefab similarity index 100% rename from UnityClient/Assets/Prefabs/Flames.prefab rename to UnityClient/Assets/_DEV/Prefabs/Flames.prefab diff --git a/UnityClient/Assets/Prefabs/Flames.prefab.meta b/UnityClient/Assets/_DEV/Prefabs/Flames.prefab.meta similarity index 100% rename from UnityClient/Assets/Prefabs/Flames.prefab.meta rename to UnityClient/Assets/_DEV/Prefabs/Flames.prefab.meta diff --git a/UnityClient/Assets/Prefabs/Molotov.prefab b/UnityClient/Assets/_DEV/Prefabs/Molotov.prefab similarity index 100% rename from UnityClient/Assets/Prefabs/Molotov.prefab rename to UnityClient/Assets/_DEV/Prefabs/Molotov.prefab diff --git a/UnityClient/Assets/Prefabs/Molotov.prefab.meta b/UnityClient/Assets/_DEV/Prefabs/Molotov.prefab.meta similarity index 100% rename from UnityClient/Assets/Prefabs/Molotov.prefab.meta rename to UnityClient/Assets/_DEV/Prefabs/Molotov.prefab.meta diff --git a/UnityClient/Assets/Prefabs/Player.prefab b/UnityClient/Assets/_DEV/Prefabs/Player.prefab similarity index 100% rename from UnityClient/Assets/Prefabs/Player.prefab rename to UnityClient/Assets/_DEV/Prefabs/Player.prefab diff --git a/UnityClient/Assets/Prefabs/Player.prefab.meta b/UnityClient/Assets/_DEV/Prefabs/Player.prefab.meta similarity index 100% rename from UnityClient/Assets/Prefabs/Player.prefab.meta rename to UnityClient/Assets/_DEV/Prefabs/Player.prefab.meta diff --git a/UnityClient/Assets/Scripts.meta b/UnityClient/Assets/_DEV/Scripts.meta similarity index 100% rename from UnityClient/Assets/Scripts.meta rename to UnityClient/Assets/_DEV/Scripts.meta diff --git a/UnityClient/Assets/Scripts/Characters.meta b/UnityClient/Assets/_DEV/Scripts/Characters.meta similarity index 100% rename from UnityClient/Assets/Scripts/Characters.meta rename to UnityClient/Assets/_DEV/Scripts/Characters.meta diff --git a/UnityClient/Assets/Scripts/Characters/CharacterStats.cs b/UnityClient/Assets/_DEV/Scripts/Characters/CharacterStats.cs similarity index 100% rename from UnityClient/Assets/Scripts/Characters/CharacterStats.cs rename to UnityClient/Assets/_DEV/Scripts/Characters/CharacterStats.cs diff --git a/UnityClient/Assets/Scripts/Characters/CharacterStats.cs.meta b/UnityClient/Assets/_DEV/Scripts/Characters/CharacterStats.cs.meta similarity index 100% rename from UnityClient/Assets/Scripts/Characters/CharacterStats.cs.meta rename to UnityClient/Assets/_DEV/Scripts/Characters/CharacterStats.cs.meta diff --git a/UnityClient/Assets/Scripts/MockPlayerController.cs b/UnityClient/Assets/_DEV/Scripts/MockPlayerController.cs similarity index 100% rename from UnityClient/Assets/Scripts/MockPlayerController.cs rename to UnityClient/Assets/_DEV/Scripts/MockPlayerController.cs diff --git a/UnityClient/Assets/Scripts/MockPlayerController.cs.meta b/UnityClient/Assets/_DEV/Scripts/MockPlayerController.cs.meta similarity index 100% rename from UnityClient/Assets/Scripts/MockPlayerController.cs.meta rename to UnityClient/Assets/_DEV/Scripts/MockPlayerController.cs.meta diff --git a/UnityClient/Assets/Scripts/Molotov.meta b/UnityClient/Assets/_DEV/Scripts/Molotov.meta similarity index 100% rename from UnityClient/Assets/Scripts/Molotov.meta rename to UnityClient/Assets/_DEV/Scripts/Molotov.meta diff --git a/UnityClient/Assets/Scripts/Molotov/AmmoPickup.cs b/UnityClient/Assets/_DEV/Scripts/Molotov/AmmoPickup.cs similarity index 100% rename from UnityClient/Assets/Scripts/Molotov/AmmoPickup.cs rename to UnityClient/Assets/_DEV/Scripts/Molotov/AmmoPickup.cs diff --git a/UnityClient/Assets/Scripts/Molotov/AmmoPickup.cs.meta b/UnityClient/Assets/_DEV/Scripts/Molotov/AmmoPickup.cs.meta similarity index 100% rename from UnityClient/Assets/Scripts/Molotov/AmmoPickup.cs.meta rename to UnityClient/Assets/_DEV/Scripts/Molotov/AmmoPickup.cs.meta diff --git a/UnityClient/Assets/Scripts/Molotov/Flames.cs b/UnityClient/Assets/_DEV/Scripts/Molotov/Flames.cs similarity index 100% rename from UnityClient/Assets/Scripts/Molotov/Flames.cs rename to UnityClient/Assets/_DEV/Scripts/Molotov/Flames.cs diff --git a/UnityClient/Assets/Scripts/Molotov/Flames.cs.meta b/UnityClient/Assets/_DEV/Scripts/Molotov/Flames.cs.meta similarity index 100% rename from UnityClient/Assets/Scripts/Molotov/Flames.cs.meta rename to UnityClient/Assets/_DEV/Scripts/Molotov/Flames.cs.meta diff --git a/UnityClient/Assets/Scripts/Molotov/Molotov.cs b/UnityClient/Assets/_DEV/Scripts/Molotov/Molotov.cs similarity index 100% rename from UnityClient/Assets/Scripts/Molotov/Molotov.cs rename to UnityClient/Assets/_DEV/Scripts/Molotov/Molotov.cs diff --git a/UnityClient/Assets/Scripts/Molotov/Molotov.cs.meta b/UnityClient/Assets/_DEV/Scripts/Molotov/Molotov.cs.meta similarity index 100% rename from UnityClient/Assets/Scripts/Molotov/Molotov.cs.meta rename to UnityClient/Assets/_DEV/Scripts/Molotov/Molotov.cs.meta diff --git a/UnityClient/Assets/Scripts/Molotov/Projectile.cs b/UnityClient/Assets/_DEV/Scripts/Molotov/Projectile.cs similarity index 100% rename from UnityClient/Assets/Scripts/Molotov/Projectile.cs rename to UnityClient/Assets/_DEV/Scripts/Molotov/Projectile.cs diff --git a/UnityClient/Assets/Scripts/Molotov/Projectile.cs.meta b/UnityClient/Assets/_DEV/Scripts/Molotov/Projectile.cs.meta similarity index 100% rename from UnityClient/Assets/Scripts/Molotov/Projectile.cs.meta rename to UnityClient/Assets/_DEV/Scripts/Molotov/Projectile.cs.meta diff --git a/UnityClient/UserSettings/EditorUserSettings.asset b/UnityClient/UserSettings/EditorUserSettings.asset index 6ea316a..97cfc9a 100644 --- a/UnityClient/UserSettings/EditorUserSettings.asset +++ b/UnityClient/UserSettings/EditorUserSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bcc223100ab62f0f3b8b1207878d85c66266667f14e5737e08fc618ba0b0da19 -size 725 +oid sha256:f374e994022075b9b8674018248013528c23d6ef032b084111c4fcb776ea90b2 +size 995