add

2024-11-27 00:06:25 +08:00 · 2024-11-27 00:06:25 +08:00 · 5cce41cb28
commit 5cce41cb28
parent 8bd9b17c7f
12 changed files with 582 additions and 165 deletions
--- a/Assets/Asteroid_Crystal_Set_01/Models/Materials/Asteroids_A.mat
+++ b/Assets/Asteroid_Crystal_Set_01/Models/Materials/Asteroids_A.mat
@ -25,7 +25,7 @@ Material:
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
-        m_Texture: {fileID: 2800000, guid: d3085e48f7caa8b44923a8163a7112a7, type: 3}
+        m_Texture: {fileID: 2800000, guid: fc0b3bb726e3ce44f851f3505484b215, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    m_Ints: []
--- a/Assets/Asteroid_Crystal_Set_01/Models/Materials/Crystal_A.mat
+++ b/Assets/Asteroid_Crystal_Set_01/Models/Materials/Crystal_A.mat
@ -21,7 +21,7 @@ Material:
    serializedVersion: 3
    m_TexEnvs:
    - _MainTex:
-        m_Texture: {fileID: 2800000, guid: aab99fb80249c4461a4bf77e696eb66d, type: 3}
+        m_Texture: {fileID: 2800000, guid: b1230f4022eb50045a91a2762e7f015b, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    m_Ints: []
--- a/Assets/Scenes/GameScene.unity
+++ b/Assets/Scenes/GameScene.unity
@ -158,8 +158,24 @@ BoxCollider:
  m_IsTrigger: 0
  m_Enabled: 1
  serializedVersion: 2
-  m_Size: {x: 1, y: 2, z: 1}
-  m_Center: {x: 0, y: 1, z: 0}
+  m_Size: {x: 1, y: 2.1145759, z: 1.1321503}
+  m_Center: {x: 0, y: 0.028930461, z: -0.050044265}
+--- !u!54 &412280656
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 412280648}
+  serializedVersion: 2
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_UseGravity: 0
+  m_IsKinematic: 0
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
 --- !u!1001 &446207351
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -276,7 +292,6 @@ GameObject:
  - component: {fileID: 551772365}
  - component: {fileID: 551772364}
  - component: {fileID: 551772363}
-  - component: {fileID: 551772366}
  - component: {fileID: 551772367}
  m_Layer: 0
  m_Name: player
@ -301,6 +316,7 @@ MonoBehaviour:
  MaxSpeed: 100
  x: 0
  y: 0
+  rotationSpeed: 5
 --- !u!143 &551772364
 CharacterController:
  m_ObjectHideFlags: 0
@ -327,7 +343,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 551772362}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 275.74304, y: 3.3, z: 274.33115}
+  m_LocalPosition: {x: 275.74304, y: 3, z: 274.33115}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
@ -337,19 +353,6 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &551772366
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 551772362}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fab23f15c9f68384c9206137bbe28db8, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  playermode: {fileID: 551772365}
 --- !u!114 &551772367
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -367,7 +370,80 @@ MonoBehaviour:
  bulletSpawn:
  - {fileID: 1160531882}
  - {fileID: 471442432}
-  bulletVelocity: 30
+--- !u!1001 &564820385
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1917679240}
+    m_Modifications:
+    - target: {fileID: 100000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_Name
+      value: Crystal_Sml_A_01
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 2887.8
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 3555.286
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -2438.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+--- !u!4 &564820386 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 400000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+  m_PrefabInstance: {fileID: 564820385}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &705507993
 GameObject:
  m_ObjectHideFlags: 0
@ -533,6 +609,10 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 2300000, guid: e8cdb3a4f9c799a44b53019778370380, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 720f66b8f1880c2449d38286edba163a, type: 2}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: e8cdb3a4f9c799a44b53019778370380, type: 3}
 --- !u!4 &723575407 stripped
@ -545,8 +625,8 @@ GameObject:
  m_CorrespondingSourceObject: {fileID: 100000, guid: e8cdb3a4f9c799a44b53019778370380, type: 3}
  m_PrefabInstance: {fileID: 723575406}
  m_PrefabAsset: {fileID: 0}
--- !u!64 &723575409
-MeshCollider:
+--- !u!65 &723575413
+BoxCollider:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
@ -555,10 +635,38 @@ MeshCollider:
  m_Material: {fileID: 0}
  m_IsTrigger: 0
  m_Enabled: 1
