reworked interactions, fixed health depleting from testing

2023-12-29 17:29:03 +01:00
parent 661aa6704b
commit f57389e8a4
42 changed files with 325 additions and 105 deletions
--- a/Assets/Prefabs/NPCIdle.prefab
+++ b/Assets/Prefabs/NPCIdle.prefab
@@ -166,6 +166,8 @@ MonoBehaviour:
  m_GameObject: {fileID: 4918528717594724652}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 87ac36bb4d63c7b4f901ce681578ca4b, type: 3}
+  m_Script: {fileID: 11500000, guid: 502dfdd16cfb094a89708a6d31f80af2, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  clip: {fileID: 0}
+  isEnemy: 1
--- a/Assets/Prefabs/Rock_1.prefab
+++ b/Assets/Prefabs/Rock_1.prefab
@@ -13,6 +13,7 @@ GameObject:
  - component: {fileID: 6365990307743021963}
  - component: {fileID: 6952935615892918535}
  - component: {fileID: 2329328608366088264}
+  - component: {fileID: 3373736657539295389}
  m_Layer: 0
  m_Name: Rock_1
  m_TagString: Object:Stone
@@ -134,3 +135,16 @@ Rigidbody:
  m_Interpolate: 0
  m_Constraints: 122
  m_CollisionDetection: 0
+--- !u!114 &3373736657539295389
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4852758362040146526}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4fc88a9ab15a9238baf100c2fd070aa7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  clip: {fileID: 7400000, guid: dfe6f42559279b9f2a43256075839781, type: 2}
--- a/Assets/Prefabs/Rock_2.prefab
+++ b/Assets/Prefabs/Rock_2.prefab
@@ -13,6 +13,7 @@ GameObject:
  - component: {fileID: 3216712892522360414}
  - component: {fileID: 1477549268999423186}
  - component: {fileID: 3850889906121968706}
+  - component: {fileID: 3470364473752288912}
  m_Layer: 0
  m_Name: Rock_2
  m_TagString: Object:Stone
@@ -134,3 +135,16 @@ Rigidbody:
  m_Interpolate: 0
  m_Constraints: 122
  m_CollisionDetection: 0
+--- !u!114 &3470364473752288912
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4009596908532748171}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4fc88a9ab15a9238baf100c2fd070aa7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  clip: {fileID: 7400000, guid: dfe6f42559279b9f2a43256075839781, type: 2}
--- a/Assets/Prefabs/SlimeBaseIdle.prefab
+++ b/Assets/Prefabs/SlimeBaseIdle.prefab
@@ -211,9 +211,10 @@ MonoBehaviour:
  m_GameObject: {fileID: 4972404453844040047}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cc3c1c0815bce34498b5dc8b199d0118, type: 3}
+  m_Script: {fileID: 11500000, guid: 2fe18bcd2d3d0d752ae519027875df8f, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  clip: {fileID: 0}
 --- !u!64 &-3685426353244344161
 MeshCollider:
  m_ObjectHideFlags: 0
--- a/Assets/Prefabs/SlimeBossIdle.prefab
+++ b/Assets/Prefabs/SlimeBossIdle.prefab
@@ -295,9 +295,10 @@ MonoBehaviour:
  m_GameObject: {fileID: 7422307534756093511}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cc3c1c0815bce34498b5dc8b199d0118, type: 3}
+  m_Script: {fileID: 11500000, guid: 2fe18bcd2d3d0d752ae519027875df8f, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  clip: {fileID: 0}
 --- !u!64 &2645811048282726494
 MeshCollider:
  m_ObjectHideFlags: 0
--- a/Assets/Prefabs/SlimeForestIdle.prefab
+++ b/Assets/Prefabs/SlimeForestIdle.prefab
@@ -306,9 +306,10 @@ MonoBehaviour:
  m_GameObject: {fileID: 9127354857402186281}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cc3c1c0815bce34498b5dc8b199d0118, type: 3}
+  m_Script: {fileID: 11500000, guid: 2fe18bcd2d3d0d752ae519027875df8f, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  clip: {fileID: 0}
 --- !u!64 &-1326613566692478026
 MeshCollider:
  m_ObjectHideFlags: 0
--- a/Assets/Prefabs/SlimeMageIdle.prefab
+++ b/Assets/Prefabs/SlimeMageIdle.prefab
@@ -295,9 +295,10 @@ MonoBehaviour:
  m_GameObject: {fileID: 8445085162624319281}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cc3c1c0815bce34498b5dc8b199d0118, type: 3}
