diff --git a/character/sp.js b/character/sp.js index b031f5431..b8f336672 100644 --- a/character/sp.js +++ b/character/sp.js @@ -64,6 +64,10 @@ character.sp={ wanglang:['male','wei',3,['gushe','jici']], sp_pangde:['male','wei',4,['mashu','juesi']], sp_jiaxu:['male','wei',3,['zhenlue','jianshu','yongdi']], + + litong:['male','wei',4,['tuifeng']], + mizhu:['male','shu',4,['ziyuan','jugu']], + buzhi:['male','wu',4,['hongde','dingpan']], }, perfectPair:{ zhugejin:['zhugeke'], @@ -6210,6 +6214,9 @@ character.sp={ }, }, translate:{ + litong:'李通', + mizhu:'糜竺', + buzhi:'步骘', chenlin:'陈琳', yuanshu:'袁术', re_yuanshu:'新袁术', @@ -6286,6 +6293,16 @@ character.sp={ yanbaihu:'严白虎', wanglang:'王朗', + tuifeng:'推锋', + tuifeng_info:'1.当你受到1点伤害后,你可以将一张牌置于武将牌上,称为“锋”。2.准备阶段开始时,若你的武将牌上有“锋”,你将所有“锋”置入弃牌堆,摸2X张牌,然后你于此回合的出牌阶段内使用【杀】的次数上限+X(X为你此次置入弃牌堆的“锋”数)', + ziyuan:'资援', + ziyuan_info:'出牌阶段限一次,你可以将任意张点数之和为13的手牌交给一名其他角色,然后该角色回复1点体力', + jugu:'巨贾', + jugu_info:'锁定技,1.你的手牌上限+X。2.游戏开始时,你摸X张牌(X为你的体力上限)', + hongde:'弘德', + hongde_info:'当你一次获得或失去至少两张牌后,你可以令一名其他角色摸一张牌', + dingpan:'定叛', + dingpan_info:'出牌阶段限X次,你可以令一名装备区里有牌的角色摸一张牌,然后其选择一项:1.令你弃置其装备区里的一张牌;2.获得其装备区里的所有牌,若如此做,你对其造成1点伤害(X为场上存活的反贼数)', weidi:'伪帝', weidi_info:'锁定技,你视为拥有当前主公的主公技', juesi:'决死', diff --git a/game/asset.js b/game/asset.js index 6ed5467c8..4fad38efe 100644 --- a/game/asset.js +++ b/game/asset.js @@ -242,6 +242,7 @@ window.noname_asset_list=[ 'image/character/boss_zhuoguiquxie.jpg', 'image/character/boss_zuoci.jpg', 'image/character/bulianshi.jpg', + 'image/character/buzhi.jpg', 'image/character/caifuren.jpg', 'image/character/caiwenji.jpg', 'image/character/caoang.jpg', @@ -415,6 +416,7 @@ window.noname_asset_list=[ 'image/character/lingju.jpg', 'image/character/lingtong.jpg', 'image/character/liru.jpg', + 'image/character/litong.jpg', 'image/character/liubei.jpg', 'image/character/liubiao.jpg', 'image/character/liuchen.jpg', @@ -439,6 +441,7 @@ window.noname_asset_list=[ 'image/character/mayunlu.jpg', 'image/character/menghuo.jpg', 'image/character/mifuren.jpg', + 'image/character/mizhu.jpg', 'image/character/nianshou.jpg', 'image/character/niutou.jpg', 'image/character/old_zhonghui.jpg', diff --git a/game/game.js b/game/game.js index 40c4d9114..1de659a0d 100644 --- a/game/game.js +++ b/game/game.js @@ -14667,7 +14667,7 @@ game.send('server','enter',game.roomId,lib.config.connect_nickname,lib.config.connect_avatar); } } - if(_status.event.getParent()){ + if(_status.event.parent){ game.forceOver('noover',proceed); } else{ diff --git a/image/character/.DS_Store b/image/character/.DS_Store deleted file mode 100644 index 5008ddfcf..000000000 Binary files a/image/character/.DS_Store and /dev/null differ diff --git a/image/character/buzhi.jpg b/image/character/buzhi.jpg new file mode 100644 index 000000000..53f44590f Binary files /dev/null and b/image/character/buzhi.jpg differ diff --git a/image/character/litong.jpg b/image/character/litong.jpg new file mode 100644 index 000000000..9b9955ce4 Binary files /dev/null and b/image/character/litong.jpg differ diff --git a/image/character/mizhu.jpg b/image/character/mizhu.jpg new file mode 100644 index 000000000..5cf0cc377 Binary files /dev/null and b/image/character/mizhu.jpg differ