From a35da27375c52cdc0ac306798413b8b6eea083d8 Mon Sep 17 00:00:00 2001 From: Spmario233 Date: Sun, 5 Jan 2020 17:13:44 +0800 Subject: [PATCH] v1.9.96.9 --- mode/guozhan.js | 101 +++++++++++++---------------------------------- mode/identity.js | 7 ++-- mode/versus.js | 32 +++++++-------- 3 files changed, 47 insertions(+), 93 deletions(-) diff --git a/mode/guozhan.js b/mode/guozhan.js index f664354e6..9d5f2a7e5 100644 --- a/mode/guozhan.js +++ b/mode/guozhan.js @@ -142,9 +142,11 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ else{ player=game.players[Math.floor(Math.random()*game.players.length)]; } + event.playerx=player; event.trigger('gameStart'); - game.gameDraw(player); + "step 3" + game.gameDraw(event.playerx); game.broadcastAll(function(player){ for(var i=0;i'+intro+''); + var ul=uiintro.querySelector('ul'); + if(ul){ + ul.style.width='180px'; + } + uiintro.add(ui.create.div('.placeholder')); + return uiintro; + },250); game.playBackgroundMusic(); }); game.countPlayer(function(current){current.addSkill('aozhan')}); @@ -7132,8 +7088,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ "yinyang_skill_add_info":"", "yinyang_add":"阴阳鱼", "yinyang_add_info":"", - aozhan:"鏖战", - "aozhan_info":"◇锁定技，你的【桃】只能当做【杀】或【闪】使用或打出，不能用来回复体力。", "new_jushou":"据守", "new_jushou_info":"结束阶段，你可以摸X张牌（X为亮明势力数），然后弃置一张手牌，若以此法弃置的是装备牌，则改为你使用之。若X大于2，则你将武将牌叠置。", @@ -7881,6 +7835,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ else{ this.maxHp--; } + this.update(); }, hideCharacter:function(num,log){ if(this.isUnseen(2)){ diff --git a/mode/identity.js b/mode/identity.js index a051ff60a..513584836 100644 --- a/mode/identity.js +++ b/mode/identity.js @@ -294,9 +294,10 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ } _status.videoInited=true; game.addVideo('init',null,info); + "step 6" - game.gameDraw(game.zhong||game.zhu||_status.firstAct||game.me); - game.phaseLoop(game.zhong||game.zhu||_status.firstAct||game.me); + game.gameDraw(_status.firstAct2||game.zhong||game.zhu||_status.firstAct||game.me); + game.phaseLoop(_status.firstAct2||game.zhong||game.zhu||_status.firstAct||game.me); }, game:{ getState:function(){ @@ -936,7 +937,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ } } - if(!game.zhu) game.zhu=game.me; + if(!game.zhu) game.zhu=game.me; else{ game.zhu.setIdentity(); game.zhu.identityShown=true; diff --git a/mode/versus.js b/mode/versus.js index 0c417c42a..9d4199896 100644 --- a/mode/versus.js +++ b/mode/versus.js @@ -3798,23 +3798,21 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ 'mazhong','mayunlu','litong','wenpin' ], choiceFour:[ - 'sunquan','re_ganning','re_lvmeng','re_zhouyu','re_daqiao','re_luxun','sunshangxiang', - 're_liubei','re_guanyu','re_zhangfei','zhugeliang','re_zhaoyun','re_machao','huangyueying','re_xushu', - 're_caocao','re_simayi','re_xiahoudun','re_zhangliao','re_xuzhu','re_guojia','zhenji','re_lidian', - 're_lvbu','diaochan','re_huatuo', - 'xiahouyuan','huangzhong','xiaoqiao', - 'dianwei','pangtong','sp_zhugeliang','taishici','pangde','yanwen', - 'xuhuang','sunjian','jiaxu','dongzhuo', - 'zhanghe','dengai','jiangwei','liushan','sunce', - 'caozhi','zhangchunhua','xin_masu','xin_fazheng','xin_xushu','lingtong','wuguotai','xusheng','chengong','gaoshun', - 'xunyou','wangyi','zhonghui','madai','liaohua','chengpu','handang','bulianshi', - 'jianyong','panzhangmazhong','yufan','xin_liru','fuhuanghou', - 'caozhen','chenqun','hanhaoshihuan','wuyi','zhoucang','guyong','sunluban','jushou','caifuren', - 'caoxiu','liuchen','gongsunyuan', - 'guohuanghou','liyan','cenhun','liuyu','sundeng', - 'sp_caiwenji','yuejin','sp_jiangwei','simalang','chengyu','caoang','wangji','wenpin', - 'zhugedan','mizhu','mayunlu','zhugeke','zumao','dingfeng','sunhao','zhanglu','hetaihou', - 'litong','dongbai','yanbaihu','zhugejin','daxiaoqiao' + 'sunquan','zhenji','diaochan','zhugeliang','sunshangxiang','huangyueying', + 're_caocao','re_liubei','re_simayi','re_guanyu','re_zhouyu','re_lvbu','re_daqiao','re_zhangfei','re_zhangliao','re_zhaoyun','re_xuzhu','re_machao','re_ganning','re_guojia','re_lidian','re_xiahoudun','re_xushu','re_lvmeng', + 're_xiahouyuan','re_xiaoqiao','re_huangzhong', + 'yanwen','dianwei','pangtong','taishici','sp_zhugeliang','re_pangde', + 'dongzhuo','jiaxu','sunjian','xuhuang','zhurong','jiangwei','sunce', + 'wangping','sunliang','wangji','yanyan', + 'chengong','zhangchunhua','xin_fazheng','lingtong','wuguotai','caozhi','xusheng', + 'xunyou','zhonghui','xin_wangyi','madai','bulianshi','handang','liubiao', + 'fuhuanghou','xin_liru','jianyong','panzhangmazhong','yufan','liufeng', + 'yj_jushou','caifuren','guyong','zhoucang', + 'gongsunyuan','liuchen','xiahoushi','sunxiu','quancong','guotupangji', + 'liyan','sundeng','cenhun','guohuanghou','caiyong','xuecong', + 'liuxie','yuejin','caoang','hetaihou','simalang','mayunlu','zhugejin','sp_machao','zhugeke','sp_caoren', + 'dingfeng','heqi','chengyu','wenpin','guanyinping','kanze', + 'sp_sunshangxiang','quyi','sp_jiangwei','dongbai','litong','yangxiu','sunqian','sunhao','xiahouba','liuqi','luzhi', ], translate:{ zhu:'主',