+  m_Script: {fileID: 11500000, guid: 2fe18bcd2d3d0d752ae519027875df8f, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  clip: {fileID: 0}
 --- !u!64 &3048554505669354710
 MeshCollider:
  m_ObjectHideFlags: 0
--- a/Assets/Prefabs/SlimeMetalIdle.prefab
+++ b/Assets/Prefabs/SlimeMetalIdle.prefab
@@ -129,9 +129,10 @@ MonoBehaviour:
  m_GameObject: {fileID: 1452497377981145769}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cc3c1c0815bce34498b5dc8b199d0118, type: 3}
+  m_Script: {fileID: 11500000, guid: 2fe18bcd2d3d0d752ae519027875df8f, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  clip: {fileID: 0}
 --- !u!64 &3661858136180210843
 MeshCollider:
  m_ObjectHideFlags: 0
--- a/Assets/Prefabs/SlimeMiniBossIdle.prefab
+++ b/Assets/Prefabs/SlimeMiniBossIdle.prefab
@@ -129,9 +129,10 @@ MonoBehaviour:
  m_GameObject: {fileID: 419805594404797990}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cc3c1c0815bce34498b5dc8b199d0118, type: 3}
+  m_Script: {fileID: 11500000, guid: 2fe18bcd2d3d0d752ae519027875df8f, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  clip: {fileID: 0}
 --- !u!64 &-4696269184063814604
 MeshCollider:
  m_ObjectHideFlags: 0
--- a/Assets/Prefabs/SlimeWarriorIdle.prefab
+++ b/Assets/Prefabs/SlimeWarriorIdle.prefab
@@ -297,9 +297,10 @@ MonoBehaviour:
  m_GameObject: {fileID: 7815009759384241731}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cc3c1c0815bce34498b5dc8b199d0118, type: 3}
+  m_Script: {fileID: 11500000, guid: 2fe18bcd2d3d0d752ae519027875df8f, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  clip: {fileID: 0}
 --- !u!64 &6523941094505267678
 MeshCollider:
  m_ObjectHideFlags: 0
--- a/Assets/Prefabs/Tree_1.prefab
+++ b/Assets/Prefabs/Tree_1.prefab
@@ -15,6 +15,7 @@ GameObject:
  - component: {fileID: 1658981204574654673}
  - component: {fileID: 6099884091545410372}
  - component: {fileID: 645566918292761053}
+  - component: {fileID: 3674917119847316386}
  m_Layer: 0
  m_Name: Tree_1
  m_TagString: Object:Tree
@@ -4992,3 +4993,16 @@ ParticleSystemRenderer:
  m_MeshWeighting2: 1
  m_MeshWeighting3: 1
  m_MaskInteraction: 0
+--- !u!114 &3674917119847316386
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8867824946895199964}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9d069bae9082b7b60a2a05060a98424e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  clip: {fileID: 7400000, guid: 4522681ee7a4e1196af04c3f4fc704d6, type: 2}
--- a/Assets/Prefabs/Tree_2.prefab
+++ b/Assets/Prefabs/Tree_2.prefab
@@ -13,6 +13,7 @@ GameObject:
  - component: {fileID: 7366098166761564472}
  - component: {fileID: 6781544929942635444}
  - component: {fileID: 8075644600998223849}
+  - component: {fileID: 1343859431540429002}
  m_Layer: 0
  m_Name: Tree_2
  m_TagString: Object:Tree
@@ -135,3 +136,16 @@ Rigidbody:
  m_Interpolate: 0
  m_Constraints: 122
  m_CollisionDetection: 0
+--- !u!114 &1343859431540429002
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9023347993894783213}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9d069bae9082b7b60a2a05060a98424e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  clip: {fileID: 7400000, guid: 4522681ee7a4e1196af04c3f4fc704d6, type: 2}
--- a/Assets/Prefabs/copperOre.prefab
+++ b/Assets/Prefabs/copperOre.prefab
@@ -94,6 +94,7 @@ GameObject:
  - component: {fileID: 4848850860749154617}
  - component: {fileID: -2572412590075727139}
  - component: {fileID: 4483093259101442725}
