fix：调整鸡蛋攻击

2025-07-25 14:30:55 +08:00
parent 63cb40609a
commit e41ca6923d
24 changed files with 40033 additions and 90 deletions
--- a/Assets/_Alice/Audios/1.19.mp3
+++ b/Assets/_Alice/Audios/1.19.mp3
--- a/Assets/_Alice/Audios/1.51.mp3
+++ b/Assets/_Alice/Audios/1.51.mp3
--- a/Assets/_Alice/Audios/1.51.mp3.meta
+++ b/Assets/_Alice/Audios/1.51.mp3.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 8f2b2ac00f9c3974790e9c513b1dff90
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Alice/Prefabs/Box/TaskGembox.prefab
+++ b/Assets/_Alice/Prefabs/Box/TaskGembox.prefab
@@ -1,5 +1,36 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2646692919842372461
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6595442436394767115}
+  m_Layer: 0
+  m_Name: lockPos
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6595442436394767115
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2646692919842372461}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.0019, y: 0.2094, z: 0.2058}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6527194439952923774}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &7169536842987339345
 GameObject:
  m_ObjectHideFlags: 0
@@ -10,6 +41,7 @@ GameObject:
  m_Component:
  - component: {fileID: 6527194439952923774}
  - component: {fileID: 3194191736012720344}
+  - component: {fileID: 7760529191452043405}
  m_Layer: 0
  m_Name: TaskGembox
  m_TagString: Untagged
@@ -32,6 +64,7 @@ Transform:
  m_Children:
  - {fileID: 3572454064492792957}
  - {fileID: 8793618969457198129}
+  - {fileID: 6595442436394767115}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &3194191736012720344
@@ -51,16 +84,38 @@ MonoBehaviour:
  - {fileID: 8451239265004873179}
  - {fileID: 8781725954727451333}
  - {fileID: 297673417030629915}
+  taskBoxType: 0
+  lockPos: {fileID: 6595442436394767115}
  explosionEffect: {fileID: 1298662643261583317}
  pileCenter: {fileID: 8793618969457198129}
  gemCount: 40
  pileRadius: 1
  pileHeight: 1
-  spawnScaleDuration: 0.4
  spawnDelayBetween: 0.05
  id: 0
+  isOpen: 0
  spawnCenter: {x: 0, y: 0, z: 0}
-  spawnRange: {x: 10, y: 2, z: 10}
+--- !u!65 &7760529191452043405
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7169536842987339345}
+  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: 0, z: 0.07846868}
+  m_Center: {x: 0, y: 0.18815932, z: 0.18327767}
 --- !u!1001 &3356715084177009585
 PrefabInstance:
  m_ObjectHideFlags: 0
--- a/Assets/_Alice/Prefabs/Enemy/Enemy.prefab
+++ b/Assets/_Alice/Prefabs/Enemy/Enemy.prefab
@@ -2109,52 +2109,52 @@ PrefabInstance:
    - target: {fileID: 579998581184368345, guid: 50a9327bb69fce5459c7ea504d72b494,
        type: 3}
      propertyPath: m_LocalPosition.x
