合并

meng_yao/Assets/Prefabs/Bullet/Bing_1.prefab

@@ -0,0 +1,104 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1091443316701177648
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 660602218193290689}
+  - component: {fileID: 762876158176410263}
+  - component: {fileID: 4303165778035962172}
+  m_Layer: 0
+  m_Name: Bing_1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &660602218193290689
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1091443316701177648}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -2.391, y: -0.135, z: 0}
+  m_LocalScale: {x: 0.15529104, y: 0.15529104, z: 0.15529104}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &762876158176410263
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1091443316701177648}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: 50b7ecc28d19b854a9919b19b69eac3c, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!114 &4303165778035962172
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1091443316701177648}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a7361a599e01f924eb9bd42480cf7ade, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Crole: {fileID: 0}
+  bullet: {fileID: 0}
+  attackTime: 0
+  attackAllTime: 3
+  lifeTime: 3

meng_yao/Assets/Prefabs/Bullet/Bing_1.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 65e205dfab4a6c2458647bb554b62ac2
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

meng_yao/Assets/Prefabs/Bullet/Bing_2.prefab

@@ -0,0 +1,104 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1091443316701177648
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 660602218193290689}
+  - component: {fileID: 762876158176410263}
+  - component: {fileID: 4303165778035962172}
+  m_Layer: 0
+  m_Name: Bing_2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &660602218193290689
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1091443316701177648}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -2.391, y: -0.135, z: 0}
+  m_LocalScale: {x: 0.15529104, y: 0.15529104, z: 0.15529104}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &762876158176410263
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1091443316701177648}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: d4af21e9302f7294eb4ef3f65f9d0c74, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!114 &4303165778035962172
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1091443316701177648}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a7361a599e01f924eb9bd42480cf7ade, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Crole: {fileID: 0}
+  bullet: {fileID: 0}
+  attackTime: 0
+  attackAllTime: 3
+  lifeTime: 3

meng_yao/Assets/Prefabs/Bullet/Bing_2.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: beeceee8fc2c8464abd22e4b3e7850f1
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

meng_yao/Assets/Prefabs/Bullet/Fire.prefab

@@ -55,7 +55,8 @@ MonoBehaviour:
   animator: {fileID: 0}
   IsMove: 1
   Collider2D: {fileID: 0}
-  effectPre: {fileID: 1487967899565519868, guid: 206f837f6265c164187718739b604743, type: 3}
+  effectPres:
+  - {fileID: 1487967899565519868, guid: 206f837f6265c164187718739b604743, type: 3}
 --- !u!61 &3373243311622701097
 BoxCollider2D:
   m_ObjectHideFlags: 0

meng_yao/Assets/Prefabs/Bullet/bingqiu.prefab

@@ -4825,7 +4825,10 @@ MonoBehaviour:
   animator: {fileID: 0}
   IsMove: 1
   Collider2D: {fileID: 0}
-  effectPre: {fileID: 1091443316701177648, guid: b9df638c9cb3bfe43acb042655fd517e, type: 3}
+  effectPres:
+  - {fileID: 1091443316701177648, guid: b9df638c9cb3bfe43acb042655fd517e, type: 3}
+  - {fileID: 1091443316701177648, guid: 65e205dfab4a6c2458647bb554b62ac2, type: 3}
+  - {fileID: 1091443316701177648, guid: beeceee8fc2c8464abd22e4b3e7850f1, type: 3}
 --- !u!210 &6519243243911487068
 SortingGroup:
   m_ObjectHideFlags: 0

meng_yao/Assets/Prefabs/ui/scene_main/Battle_Selection.prefab

@@ -603,7 +603,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c64989b3a75e1d44e8692a17ba9c22ea, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  mengyaoid: 3
+  mengyaoid: M_H_001
 --- !u!1 &4784401008393657171
 GameObject:
   m_ObjectHideFlags: 0
@@ -816,7 +816,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c64989b3a75e1d44e8692a17ba9c22ea, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  mengyaoid: 1
+  mengyaoid: M_M_001
 --- !u!1 &6630224712762924237
 GameObject:
   m_ObjectHideFlags: 0
@@ -1044,7 +1044,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c64989b3a75e1d44e8692a17ba9c22ea, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  mengyaoid: 2
+  mengyaoid: M_S_001
 --- !u!1 &7283252518049257111
 GameObject:
   m_ObjectHideFlags: 0

meng_yao/Assets/Prefabs/ui/scene_main/card_huhuhu.prefab

@@ -358,7 +358,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c64989b3a75e1d44e8692a17ba9c22ea, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  mengyaoid: 3
+  mengyaoid: M_H_001
 --- !u!1 &1126466392997513758
 GameObject:
   m_ObjectHideFlags: 0

meng_yao/Assets/Prefabs/ui/scene_main/card_mkl.prefab

