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 0000000..aab0112 Binary files /dev/null and b/Assets/Import/CharacterModels/Creeper/minecraft_creeper.glb differ diff --git a/Assets/Import/CharacterModels/Creeper/minecraft_creeper.glb.meta b/Assets/Import/CharacterModels/Creeper/minecraft_creeper.glb.meta new file mode 100644 index 0000000..c820ef8 --- /dev/null +++ b/Assets/Import/CharacterModels/Creeper/minecraft_creeper.glb.meta @@ -0,0 +1,28 @@ +fileFormatVersion: 2 +guid: e35f9fb101caf8738948e4f2ca3991ac +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 715df9372183c47e389bb6e19fbc3b52, type: 3} + editorImportSettings: + generateSecondaryUVSet: 0 + importSettings: + nodeNameMethod: 1 + animationMethod: 2 + generateMipMaps: 1 + texturesReadable: 0 + defaultMinFilterMode: 9729 + defaultMagFilterMode: 9729 + anisotropicFilterLevel: 1 + instantiationSettings: + mask: -1 + layer: 0 + skinUpdateWhenOffscreen: 1 + lightIntensityFactor: 1 + sceneObjectCreation: 2 + assetDependencies: [] + reportItems: [] diff --git a/Assets/Import/CharacterModels/minecraft-creeper/source/creeper.glb b/Assets/Import/CharacterModels/minecraft-creeper/source/creeper.glb deleted file mode 100644 index cc50eb6..0000000 Binary files a/Assets/Import/CharacterModels/minecraft-creeper/source/creeper.glb and /dev/null differ diff --git a/Assets/Import/CharacterModels/minecraft-creeper/textures/gltf_embedded_0.png b/Assets/Import/CharacterModels/minecraft-creeper/textures/gltf_embedded_0.png deleted file mode 100644 index 297bbd2..0000000 Binary files a/Assets/Import/CharacterModels/minecraft-creeper/textures/gltf_embedded_0.png and /dev/null differ 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,