diff --git a/assets/script/game/common/config/CardSet.ts b/assets/script/game/common/config/CardSet.ts
index 7054e1f2..eaf9bf98 100644
--- a/assets/script/game/common/config/CardSet.ts
+++ b/assets/script/game/common/config/CardSet.ts
@@ -8,11 +8,28 @@ export const CardType = {
      1: "前排",
      2: "后排",
 }
+
 export const CardList={
-     1:[{uuid:1101,type:1},{uuid:1102,type:1},{uuid:1201,type:1},{uuid:1202,type:1},{uuid:1301,type:1},{uuid:1302,type:1},{uuid:1001,type:2}],
-     2:[{uuid:2101,type:1},{uuid:2102,type:1},{uuid:2201,type:1},{uuid:2202,type:1},{uuid:2301,type:1},{uuid:2302,type:1},],
-     3:[{uuid:3101,type:1},{uuid:3102,type:1},{uuid:3201,type:1},{uuid:3202,type:1},{uuid:3301,type:1},{uuid:3302,type:1},],
-     4:[{uuid:4101,type:1},{uuid:4102,type:1},{uuid:4201,type:1},{uuid:4202,type:1},{uuid:4301,type:1},{uuid:4302,type:1},],
+     1:[
+          {uuid:1101,type:1},{uuid:1102,type:1},{uuid:1201,type:1},{uuid:1202,type:1},{uuid:1301,type:1},{uuid:1302,type:1},
+          {uuid:1001,type:2},{uuid:1002,type:2},{uuid:1003,type:2},{uuid:1004,type:2},{uuid:1005,type:2},{uuid:1006,type:2},
+          {uuid:1008,type:2},{uuid:1009,type:2},{uuid:1010,type:2},
+     ],
+     2:[
+          {uuid:2101,type:1},{uuid:2102,type:1},{uuid:2201,type:1},{uuid:2202,type:1},{uuid:2301,type:1},{uuid:2302,type:1},
+          {uuid:2001,type:2},{uuid:2002,type:2},{uuid:2003,type:2},{uuid:2004,type:2},{uuid:2005,type:2},{uuid:2006,type:2},
+          {uuid:2008,type:2},{uuid:2009,type:2},{uuid:2010,type:2},
+     ],
+     3:[
+          {uuid:3101,type:1},{uuid:3102,type:1},{uuid:3201,type:1},{uuid:3202,type:1},{uuid:3301,type:1},{uuid:3302,type:1},
+          {uuid:3001,type:2},{uuid:3002,type:2},{uuid:3003,type:2},{uuid:3004,type:2},{uuid:3005,type:2},{uuid:3006,type:2},
+          {uuid:3008,type:2},{uuid:3009,type:2},{uuid:3010,type:2},{uuid:1011,type:2},{uuid:1012,type:2},
+     ],
+     4:[
+          {uuid:4101,type:1},{uuid:4102,type:1},{uuid:4201,type:1},{uuid:4202,type:1},{uuid:4301,type:1},{uuid:4302,type:1},
+          {uuid:4001,type:2},{uuid:4002,type:2},{uuid:4003,type:2},{uuid:4004,type:2},{uuid:4005,type:2},{uuid:4006,type:2},
+          {uuid:4008,type:2},{uuid:4009,type:2},{uuid:4010,type:2},{uuid:2011,type:2},{uuid:2012,type:2},
+     ],
      5:[{uuid:5001,type:1},{uuid:5002,type:1},{uuid:5003,type:1},{uuid:5004,type:1}],
      // 1:[1101,1102,1103,1104,1105,1106,1201,1202,1203,1204,1205,1301,1302,1303,1304,],
      // 2:[2101,2102,2103,2104,2105,2201,2202,2203,2204,2301,2302,2303,2304,2305,],
@@ -30,8 +47,55 @@ export const HeroSet ={
 
 }
 export const SkillSet={
-     1001:{uuid: 1001,path: "1001",type: 1,level: 1,name: "火球术",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,}
-
+     1001:{uuid: 1001,path: "1001",type: 1,level: 1,name: "火球术-初级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     1002:{uuid: 1002,path: "1002",type: 1,level: 1,name: "寒冰箭-初级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     1003:{uuid: 1003,path: "1003",type: 1,level: 1,name: "狂暴-初级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     1004:{uuid: 1004,path: "1004",type: 1,level: 1,name: "守护-初级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     1005:{uuid: 1005,path: "1005",type: 1,level: 1,name: "雷霆-初级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     1006:{uuid: 1006,path: "1006",type: 1,level: 1,name: "再生-初级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     1007:{uuid: 1007,path: "1007",type: 1,level: 1,name: "复生-初级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     1008:{uuid: 1008,path: "1008",type: 1,level: 1,name: "灵巧-初级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     1009:{uuid: 1009,path: "1009",type: 1,level: 1,name: "盾守-初级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     1010:{uuid: 1010,path: "1010",type: 1,level: 1,name: "治愈-初级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     1011:{uuid: 1011,path: "1011",type: 1,level: 3,name: "火焰风暴-初级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     1012:{uuid: 1012,path: "1012",type: 1,level: 3,name: "冰晶风暴-初级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     2001:{uuid: 2001,path: "1001",type: 1,level: 2,name: "火球术-中级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     2002:{uuid: 2002,path: "1002",type: 1,level: 2,name: "寒冰箭-中级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     2003:{uuid: 2003,path: "1003",type: 1,level: 2,name: "狂暴-中级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     2004:{uuid: 2004,path: "1004",type: 1,level: 2,name: "守护-中级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     2005:{uuid: 2005,path: "1005",type: 1,level: 2,name: "雷霆-中级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     2006:{uuid: 2006,path: "1006",type: 1,level: 2,name: "再生-中级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     2007:{uuid: 2007,path: "1007",type: 1,level: 2,name: "复生-中级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     2008:{uuid: 2008,path: "1008",type: 1,level: 2,name: "灵巧-中级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     2009:{uuid: 2009,path: "1009",type: 1,level: 2,name: "盾守-中级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     2020:{uuid: 2010,path: "1010",type: 1,level: 2,name: "治愈-中级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     2011:{uuid: 2011,path: "1011",type: 1,level: 4,name: "火焰风暴-中级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     2012:{uuid: 2012,path: "1012",type: 1,level: 4,name: "冰晶风暴-中级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     3001:{uuid: 3001,path: "1001",type: 1,level: 3,name: "火球术-高级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     3002:{uuid: 3002,path: "1002",type: 1,level: 3,name: "寒冰箭-高级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     3003:{uuid: 3003,path: "1003",type: 1,level: 3,name: "狂暴-高级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     3004:{uuid: 3004,path: "1004",type: 1,level: 3,name: "守护-高级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     3005:{uuid: 3005,path: "1005",type: 1,level: 3,name: "雷霆-高级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     3006:{uuid: 3006,path: "1006",type: 1,level: 3,name: "再生-高级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     3007:{uuid: 3007,path: "1007",type: 1,level: 3,name: "复生-高级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     3008:{uuid: 3008,path: "1008",type: 1,level: 3,name: "灵巧-高级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     3009:{uuid: 3009,path: "1009",type: 1,level: 3,name: "盾守-高级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     3030:{uuid: 3010,path: "1010",type: 1,level: 3,name: "治愈-高级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     3011:{uuid: 3011,path: "1011",type: 1,level: 5,name: "火焰风暴-高级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     3012:{uuid: 3012,path: "1012",type: 1,level: 5,name: "冰晶风暴-高级",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     4001:{uuid: 4001,path: "1001",type: 1,level: 4,name: "火球术-终极",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     4002:{uuid: 4002,path: "1002",type: 1,level: 4,name: "寒冰箭-终极",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     4003:{uuid: 4003,path: "1003",type: 1,level: 4,name: "狂暴-终极",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     4004:{uuid: 4004,path: "1004",type: 1,level: 4,name: "守护-终极",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     4005:{uuid: 4005,path: "1005",type: 1,level: 4,name: "雷霆-终极",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     4006:{uuid: 4006,path: "1006",type: 1,level: 4,name: "再生-终极",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     4007:{uuid: 4007,path: "1007",type: 1,level: 4,name: "复生-终极",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     4008:{uuid: 4008,path: "1008",type: 1,level: 4,name: "灵巧-终极",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     4009:{uuid: 4009,path: "1009",type: 1,level: 4,name: "盾守-终极",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     4040:{uuid: 4010,path: "1010",type: 1,level: 4,name: "治愈-终极",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     4011:{uuid: 4011,path: "1011",type: 1,level: 6,name: "火焰风暴-终极",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     4012:{uuid: 4012,path: "1012",type: 1,level: 6,name: "冰晶风暴-终极",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,},
+     
 }