Added dummy enemies

2022-11-21 19:17:33 +01:00 · 2022-11-21 19:17:33 +01:00 · 07f79d74da
commit 07f79d74da
parent b051b05040
8 changed files with 9877 additions and 216 deletions
--- a/Assets/Resources/ThePlayer.prefab
+++ b/Assets/Resources/ThePlayer.prefab
@ -19,7 +19,7 @@ GameObject:
  - component: {fileID: 4869648843286970676}
  - component: {fileID: 4869648843286970678}
  - component: {fileID: 4869648843286970673}
-  m_Layer: 0
+  m_Layer: 8
  m_Name: ThePlayer
  m_TagString: Player
  m_Icon: {fileID: 0}
@ -116,16 +116,21 @@ MonoBehaviour:
  walkSpeed: 10
  Panel: {fileID: 0}
  dmgParticleSystem: {fileID: 4869648843387222763}
-  maxHealth: {fileID: 11400000, guid: 2cac7af95874b184aae736e0ed4994d7, type: 2}
-  currentHealth: 10
  healthBar: {fileID: 0}
  lvlUp: 0
  test: 0
+  currentHealth: 10
+  maxHealth: 0
+  healthPoints: 0
+  defensePoints: 0
+  strengthPoints: 0
+  intelligencePoints: 0
  exp: 0
  lvl: 0
  maxExp: 0
  levelBar: {fileID: 0}
  minPlayerExp: {fileID: 11400000, guid: e66e910aa7e03d342bda145946dad7bc, type: 2}
+  attackValue: 0
 --- !u!61 &4869648843286970702
 BoxCollider2D:
  m_ObjectHideFlags: 0
@ -278,7 +283,7 @@ GameObject:
  - component: {fileID: 4869648843387222761}
  - component: {fileID: 4869648843387222763}
  - component: {fileID: 4869648843387222760}
-  m_Layer: 0
+  m_Layer: 8
  m_Name: Particle System
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@ -5139,7 +5144,7 @@ GameObject:
  m_Component:
  - component: {fileID: 4869648843392866317}
  - component: {fileID: 4869648843392866316}
-  m_Layer: 0
+  m_Layer: 8
  m_Name: PickaxeDown
  m_TagString: PickaxeHitbox
  m_Icon: {fileID: 0}
@ -5219,7 +5224,7 @@ GameObject:
  m_Component:
  - component: {fileID: 4869648843792212564}
  - component: {fileID: 4869648843792212567}
-  m_Layer: 0
+  m_Layer: 8
  m_Name: HitboxFront
  m_TagString: AttackHitbox
  m_Icon: {fileID: 0}
@ -5281,7 +5286,7 @@ GameObject:
  m_Component:
  - component: {fileID: 4869648844298201121}
  - component: {fileID: 4869648844298201120}
-  m_Layer: 0
+  m_Layer: 8
  m_Name: HitboxBack
  m_TagString: AttackHitbox
  m_Icon: {fileID: 0}
@ -5343,7 +5348,7 @@ GameObject:
  m_Component:
  - component: {fileID: 4869648844605138518}
  - component: {fileID: 4869648844605138513}
-  m_Layer: 0
+  m_Layer: 8
  m_Name: HitboxLeft
  m_TagString: AttackHitbox
  m_Icon: {fileID: 0}
@ -5405,7 +5410,7 @@ GameObject:
  m_Component:
  - component: {fileID: 4869648844762232054}
  - component: {fileID: 4869648844762232049}
-  m_Layer: 0
+  m_Layer: 8
  m_Name: PickaxeRight
  m_TagString: PickaxeHitbox
  m_Icon: {fileID: 0}
@ -5480,7 +5485,7 @@ GameObject:
  m_Component:
  - component: {fileID: 4869648844801431961}
  - component: {fileID: 4869648844801431960}
-  m_Layer: 0
+  m_Layer: 8
  m_Name: HitboxRight
  m_TagString: AttackHitbox
  m_Icon: {fileID: 0}
@ -5542,7 +5547,7 @@ GameObject:
  m_Component:
  - component: {fileID: 4869648845035997474}
  - component: {fileID: 4869648845035997484}
-  m_Layer: 0
+  m_Layer: 8
  m_Name: Hitbox
  m_TagString: PlayerHitbox
  m_Icon: {fileID: 0}
@ -5589,7 +5594,7 @@ GameObject:
  m_Component:
  - component: {fileID: 4869648845042760662}
  - component: {fileID: 4869648845042760657}
-  m_Layer: 0
+  m_Layer: 8
  m_Name: PickaxeLeft
  m_TagString: PickaxeHitbox
  m_Icon: {fileID: 0}
@ -5664,7 +5669,7 @@ GameObject:
  m_Component:
  - component: {fileID: 4869648845194584457}
  - component: {fileID: 4869648845194584456}
-  m_Layer: 0
+  m_Layer: 8
  m_Name: PickaxeUp
  m_TagString: PickaxeHitbox
  m_Icon: {fileID: 0}