@@ -450,7 +450,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c64989b3a75e1d44e8692a17ba9c22ea, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  mengyaoid: 1
+  mengyaoid: M_M_001
 --- !u!1 &6655435213110775788
 GameObject:
   m_ObjectHideFlags: 0

meng_yao/Assets/Prefabs/ui/scene_main/card_qie.prefab

@@ -285,7 +285,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c64989b3a75e1d44e8692a17ba9c22ea, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  mengyaoid: 2
+  mengyaoid: M_S_001
 --- !u!1 &5508436328304430213
 GameObject:
   m_ObjectHideFlags: 0

meng_yao/Assets/Scenes/New/Scene_map_1.unity

@@ -841,7 +841,7 @@ Transform:
   - {fileID: 995271151}
   - {fileID: 1932457213}
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &284432671
 MonoBehaviour:
@@ -1540,6 +1540,37 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 924676270184311531, guid: 8d398c914061e5842b409729ac3d43c1, type: 3}
   m_PrefabInstance: {fileID: 457244935}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &459650024
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 459650025}
+  m_Layer: 0
+  m_Name: ------------------------------ (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &459650025
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 459650024}
+  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: 0}
+  m_RootOrder: 7
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &530562778
 GameObject:
   m_ObjectHideFlags: 0
@@ -3554,11 +3585,11 @@ MonoBehaviour:
   btnObj: {fileID: 1942153352}
   IconTipObj: {fileID: 0}
   mengyaoCardDataList:
-  - cardID: 1
+  - cardID: M_M_001
     cardPrefab: {fileID: 6655435212987556048, guid: 383e65ed01369d345a73d626ab713888, type: 3}
-  - cardID: 2
+  - cardID: M_S_001
     cardPrefab: {fileID: 5508436327438263543, guid: 12644a2c53bfc72489ad76e8f81628f5, type: 3}
-  - cardID: 3
+  - cardID: M_H_001
     cardPrefab: {fileID: 1126466392417920613, guid: 0dd4a50e59d08e84fb1439c946c24fdc, type: 3}
   parentPos: {fileID: 1136445683}
   scaleUpDuration: 0.5
@@ -4333,7 +4364,7 @@ GameObject:
   - component: {fileID: 1337722729}
   - component: {fileID: 1337722730}
   m_Layer: 0
-  m_Name: ------------------------------
+  m_Name: ReadJson
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -4352,7 +4383,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1337722730
 MonoBehaviour:
@@ -6049,6 +6080,37 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1942153352}
   m_CullTransparentMesh: 1
+--- !u!1 &1993700582
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1993700584}
+  m_Layer: 0
+  m_Name: ------------------------------ (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1993700584
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1993700582}
+  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: 0}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2035101380
 GameObject:
   m_ObjectHideFlags: 0

meng_yao/Assets/script/A_Fight/SkillBox.cs

@@ -1,6 +1,7 @@
 using DG.Tweening;
 using System.Collections;
 using System.Collections.Generic;
+using Unity.VisualScripting;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -27,6 +28,9 @@ public class SkillBox : Base
     public Transform SkillParent;
 
     public Image ExpFill;
+
+   
+
     public int ExpNumber
     {
         get => expNumber;
@@ -39,7 +43,9 @@ public class SkillBox : Base
     private int ExpFileObjNumber=0;
     [Header("Õ½»ê(¾­Ñé)Ìî³ä¸¸½Úµã")] public GameObject ExpFilePrante;
 
-   public List<GameObject> expList = new List<GameObject>();
+    public List<GameObject> expList = new List<GameObject>();
+
+
     private void Start()
     {
         ExpFill.fillAmount = 0;
@@ -48,7 +54,6 @@ public class SkillBox : Base
         instance = this;
 
         InitSkil();
-
     }
 
    public void UpdataExp(int number)
@@ -85,18 +90,24 @@ public class SkillBox : Base
 
     void InitSkil()
     {
-        for (int i = 0; i < Base.GlobalObj.GetComponent<gameGlobal>().CarryCardId.Count; i++)
-        {
       
-            for (int j = 0; j < 2; j++)
+        foreach (string _mengyaoRoleId in Base.GlobalObj.GetComponent<gameGlobal>().CarryCardId)
+        {
+            foreach (Monster info in MengyaoInfo.Instance.m_SkillData)
             {
-                GameObject obj = Instantiate(Skill,SkillParent);
+                if (string.Equals(_mengyaoRoleId, info.temp_id))
-                obj.GetComponent<Skill_Spend>().infobox_skill_up = infobox_skill;
+                {
-                obj.GetComponent<Skill_Spend>().MySkill = MengyaoInfo.Instance.m_SkillData[i].skills[j];
+                  for (int j = 0; j < 2; j++)
+                  {
+                     GameObject obj = Instantiate(Skill, SkillParent);
+                     obj.GetComponent<Skill_Spend>().infobox_skill_up = infobox_skill;
+                     obj.GetComponent<Skill_Spend>().MySkill = info.skills[j];
+                     obj.GetComponent<Skill_Spend>().mengyao = MengyaoInfo.Instance.mengyaoIdToRole[info.temp_id];
+                  }
+                  break;
+                }
             }
         }
-
-        //Base.GlobalObj.GetComponent<gameGlobal>().CarryCardId.Clear();
     }
 
 
@@ -181,4 +192,9 @@ public class SkillBox : Base
         });
     }
 