-  serializedVersion: 4
-  m_Convex: 1
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 4300000, guid: e8cdb3a4f9c799a44b53019778370380, type: 3}
+  serializedVersion: 2
+  m_Size: {x: 1.9152313, y: 2.3505757, z: 4.469776}
+  m_Center: {x: -0.21793671, y: 0.7723259, z: -0.85845417}
+--- !u!54 &723575414
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 723575408}
+  serializedVersion: 2
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_UseGravity: 0
+  m_IsKinematic: 0
+  m_Interpolate: 0
+  m_Constraints: 126
+  m_CollisionDetection: 0
+--- !u!114 &723575415
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 723575408}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b2008e5ca24687a43a10fda1be37469c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  OreHp: 100
 --- !u!1 &751070920
 GameObject:
  m_ObjectHideFlags: 0
@ -659,6 +767,10 @@ PrefabInstance:
  m_Modification:
    m_TransformParent: {fileID: 0}
    m_Modifications:
+    - target: {fileID: 1469769172608520798, guid: ccaf4affb26fa0d44ae2c5195096ae23, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -1
+      objectReference: {fileID: 0}
    - target: {fileID: 4335648890274827393, guid: ccaf4affb26fa0d44ae2c5195096ae23, type: 3}
      propertyPath: m_ApplyRootMotion
      value: 0
@ -675,6 +787,10 @@ PrefabInstance:
      propertyPath: m_Name
      value: enemy
      objectReference: {fileID: 0}
+    - target: {fileID: 7212692251125003708, guid: ccaf4affb26fa0d44ae2c5195096ae23, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -1
+      objectReference: {fileID: 0}
    - target: {fileID: 7695382262159251195, guid: ccaf4affb26fa0d44ae2c5195096ae23, type: 3}
      propertyPath: m_RootOrder
      value: 4
@ -697,7 +813,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7695382262159251195, guid: ccaf4affb26fa0d44ae2c5195096ae23, type: 3}
      propertyPath: m_LocalPosition.y
-      value: 0.75
+      value: 7.93
      objectReference: {fileID: 0}
    - target: {fileID: 7695382262159251195, guid: ccaf4affb26fa0d44ae2c5195096ae23, type: 3}
      propertyPath: m_LocalPosition.z
@ -735,6 +851,10 @@ PrefabInstance:
      propertyPath: m_Speed
      value: 10
      objectReference: {fileID: 0}
+    - target: {fileID: 7760167297535577427, guid: ccaf4affb26fa0d44ae2c5195096ae23, type: 3}
+      propertyPath: m_Height
+      value: 2
+      objectReference: {fileID: 0}
    - target: {fileID: 7760167297535577427, guid: ccaf4affb26fa0d44ae2c5195096ae23, type: 3}
      propertyPath: m_Radius
      value: 0.5
@ -743,6 +863,10 @@ PrefabInstance:
      propertyPath: m_AutoRepath
      value: 1
      objectReference: {fileID: 0}
+    - target: {fileID: 7760167297535577427, guid: ccaf4affb26fa0d44ae2c5195096ae23, type: 3}
+      propertyPath: m_BaseOffset
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 7760167297535577427, guid: ccaf4affb26fa0d44ae2c5195096ae23, type: 3}
      propertyPath: m_WalkableMask
      value: 4294967295
@ -849,6 +973,9 @@ MonoBehaviour:
  target: {fileID: 551772365}
  smoothSpeed: 0.125
  offset: {x: -50, y: 150, z: -50}
+  rotationSmoothSpeed: 10
+  maxDistance: 10
+  minDistance: 2
 --- !u!1 &1160531881
 GameObject:
  m_ObjectHideFlags: 0