+  - component: {fileID: 5418233419134080367}
  m_Layer: 0
  m_Name: copperOre
  m_TagString: Object:Ore
@@ -167,6 +168,19 @@ MeshCollider:
  m_Convex: 1
  m_CookingOptions: 30
  m_Mesh: {fileID: -5266056624350073623, guid: 21b8842f73b5b16dc87c1cb1b0afe0ce, type: 3}
+--- !u!114 &5418233419134080367
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5188503590062044035}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ab6955d1e578ef1b88f1ee3b6fa83051, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  clip: {fileID: 7400000, guid: dfe6f42559279b9f2a43256075839781, type: 2}
 --- !u!1 &8310517336631356992
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/Prefabs/goldOre.prefab
+++ b/Assets/Prefabs/goldOre.prefab
@@ -94,6 +94,7 @@ GameObject:
  - component: {fileID: 5321737818351179594}
  - component: {fileID: 8145716631555738662}
  - component: {fileID: 7075289032286914303}
+  - component: {fileID: 7599337776987165547}
  m_Layer: 0
  m_Name: goldOre
  m_TagString: Object:Ore
@@ -167,6 +168,19 @@ MeshCollider:
  m_Convex: 1
  m_CookingOptions: 30
  m_Mesh: {fileID: -5266056624350073623, guid: 21b8842f73b5b16dc87c1cb1b0afe0ce, type: 3}
+--- !u!114 &7599337776987165547
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4796699693279464944}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ab6955d1e578ef1b88f1ee3b6fa83051, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  clip: {fileID: 7400000, guid: dfe6f42559279b9f2a43256075839781, type: 2}
 --- !u!1 &8774396427657433139
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/Prefabs/ironOre.prefab
+++ b/Assets/Prefabs/ironOre.prefab
@@ -94,6 +94,7 @@ GameObject:
  - component: {fileID: 6744453271754949240}
  - component: {fileID: 215655860811652073}
  - component: {fileID: 6576777228973474439}
+  - component: {fileID: 6437085144792087181}
  m_Layer: 0
  m_Name: ironOre
  m_TagString: Object:Ore
@@ -167,6 +168,19 @@ MeshCollider:
  m_Convex: 1
  m_CookingOptions: 30
  m_Mesh: {fileID: -5266056624350073623, guid: 21b8842f73b5b16dc87c1cb1b0afe0ce, type: 3}
+--- !u!114 &6437085144792087181
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6256287307790063810}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ab6955d1e578ef1b88f1ee3b6fa83051, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  clip: {fileID: 7400000, guid: dfe6f42559279b9f2a43256075839781, type: 2}
 --- !u!1 &7892395422436754689
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/Prefabs/pnlQuest.prefab
+++ b/Assets/Prefabs/pnlQuest.prefab
@@ -61,7 +61,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0.27058825, g: 0.4117647, b: 0.5647059, a: 1}
+  m_Color: {r: 0.24313726, g: 0.53333336, b: 0.35686275, a: 1}
  m_RaycastTarget: 1
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
--- a/Assets/Prefabs/tinOre.prefab
+++ b/Assets/Prefabs/tinOre.prefab
@@ -94,6 +94,7 @@ GameObject:
  - component: {fileID: 6024848534698070052}
  - component: {fileID: 70974923766122465}
  - component: {fileID: 6135128249415564205}
+  - component: {fileID: 8624121310591208666}
  m_Layer: 0
  m_Name: tinOre
  m_TagString: Object:Ore
@@ -167,6 +168,19 @@ MeshCollider:
  m_Convex: 1
  m_CookingOptions: 30
  m_Mesh: {fileID: -5266056624350073623, guid: 21b8842f73b5b16dc87c1cb1b0afe0ce, type: 3}
+--- !u!114 &8624121310591208666
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6401690393767201438}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ab6955d1e578ef1b88f1ee3b6fa83051, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  clip: {fileID: 7400000, guid: dfe6f42559279b9f2a43256075839781, type: 2}
 --- !u!1 &7170566803458479965
 GameObject:
  m_ObjectHideFlags: 0