diff --git a/Assets/Materials/TestEnemy2Material.mat b/Assets/Materials/TestEnemy2Material.mat deleted file mode 100644 index 1e21e5d..0000000 --- a/Assets/Materials/TestEnemy2Material.mat +++ /dev/null @@ -1,137 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &-6105262053046164403 -MonoBehaviour: - m_ObjectHideFlags: 11 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion - version: 10 ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: TestEnemy2Material - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque - disabledShaderPasses: - - MOTIONVECTORS - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _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} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AddPrecomputedVelocity: 0 - - _AlphaClip: 0 - - _AlphaToMask: 0 - - _Blend: 0 - - _BlendModePreserveSpecular: 1 - - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _DstBlendAlpha: 0 - - _EnvironmentReflections: 1 - - _GlossMapScale: 0 - - _Glossiness: 0 - - _GlossyReflections: 0 - - _Metallic: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.005 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - - _Surface: 0 - - _WorkflowMode: 1 - - _XRMotionVectorsPass: 1 - - _ZWrite: 1 - m_Colors: - - _BaseColor: {r: 1, g: 0, b: 0, a: 1} - - _Color: {r: 1, g: 0, b: 0, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 diff --git a/Assets/Materials/TestEnemy2Material.mat.meta b/Assets/Materials/TestEnemy2Material.mat.meta deleted file mode 100644 index 190d10c..0000000 --- a/Assets/Materials/TestEnemy2Material.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7478f79bcd8d30b40a1a6ca230313b70 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefabs/Enemies/CactusPA.prefab b/Assets/Prefabs/Enemies/CactusPA.prefab index 30f228d..d01f375 100644 --- a/Assets/Prefabs/Enemies/CactusPA.prefab +++ b/Assets/Prefabs/Enemies/CactusPA.prefab @@ -582,10 +582,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::Enemy _pathService: {fileID: 0} - _health: 5 + _health: 4 _speed: 2 _damage: 1 - _killReward: 15 + _killReward: 20 _onHealthChanged: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Prefabs/Enemies/Monster_X_Black.prefab b/Assets/Prefabs/Enemies/Monster_X_Black.prefab index f1921d7..b77e318 100644 --- a/Assets/Prefabs/Enemies/Monster_X_Black.prefab +++ b/Assets/Prefabs/Enemies/Monster_X_Black.prefab @@ -1581,8 +1581,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::Enemy _pathService: {fileID: 0} - _health: 10 - _speed: 1 + _health: 30 + _speed: 0.5 _damage: 3 _killReward: 100 _onHealthChanged: diff --git a/Assets/Prefabs/Enemies/Mummy.prefab b/Assets/Prefabs/Enemies/Mummy.prefab index 55a323d..df072d7 100644 --- a/Assets/Prefabs/Enemies/Mummy.prefab +++ b/Assets/Prefabs/Enemies/Mummy.prefab @@ -8,6 +8,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 100068, guid: 4ee39bc25eeaa144891bd0eadcc1bc51, type: 3} + propertyPath: m_Name + value: Mummy + objectReference: {fileID: 0} - target: {fileID: 400068, guid: 4ee39bc25eeaa144891bd0eadcc1bc51, type: 3} propertyPath: m_RootOrder value: 0 @@ -104,10 +108,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::Enemy _pathService: {fileID: 0} - _health: 5 - _speed: 4 + _health: 6 + _speed: 1 _damage: 1 - _killReward: 50 + _killReward: 15 _onHealthChanged: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Prefabs/Enemies/MushroomAngryPA.prefab b/Assets/Prefabs/Enemies/MushroomAngryPA.prefab index 358909f..73ccdbe 100644 --- a/Assets/Prefabs/Enemies/MushroomAngryPA.prefab +++ b/Assets/Prefabs/Enemies/MushroomAngryPA.prefab @@ -296,8 +296,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::Enemy _pathService: {fileID: 0} - _health: 5 - _speed: 2 + _health: 3 + _speed: 3 _damage: 1 _killReward: 15 _onHealthChanged: diff --git a/Assets/Prefabs/Enemies/TestEnemy2.prefab b/Assets/Prefabs/Enemies/TestEnemy2.prefab deleted file mode 100644 index 0681d7a..0000000 --- a/Assets/Prefabs/Enemies/TestEnemy2.prefab +++ /dev/null @@ -1,173 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &251180753025569800 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8519928416567387296} - - component: {fileID: 5584936129478037181} - - component: {fileID: 4691593706010193046} - m_Layer: 0 - m_Name: TestEnemy2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8519928416567387296 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 251180753025569800} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.991, y: 0, z: -9.936} - m_LocalScale: {x: 0.5, y: 1, z: 0.5} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4358740754901839407} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &5584936129478037181 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 251180753025569800} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cc6b4f7ed5ed4fdbbcfc85d14e3e9ad9, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::Enemy - _pathService: {fileID: 0} - _health: 6 - _speed: 1.5 - _damage: 1 - _killReward: 20 - _onHealthChanged: - m_PersistentCalls: - m_Calls: [] - _onDeath: - m_PersistentCalls: - m_Calls: [] - _onDestroyed: - m_PersistentCalls: - m_Calls: [] ---- !u!65 &4691593706010193046 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 251180753025569800} - 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_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0.5, z: 0} ---- !u!1 &5518436262255732647 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4358740754901839407} - - component: {fileID: 2046865036349517523} - - component: {fileID: 3760699990058627144} - m_Layer: 0 - m_Name: Cube - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4358740754901839407 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5518436262255732647} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.5, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8519928416567387296} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &2046865036349517523 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5518436262255732647} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &3760699990058627144 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5518436262255732647} - 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_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 7478f79bcd8d30b40a1a6ca230313b70, 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_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_MaskInteraction: 0 - m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/Prefabs/Enemies/TestEnemy2.prefab.meta b/Assets/Prefabs/Enemies/TestEnemy2.prefab.meta deleted file mode 100644 index d39c63e..0000000 --- a/Assets/Prefabs/Enemies/TestEnemy2.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 51d15bcd7060d774c831ac3a7be8832b -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefabs/Enemies/goblin.prefab b/Assets/Prefabs/Enemies/goblin.prefab index c9e1bd0..e05f8df 100644 --- a/Assets/Prefabs/Enemies/goblin.prefab +++ b/Assets/Prefabs/Enemies/goblin.prefab @@ -175,7 +175,7 @@ MonoBehaviour: _health: 5 _speed: 1 _damage: 1 - _killReward: 10 + _killReward: 15 _onHealthChanged: m_PersistentCalls: m_Calls: []