@ -880,6 +1007,84 @@ Transform:
  m_Father: {fileID: 551772365}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1195250373
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1917679240}
+    m_Modifications:
+    - target: {fileID: 100000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_Name
+      value: Crystal_Sml_B_01 (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 2920.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 3561.6858
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -2363.4
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2300000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 720f66b8f1880c2449d38286edba163a, type: 2}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+--- !u!4 &1195250374 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 400000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+  m_PrefabInstance: {fileID: 1195250373}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1324451146
 GameObject:
  m_ObjectHideFlags: 0
@ -934,7 +1139,7 @@ MeshRenderer:
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
-  - {fileID: 2100000, guid: 236e6a789de532b44987bc484a177aab, type: 2}
+  - {fileID: 2100000, guid: 09258af9a63f1a049a05c7575407f260, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
@ -992,6 +1197,287 @@ BoxCollider:
  serializedVersion: 2
  m_Size: {x: 10.000001, y: 2.2204463e-16, z: 10.000001}
  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1001 &1502306325
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1917679240}
+    m_Modifications:
+    - target: {fileID: 100000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_Name
+      value: Crystal_Sml_B_01
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 2911.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 3561.6858
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -2441.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+--- !u!4 &1502306326 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 400000, guid: 152fa45dabcbb324aa494574f578e2b5, type: 3}
+  m_PrefabInstance: {fileID: 1502306325}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1574596279
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1917679240}
+    m_Modifications:
+    - target: {fileID: 100000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_Name
+      value: Crystal_Sml_A_01 (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_RootOrder
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 2897.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 3555.286
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -2360.4
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2300000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 720f66b8f1880c2449d38286edba163a, type: 2}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+--- !u!4 &1574596280 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 400000, guid: d638cc32d98ca2b458e7d672e6b5d561, type: 3}
+  m_PrefabInstance: {fileID: 1574596279}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1827496785
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1917679240}
+    m_Modifications:
+    - target: {fileID: 100000, guid: e8cdb3a4f9c799a44b53019778370380, type: 3}
+      propertyPath: m_Name
+      value: Crystal_Lrg_A_01 (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 100000, guid: e8cdb3a4f9c799a44b53019778370380, type: 3}
+      propertyPath: m_TagString
+      value: ore
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: e8cdb3a4f9c799a44b53019778370380, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: e8cdb3a4f9c799a44b53019778370380, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: e8cdb3a4f9c799a44b53019778370380, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: e8cdb3a4f9c799a44b53019778370380, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: e8cdb3a4f9c799a44b53019778370380, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 2827.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: e8cdb3a4f9c799a44b53019778370380, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 3577.386
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: e8cdb3a4f9c799a44b53019778370380, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -2415.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: e8cdb3a4f9c799a44b53019778370380, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: e8cdb3a4f9c799a44b53019778370380, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: e8cdb3a4f9c799a44b53019778370380, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: e8cdb3a4f9c799a44b53019778370380, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: e8cdb3a4f9c799a44b53019778370380, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: e8cdb3a4f9c799a44b53019778370380, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: e8cdb3a4f9c799a44b53019778370380, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2300000, guid: e8cdb3a4f9c799a44b53019778370380, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: fafc27bf79f10424f8ab4fdcb85ef79b, type: 2}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: e8cdb3a4f9c799a44b53019778370380, type: 3}
+--- !u!4 &1827496786 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 400000, guid: e8cdb3a4f9c799a44b53019778370380, type: 3}
+  m_PrefabInstance: {fileID: 1827496785}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1827496787 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 100000, guid: e8cdb3a4f9c799a44b53019778370380, type: 3}
+  m_PrefabInstance: {fileID: 1827496785}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1827496788
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1827496787}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b2008e5ca24687a43a10fda1be37469c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  OreHp: 100
+--- !u!65 &1827496789
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1827496787}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1.9152313, y: 2.3505757, z: 4.469776}
+  m_Center: {x: -0.21793671, y: 0.7723259, z: -0.85845417}
+--- !u!54 &1827496790
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1827496787}
+  serializedVersion: 2
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_UseGravity: 0
+  m_IsKinematic: 0
+  m_Interpolate: 0
+  m_Constraints: 126
+  m_CollisionDetection: 0
 --- !u!1 &1917679239
 GameObject:
  m_ObjectHideFlags: 0
@ -1021,6 +1507,11 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 723575407}
+  - {fileID: 1827496786}
+  - {fileID: 1502306326}
+  - {fileID: 564820386}
+  - {fileID: 1195250374}
+  - {fileID: 1574596280}
  m_Father: {fileID: 0}
  m_RootOrder: 6
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- a/Assets/Shoot.cs
+++ b/Assets/Shoot.cs
@ -1,50 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using DG.Tweening;
-public class Shoot : MonoBehaviour
-{
-    public GameObject bulletPrefab; // 子弹预制体
-    public GameObject firePrefab;
-    public Transform[] bulletSpawn; // 子弹生成位置
-    public float bulletVelocity = 30f; // 子弹速度
-
-
-    void Update()
-    {
-        Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
-        RaycastHit hitInfo;
-
-        if (Input.GetMouseButtonDown(0))
-        {
-            if (Physics.Raycast(ray, out hitInfo))
-            {
-                //射线选择人物
-                if (hitInfo.collider.gameObject.name == "enemy")
-                {
-                    FireWeapon(hitInfo.collider.gameObject.transform);
-                    GoldFirePoint();
-                }
-            }
-        }
-    }
-    private void GoldFirePoint()
-    {
-        GameObject fireobj0 = Instantiate(firePrefab, bulletSpawn[0].position, bulletSpawn[0].rotation);
-        GameObject fireobj1 = Instantiate(firePrefab, bulletSpawn[1].position, bulletSpawn[1].rotation);
-        Destroy(fireobj0, 0.5f);
-        Destroy(fireobj1,0.5f);
-    }
-    private void FireWeapon(Transform transform)
-    {
-        
-        GameObject bullet = Instantiate(bulletPrefab, bulletSpawn[0].position, bulletSpawn[0].rotation);
-        bullet.transform.DOMove(transform.position,0.5f);
-
-        GameObject bullet1 = Instantiate(bulletPrefab, bulletSpawn[1].position, bulletSpawn[1].rotation);
-        bullet1.transform.DOMove(transform.position, 0.5f);
-
-    }
-
-
-}
--- a/Assets/Shoot.cs.meta
+++ b/Assets/Shoot.cs.meta
@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: f409e59750983ef4c87238abaf7f71de
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/prefabs/Bullet_GoldFire_Small_Projectile.prefab
+++ b/Assets/prefabs/Bullet_GoldFire_Small_Projectile.prefab
@ -12,7 +12,7 @@ GameObject:
  - component: {fileID: 199822515480979474}
  - component: {fileID: 198737689383679476}
  - component: {fileID: -6286893812409163610}
