diff --git a/character/gwent.js b/character/gwent.js new file mode 100644 index 000000000..0c28aba28 --- /dev/null +++ b/character/gwent.js @@ -0,0 +1,14 @@ +character.gwent={ + character:{ + + }, + characterIntro:{ + + }, + skill:{ + + }, + translate:{ + + } +} diff --git a/game/asset.js b/game/asset.js index 37e62b975..7c084233b 100644 --- a/game/asset.js +++ b/game/asset.js @@ -637,12 +637,14 @@ window.noname_asset_list=[ 'image/character/swd_jiuyou.jpg', 'image/character/swd_kama.jpg', 'image/character/swd_kangnalishi.jpg', + 'image/character/swd_kendi.jpg', 'image/character/swd_lanmoshen.jpg', 'image/character/swd_lanyin.jpg', 'image/character/swd_lilian.jpg', 'image/character/swd_linyue.jpg', 'image/character/swd_luchengxuan.jpg', 'image/character/swd_maixing.jpg', + 'image/character/swd_miles.jpg', 'image/character/swd_moye.jpg', 'image/character/swd_murongshi.jpg', 'image/character/swd_muyue.jpg', diff --git a/game/config.js b/game/config.js index fd92db80e..b02a1b02b 100644 --- a/game/config.js +++ b/game/config.js @@ -29,7 +29,7 @@ window.config={ sgscharacters:['standard','shenhua','refresh','yijiang','sp','extra','old'], sgscards:['standard','extra','sp','guozhan'], sgsmodes:['identity','guozhan','versus','brawl','connect'], - stockmode:['identity','guozhan','versus','boss','chess','stone','connect','brawl','tafang','hearthstone'], + stockmode:['identity','guozhan','versus','boss','chess','stone','connect','brawl','tafang'], stockextension:['boss','cardpile','character','coin','soldier','weather','wuxing','hs_mod'], layout:['default','newlayout'], theme:['woodden','music','simple'], diff --git a/game/game.js b/game/game.js index 23957e710..06ad1603a 100644 --- a/game/game.js +++ b/game/game.js @@ -4563,10 +4563,6 @@ delete card.pack; delete play.pack; delete mode.pack; - delete character.hearthpack; - delete card.hearthpack; - delete play.hearthpack; - delete mode.hearthpack; delete window.background; delete window.music; delete window.font; @@ -5944,6 +5940,7 @@ } if(!lib.character[name]){ target.node.avatar.setBackground(name,'character'); + target.node.avatar.show(); } else{ target.init(name); diff --git a/game/package.js b/game/package.js index 399e7a5b9..35fee293f 100644 --- a/game/package.js +++ b/game/package.js @@ -13,9 +13,7 @@ character.pack={ swd:'轩辕剑', gujian:'古剑奇谭', xianjian:'仙剑', -}; -character.hearthpack={ - classic:'经典', + gwent:'昆特牌', }; card.pack={ standard:'标准', @@ -28,11 +26,6 @@ card.pack={ gujian:'古剑奇谭', hearth:'炉石传说', }; -card.hearthpack={ - basic:'基本', - classic:'经典', - naxx:'纳克萨玛斯', -}; play.pack={ boss:'剑阁挑战', cardpile:'牌堆补充', @@ -42,9 +35,6 @@ play.pack={ weather:'天气变化', coin:'富甲天下', }; -play.hearthpack={ - hsmod:'规则调整' -}; mode.pack={ identity:'身份', guozhan:'国战', diff --git a/game/source.js b/game/source.js index 1b6fc79dc..3d332260a 100644 --- a/game/source.js +++ b/game/source.js @@ -11,6 +11,7 @@ window.noname_source_list=[ 'character/diy.js', 'character/extra.js', 'character/gujian.js', + 'character/gwent.js', 'character/hearth.js', 'character/old.js', 'character/ow.js', diff --git a/game/update.js b/game/update.js index 1fda00d89..bfef854c9 100644 --- a/game/update.js +++ b/game/update.js @@ -1,13 +1,15 @@ window.noname_update={ - version:'1.9.10.3', + version:'1.9.10.3beta', update:'1.9.10.2', changeLog:[ 'bug修复', ], files:[ 'game/game.js', - // 'game/config.js', - // 'game/asset.js', + 'game/package.js', + 'game/config.js', + 'game/source.js', + 'game/asset.js', 'card/guozhan.js', 'character/*', // 'character/*', diff --git a/image/character/swd_anka.jpg b/image/character/swd_anka.jpg index 15376a432..dfa7c4942 100644 Binary files a/image/character/swd_anka.jpg and b/image/character/swd_anka.jpg differ diff --git a/image/character/swd_chenfu.jpg b/image/character/swd_chenfu.jpg index 104634252..e42ffa548 100644 Binary files a/image/character/swd_chenfu.jpg and b/image/character/swd_chenfu.jpg differ diff --git a/image/character/swd_kendi.jpg b/image/character/swd_kendi.jpg new file mode 100644 index 000000000..9ad9296cb Binary files /dev/null and b/image/character/swd_kendi.jpg differ diff --git a/image/character/swd_miles.jpg b/image/character/swd_miles.jpg new file mode 100644 index 000000000..11a0c4cd6 Binary files /dev/null and b/image/character/swd_miles.jpg differ