+   void OnDestroy()
+   {
+       //mengyaoRole = null;
+   }
+
 }

meng_yao/Assets/script/A_Fight/Skill_Spend.cs

@@ -38,6 +38,9 @@ public class Skill_Spend : MonoBehaviour
 
     public Skill MySkill = new Skill();
 
+    //[HideInInspector]
+    public GameObject mengyao;//对应的role
+
     // Start is called before the first frame update
     void Start()
     {

meng_yao/Assets/script/A_Fight/cardBox.cs

@@ -33,6 +33,10 @@ public class cardBox : MonoBehaviour
     // ID到萌妖卡预制体的映射字典
     private Dictionary<string, GameObject> IDTomangyaoPrefab = new Dictionary<string, GameObject>();
 
+
+    //public Dictionary<string,>
+
+
     [HideInInspector] public List<GameObject> card = new List<GameObject>();
     private void Awake()
     {
@@ -142,7 +146,6 @@ public class cardBox : MonoBehaviour
                 Debug.LogWarning($"未找到ID为 '{id}' 的萌妖卡预制体！");
             }
         }
-        //Base.GlobalObj.GetComponent<gameGlobal>().CarryCardId.Clear();
     }
 
 }

meng_yao/Assets/script/A_Fight/cardContorl.cs

@@ -82,6 +82,9 @@ public class cardContorl : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndD
         {           
             mY.transform.position = mY.GetComponent<cardPlace>().tower.transform.position;
 
+            
+            MengyaoInfo.Instance.mengyaoIdToRole.Add(mY.GetComponent<Role>().id, mY);
+
             this.enabled = false;
             cardBox.instance.ChangeInPlaceNumber(1);
             mask.SetActive(true);

meng_yao/Assets/script/A_Fight/gameGlobal.cs

@@ -15,6 +15,7 @@ public class gameGlobal : Base
 
     public List<string> CarryCardId = new List<string>();
 
+   
     /// <summary>
     /// ÓÎÏ·³õʼ»¯
     /// </summary>

meng_yao/Assets/script/A_Fight/json/MengyaoInfo.cs

@@ -2,6 +2,7 @@ using Newtonsoft.Json;
 using System.Collections;
 using System.Collections.Generic;
 using System.Xml.Linq;
+using Unity.VisualScripting;
 using UnityEngine;
 
 public class MengyaoInfo :JsonReadBase
@@ -16,13 +17,16 @@ public class MengyaoInfo :JsonReadBase
     public List<WaveData> m_WaveData;
     public List<Monster> m_SkillData;
     public static MengyaoInfo Instance;
+
+    
+    public Dictionary<string,GameObject> mengyaoIdToRole=new Dictionary<string, GameObject>();
     // Start is called before the first frame update
     void Awake()
     {
         Instance = this;
 
         m_Mengyao = base.LoadJson<Character>(NameAsset);
-        base.DisplayData<Character>(m_Mengyao);
+        //base.DisplayData<Character>(m_Mengyao);
 
         m_Level = base.LoadJson<Level>(LevelAsset);
        // base.DisplayData<Level>(m_Level);
@@ -35,11 +39,11 @@ public class MengyaoInfo :JsonReadBase
         //base.DisplayData<Monster>(m_SkillData);
     }
 
-    // Update is called once per frame
+    void OnDestroy()
-    void Update()
     {
-        
+        mengyaoIdToRole=null;
     }
+
 }
 
 public class Character

meng_yao/Assets/script/UI_prefabs/Battle_Selection.cs

@@ -38,7 +38,7 @@ public class Battle_Selection : BaseUI
     {
        
 
-         await showPanel(_panel);
+        await showPanel(_panel);
         // 初始化：将所有卡牌添加到萌妖卡列表，并设置其父节点为萌妖卡生成点
         foreach (Button btn in CardBTN)
         {
@@ -71,6 +71,8 @@ public class Battle_Selection : BaseUI
             foreach (Button go in CarryCard)
             {
                 Debug.Log(go.gameObject.GetComponent<CardInfo>().mengyaoid);
+
+
                 Base.GlobalObj.GetComponent<gameGlobal>().CarryCardId.Add(go.gameObject.GetComponent<CardInfo>().mengyaoid);
             }
             SceneManager.LoadScene(2);