-  - component: {fileID: 1534982649205556764}
+  - component: {fileID: 3172706102151116315}
  m_Layer: 0
  m_Name: Bullet_GoldFire_Small_Projectile
  m_TagString: FX
@ -4841,7 +4841,8 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 4e3a9f6a53e539141b12bdb8580ae62f, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
--- !u!65 &1534982649205556764
+  harm: 10
+--- !u!65 &3172706102151116315
 BoxCollider:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@ -4850,10 +4851,10 @@ BoxCollider:
  m_GameObject: {fileID: 1238843893459588}
  m_Material: {fileID: 0}
  m_IsTrigger: 0
-  m_Enabled: 0
+  m_Enabled: 1
  serializedVersion: 2
-  m_Size: {x: 0.1, y: 0.1, z: 1.8139994}
-  m_Center: {x: 0, y: -0.0018275678, z: -0.43804714}
+  m_Size: {x: 0.17588894, y: 0.17478092, z: 1.5584414}
+  m_Center: {x: 0.011916515, y: 0.04189855, z: -0.27921993}
 --- !u!1 &1540588367011230
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/scripts/Bullet.cs
+++ b/Assets/scripts/Bullet.cs
@ -4,24 +4,27 @@ using UnityEngine;

 public class Bullet : MonoBehaviour
 {
+    public int harm;
+    private void Start()
+    {
+        Destroy(this.gameObject,1f);
+    }
    private void OnCollisionEnter(Collision collision)
    {
        if (collision.gameObject.CompareTag("enemy"))
        {
+            Enemy enemy = collision.gameObject.GetComponent<Enemy>();
+            enemy.EnemyHpDown(harm);
            Destroy(this.gameObject);
        }
        if (collision.gameObject.CompareTag("ore"))
        {
-            Destroy(this.gameObject);
+            Ore ore = collision.gameObject.GetComponent<Ore>();
+            ore.OreHpDown(harm);
            Destroy(this.gameObject);
        }
-    }
-    void OnParticleCollision(GameObject other)
-    {
-        if (other.tag == "enemy")
-        {
+        
            
-
-        }
    }
+  
 }
--- a/Assets/scripts/camfollow.cs
+++ b/Assets/scripts/camfollow.cs
@ -5,9 +5,14 @@ using UnityEngine;
 public class camfollow : MonoBehaviour
 {
    public Transform target; // 要跟随的目标，这里通常是玩家角色
-    public float smoothSpeed = 0.125f; // 摄像机移动的平滑速度
+    public float smoothSpeed = 0.001f; // 摄像机移动的平滑速度
    public Vector3 offset; // 摄像机相对于目标的偏移量
- 
+
+    public float rotationSmoothSpeed = 50f; // 摄像机旋转的平滑速度
+    public float maxDistance = 10f; // 最大追踪距离s
+    public float minDistance = 5f; // 最小追踪距离
+
+
    void LateUpdate()
    {
        if (target == null)
@ -17,12 +22,11 @@ public class camfollow : MonoBehaviour

        // 计算目标位置
        Vector3 desiredPosition = target.position + offset;
+        transform.position = desiredPosition;

-        // 使用平滑插值来移动摄像机
-        Vector3 smoothedPosition = Vector3.Lerp(transform.position, desiredPosition, smoothSpeed);
-        transform.position = smoothedPosition;
-
-        // 确保摄像机始终看向目标
-        transform.LookAt(target);
+        // 计算摄像机旋转方向，平滑旋转到目标方向
+        Vector3 direction = target.position - transform.position;
+        Quaternion targetRotation = Quaternion.LookRotation(direction);
+        transform.rotation = Quaternion.Slerp(transform.rotation, targetRotation, Time.deltaTime * rotationSmoothSpeed);
    }
 }
