Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks

meng_yao/Assets/Config/MengYaoSkill.json

@@ -1,226 +1,254 @@
 [
-    {
-        "temp_id": "M_H_001",
-        "monster_code": "火萌妖-01",
-        "skills": [
-            {
-                "positioning": "长周期烧一条直线上",
-                "name": "火龙之舌",
-                "effects": {
-                    "level_1": "射程提升2格位置",
-                    "level_2": "伤害提升15%",
-                    "level_3": "被火焰伤害的敌人有20%概率原地眩晕1秒，射程减少1格",
-                    "level_4": "伤害提升35%",
-                    "level_5": "喷火冷却时间减少50%，持续喷火时间减少50%"
-                }
-            },
-            {
-                "positioning": "近身攻击多个敌人",
-                "name": "烈焰之舞",
-                "effects": {
-                    "level_1": "喷出的火焰散开为3个，但每个火焰伤害减少50%",
-                    "level_2": "伤害提升15%",
-                    "level_3": "降低敌人20%移动速度，攻击CD增加5%",
-                    "level_4": "伤害提升35%",
-                    "level_5": "喷火冷却时间增加30%，持续喷火时间增加50%"
-                }
-            }
-        ]
-    },
-    {
-        "temp_id": "M_S_001",
-        "monster_code": "水萌妖-01",
-        "skills": [
-            {
-                "positioning": "快速射出子弹，增加对空伤害",
-                "name": "寒冰子弹",
-                "effects": {
-                    "level_1": "攻击CD减少25%",
-                    "level_2": "伤害提升15%",
-                    "level_3": "增加子弹20%飞行速度，射程减少1格",
-                    "level_4": "伤害提升35%",
-                    "level_5": "对攻击减速的敌人造成额外30%伤害，攻击CD增加5%"
-                }
-            },
-            {
-                "positioning": "增加对空debuff，对小型怪伤害加强",
-                "name": "冰霜风暴",
-                "effects": {
-                    "level_1": "攻击CD减少25%",
-                    "level_2": "伤害提升15%",
-                    "level_3": "对小型敌人增加25%伤害，射程减少1格",
-                    "level_4": "伤害提升35%",
-                    "level_5": "每次攻击增加20%暴击率，攻击CD增加5%"
-                }
-            }
-        ]
-    },
-    {
-        "temp_id": "M_M_001",
-        "monster_code": "木萌妖-01",
-        "skills": [
-            {
-                "positioning": "子弹飞行速度射击高频",
-                "name": "高速射击",
-                "effects": {
-                    "level_1": "子弹飞行速度增加30%",
-                    "level_2": "伤害提升15%",
-                    "level_3": "对小型敌人增加40%伤害，攻击CD增加5%",
-                    "level_4": "伤害提升35%",
-                    "level_5": "每次攻击增加20%暴击率，射程减少1格"
-                }
-            },
-            {
-                "positioning": "精准子弹",
-                "name": "精制子弹",
-                "effects": {
-                    "level_1": "攻击CD减少25%",
-                    "level_2": "伤害提升15%",
-                    "level_3": "对小型敌人增加25%伤害，射程减少1格",
-                    "level_4": "伤害提升35%",
-                    "level_5": "每次攻击增加20%暴击率，攻击CD增加5%"
-                }
-            }
-        ]
-    },
-{
-        "temp_id": "M_T_002",
-        "monster_code": "土萌妖-02",
-        "skills": [
-            {
-                "positioning": "增加散射的子弹数量，对空中单位有更多伤害",
-                "name": "飞散宝石",
-                "effects": {
-                    "level_1": "对空中的敌人额外造成30%伤害",
-                    "level_2": "伤害提升15%",
-                    "level_3": "攻击CD减少25%，散射角度增加25%，射程减少1格",
-                    "level_4": "伤害提升35%",
-                    "level_5": "子弹飞行速度增加25%，射程减少1格"
-                }
-            },
-            {
-                "positioning": "对地面单位伤害加强",
-                "name": "锐利宝石",
-                "effects": {
-                    "level_1": "对地面敌人造成额外30%伤害",
-                    "level_2": "伤害提升15%",
-                    "level_3": "攻击CD减少15%，但散射角度更大",
-                    "level_4": "伤害提升35%",
-                    "level_5": "对减速目标造成额外20%伤害，攻击CD增加5%"
-                }
-            }
-        ]
-    },
-{
-        "temp_id": "M_S_002",
-        "monster_code": "水萌妖-02",
-        "skills": [
-            {
-                "positioning": "增加散开子弹数量",
-                "name": "碎裂寒冰",
-                "effects": {
-                    "level_1": "冰冻子弹命中敌人后裂开为3个小子弹",
-                    "level_2": "伤害提升15%",
-                    "level_3": "每个小子弹伤害增加30%，攻击CD增加5%",
-                    "level_4": "伤害提升35%",
-                    "level_5": "每次射出2个子弹，攻击CD增加5%"
-                }
-            },
-            {
-                "positioning": "增加对小型敌人伤害",
-                "name": "深寒冰锥",
-                "effects": {
-                    "level_1": "对小型敌人增加25%伤害",
-                    "level_2": "伤害提升15%",
-                    "level_3": "攻击CD减少25%，射程减少1格",
-                    "level_4": "伤害提升35%",
-                    "level_5": "对小型敌人增加25%伤害，射程减少1格"
-                }
-            }
-        ]
-    },
-{
-        "temp_id": "M_M_002",
-        "monster_code": "木萌妖-02",
-        "skills": [
-            {
-                "positioning": "加快子弹速度",
-                "name": "随风之叶",
-                "effects": {
-                    "level_1": "攻击CD减少25%",
-                    "level_2": "伤害提升15%",
-                    "level_3": "射程提升2格位置，攻击CD增加5%",
-                    "level_4": "伤害提升35%",
-                    "level_5": "增加子弹20%飞行速度，攻击CD增加5%"
-                }
-            },
-            {
-                "positioning": "增加扇形面积，对小型单位伤害加强",
-                "name": "散落之风",
-                "effects": {
-                    "level_1": "每次射击2个子弹，增加扇形攻击范围",
-                    "level_2": "伤害提升15%",
-                    "level_3": "对小型敌人增加25%伤害，攻击CD增加5%",
-                    "level_4": "伤害提升35%",
-                    "level_5": "对小型敌人增加40%伤害，攻击CD增加5%"
-                }
-            }
-        ]
-    },
-{
-        "temp_id": "M_J_001",
-        "monster_code": "金萌妖-01",
-        "skills": [
-            {
-                "positioning": "增加刀的攻击范围",
-                "name": "无形剑气",
-                "effects": {
-                    "level_1": "刀的长度延长1格",
-                    "level_2": "伤害提升15%",
-                    "level_3": "额外增加1把刀，刀的旋转速度减少10%",
-                    "level_4": "伤害提升35%",
-                    "level_5": "每次攻击额外造成30%魔法伤害,刀的旋转速度减少10%"
-                }
-            },
-            {
-                "positioning": "增加刀旋转速度",
-                "name": "剑气旋风",
-                "effects": {
-                    "level_1": "刀的旋转速度提升25%",
-                    "level_2": "伤害提升15%",
-                    "level_3": "额外增加1把刀,刀的旋转速度减少10%",
-                    "level_4": "伤害提升35%",
-                    "level_5": "刀的旋转速度提升40%"
-                }
-            }
-        ]
-    },
-{
-        "temp_id": "M_H_002",
-        "monster_code": "火萌妖-02",
-        "skills": [
-            {
-                "positioning": "快速射出火球",
-                "name": "迅捷火球",
-                "effects": {
-                    "level_1": "攻击CD减少25%",
-                    "level_2": "伤害提升15%",
-                    "level_3": "火球飞行速度增加15%，攻击CD增加5%",
-                    "level_4": "伤害提升35%",
-                    "level_5": "火球飞行速度增加30%，攻击CD增加5%"
-                }
-            },
-            {
-                "positioning": "火球能大面积伤害敌人",
-                "name": "巨型火球",
-                "effects": {
-                    "level_1": "火球溅射伤害范围增加1格",
-                    "level_2": "伤害提升15%",
-                    "level_3": "对大型敌人额外造成30%伤害，射程减少1格",
-                    "level_4": "伤害提升35%",
-                    "level_5": "被火球伤害的敌人会原地眩晕1秒，射程减少1格"
-                }
-            }
-        ]
-    }
+  {
+    "temp_id": "M_H_001",
+    "monster_code": "火萌妖-01",
+    "skills": [
+      {
+        "positioning": "长周期烧一条直线上",
+        "name": "火龙之舌",
+        "effects": {
+          "level_1": "射程提升2格位置",
+          "level_2": "伤害提升15%",
+          "level_3": "被火焰伤害的敌人有20%概率原地眩晕1秒，射程减少1格",
+          "level_4": "伤害提升35%",
+          "level_5": "喷火冷却时间减少50%，持续喷火时间减少50%"
+        }
+      },
+      {
+        "positioning": "近身攻击多个敌人",
+        "name": "烈焰之舞",
+        "effects": {
+          "level_1": "喷出的火焰散开为3个，但每个火焰伤害减少50%",
+          "level_2": "伤害提升15%",
+          "level_3": "降低敌人20%移动速度，攻击CD增加5%",
+          "level_4": "伤害提升35%",
+          "level_5": "喷火冷却时间增加30%，持续喷火时间增加50%"
+        }
+      }
+    ]
+  },
+  {
+    "temp_id": "M_S_001",
+    "monster_code": "水萌妖-01",
+    "skills": [
+      {
+        "positioning": "快速射出子弹，增加对空伤害",
+        "name": "寒冰子弹",
+        "effects": {
+          "level_1": "攻击CD减少25%",
+          "level_2": "伤害提升15%",
+          "level_3": "增加子弹20%飞行速度，射程减少1格",
+          "level_4": "伤害提升35%",
+          "level_5": "对攻击减速的敌人造成额外30%伤害，攻击CD增加5%"
+        }
+      },
+      {
+        "positioning": "增加对空debuff，对小型怪伤害加强",
+        "name": "冰霜风暴",
+        "effects": {
+          "level_1": "攻击CD减少25%",
+          "level_2": "伤害提升15%",
+          "level_3": "对小型敌人增加25%伤害，射程减少1格",
+          "level_4": "伤害提升35%",
+          "level_5": "每次攻击增加20%暴击率，攻击CD增加5%"
+        }
+      }
+    ]
+  },
+  {
+    "temp_id": "M_M_001",
+    "monster_code": "木萌妖-01",
+    "skills": [
+      {
+        "positioning": "子弹飞行速度射击高频",
+        "name": "高速射击",
+        "effects": {
+          "level_1": "子弹飞行速度增加30%",
+          "level_2": "伤害提升15%",
+          "level_3": "对小型敌人增加40%伤害，攻击CD增加5%",
+          "level_4": "伤害提升35%",
+          "level_5": "每次攻击增加20%暴击率，射程减少1格"
+        }
+      },
+      {
+        "positioning": "精准子弹",
+        "name": "精制子弹",
+        "effects": {
+          "level_1": "攻击CD减少25%",
+          "level_2": "伤害提升15%",
+          "level_3": "对小型敌人增加25%伤害，射程减少1格",
+          "level_4": "伤害提升35%",
+          "level_5": "每次攻击增加20%暴击率，攻击CD增加5%"
+        }
+      }
+    ]
+  },
+  {
+    "temp_id": "M_T_002",
+    "monster_code": "土萌妖-02",
+    "skills": [
+      {
+        "positioning": "增加散射的子弹数量，对空中单位有更多伤害",
+        "name": "飞散宝石",
+        "effects": {
+          "level_1": "对空中的敌人额外造成30%伤害",
+          "level_2": "伤害提升15%",
+          "level_3": "攻击CD减少25%，散射角度增加25%，射程减少1格",
+          "level_4": "伤害提升35%",
+          "level_5": "子弹飞行速度增加25%，射程减少1格"
+        }
+      },
+      {
+        "positioning": "对地面单位伤害加强",
+        "name": "锐利宝石",
+        "effects": {
+          "level_1": "对地面敌人造成额外30%伤害",
+          "level_2": "伤害提升15%",
+          "level_3": "攻击CD减少15%，但散射角度更大",
+          "level_4": "伤害提升35%",
+          "level_5": "对减速目标造成额外20%伤害，攻击CD增加5%"
+        }
+      }
+    ]
+  },
+  {
+    "temp_id": "M_S_002",
+    "monster_code": "水萌妖-02",
+    "skills": [
+      {
+        "positioning": "增加散开子弹数量",
+        "name": "碎裂寒冰",
+        "effects": {
+          "level_1": "冰冻子弹命中敌人后裂开为3个小子弹",
+          "level_2": "伤害提升15%",
+          "level_3": "每个小子弹伤害增加30%，攻击CD增加5%",
+          "level_4": "伤害提升35%",
+          "level_5": "每次射出2个子弹，攻击CD增加5%"
+        }
+      },
+      {
+        "positioning": "增加对小型敌人伤害",
+        "name": "深寒冰锥",
+        "effects": {
+          "level_1": "对小型敌人增加25%伤害",
+          "level_2": "伤害提升15%",
+          "level_3": "攻击CD减少25%，射程减少1格",
+          "level_4": "伤害提升35%",
+          "level_5": "对小型敌人增加25%伤害，射程减少1格"
+        }
+      }
+    ]
+  },
+  {
+    "temp_id": "M_M_002",
+    "monster_code": "木萌妖-02",
+    "skills": [
+      {
+        "positioning": "加快子弹速度",
+        "name": "随风之叶",
+        "effects": {
+          "level_1": "攻击CD减少25%",
+          "level_2": "伤害提升15%",
+          "level_3": "射程提升2格位置，攻击CD增加5%",
+          "level_4": "伤害提升35%",
+          "level_5": "增加子弹20%飞行速度，攻击CD增加5%"
+        }
+      },
+      {
+        "positioning": "增加扇形面积，对小型单位伤害加强",
+        "name": "散落之风",
+        "effects": {
+          "level_1": "每次射击2个子弹，增加扇形攻击范围",
+          "level_2": "伤害提升15%",
+          "level_3": "对小型敌人增加25%伤害，攻击CD增加5%",
+          "level_4": "伤害提升35%",
+          "level_5": "对小型敌人增加40%伤害，攻击CD增加5%"
+        }
+      }
+    ]
+  },
+  {
+    "temp_id": "M_J_001",
+    "monster_code": "金萌妖-01",
+    "skills": [
+      {
+        "positioning": "增加刀的攻击范围",
+        "name": "无形剑气",
+        "effects": {
+          "level_1": "刀的长度延长1格",
+          "level_2": "伤害提升15%",
+          "level_3": "额外增加1把刀，刀的旋转速度减少10%",
+          "level_4": "伤害提升35%",
+          "level_5": "每次攻击额外造成30%魔法伤害,刀的旋转速度减少10%"
+        }
+      },
+      {
+        "positioning": "增加刀旋转速度",
+        "name": "剑气旋风",
+        "effects": {
+          "level_1": "刀的旋转速度提升25%",
+          "level_2": "伤害提升15%",
+          "level_3": "额外增加1把刀,刀的旋转速度减少10%",
+          "level_4": "伤害提升35%",
+          "level_5": "刀的旋转速度提升40%"
+        }
+      }
+    ]
+  },
+  {
+    "temp_id": "M_H_002",
+    "monster_code": "火萌妖-02",
+    "skills": [
+      {
+        "positioning": "快速射出火球",
+        "name": "迅捷火球",
+        "effects": {
+          "level_1": "攻击CD减少25%",
+          "level_2": "伤害提升15%",
+          "level_3": "火球飞行速度增加15%，攻击CD增加5%",
+          "level_4": "伤害提升35%",
+          "level_5": "火球飞行速度增加30%，攻击CD增加5%"
+        }
+      },
+      {
+        "positioning": "火球能大面积伤害敌人",
+        "name": "巨型火球",
+        "effects": {
+          "level_1": "火球溅射伤害范围增加1格",
+          "level_2": "伤害提升15%",
+          "level_3": "对大型敌人额外造成30%伤害，射程减少1格",
+          "level_4": "伤害提升35%",
+          "level_5": "被火球伤害的敌人会原地眩晕1秒，射程减少1格"
+        }
+      }
+    ]
+  },
+  {
+    "temp_id": "M_T_001",
+    "monster_code": "土萌妖-01",
+    "skills": [
+      {
+        "positioning": "增加附加效果",
+        "name": "震荡巨石",
+        "effects": {
+          "level_1": "被巨石击中的敌人在3秒内速度减少50%",
+          "level_2": "伤害提升15%",
+          "level_3": "巨石的溅伤范围增加1格,射程减少1格",
+          "level_4": "伤害提升35%",
+          "level_5": "被巨石击中的敌人在2秒内陷入眩晕状态无法移动,射程减少1格"
+        }
+      },
+      {
+        "positioning": "增加攻击距离",
+        "name": "蛮力抛投",
+        "effects": {
+          "level_1": "巨石飞行速度增加20%",
+          "level_2": "伤害提升15%",
+          "level_3": "攻击范围增加2格,攻击CD增加5%",
+          "level_4": "伤害提升35%",
+          "level_5": "巨石的溅伤范围增加1格,攻击CD增加5%"
+        }
+      }
+    ]
+  }
 ]

