fix: 修复火焰法师和冰法法师的UUID配置错误

移除胜利界面未使用的复活功能逻辑修正英雄卡牌显示等级计算和属性显示清理地图预制件中未使用的背景和英雄节点
2026-03-29 23:15:41 +08:00
parent ec0c9c97f8
commit 6b2967ea31
6 changed files with 118 additions and 435 deletions
--- a/assets/resources/game/map/map_rpg.prefab
+++ b/assets/resources/game/map/map_rpg.prefab
@@ -28,17 +28,17 @@
    "_active": true,
    "_components": [
      {
-        "__id__": 134
+        "__id__": 120
      },
      {
-        "__id__": 136
+        "__id__": 122
      },
      {
-        "__id__": 138
+        "__id__": 124
      }
    ],
    "_prefab": {
-      "__id__": 140
+      "__id__": 126
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -197,17 +197,17 @@
    "_active": true,
    "_components": [
      {
-        "__id__": 127
+        "__id__": 113
      },
      {
-        "__id__": 129
+        "__id__": 115
      },
      {
-        "__id__": 131
+        "__id__": 117
      }
    ],
    "_prefab": {
-      "__id__": 133
+      "__id__": 119
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -251,23 +251,23 @@
        "__id__": 8
      },
      {
-        "__id__": 80
+        "__id__": 66
      },
      {
-        "__id__": 84
+        "__id__": 70
      },
      {
-        "__id__": 118
+        "__id__": 104
      }
    ],
    "_active": true,
    "_components": [
      {
-        "__id__": 124
+        "__id__": 110
      }
    ],
    "_prefab": {
-      "__id__": 126
+      "__id__": 112
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -317,14 +317,14 @@
    "_active": true,
    "_components": [
      {
-        "__id__": 75
+        "__id__": 61
      },
      {
-        "__id__": 77
+        "__id__": 63
      }
    ],
    "_prefab": {
-      "__id__": 79
+      "__id__": 65
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -1464,22 +1464,15 @@
    "_parent": {
      "__id__": 8
    },
-    "_children": [
-      {
-        "__id__": 58
-      },
-      {
-        "__id__": 64
-      }
-    ],
+    "_children": [],
    "_active": false,
    "_components": [
      {
-        "__id__": 72
+        "__id__": 58
      }
    ],
    "_prefab": {
-      "__id__": 74
+      "__id__": 60
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -1510,316 +1503,6 @@
    },
    "_id": ""
  },
-  {
-    "__type__": "cc.Node",
-    "_name": "Background_01",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 57
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 59
-      },
-      {
-        "__id__": 61
-      }
-    ],
-    "_prefab": {
-      "__id__": 63
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 2.4,
-      "y": 2.4,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 58
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 60
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 324,
-      "height": 666
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "7bVYuCaxRJs4b/H2zt8e8R"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 58
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 62
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "d7d869bc-06aa-4876-806f-487e68b96780@8b868",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": {
-      "__uuid__": "d7d869bc-06aa-4876-806f-487e68b96780",
-      "__expectedType__": "cc.SpriteAtlas"
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "30LC7woTRCv5n9Og8yHH8X"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "b5zuDl+m5DoqEGo+A6Tf+k",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "hero",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 57
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 65
-      },
-      {
-        "__id__": 67
-      },
-      {
-        "__id__": 69
-      }
-    ],
-    "_prefab": {
-      "__id__": 71
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": -73.986,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": -0.8,
-      "y": 0.8,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 64
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 66
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 256,
-      "height": 256
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "8988yuWqJLSJJNE3V36q6n"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 64
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 68
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "91033056-eac3-4ad0-b174-e072da964784@e2787",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": {
-      "__uuid__": "91033056-eac3-4ad0-b174-e072da964784",
-      "__expectedType__": "cc.SpriteAtlas"
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "02fDHjuy1FKaLif5EL2LAf"
-  },
-  {
-    "__type__": "cc.Animation",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 64
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 70
-    },
-    "playOnLoad": true,
-    "_clips": [
-      {
-        "__uuid__": "aa5b9fe9-25de-4ea2-bab3-0364834cba6d",
-        "__expectedType__": "cc.AnimationClip"
-      }
-    ],
-    "_defaultClip": {
-      "__uuid__": "aa5b9fe9-25de-4ea2-bab3-0364834cba6d",
-      "__expectedType__": "cc.AnimationClip"
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "b7RjGVdwBOi7rP/cfZ9eFV"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "2boht7EuBPd7DnaYIoq9yO",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
  {
    "__type__": "cc.UITransform",
    "_name": "",
@@ -1830,7 +1513,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 73
+      "__id__": 59
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -1871,7 +1554,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 76
+      "__id__": 62
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -1899,7 +1582,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 78
+      "__id__": 64
    },
    "bgImg": null,
    "_id": ""
@@ -1933,11 +1616,11 @@
    "_active": true,
    "_components": [
      {
-        "__id__": 81
+        "__id__": 67
      }
    ],
    "_prefab": {
-      "__id__": 83
+      "__id__": 69
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -1974,11 +1657,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 80
+      "__id__": 66
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 82
+      "__id__": 68
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -2019,38 +1702,38 @@
    },
    "_children": [
      {
-        "__id__": 85
+        "__id__": 71
      },
      {
-        "__id__": 89
+        "__id__": 75
      },
      {
-        "__id__": 93
+        "__id__": 79
      },
      {
-        "__id__": 97
+        "__id__": 83
      },
      {
-        "__id__": 101
+        "__id__": 87
      },
      {
-        "__id__": 105
+        "__id__": 91
      },
      {
-        "__id__": 109
+        "__id__": 95
      }
    ],
    "_active": true,
    "_components": [
      {
-        "__id__": 113
+        "__id__": 99
      },
      {
-        "__id__": 115
+        "__id__": 101
      }
    ],
    "_prefab": {
-      "__id__": 117
+      "__id__": 103
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -2087,17 +1770,17 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "_parent": {
-      "__id__": 84
+      "__id__": 70
    },
    "_children": [],
    "_active": true,
    "_components": [
      {
-        "__id__": 86
+        "__id__": 72
      }
    ],
    "_prefab": {
-      "__id__": 88
+      "__id__": 74
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -2134,11 +1817,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 85
+      "__id__": 71
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 87
+      "__id__": 73
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -2175,17 +1858,17 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "_parent": {
-      "__id__": 84
+      "__id__": 70
    },
    "_children": [],
    "_active": true,
    "_components": [
      {
-        "__id__": 90
+        "__id__": 76
      }
    ],
    "_prefab": {
-      "__id__": 92
+      "__id__": 78
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -2222,11 +1905,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 89
+      "__id__": 75
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 91
+      "__id__": 77
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -2263,17 +1946,17 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "_parent": {
-      "__id__": 84
+      "__id__": 70
    },
    "_children": [],
    "_active": true,
    "_components": [
      {
-        "__id__": 94
+        "__id__": 80
      }
    ],
    "_prefab": {
-      "__id__": 96
+      "__id__": 82
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -2310,11 +1993,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 93
+      "__id__": 79
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 95
+      "__id__": 81
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -2351,17 +2034,17 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "_parent": {
-      "__id__": 84
+      "__id__": 70
    },
    "_children": [],
    "_active": true,
    "_components": [
      {
-        "__id__": 98
+        "__id__": 84
      }
    ],
    "_prefab": {
-      "__id__": 100
+      "__id__": 86
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -2398,11 +2081,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 97
+      "__id__": 83
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 99
+      "__id__": 85
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -2439,17 +2122,17 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "_parent": {
-      "__id__": 84
+      "__id__": 70
    },
    "_children": [],
    "_active": true,
    "_components": [
      {
-        "__id__": 102
+        "__id__": 88
      }
    ],
    "_prefab": {
-      "__id__": 104
+      "__id__": 90
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -2486,11 +2169,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 101
+      "__id__": 87
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 103
+      "__id__": 89
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -2527,17 +2210,17 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "_parent": {
-      "__id__": 84
+      "__id__": 70
    },
    "_children": [],
    "_active": true,
    "_components": [
      {
-        "__id__": 106
+        "__id__": 92
      }
    ],
    "_prefab": {
-      "__id__": 108
+      "__id__": 94
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -2574,11 +2257,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 105
+      "__id__": 91
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 107
+      "__id__": 93
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -2615,17 +2298,17 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "_parent": {
-      "__id__": 84
+      "__id__": 70
    },
    "_children": [],
    "_active": true,
    "_components": [
      {
-        "__id__": 110
+        "__id__": 96
      }
    ],
    "_prefab": {
-      "__id__": 112
+      "__id__": 98
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -2662,11 +2345,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 109
+      "__id__": 95
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 111
+      "__id__": 97
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -2703,11 +2386,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 84
+      "__id__": 70
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 114
+      "__id__": 100
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -2731,11 +2414,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 84
+      "__id__": 70
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 116
+      "__id__": 102
    },
    "_id": ""
  },
@@ -2768,14 +2451,14 @@
    "_active": true,
    "_components": [
      {
-        "__id__": 119
+        "__id__": 105
      },
      {
-        "__id__": 121
+        "__id__": 107
      }
    ],
    "_prefab": {
-      "__id__": 123
+      "__id__": 109
    },
    "_lpos": {
      "__type__": "cc.Vec3",
@@ -2812,11 +2495,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 118
+      "__id__": 104
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 120
+      "__id__": 106
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -2840,11 +2523,11 @@
    "_objFlags": 0,
    "__editorExtras__": {},
    "node": {
-      "__id__": 118
+      "__id__": 104
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 122
+      "__id__": 108
    },
    "light": null,
    "_id": ""
@@ -2876,7 +2559,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 125
+      "__id__": 111
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -2917,7 +2600,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 128
+      "__id__": 114
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -2945,7 +2628,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 130
+      "__id__": 116
    },
    "camera": {
      "__id__": 3
@@ -2954,16 +2637,16 @@
      "__id__": 7
    },
    "mapLayer": {
-      "__id__": 77
+      "__id__": 63
    },
    "floorLayer": {
-      "__id__": 80
+      "__id__": 66
    },
    "entityLayer": {
-      "__id__": 115
+      "__id__": 101
    },
    "SkillLayer": {
-      "__id__": 121
+      "__id__": 107
    },
    "isFollowPlayer": true,
    "_id": ""
@@ -2982,7 +2665,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 132
+      "__id__": 118
    },
    "_id": ""
  },
@@ -3013,7 +2696,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 135
+      "__id__": 121
    },
    "_contentSize": {
      "__type__": "cc.Size",
@@ -3041,7 +2724,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 137
+      "__id__": 123
    },
    "_cameraComponent": {
      "__id__": 3
@@ -3063,7 +2746,7 @@
    },
    "_enabled": true,
    "__prefab": {
-      "__id__": 139
+      "__id__": 125
    },
    "_alignFlags": 45,
    "_target": null,
--- a/assets/resources/gui/element/victory.prefab
+++ b/assets/resources/gui/element/victory.prefab
@@ -606,10 +606,7 @@
      "b": 255,
      "a": 255
    },
-    "_spriteFrame": {
-      "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@c1a5c",
-      "__expectedType__": "cc.SpriteFrame"
-    },
+    "_spriteFrame": null,
    "_type": 0,
    "_fillType": 0,
    "_sizeMode": 1,
@@ -4867,7 +4864,7 @@
    "propertyPath": [
      "_active"
    ],
-    "value": true
+    "value": false
  },
  {
    "__type__": "CCPropertyOverrideInfo",
--- a/assets/script/game/common/config/CardSet.ts
+++ b/assets/script/game/common/config/CardSet.ts
@@ -54,7 +54,7 @@ export const CardPoolList: CardConfig[] = [


    { uuid: 5003, type: CardType.Hero, cost: 3, weight: 25, lv: 2, hero_lv: 1 },
-    { uuid: 5012, type: CardType.Hero, cost: 3, weight: 25, lv: 2, hero_lv: 1 },
+    { uuid: 5102, type: CardType.Hero, cost: 3, weight: 25, lv: 2, hero_lv: 1 },
    { uuid: 5302, type: CardType.Hero, cost: 3, weight: 25, lv: 2, hero_lv: 1 },
    
    { uuid: 5001, type: CardType.Hero, cost: 3, weight: 25, lv: 3, hero_lv: 2 },
@@ -63,11 +63,11 @@ export const CardPoolList: CardConfig[] = [
    { uuid: 5301, type: CardType.Hero, cost: 3, weight: 25, lv: 3, hero_lv: 2 },

    { uuid: 5002, type: CardType.Hero, cost: 3, weight: 25, lv: 3, hero_lv: 1 },
-    { uuid: 5013, type: CardType.Hero, cost: 3, weight: 25, lv: 3, hero_lv: 1 },
+    { uuid: 5103, type: CardType.Hero, cost: 3, weight: 25, lv: 3, hero_lv: 1 },
    { uuid: 5202, type: CardType.Hero, cost: 3, weight: 25, lv: 3, hero_lv: 1 },

    { uuid: 5003, type: CardType.Hero, cost: 3, weight: 25, lv: 4, hero_lv: 2 },
-    { uuid: 5012, type: CardType.Hero, cost: 3, weight: 25, lv: 4, hero_lv: 2 },
+    { uuid: 5102, type: CardType.Hero, cost: 3, weight: 25, lv: 4, hero_lv: 2 },
    { uuid: 5302, type: CardType.Hero, cost: 3, weight: 25, lv: 4, hero_lv: 2 },
    
    { uuid: 5004, type: CardType.Hero, cost: 3, weight: 25, lv: 4, hero_lv: 1 },
@@ -80,13 +80,13 @@ export const CardPoolList: CardConfig[] = [
    { uuid: 5301, type: CardType.Hero, cost: 3, weight: 25, lv: 5, hero_lv: 3 },

    { uuid: 5002, type: CardType.Hero, cost: 3, weight: 25, lv: 5, hero_lv: 2 },
-    { uuid: 5013, type: CardType.Hero, cost: 3, weight: 25, lv: 5, hero_lv: 2 },
+    { uuid: 5103, type: CardType.Hero, cost: 3, weight: 25, lv: 5, hero_lv: 2 },
    { uuid: 5202, type: CardType.Hero, cost: 3, weight: 25, lv: 5, hero_lv: 2 },

    { uuid: 5105, type: CardType.Hero, cost: 3, weight: 25, lv: 5, hero_lv: 1 },

    { uuid: 5003, type: CardType.Hero, cost: 3, weight: 25, lv: 6, hero_lv: 3 },
-    { uuid: 5012, type: CardType.Hero, cost: 3, weight: 25, lv: 6, hero_lv: 3 },
+    { uuid: 5102, type: CardType.Hero, cost: 3, weight: 25, lv: 6, hero_lv: 3 },
    { uuid: 5302, type: CardType.Hero, cost: 3, weight: 25, lv: 6, hero_lv: 3 },
    
    { uuid: 5304, type: CardType.Hero, cost: 3, weight: 25, lv: 6, hero_lv: 1 },
--- a/assets/script/game/common/config/heroSet.ts
+++ b/assets/script/game/common/config/heroSet.ts
@@ -109,9 +109,9 @@ export const HeroInfo: Record<number, heroInfo> = {
    // ========== 法师英雄 ==========
    5101:{uuid:5101,name:"奥术法师",path:"hm2", fac:FacSet.HERO,cards_lv:1,lv:1,type:HType.Long,hp:150,ap:60,speed:100,
        skills:{6201:{uuid:6201,lv:1,cd:1.4,ccd:0},6012:{uuid:6012,lv:1,cd:5,ccd:0}},info:"冰球,冰锥 远法dps"},
-    5102:{uuid:5012,name:"火焰法师",path:"hm1", fac:FacSet.HERO,cards_lv:2,lv:1,type:HType.Long,hp:300,ap:120,speed:100,
+    5102:{uuid:5102,name:"火焰法师",path:"hm1", fac:FacSet.HERO,cards_lv:2,lv:1,type:HType.Long,hp:300,ap:120,speed:100,
        skills:{6203:{uuid:6203,lv:1,cd:1.4,ccd:0},6013:{uuid:6013,lv:1,cd:5,ccd:0}},info:"火击,火球 远法dps"},
-    5103:{uuid:5013,name:"冰法法师",path:"hm9", fac:FacSet.HERO,cards_lv:3,lv:1,type:HType.Long,hp:450,ap:180,speed:100,
+    5103:{uuid:5103,name:"冰法法师",path:"hm9", fac:FacSet.HERO,cards_lv:3,lv:1,type:HType.Long,hp:450,ap:180,speed:100,
        skills:{6201:{uuid:6201,lv:1,cd:1.4,ccd:0},6012:{uuid:6012,lv:1,cd:5,ccd:0}},info:"冰击,冰锥 远法dps"},
    5104:{uuid:5104,name:"寒霜术士",path:"hm4", fac:FacSet.HERO,cards_lv:4,lv:1,type:HType.Long,hp:600,ap:240,speed:100,
        skills:{6201:{uuid:6201,lv:1,cd:1.4,ccd:0},6202:{uuid:6202,lv:1,cd:5,ccd:0}},info:"冰锥,冰刺 远法dps"},
--- a/assets/script/game/map/CardComp.ts
+++ b/assets/script/game/map/CardComp.ts
@@ -369,11 +369,13 @@ export class CardComp extends CCComp {
        
        
        if(this.card_type===CardType.Hero){
-            this.setLabel(this.name_node, `${HeroInfo[this.card_uuid].name}Lv.${this.cardData.hero_lv}`);
+            const hero = HeroInfo[this.card_uuid];
+            const heroLv = Math.max(1, Math.floor(this.cardData.hero_lv ?? hero?.lv ?? 1));
+            this.setLabel(this.name_node, `${hero?.name || ""}Lv.${heroLv}`);
            this.info_node.active = true;
            this.oinfo_node.active = false;
-            this.info_node.getChildByName("ap").getChildByName("val").getComponent(Label).string = `${HeroInfo[this.card_uuid].ap*this.cardData.hero_lv}`;
-            this.info_node.getChildByName("hp").getChildByName("val").getComponent(Label).string = `${HeroInfo[this.card_uuid].hp*this.cardData.hero_lv}`;
+            this.info_node.getChildByName("ap").getChildByName("val").getComponent(Label).string = `${(hero?.ap ?? 0) * heroLv}`;
+            this.info_node.getChildByName("hp").getChildByName("val").getComponent(Label).string = `${(hero?.hp ?? 0) * heroLv}`;
        }else{
            const specialCard = this.card_type === CardType.SpecialUpgrade
                ? SpecialUpgradeCardList[this.card_uuid]
--- a/assets/script/game/map/VictoryComp.ts
+++ b/assets/script/game/map/VictoryComp.ts
@@ -46,20 +46,21 @@ export class VictoryComp extends CCComp {
            this.game_data=args.game_data
        }

-        // 接收复活参数
-        if (args.can_revive !== undefined) {
-            this.canRevive = args.can_revive;
-        } else {
-            this.canRevive = false; // 默认不可复活
-        }
+        // // 接收复活参数
+        // if (args.can_revive !== undefined) {
+        //     this.canRevive = args.can_revive;
+        // } else {
+        //     this.canRevive = false; // 默认不可复活
+        // }

        this.node.getChildByName("btns").getChildByName("next").active=!args.can_revive
-        this.node.getChildByName("btns").getChildByName("alive").active=args.can_revive
+        // this.node.getChildByName("btns").getChildByName("alive").active=args.can_revive

        // 只有在不能复活（彻底结算）时才计算总分
-        if (!this.canRevive) {
-            this.calculateTotalScore();
-        }
+        // if (!this.canRevive) {
+            
+        // }
+        this.calculateTotalScore();
    }

    /**