--- a/Assets/scripts/enemy.cs
+++ b/Assets/scripts/enemy.cs
@ -3,10 +3,10 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.AI;

-public class enemy : MonoBehaviour
+public class Enemy : MonoBehaviour
 {
    public NavMeshAgent _agent;
-    public float bloodvolume;
+    public int bloodvolume;
    public Transform player;
    // Start is called before the first frame update
    void Start()
@ -18,11 +18,18 @@ public class enemy : MonoBehaviour
    // Update is called once per frame
    void Update()
    {
-
-        
        setMoveTo(player);
+        if (bloodvolume <= 0)
+        {
+            //ToDo
+
+            Destroy(this.gameObject);
+        }
        
-        
+    }
+    public void EnemyHpDown(int hp)
+    {
+        bloodvolume -= hp;
    }
    public void setMoveTo(Transform target)
    {
--- a/Assets/scripts/playercontroller.cs
+++ b/Assets/scripts/playercontroller.cs
@ -10,19 +10,26 @@ public class playercontroller : MonoBehaviour
    public float MaxSpeed = 10;
    public float x;
    public float y;
+    public float rotationSpeed = 5f; 
+
    // Start is called before the first frame update
    void Start()
    {
-        playerController=GetComponent<CharacterController>();
+        playerController = GetComponent<CharacterController>();
    }

    // Update is called once per frame
    void Update()
    {
-         x = Input.GetAxis("Horizontal"); 
-         y = Input.GetAxis("Vertical");
+        // 获取输入
+        x = Input.GetAxis("Horizontal");
+        y = Input.GetAxis("Vertical");
+
+        // 计算移动方向
        moveDirection = new Vector3(x, 0, y);
        moveDirection = transform.TransformDirection(moveDirection);
+
+        // 按住左shift加速
        if (Input.GetKeyDown(KeyCode.LeftShift))
        {
            MaxSpeed *= 2;
@ -32,16 +39,25 @@ public class playercontroller : MonoBehaviour
            MaxSpeed /= 2;
        }
        moveDirection *= MaxSpeed;
+
+        // 获取鼠标位置并射线检测
        Vector3 mouseScreenPosition = Input.mousePosition;
        Ray ray = Camera.main.ScreenPointToRay(mouseScreenPosition);
        RaycastHit hit;
+
        if (Physics.Raycast(ray, out hit))
        {
-            Vector3 mouseWorldPosition = new Vector3(hit.point.x, hit.point.y, hit.point.z);
+            // 获取鼠标点击的世界位置，并计算目标方向
+            Vector3 mouseWorldPosition = new Vector3(hit.point.x, transform.position.y, hit.point.z);
            Vector3 direction = mouseWorldPosition - transform.position;
-            Quaternion rotation = Quaternion.LookRotation(direction);
-            transform.rotation = rotation;
+            direction.y = 0;
+
+            // 使用Quaternion.Slerp进行平滑旋转
+            Quaternion targetRotation = Quaternion.LookRotation(direction);
+            transform.rotation = Quaternion.Slerp(transform.rotation, targetRotation, Time.deltaTime * rotationSpeed);
        }
+
+        // 移动玩家
        playerController.Move(moveDirection * Time.deltaTime);
    }
 }
--- a/Assets/scripts/playerpoint.cs
+++ b/Assets/scripts/playerpoint.cs
@ -1,33 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using Unity.VisualScripting.FullSerializer;
-using UnityEngine;
-
-public class playerpoint : MonoBehaviour
-{
-    public Transform playermode;
-
-    void Start()
-    {
-        
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
-        RaycastHit hitInfo;
-
-        if (Input.GetMouseButtonDown(0))
-        {
-            if (Physics.Raycast(ray, out hitInfo))
-            {
-                //ÉäÏßÑ¡ÔñÈËÎï
-                if (hitInfo.collider.gameObject.name == "showman")
-                {
-                   
-                }
-            }
-        }
-    }
-}
--- a/Assets/scripts/playerpoint.cs.meta
+++ b/Assets/scripts/playerpoint.cs.meta
@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: fab23f15c9f68384c9206137bbe28db8
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: