水水母

meng_yao/Assets/Scenes/New/Scene_map_1gl.unity

@@ -4373,6 +4373,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1337722729}
   - component: {fileID: 1337722730}
+  - component: {fileID: 1337722731}
   m_Layer: 0
   m_Name: ReadJson
   m_TagString: Untagged
@@ -4412,6 +4413,20 @@ MonoBehaviour:
   LevelAsset: {fileID: 4900000, guid: 89bbacca41b409b4dbf238a43bbb2e4b, type: 3}
   SkillAsset: {fileID: 4900000, guid: 3d441bff04ee5a64ea8b8967bcfbc070, type: 3}
   m_Level: []
+--- !u!114 &1337722731
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1337722728}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f1617263e713d804995e0d3f3073e0cb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  MapLevelJson: {fileID: 4900000, guid: b534002cbb7fddf4bb68f34fb1357ff3, type: 3}
+  count: 0
 --- !u!1 &1342038372
 GameObject:
   m_ObjectHideFlags: 0
@@ -5845,7 +5860,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1884241085}
-  - component: {fileID: 1884241086}
   - component: {fileID: 1884241087}
   m_Layer: 0
   m_Name: SpawnMonster
@@ -5869,28 +5883,6 @@ Transform:
   m_Father: {fileID: 284432670}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1884241086
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1884241084}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fdf69f16194abb24d9e887468940e1cb, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  retbutton: {fileID: 0}
-  ClosureObj: {fileID: 0}
-  Enemys: []
-  Prefab: {fileID: 4703411402065954783, guid: aac4ad2c72526a54691494dd54e115a6, type: 3}
-  SpawnLocation: {fileID: 734893407}
-  GenerationInterval: 15
-  GenerationIntervalOfOne: 2
-  GenerateQuantityMax: 20
-  GenerateQuantity: 5
-  deadNumber: 0
 --- !u!114 &1884241087
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5905,7 +5897,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   retbutton: {fileID: 0}
   ClosureObj: {fileID: 0}
-  SpawnLocations: []
+  SpawnLocations:
+  - {fileID: 734893407}
   enemysList: []
 --- !u!1 &1910338484
 GameObject:
@@ -5953,6 +5946,30 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   mengyaoItems:
+  - id: M_T_002
+    prefab: {fileID: 8433650275485930554, guid: 0e629856be1575e4a9258394dee87cc7, type: 3}
+    cardprefab: {fileID: 6655435212987556048, guid: c7cffe9eb5ea6bb4791fe5c8bb025f01, type: 3}
+  - id: M_J_001
+    prefab: {fileID: 8433650275485930554, guid: 1e8a70ff26520dd4a8744ae2156d16d3, type: 3}
+    cardprefab: {fileID: 5508436327438263543, guid: c61070f2dd2a750439bf3913156d4f7b, type: 3}
+  - id: M_H_001
+    prefab: {fileID: 8433650275485930554, guid: 67d13a9263159eb49993b8cc68eb3785, type: 3}
+    cardprefab: {fileID: 1126466392417920613, guid: 0dd4a50e59d08e84fb1439c946c24fdc, type: 3}
+  - id: M_M_001
+    prefab: {fileID: 8433650275485930554, guid: 4f81cc16b1203d549b927ed7da53fdbf, type: 3}
+    cardprefab: {fileID: 6655435212987556048, guid: 383e65ed01369d345a73d626ab713888, type: 3}
+  - id: M_M_002
+    prefab: {fileID: 8433650275485930554, guid: b7a992fcbbc242e4eb0b83eea3bfab81, type: 3}
+    cardprefab: {fileID: 6655435212987556048, guid: edec2410bf23cdd40a210a28e9c3624f, type: 3}
+  - id: M_S_001
+    prefab: {fileID: 8433650275485930554, guid: 1ce7ba2999a588840be40787ac4fb7fc, type: 3}
+    cardprefab: {fileID: 5508436327438263543, guid: 12644a2c53bfc72489ad76e8f81628f5, type: 3}
+  - id: M_S_002
+    prefab: {fileID: 8433650275485930554, guid: 71d5f6e53fdb1674aae2e6fa1acf423d, type: 3}
+    cardprefab: {fileID: 5508436327438263543, guid: db8f2924fd8bba94e881e4b275b8b48a, type: 3}
+  - id: M_H_002
+    prefab: {fileID: 8433650275485930554, guid: b23a54d617796b04d832ddf0cd85a319, type: 3}
+    cardprefab: {fileID: 1126466392417920613, guid: 3de98a391a58e5a4fa74ff1107105986, type: 3}
   - id: M_S_003
     prefab: {fileID: 8433650275485930554, guid: 289ffd028fbe21746a0f4b8c15273104, type: 3}
     cardprefab: {fileID: 5508436327438263543, guid: caccfa6e2b899134ab6db84047d090f7, type: 3}
@@ -5971,6 +5988,8 @@ MonoBehaviour:
   monsters:
   - id: 
     prefab: {fileID: 4703411402065954783, guid: aac4ad2c72526a54691494dd54e115a6, type: 3}
+  - id: Enemy_001
+    prefab: {fileID: 4703411402065954783, guid: 6e6ba8758b8dcd743bb59f49094f13a6, type: 3}
 --- !u!1 &1932457212
 GameObject:
   m_ObjectHideFlags: 0

meng_yao/Assets/Scenes/New/Scene_map_1gl.unity.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 64228585e5997b646b23ba50dcf8dd0e
+guid: 6a5f3c28f71eee045b445e2c89394109
 DefaultImporter:
   externalObjects: {}
   userData: 

meng_yao/Assets/common

@@ -1 +1 @@
-Subproject commit 1e14910b4dbc8af410380e609bcfc0010370c5e2
+Subproject commit 8873ff33780bf44fc454aa318094170ac46c3b2f

meng_yao/Assets/script/A_Fight/SkillUp/ssm_SkillUp.cs

@@ -18,11 +18,11 @@ public class ssm_SkillUp : SkillUp
     {
         base.Start();
         
-         decelerationBuff = CreatePoisonBuff(poisonDuration,poisonInterval,poisonDamage);
+         decelerationBuff = CreatePoisonBuff(poisonDuration,poisonInterval,poisonDamage,role);
 
         // 将 Buff 添加到玩家的 storageBuff 列表中
         role.AddBuff(role.storageBuff, decelerationBuff);
-        Debug.LogError("使用技能1-3");
+   
     }
 
     
@@ -82,7 +82,7 @@ public class ssm_SkillUp : SkillUp
     private void SetPoisonBuff()//重置buff
     {
         role.RemoveBuff(role.storageBuff, decelerationBuff);
-        decelerationBuff = CreatePoisonBuff(poisonDuration, poisonInterval, poisonDamage);
+        decelerationBuff = CreatePoisonBuff(poisonDuration, poisonInterval, poisonDamage, role);
         role.AddBuff(role.storageBuff, decelerationBuff);
     }
 }

meng_yao/Assets/ssm_Ani/ssm_Attack2.anim

@@ -121,7 +121,7 @@ AnimationClip:
   m_HasMotionFloatCurves: 0
   m_Events:
   - time: 0.33333334
-    functionName: ShootBullet
+    functionName: ShanXingAttack
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0