From b21d392ff645c2e23d0f35b7d7197e0fb83efbad Mon Sep 17 00:00:00 2001 From: Crizomb Date: Mon, 20 Jan 2025 21:05:28 +0100 Subject: [PATCH] witches --- .../{minecraft-creeper.meta => Creeper.meta} | 2 +- .../Creeper/CreeperAnimator.controller | 95 ++++++ .../Creeper/CreeperAnimator.controller.meta | 8 + .../CharacterModels/Creeper/exploding.mat | 86 ++++++ .../Creeper/exploding.mat.meta | 8 + .../Creeper/material_0_blue.mat | 73 +++++ .../Creeper/material_0_blue.mat.meta | 8 + .../Creeper/material_0_red.mat | 73 +++++ .../Creeper/material_0_red.mat.meta | 8 + .../Creeper/minecraft_creeper.glb | Bin 0 -> 17616 bytes .../Creeper/minecraft_creeper.glb.meta | 28 ++ .../minecraft-creeper/source/creeper.glb | Bin 20936 -> 0 bytes .../textures/gltf_embedded_0.png | Bin 2916 -> 0 bytes .../textures/gltf_embedded_0.png.meta | 117 -------- .../minecraft-witch/source/witch.fbx.meta | 7 +- .../source/witch_mat.meta} | 2 +- .../source/witch_mat/Witch.mat | 84 ++++++ .../source/witch_mat/Witch.mat.meta | 8 + .../source/witch_mat/WitchBlue.mat | 84 ++++++ .../source/witch_mat/WitchBlue.mat.meta | 8 + .../source/witch_mat/WitchRed.mat | 84 ++++++ .../source/witch_mat/WitchRed.mat.meta | 8 + .../minecraft-witch/textures/witch.png.meta | 2 +- Assets/Materials/Arrow.mat | 84 ++++++ Assets/Materials/Arrow.mat.meta | 8 + Assets/Materials/HealthArea.mat | 86 ++++++ Assets/Materials/HealthArea.mat.meta | 8 + Assets/Materials/HealthPotion.mat | 84 ++++++ Assets/Materials/HealthPotion.mat.meta | 8 + Assets/Prefabs/Arrow.prefab | 11 +- Assets/Prefabs/ExplodingMesh.prefab | 88 ++++++ Assets/Prefabs/ExplodingMesh.prefab.meta | 7 + Assets/Prefabs/HealthExplode.prefab | 162 +++++++++++ Assets/Prefabs/HealthExplode.prefab.meta | 7 + Assets/Prefabs/HealthPotion.prefab | 274 ++++++++++++++++++ Assets/Prefabs/HealthPotion.prefab.meta | 7 + Assets/Prefabs/Units/Base/BaseCreeper.prefab | 252 ++++++++++++++++ .../Units/Base/BaseCreeper.prefab.meta | 7 + Assets/Prefabs/Units/Base/BaseGolem.prefab | 30 +- Assets/Prefabs/Units/Base/BaseWitch.prefab | 227 +++++++++++++++ .../Prefabs/Units/Base/BaseWitch.prefab.meta | 7 + Assets/Prefabs/Units/Base/BaseZombie.prefab | 4 +- Assets/Prefabs/Units/CreeperA.prefab | 83 ++++++ Assets/Prefabs/Units/CreeperA.prefab.meta | 7 + Assets/Prefabs/Units/CreeperB.prefab | 91 ++++++ Assets/Prefabs/Units/CreeperB.prefab.meta | 7 + Assets/Prefabs/Units/SkeletonA.prefab | 2 +- Assets/Prefabs/Units/SkeletonB.prefab | 2 +- Assets/Prefabs/Units/WitchA.prefab | 63 ++++ Assets/Prefabs/Units/WitchA.prefab.meta | 7 + Assets/Prefabs/Units/WitchB.prefab | 67 +++++ Assets/Prefabs/Units/WitchB.prefab.meta | 7 + Assets/Scenes/Clement 1.unity | 238 ++++++++++++++- .../textures.meta => Scripts/Singletons.meta} | 2 +- .../Singletons/Abstract.meta} | 3 +- .../Abstract/MonoBehaviourSingleton.cs | 26 ++ .../Abstract/MonoBehaviourSingleton.cs.meta | 2 + .../MonoBehaviourSingletonPersistent.cs | 18 ++ .../MonoBehaviourSingletonPersistent.cs.meta | 2 + Assets/Scripts/Singletons/CoroutineManager.cs | 6 + .../Singletons/CoroutineManager.cs.meta | 2 + Assets/Scripts/UnitScripts/AbstractUnit.cs | 1 + .../UnitScripts/Attacks/ArrowHandler.cs | 54 ---- .../UnitScripts/Attacks/AttackHandler.cs | 21 +- .../UnitScripts/Attacks/CreeperBomb.cs | 29 ++ .../UnitScripts/Attacks/CreeperBomb.cs.meta | 2 + .../UnitScripts/Attacks/Projectiles.meta | 8 + .../UnitScripts/Attacks/Projectiles/Arrow.cs | 24 ++ .../Attacks/Projectiles/Arrow.cs.meta | 2 + .../AttackProjectile.cs} | 11 +- .../AttackProjectile.cs.meta} | 0 .../Attacks/Projectiles/HealthPotion.cs | 38 +++ .../Attacks/Projectiles/HealthPotion.cs.meta | 2 + .../Attacks/Projectiles/ProjectileHandler.cs | 37 +++ .../ProjectileHandler.cs.meta} | 0 Assets/Scripts/UnitScripts/HealthHandler.cs | 4 +- Assets/Scripts/UnitScripts/MinecraftUnit.cs | 5 + Assets/Scripts/UnitScripts/MovementHandler.cs | 22 +- Packages/manifest.json | 1 + Packages/packages-lock.json | 59 ++++ 80 files changed, 2888 insertions(+), 221 deletions(-) rename Assets/Import/CharacterModels/{minecraft-creeper.meta => Creeper.meta} (77%) create mode 100644 Assets/Import/CharacterModels/Creeper/CreeperAnimator.controller create mode 100644 Assets/Import/CharacterModels/Creeper/CreeperAnimator.controller.meta create mode 100644 Assets/Import/CharacterModels/Creeper/exploding.mat create mode 100644 Assets/Import/CharacterModels/Creeper/exploding.mat.meta create mode 100644 Assets/Import/CharacterModels/Creeper/material_0_blue.mat create mode 100644 Assets/Import/CharacterModels/Creeper/material_0_blue.mat.meta create mode 100644 Assets/Import/CharacterModels/Creeper/material_0_red.mat create mode 100644 Assets/Import/CharacterModels/Creeper/material_0_red.mat.meta create mode 100644 Assets/Import/CharacterModels/Creeper/minecraft_creeper.glb create mode 100644 Assets/Import/CharacterModels/Creeper/minecraft_creeper.glb.meta delete mode 100644 Assets/Import/CharacterModels/minecraft-creeper/source/creeper.glb delete mode 100644 Assets/Import/CharacterModels/minecraft-creeper/textures/gltf_embedded_0.png delete mode 100644 Assets/Import/CharacterModels/minecraft-creeper/textures/gltf_embedded_0.png.meta rename Assets/Import/CharacterModels/{minecraft-creeper/source.meta => minecraft-witch/source/witch_mat.meta} (77%) create mode 100644 Assets/Import/CharacterModels/minecraft-witch/source/witch_mat/Witch.mat create mode 100644 Assets/Import/CharacterModels/minecraft-witch/source/witch_mat/Witch.mat.meta create mode 100644 Assets/Import/CharacterModels/minecraft-witch/source/witch_mat/WitchBlue.mat create mode 100644 Assets/Import/CharacterModels/minecraft-witch/source/witch_mat/WitchBlue.mat.meta create mode 100644 Assets/Import/CharacterModels/minecraft-witch/source/witch_mat/WitchRed.mat create mode 100644 Assets/Import/CharacterModels/minecraft-witch/source/witch_mat/WitchRed.mat.meta create mode 100644 Assets/Materials/Arrow.mat create mode 100644 Assets/Materials/Arrow.mat.meta create mode 100644 Assets/Materials/HealthArea.mat create mode 100644 Assets/Materials/HealthArea.mat.meta create mode 100644 Assets/Materials/HealthPotion.mat create mode 100644 Assets/Materials/HealthPotion.mat.meta create mode 100644 Assets/Prefabs/ExplodingMesh.prefab create mode 100644 Assets/Prefabs/ExplodingMesh.prefab.meta create mode 100644 Assets/Prefabs/HealthExplode.prefab create mode 100644 Assets/Prefabs/HealthExplode.prefab.meta create mode 100644 Assets/Prefabs/HealthPotion.prefab create mode 100644 Assets/Prefabs/HealthPotion.prefab.meta create mode 100644 Assets/Prefabs/Units/Base/BaseCreeper.prefab create mode 100644 Assets/Prefabs/Units/Base/BaseCreeper.prefab.meta create mode 100644 Assets/Prefabs/Units/Base/BaseWitch.prefab create mode 100644 Assets/Prefabs/Units/Base/BaseWitch.prefab.meta create mode 100644 Assets/Prefabs/Units/CreeperA.prefab create mode 100644 Assets/Prefabs/Units/CreeperA.prefab.meta create mode 100644 Assets/Prefabs/Units/CreeperB.prefab create mode 100644 Assets/Prefabs/Units/CreeperB.prefab.meta create mode 100644 Assets/Prefabs/Units/WitchA.prefab create mode 100644 Assets/Prefabs/Units/WitchA.prefab.meta create mode 100644 Assets/Prefabs/Units/WitchB.prefab create mode 100644 Assets/Prefabs/Units/WitchB.prefab.meta rename Assets/{Import/CharacterModels/minecraft-creeper/textures.meta => Scripts/Singletons.meta} (77%) rename Assets/{Import/CharacterModels/minecraft-creeper/source/creeper.glb.meta => Scripts/Singletons/Abstract.meta} (67%) create mode 100644 Assets/Scripts/Singletons/Abstract/MonoBehaviourSingleton.cs create mode 100644 Assets/Scripts/Singletons/Abstract/MonoBehaviourSingleton.cs.meta create mode 100644 Assets/Scripts/Singletons/Abstract/MonoBehaviourSingletonPersistent.cs create mode 100644 Assets/Scripts/Singletons/Abstract/MonoBehaviourSingletonPersistent.cs.meta create mode 100644 Assets/Scripts/Singletons/CoroutineManager.cs create mode 100644 Assets/Scripts/Singletons/CoroutineManager.cs.meta delete mode 100644 Assets/Scripts/UnitScripts/Attacks/ArrowHandler.cs create mode 100644 Assets/Scripts/UnitScripts/Attacks/CreeperBomb.cs create mode 100644 Assets/Scripts/UnitScripts/Attacks/CreeperBomb.cs.meta create mode 100644 Assets/Scripts/UnitScripts/Attacks/Projectiles.meta create mode 100644 Assets/Scripts/UnitScripts/Attacks/Projectiles/Arrow.cs create mode 100644 Assets/Scripts/UnitScripts/Attacks/Projectiles/Arrow.cs.meta rename Assets/Scripts/UnitScripts/Attacks/{AttackSkeleton.cs => Projectiles/AttackProjectile.cs} (81%) rename Assets/Scripts/UnitScripts/Attacks/{AttackSkeleton.cs.meta => Projectiles/AttackProjectile.cs.meta} (100%) create mode 100644 Assets/Scripts/UnitScripts/Attacks/Projectiles/HealthPotion.cs create mode 100644 Assets/Scripts/UnitScripts/Attacks/Projectiles/HealthPotion.cs.meta create mode 100644 Assets/Scripts/UnitScripts/Attacks/Projectiles/ProjectileHandler.cs rename Assets/Scripts/UnitScripts/Attacks/{ArrowHandler.cs.meta => Projectiles/ProjectileHandler.cs.meta} (100%) diff --git a/Assets/Import/CharacterModels/minecraft-creeper.meta b/Assets/Import/CharacterModels/Creeper.meta similarity index 77% rename from Assets/Import/CharacterModels/minecraft-creeper.meta rename to Assets/Import/CharacterModels/Creeper.meta index 98e0468..b14c800 100644 --- a/Assets/Import/CharacterModels/minecraft-creeper.meta +++ b/Assets/Import/CharacterModels/Creeper.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d26c5b8833747a306b11d8da615a0e01 +guid: 6a2b4a8aa1c5593e6b21d5a99c2f9149 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Import/CharacterModels/Creeper/CreeperAnimator.controller b/Assets/Import/CharacterModels/Creeper/CreeperAnimator.controller new file mode 100644 index 0000000..03d5671 --- /dev/null +++ b/Assets/Import/CharacterModels/Creeper/CreeperAnimator.controller @@ -0,0 +1,95 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CreeperAnimator + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 2129174433115283639} + 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 &1195150866194163689 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: walk + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 3719071572971705791} + 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: -4832708865683171987, guid: e35f9fb101caf8738948e4f2ca3991ac, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &2129174433115283639 +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: 1195150866194163689} + m_Position: {x: 30, y: 190, 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: 1195150866194163689} +--- !u!1101 &3719071572971705791 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1195150866194163689} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.5 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/Import/CharacterModels/Creeper/CreeperAnimator.controller.meta b/Assets/Import/CharacterModels/Creeper/CreeperAnimator.controller.meta new file mode 100644 index 0000000..d098aa2 --- /dev/null +++ b/Assets/Import/CharacterModels/Creeper/CreeperAnimator.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bbd1efa4244ab94009ad0a72ac791c8a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Import/CharacterModels/Creeper/exploding.mat b/Assets/Import/CharacterModels/Creeper/exploding.mat new file mode 100644 index 0000000..975b2dc --- /dev/null +++ b/Assets/Import/CharacterModels/Creeper/exploding.mat @@ -0,0 +1,86 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: exploding + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 0.6603774, g: 0.64480245, b: 0.64480245, a: 0.53333336} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Import/CharacterModels/Creeper/exploding.mat.meta b/Assets/Import/CharacterModels/Creeper/exploding.mat.meta new file mode 100644 index 0000000..a145aca --- /dev/null +++ b/Assets/Import/CharacterModels/Creeper/exploding.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b5a492f18cb1949a5bcd39f94d2921f4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Import/CharacterModels/Creeper/material_0_blue.mat b/Assets/Import/CharacterModels/Creeper/material_0_blue.mat new file mode 100644 index 0000000..b597f89 --- /dev/null +++ b/Assets/Import/CharacterModels/Creeper/material_0_blue.mat @@ -0,0 +1,73 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: material_0_blue + m_Shader: {fileID: 4800000, guid: 99fa998bbbed3408aafa652b466d261d, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 1 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - baseColorTexture: + m_Texture: {fileID: -5390149515647955136, guid: e35f9fb101caf8738948e4f2ca3991ac, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - emissiveTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - metallicRoughnessTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - normalTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - occlusionTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _CullMode: 0 + - _DstBlend: 0 + - _Mode: 0 + - _SrcBlend: 1 + - _ZWrite: 1 + - alphaCutoff: 0.5 + - baseColorTexture_texCoord: 0 + - emissiveTexture_texCoord: 0 + - metallicFactor: 0 + - metallicRoughnessTexture_texCoord: 0 + - normalTexture_scale: 1 + - normalTexture_texCoord: 0 + - occlusionTexture_strength: 1 + - occlusionTexture_texCoord: 0 + - roughnessFactor: 1 + m_Colors: + - baseColorFactor: {r: 0.4906105, g: 0.59998006, b: 0.990566, a: 1} + - baseColorTexture_Rotation: {r: 0, g: 0, b: 0, a: 0} + - emissiveFactor: {r: 0, g: 0, b: 0, a: 1} + - emissiveTexture_Rotation: {r: 0, g: 0, b: 0, a: 0} + - metallicRoughnessTexture_Rotation: {r: 0, g: 0, b: 0, a: 0} + - normalTexture_Rotation: {r: 0, g: 0, b: 0, a: 0} + - occlusionTexture_Rotation: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Import/CharacterModels/Creeper/material_0_blue.mat.meta b/Assets/Import/CharacterModels/Creeper/material_0_blue.mat.meta new file mode 100644 index 0000000..ababb7e --- /dev/null +++ b/Assets/Import/CharacterModels/Creeper/material_0_blue.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 42186be0607798848b8c08f4890b0da5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Import/CharacterModels/Creeper/material_0_red.mat b/Assets/Import/CharacterModels/Creeper/material_0_red.mat new file mode 100644 index 0000000..7bbff5d --- /dev/null +++ b/Assets/Import/CharacterModels/Creeper/material_0_red.mat @@ -0,0 +1,73 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: material_0_red + m_Shader: {fileID: 4800000, guid: 99fa998bbbed3408aafa652b466d261d, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 1 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - baseColorTexture: + m_Texture: {fileID: -5390149515647955136, guid: e35f9fb101caf8738948e4f2ca3991ac, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - emissiveTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - metallicRoughnessTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - normalTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - occlusionTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _CullMode: 0 + - _DstBlend: 0 + - _Mode: 0 + - _SrcBlend: 1 + - _ZWrite: 1 + - alphaCutoff: 0.5 + - baseColorTexture_texCoord: 0 + - emissiveTexture_texCoord: 0 + - metallicFactor: 0 + - metallicRoughnessTexture_texCoord: 0 + - normalTexture_scale: 1 + - normalTexture_texCoord: 0 + - occlusionTexture_strength: 1 + - occlusionTexture_texCoord: 0 + - roughnessFactor: 1 + m_Colors: + - baseColorFactor: {r: 0.9811321, g: 0.45817015, b: 0.45817015, a: 1} + - baseColorTexture_Rotation: {r: 0, g: 0, b: 0, a: 0} + - emissiveFactor: {r: 0, g: 0, b: 0, a: 1} + - emissiveTexture_Rotation: {r: 0, g: 0, b: 0, a: 0} + - metallicRoughnessTexture_Rotation: {r: 0, g: 0, b: 0, a: 0} + - normalTexture_Rotation: {r: 0, g: 0, b: 0, a: 0} + - occlusionTexture_Rotation: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Import/CharacterModels/Creeper/material_0_red.mat.meta b/Assets/Import/CharacterModels/Creeper/material_0_red.mat.meta new file mode 100644 index 0000000..5a87e77 --- /dev/null +++ b/Assets/Import/CharacterModels/Creeper/material_0_red.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d9b351246e1b647dba58993596ae5e8d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Import/CharacterModels/Creeper/minecraft_creeper.glb b/Assets/Import/CharacterModels/Creeper/minecraft_creeper.glb new file mode 100644 index 0000000000000000000000000000000000000000..aab01120bb30bc321f03021f4cee484478ce8b4f GIT binary patch literal 17616 zcmeG?2UJv7(`$nl|%;JNu1G}B zD>U25D~r`4uh7&!uPr>|wi}eckZ26!bzrb~RT2dZe>HQ41yhE2TUY9PXDi0#wp+XH zEg64zo;kvHquHKmn3~)cd4@U3YCC^h<+(%im!9XhtYLp8&jPmA%Oa7=wrQqTW|Zs> zCmO<~^^)>;C%R*+**}?RE~nku_ZJe)=CC?a)o3q5nbz#I#3oG5Xdn|4{aw3YtCgG0 z(|-N@yE84|cc9Au(JB3w8vHAn77DdqI-93-t3)@?=|7Wd4yJv)|L#Z?rPr(Lv(H^Y-JoW>9cY z;lLuu6ADEv7LU)z$b%WmrbvKsxNMe?FA!lO5t~gS@XSOA&&v5v}Jhno4k}<#FIsp2HUM z=`)54r30S_EH01BgD-x16>-=Ymm}f|xI(Bf5v#>S(OOKPg%~XBt;I0#fHbF&tJ<>#32P$+w08@^Ale8)NxxeN z=0F=EQF}rVU70uxV#SOWhlVhXsK5}x4U&aNlJ{3ZGL=*jE+=DX%A7RO(H3r0jF|FB z6~V+qait`{!}m)F=n}A!y}mCBSTBi7c&R@02RCM-e@#C#P}sH-R`2!+9HFp(<)Mw9%?(UREFz&jf0P|70} zzDPy;_BejVVK6~Lm80RiN9wB(`>TvWwKQC+FqUw+{v4i^>xT&>T+B}(^7Zrg6-Xsw zu0SY}hy|cs6{HG9$~D6J)`T$Zip&71OsWv8@Ikv$qcp~NCOn=A3xuPj3MI^B5NAUh z1e)(riJBwY_`)RU)6rsn6kx_;>=}qK3Hnq3;j4 zVnlFNDT2_d0fnfY9X2YIx7guuc`ya&c8IG0x*>En{OgtkpoMM+jxq1h`wo}eDB_`g zL0gC4p%}keY~doT_N_ES`)#3khi0}2#ju5HA*(rmuxUsYLE=y!mXAcNlv>L}xSGeAMpG&&dxVsqJW>)Wb%mPp zW16ZIky6bNDLx-GA;Kk!ucaz+D9mFQd1OGK41QxkONYi|H&{+06;POHb@h|N&j>7- zHesa9c(E@&+28{u0l6I}RR)r7lL2*-1WSEYge^r-SP)u32oJ?7D0xYw3N_=Hj!rIL zTTWt{!j96J`0d|YpLl+8k2iPsDkNx)Y z^MaWMwMZ1XZ(vZUpF)a$WW%5Xd{zXZpW-kR5u3{v^4M_rWb?ReSpI0A|2WPy0jfZN z@dZ3S{5l1Hes__TrMBJYvIQ?4#vU9h3={-ukhaj+h?O#DA>aB36tE$`?$gh zM(P5NIieK-tp+sTxkdsbI4VQ2LntxyT}_U}2P1yrqw%888nV|)?icHWwN}P&#ehx} zarhdDFAAhAxdQTAOADK&?WAHqA2d_xUkd2=TJ$?9Bpw9@U)N~fA>V1`)EqooWHbS7 zj|M>|RihtdTRB4n11;zHlH77AqSiyfP;HYuq0#`B51MnW$3hq*e&PVU^>{G+Zsc8c zL$8q51A>bsq#r=@&3emW;eHWUC&aLt&naYv+ExI@Z80v)2S0$)zUJ_s&fhmM{PXzF z4osVIVLn805#xfDsb#t_UYmRgT8xYBBYJ1Ph~TzK7%JdDU4bnVMvSsW8A86;K0?}z zg8jJFxQJfboM6++800xV7~1+<79wewUMQ_c#%{G#cXV#iDzW{6fn)Tw0(R4uBV)r- z1HmP)35cBp4us=_LgB!}G=-ZoI3K_VP)kCzLLBZ22O|zk06Q6Kxsfeg8Cn+cbxDaZ zLMdssdBMjQPly?{gTb-`j;M%3AR(ijLZt??)u;PvQdr>cRUl2|pom z0RQ>}G59w=L@oWluOEH&IEKEyIiog*fT&%YNVE~uuO<86kp0lc`=O1)s{p?MzFY#< zLR+6fv=Mx$12}3UJ!Bi_M|wa`7xn1_AJPF3wUJ)b#_fY%+&`oj`f)qZkL;j+hFZk1 zP>*A%-;Bi}Y8SsD+6bcYp#It-0-`peqc(!YiNFi51%rU7&0v_~Z3Gb?f=G^PBYxDz zVKJ%y4XGd6xPE9Oi1Z@+NH2n@P1!{d`HRNINE}N*XxBOsZ3GcN>Mu4YAZjBzY9olo zjpC?QlMvb{&ZvzbE(Z|TL$(n=t_ML2Qa|{I?4UNTAKJKnqzCB84i1qW$}Yfv{r@-q zczyoq`hhvH4C)B#nxUrfg9Kg-ZHkWLhz>8#Psf1|(dj%ISvo)PwJS@}0c!Lh9A3H} zjed%Lkme7`uNe#UX=EvWIuG=>7z@Qi(lxeFY{*Bg4PHcXgMKY=#I2QHx@|4=(ry1I zZKxq`72q3!8XUzC+9($k9mf$JUYwtf122^e1T{EG*YHDIg99IqBOZ#5aG)=1ZI@1m zevNMkhqps|Kvx?d+R=&ofau^0^=O3`QQRP_1&+A2(o6S43%zvP|4ADt7scdD;S6Xa z96hLy!V#UK(Q(A1d1yFA$04bQ!YMtdt%estypL2w(J4N6pm!6hvLE8t@tTh6c5saWGOmb4@IZzK{%2{{1lGE z4(Oq5Aw86AdphwxWQ$%K+Tj0V^+UxF<%`0p*y03|j`yK>!i(~b$DG8GETYqS@CHez z`0@U6ZDlDsT@S)F52**|qtS~=I?_+^Q@EPqqaYF{ampXWL*b|!J;gwyWN}=ZnxXUj z57v)*90ZPx!Jo#}DEj21h8z?&;}n?zbaXDoAHY*-I6=Sft3u_|qj=VcxobfwSX;J|7N3SI~VX z+S#}Ow18K?2fDbFJZ-A3uBX^ik9O#^(?3zG`Ur zy{_@;<9jdeK6rNf_RCv$p4T@#ZK!{K?cSsNzdfnD@$A~oCwFc&-mJf0ck|(`YmGHE zPcB`1c&+wv^^FIYuiv|H=|RoKd(~ABE6)CQ^4zV{7i!P{dh_Jz%N14UtIBGAEv-G8 z|6*1CizOvj3XY#I{q@|5buSkkxVAg{*^nfJ6s7g((iAlK#-q9G%2uUSC9OD}ysTnLYE}Hw z^3)|2@rf7Z$yHH{PR&a#Ph5U{;rfHwiD$!?m82(^$3$HSm{T5+P!Sn-I&9Ig*((cI z%sCO0dR!J)9z3rkC7~=Ls?sm5FfH+fEaaSbbXi17(Y%NXNlaPL;)0Zj3NOX40ke+D zlMY8D9El7$?LPlN%JSVSqe}xN=cXhaOpH4$i}*zne9|+%a8}a3q>wWAq}$W z&XL7obAOm0cR=A);TU*)ddM+PMNy!lSgigb-uD-`S$krX`<2tn9D<9y{SSMn_6CO? zkT{oHdX+fG?uedp!p6JAUR>-Nxifs~Q3t;Q_uxG~?niC>_IP*|IC~uYTAe+2@?jg* zCWUNUi2c#AQ+}Q>ZI7dKp}9>7*MEzzd_!2|`f$%(_A|Fnb^U3)<6bL=ePjIdW(MU- zee!37Wd%*x%lFHkF)iOknl&>ZGsru4iv13A@9gQW8z)W8ah$r|&2z20WTn_?y^~|k z1eYxPDXUx@*4bKbFtb}X&VIG6WBLS(EP-`~neCGCrWyS4Qme6E0+Z>6Oz%&bPJ_P~ z{YCG7y~4I0-o;?__-vw$rCZF!Zil*iq<8Pks7RDPSZ|?TmaJ=GlVbF7Ns@4u`b1GANBU1s)uHHVeIYSoIgrN<3# zFiO7kWcXL@k{BH5KE&MBuG=5c$5IxB)rGIsGn>-%HFNk@E8PLILk}K3Vl;8)4S2BI zWrwkUmY-Zw|X@_2S-EhUk>$P8U!KIr= z9R?d=j&2usD;-bpB#(w~O0tNszL#?_YP9TT3GYOHalJ$G z0B{X*{I{eA4fQ{SB(wJDV)^|QJfx5eC|aC$-E z?2|f+rqq}Q%8uynHR$1W^^+NyZadEg$Mx0WTpuG^QK*xZ!)(#m^RlEp(R1A6j(B#~8a( z2YvT}CFwDxUBgE*oFD1(>y^nPAAK>T-{vF7C)(Z{YLMQoS3>v5UV4*{Hkb~%9zJ8^ zB=4>>eQctKcGG(v)AQ2C-bHqM$F8|CUC-@oH(QS#sc%dQMkNLuf}c+#$LVeHjF}Ks zx%DR>3&E_TSCg}Pbvb2w)>rJ==Roz4Xw1K9-(CB_u|rZq?iK{x*jc}1Wo-h4krc~6;{E4%uR=uupuZ#cC0Kbsa zovIxZQ;!;%+i*-qZSM97L%G$nYu=7=g;OeW=5gvBhWUi8>tP($@r=1D8( zKFZ#HoO!7>n+h)VXtcU#y}}%qny`^XFg(?ggo>x@3t~x=s{fEnu2ZfXAKz4SJ*<4rkhK>3^6$s#k2sa^=`U!8Z*dNp>g07! z%;+|?sK#zW)|f#VmKXjQos;{E-z|gtcSSQNHROewJ6Ziww)kq($+OeUCOoN0Tis3f zw^!`d+$TTvkJX!Z=+V81coHyNj9x}Xq zGq|za#p)|jX>We{>G;jDJzox1gumGHYVYi;-^P2?I2;T3;ERT$iGhKVrxh>mc6UD? z5S-_i`)tA2Uk&!2^Lo04;OAQ5MVWv(=5)nZwJ#?Jm!C^>aO<-^$*N}kj~CvoJhXG| z5n)1M;>@(4E1er2409j3ctVd_`NGJW;@%Q$_}-c=ip?i>vj^93`_7$dQRm@laHb$= zRK6wCH`g)Mv77Bj2Yb%mHo4Pab!XL>u1Vj{8|wJg2M;%&-xu_8MtZHkrJq}7e~x_I z`n|b@*1871XA*7=aS9(}wqwh83zLleJAc#T%w3nhvDSC?_k9uX^ZZ1)Vd+Pc6>F~z z6h(adab&9ZZ|8OF*Vj9pr#?};K*ac zLg%}V8+8Bm>P`D^pBYmWICJUGl`l_UF+1^x^LBps*DoYlS8F#HEWVv4zOjE!M9vY; u%f`6j83&q5{iIKei|3SWdQu+zS|?=W28F-Ucnh4I853h*MDP^cokrWMv%p{5? zAu>gw%nJGUdyd0NZdYI3=l`GQ|K9F<_F8MNVehrpp5E=bHuieT%V98Br8W%K$qj?4 z>uPCwbDO!kS`oM#FCg71f_2`*-iuJ&dG zVi%0yBBBT}1X5fCKHmmaD>KVEm59Y;{!WC#7;+I~qHv-qP@pj4A|!0yti6>D|k_>b1V>--{dgM=x}BS@J>NfAMbh>KuEa3ToAekh~O z-K?#xT=ea%JV;}KgcDQT+>2nPWo=CyZ6MAh5+&#iN%U=6UBxoh2AP2x8j&jV_|_AJZm|k@&uC2pnk4Puhls-1;|7!$^RBQ8o>;Ko>C~|3(;# z{*zupAdm~%@>@x2PY4P4g2w%dqYx6^#?tL{$XnP6;Gj&@IUD( zklzau{I@)X#{9|o9IQ+W8uu%n5{ECG(SN$GiNnQbmqGF}iIVuqS|bi$=(wM2M=T86 z&$T0d$he=a$>NBG`HueCIw_9$VdVc*J96Q?^K9cSh>35T_`tV(8i3o8MDAUIN=?w90__} zPGEy2jzEG5#RBi<2sU6yG}x`1c|s=(F>r#IJrqE@bfDG24mxsxy&`nB_=sWhMdk1T0uOP+C5^tNUi=MT%uTI7Q#NXPk%5P^f#T$pV?4l3MIE&WGfLV#s` z$sIv|7bh@M;6IM41#w#Xs6s3{d;E5w5KEsnW~Vx0u;#)vI|(i+RER}qhQ;RG|14I& zGDZBmv08NQ`2AS@!ld!z%0ybUz@UOYPLW31{4DuHti*8a#JJ!G7N6Z@#`=xgO!{DD+OWqk%v>hR~ zw5I>V3@~rw*P6cQaGoCt6l#$u@NH5Yi^aj=;t~=FCpapXSko(zWOQH6E zE$IKw41-$o3?l|*HQ17hqriC&9Ka>WK}Ul~gPkfIEshokM?%VcM>snX8oo-X8CwXXQz7a{*^{Z*DtBODk|ZhaWu( zPWkpuwr0D*?IE~i+%2cO3*6WcNeXTRytOr85`zObS>oNy?X7gdWr`)YB*Dea3Th{T zq>K@IAr9#mq?; zT;ibM7|?nM)0@R0lXgJC>@BH-or9Gg>5Bo8y4}gq1~i^@8AAGK0KP~;?gUq$vocOD zb`Ev~J9n}QVz)tZnGwK6k+~ZIqI+}i(b84ZQ`6EU_C-@mXSbXNxIz-))>AT2(9+UT zG=+n29KdzJjdtJ@325GY%!r+aK3@E)DbNbCDd2BPQ{bcByeY7_kkjKoHU->HHU%bp zN>d1MQ9N%8IyU{bG3by)wgw$yzB7mZ&K&6X@0$aw)touttnbW$Plyz~1AYH(bI?we zY!2E-Qkp}4mm|>T>w9ziLEbrn)P-)`Nuy)->fXc5{t(FI?*@*Yqm$e0r!~AAfdm78 z**Su-Y39|rWa7OXO@4iFQ9HtmdsDd1M0u)3z=t@K4%N^&Ftg16u6Mg4fHPohPaoc zm(unU^itaX7j1C*Ny9ifWngWIq!Pm0d`UP|a<KB%07p4oe=dZ7}+$#$XgkB*}vpbvV1o$uyw$p2(I1j9f*^guL9 zn1~Z==IIbhrjz;oDD;!-p*k|1$Olz`hfF8KL?ZMv%TL6ic7O-sCG(SEQq4S_%;z`D z3!{*QV2Dn9$R&h8bjti)3jBX4$4MO`{r+410OJOl=V885q!Qq5S|l7QWq}W&`XU)p z3E>bO!l4oxf6%((=Qmpd99nlE94d)&pd{*<#UXy89;lR^)epuAWCy~D`T12K~P80w?lypdT?)eY&K(dfNNDpOS7V0G85D)M*`B@TNNahBzOMoHnCF!MX#}f2X z+Wt3f{C6D9@9T(pRRH1%@&lIbuCJrF$i zP|(SGh%&SEh3)^D9-^G|>=*&^`%4cl#X&KkY!9_=HZ_w_Bp8^TPV z@I6*Dmc|TQ#5(WS39fi2Kc-O<{VuBas#^IwXYGy~=A)NJc>~8QPBP`bdi?&?x9XQu z4hf$>araQ)5_8`n!1rLLaIl|Cc!%#)bj;w%QYHR(C4nWMx<763B$C0<*N_KExglQCl{#b?jC#a52-d}&H< zrTzF7e@XG~>NLYgRAww!6E9eOJoieQp}bwnl}2cVMs-z5hTG-OLcMvdCCzNESl8Pd z5+BtL)i5`IxEK1y`aqUsRCVC^MkyCw1d^vUUs5Xvb1X^C=w7O1_>0!vuN*j(l3xwl zP22GHFdCk}bFtyk3F-@SLn*_hgP7Az$MuumwK`5=MhZ3t^WS(MkWLjYP?@oYb#sM- zrOmX>#^hwf$opX-j~JK7Mqp>^1zNSw<;GGMPfSdv)X}5HVy$lsK zHyxGcZTTj~C330FQU#%#WaIqdtJ0B<2d8vw4YqB!^zJ{L;7*_JD0PMF;D{rWYpC!& zu7pS3pUmzbS;_EDC(MI6Ds^i~#{(^D%QrofyPwsTvcEXaBr~vY`x|G*=mF~30Ea6Y zhc_7&6%UETz_h>Bo^ax|Bip!{W$hC$=wGC!U(RYQ`>L#mjuw(DO9x%-t}a$d+)m2C-SB& zEu(1>Po9FuDM){=6q7C z(xwPA*82#dGg)6H1!?-qTb3PSy6a+Gz+@CSJo5-2>a8%P{Gj1j>A+p;)zhYJ^iq55sq~U8)`OON&>EUVZZbs%cwKVSw-$kAL8S zNT1Etmjm-NzbW_FQ4J5-3~Bte+Go3wxo?oLWtaJTL6))`9S^7Bnpd?FI-fl~OEsOP zG|VMu7m@Ff_;hc_`x|L^=NymKj(9(}AfwNo@Akbiyb{;#Qsu*V{&97{gsIccJcWcA z>(Ri8RFg6HfuyT%ig!fGv}N_{G8E$8iC$ku`)bEc#Me;6}qQ#vi|heGz<& ztzd}m*RfX2?A+7kXelVICwf>v%%D6ny~9@bMNQbgA=I}cB`d8{x&|+dGKRGO<)pT) zyh+R^?N)>o^A5#_ISLi`6JBARK2amsbXb(GU!8d7+-+6Urtw0pdu`&AJ7XcLK89mq z5mjZGH(+)8As|33hoWjt+^K*QFD6t z2Tr6?^-!t2W~-EnR@T|L#s=Fx%@v$Io~V9Ip1g$SOOpfNvb@ekEBko#`d-q>7|b)C zDCtkJq)U;_^>49yFc^66HTJ86SfzV1O|OASW9Tlk_lo;zTvu=BHHq2Q{$h<3ixoyF zNLD@|tnBNPzK7Gy$2nehGP|g`Y&dCLtJAAIC4b6-F7TV6$q>gDjy2i`x9o~OkL#Xd z$t(@L&B$GTypG|3|IwXRwK|e7S`=UK-#${hCahJ=%=7TNvxz30#neNEANuE3%mV4!ScU}>A9(iup1WDrtiPLDLYhw&YSx2U{v~(19$CL zmW^%i^_EPR>QPZ;SdKJ#mH$|<)Z>o#xSdgrp{Uz~eY^sA3@2BZa?jK+o43u6tK?p%Neg*FUHy%u$^pw|qTgTYhzfaj}ZECw0 zbM-dC6(cJ=ZEx5_IK#saZbcFH2<5-tcr#IU?~9|{Dl6C52*rMQ8M5H9J%?uuR$E}a6dpp$P?^3fZf7KarWn*=YN8QwS!+irY zGYS-$1S~X-mtl;r#-*BanOrc8i}JM3usQC`@<7NvsU|0Bv;ryP!W?Mo6OtU4IH-Na ziC;wi7%Ttr*TnTyMRj{93|%M;)5(wec3t zv#z)M#KclB+-l@W>$_Lhp&%2vEd@Sv0;l(vxYH+%l_$&_CMNo4+WLkYMA!}dOj0Y- zoZjV5ZY#*;z^8=2y8X88y3?r$qvEN`n938#0vvxgta-Cf%k>+|#ewBEa;7%X< z21CuLNw)j&6_IjMR+ooI_B}9UFAV#1INa>kzH?VaJ9}C>@{mm%Q3R@t9HTsTET7Mw zV@E{A!dJu@t6|@pA>+(UYok0j zT}$G7U54fFh|aS;bW|;yu-=>gXbAtM_bsA@DI-<59G+DF=H*7C94>16kLT>KKI2bk z9Kl}RKlW5hwSw#R)8^+QUr#dK-LGn_KGbp5>9Z!{S>wJl=24y{6AUUxTTh+a9Wah% zeRBdsB^+Z^T814Qf`?49W@moXmH!6Iu*e;Ha-lAW?WSCB)UE0X3BGUJKi^;8F28@x z)-qA&Y-LYcl_H_`vvek9uexO}XJ?eHoJbj}8+rVUM^MO!-}0lfuC}hGWkS5!ATD|` zv+cuR)=oEO_1t*WxY*NuV`n}L)0gevgcUd$#1Xb3=#x*~Q5L(iSu>4tq1uuxDWV<5 zpX5@)sFejm%Rbz8?zI*~Dc4-8H947F5-zPEfBvbOoUPQ2bPmIq?2FSeWfL9Vh8K)W z1DNE}Tv07^OWH%~eg91A}&p!5cUn~smy`Rc1BIAdA6{N9j zf9}e+33<%ZPUJCSD(Ct~TstxOLIjt*Z8TB<-`y6`vRs~x0#~AbqpL}yNn|g(Kzyp@ZbpXz3GMD!z8k#y zamN+c&|T1a?dwJ#r5whJqV~pPP|0U?yYj=Dn0QaH$ELCdkNR@>%skF4J@let!sTA* zI@7=&&&ld{E{$HiiBq3J-&)A)YrnOmtD|vmK5clNrlY2q zR6R>PyTfPRghmT%r>uiARSasOn#~o381pIh{h((8;qB;c_YrmXy#sRXL)eoC;FWBXa{Pf$I-8=(2&pnTc3LCwLxXf zKts;T^Uf0L+BWKgxD%Z!oeg66clS~w6RsIgyyGF6NR18XKo(~BsPowJc@gc}q|$YV$c++0%M5tlr{|nNO#Hj|R5x zP`uzN(a!WKDxchtv~;gadoG<3?iENeJM~Pb#xWt^U83w^onY_HnVJ>lDoib}ySTd9ld!i3#q|x&k!;x!c{n=ZF1wtzMcbW+%n5h5UMYD|`?U0(qUS^O>+`*M z_8J8vah(Uz&HfC}AAC>}uN3cWAC^qR$Q-v}m@;p6AKOvzsDJdSsSHe|GPtFWTlgT= z_=+z7Mm>>D21RalD=$iJj@u-?I$0uCclT;)DIJ7I{n`QS&Ez$9hHvq7nf5oDKZyxE ziBO0d=hDm!F)mRw@jv)9z}#TNyb@ecz$Y;8Qv>`#vOc^N-63cgYp9NJ^1hi>Mv zs63FK@$u=}h=$iqr4g?Q7uB~i5m=F&&W`V*Gry@4lYcT)ErPUmrJ}y?f`4!)gZ)B9B`4 zPgc7i8|v>Fc*jjeT6jJE>i4ko$i;0Lw+IGtjM9PG@koN&!Kn+#SR2uI`W`Ev#i_5+ zJA|EV5WKQBe%f`b^UbccXHs``(+rj*Z9H_Yba05)^Q6g3y4F&MUgo6zgBlXMJD6ph zlgId1m@`FOE8dpxaoTA^-eAZMyz1UFX^%U7_DTiA*_6D_=h@2$6zuw|laZhG+F|{= z*IZGYJ>C1hY|#kDUPlV+KT>O#-J+Xx)%9-sP9MWlxTs;J6CKofacqba`j_J>!sB0` z8(ww1v?NhoM!@8p!RkP!F~#{H#b zczosi49;CiuUwwrr44M8{dQuRZ*UCO5N%;GgllkSe^6YWb?V)=;uJlsW3c|c@Qqz; za+dCbI0Vz@(H7_PE7X$XZywuzil!{mCSEzM|D0-Y@BPc|>!v%Z-SV?8ZB5_6D)czI zmS+;xDb4nkb#PnY%F>Gp#)=}N-G`SS55G5)hZN9Iz)vWmCKGC2-EeJUv%YnPQ-&~EpKUM`Hgnf=v&C^H;$;57QyS8RwYpjrd`Xh>TA=ke6Ai^ zZEI|T>B<$Nu2cwRkEv4dkQ!v*zp~k8_;qv9h1K*uXE$l-*KFJ;C8PbVN6a<5``sRQ z1Uh<`o~MXSb#2?;dsUldjveY3a27tQL2DX{`yBi=okQ)hrgawomKg3(qrKw>Xj>YY zZ5P+`DV`B}d?}@U{l$p0aSd07MbcL#i^P_t-@!f(iR%Le|OvK-&-+33S_VPM@ z+0H1|09Uzv{FJP}L8X6=X7H9Bws%G%(w;D<*1aEs3pz?#(ck2GvYwhY0HL-c>}*cb zUKM1CwrplP>+K}E2Tk%P$JZTJF%{YwC>-W$-YKCh6}y9OoFQQ1RPgi9`=0ZwA9gnz z-eIuu-f}lMBfhd^*B93h2`_q5SDDamZ;zh7WH2}{12<0y=oSHb*QaN)SCZESN5ccqzCV=oR6=y$N3^lcuT4IUzQe>U9R1p_2pqr zSbT+eU)r{A81_p^pyr)9{AC3fhCjSMKFVL< zBm#5S4_RfnT*^hi9KXIv$J^2OadtvX^ghkO>|3Xw_gQLG8=TpD!n5&(>P>58S@>96 zI7k<3>hb*XJxzBswxCbQo(=qX$D?vnjGF5!Evijjyr-WxaP@QUMMSgirt1_CX|r$P zn_5LnyE?Nielq$sALizcx2lDB%j&mrfoI|D;KT--*8 z#aB4SO?)C>PA`qo?;bF#?A>F@%E$(Z=d>Kl%q@hVSMR3qe_ zSSBwm==QS7e5-R#!MR7M_EHm-ru`U>&U`JsbI0n=`)W-^^P_44ib?C*@F5?eXsF^ycIC z;pFt_<@4m}?&jq1<>B+)-Spex@ZsR{*W>Tp;_cbn@7>z%*VgdR)auRE<RQhyU5tb%+<=A`HQ;YvYz&inE8jp*TkXnlDpft!PdRT z(8itci>>0LnDU0D=$EqHtd{eFk@SVR)w#pYzPQ%0k@9?)?1!@0r@YR*vevDW?t-e^ zprYWHn&ynT&bGGDv5fD0iSl!j>4Tf&h^*A6pxm3O)}V{)e~;;YlH`nx>vo^pl%v<4 zn%mwfQ0FJm)wVq;e~|hbAsw^p3|6$;(VCbj)voSrOTj? z+lH6Zl#JYcpv;<_(2tVVh=|>IhTd_P(2JzSpq$H=jn;vZ(u9!Ej)>NLkI#sX(0qT| zZ-mx%i_V3J&wr7~ik-fmf7Ec0#FK>2cy`%mg3ob%&~>7b6U$wYQJ7)!dP^-YHhk=P|rbK#87#zcU8(n zUc^daz*BXva971kWV=>swqI7oL}a#DUAs_NzD^ zU}u!FpOPobRp*u*NK1!EG zPLoGKn>Rz1J4KF0I+Zp?WkNk&H!fN!B3>CHPaGdF9}E%;ZK=Ys000OdNkl`0ve(PM7ku1;>P?%T*Z1{*oi}hJ^5vWcGL@THd+1JR z+C|Z|kipsWiEeY&KUrc&d@6c3T;#f7AXC;ntSTVn?wrZ_&rP_b6DiD~HU9c>KOsyC zlap9Iyqv}Mr?s|kkWdSS#Al2K=BxzUMLpZ_;2_oGI|SenD-gUqLsRUk0!F_pQ7Pe@54p!s6Ket&_Fb)?<7gtFQFO~b_f!8hG{O= z0cv+U50KfImVdS8#~-Ti;NGikYSkkqZkubq)5U~I_#pU&M8*n^H){2Cj+-{2k^6#= zd;-=>C3;^xW|;NLG>Q&(5J~BogE@&>4(=VJ?mUv-UB!VUE);f5-G4h&>D8%VJ%g-Bue^nH}lFy`eZ+yl00b}V9_?sENEUqZLb0%zI%gz{|S4WjawcQ zIQ$&XI|Z#8aXI89oy(#$9+(?90wPjJh{NUag=XHTJLg_EdOFm)2^ZZh*Xc7@`zIlO zTd!&Yv%1kq{c%E8Hw3LnSh9KNMS$Ra7Wun@kOJ|7IC1emOpkI~9}P_ zEd+Bj``{FPGbL%RZ~PaBlo&y=xY8mxkB7NIDK)Xd{IVL>{mtFc-AEG>**Y&w@Y5;V z!xQfoR)9C>WL#gKDCo%r_LVD>N&_#t*HtEkEvfj?@YnWkHsH978Uv| z{T|ySw#Y?Ss8q}Fyoii<`tarNW*|c$~`He^v6zO+mP`S{upB8HF6FwmtB zP3Tksu3CVhGudTEPIH}6Uy(w4vB>S>?>J}Xv{ldQnN+A0KGNq2kuMj2+vZ!02IOQ@ zqh|t;7l}hx2Lw4Uy98UN>mUCs90-~%Y(h$#RFpOCf4mSr9SJs`Y(vg98+^YXgR5i< zj>mB)yBbfk`n$tXeGA$yNFDmyRp{$2cYq{ zI(HvYr=cREnCbQs6gQ-G4nP`|O6^!Ae|=er8&^A|BlReC!g1D{(^&xbpgY9Xn1YmseuO92 zUN`WInOlwe{muj7TB>YarFp>x%37N?o0=PeQk5GkErN?M{0c~|SdV=6NEp<(M;LcV za1@tTye1&@!4Z37mN=}$dzO%RZ8dMH@D#2wOUx<7%HZVkWdAtfIqT!SV!=rYWCkS4 z^kK4NjMsVd$Kq5#iIG<^hj?p_tpp#z6!y!S5QkAC6~&b}11ZcgXTqR@25bY^R+$!?BrQY}uUSydIc? z>8Uz~%}fN70?%@KLB3N@H8D&mu%8-}7Fyv$wpz-HN@R)BzQh~9?iZN?Uq_IO|{?RL4fax0u#QuUW-xyYaQPW1gjskrE diff --git a/Assets/Import/CharacterModels/minecraft-creeper/textures/gltf_embedded_0.png.meta b/Assets/Import/CharacterModels/minecraft-creeper/textures/gltf_embedded_0.png.meta deleted file mode 100644 index baa48f3..0000000 --- a/Assets/Import/CharacterModels/minecraft-creeper/textures/gltf_embedded_0.png.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: 3856ac98df50e0ea8aa9527e30846c3e -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Import/CharacterModels/minecraft-witch/source/witch.fbx.meta b/Assets/Import/CharacterModels/minecraft-witch/source/witch.fbx.meta index 5e0053a..e1d8a4c 100644 --- a/Assets/Import/CharacterModels/minecraft-witch/source/witch.fbx.meta +++ b/Assets/Import/CharacterModels/minecraft-witch/source/witch.fbx.meta @@ -3,7 +3,12 @@ guid: 8353835cc6cd9482c845e260ebf262e7 ModelImporter: serializedVersion: 22200 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Witch + second: {fileID: 2100000, guid: 78e10ec583b543fc2b926cda247ddee1, type: 2} materials: materialImportMode: 2 materialName: 0 diff --git a/Assets/Import/CharacterModels/minecraft-creeper/source.meta b/Assets/Import/CharacterModels/minecraft-witch/source/witch_mat.meta similarity index 77% rename from Assets/Import/CharacterModels/minecraft-creeper/source.meta rename to Assets/Import/CharacterModels/minecraft-witch/source/witch_mat.meta index d4f24f9..ed669f8 100644 --- a/Assets/Import/CharacterModels/minecraft-creeper/source.meta +++ b/Assets/Import/CharacterModels/minecraft-witch/source/witch_mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 98d82463daac5ef068e642ac18aa9ffd +guid: 8228f13c041271a71bacbaa51d10a388 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Import/CharacterModels/minecraft-witch/source/witch_mat/Witch.mat b/Assets/Import/CharacterModels/minecraft-witch/source/witch_mat/Witch.mat new file mode 100644 index 0000000..beb078a --- /dev/null +++ b/Assets/Import/CharacterModels/minecraft-witch/source/witch_mat/Witch.mat @@ -0,0 +1,84 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Witch + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 1ab832529f02deea98618b14af59f238, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.14142135 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Import/CharacterModels/minecraft-witch/source/witch_mat/Witch.mat.meta b/Assets/Import/CharacterModels/minecraft-witch/source/witch_mat/Witch.mat.meta new file mode 100644 index 0000000..7d32611 --- /dev/null +++ b/Assets/Import/CharacterModels/minecraft-witch/source/witch_mat/Witch.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 78e10ec583b543fc2b926cda247ddee1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Import/CharacterModels/minecraft-witch/source/witch_mat/WitchBlue.mat b/Assets/Import/CharacterModels/minecraft-witch/source/witch_mat/WitchBlue.mat new file mode 100644 index 0000000..ced8fe0 --- /dev/null +++ b/Assets/Import/CharacterModels/minecraft-witch/source/witch_mat/WitchBlue.mat @@ -0,0 +1,84 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: WitchBlue + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 1ab832529f02deea98618b14af59f238, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.14142135 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.5613208, g: 0.61244106, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Import/CharacterModels/minecraft-witch/source/witch_mat/WitchBlue.mat.meta b/Assets/Import/CharacterModels/minecraft-witch/source/witch_mat/WitchBlue.mat.meta new file mode 100644 index 0000000..62bc189 --- /dev/null +++ b/Assets/Import/CharacterModels/minecraft-witch/source/witch_mat/WitchBlue.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: be35c56145277679e94486ba84431f60 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Import/CharacterModels/minecraft-witch/source/witch_mat/WitchRed.mat b/Assets/Import/CharacterModels/minecraft-witch/source/witch_mat/WitchRed.mat new file mode 100644 index 0000000..b5229b7 --- /dev/null +++ b/Assets/Import/CharacterModels/minecraft-witch/source/witch_mat/WitchRed.mat @@ -0,0 +1,84 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: WitchRed + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 1ab832529f02deea98618b14af59f238, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.14142135 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 0.48584908, b: 0.48584908, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Import/CharacterModels/minecraft-witch/source/witch_mat/WitchRed.mat.meta b/Assets/Import/CharacterModels/minecraft-witch/source/witch_mat/WitchRed.mat.meta new file mode 100644 index 0000000..68ba8d2 --- /dev/null +++ b/Assets/Import/CharacterModels/minecraft-witch/source/witch_mat/WitchRed.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a69c0be752a1368dab16ba8b0bf129ff +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Import/CharacterModels/minecraft-witch/textures/witch.png.meta b/Assets/Import/CharacterModels/minecraft-witch/textures/witch.png.meta index cba87ed..41f2cb3 100644 --- a/Assets/Import/CharacterModels/minecraft-witch/textures/witch.png.meta +++ b/Assets/Import/CharacterModels/minecraft-witch/textures/witch.png.meta @@ -34,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 0 diff --git a/Assets/Materials/Arrow.mat b/Assets/Materials/Arrow.mat new file mode 100644 index 0000000..ee7343c --- /dev/null +++ b/Assets/Materials/Arrow.mat @@ -0,0 +1,84 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Arrow + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.3018868, g: 0.28622285, b: 0.28622285, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Materials/Arrow.mat.meta b/Assets/Materials/Arrow.mat.meta new file mode 100644 index 0000000..8df675f --- /dev/null +++ b/Assets/Materials/Arrow.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 862810f643f0a77dd885b30b7a1aebe0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/HealthArea.mat b/Assets/Materials/HealthArea.mat new file mode 100644 index 0000000..b02abc2 --- /dev/null +++ b/Assets/Materials/HealthArea.mat @@ -0,0 +1,86 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HealthArea + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 0.3497488, g: 1, b: 0, a: 0.23529412} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Materials/HealthArea.mat.meta b/Assets/Materials/HealthArea.mat.meta new file mode 100644 index 0000000..c2973eb --- /dev/null +++ b/Assets/Materials/HealthArea.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 898e0f8c3e282f261b4a68fd8c357073 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/HealthPotion.mat b/Assets/Materials/HealthPotion.mat new file mode 100644 index 0000000..8350782 --- /dev/null +++ b/Assets/Materials/HealthPotion.mat @@ -0,0 +1,84 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HealthPotion + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.34974882, g: 1, b: 0, a: 0.2901961} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Materials/HealthPotion.mat.meta b/Assets/Materials/HealthPotion.mat.meta new file mode 100644 index 0000000..03ae5cf --- /dev/null +++ b/Assets/Materials/HealthPotion.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ecc92429cb1b1991587a1c61d1eb871e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Arrow.prefab b/Assets/Prefabs/Arrow.prefab index d8f8eb9..12f9b6b 100644 --- a/Assets/Prefabs/Arrow.prefab +++ b/Assets/Prefabs/Arrow.prefab @@ -10,7 +10,7 @@ GameObject: m_Component: - component: {fileID: 6654189472296898277} - component: {fileID: 4353031985084200663} - - component: {fileID: 7967582655809156462} + - component: {fileID: -9093672179699829495} m_Layer: 0 m_Name: Arrow m_TagString: Untagged @@ -62,7 +62,7 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 1 ---- !u!114 &7967582655809156462 +--- !u!114 &-9093672179699829495 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -71,11 +71,12 @@ MonoBehaviour: m_GameObject: {fileID: 173966350544600092} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9aa6ff4d0673f53389daff2a5ba3c45f, type: 3} + m_Script: {fileID: 11500000, guid: 36e1a3cc9e04b444cadcfe2b444d0abc, type: 3} m_Name: m_EditorClassIdentifier: + _lifeSpan: 8 baseDamage: 10 - baseKnockback: 2 + baseKnockback: 5 --- !u!1 &3333242642527957384 GameObject: m_ObjectHideFlags: 0 @@ -140,7 +141,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: f0a21bf5341b4050a84f342620182364, type: 2} + - {fileID: 2100000, guid: 862810f643f0a77dd885b30b7a1aebe0, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Prefabs/ExplodingMesh.prefab b/Assets/Prefabs/ExplodingMesh.prefab new file mode 100644 index 0000000..ba7e235 --- /dev/null +++ b/Assets/Prefabs/ExplodingMesh.prefab @@ -0,0 +1,88 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5893534402964530642 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2942567998136724134} + - component: {fileID: 6945311612960278308} + - component: {fileID: 3631373003543746904} + m_Layer: 6 + m_Name: ExplodingMesh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2942567998136724134 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5893534402964530642} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 10, y: 10, z: 10} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6945311612960278308 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5893534402964530642} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3631373003543746904 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5893534402964530642} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: b5a492f18cb1949a5bcd39f94d2921f4, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/Prefabs/ExplodingMesh.prefab.meta b/Assets/Prefabs/ExplodingMesh.prefab.meta new file mode 100644 index 0000000..bf5629a --- /dev/null +++ b/Assets/Prefabs/ExplodingMesh.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bd4497a05da01083e8a4c6a4fca1f5c3 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/HealthExplode.prefab b/Assets/Prefabs/HealthExplode.prefab new file mode 100644 index 0000000..ca55a27 --- /dev/null +++ b/Assets/Prefabs/HealthExplode.prefab @@ -0,0 +1,162 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &173966350544600092 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6654189472296898277} + - component: {fileID: 4353031985084200663} + - component: {fileID: 7967582655809156462} + m_Layer: 0 + m_Name: HealthExplode + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6654189472296898277 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 173966350544600092} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -13.979821, y: 2.4889863, z: 54.263966} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6738264529730973941} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &4353031985084200663 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 173966350544600092} + serializedVersion: 4 + m_Mass: 0.001 + m_Drag: 0 + m_AngularDrag: 0 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 1 +--- !u!114 &7967582655809156462 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 173966350544600092} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9aa6ff4d0673f53389daff2a5ba3c45f, type: 3} + m_Name: + m_EditorClassIdentifier: + _lifeSpan: 8 +--- !u!1 &3333242642527957384 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6738264529730973941} + - component: {fileID: 8854319934852735273} + - component: {fileID: 2527533752114903105} + m_Layer: 0 + m_Name: Mesh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6738264529730973941 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3333242642527957384} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 5, y: 5, z: 5} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 6654189472296898277} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!33 &8854319934852735273 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3333242642527957384} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &2527533752114903105 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3333242642527957384} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 898e0f8c3e282f261b4a68fd8c357073, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/Prefabs/HealthExplode.prefab.meta b/Assets/Prefabs/HealthExplode.prefab.meta new file mode 100644 index 0000000..eb96550 --- /dev/null +++ b/Assets/Prefabs/HealthExplode.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4a740d83829a3f11b83abbd4acadc611 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/HealthPotion.prefab b/Assets/Prefabs/HealthPotion.prefab new file mode 100644 index 0000000..bbd195b --- /dev/null +++ b/Assets/Prefabs/HealthPotion.prefab @@ -0,0 +1,274 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &173966350544600092 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6654189472296898277} + - component: {fileID: 4353031985084200663} + - component: {fileID: 6753958899723111721} + m_Layer: 0 + m_Name: HealthPotion + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6654189472296898277 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 173966350544600092} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -13.979821, y: 2.4889863, z: 54.263966} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 432845237996938895} + - {fileID: 1197509880751978979} + - {fileID: 6738264529730973941} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &4353031985084200663 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 173966350544600092} + serializedVersion: 4 + m_Mass: 0.001 + m_Drag: 0 + m_AngularDrag: 0 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 1 +--- !u!114 &6753958899723111721 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 173966350544600092} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fd66c851299240c02a3082ade5b6295d, type: 3} + m_Name: + m_EditorClassIdentifier: + _lifeSpan: 8 + healthAdd: 100 + healthPotionEffectArea: {fileID: 1079864639964228445} + explodeMesh: {fileID: 173966350544600092, guid: 4a740d83829a3f11b83abbd4acadc611, type: 3} + exploseMeshTime: 0 +--- !u!1 &3333242642527957384 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6738264529730973941} + - component: {fileID: 8854319934852735273} + - component: {fileID: 2527533752114903105} + m_Layer: 0 + m_Name: Mesh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6738264529730973941 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3333242642527957384} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 6654189472296898277} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!33 &8854319934852735273 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3333242642527957384} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &2527533752114903105 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3333242642527957384} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: ecc92429cb1b1991587a1c61d1eb871e, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &6094584401990915868 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 432845237996938895} + - component: {fileID: 1079864639964228445} + m_Layer: 0 + m_Name: Collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &432845237996938895 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6094584401990915868} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6654189472296898277} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!135 &1079864639964228445 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6094584401990915868} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &6821885135016987577 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1197509880751978979} + - component: {fileID: 7930232572283191225} + m_Layer: 0 + m_Name: HealArea + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1197509880751978979 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6821885135016987577} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6654189472296898277} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!135 &7930232572283191225 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6821885135016987577} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 5 + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/HealthPotion.prefab.meta b/Assets/Prefabs/HealthPotion.prefab.meta new file mode 100644 index 0000000..f4b24fa --- /dev/null +++ b/Assets/Prefabs/HealthPotion.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c7eca518d1c1db450b901d7d30f20d61 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Units/Base/BaseCreeper.prefab b/Assets/Prefabs/Units/Base/BaseCreeper.prefab new file mode 100644 index 0000000..8ed092f --- /dev/null +++ b/Assets/Prefabs/Units/Base/BaseCreeper.prefab @@ -0,0 +1,252 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &4997367774091724088 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2076979688870881298, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_Name + value: BaseCreeper + objectReference: {fileID: 0} + - target: {fileID: 2136414657818712025, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2136414657818712025, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: b5a492f18cb1949a5bcd39f94d2921f4, type: 2} + - target: {fileID: 2572766376840025726, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: k__BackingField + value: + objectReference: {fileID: 2903441093006095603} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3230378027333185902, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3230378027333185902, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3230378027333185902, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3230378027333185902, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalPosition.z + value: 0.006 + objectReference: {fileID: 0} + - target: {fileID: 6587310683195830629, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: speed + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7673576048613581623, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_Name + value: ExplodeCollider + objectReference: {fileID: 0} + - target: {fileID: 7673576048613581623, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 7841837150169133400, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + - {fileID: 1284886913308718791, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + - {fileID: 8908285060348773052, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + - {fileID: 2136414657818712025, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + - {fileID: 661999679205371441, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + - {fileID: 2074347425566192522, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + m_RemovedGameObjects: + - {fileID: 3380792937898646976, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + insertIndex: -1 + addedObject: {fileID: 171749599631841631} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2076979688870881298, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + insertIndex: -1 + addedObject: {fileID: 2903441093006095603} + - targetCorrespondingSourceObject: {fileID: 7673576048613581623, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + insertIndex: -1 + addedObject: {fileID: 2434062731827021779} + m_SourcePrefab: {fileID: 100100000, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} +--- !u!1 &3396896377173059087 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7673576048613581623, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + m_PrefabInstance: {fileID: 4997367774091724088} + m_PrefabAsset: {fileID: 0} +--- !u!135 &2434062731827021779 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3396896377173059087} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 64 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &6451650036930538794 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2076979688870881298, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + m_PrefabInstance: {fileID: 4997367774091724088} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2903441093006095603 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6451650036930538794} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a3898c60f9d89bde4973aa3d701f6282, type: 3} + m_Name: + m_EditorClassIdentifier: + damage: 50 + cooldown: 2 + attackShape: {fileID: 2434062731827021779} + knockbackHorizontalForce: 10 + knockbackVerticalForce: 20 + explodeMesh: {fileID: 5893534402964530642, guid: bd4497a05da01083e8a4c6a4fca1f5c3, type: 3} + exploseMeshTime: 1 +--- !u!4 &8048907530080174963 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + m_PrefabInstance: {fileID: 4997367774091724088} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &8726567053284045201 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8048907530080174963} + m_Modifications: + - target: {fileID: -5644133064174452605, guid: e35f9fb101caf8738948e4f2ca3991ac, type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 9100000, guid: bbd1efa4244ab94009ad0a72ac791c8a, type: 2} + - target: {fileID: 8128668236925612103, guid: e35f9fb101caf8738948e4f2ca3991ac, type: 3} + propertyPath: m_Name + value: minecraft_creeper + objectReference: {fileID: 0} + - target: {fileID: 8897093224900880590, guid: e35f9fb101caf8738948e4f2ca3991ac, type: 3} + propertyPath: m_LocalScale.x + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 8897093224900880590, guid: e35f9fb101caf8738948e4f2ca3991ac, type: 3} + propertyPath: m_LocalScale.y + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 8897093224900880590, guid: e35f9fb101caf8738948e4f2ca3991ac, type: 3} + propertyPath: m_LocalScale.z + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 8897093224900880590, guid: e35f9fb101caf8738948e4f2ca3991ac, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8897093224900880590, guid: e35f9fb101caf8738948e4f2ca3991ac, type: 3} + propertyPath: m_LocalPosition.y + value: -0.96 + objectReference: {fileID: 0} + - target: {fileID: 8897093224900880590, guid: e35f9fb101caf8738948e4f2ca3991ac, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8897093224900880590, guid: e35f9fb101caf8738948e4f2ca3991ac, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8897093224900880590, guid: e35f9fb101caf8738948e4f2ca3991ac, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8897093224900880590, guid: e35f9fb101caf8738948e4f2ca3991ac, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8897093224900880590, guid: e35f9fb101caf8738948e4f2ca3991ac, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8897093224900880590, guid: e35f9fb101caf8738948e4f2ca3991ac, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8897093224900880590, guid: e35f9fb101caf8738948e4f2ca3991ac, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8897093224900880590, guid: e35f9fb101caf8738948e4f2ca3991ac, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8897093224900880590, guid: e35f9fb101caf8738948e4f2ca3991ac, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: -5645937942226959685, guid: e35f9fb101caf8738948e4f2ca3991ac, type: 3} +--- !u!4 &171749599631841631 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8897093224900880590, guid: e35f9fb101caf8738948e4f2ca3991ac, type: 3} + m_PrefabInstance: {fileID: 8726567053284045201} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Units/Base/BaseCreeper.prefab.meta b/Assets/Prefabs/Units/Base/BaseCreeper.prefab.meta new file mode 100644 index 0000000..7e6cad2 --- /dev/null +++ b/Assets/Prefabs/Units/Base/BaseCreeper.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5ac3b95074dc92b639931d28dc159a17 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Units/Base/BaseGolem.prefab b/Assets/Prefabs/Units/Base/BaseGolem.prefab index 7aeae58..994bf72 100644 --- a/Assets/Prefabs/Units/Base/BaseGolem.prefab +++ b/Assets/Prefabs/Units/Base/BaseGolem.prefab @@ -20,6 +20,18 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 2074347425566192522, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_Size.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2074347425566192522, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_Size.y + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 2074347425566192522, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_Size.z + value: 4 + objectReference: {fileID: 0} - target: {fileID: 2076979688870881298, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} propertyPath: m_Name value: BaseGolem @@ -74,19 +86,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3230378027333185902, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} propertyPath: m_LocalScale.x - value: 1.8190169 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3230378027333185902, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} propertyPath: m_LocalScale.y - value: 1.7602 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3230378027333185902, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} propertyPath: m_LocalScale.z - value: 1.4614067 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3230378027333185902, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} propertyPath: m_LocalPosition.z - value: 1.839 + value: 2.17 + objectReference: {fileID: 0} + - target: {fileID: 3230378027333185902, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 0 objectReference: {fileID: 0} - target: {fileID: 3280843376750909586, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} propertyPath: m_Mass @@ -112,6 +128,10 @@ PrefabInstance: propertyPath: m_AgentTypeID value: -1372625422 objectReference: {fileID: 0} + - target: {fileID: 6587310683195830629, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: speed + value: 2 + objectReference: {fileID: 0} - target: {fileID: 6587310683195830629, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} propertyPath: knockbackTime value: 0.5 @@ -130,7 +150,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8908285060348773052, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} propertyPath: knockbackVerticalForce - value: 12 + value: 15 objectReference: {fileID: 0} - target: {fileID: 8908285060348773052, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} propertyPath: knockbackHorizontalForce diff --git a/Assets/Prefabs/Units/Base/BaseWitch.prefab b/Assets/Prefabs/Units/Base/BaseWitch.prefab new file mode 100644 index 0000000..b648436 --- /dev/null +++ b/Assets/Prefabs/Units/Base/BaseWitch.prefab @@ -0,0 +1,227 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7628416681007129150 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5966639341884708145} + m_Layer: 0 + m_Name: spawnPos + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5966639341884708145 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7628416681007129150} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1.462, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3402840626423002699} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &418853211557359616 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1854268353119403178, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: distanceGoal + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2076979688870881298, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_Name + value: BaseWitch + objectReference: {fileID: 0} + - target: {fileID: 2572766376840025726, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: k__BackingField + value: + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6587310683195830629, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: followEnemy + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7841837150169133400, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 8908285060348773052, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + m_RemovedGameObjects: + - {fileID: 3380792937898646976, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + - {fileID: 7673576048613581623, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + insertIndex: -1 + addedObject: {fileID: 3125975091896958817} + - targetCorrespondingSourceObject: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + insertIndex: -1 + addedObject: {fileID: 5966639341884708145} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2076979688870881298, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + insertIndex: -1 + addedObject: {fileID: 6630021836861456616} + m_SourcePrefab: {fileID: 100100000, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} +--- !u!1 &1802278516447893522 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2076979688870881298, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + m_PrefabInstance: {fileID: 418853211557359616} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6630021836861456616 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1802278516447893522} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6fa6d262ce5ee0761b28bd18f6bcd247, type: 3} + m_Name: + m_EditorClassIdentifier: + damage: 0 + cooldown: 1 + attackShape: {fileID: 0} + knockbackHorizontalForce: 0 + knockbackVerticalForce: 0 + arrowPrefab: {fileID: 173966350544600092, guid: c7eca518d1c1db450b901d7d30f20d61, type: 3} + arrowBaseSpeed: 10 + spawnPos: {fileID: 5966639341884708145} + directShot: 1 +--- !u!4 &3402840626423002699 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3092074377783379531, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} + m_PrefabInstance: {fileID: 418853211557359616} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &3236690334159329418 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3402840626423002699} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 8353835cc6cd9482c845e260ebf262e7, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8353835cc6cd9482c845e260ebf262e7, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8353835cc6cd9482c845e260ebf262e7, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8353835cc6cd9482c845e260ebf262e7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8353835cc6cd9482c845e260ebf262e7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8353835cc6cd9482c845e260ebf262e7, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8353835cc6cd9482c845e260ebf262e7, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8353835cc6cd9482c845e260ebf262e7, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8353835cc6cd9482c845e260ebf262e7, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8353835cc6cd9482c845e260ebf262e7, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8353835cc6cd9482c845e260ebf262e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8353835cc6cd9482c845e260ebf262e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8353835cc6cd9482c845e260ebf262e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8353835cc6cd9482c845e260ebf262e7, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 8353835cc6cd9482c845e260ebf262e7, type: 3} + propertyPath: m_Name + value: witch + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8353835cc6cd9482c845e260ebf262e7, type: 3} +--- !u!4 &3125975091896958817 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 8353835cc6cd9482c845e260ebf262e7, type: 3} + m_PrefabInstance: {fileID: 3236690334159329418} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Units/Base/BaseWitch.prefab.meta b/Assets/Prefabs/Units/Base/BaseWitch.prefab.meta new file mode 100644 index 0000000..3ed9037 --- /dev/null +++ b/Assets/Prefabs/Units/Base/BaseWitch.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 60d0116586de851dfbb6e860ae759928 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Units/Base/BaseZombie.prefab b/Assets/Prefabs/Units/Base/BaseZombie.prefab index f3fc5ba..1fcc823 100644 --- a/Assets/Prefabs/Units/Base/BaseZombie.prefab +++ b/Assets/Prefabs/Units/Base/BaseZombie.prefab @@ -66,11 +66,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3230378027333185902, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} propertyPath: m_LocalScale.z - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3230378027333185902, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} propertyPath: m_LocalPosition.z - value: 0.732 + value: 1.085 objectReference: {fileID: 0} - target: {fileID: 3230378027333185902, guid: 8094e6afe32f290e6987d6a2fc43119d, type: 3} propertyPath: m_ConstrainProportionsScale diff --git a/Assets/Prefabs/Units/CreeperA.prefab b/Assets/Prefabs/Units/CreeperA.prefab new file mode 100644 index 0000000..f48b803 --- /dev/null +++ b/Assets/Prefabs/Units/CreeperA.prefab @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &6050764890821510002 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1318589604395179501, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: d9b351246e1b647dba58993596ae5e8d, type: 2} + - target: {fileID: 1984856242092951621, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: d9b351246e1b647dba58993596ae5e8d, type: 2} + - target: {fileID: 5847636543502427332, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: d9b351246e1b647dba58993596ae5e8d, type: 2} + - target: {fileID: 6451650036930538794, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: m_Name + value: CreeperA + objectReference: {fileID: 0} + - target: {fileID: 6798516945552372515, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: d9b351246e1b647dba58993596ae5e8d, type: 2} + - target: {fileID: 7053451073923277243, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: d9b351246e1b647dba58993596ae5e8d, type: 2} + - target: {fileID: 8048907530080174963, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8048907530080174963, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8048907530080174963, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8048907530080174963, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8048907530080174963, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8048907530080174963, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8048907530080174963, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8048907530080174963, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8048907530080174963, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8048907530080174963, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8230031708082125702, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: d9b351246e1b647dba58993596ae5e8d, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} diff --git a/Assets/Prefabs/Units/CreeperA.prefab.meta b/Assets/Prefabs/Units/CreeperA.prefab.meta new file mode 100644 index 0000000..b9c150c --- /dev/null +++ b/Assets/Prefabs/Units/CreeperA.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 182c67000c2a4e4febf413073594256d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Units/CreeperB.prefab b/Assets/Prefabs/Units/CreeperB.prefab new file mode 100644 index 0000000..4e77b51 --- /dev/null +++ b/Assets/Prefabs/Units/CreeperB.prefab @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7149034439124031156 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1318589604395179501, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 42186be0607798848b8c08f4890b0da5, type: 2} + - target: {fileID: 1984856242092951621, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 42186be0607798848b8c08f4890b0da5, type: 2} + - target: {fileID: 5847636543502427332, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 42186be0607798848b8c08f4890b0da5, type: 2} + - target: {fileID: 6451650036930538794, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: m_Name + value: CreeperB + objectReference: {fileID: 0} + - target: {fileID: 6798516945552372515, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 42186be0607798848b8c08f4890b0da5, type: 2} + - target: {fileID: 7053451073923277243, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 42186be0607798848b8c08f4890b0da5, type: 2} + - target: {fileID: 7417000739205452614, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: k__BackingField + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7417000739205452614, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: k__BackingField + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8048907530080174963, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8048907530080174963, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8048907530080174963, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8048907530080174963, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8048907530080174963, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8048907530080174963, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8048907530080174963, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8048907530080174963, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8048907530080174963, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8048907530080174963, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8230031708082125702, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 42186be0607798848b8c08f4890b0da5, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5ac3b95074dc92b639931d28dc159a17, type: 3} diff --git a/Assets/Prefabs/Units/CreeperB.prefab.meta b/Assets/Prefabs/Units/CreeperB.prefab.meta new file mode 100644 index 0000000..f98ab9c --- /dev/null +++ b/Assets/Prefabs/Units/CreeperB.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e950a33412a848e75823bfe7dd4286ad +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Units/SkeletonA.prefab b/Assets/Prefabs/Units/SkeletonA.prefab index 9f8bfa2..6705001 100644 --- a/Assets/Prefabs/Units/SkeletonA.prefab +++ b/Assets/Prefabs/Units/SkeletonA.prefab @@ -14,7 +14,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 694975301204954681, guid: 31f097ed795257d8da1f9b48164def89, type: 3} propertyPath: directShot - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3646442495847485308, guid: 31f097ed795257d8da1f9b48164def89, type: 3} propertyPath: 'm_Materials.Array.data[0]' diff --git a/Assets/Prefabs/Units/SkeletonB.prefab b/Assets/Prefabs/Units/SkeletonB.prefab index 5b87877..257bc74 100644 --- a/Assets/Prefabs/Units/SkeletonB.prefab +++ b/Assets/Prefabs/Units/SkeletonB.prefab @@ -14,7 +14,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 694975301204954681, guid: 31f097ed795257d8da1f9b48164def89, type: 3} propertyPath: directShot - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3646442495847485308, guid: 31f097ed795257d8da1f9b48164def89, type: 3} propertyPath: 'm_Materials.Array.data[0]' diff --git a/Assets/Prefabs/Units/WitchA.prefab b/Assets/Prefabs/Units/WitchA.prefab new file mode 100644 index 0000000..dfe3be1 --- /dev/null +++ b/Assets/Prefabs/Units/WitchA.prefab @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &3776346381968483807 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1802278516447893522, guid: 60d0116586de851dfbb6e860ae759928, type: 3} + propertyPath: m_Name + value: WitchA + objectReference: {fileID: 0} + - target: {fileID: 3402840626423002699, guid: 60d0116586de851dfbb6e860ae759928, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3402840626423002699, guid: 60d0116586de851dfbb6e860ae759928, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3402840626423002699, guid: 60d0116586de851dfbb6e860ae759928, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3402840626423002699, guid: 60d0116586de851dfbb6e860ae759928, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3402840626423002699, guid: 60d0116586de851dfbb6e860ae759928, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3402840626423002699, guid: 60d0116586de851dfbb6e860ae759928, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3402840626423002699, guid: 60d0116586de851dfbb6e860ae759928, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3402840626423002699, guid: 60d0116586de851dfbb6e860ae759928, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3402840626423002699, guid: 60d0116586de851dfbb6e860ae759928, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3402840626423002699, guid: 60d0116586de851dfbb6e860ae759928, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4263392706973352974, guid: 60d0116586de851dfbb6e860ae759928, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: a69c0be752a1368dab16ba8b0bf129ff, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 60d0116586de851dfbb6e860ae759928, type: 3} diff --git a/Assets/Prefabs/Units/WitchA.prefab.meta b/Assets/Prefabs/Units/WitchA.prefab.meta new file mode 100644 index 0000000..c8e3f8a --- /dev/null +++ b/Assets/Prefabs/Units/WitchA.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 663f8d60a19c1f4f3bb99b0cc3735adc +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Units/WitchB.prefab b/Assets/Prefabs/Units/WitchB.prefab new file mode 100644 index 0000000..726978a --- /dev/null +++ b/Assets/Prefabs/Units/WitchB.prefab @@ -0,0 +1,67 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &5877710455184815368 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1802278516447893522, guid: 60d0116586de851dfbb6e860ae759928, type: 3} + propertyPath: m_Name + value: WitchB + objectReference: {fileID: 0} + - target: {fileID: 2766439037223183998, guid: 60d0116586de851dfbb6e860ae759928, type: 3} + propertyPath: k__BackingField + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3402840626423002699, guid: 60d0116586de851dfbb6e860ae759928, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3402840626423002699, guid: 60d0116586de851dfbb6e860ae759928, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3402840626423002699, guid: 60d0116586de851dfbb6e860ae759928, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3402840626423002699, guid: 60d0116586de851dfbb6e860ae759928, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3402840626423002699, guid: 60d0116586de851dfbb6e860ae759928, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3402840626423002699, guid: 60d0116586de851dfbb6e860ae759928, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3402840626423002699, guid: 60d0116586de851dfbb6e860ae759928, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3402840626423002699, guid: 60d0116586de851dfbb6e860ae759928, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3402840626423002699, guid: 60d0116586de851dfbb6e860ae759928, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3402840626423002699, guid: 60d0116586de851dfbb6e860ae759928, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4263392706973352974, guid: 60d0116586de851dfbb6e860ae759928, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: be35c56145277679e94486ba84431f60, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 60d0116586de851dfbb6e860ae759928, type: 3} diff --git a/Assets/Prefabs/Units/WitchB.prefab.meta b/Assets/Prefabs/Units/WitchB.prefab.meta new file mode 100644 index 0000000..db5ef4b --- /dev/null +++ b/Assets/Prefabs/Units/WitchB.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9afbe58abb2af8bb6b4ba51160a048a0 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Clement 1.unity b/Assets/Scenes/Clement 1.unity index 5cb36e1..31b6c05 100644 --- a/Assets/Scenes/Clement 1.unity +++ b/Assets/Scenes/Clement 1.unity @@ -1724,6 +1724,63 @@ Transform: m_CorrespondingSourceObject: {fileID: 6208992634893184319, guid: e2eadb5c4fdf45ea995b4da7c9110275, type: 3} m_PrefabInstance: {fileID: 170264021} m_PrefabAsset: {fileID: 0} +--- !u!1001 &173176455 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 752240890012184152, guid: 182c67000c2a4e4febf413073594256d, type: 3} + propertyPath: m_Name + value: CreeperA + objectReference: {fileID: 0} + - target: {fileID: 4344799760632709121, guid: 182c67000c2a4e4febf413073594256d, type: 3} + propertyPath: m_LocalPosition.x + value: 23.3 + objectReference: {fileID: 0} + - target: {fileID: 4344799760632709121, guid: 182c67000c2a4e4febf413073594256d, type: 3} + propertyPath: m_LocalPosition.y + value: 3.29 + objectReference: {fileID: 0} + - target: {fileID: 4344799760632709121, guid: 182c67000c2a4e4febf413073594256d, type: 3} + propertyPath: m_LocalPosition.z + value: 76.39 + objectReference: {fileID: 0} + - target: {fileID: 4344799760632709121, guid: 182c67000c2a4e4febf413073594256d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4344799760632709121, guid: 182c67000c2a4e4febf413073594256d, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4344799760632709121, guid: 182c67000c2a4e4febf413073594256d, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4344799760632709121, guid: 182c67000c2a4e4febf413073594256d, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4344799760632709121, guid: 182c67000c2a4e4febf413073594256d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4344799760632709121, guid: 182c67000c2a4e4febf413073594256d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4344799760632709121, guid: 182c67000c2a4e4febf413073594256d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 182c67000c2a4e4febf413073594256d, type: 3} --- !u!1001 &174256985 PrefabInstance: m_ObjectHideFlags: 0 @@ -4706,6 +4763,63 @@ Transform: m_CorrespondingSourceObject: {fileID: 6208992634893184319, guid: e2eadb5c4fdf45ea995b4da7c9110275, type: 3} m_PrefabInstance: {fileID: 420811154} m_PrefabAsset: {fileID: 0} +--- !u!1001 &421842040 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1968379266368656276, guid: 663f8d60a19c1f4f3bb99b0cc3735adc, type: 3} + propertyPath: m_LocalPosition.x + value: 2.1703644 + objectReference: {fileID: 0} + - target: {fileID: 1968379266368656276, guid: 663f8d60a19c1f4f3bb99b0cc3735adc, type: 3} + propertyPath: m_LocalPosition.y + value: 3.1030817 + objectReference: {fileID: 0} + - target: {fileID: 1968379266368656276, guid: 663f8d60a19c1f4f3bb99b0cc3735adc, type: 3} + propertyPath: m_LocalPosition.z + value: 39.41173 + objectReference: {fileID: 0} + - target: {fileID: 1968379266368656276, guid: 663f8d60a19c1f4f3bb99b0cc3735adc, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1968379266368656276, guid: 663f8d60a19c1f4f3bb99b0cc3735adc, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1968379266368656276, guid: 663f8d60a19c1f4f3bb99b0cc3735adc, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1968379266368656276, guid: 663f8d60a19c1f4f3bb99b0cc3735adc, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1968379266368656276, guid: 663f8d60a19c1f4f3bb99b0cc3735adc, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1968379266368656276, guid: 663f8d60a19c1f4f3bb99b0cc3735adc, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1968379266368656276, guid: 663f8d60a19c1f4f3bb99b0cc3735adc, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3272636736284523981, guid: 663f8d60a19c1f4f3bb99b0cc3735adc, type: 3} + propertyPath: m_Name + value: WitchA + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 663f8d60a19c1f4f3bb99b0cc3735adc, type: 3} --- !u!1001 &424356162 PrefabInstance: m_ObjectHideFlags: 0 @@ -10764,7 +10878,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &985930955 Transform: m_ObjectHideFlags: 0 @@ -10774,7 +10888,7 @@ Transform: m_GameObject: {fileID: 985930954} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -44.14, y: 6.124237, z: 69.593155} + m_LocalPosition: {x: -7.6, y: 6.124237, z: 87.8} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -10969,6 +11083,63 @@ Transform: m_CorrespondingSourceObject: {fileID: 6208992634893184319, guid: e2eadb5c4fdf45ea995b4da7c9110275, type: 3} m_PrefabInstance: {fileID: 1040338045} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1044434481 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 902142904097625543, guid: e950a33412a848e75823bfe7dd4286ad, type: 3} + propertyPath: m_LocalPosition.x + value: -38.37 + objectReference: {fileID: 0} + - target: {fileID: 902142904097625543, guid: e950a33412a848e75823bfe7dd4286ad, type: 3} + propertyPath: m_LocalPosition.y + value: 3.2 + objectReference: {fileID: 0} + - target: {fileID: 902142904097625543, guid: e950a33412a848e75823bfe7dd4286ad, type: 3} + propertyPath: m_LocalPosition.z + value: 55.93 + objectReference: {fileID: 0} + - target: {fileID: 902142904097625543, guid: e950a33412a848e75823bfe7dd4286ad, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 902142904097625543, guid: e950a33412a848e75823bfe7dd4286ad, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 902142904097625543, guid: e950a33412a848e75823bfe7dd4286ad, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 902142904097625543, guid: e950a33412a848e75823bfe7dd4286ad, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 902142904097625543, guid: e950a33412a848e75823bfe7dd4286ad, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 902142904097625543, guid: e950a33412a848e75823bfe7dd4286ad, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 902142904097625543, guid: e950a33412a848e75823bfe7dd4286ad, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4233002631592999838, guid: e950a33412a848e75823bfe7dd4286ad, type: 3} + propertyPath: m_Name + value: CreeperB + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e950a33412a848e75823bfe7dd4286ad, type: 3} --- !u!1001 &1053243240 PrefabInstance: m_ObjectHideFlags: 0 @@ -17906,6 +18077,63 @@ Transform: m_CorrespondingSourceObject: {fileID: 8301512717716404702, guid: a0750dd4706e5480da2ad597b62d8531, type: 3} m_PrefabInstance: {fileID: 1640036854} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1647234709 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5229567879775661338, guid: 9afbe58abb2af8bb6b4ba51160a048a0, type: 3} + propertyPath: m_Name + value: WitchB + objectReference: {fileID: 0} + - target: {fileID: 9126688686003848003, guid: 9afbe58abb2af8bb6b4ba51160a048a0, type: 3} + propertyPath: m_LocalPosition.x + value: -61.831493 + objectReference: {fileID: 0} + - target: {fileID: 9126688686003848003, guid: 9afbe58abb2af8bb6b4ba51160a048a0, type: 3} + propertyPath: m_LocalPosition.y + value: 3.1030855 + objectReference: {fileID: 0} + - target: {fileID: 9126688686003848003, guid: 9afbe58abb2af8bb6b4ba51160a048a0, type: 3} + propertyPath: m_LocalPosition.z + value: 53.025593 + objectReference: {fileID: 0} + - target: {fileID: 9126688686003848003, guid: 9afbe58abb2af8bb6b4ba51160a048a0, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9126688686003848003, guid: 9afbe58abb2af8bb6b4ba51160a048a0, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9126688686003848003, guid: 9afbe58abb2af8bb6b4ba51160a048a0, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9126688686003848003, guid: 9afbe58abb2af8bb6b4ba51160a048a0, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9126688686003848003, guid: 9afbe58abb2af8bb6b4ba51160a048a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9126688686003848003, guid: 9afbe58abb2af8bb6b4ba51160a048a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9126688686003848003, guid: 9afbe58abb2af8bb6b4ba51160a048a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9afbe58abb2af8bb6b4ba51160a048a0, type: 3} --- !u!1001 &1650838053 PrefabInstance: m_ObjectHideFlags: 0 @@ -20291,7 +20519,7 @@ Transform: m_GameObject: {fileID: 1908715244} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.698484, z: -0, w: 0.71562576} - m_LocalPosition: {x: 5.3058853, y: -8.150209, z: 62.397087} + m_LocalPosition: {x: -35.23, y: -8.150209, z: 61.37} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -26484,3 +26712,7 @@ SceneRoots: - {fileID: 1405465991} - {fileID: 1908715245} - {fileID: 985930955} + - {fileID: 1044434481} + - {fileID: 173176455} + - {fileID: 1647234709} + - {fileID: 421842040} diff --git a/Assets/Import/CharacterModels/minecraft-creeper/textures.meta b/Assets/Scripts/Singletons.meta similarity index 77% rename from Assets/Import/CharacterModels/minecraft-creeper/textures.meta rename to Assets/Scripts/Singletons.meta index 8b31a10..becbf54 100644 --- a/Assets/Import/CharacterModels/minecraft-creeper/textures.meta +++ b/Assets/Scripts/Singletons.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b13a31075da353e8cb8012146691c246 +guid: 3efa04ec7ac1107c6beb66cfa064b1b7 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Import/CharacterModels/minecraft-creeper/source/creeper.glb.meta b/Assets/Scripts/Singletons/Abstract.meta similarity index 67% rename from Assets/Import/CharacterModels/minecraft-creeper/source/creeper.glb.meta rename to Assets/Scripts/Singletons/Abstract.meta index 76485aa..2188a9c 100644 --- a/Assets/Import/CharacterModels/minecraft-creeper/source/creeper.glb.meta +++ b/Assets/Scripts/Singletons/Abstract.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: 23a55fdf387546cd7904fd53f0940672 +guid: 378d95684615781798186de36dd1fd98 +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Scripts/Singletons/Abstract/MonoBehaviourSingleton.cs b/Assets/Scripts/Singletons/Abstract/MonoBehaviourSingleton.cs new file mode 100644 index 0000000..a93f5c2 --- /dev/null +++ b/Assets/Scripts/Singletons/Abstract/MonoBehaviourSingleton.cs @@ -0,0 +1,26 @@ +using UnityEngine; +using System.Collections; + +public class MonoBehaviourSingleton : MonoBehaviour + where T : Component +{ + private static T _instance; + public static T Instance { + get { + if (_instance == null) { + var objs = FindObjectsByType (FindObjectsSortMode.None) as T[]; + if (objs.Length > 0) + _instance = objs[0]; + if (objs.Length > 1) { + Debug.LogError ("There is more than one " + typeof(T).Name + " in the scene."); + } + if (_instance == null) { + GameObject obj = new GameObject (typeof(T).Name); + obj.hideFlags = HideFlags.HideAndDontSave; + _instance = obj.AddComponent (); + } + } + return _instance; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Singletons/Abstract/MonoBehaviourSingleton.cs.meta b/Assets/Scripts/Singletons/Abstract/MonoBehaviourSingleton.cs.meta new file mode 100644 index 0000000..23c0547 --- /dev/null +++ b/Assets/Scripts/Singletons/Abstract/MonoBehaviourSingleton.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 1dde3af729030b37d991e70070acee9b \ No newline at end of file diff --git a/Assets/Scripts/Singletons/Abstract/MonoBehaviourSingletonPersistent.cs b/Assets/Scripts/Singletons/Abstract/MonoBehaviourSingletonPersistent.cs new file mode 100644 index 0000000..44c1ce2 --- /dev/null +++ b/Assets/Scripts/Singletons/Abstract/MonoBehaviourSingletonPersistent.cs @@ -0,0 +1,18 @@ +using UnityEngine; + +public class MonoBehaviourSingletonPersistent : MonoBehaviour + where T : Component +{ + public static T Instance { get; private set; } + + public virtual void Awake () + { + if (Instance == null) { + Instance = this as T; + Instance.name = typeof(T).Name; + DontDestroyOnLoad (this); + } else { + Destroy (gameObject); + } + } +} diff --git a/Assets/Scripts/Singletons/Abstract/MonoBehaviourSingletonPersistent.cs.meta b/Assets/Scripts/Singletons/Abstract/MonoBehaviourSingletonPersistent.cs.meta new file mode 100644 index 0000000..b89d1f1 --- /dev/null +++ b/Assets/Scripts/Singletons/Abstract/MonoBehaviourSingletonPersistent.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: a1a48baa3d70ae8fca6a9e23eb62eb1d \ No newline at end of file diff --git a/Assets/Scripts/Singletons/CoroutineManager.cs b/Assets/Scripts/Singletons/CoroutineManager.cs new file mode 100644 index 0000000..245ecb5 --- /dev/null +++ b/Assets/Scripts/Singletons/CoroutineManager.cs @@ -0,0 +1,6 @@ +using System.Collections; +using UnityEngine; + +public class CoroutineManager : MonoBehaviourSingleton +{ +} diff --git a/Assets/Scripts/Singletons/CoroutineManager.cs.meta b/Assets/Scripts/Singletons/CoroutineManager.cs.meta new file mode 100644 index 0000000..9db152a --- /dev/null +++ b/Assets/Scripts/Singletons/CoroutineManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: e25f27d44ff1bea9fb02b1e5deeceed8 \ No newline at end of file diff --git a/Assets/Scripts/UnitScripts/AbstractUnit.cs b/Assets/Scripts/UnitScripts/AbstractUnit.cs index ceaa09d..83698d3 100644 --- a/Assets/Scripts/UnitScripts/AbstractUnit.cs +++ b/Assets/Scripts/UnitScripts/AbstractUnit.cs @@ -15,6 +15,7 @@ public abstract class AbstractUnit : MonoBehaviour [field: SerializeField] public bool IsQueen { get; private set; } public abstract void TakeDamage(float damage); + public abstract void Heal(float heal); void Awake() { diff --git a/Assets/Scripts/UnitScripts/Attacks/ArrowHandler.cs b/Assets/Scripts/UnitScripts/Attacks/ArrowHandler.cs deleted file mode 100644 index e6104b6..0000000 --- a/Assets/Scripts/UnitScripts/Attacks/ArrowHandler.cs +++ /dev/null @@ -1,54 +0,0 @@ -using Unity.VisualScripting; -using UnityEngine; - -/// -/// Should be attached to the Arrow, not the skeleton -/// -[RequireComponent(typeof(Rigidbody))] -public class ArrowHandler : MonoBehaviour -{ - [SerializeField] private float baseDamage; - [SerializeField] private float baseKnockback; - private Rigidbody _rigidBody; - private bool _fromTeamA; - - void Awake() - { - _rigidBody = GetComponent(); - } - - void Start() - { - // Destroy after 8s, in all case - Destroy(this.gameObject, 8.0f); - } - - void Update() - { - // Align with speed - if (_rigidBody.linearVelocity.magnitude >= 1f) transform.forward = _rigidBody.linearVelocity.normalized; - } - - public void LaunchArrow(Vector3 baseSpeed, bool fromTeamA) - { - _rigidBody.linearVelocity = baseSpeed; - _fromTeamA = fromTeamA; - } - - void OnCollisionEnter(Collision collision) - { - // Can be optimized with tags, but it add dependance beetween teams - if (collision.gameObject.TryGetComponent(out AbstractUnit unit)) - { - if (unit is MinecraftUnit && unit.IsTeamA != _fromTeamA) // No friendly fire - { - MinecraftUnit minecraftUnit = unit as MinecraftUnit; - Vector3 knockback = _rigidBody.linearVelocity * baseKnockback; - minecraftUnit.StartCoroutine(minecraftUnit.MovementHandler.TakeImpulse(knockback)); - } - unit.TakeDamage(baseDamage); - } - - Destroy(this.gameObject); - } -} diff --git a/Assets/Scripts/UnitScripts/Attacks/AttackHandler.cs b/Assets/Scripts/UnitScripts/Attacks/AttackHandler.cs index ad7c967..fd392be 100644 --- a/Assets/Scripts/UnitScripts/Attacks/AttackHandler.cs +++ b/Assets/Scripts/UnitScripts/Attacks/AttackHandler.cs @@ -22,8 +22,6 @@ public class AttackHandler : MonoBehaviour void Start() { - print("coldown"); - print(cooldown); InvokeRepeating(nameof(Attack), Random.Range(-cooldown*0.2f, cooldown*0.2f), cooldown); } @@ -34,8 +32,8 @@ public class AttackHandler : MonoBehaviour /// public virtual bool Attack() { - Collider[] targets = DetectTargets(); + bool hasHit = false; foreach (Collider target in targets) { if (!target.CompareTag("Unit")) continue; @@ -46,6 +44,7 @@ public class AttackHandler : MonoBehaviour if (targetUnit.IsTeamA == _minecraftUnit.IsTeamA) continue; targetUnit.TakeDamage(damage); + hasHit = true; Vector3 knockbackVector = knockbackHorizontalForce * (target.transform.position - transform.position).normalized + knockbackVerticalForce * Vector3.up; @@ -57,15 +56,15 @@ public class AttackHandler : MonoBehaviour minecraftTarget.StartCoroutine(minecraftTarget.MovementHandler.TakeImpulse(knockbackVector)); } - // Attack animation - if (_minecraftUnit.Animator) - { - _minecraftUnit.Animator.SetTrigger("Attack"); - } - } - return true; + // Attack animation + if (_minecraftUnit.Animator && hasHit) + { + _minecraftUnit.Animator.SetTrigger("Attack"); + } + + return hasHit; } private Collider[] DetectTargets() @@ -75,7 +74,7 @@ public class AttackHandler : MonoBehaviour switch (attackShape) { case SphereCollider sphere: - hitColliders = Physics.OverlapSphere(sphere.transform.position, sphere.radius, sphere.includeLayers); + hitColliders = Physics.OverlapSphere(transform.position, sphere.radius, sphere.includeLayers); break; case BoxCollider box: hitColliders = Physics.OverlapBox(box.bounds.center, box.bounds.extents, box.transform.rotation, box.includeLayers); diff --git a/Assets/Scripts/UnitScripts/Attacks/CreeperBomb.cs b/Assets/Scripts/UnitScripts/Attacks/CreeperBomb.cs new file mode 100644 index 0000000..3735b1a --- /dev/null +++ b/Assets/Scripts/UnitScripts/Attacks/CreeperBomb.cs @@ -0,0 +1,29 @@ +using System.Collections; +using UnityEngine; + +public class CreeperBomb : AttackHandler +{ + [SerializeField] private GameObject explodeMesh; + [SerializeField] private float exploseMeshTime = 0.5f; + + + public override bool Attack() + { + bool hasExploded = base.Attack(); + if (hasExploded) + { + _minecraftUnit.HealthHandler.Death(); + CoroutineManager.Instance.StartCoroutine(ExplodeVisual()); + Destroy(gameObject); + } + return hasExploded; + } + + private IEnumerator ExplodeVisual() + { + GameObject explosion = Instantiate(explodeMesh, transform.position, Quaternion.identity); + explosion.transform.parent = null; + yield return new WaitForSeconds(exploseMeshTime); + Destroy(explosion); + } +} diff --git a/Assets/Scripts/UnitScripts/Attacks/CreeperBomb.cs.meta b/Assets/Scripts/UnitScripts/Attacks/CreeperBomb.cs.meta new file mode 100644 index 0000000..78a0604 --- /dev/null +++ b/Assets/Scripts/UnitScripts/Attacks/CreeperBomb.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: a3898c60f9d89bde4973aa3d701f6282 \ No newline at end of file diff --git a/Assets/Scripts/UnitScripts/Attacks/Projectiles.meta b/Assets/Scripts/UnitScripts/Attacks/Projectiles.meta new file mode 100644 index 0000000..07ada5e --- /dev/null +++ b/Assets/Scripts/UnitScripts/Attacks/Projectiles.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 81db3118949a24b2d83ea142891913b3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UnitScripts/Attacks/Projectiles/Arrow.cs b/Assets/Scripts/UnitScripts/Attacks/Projectiles/Arrow.cs new file mode 100644 index 0000000..4418174 --- /dev/null +++ b/Assets/Scripts/UnitScripts/Attacks/Projectiles/Arrow.cs @@ -0,0 +1,24 @@ +using UnityEngine; + +public class Arrow : ProjectileHandler +{ + [SerializeField] private float baseDamage; + [SerializeField] private float baseKnockback; + + void OnCollisionEnter(Collision collision) + { + // Can be optimized with tags, but it add dependance beetween teams + if (collision.gameObject.TryGetComponent(out AbstractUnit unit)) + { + if (unit is MinecraftUnit && unit.IsTeamA != FromTeamA) // No friendly fire + { + MinecraftUnit minecraftUnit = unit as MinecraftUnit; + Vector3 knockback = RigidBody.linearVelocity * baseKnockback; + minecraftUnit.StartCoroutine(minecraftUnit.MovementHandler.TakeImpulse(knockback)); + } + unit.TakeDamage(baseDamage); + } + + Destroy(this.gameObject); + } +} diff --git a/Assets/Scripts/UnitScripts/Attacks/Projectiles/Arrow.cs.meta b/Assets/Scripts/UnitScripts/Attacks/Projectiles/Arrow.cs.meta new file mode 100644 index 0000000..5d3d513 --- /dev/null +++ b/Assets/Scripts/UnitScripts/Attacks/Projectiles/Arrow.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 36e1a3cc9e04b444cadcfe2b444d0abc \ No newline at end of file diff --git a/Assets/Scripts/UnitScripts/Attacks/AttackSkeleton.cs b/Assets/Scripts/UnitScripts/Attacks/Projectiles/AttackProjectile.cs similarity index 81% rename from Assets/Scripts/UnitScripts/Attacks/AttackSkeleton.cs rename to Assets/Scripts/UnitScripts/Attacks/Projectiles/AttackProjectile.cs index c4ee343..4b2e852 100644 --- a/Assets/Scripts/UnitScripts/Attacks/AttackSkeleton.cs +++ b/Assets/Scripts/UnitScripts/Attacks/Projectiles/AttackProjectile.cs @@ -1,6 +1,6 @@ using UnityEngine; -public class AttackSkeleton : AttackHandler +public class AttackProjectile : AttackHandler { [SerializeField] private GameObject arrowPrefab; [SerializeField] private float arrowBaseSpeed; @@ -18,7 +18,7 @@ public class AttackSkeleton : AttackHandler if (launchAngle < 0) return false; GameObject arrow = Instantiate(arrowPrefab, spawnPos.position, spawnPos.rotation); - ArrowHandler arrowHandler = arrow.GetComponent(); + ProjectileHandler projectileHandler = arrow.GetComponent(); // In target <-> launcher + transform.up basis Vector2 localLaunchVector = arrowBaseSpeed * new Vector2(Mathf.Cos(launchAngle), Mathf.Sin(launchAngle)); // Transform it in global basis @@ -26,7 +26,7 @@ public class AttackSkeleton : AttackHandler Vector3 diffVector = Vector3.ProjectOnPlane(targetUnit.transform.position - spawnPos.position, Vector3.up); Vector3 launchVectorNormalized = (localLaunchVector.x * diffVector.normalized + localLaunchVector.y * Vector3.up).normalized; - arrowHandler.LaunchArrow(launchVectorNormalized * arrowBaseSpeed, _minecraftUnit.IsTeamA); + projectileHandler.LaunchProjectile(launchVectorNormalized * arrowBaseSpeed, _minecraftUnit.IsTeamA); return true; } @@ -36,9 +36,10 @@ public class AttackSkeleton : AttackHandler // Source : https://en.wikipedia.org/wiki/Projectile_motion#Angle_%CE%B8_required_to_hit_coordinate_(x,_y) AbstractUnit targetUnit = _minecraftUnit.MovementHandler.TargetUnit; - Vector3 diffVector = Vector3.ProjectOnPlane(targetUnit.transform.position - spawnPos.position, Vector3.up); + Vector3 diffVector = targetUnit.transform.position - spawnPos.position; + Vector3 projectOnPlane = Vector3.ProjectOnPlane(diffVector, Vector3.up); - float x = Vector3.ProjectOnPlane(diffVector, Vector3.up).magnitude; + float x = Vector3.ProjectOnPlane(projectOnPlane, Vector3.up).magnitude; float y = diffVector.y; float g = Physics.gravity.magnitude; float v = arrowBaseSpeed; diff --git a/Assets/Scripts/UnitScripts/Attacks/AttackSkeleton.cs.meta b/Assets/Scripts/UnitScripts/Attacks/Projectiles/AttackProjectile.cs.meta similarity index 100% rename from Assets/Scripts/UnitScripts/Attacks/AttackSkeleton.cs.meta rename to Assets/Scripts/UnitScripts/Attacks/Projectiles/AttackProjectile.cs.meta diff --git a/Assets/Scripts/UnitScripts/Attacks/Projectiles/HealthPotion.cs b/Assets/Scripts/UnitScripts/Attacks/Projectiles/HealthPotion.cs new file mode 100644 index 0000000..aba5ea8 --- /dev/null +++ b/Assets/Scripts/UnitScripts/Attacks/Projectiles/HealthPotion.cs @@ -0,0 +1,38 @@ +using UnityEngine; +using System.Collections; + + +public class HealthPotion : ProjectileHandler +{ + [SerializeField] private float healthAdd; + [SerializeField] private SphereCollider healthPotionEffectArea; + [SerializeField] private GameObject explodeMesh; + [SerializeField] private float exploseMeshTime = 0.5f; + + void OnCollisionEnter(Collision collision) + { + Collider[] targets = Physics.OverlapSphere(transform.position, healthPotionEffectArea.radius, healthPotionEffectArea.includeLayers); + foreach (Collider target in targets) + { + if (!target.CompareTag("Unit")) continue; + // GetComponent is expensive in performance, optimize here if it's slow + AbstractUnit targetUnit = target.GetComponent(); + + // No EnemyHealing + if (targetUnit.IsTeamA != FromTeamA) continue; + + targetUnit.Heal(healthAdd); + + } + CoroutineManager.Instance.StartCoroutine(ExplodeVisual()); + Destroy(gameObject); + } + + private IEnumerator ExplodeVisual() + { + GameObject explosion = Instantiate(explodeMesh, transform.position, Quaternion.identity); + explosion.transform.parent = null; + yield return new WaitForSeconds(exploseMeshTime); + Destroy(explosion); + } +} diff --git a/Assets/Scripts/UnitScripts/Attacks/Projectiles/HealthPotion.cs.meta b/Assets/Scripts/UnitScripts/Attacks/Projectiles/HealthPotion.cs.meta new file mode 100644 index 0000000..6396c64 --- /dev/null +++ b/Assets/Scripts/UnitScripts/Attacks/Projectiles/HealthPotion.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: fd66c851299240c02a3082ade5b6295d \ No newline at end of file diff --git a/Assets/Scripts/UnitScripts/Attacks/Projectiles/ProjectileHandler.cs b/Assets/Scripts/UnitScripts/Attacks/Projectiles/ProjectileHandler.cs new file mode 100644 index 0000000..3388a7a --- /dev/null +++ b/Assets/Scripts/UnitScripts/Attacks/Projectiles/ProjectileHandler.cs @@ -0,0 +1,37 @@ +using Unity.VisualScripting; +using UnityEngine; + +/// +/// Should be attached to the Arrow, not the skeleton +/// +[RequireComponent(typeof(Rigidbody))] +public class ProjectileHandler : MonoBehaviour +{ + [SerializeField] protected float _lifeSpan = 8.0f; + protected Rigidbody RigidBody; + protected bool FromTeamA; + + void Awake() + { + RigidBody = GetComponent(); + } + + void Start() + { + // Destroy after _lifeSpan, in all case + Destroy(this.gameObject, _lifeSpan); + } + + void Update() + { + // Align with speed + if (RigidBody.linearVelocity.magnitude >= 1f) transform.forward = RigidBody.linearVelocity.normalized; + } + + public void LaunchProjectile(Vector3 baseSpeed, bool fromTeamA) + { + RigidBody.linearVelocity = baseSpeed; + FromTeamA = fromTeamA; + } + +} diff --git a/Assets/Scripts/UnitScripts/Attacks/ArrowHandler.cs.meta b/Assets/Scripts/UnitScripts/Attacks/Projectiles/ProjectileHandler.cs.meta similarity index 100% rename from Assets/Scripts/UnitScripts/Attacks/ArrowHandler.cs.meta rename to Assets/Scripts/UnitScripts/Attacks/Projectiles/ProjectileHandler.cs.meta diff --git a/Assets/Scripts/UnitScripts/HealthHandler.cs b/Assets/Scripts/UnitScripts/HealthHandler.cs index d2b9887..c24b6da 100644 --- a/Assets/Scripts/UnitScripts/HealthHandler.cs +++ b/Assets/Scripts/UnitScripts/HealthHandler.cs @@ -44,12 +44,12 @@ public class HealthHandler : MonoBehaviour armor -= armorBoost; } - public void Death() + public void Death(float delay = 0) { DeathSate deathState = _minecraftUnit.AbstractDeath(); if (deathState == DeathSate.QueenADead) print("TEAM B WIN GG"); if (deathState == DeathSate.QueenBDead) print("TEAM A WIN GG"); - Destroy(gameObject); + Destroy(gameObject, delay); } } diff --git a/Assets/Scripts/UnitScripts/MinecraftUnit.cs b/Assets/Scripts/UnitScripts/MinecraftUnit.cs index 044e1de..32d5453 100644 --- a/Assets/Scripts/UnitScripts/MinecraftUnit.cs +++ b/Assets/Scripts/UnitScripts/MinecraftUnit.cs @@ -29,4 +29,9 @@ public class MinecraftUnit : AbstractUnit { HealthHandler.TakeDamage(damage); } + + public override void Heal(float heal) + { + HealthHandler.Heal(heal); + } } diff --git a/Assets/Scripts/UnitScripts/MovementHandler.cs b/Assets/Scripts/UnitScripts/MovementHandler.cs index 8667c8e..04d4493 100644 --- a/Assets/Scripts/UnitScripts/MovementHandler.cs +++ b/Assets/Scripts/UnitScripts/MovementHandler.cs @@ -11,7 +11,7 @@ public class MovementHandler : MonoBehaviour { [SerializeField] public float speed; [SerializeField] private NavMeshAgent agent; - [SerializeField] private Transform defaultMoveTarget; + [SerializeField] private bool followEnemy = true; [SerializeField] private float knockbackTime = 1.2f; private float _noNavMeshDeadTime = 6.0f; @@ -59,26 +59,30 @@ public class MovementHandler : MonoBehaviour public void UpdateNearest() { - TargetUnit = FindNearestEnemy(); + TargetUnit = FindNearest(followEnemy); } public void MoveTowardsNearest() { MoveTowards(TargetUnit.transform.position); } - - AbstractUnit FindNearestEnemy() + + // If findEnemy, return closest ennemy else return closest ally + public AbstractUnit FindNearest(bool findEnemy) { - List enemies = _minecraftUnit.IsTeamA ? GlobalsVariable.AliveUnitsTeamB : GlobalsVariable.AliveUnitsTeamA; + // Funny funny double ternary operator. + List targets = findEnemy ? + _minecraftUnit.IsTeamA ? GlobalsVariable.AliveUnitsTeamB : GlobalsVariable.AliveUnitsTeamA + : _minecraftUnit.IsTeamA ? GlobalsVariable.AliveUnitsTeamA : GlobalsVariable.AliveUnitsTeamB; AbstractUnit closestUnit = null; float closestDistance = float.MaxValue; - foreach (AbstractUnit enemy in enemies) + foreach (AbstractUnit target in targets) { - float distanceToEnemy = (enemy.transform.position - transform.position).sqrMagnitude; - if (distanceToEnemy < closestDistance) + float distanceToEnemy = (target.transform.position - transform.position).sqrMagnitude; + if (distanceToEnemy < closestDistance && target != _minecraftUnit) { - closestUnit = enemy; + closestUnit = target; closestDistance = distanceToEnemy; } } diff --git a/Packages/manifest.json b/Packages/manifest.json index 308f019..f5ec180 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,6 +1,7 @@ { "dependencies": { "com.unity.ai.navigation": "2.0.5", + "com.unity.cloud.gltfast": "6.10.1", "com.unity.collab-proxy": "2.6.0", "com.unity.feature.development": "1.0.2", "com.unity.inputsystem": "1.11.2", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 0f13b4b..029d3cc 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -9,6 +9,29 @@ }, "url": "https://packages.unity.com" }, + "com.unity.burst": { + "version": "1.8.18", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.mathematics": "1.2.1", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.cloud.gltfast": { + "version": "6.10.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.burst": "1.8.4", + "com.unity.collections": "1.2.4", + "com.unity.mathematics": "1.2.6", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.collab-proxy": { "version": "2.6.0", "depth": 0, @@ -16,6 +39,18 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.collections": { + "version": "2.5.1", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.burst": "1.8.17", + "com.unity.test-framework": "1.4.5", + "com.unity.nuget.mono-cecil": "1.11.4", + "com.unity.test-framework.performance": "3.0.3" + }, + "url": "https://packages.unity.com" + }, "com.unity.editorcoroutines": { "version": "1.0.0", "depth": 1, @@ -70,6 +105,13 @@ }, "url": "https://packages.unity.com" }, + "com.unity.mathematics": { + "version": "1.3.2", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.multiplayer.center": { "version": "1.0.0", "depth": 0, @@ -78,6 +120,13 @@ "com.unity.modules.uielements": "1.0.0" } }, + "com.unity.nuget.mono-cecil": { + "version": "1.11.4", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.performance.profile-analyzer": { "version": "1.2.2", "depth": 1, @@ -103,6 +152,16 @@ }, "url": "https://packages.unity.com" }, + "com.unity.test-framework.performance": { + "version": "3.0.3", + "depth": 2, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.31", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.testtools.codecoverage": { "version": "1.2.6", "depth": 1,