-      value: -0.00134
+      value: -0.00099
      objectReference: {fileID: 0}
    - target: {fileID: 579998581184368345, guid: 50a9327bb69fce5459c7ea504d72b494,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: 0.00164
+      value: 0.00103
      objectReference: {fileID: 0}
    - target: {fileID: 579998581184368345, guid: 50a9327bb69fce5459c7ea504d72b494,
        type: 3}
      propertyPath: m_LocalPosition.z
-      value: -0.00078
+      value: -0.00072
      objectReference: {fileID: 0}
    - target: {fileID: 579998581184368345, guid: 50a9327bb69fce5459c7ea504d72b494,
        type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0.47743276
+      value: 0.5262586
      objectReference: {fileID: 0}
    - target: {fileID: 579998581184368345, guid: 50a9327bb69fce5459c7ea504d72b494,
        type: 3}
      propertyPath: m_LocalRotation.x
-      value: 0.4595702
+      value: 0.41260207
      objectReference: {fileID: 0}
    - target: {fileID: 579998581184368345, guid: 50a9327bb69fce5459c7ea504d72b494,
        type: 3}
      propertyPath: m_LocalRotation.y
-      value: -0.2554187
+      value: -0.30827788
      objectReference: {fileID: 0}
    - target: {fileID: 579998581184368345, guid: 50a9327bb69fce5459c7ea504d72b494,
        type: 3}
      propertyPath: m_LocalRotation.z
-      value: 0.703999
+      value: 0.67659163
      objectReference: {fileID: 0}
    - target: {fileID: 579998581184368345, guid: 50a9327bb69fce5459c7ea504d72b494,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
+      value: 58.367
      objectReference: {fileID: 0}
    - target: {fileID: 579998581184368345, guid: 50a9327bb69fce5459c7ea504d72b494,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
+      value: 26.48
      objectReference: {fileID: 0}
    - target: {fileID: 579998581184368345, guid: 50a9327bb69fce5459c7ea504d72b494,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
+      value: 119.221
      objectReference: {fileID: 0}
    - target: {fileID: 579998581184368345, guid: 50a9327bb69fce5459c7ea504d72b494,
        type: 3}
@@ -2215,52 +2215,52 @@ PrefabInstance:
    - target: {fileID: 286868030926342863, guid: e6807bdf7d6a9134b9db595baddb437f,
        type: 3}
      propertyPath: m_LocalPosition.x
-      value: -0.0013400031
+      value: -0.00099
      objectReference: {fileID: 0}
    - target: {fileID: 286868030926342863, guid: e6807bdf7d6a9134b9db595baddb437f,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: 0.001639998
+      value: 0.00103
      objectReference: {fileID: 0}
    - target: {fileID: 286868030926342863, guid: e6807bdf7d6a9134b9db595baddb437f,
        type: 3}
      propertyPath: m_LocalPosition.z
-      value: -0.00077999884
+      value: -0.00072
      objectReference: {fileID: 0}
    - target: {fileID: 286868030926342863, guid: e6807bdf7d6a9134b9db595baddb437f,
        type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0.47743285
+      value: 0.5262585
      objectReference: {fileID: 0}
    - target: {fileID: 286868030926342863, guid: e6807bdf7d6a9134b9db595baddb437f,
        type: 3}
      propertyPath: m_LocalRotation.x
-      value: 0.4595704
+      value: 0.41260263
      objectReference: {fileID: 0}
    - target: {fileID: 286868030926342863, guid: e6807bdf7d6a9134b9db595baddb437f,
        type: 3}
      propertyPath: m_LocalRotation.y
-      value: -0.25541857
+      value: -0.30827755
      objectReference: {fileID: 0}
    - target: {fileID: 286868030926342863, guid: e6807bdf7d6a9134b9db595baddb437f,
        type: 3}
      propertyPath: m_LocalRotation.z
-      value: 0.70399886
+      value: 0.6765915
      objectReference: {fileID: 0}
    - target: {fileID: 286868030926342863, guid: e6807bdf7d6a9134b9db595baddb437f,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
+      value: 58.367
      objectReference: {fileID: 0}
    - target: {fileID: 286868030926342863, guid: e6807bdf7d6a9134b9db595baddb437f,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
+      value: 26.481
      objectReference: {fileID: 0}
    - target: {fileID: 286868030926342863, guid: e6807bdf7d6a9134b9db595baddb437f,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
+      value: 119.221
      objectReference: {fileID: 0}
    - target: {fileID: 286868030926342863, guid: e6807bdf7d6a9134b9db595baddb437f,
        type: 3}
@@ -4085,52 +4085,52 @@ PrefabInstance:
    - target: {fileID: 5353875451509221560, guid: 6febffb1016ed2348b80f35cfbf9ad8d,
        type: 3}
      propertyPath: m_LocalPosition.x
-      value: -0.00134
+      value: -0.00099
      objectReference: {fileID: 0}
    - target: {fileID: 5353875451509221560, guid: 6febffb1016ed2348b80f35cfbf9ad8d,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: 0.00164
+      value: 0.00103
      objectReference: {fileID: 0}
    - target: {fileID: 5353875451509221560, guid: 6febffb1016ed2348b80f35cfbf9ad8d,
        type: 3}
      propertyPath: m_LocalPosition.z
-      value: -0.00078
+      value: -0.00072
      objectReference: {fileID: 0}
    - target: {fileID: 5353875451509221560, guid: 6febffb1016ed2348b80f35cfbf9ad8d,
        type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0.47743276
+      value: 0.5262586
      objectReference: {fileID: 0}
    - target: {fileID: 5353875451509221560, guid: 6febffb1016ed2348b80f35cfbf9ad8d,
        type: 3}
      propertyPath: m_LocalRotation.x
-      value: 0.4595702
+      value: 0.41260207
      objectReference: {fileID: 0}
    - target: {fileID: 5353875451509221560, guid: 6febffb1016ed2348b80f35cfbf9ad8d,
        type: 3}
      propertyPath: m_LocalRotation.y
-      value: -0.2554187
+      value: -0.30827788
      objectReference: {fileID: 0}
    - target: {fileID: 5353875451509221560, guid: 6febffb1016ed2348b80f35cfbf9ad8d,
        type: 3}
      propertyPath: m_LocalRotation.z
-      value: 0.703999
+      value: 0.67659163
      objectReference: {fileID: 0}
    - target: {fileID: 5353875451509221560, guid: 6febffb1016ed2348b80f35cfbf9ad8d,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
+      value: 58.367
      objectReference: {fileID: 0}
    - target: {fileID: 5353875451509221560, guid: 6febffb1016ed2348b80f35cfbf9ad8d,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
+      value: 26.48
      objectReference: {fileID: 0}
    - target: {fileID: 5353875451509221560, guid: 6febffb1016ed2348b80f35cfbf9ad8d,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
+      value: 119.221
      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
--- a/Assets/_Alice/Prefabs/RightHand.prefab
+++ b/Assets/_Alice/Prefabs/RightHand.prefab
@@ -1035,6 +1035,7 @@ MonoBehaviour:
  - {fileID: 1694507413901063891}
  gemKeyHand: {fileID: 6425644878413854746}
  gemKey: {fileID: 6396554136650270416}
+  gemKeyUp: {fileID: 4222883313532505238}
  skillet: {fileID: 1971246387353709640}
  skilletEx: {fileID: 2298026520619126189}
  hit: {fileID: 0}
@@ -1042,6 +1043,37 @@ MonoBehaviour:
  triggerDis: 0
  _isOpenLine: 0
  puzzleId: 0
+--- !u!1 &5730286699277404789
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4222883313532505238}
+  m_Layer: 0
+  m_Name: KeyUp
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4222883313532505238
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5730286699277404789}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -0.022, y: -0.592, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6965482936681125062}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &309140019808380269
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -2263,7 +2295,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 693968545217981121, guid: 6c2caea142927324eb19f8b9cc1fb757,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 4222883313532505238}
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 6c2caea142927324eb19f8b9cc1fb757, type: 3}
 --- !u!1 &6396554136650270416 stripped
--- a/Assets/_Alice/Resources/Data.json
+++ b/Assets/_Alice/Resources/Data.json
@@ -1 +0,0 @@
-{"EnemysInfo":{"Columns":["ID","Type","Name","CN_Name","Lvl","Hp","Atk","Speed","Toughness","AtkArea","Priority","Radius","Height"],"Values":[[ 0, 0,"HR01","\u5C0F\u571F\u8C46", 1, 200, 8,0.5, 100,"[2,4]", 1,0.3,0.7],[ 1, 1,"PHR01","\u98DE\u5154", 1, 150, 8,0.5, 100,"[3,6]", 1,0.4, 1.85],[ 2, 2,"MR3","\u5927\u5934", 1, 600, 12,0.6, 100,"[5.0,6.0]", 1,0.4, 1.1],[ 3, 3,"GRMII","\u963F\u5F3A", 1, 800, 10,0.5, 100,"[5.0,6.0]", 1,0.5, 1.3],[ 4, 4,"NXR03","\u5C0F\u871C\u8702", 1, 400, 40, 2, 100,"[0,0.35]", 1,0.5, 3.6],[ 5, 5,"BLR02","\u767E\u592B\u957F", 1, 700, 18, 1, 100,"[5.0,6.0]", 1,0.5, 1.3],[ 6, 6,"SDRRMI","\u6218\u9524", 1, 800, 10, 2, 100,"[1.5,2.5]", 1,0.8, 2],[ 7, 7,"DragonBoss","\u63D0\u4E9A\u739B\u7279", 1, 3000, 100, 1, 100,"[7.0,7.8]", 1,0.5, 6.5],[ 8, 8,"AirdropBlood","\u7269\u8D44\u8840\u5305", 1, 1, 0, 1, 0,"[0,0]", 1,0.5, 1.3],[ 9, 9,"AirdropJoinControl","\u7269\u8D44\u8054\u63A7", 1, 1, 0, 1, 0,"[0,0]", 1,0.5, 1.3]]},"TowersInfo":{"Columns":["ID","Type","Name","CN_Name","Lvl","Hp","SearchArea","RotateSpeed","GCD"],"Values":[[ 0, 0,"PowerCore","\u7535\u529B\u6838\u5FC3", 1, 2000, 0, 0, 0],[ 1, 1,"DoubleTubeTower","\u53CC\u7BA1\u901F\u5C04\u70AE", 1, 2500, 8,0.2, 1],[ 2, 2,"GatlingTower","\u4E94\u8054\u52A0\u7279\u6797", 1, 2500, 10,0.4,0.1],[ 3, 3,"ElectroTower","\u8D85\u5BFC\u7535\u78C1\u70AE", 1, 2500, 10,0.4, 2]]},"GunsInfo":{"Columns":["ID","Type","Name","CN_Name","Lvl","Recoil","ShootRate"],"Values":[[ 0, 0,"QuickGun","\u901F\u51FB\u67AA", 1, 80, 4],[ 1, 1,"HR01Gun","HR01\u7528\u67AA", 1, 20, 1],[ 2, 2,"PHR01Gun","PHR01\u7528\u67AA", 1, 20, 1],[ 3, 3,"MR3Gun","MR3\u7528\u67AA", 1, 20, 1],[ 4, 4,"GRMIIGun","GRMII\u7528\u67AA", 1, 20, 1],[ 5, 5,"BLR02Gun","BLR02\u7528\u67AA", 1, 20, 1],[ 6, 6,"GatlingGun","\u52A0\u7279\u6797\u7528\u67AA", 1, 80, 10],[ 7, 7,"ElectroGun","\u7535\u78C1\u70AE\u7528\u67AA", 1, 10, 1],[ 8, 8,"DragonBossGun","DragonBoss\u7528\u67AA", 1, 80, 10],[ 9, 9,"Pistol","\u624B\u67AA", 1, 80, 10]]},"BulletsInfo":{"Columns":["ID","Type","Name","CN_Name","Lvl","Damage","DeToughness"],"Values":[[ 0, 0,"QuickBullet","\u5FEB\u5F39", 1, 10, 10],[ 1, 1,"HR01Bullet","HR01\u7528\u5F39", 1, 10, 0],[ 2, 2,"PHR01Bullet","PHR01\u7528\u5F39", 1, 10, 0],[ 3, 3,"MR3Bullet","MR3\u7528\u5F39", 1, 15, 0],[ 4, 4,"GRMIIBullet","GRMII\u7528\u5F39", 1, 12, 0],[ 5, 5,"BLR02Bullet","BLR02\u7528\u5F39", 1, 20, 0],[ 6, 6,"GatlingBullet","\u52A0\u7279\u6797\u7528\u5F39", 1, 8, 0],[ 7, 7,"ElectroBullet","\u7535\u78C1\u70AE\u7528\u67AA", 1, 80, 10],[ 8, 8,"DragonBossBullet","DragonBoss\u7528\u5F39", 1, 290, 10],[ 9, 9,"PistolBullet","\u624B\u67AA\u7528\u5F39", 1, 10, 10]]},"DefensesInfo":{"Columns":["ID","TowerType","BornPos","BornAngleY"],"Values":[[ 0, 0,"(1.08,0,2.8)", 0],[ 1, 1,"(-4.75,0,4.57)", 49.615],[ 2, 1,"(-5.73,0,6.02)", 47.998],[ 3, 1,"(-1.03,0,7.17)",-126.925],[ 4, 1,"(-2.25,0,8.68)",-128.42],[ 5, 2,"(-1.65,0,3.91)",-34.406],[ 6, 2,"(0.54,0,5.18)",-36.403],[ 7, 3,"(-4.6,0,2.06)",-32.015]]},"StoryProgressInfo":{"Columns":["ID","Belong","EnemyType","Special","BornPos","BornAngleY","BornTime"],"Values":[[ 0, 0, 0, 0,"(-12.34,0,12.21)", 130, 1],[ 1, 0, 0, 0,"(-11.48,0,13.24)", 130, 1.5],[ 2, 0, 0, 0,"(-10.71,0,14.16)", 130, 1.8],[ 3, 0, 9, 1,"(-5.43,6.82,7.8)", 180, 2],[ 4, 0, 0, 0,"(-8.45,0,16.85)", 139.148, 2],[ 5, 0, 0, 0,"(-7.5,0,17.98)", 157.038, 2.3],[ 6, 0, 7, 0,"(-12.34,2.5,12.21)", 157.038, 3.5],[ 7, 0, 0, 0,"(-6.7,0,16.08)", 146.678, 4],[ 8, 0, 0, 0,"(-12.34,0,12.21)", 130, 5.5],[ 9, 0, 0, 0,"(-11.48,0,13.24)", 130, 6],[ 10, 0, 0, 0,"(-10.71,0,14.16)", 130, 6.5],[ 11, 0, 9, 1,"(-5.43,6.82,7.8)", 180, 7],[ 12, 0, 0, 0,"(-8.45,0,16.85)", 139.148, 8],[ 13, 1, 0, 0,"(-12.34,0,12.21)", 130, 1],[ 14, 1, 0, 0,"(-11.48,0,13.24)", 130, 1.5],[ 15, 1, 0, 0,"(-7.5,0,17.98)", 157.038, 1.8],[ 16, 1, 0, 0,"(-8.45,0,16.85)", 139.148, 2],[ 17, 1, 1, 0,"(-12.34,0,12.21)", 130, 4],[ 18, 1, 1, 0,"(-11.48,0,13.24)", 130, 4.5],[ 19, 1, 1, 0,"(-6.7,0,16.08)", 146.678, 5.8],[ 20, 1, 9, 1,"(-5.43,6.82,7.8)", 180, 5.8],[ 21, 1, 1, 0,"(-7.5,0,17.98)", 157.038, 6],[ 22, 2, 1, 0,"(-12.34,0,12.21)", 130, 1],[ 23, 2, 1, 0,"(-11.48,0,13.24)", 130, 1.5],[ 24, 2, 1, 0,"(-10.71,0,14.16)", 130, 2],[ 25, 2, 1, 0,"(-8.45,0,16.85)", 139.148, 2.5],[ 26, 2, 1, 0,"(-7.5,0,17.98)", 157.038, 3.2],[ 27, 2, 1, 0,"(-6.7,0,16.08)", 146.678, 3.8],[ 28, 2, 2, 0,"(-12.34,0,12.21)", 130, 4.6],[ 29, 2, 9, 1,"(-5.43,6.82,7.8)", 180, 5],[ 30, 2, 2, 0,"(-12.34,0,12.21)", 130, 6],[ 31, 2, 2, 0,"(-11.48,0,13.24)", 130, 7.8],[ 32, 2, 2, 0,"(-10.71,0,14.16)", 130, 9],[ 33, 3, 0, 0,"(-12.34,0,12.21)", 130,0.6],[ 34, 3, 0, 0,"(-11.48,0,13.24)", 130, 1],[ 35, 3, 2, 0,"(-10.71,0,14.16)", 130, 2.2],[ 36, 3, 2, 0,"(-8.45,0,16.85)", 139.148, 3.5],[ 37, 3, 2, 0,"(-7.5,0,17.98)", 157.038, 4],[ 38, 3, 2, 0,"(-6.7,0,16.08)", 146.678, 5.6],[ 39, 3, 2, 0,"(-12.34,0,12.21)", 130, 6],[ 40, 3, 2, 0,"(-11.48,0,13.24)", 130, 7.3],[ 41, 3, 3, 0,"(-10.71,0,14.16)", 130, 9],[ 42, 3, 3, 0,"(-8.45,0,16.85)", 139.148, 11],[ 43, 3, 3, 0,"(-7.5,0,17.98)", 157.038, 13.6],[ 44, 3, 3, 0,"(-6.7,0,16.08)", 146.678, 15],[ 45, 4, 2, 0,"(-12.34,0,12.21)", 130,0.5],[ 46, 4, 2, 0,"(-11.48,0,13.24)", 130, 1.3],[ 47, 4, 3, 0,"(-10.71,0,14.16)", 130, 2.8],[ 48, 4, 3, 0,"(-6.7,0,16.08)", 146.678, 3.6],[ 49, 4, 5, 0,"(-7.5,0,17.98)", 146.678, 4.3],[ 50, 4, 5, 0,"(-12.34,0,12.21)", 130, 5.5],[ 51, 4, 5, 0,"(-8.45,0,16.85)", 139.148, 6.5],[ 52, 4, 5, 0,"(-7.5,0,17.98)", 146.678, 7.3],[ 53, 5, 0, 0,"(-12.34,0,12.21)", 146.678,0.8],[ 54, 5, 0, 0,"(-6.7,0,16.08)", 146.678, 1.7],[ 55, 5, 1, 0,"(-11.48,0,13.24)", 130, 2.9],[ 56, 5, 1, 0,"(-7.5,0,17.98)", 157.038, 4],[ 57, 5, 2, 0,"(-10.71,0,14.16)", 130, 5.5],[ 58, 5, 2, 0,"(-11.48,0,13.24)", 130, 6.4],[ 59, 5, 8, 1,"(-5.43,6.82,7.8)", 180, 7],[ 60, 5, 3, 0,"(-7.5,0,17.98)", 146.678, 7.8],[ 61, 5, 3, 0,"(-11.48,0,13.24)", 146.678, 8.2],[ 62, 5, 5, 0,"(-6.7,0,16.08)", 130, 9],[ 63, 5, 5, 0,"(-10.71,0,14.16)", 130, 10.1],[ 64, 6, 0, 0,"(-6.7,0,16.08)", 146.678, 1],[ 65, 6, 0, 0,"(-12.34,0,12.21)", 146.678, 1.8],[ 66, 6, 1, 0,"(-11.48,0,13.24)", 130, 2.3],[ 67, 6, 1, 0,"(-7.5,0,17.98)", 146.678, 3.5],[ 68, 6, 2, 0,"(-10.71,0,14.16)", 130, 4],[ 69, 6, 2, 0,"(-7.5,0,17.98)", 146.678, 4.5],[ 70, 6, 3, 0,"(-12.34,0,12.21)", 130, 4],[ 71, 6, 3, 0,"(-11.48,0,13.24)", 130, 4.8],[ 72, 6, 5, 0,"(-7.5,0,17.98)", 146.678, 5.6],[ 73, 6, 5, 0,"(-10.71,0,14.16)", 130, 6.5],[ 74, 6, 9, 1,"(-5.43,6.82,7.8)", 180, 7.1],[ 75, 6, 6, 0,"(-6.7,0,16.08)", 146.678, 8],[ 76, 6, 6, 0,"(-11.48,0,13.24)", 130, 8.2],[ 77, 7, 7, 0,"(-1,0,16.7)", 167, 1],[ 78, 7, 0, 0,"(-12.34,0,12.21)", 130, 4.5],[ 79, 7, 0, 0,"(-11.48,0,13.24)", 130, 5],[ 80, 7, 1, 0,"(-10.71,0,14.16)", 130, 5.5],[ 81, 7, 9, 1,"(-5.43,6.82,7.8)", 180, 5.7],[ 82, 7, 1, 0,"(-8.45,0,16.85)", 139.148, 6],[ 83, 7, 2, 0,"(-7.5,0,17.98)", 157.038, 6.5],[ 84, 7, 2, 0,"(-6.7,0,16.08)", 130, 7],[ 85, 7, 3, 0,"(-12.34,0,12.21)", 130, 7.5],[ 86, 7, 3, 0,"(-11.48,0,13.24)", 130, 8.5],[ 87, 7, 5, 0,"(-10.71,0,14.16)", 130, 9.5],[ 88, 7, 5, 0,"(-7.5,0,17.98)", 146.678, 10.5],[ 89, 7, 0, 0,"(-6.7,0,16.08)", 146.678, 11.2],[ 90, 7, 6, 0,"(-12.34,0,12.21)", 130, 12.5],[ 91, 7, 6, 0,"(-6.7,0,16.08)", 146.678, 14],[ 92, 7, 9, 1,"(-5.43,6.82,7.8)", 180, 18]]}}
--- a/Assets/_Alice/Resources/GongSi1Lou.xlsm
+++ b/Assets/_Alice/Resources/GongSi1Lou.xlsm
--- a/Assets/_Alice/Resources/GongSi1Lou.xlsm.meta
+++ b/Assets/_Alice/Resources/GongSi1Lou.xlsm.meta
--- a/Assets/_Alice/Resources/Json.meta
+++ b/Assets/_Alice/Resources/Json.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: df7ce0d1e1ea6394382de4e6aeddd6ea
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Alice/Resources/Json/GongSi1Lou.json
+++ b/Assets/_Alice/Resources/Json/GongSi1Lou.json
@@ -0,0 +1 @@
+{"EnemysInfo":{"Columns":["ID"],"Values":[[ 0],[ 1],[ 2],[ 3],[ 4],[ 5],[ 6],[ 7],[ 8],[ 9]]}}
--- a/Assets/_Alice/Resources/Json/GongSi1Lou.json.meta
+++ b/Assets/_Alice/Resources/Json/GongSi1Lou.json.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e87549550e4f024448e44057d32ed4ee
+guid: 681888521feb1624587d07931085d82b
 TextScriptImporter:
  externalObjects: {}
  userData: 
--- a/Assets/_Alice/Resources/ToyStory.xlsm
+++ b/Assets/_Alice/Resources/ToyStory.xlsm
--- a/Assets/_Alice/Resources/UI/HUDPanel.prefab
+++ b/Assets/_Alice/Resources/UI/HUDPanel.prefab
@@ -1206,8 +1206,8 @@ RectTransform:
  m_GameObject: {fileID: 1190333178644712044}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 0.63, y: 0.63, z: 0.63}
+  m_ConstrainProportionsScale: 1
  m_Children: []
  m_Father: {fileID: 14603909944634288}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1237,7 +1237,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.4392157}
  m_RaycastTarget: 1
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
--- a/Assets/_Alice/Scenes/GongSi1Lou.unity
+++ b/Assets/_Alice/Scenes/GongSi1Lou.unity
@@ -13309,6 +13309,7 @@ Transform:
  - {fileID: 283614211}
  - {fileID: 1154837751}
  - {fileID: 1519347539}
+  - {fileID: 2017402955}
  m_Father: {fileID: 1915035811}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1141237068
@@ -15553,11 +15554,386 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 2095954437}
    m_Modifications:
+    - target: {fileID: 77188646320157127, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0.000009382283
+      objectReference: {fileID: 0}
+    - target: {fileID: 77188646320157127, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0.000006571152
+      objectReference: {fileID: 0}
+    - target: {fileID: 77188646320157127, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 98.44152
+      objectReference: {fileID: 0}
+    - target: {fileID: 523757071275999838, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0.13699587
+      objectReference: {fileID: 0}
+    - target: {fileID: 523757071275999838, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0.96352106
+      objectReference: {fileID: 0}
+    - target: {fileID: 523757071275999838, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -105.39279
+      objectReference: {fileID: 0}
+    - target: {fileID: 876124690366685357, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 1.60231
+      objectReference: {fileID: 0}
+    - target: {fileID: 876124690366685357, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 53.44369
+      objectReference: {fileID: 0}
+    - target: {fileID: 876124690366685357, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -7.218398
+      objectReference: {fileID: 0}
+    - target: {fileID: 1410521241468601514, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -22.710629
+      objectReference: {fileID: 0}
+    - target: {fileID: 1410521241468601514, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 12.254994
+      objectReference: {fileID: 0}
+    - target: {fileID: 1410521241468601514, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -4.6836047
+      objectReference: {fileID: 0}
+    - target: {fileID: 1443240152038909280, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -0.0000023293728
+      objectReference: {fileID: 0}
+    - target: {fileID: 1443240152038909280, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -0.0000010650772
+      objectReference: {fileID: 0}
+    - target: {fileID: 1443240152038909280, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 24.571665
+      objectReference: {fileID: 0}
+    - target: {fileID: 1521404045961198655, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -7.016709e-15
+      objectReference: {fileID: 0}
+    - target: {fileID: 1600305349913880293, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -0.83543867
+      objectReference: {fileID: 0}
+    - target: {fileID: 1600305349913880293, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 79.20189
+      objectReference: {fileID: 0}
+    - target: {fileID: 1600305349913880293, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -177.05785
+      objectReference: {fileID: 0}
+    - target: {fileID: 1647718312790283264, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 7.3827705
+      objectReference: {fileID: 0}
+    - target: {fileID: 1647718312790283264, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -1.3167642
+      objectReference: {fileID: 0}
+    - target: {fileID: 1647718312790283264, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -20.524601
+      objectReference: {fileID: 0}
+    - target: {fileID: 2294675428344173210, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 67.61065
+      objectReference: {fileID: 0}
+    - target: {fileID: 2294675428344173210, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 168.22188
+      objectReference: {fileID: 0}
+    - target: {fileID: 2294675428344173210, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 162.86418
+      objectReference: {fileID: 0}
+    - target: {fileID: 2622097678483149640, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 14.012313
+      objectReference: {fileID: 0}
+    - target: {fileID: 2622097678483149640, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 170.9947
+      objectReference: {fileID: 0}
+    - target: {fileID: 2622097678483149640, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -27.216984
+      objectReference: {fileID: 0}
+    - target: {fileID: 2748985741941848812, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 1.0594386
+      objectReference: {fileID: 0}
+    - target: {fileID: 2748985741941848812, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0.48605973
+      objectReference: {fileID: 0}
+    - target: {fileID: 2748985741941848812, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -1.2944238
+      objectReference: {fileID: 0}
    - target: {fileID: 2891846406471782568, guid: 32dbba626ec420c4091ae2749f70007d,
        type: 3}
      propertyPath: m_Name
      value: "\u4E3B\u89D2\u8DF3\u821E"
      objectReference: {fileID: 0}
+    - target: {fileID: 3010867809012270686, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0.89511883
+      objectReference: {fileID: 0}
+    - target: {fileID: 3010867809012270686, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -0.6608771
+      objectReference: {fileID: 0}
+    - target: {fileID: 3010867809012270686, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -9.601242
+      objectReference: {fileID: 0}
+    - target: {fileID: 3391070596053297000, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 54.238808
+      objectReference: {fileID: 0}
+    - target: {fileID: 3391070596053297000, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -35.289356
+      objectReference: {fileID: 0}
+    - target: {fileID: 3391070596053297000, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -14.696515
+      objectReference: {fileID: 0}
+    - target: {fileID: 3774227262578685632, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 1.139347
+      objectReference: {fileID: 0}
+    - target: {fileID: 3774227262578685632, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -4.331072
+      objectReference: {fileID: 0}
+    - target: {fileID: 3774227262578685632, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -5.227002
+      objectReference: {fileID: 0}
+    - target: {fileID: 4160484829641273989, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 1.7414773
+      objectReference: {fileID: 0}
+    - target: {fileID: 4160484829641273989, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -4.945383
+      objectReference: {fileID: 0}
+    - target: {fileID: 4160484829641273989, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 1.8972045
+      objectReference: {fileID: 0}
+    - target: {fileID: 4507948212091573638, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -0.25043866
+      objectReference: {fileID: 0}
+    - target: {fileID: 4507948212091573638, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0.7887339
+      objectReference: {fileID: 0}
+    - target: {fileID: 4507948212091573638, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -86.748604
+      objectReference: {fileID: 0}
+    - target: {fileID: 4767367027770837779, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0.00000034887654
+      objectReference: {fileID: 0}
+    - target: {fileID: 4767367027770837779, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0.00000053694305
+      objectReference: {fileID: 0}
+    - target: {fileID: 4767367027770837779, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 56.98636
+      objectReference: {fileID: 0}
+    - target: {fileID: 4822275404061651839, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 3.351873
+      objectReference: {fileID: 0}
+    - target: {fileID: 4822275404061651839, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -76.14278
+      objectReference: {fileID: 0}
+    - target: {fileID: 4822275404061651839, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 172.38069
+      objectReference: {fileID: 0}
+    - target: {fileID: 5285891935137925878, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0.00000026680428
+      objectReference: {fileID: 0}
+    - target: {fileID: 5285891935137925878, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -3.975693e-15
+      objectReference: {fileID: 0}
+    - target: {fileID: 5285891935137925878, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -0.0000008537735
+      objectReference: {fileID: 0}
+    - target: {fileID: 5874576581009404053, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -0.0000002134434
+      objectReference: {fileID: 0}
+    - target: {fileID: 5874576581009404053, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0.00000017550717
+      objectReference: {fileID: 0}
+    - target: {fileID: 5935693166408044972, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -82.921104
+      objectReference: {fileID: 0}
+    - target: {fileID: 5935693166408044972, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -121.02301
+      objectReference: {fileID: 0}
+    - target: {fileID: 5935693166408044972, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -148.73994
+      objectReference: {fileID: 0}
+    - target: {fileID: 6273103542873688915, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 6.0470133
+      objectReference: {fileID: 0}
+    - target: {fileID: 6273103542873688915, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -3.687102
+      objectReference: {fileID: 0}
+    - target: {fileID: 6273103542873688915, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -90.43185
+      objectReference: {fileID: 0}
+    - target: {fileID: 7371147805621560460, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0.00000028332073
+      objectReference: {fileID: 0}
+    - target: {fileID: 7371147805621560460, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -0.0000003571948
+      objectReference: {fileID: 0}
+    - target: {fileID: 7371147805621560460, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 17.864794
+      objectReference: {fileID: 0}
+    - target: {fileID: 7730255771853800278, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 6.45776
+      objectReference: {fileID: 0}
+    - target: {fileID: 7730255771853800278, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 175.33777
+      objectReference: {fileID: 0}
+    - target: {fileID: 7730255771853800278, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -2.5159268
+      objectReference: {fileID: 0}
+    - target: {fileID: 8111075051590118454, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0.0000008537736
+      objectReference: {fileID: 0}
+    - target: {fileID: 8111075051590118454, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0.0000003201651
+      objectReference: {fileID: 0}
+    - target: {fileID: 8366781386805531930, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -74.27346
+      objectReference: {fileID: 0}
+    - target: {fileID: 8366781386805531930, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 21.722797
+      objectReference: {fileID: 0}
+    - target: {fileID: 8366781386805531930, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -1.384197
+      objectReference: {fileID: 0}
+    - target: {fileID: 8829209907158793001, guid: 32dbba626ec420c4091ae2749f70007d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0.000007629394
+      objectReference: {fileID: 0}
    - target: {fileID: 8996005110853184548, guid: 32dbba626ec420c4091ae2749f70007d,
        type: 3}
      propertyPath: m_LocalScale.x
@@ -17603,7 +17979,7 @@ MonoBehaviour:
  soundPlayedEventActive: 0
  soundPlayedCustomEvent: 
  willCleanUpDelegatesAfterStop: 1
-  frames: 178
+  frames: 184
 --- !u!1 &1519347538
 GameObject:
  m_ObjectHideFlags: 0
@@ -20838,6 +21214,216 @@ MonoBehaviour:
  soundPlayedCustomEvent: 
  willCleanUpDelegatesAfterStop: 1
  frames: 178
+--- !u!1 &1644802464
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1644802465}
+  - component: {fileID: 1644802468}
+  - component: {fileID: 1644802467}
+  - component: {fileID: 1644802466}
+  m_Layer: 2
+  m_Name: 1.511
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1644802465
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1644802464}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2017402955}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1644802466
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1644802464}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e1b7eb7dcef8b0e48a8572747ca7c64d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &1644802467
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1644802464}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 931518f9ca6c3844891dee74db8ed494, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  weight: 1
+  probabilityToPlay: 100
+  importance: 5
+  isUninterruptible: 0
+  useLocalization: 0
+  useRandomPitch: 0
+  randomPitchMode: 0
+  randomPitchMin: 0
+  randomPitchMax: 0
+  useRandomVolume: 0
+  randomVolumeMode: 0
+  randomVolumeMin: 0
+  randomVolumeMax: 0
+  clipAlias: 
+  audLocation: 0
+  resourceFileName: 
+  original_pitch: 0
+  original_volume: 0
+  isExpanded: 1
+  isChecked: 1
+  useFades: 0
+  fadeInTime: 0
+  fadeOutTime: 0
+  useCustomLooping: 0
+  minCustomLoops: 1
+  maxCustomLoops: 5
+  useRandomStartTime: 0
+  randomStartMinPercent: 0
+  randomStartMaxPercent: 0
+  randomEndPercent: 100
+  useIntroSilence: 0
+  introSilenceMin: 0
+  introSilenceMax: 0
+  fadeMaxVolume: 0
+  curFadeMode: 0
+  curPitchMode: 0
+  curDetectEndMode: 0
+  frames: 0
+--- !u!82 &1644802468
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1644802464}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 8300000, guid: 8f2b2ac00f9c3974790e9c513b1dff90, type: 3}
+  m_PlayOnAwake: 0
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 0
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 10
+  MaxDistance: 100
+  Pan2D: 0
+  rolloffMode: 2
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0.1
+      value: 1
+      inSlope: -10.0039835
+      outSlope: -10.0039835
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.2
+      value: 0.5
+      inSlope: -2.5009959
+      outSlope: -2.5009959
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.4
+      value: 0.25
+      inSlope: -0.62524897
+      outSlope: -0.62524897
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: -0.10003992
+      outSlope: -0.10003992
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
 --- !u!1 &1674033034
 GameObject:
  m_ObjectHideFlags: 0
@@ -23734,7 +24320,7 @@ MonoBehaviour:
  soundPlayedEventActive: 0
  soundPlayedCustomEvent: 
  willCleanUpDelegatesAfterStop: 1
-  frames: 178
+  frames: 271
 --- !u!1 &1879102618
 GameObject:
  m_ObjectHideFlags: 0
@@ -24613,6 +25199,11 @@ PrefabInstance:
      propertyPath: m_Name
      value: "\u670D\u52A1\u545801"
      objectReference: {fileID: 0}
+    - target: {fileID: 5950023880932285195, guid: 0b40cfe23cbd2994b94778e3551ab70c,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 7029301355487061821, guid: 0b40cfe23cbd2994b94778e3551ab70c,
        type: 3}
      propertyPath: m_LocalScale.x
@@ -25084,6 +25675,105 @@ Transform:
  m_Children: []
  m_Father: {fileID: 418719605}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2017402954
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2017402955}
+  - component: {fileID: 2017402956}
+  m_Layer: 2
+  m_Name: 1.51
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2017402955
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2017402954}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1644802465}
+  m_Father: {fileID: 1141237067}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2017402956
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2017402954}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: db10a6d491569a8419b6f5e1bffc5243, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  busIndex: -1
+  spatialBlendType: 1
+  spatialBlend: 1
+  groupPlayType: 0
+  isSelected: 0
+  isExpanded: 1
+  groupMasterVolume: 1
+  retriggerPercentage: 100
+  curVariationMode: 0
+  alwaysHighestPriority: 0
+  ignoreListenerPause: 0
+  importance: 5
+  isUninterruptible: 0
+  chainLoopDelayMin: 0
+  chainLoopDelayMax: 0
+  chainLoopMode: 0
+  chainLoopNumLoops: 0
+  useDialogFadeOut: 0
+  dialogFadeOutTime: 0.5
+  curVariationSequence: 0
+  useNoRepeatRefill: 1
+  useInactivePeriodPoolRefill: 0
+  inactivePeriodSeconds: 5
+  groupVariations:
+  - {fileID: 1644802467}
+  bulkVariationMode: 0
+  comments: 
+  logSound: 0
+  copySettingsExpanded: 0
+  expandLinkedGroups: 0
+  childSoundGroups: []
+  endLinkedGroups: []
+  linkedStartGroupSelectionType: 0
+  linkedStopGroupSelectionType: 0
+  limitMode: 0
+  limitPerXFrames: 1
+  minimumTimeBetween: 0.1
+  useClipAgePriority: 0
+  limitPolyphony: 0
+  voiceLimitCount: 1
+  targetDespawnedBehavior: 0
+  despawnFadeTime: 1
+  isUsingOcclusion: 0
+  willOcclusionOverrideRaycastOffset: 0
+  occlusionRayCastOffset: 0
+  willOcclusionOverrideFrequencies: 0
+  occlusionMaxCutoffFreq: 0
+  occlusionMinCutoffFreq: 22000
+  isSoloed: 0
+  isMuted: 0
+  soundPlayedEventActive: 0
+  soundPlayedCustomEvent: 
+  willCleanUpDelegatesAfterStop: 1
+  frames: 178
 --- !u!1 &2032735235
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/_Alice/Scripts/Base/GameManager.cs
+++ b/Assets/_Alice/Scripts/Base/GameManager.cs
@@ -76,10 +76,8 @@ public class GameManager : MonoBehaviour
        HUDPanel.Show();
        taskManager.bg.SetActive(true);
        CreateEnemy(new Vector3(0,1,5), new Vector3(0,180,0));
-        
        // enemy.SetState(2);
        // taskManager.curTaskId = 2;
-        // taskManager.StartTask();
        
        // taskManager.curTaskId = 3;
        // taskManager.StartTask();
@@ -196,9 +194,9 @@ public class GameManager : MonoBehaviour

    public GameObject CreateGemKey(Vector3 pos,Vector3 eulerAngles,Transform box)
    {
-       var key= Instantiate(gemKeyPre, pos,Quaternion.identity);
-       key.transform.eulerAngles = eulerAngles;
-       key.transform.parent = box;
+       var key= Instantiate(gemKeyPre, pos,Quaternion.identity,box);
+       key.transform.localEulerAngles = eulerAngles;
+       key.transform.localPosition = pos;
       return key;
    }
    
@@ -220,6 +218,8 @@ public class GameManager : MonoBehaviour

    public void PlayerHit()
    {
+        if(enemy.isDie)
+            return;
        //玩家UI模糊
        HUDPanel.Ins.ShowEgg();
        Debug.Log("击中玩家");
@@ -228,6 +228,8 @@ public class GameManager : MonoBehaviour

    public void EnemyHit(Vector3 pos)
    {
+        if(enemy.isDie)
+            return;
        enemy.Hit();
        PlaySound3DRPC("1.49",enemy.transform,true);
        CreateEggEx(pos);
--- a/Assets/_Alice/Scripts/Item/CarrotGem.cs
+++ b/Assets/_Alice/Scripts/Item/CarrotGem.cs
@@ -80,7 +80,7 @@ public class CarrotGem : MonoBehaviour
        {
            LaunchTowards(GameManager.Ins.playerRightHand.transform);
            yield return !_isMove;
-            GameManager.Ins.PlaySound2DRPC("1.13");
+            GameManager.Ins.PlaySound2DRPC("1.51");
            _isGet = true;
            yield return new WaitForSeconds(4f);
            GameManager.Ins.taskManager.CompleteTask();
--- a/Assets/_Alice/Scripts/Item/TaskBox.cs
+++ b/Assets/_Alice/Scripts/Item/TaskBox.cs
@@ -19,6 +19,8 @@ public class TaskBox : MonoBehaviour
    public GameObject[] effectObjs;
    
    public TaskBoxType taskBoxType;
+
+    public Transform lockPos;
    
    [Header("References")]
    public ParticleSystem explosionEffect; // 宝箱爆炸烟雾粒子
@@ -58,16 +60,9 @@ public class TaskBox : MonoBehaviour
            transform.eulerAngles = new Vector3(0, 180, 0);
            MonoSingleton<CoroutineTaskManager>.Instance.WaitSecondTodo(() =>
            {
-                if (!isOpen)
-                {
-                    GameManager.Ins.playerRightHand.ChangeHand();
-                    var key = GameManager.Ins.playerRightHand.gemKey;
-                    _gemKey= GameManager.Ins.CreateGemKey(key.transform.position,key.transform.eulerAngles,transform);
-                    GameManager.Ins.PlaySound2DRPC("1.39");
-                    StartCoroutine(CreatePuzzle());
-                    isOpen = true;
-                }
-            },6f);
+                if(!isOpen)
+                    GameManager.Ins.playerRightHand.MoveGemKey(lockPos,GetKey);
+            },12f);
        }
        
    }
@@ -215,17 +210,29 @@ public class TaskBox : MonoBehaviour
        Destroy(gameObject);
    }

-    private GameObject _gemKey;
-    private void OnTriggerEnter(Collider other)
+    private void Update()
    {
-        if (other.tag == "GemKey")
+        if (taskBoxType == TaskBoxType.TaskEndBox&&GameManager.Ins.playerRightHand.gemKeyUp!=null)
        {
-            GameManager.Ins.playerRightHand.ChangeHand();
-            var key = GameManager.Ins.playerRightHand.gemKey;
-            _gemKey= GameManager.Ins.CreateGemKey(key.transform.position,key.transform.eulerAngles,transform);
-            GameManager.Ins.PlaySound2DRPC("1.39");
-            StartCoroutine(CreatePuzzle());
-            isOpen = true;
+            var dir = Vector3.Distance(GameManager.Ins.playerRightHand.gemKeyUp.position, lockPos.position);
+            if (dir < 0.1f)
+            {
+               GetKey();
+            }
        }
    }
+
+    public void GetKey()
+    {
+        if(isOpen)
+            return;
+        GameManager.Ins.playerRightHand.ChangeHand();
+        var key = GameManager.Ins.playerRightHand.gemKey;
+        _gemKey= GameManager.Ins.CreateGemKey(new Vector3(0,0.2f,0.3f),new Vector3(0,90,90),transform);
+        GameManager.Ins.PlaySound2DRPC("1.39");
+        StartCoroutine(CreatePuzzle());
+        Destroy(key);
+        isOpen = true;
+    }
+    private GameObject _gemKey;
 }
--- a/Assets/_Alice/Scripts/Player/RightHand.cs
+++ b/Assets/_Alice/Scripts/Player/RightHand.cs
@@ -25,6 +25,7 @@ public class RightHand : MonoBehaviour

    public GameObject gemKeyHand;
    public GameObject gemKey;
+    public Transform gemKeyUp;

    public GameObject skillet;
    public GameObject skilletEx;
@@ -161,8 +162,9 @@ public class RightHand : MonoBehaviour
            item.SetActive(true);
        }
        yield return new WaitForSeconds(3f);
-        gems[0].transform.DOMove(gems[1].transform.position, 2f);
-        gems[2].transform.DOMove(gems[1].transform.position, 2f).OnComplete(()=>
+        Vector3 targetLocalPos = gems[1].transform.localPosition;
+        gems[0].transform.DOLocalMove(targetLocalPos, 2f);
+        gems[2].transform.DOLocalMove(targetLocalPos, 2f).OnComplete(()=>
        {
            GameManager.Ins.PlaySound2DRPC("1.37");
            GameManager.Ins.PlaySound2DRPC("1.14");
@@ -175,6 +177,16 @@ public class RightHand : MonoBehaviour
        });
    }

+    public void MoveGemKey(Transform target,Action cb)
+    {
+        gemKey.transform.parent = null;
+        gemKey.transform.DOMove(target.position, 2f).OnComplete(() =>
+        {
+            cb();
+        });
+        gemKey.transform.DORotate(new Vector3(0, -90, 90), 2f);
+    }
+
    public void ChangeHand()
    {
        hand.SetActive(true);
--- a/Assets/_Alice/Scripts/Task/BattleTask/EggBullet.cs
+++ b/Assets/_Alice/Scripts/Task/BattleTask/EggBullet.cs
@@ -31,7 +31,7 @@ public class EggBullet : MonoBehaviour
    private float arrivalThreshold = 0.1f; // 到达目标的容差

    [Header("Bouncing Mode Settings")]
-    private int bounceCount = 3;       // 弹跳次数
+    private int bounceCount = 2;       // 弹跳次数
    private float bounceHeight = 1.5f;   // 弹跳高度

    [Header("Curved Mode Settings")]
@@ -49,7 +49,6 @@ public class EggBullet : MonoBehaviour
        type = EggBulletType.EnemyType;
        isDie = false;
        int id = Random.Range(1, 4);
-        //id = 3;
        flyMode = (FlyMode)id;
        _enemyTran = GameManager.Ins.enemy.body;
        _playerTran = GameLocal.Ins.self.transform;
--- a/Assets/_Alice/Scripts/Task/GemTask/CarrotGemTask.cs
+++ b/Assets/_Alice/Scripts/Task/GemTask/CarrotGemTask.cs
@@ -15,7 +15,6 @@ public class CarrotGemTask : Task
        base.StartTask();
        winTaskTime = Random.Range(40, 61);
        endTaskTime = 60;
-        
        GameManager.Ins.playerRightHand._isOpenLine = false;
    }
    
--- a/Assets/_Alice/Scripts/UI/HUDPanel.cs
+++ b/Assets/_Alice/Scripts/UI/HUDPanel.cs
@@ -45,11 +45,11 @@ public class HUDPanel : UIBehaviour
        go.rectTransform.anchoredPosition=new Vector2(randomX,randomY);
        MonoSingleton<CoroutineTaskManager>.Instance.WaitSecondTodo(() =>
        {
-            go.GetComponent<CanvasGroup>().DOFade(0, 3).OnComplete(() =>
+            go.GetComponent<CanvasGroup>().DOFade(0, 2).OnComplete(() =>
            {
                Destroy(go.gameObject);
            });
-        },3f);
+        },2f);
        
    }

--- a/Assets/sucai/MagicSheildBubbles_HDRP/Art/Materials/Point01.mat
+++ b/Assets/sucai/MagicSheildBubbles_HDRP/Art/Materials/Point01.mat
@@ -34,28 +34,27 @@ Material:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: Point01
-  m_Shader: {fileID: -6465566751694194690, guid: c56a7b9df1d72ea468b1aec67ff5600e, type: 3}
+  m_Shader: {fileID: 4800000, guid: 050a1819cb9a36e4b8fefcefd0d896f7, type: 3}
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
  m_ValidKeywords:
-  - DISSOLVE_OFFSET_MODE_A
-  - MAINTEX_OFFSET_MODE_A
-  - VERTEXAIN_OFFSET_MODE_A
-  m_InvalidKeywords:
-  - _DOUBLESIDED_ON
-  - _ENABLE_FOG_ON_TRANSPARENT
  - _SURFACE_TYPE_TRANSPARENT
+  m_InvalidKeywords:
+  - _FLIPBOOKBLENDING_OFF
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 1
+  m_DoubleSidedGI: 0
  m_CustomRenderQueue: 3000
  stringTagMap:
    MotionVector: User
+    RenderType: Transparent
  disabledShaderPasses:
  - TransparentBackface
  - MOTIONVECTORS
  - TransparentDepthPrepass
  - TransparentDepthPostpass
+  - DepthOnly
+  - SHADOWCASTER
  m_LockedProperties: 
  m_SavedProperties:
    serializedVersion: 3
@@ -68,6 +67,10 @@ Material:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    - _BaseMap:
+        m_Texture: {fileID: 2800000, guid: cb0abc3e1307df841b05e31261c3a0c7, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
    - _BentNormalMap:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
@@ -76,6 +79,10 @@ Material:
        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}
    - _CoatMaskMap:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
@@ -92,6 +99,10 @@ Material:
        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}
    - _EmissiveColorMap:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
@@ -182,6 +193,7 @@ Material:
    - _ATDistance: 1
    - _AddPrecomputedVelocity: 0
    - _AlbedoAffectEmissive: 0
+    - _AlphaClip: 0
    - _AlphaCutoff: 0.5
    - _AlphaCutoffEnable: 0
    - _AlphaCutoffPostpass: 0.5
@@ -192,8 +204,15 @@ Material:
    - _AlphaToMask: 0
    - _AlphaToMaskInspectorValue: 0
    - _Anisotropy: 0
+    - _Blend: 0
    - _BlendMode: 1
+    - _BlendOp: 0
+    - _CameraFadingEnabled: 0
+    - _CameraFarFadeDistance: 2
+    - _CameraNearFadeDistance: 1
    - _CoatMask: 0
+    - _ColorMode: 0
+    - _Cull: 2
    - _CullMode: 0
    - _CullModeForward: 0
    - _Cutoff: 0.5
@@ -207,6 +226,7 @@ Material:
    - _DisplacementLockTilingScale: 1
    - _DisplacementMode: 0
    - _Dissolve_Side: 0
+    - _DistortionBlend: 0.5
    - _DistortionBlendMode: 0
    - _DistortionBlurBlendMode: 0
    - _DistortionBlurDstBlend: 1
@@ -217,13 +237,17 @@ Material:
    - _DistortionDepthTest: 1
    - _DistortionDstBlend: 1
    - _DistortionEnable: 0
+    - _DistortionEnabled: 0
    - _DistortionScale: 1
    - _DistortionSrcBlend: 1
+    - _DistortionStrength: 1
+    - _DistortionStrengthScaled: 0.1
    - _DistortionVectorBias: -1
    - _DistortionVectorScale: 2
    - _DoubleSidedEnable: 1
    - _DoubleSidedNormalMode: 2
-    - _DstBlend: 1
+    - _DstBlend: 10
+    - _DstBlendAlpha: 10
    - _EmissiveColorMode: 1
    - _EmissiveExposureWeight: 1
    - _EmissiveIntensity: 1
@@ -232,6 +256,8 @@ Material:
    - _EnableFogOnTransparent: 1
    - _EnableGeometricSpecularAA: 0
    - _EnergyConservingSpecularColor: 1
+    - _FlipbookBlending: 0
+    - _FlipbookMode: 0
    - _HeightAmplitude: 0.02
    - _HeightCenter: 0.5
    - _HeightMapParametrization: 0
@@ -250,6 +276,7 @@ Material:
    - _MaskWave_Value: 0
    - _MaterialID: 1
    - _Metallic: 0
+    - _Mode: 0
    - _NormalMapSpace: 0
    - _NormalScale: 1
    - _OpaqueCullMode: 2
@@ -267,10 +294,14 @@ Material:
    - _Smoothness: 0.5
    - _SmoothnessRemapMax: 1
    - _SmoothnessRemapMin: 0
+    - _SoftParticlesEnabled: 0
+    - _SoftParticlesFarFadeDistance: 1
+    - _SoftParticlesNearFadeDistance: 0
    - _SpecularAAScreenSpaceVariance: 0.1
    - _SpecularAAThreshold: 0.2
    - _SpecularOcclusionMode: 1
-    - _SrcBlend: 1
+    - _SrcBlend: 5
+    - _SrcBlendAlpha: 1
    - _StencilRef: 0
    - _StencilRefDepth: 0
    - _StencilRefDistortionVec: 4
@@ -282,6 +313,7 @@ Material:
    - _StencilWriteMaskGBuffer: 14
    - _StencilWriteMaskMV: 40
    - _SubsurfaceMask: 1
+    - _Surface: 1
    - _SurfaceType: 1
    - _TexWorldScale: 1
    - _TexWorldScaleEmissive: 1
@@ -308,7 +340,9 @@ Material:
    - _ZWrite: 0
    m_Colors:
    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
    - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
+    - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0}
    - _DissolveColor: {r: 1, g: 1, b: 1, a: 1}
@@ -321,6 +355,7 @@ Material:
    - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
    - _MainTex_Offset: {r: 1, g: 1, b: 0, a: 0}
    - _MaskTex_Offset: {r: 1, g: 1, b: 0, a: 0}
+    - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
    - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
    - _ThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
    - _TintColor: {r: 2.9960785, g: 2.9960785, b: 2.9960785, a: 1}
--- a/Assets/sucai/坏母后/说话.anim
+++ b/Assets/sucai/坏母后/说话.anim
				`@@ -1 +0,0 @@`
				{"EnemysInfo":{"Columns":["ID","Type","Name","CN_Name","Lvl","Hp","Atk","Speed","Toughness","AtkArea","Priority","Radius","Height"],"Values":[[ 0, 0,"HR01","\u5C0F\u571F\u8C46", 1, 200, 8,0.5, 100,"[2,4]", 1,0.3,0.7],[ 1, 1,"PHR01","\u98DE\u5154", 1, 150, 8,0.5, 100,"[3,6]", 1,0.4, 1.85],[ 2, 2,"MR3","\u5927\u5934", 1, 600, 12,0.6, 100,"[5.0,6.0]", 1,0.4, 1.1],[ 3, 3,"GRMII","\u963F\u5F3A", 1, 800, 10,0.5, 100,"[5.0,6.0]", 1,0.5, 1.3],[ 4, 4,"NXR03","\u5C0F\u871C\u8702", 1, 400, 40, 2, 100,"[0,0.35]", 1,0.5, 3.6],[ 5, 5,"BLR02","\u767E\u592B\u957F", 1, 700, 18, 1, 100,"[5.0,6.0]", 1,0.5, 1.3],[ 6, 6,"SDRRMI","\u6218\u9524", 1, 800, 10, 2, 100,"[1.5,2.5]", 1,0.8, 2],[ 7, 7,"DragonBoss","\u63D0\u4E9A\u739B\u7279", 1, 3000, 100, 1, 100,"[7.0,7.8]", 1,0.5, 6.5],[ 8, 8,"AirdropBlood","\u7269\u8D44\u8840\u5305", 1, 1, 0, 1, 0,"[0,0]", 1,0.5, 1.3],[ 9, 9,"AirdropJoinControl","\u7269\u8D44\u8054\u63A7", 1, 1, 0, 1, 0,"[0,0]", 1,0.5, 1.3]]},"TowersInfo":{"Columns":["ID","Type","Name","CN_Name","Lvl","Hp","SearchArea","RotateSpeed","GCD"],"Values":[[ 0, 0,"PowerCore","\u7535\u529B\u6838\u5FC3", 1, 2000, 0, 0, 0],[ 1, 1,"DoubleTubeTower","\u53CC\u7BA1\u901F\u5C04\u70AE", 1, 2500, 8,0.2, 1],[ 2, 2,"GatlingTower","\u4E94\u8054\u52A0\u7279\u6797", 1, 2500, 10,0.4,0.1],[ 3, 3,"ElectroTower","\u8D85\u5BFC\u7535\u78C1\u70AE", 1, 2500, 10,0.4, 2]]},"GunsInfo":{"Columns":["ID","Type","Name","CN_Name","Lvl","Recoil","ShootRate"],"Values":[[ 0, 0,"QuickGun","\u901F\u51FB\u67AA", 1, 80, 4],[ 1, 1,"HR01Gun","HR01\u7528\u67AA", 1, 20, 1],[ 2, 2,"PHR01Gun","PHR01\u7528\u67AA", 1, 20, 1],[ 3, 3,"MR3Gun","MR3\u7528\u67AA", 1, 20, 1],[ 4, 4,"GRMIIGun","GRMII\u7528\u67AA", 1, 20, 1],[ 5, 5,"BLR02Gun","BLR02\u7528\u67AA", 1, 20, 1],[ 6, 6,"GatlingGun","\u52A0\u7279\u6797\u7528\u67AA", 1, 80, 10],[ 7, 7,"ElectroGun","\u7535\u78C1\u70AE\u7528\u67AA", 1, 10, 1],[ 8, 8,"DragonBossGun","DragonBoss\u7528\u67AA", 1, 80, 10],[ 9, 9,"Pistol","\u624B\u67AA", 1, 80, 10]]},"BulletsInfo":{"Columns":["ID","Type","Name","CN_Name","Lvl","Damage","DeToughness"],"Values":[[ 0, 0,"QuickBullet","\u5FEB\u5F39", 1, 10, 10],[ 1, 1,"HR01Bullet","HR01\u7528\u5F39", 1, 10, 0],[ 2, 2,"PHR01Bullet","PHR01\u7528\u5F39", 1, 10, 0],[ 3, 3,"MR3Bullet","MR3\u7528\u5F39", 1, 15, 0],[ 4, 4,"GRMIIBullet","GRMII\u7528\u5F39", 1, 12, 0],[ 5, 5,"BLR02Bullet","BLR02\u7528\u5F39", 1, 20, 0],[ 6, 6,"GatlingBullet","\u52A0\u7279\u6797\u7528\u5F39", 1, 8, 0],[ 7, 7,"ElectroBullet","\u7535\u78C1\u70AE\u7528\u67AA", 1, 80, 10],[ 8, 8,"DragonBossBullet","DragonBoss\u7528\u5F39", 1, 290, 10],[ 9, 9,"PistolBullet","\u624B\u67AA\u7528\u5F39", 1, 10, 10]]},"DefensesInfo":{"Columns":["ID","TowerType","BornPos","BornAngleY"],"Values":[[ 0, 0,"(1.08,0,2.8)", 0],[ 1, 1,"(-4.75,0,4.57)", 49.615],[ 2, 1,"(-5.73,0,6.02)", 47.998],[ 3, 1,"(-1.03,0,7.17)",-126.925],[ 4, 1,"(-2.25,0,8.68)",-128.42],[ 5, 2,"(-1.65,0,3.91)",-34.406],[ 6, 2,"(0.54,0,5.18)",-36.403],[ 7, 3,"(-4.6,0,2.06)",-32.015]]},"StoryProgressInfo":{"Columns":["ID","Belong","EnemyType","Special","BornPos","BornAngleY","BornTime"],"Values":[[ 0, 0, 0, 0,"(-12.34,0,12.21)", 130, 1],[ 1, 0, 0, 0,"(-11.48,0,13.24)", 130, 1.5],[ 2, 0, 0, 0,"(-10.71,0,14.16)", 130, 1.8],[ 3, 0, 9, 1,"(-5.43,6.82,7.8)", 180, 2],[ 4, 0, 0, 0,"(-8.45,0,16.85)", 139.148, 2],[ 5, 0, 0, 0,"(-7.5,0,17.98)", 157.038, 2.3],[ 6, 0, 7, 0,"(-12.34,2.5,12.21)", 157.038, 3.5],[ 7, 0, 0, 0,"(-6.7,0,16.08)", 146.678, 4],[ 8, 0, 0, 0,"(-12.34,0,12.21)", 130, 5.5],[ 9, 0, 0, 0,"(-11.48,0,13.24)", 130, 6],[ 10, 0, 0, 0,"(-10.71,0,14.16)", 130, 6.5],[ 11, 0, 9, 1,"(-5.43,6.82,7.8)", 180, 7],[ 12, 0, 0, 0,"(-8.45,0,16.85)", 139.148, 8],[ 13, 1, 0, 0,"(-12.34,0,12.21)", 130, 1],[ 14, 1, 0, 0,"(-11.48,0,13.24)", 130, 1.5],[ 15, 1, 0, 0,"(-7.5,0,17.98)", 157.038, 1.8],[ 16, 1, 0, 0,"(-8.45,0,16.85)", 139.148, 2],[ 17, 1, 1, 0,"(-12.34,0,12.21)", 130, 4],[ 18, 1, 1, 0,"(-11.48,0,13.24)", 130, 4.5],[ 19, 1, 1, 0,"(-6.7,0,16.08)", 146.678, 5.8],[ 20, 1, 9, 1,"(-5.43,6.82,7.8)", 180, 5.8],[ 21, 1, 1, 0,"(-7.5,0,17.98)", 157.038, 6],[ 22, 2, 1, 0,"(-12.34,0,12.21)", 130, 1],[ 23, 2, 1, 0,"(-11.48,0,13.24)", 130, 1.5],[ 24, 2, 1, 0,"(-10.71,0,14.16)", 130, 2],[ 25, 2, 1, 0,"(-8.45,0,16.85)", 139.148, 2.5],[ 26, 2, 1, 0,"(-7.5,0,17.98)", 157.038, 3.2],[ 27, 2, 1, 0,"(-6.7,0,16.08)", 146.678, 3.8],[ 28, 2, 2, 0,"(-12.34,0,12.21)", 130, 4.6],[ 29, 2, 9, 1,"(-5.43,6.82,7.8)", 180, 5],[ 30, 2, 2, 0,"(-12.34,0,12.21)", 130, 6],[ 31, 2, 2, 0,"(-11.48,0,13.24)", 130, 7.8],[ 32, 2, 2, 0,"(-10.71,0,14.16)", 130, 9],[ 33, 3, 0, 0,"(-12.34,0,12.21)", 130,0.6],[ 34, 3, 0, 0,"(-11.48,0,13.24)", 130, 1],[ 35, 3, 2, 0,"(-10.71,0,14.16)", 130, 2.2],[ 36, 3, 2, 0,"(-8.45,0,16.85)", 139.148, 3.5],[ 37, 3, 2, 0,"(-7.5,0,17.98)", 157.038, 4],[ 38, 3, 2, 0,"(-6.7,0,16.08)", 146.678, 5.6],[ 39, 3, 2, 0,"(-12.34,0,12.21)", 130, 6],[ 40, 3, 2, 0,"(-11.48,0,13.24)", 130, 7.3],[ 41, 3, 3, 0,"(-10.71,0,14.16)", 130, 9],[ 42, 3, 3, 0,"(-8.45,0,16.85)", 139.148, 11],[ 43, 3, 3, 0,"(-7.5,0,17.98)", 157.038, 13.6],[ 44, 3, 3, 0,"(-6.7,0,16.08)", 146.678, 15],[ 45, 4, 2, 0,"(-12.34,0,12.21)", 130,0.5],[ 46, 4, 2, 0,"(-11.48,0,13.24)", 130, 1.3],[ 47, 4, 3, 0,"(-10.71,0,14.16)", 130, 2.8],[ 48, 4, 3, 0,"(-6.7,0,16.08)", 146.678, 3.6],[ 49, 4, 5, 0,"(-7.5,0,17.98)", 146.678, 4.3],[ 50, 4, 5, 0,"(-12.34,0,12.21)", 130, 5.5],[ 51, 4, 5, 0,"(-8.45,0,16.85)", 139.148, 6.5],[ 52, 4, 5, 0,"(-7.5,0,17.98)", 146.678, 7.3],[ 53, 5, 0, 0,"(-12.34,0,12.21)", 146.678,0.8],[ 54, 5, 0, 0,"(-6.7,0,16.08)", 146.678, 1.7],[ 55, 5, 1, 0,"(-11.48,0,13.24)", 130, 2.9],[ 56, 5, 1, 0,"(-7.5,0,17.98)", 157.038, 4],[ 57, 5, 2, 0,"(-10.71,0,14.16)", 130, 5.5],[ 58, 5, 2, 0,"(-11.48,0,13.24)", 130, 6.4],[ 59, 5, 8, 1,"(-5.43,6.82,7.8)", 180, 7],[ 60, 5, 3, 0,"(-7.5,0,17.98)", 146.678, 7.8],[ 61, 5, 3, 0,"(-11.48,0,13.24)", 146.678, 8.2],[ 62, 5, 5, 0,"(-6.7,0,16.08)", 130, 9],[ 63, 5, 5, 0,"(-10.71,0,14.16)", 130, 10.1],[ 64, 6, 0, 0,"(-6.7,0,16.08)", 146.678, 1],[ 65, 6, 0, 0,"(-12.34,0,12.21)", 146.678, 1.8],[ 66, 6, 1, 0,"(-11.48,0,13.24)", 130, 2.3],[ 67, 6, 1, 0,"(-7.5,0,17.98)", 146.678, 3.5],[ 68, 6, 2, 0,"(-10.71,0,14.16)", 130, 4],[ 69, 6, 2, 0,"(-7.5,0,17.98)", 146.678, 4.5],[ 70, 6, 3, 0,"(-12.34,0,12.21)", 130, 4],[ 71, 6, 3, 0,"(-11.48,0,13.24)", 130, 4.8],[ 72, 6, 5, 0,"(-7.5,0,17.98)", 146.678, 5.6],[ 73, 6, 5, 0,"(-10.71,0,14.16)", 130, 6.5],[ 74, 6, 9, 1,"(-5.43,6.82,7.8)", 180, 7.1],[ 75, 6, 6, 0,"(-6.7,0,16.08)", 146.678, 8],[ 76, 6, 6, 0,"(-11.48,0,13.24)", 130, 8.2],[ 77, 7, 7, 0,"(-1,0,16.7)", 167, 1],[ 78, 7, 0, 0,"(-12.34,0,12.21)", 130, 4.5],[ 79, 7, 0, 0,"(-11.48,0,13.24)", 130, 5],[ 80, 7, 1, 0,"(-10.71,0,14.16)", 130, 5.5],[ 81, 7, 9, 1,"(-5.43,6.82,7.8)", 180, 5.7],[ 82, 7, 1, 0,"(-8.45,0,16.85)", 139.148, 6],[ 83, 7, 2, 0,"(-7.5,0,17.98)", 157.038, 6.5],[ 84, 7, 2, 0,"(-6.7,0,16.08)", 130, 7],[ 85, 7, 3, 0,"(-12.34,0,12.21)", 130, 7.5],[ 86, 7, 3, 0,"(-11.48,0,13.24)", 130, 8.5],[ 87, 7, 5, 0,"(-10.71,0,14.16)", 130, 9.5],[ 88, 7, 5, 0,"(-7.5,0,17.98)", 146.678, 10.5],[ 89, 7, 0, 0,"(-6.7,0,16.08)", 146.678, 11.2],[ 90, 7, 6, 0,"(-12.34,0,12.21)", 130, 12.5],[ 91, 7, 6, 0,"(-6.7,0,16.08)", 146.678, 14],[ 92, 7, 9, 1,"(-5.43,6.82,7.8)", 180, 18]]}}
				`@@ -0,0 +1 @@`
				`{"EnemysInfo":{"Columns":["ID"],"Values":[[ 0],[ 1],[ 2],[ 3],[ 4],[ 5],[ 6],[ 7],[ 8],[ 9]]}}`