meng_yao/Assets/Prefabs/charatar/txm.prefab

@@ -472,8 +472,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   retbutton: {fileID: 0}
   ClosureObj: {fileID: 0}
-  id: M_M_001
-  Name: "\u6728\u840C\u5996-01"
+  id: M_T_001
+  Name: "\u571F\u840C\u5996-01"
   camp: 0
   hp: 100
   maxHp: 100

meng_yao/Assets/Prefabs/ui/Beat_ZanTing.prefab

@@ -850,8 +850,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 462.18054, y: -1051.9258}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 462.18054, y: -1101.9258}
+  m_SizeDelta: {x: 725.2872, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &5361498673185763723
 MonoBehaviour:

meng_yao/Assets/Prefabs/ui/Challeng_Evictory.prefab

@@ -4685,7 +4685,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3}
       propertyPath: m_AnchorMin.x
@@ -4693,15 +4693,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 166
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 166
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3}
       propertyPath: m_LocalPosition.x
@@ -4733,11 +4733,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 208
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -116
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5129451449518912811, guid: 50872d106f73c4649a7b6daf601794e5, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x

meng_yao/Assets/Resources/lqmengchong/Circle.controller

@@ -37,6 +37,12 @@ AnimatorController:
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_Controller: {fileID: 9100000}
+  - m_Name: State
+    m_Type: 3
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer

meng_yao/Assets/Resources/lqmengchong/txm_attck.anim

@@ -134,4 +134,11 @@ AnimationClip:
   m_EulerEditorCurves: []
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
-  m_Events: []
+  m_Events:
+  - time: 0.53333336
+    functionName: ShootBullet
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0

meng_yao/Assets/Scenes/New/Scene_map_2 tsst.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_T_001
     prefab: {fileID: 8433650275485930554, guid: c06add8b28931e4448ca9673388595af, type: 3}
     cardprefab: {fileID: 5508436327438263543, guid: 93fef5acddd00004b9ba1f30ccd46c96, type: 3}

meng_yao/Assets/Scenes/New/Scene_map_2 tsst.unity.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: dc84a977a8621424ba214936ddac9b7e
+guid: b12c0c58d3f254643845309f9611b634
 DefaultImporter:
   externalObjects: {}
   userData: