From ff8178e7932cba0a78af1f0d3c2c3f769a17538e Mon Sep 17 00:00:00 2001 From: libccy Date: Tue, 13 Oct 2015 19:15:02 +0800 Subject: [PATCH] p --- character/diy.js | 2 +- character/gujian.js | 2 +- character/mountain.js | 87 ++++++++++++-- game/game.js | 41 +++++-- image/character/default/null.png | Bin 0 -> 1048 bytes image/character/fullskin/null.png | Bin 0 -> 1048 bytes mode/chess.js | 191 +++++++++++++++++++++++++++++- 7 files changed, 293 insertions(+), 30 deletions(-) create mode 100644 image/character/default/null.png create mode 100644 image/character/fullskin/null.png diff --git a/character/diy.js b/character/diy.js index f3a80acab..5e91444dd 100755 --- a/character/diy.js +++ b/character/diy.js @@ -5,7 +5,7 @@ character.diy={ diy_feishi:['male','shu',3,['shuaiyan','moshou'],['fullskin']], diy_liuyan:['male','shu',3,['juedao','geju'],['fullskin']], // diy_luxun:['male','wu',3,['shaoying','zonghuo'],['fullskin']], - // diy_yuji:['male','qun',3,['diyguhuo','diychanyuan'],['fullskin']], + diy_yuji:['male','qun',3,['diyguhuo','diychanyuan'],['fullskin']], // diy_zhouyu:['male','wu',3,['jieyan','honglian']], diy_zhouyu:['male','wu',3,['xiongzi','yaliang'],['fullskin']], diy_caiwenji:['female','qun',3,['beige','guihan'],['fullskin']], diff --git a/character/gujian.js b/character/gujian.js index f1fdbae98..d87813d39 100755 --- a/character/gujian.js +++ b/character/gujian.js @@ -651,7 +651,7 @@ character.gujian={ player.logSkill('qianjun',targets); for(var i=0;i
【'+get.translation(skill)+ + '】
'+lib.translate[skill+'_info']+'
'); + } } }, mark:true @@ -899,9 +918,9 @@ character.mountain={ } } for(var i=0;i$ZRidLRMM`hWT6b6^aTI%McICDM zH%_qgwA20oSI$WM49@%k>?B=7XcIZHU%!v-?@PYR!SUg?@>Br;Z1;}5p?EiB+juCR zJCA={$^jc5?t|N(&wh)+W^y!U0Bk*ytpUDXJpthUH5vKb@4rD48X3Wqo?;`565$5G z$&lzqm}krsgWDsygX(hKAljiHlK3 z`@ngEAe_(V#=L3J^bA_Dv~68DbaoN*Ak$;ETP(6z$HQ!rl7tf)t8(4ol%DgB zrpb-&uJW8wa<@^;%BVzqFbfiB875o>aWY#T?;lFeti^Cf)?jj`!181iXLLkHQJ+r9 z?7|B;c5TyY>6WQm&5_kamWlRWI9aTjdWQGsO~ z=xs`{NU%(!YdP>gt?uvAC`mD6(%&lmRjuwHVn)Mrx%~T>aMv!8np~&G%XxQi!BoXM z;I9IzVg-;N0_BUk*fBZuPuZqmAd26L1fJ2cYr!`?o)`TzjvNz1#hhPk#YK C$2VgD literal 0 HcmV?d00001 diff --git a/image/character/fullskin/null.png b/image/character/fullskin/null.png new file mode 100644 index 0000000000000000000000000000000000000000..28f7e3ca0500d7b8ae5902fe04d7623eadfd05a0 GIT binary patch literal 1048 zcmZ{jL2uJA7=~RCXv?${LP7|%C_5)kQp!{-jl>$ZRidLRMM`hWT6b6^aTI%McICDM zH%_qgwA20oSI$WM49@%k>?B=7XcIZHU%!v-?@PYR!SUg?@>Br;Z1;}5p?EiB+juCR zJCA={$^jc5?t|N(&wh)+W^y!U0Bk*ytpUDXJpthUH5vKb@4rD48X3Wqo?;`565$5G z$&lzqm}krsgWDsygX(hKAljiHlK3 z`@ngEAe_(V#=L3J^bA_Dv~68DbaoN*Ak$;ETP(6z$HQ!rl7tf)t8(4ol%DgB zrpb-&uJW8wa<@^;%BVzqFbfiB875o>aWY#T?;lFeti^Cf)?jj`!181iXLLkHQJ+r9 z?7|B;c5TyY>6WQm&5_kamWlRWI9aTjdWQGsO~ z=xs`{NU%(!YdP>gt?uvAC`mD6(%&lmRjuwHVn)Mrx%~T>aMv!8np~&G%XxQi!BoXM z;I9IzVg-;N0_BUk*fBZuPuZqmAd26L1fJ2cYr!`?o)`TzjvNz1#hhPk#YK C$2VgD literal 0 HcmV?d00001 diff --git a/mode/chess.js b/mode/chess.js index 1acee7e10..cca710d38 100755 --- a/mode/chess.js +++ b/mode/chess.js @@ -67,7 +67,6 @@ mode.chess={ if(y>=ui.chessheight){ y=ui.chessheight-1; } - // console.log(x,y); var pos=y*ui.chesswidth+x; if(!lib.posmap[pos]){ @@ -743,7 +742,19 @@ mode.chess={ ui.chess.appendChild(ui.canvas2); ui.ctx2=ui.canvas2.getContext('2d'); game.me=ui.create.player(); - game.chooseCharacter(); + switch(get.config('chess_mode')){ + case 'leader':{ + game.leaderView(); + break; + } + case 'combat':{ + game.chooseCharacter(); + break; + } + default:{ + game.chooseCharacter(); + } + } "step 1" ui.arena.classList.add('chess'); var num=Math.round((_status.mylist.length+_status.enemylist.length)/2); @@ -942,6 +953,12 @@ mode.chess={ p=p.next; } }, + initLeaderSave:function(save){ + game.save(save,{ + money:0, + character:[] + }); + }, clickChessInfo:function(e){ if(this.link.isAlive()){ this.link.chessFocus(); @@ -953,6 +970,89 @@ mode.chess={ e.stopPropagation(); } }, + leaderView:function(){ + var next=game.createEvent('leaderView',false); + next.content=function(){ + 'step 0' + game.characterInfo={ + free:[ + 'caocao', + 'simayi', + 'xiahoudun', + 'zhangliao', + 'xuzhu', + 'guojia', + 'zhenji', + 'liubei', + 'guanyu', + 'zhangfei', + 'zhugeliang', + 'zhaoyun', + 'machao', + 'huangyueying', + 'sunquan', + 'ganning', + 'lvmeng', + 'huanggai', + 'zhouyu', + 'daqiao', + 'luxun', + 'sunshangxiang', + 'huatuo', + 'lvbu', + 'diaochan' + ], + rare:[ + 'diy_xuhuang', + 'diy_zhenji', + 're_huangyueying', + 'diy_lukang', + 'zhugeliangwolong', + 'taishici', + 'gjqt_xiayize', + 'gjqt_fengqingxue', + 'gjqt_fanglansheng', + 'gjqt_yuewuyi', + ], + epic:[ + 'diy_caiwenji', + 'old_zhonghui', + 'diy_zhouyu', + 'xunyu', + 'gjqt_bailitusu', + 'gjqt_aruan', + ], + legend:[ + 'shen_guanyu', + 'shen_zhaoyun', + 'shen_zhugeliang', + 'shen_lvmeng', + 'shen_zhouyu', + 'shen_simayi', + 'shen_caocao', + 'shen_lvbu', + ], + common:[], + }; + for(var i in lib.character){ + if(!game.characterInfo.free.contains('i')&& + !game.characterInfo.rare.contains('i')&& + !game.characterInfo.epic.contains('i')&& + !game.characterInfo.legend.contains('i')){ + game.characterInfo.common.push(i); + } + } + var save=get.config('chess_leader_save'); + if(!save){ + save='save1'; + } + if(!lib.storage[save]){ + game.initLeaderSave(save); + } + game.pause(); + 'step 1' + } + }, chooseCharacter:function(){ var next=game.createEvent('chooseCharacter',false); next.showConfig=true; @@ -1755,10 +1855,20 @@ mode.chess={ trueColor:"zhu", falseColor:"wei", _chessmove:'移动', + leader:'统率', + combat:'对阵', chessscroll_speed_config:'边缘滚动速度', chess_character_config:'战棋武将', only_chess_character_config:'只用战棋武将', chess_ordered_config:'指定行动顺序', + chess_mode_config:'游戏模式', + chess_leader_save_config:'选择历程', + chess_leader_clear_config:'清除进度', + save1:'一', + save2:'二', + save3:'三', + save4:'四', + save5:'五', chess_caocao:'曹操', chess_xunyu:'荀彧', @@ -1814,7 +1924,7 @@ mode.chess={ guanchuan_info:'当你使用杀指定惟一的目标后，可将攻击射线内的其他角色也加入目标', boss_qiangzheng:'强征', - boss_qiangzheng_info:'锁定技，回合结束阶段，你获得每个敌方角色的一张手牌', + boss_qiangzheng_info:'锁定技，回合结束阶段，你获得每个其他角色的一张手牌', boss_baolin:'暴凌', boss_moyan:'魔焰', boss_moyan_info:'锁定技，回合结束阶段，你对场上所有角色造成一点火焰伤害', @@ -1930,8 +2040,78 @@ mode.chess={ '杀死对方阵营的角色可摸一张牌，杀死本方阵营无惩罚
  • '+ '开启指定行动顺序后，双方将交替行动，在一方行动完毕进行下一轮行动时，若其人数比另一方少，另一方可指定至多X名角色名摸一张牌，X为人数之差' }, - config:['battle_number','ban_weak','free_choose','change_choice', + config:[ function(game,lib,get,ui){ + var current=get.config('chess_mode'); + if(typeof current!=='string'){ + game.saveConfig('chess_mode','combat',true); + current='combat'; + } + return ui.create.switcher('chess_mode',['combat','leader'],current,function(){ + ui.click.sidebar.local.apply(this,arguments); + window.location.reload(); + }); + }, + function(game,lib,get,ui){ + if(get.config('chess_mode')!='leader') return; + var current=get.config('chess_leader_save'); + if(typeof current!=='string'){ + current='save1'; + game.saveConfig('chess_leader_save',current,true); + } + return ui.create.switcher('chess_leader_save',['save1','save2','save3','save4','save5'],current,function(){ + ui.click.sidebar.local.apply(this,arguments); + window.location.reload(); + }); + }, + function(game,lib,get,ui){ + if(get.config('chess_mode')!='leader') return; + var switcher=ui.create.line('清除进度',function(){ + var node=this; + if(node._clearing){ + game.save(get.config('chess_leader_save'),null); + window.location.reload(); + return; + } + node._clearing=true; + node.innerHTML='单击以确认 (3)'; + setTimeout(function(){ + node.innerHTML='单击以确认 (2)'; + setTimeout(function(){ + node.innerHTML='单击以确认 (1)'; + setTimeout(function(){ + node.innerHTML='清除进度'; + delete node._clearing; + },1000); + },1000); + },1000); + }); + return switcher; + }, + function(){ + if(get.config('chess_mode')!='leader'){ + return 'battle_number'; + } + }, + function(){ + if(get.config('chess_mode')!='leader'){ + return 'ban_weak'; + } + }, + function(){ + if(get.config('chess_mode')!='leader'){ + return 'free_choose'; + } + }, + function(){ + if(get.config('chess_mode')!='leader'){ + return 'change_choice'; + } + }, + function(game,lib,get,ui){ + if(get.config('chess_mode')=='leader'){ + return; + } var current=get.config('chess_ordered'); if(typeof current!=='boolean'){ game.saveConfig('chess_ordered',true,true); @@ -1940,6 +2120,9 @@ mode.chess={ return ui.create.switcher('chess_ordered',current,ui.click.sidebar.local2); }, function(game,lib,get,ui){ + if(get.config('chess_mode')=='leader'){ + return; + } var current=get.config('chess_character'); if(typeof current!=='boolean'){ game.saveConfig('chess_character',true,true);