--- a/Assets/Scenes/FirstVillage.unity
+++ b/Assets/Scenes/FirstVillage.unity
@ -33243,7 +33243,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 316324888}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -9.03, y: -2.5, z: 0}
+  m_LocalPosition: {x: -7, y: -2.5, z: 0}
  m_LocalScale: {x: 1.975, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
@ -379743,6 +379743,8 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  slider: {fileID: 2062165080}
+  maxHealth: 0
+  health: 0
 --- !u!114 &2062165080
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/Assets/Scenes/InnVillage.unity
+++ b/Assets/Scenes/InnVillage.unity
--- a/Assets/Scenes/InnVillage.unity.meta
+++ b/Assets/Scenes/InnVillage.unity.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 9803284c8d1e9e1408a8090084742a25
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/OutsideWizardsHouse.unity
+++ b/Assets/Scenes/OutsideWizardsHouse.unity
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@ -38,4 +38,7 @@ EditorBuildSettings:
  - enabled: 1
    path: Assets/Scenes/NewGame - Confirmation.unity
    guid: 5a154444dad816d41b4e975d5866fd40
+  - enabled: 1
+    path: Assets/Scenes/FirstVillage.unity
+    guid: d09d8f73d205f2c4b84728e6fe6c2839
  m_configObjects: {}
--- a/ProjectSettings/Physics2DSettings.asset
+++ b/ProjectSettings/Physics2DSettings.asset
@ -1,56 +1,56 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!19 &1
-Physics2DSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 5
-  m_Gravity: {x: 0, y: -9.81}
-  m_DefaultMaterial: {fileID: 0}
-  m_VelocityIterations: 8
-  m_PositionIterations: 3
-  m_VelocityThreshold: 1
-  m_MaxLinearCorrection: 0.2
-  m_MaxAngularCorrection: 8
-  m_MaxTranslationSpeed: 100
-  m_MaxRotationSpeed: 360
-  m_BaumgarteScale: 0.2
-  m_BaumgarteTimeOfImpactScale: 0.75
-  m_TimeToSleep: 0.5
-  m_LinearSleepTolerance: 0.01
-  m_AngularSleepTolerance: 2
-  m_DefaultContactOffset: 0.01
-  m_JobOptions:
-    serializedVersion: 2
-    useMultithreading: 0
-    useConsistencySorting: 0
-    m_InterpolationPosesPerJob: 100
-    m_NewContactsPerJob: 30
-    m_CollideContactsPerJob: 100
-    m_ClearFlagsPerJob: 200
-    m_ClearBodyForcesPerJob: 200
-    m_SyncDiscreteFixturesPerJob: 50
-    m_SyncContinuousFixturesPerJob: 50
-    m_FindNearestContactsPerJob: 100
-    m_UpdateTriggerContactsPerJob: 100
-    m_IslandSolverCostThreshold: 100
-    m_IslandSolverBodyCostScale: 1
-    m_IslandSolverContactCostScale: 10
-    m_IslandSolverJointCostScale: 10
-    m_IslandSolverBodiesPerJob: 50
-    m_IslandSolverContactsPerJob: 50
-  m_SimulationMode: 0
-  m_QueriesHitTriggers: 1
-  m_QueriesStartInColliders: 1
-  m_CallbacksOnDisable: 1
-  m_ReuseCollisionCallbacks: 1
-  m_AutoSyncTransforms: 0
-  m_AlwaysShowColliders: 0
-  m_ShowColliderSleep: 1
-  m_ShowColliderContacts: 0
-  m_ShowColliderAABB: 0
-  m_ContactArrowScale: 0.2
-  m_ColliderAwakeColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.7529412}
-  m_ColliderAsleepColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.36078432}
-  m_ColliderContactColor: {r: 1, g: 0, b: 1, a: 0.6862745}
-  m_ColliderAABBColor: {r: 1, g: 1, b: 0, a: 0.2509804}
-  m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!19 &1
+Physics2DSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 5
+  m_Gravity: {x: 0, y: -9.81}
+  m_DefaultMaterial: {fileID: 0}
+  m_VelocityIterations: 8
+  m_PositionIterations: 3
+  m_VelocityThreshold: 1
+  m_MaxLinearCorrection: 0.2
+  m_MaxAngularCorrection: 8
+  m_MaxTranslationSpeed: 100
+  m_MaxRotationSpeed: 360
+  m_BaumgarteScale: 0.2
+  m_BaumgarteTimeOfImpactScale: 0.75
+  m_TimeToSleep: 0.5
+  m_LinearSleepTolerance: 0.01
+  m_AngularSleepTolerance: 2
+  m_DefaultContactOffset: 0.01
+  m_JobOptions:
+    serializedVersion: 2
+    useMultithreading: 0
+    useConsistencySorting: 0
+    m_InterpolationPosesPerJob: 100
+    m_NewContactsPerJob: 30
+    m_CollideContactsPerJob: 100
+    m_ClearFlagsPerJob: 200
+    m_ClearBodyForcesPerJob: 200
+    m_SyncDiscreteFixturesPerJob: 50
+    m_SyncContinuousFixturesPerJob: 50
+    m_FindNearestContactsPerJob: 100
+    m_UpdateTriggerContactsPerJob: 100
+    m_IslandSolverCostThreshold: 100
+    m_IslandSolverBodyCostScale: 1
+    m_IslandSolverContactCostScale: 10
+    m_IslandSolverJointCostScale: 10
+    m_IslandSolverBodiesPerJob: 50
+    m_IslandSolverContactsPerJob: 50
+  m_SimulationMode: 0
+  m_QueriesHitTriggers: 1
+  m_QueriesStartInColliders: 1
+  m_CallbacksOnDisable: 1
+  m_ReuseCollisionCallbacks: 1
+  m_AutoSyncTransforms: 0
+  m_AlwaysShowColliders: 0
+  m_ShowColliderSleep: 1
+  m_ShowColliderContacts: 0
+  m_ShowColliderAABB: 0
+  m_ContactArrowScale: 0.2
+  m_ColliderAwakeColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.7529412}
+  m_ColliderAsleepColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.36078432}
+  m_ColliderContactColor: {r: 1, g: 0, b: 1, a: 0.6862745}
+  m_ColliderAABBColor: {r: 1, g: 1, b: 0, a: 0.2509804}
+  m_LayerCollisionMatrix: fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffeffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@ -23,8 +23,8 @@ TagManager:
  - Water
  - UI
  - Settings
-  - 
-  - 
+  - Trees
+  - Player
  - 
  - 
  -