From 0b9697e82169e627ebd58945e4fa51a9ab67778b Mon Sep 17 00:00:00 2001 From: libccy Date: Wed, 29 Apr 2015 15:54:48 +0800 Subject: [PATCH] config --- game/game.js | 417 ++++++++++++--------------------------------------- 1 file changed, 98 insertions(+), 319 deletions(-) diff --git a/game/game.js b/game/game.js index 12cec4081..3653668f1 100644 --- a/game/game.js +++ b/game/game.js @@ -161,10 +161,8 @@ window.play={}; case 'hover_handcard':lib.config.hover_handcard=config2[i];break; case 'duration':lib.config.duration=config2[i];break; case 'hoveration':lib.config.hoveration=config2[i];break; - case 'character':lib.config.image.character=config2[i];break; - case 'background':lib.config.image.background=config2[i];break; - case 'background_filter':lib.config.image.background_filter=config2[i];break; - case 'dynamic_background':lib.config.image.dynamic_background=config2[i];break; + case 'image_background':lib.config.image_background=config2[i];break; + case 'image_background_filter':lib.config.image_background_filter=config2[i];break; case 'ui_zoom':lib.config.ui_zoom=config2[i];break; case 'show_name':lib.config.show_name=config2[i];break; case 'show_replay':lib.config.show_replay=config2[i];break; @@ -176,21 +174,17 @@ window.play={}; case 'only_fullskin':lib.config.only_fullskin=config2[i];break; case 'hide_card_image':lib.config.hide_card_image=config2[i];break; case 'show_wuxie':lib.config.show_wuxie=config2[i];break; - case 'show_stat':lib.config.show_stat=config2[i];break; case 'show_scrollbar':lib.config.show_scrollbar=config2[i];break; case 'mousewheel':lib.config.mousewheel=config2[i];break; case 'fold_card':lib.config.fold_card=config2[i];break; case 'touchscreen':lib.config.touchscreen=config2[i];break; case 'threed_card':lib.config.threed_card=config2[i];break; case 'blur_ui':lib.config.blur_ui=config2[i];break; - case 'vertical_scroll':lib.config.vertical_scroll=config2[i];break; case 'hide_history':lib.config.hide_history=config2[i];break; case 'right_sidebar':lib.config.right_sidebar=config2[i];break; case 'right_click':lib.config.right_click=config2[i];break; case 'sort':lib.config.sort=config2[i];break; case 'reverse_sort':lib.config.reverse_sort=config2[i];break; - case 'paused':lib.config.paused=config2[i];break; - case 'animation':lib.config.animation=config2[i];break; case 'title':lib.config.title=config2[i];break; case 'intro':lib.config.intro=config2[i];break; case 'theme':lib.config.theme=config2[i];break; @@ -245,7 +239,6 @@ window.play={}; ui.css.layout=lib.init.css('layout/'+lib.config.layout,'layout'); if(!lib.config.touchscreen){ if(lib.config.show_scrollbar) ui.css.scrollbar=lib.init.css('layout/default','scrollbar'); - if(lib.config.vertical_scroll) lib.init.css('layout/default','vertical'); } if(lib.config.fold_card) ui.css.fold=lib.init.css('layout/default','fold'); if(lib.config.threed_card) ui.css.threed=lib.init.css('layout/default','fold2'); @@ -1700,9 +1693,7 @@ window.play={}; } player.changeHp(-num,false); player.popup(-num,event.nature); - if(lib.config.animation){ - player.$damage(source); - } + player.$damage(source); event.trigger('damage'); "step 1" if(player.hp<=0&&player.isAlive()){ @@ -1734,10 +1725,14 @@ window.play={}; if(arguments[i]===true) forced=true; } game.log(get.translation(player)+'失去了'+get.cnNumber(num)+'点体力上限'); - if(!get.config('keep_max_hp')||forced){ - player.maxHp-=num; - player.update(); + if(player.totalHp){ + player.totalHp-=num; + player.maxHp=Math.floor(player.totalHp/2); } + else{ + player.maxHp-=num; + } + player.update(); "step 1" if(player.maxHp<=0){ player.die(); @@ -1745,10 +1740,14 @@ window.play={}; }, gainMaxHp:function(){ game.log(get.translation(player)+'获得了'+get.cnNumber(num)+'点体力上限'); - if(!get.config('keep_max_hp')){ - player.maxHp+=num; - player.update(); + if(player.totalHp){ + player.totalHp+=num; + player.maxHp=Math.floor(player.totalHp/2); } + else{ + player.maxHp+=num; + } + player.update(); }, changeHp:function(){ player.hp+=num; @@ -1825,9 +1824,7 @@ window.play={}; if(player==game.me&&ui.auto){ ui.auto.hide(); } - if(lib.config.animation){ - player.$die(source); - } + player.$die(source); }, equip:function(){ "step 0" @@ -3883,9 +3880,9 @@ window.play={}; ui.arena.appendChild(node); node.hide(); node.style.transitionProperty='left,top,opacity'; - if(lib.config.animation){ - node.style.webkitTransform='rotate('+(Math.random()*16-8)+'deg)'; - } + + node.style.webkitTransform='rotate('+(Math.random()*16-8)+'deg)'; + ui.arena.appendChild(node); ui.refresh(node); node.show(); @@ -4702,9 +4699,6 @@ window.play={}; } player.ai.tempIgnore=[]; player.stat.push({card:{},skill:{}}); - if(get.config('save_progress')&&game.saveProgress){ - game.saveProgress(player); - } }, }, _save:{ @@ -4967,7 +4961,7 @@ window.play={}; if(result===false) result='战斗失败'; if(result==undefined) result='战斗结束'; dialog=ui.create.dialog(result); - if(lib.config.show_stat){ + if(true){ if(game.players.length){ table=document.createElement('table'); tr=document.createElement('tr'); @@ -5915,12 +5909,7 @@ window.play={}; key+='_mode_config_'+lib.config.mode; } else{ - if(key=='character'||key=='background'||key=='background_stretch'||key=='background_filter'||key=='dynamic_background'){ - lib.config.image[key]=value; - } - else{ - lib.config[key]=value; - } + lib.config[key]=value; } config[key]=value; localStorage.setItem(lib.configprefix+'config',JSON.stringify(config)); @@ -6296,7 +6285,6 @@ window.play={}; } switcher.classList.add('onoff'); ui.create.div(ui.create.div(switcher)); - // switcher.innerHTML=current?'开':'关'; switcher.link=current?true:false; switcher.addEventListener(lib.config.touchscreen?'touchend':'click',ui.click.toggle); } @@ -6418,10 +6406,12 @@ window.play={}; lib.config.hide_history=false; if(lib.config.right_sidebar) ui.sidebar.classList.add('right'); ui.config=ui.create.div('#sidebar2.content'); - ui.config.listen(function(){_status.clicked=true;}) - // var gamemode=ui.create.switcher('mode',lib.config.all.mode,lib.config.mode,ui.click.sidebar.mode); - // gamemode.classList.add('line2'); - // ui.config.appendChild(gamemode); + ui.config.listen(function(){_status.clicked=true;}); + ui.config.oncontextmenu=function(e){ + e.stopPropagation(); + return false; + }; + ui.sidebar.ontouchstart=ui.click.touchStart; ui.config.ontouchstart=ui.click.touchStart; ui.sidebar.ontouchmove = ui.click.touchScroll; @@ -6528,18 +6518,18 @@ window.play={}; })); for(i in lib.config.current_mode){ if(i=='difficulty'&&lib.config.current_mode[i]==true){ - modeconfig.push(ui.create.switcher('difficulty',['easy','normal','hard'],get.config('difficulty'),ui.click.sidebar.difficulty)); + modeconfig.push(ui.create.switcher('difficulty',['easy','normal','hard'],get.config('difficulty'),ui.click.sidebar.local)); } else if(i=='initshow_draw'&&lib.config.current_mode[i]==true){ - modeconfig.push(ui.create.switcher('initshow_draw',[0,1,2],get.config('initshow_draw'),ui.click.sidebar.initshow_draw)); + modeconfig.push(ui.create.switcher('initshow_draw',[0,1,2],get.config('initshow_draw'),ui.click.sidebar.local)); } else if(i=='ai_strategy'&&lib.config.current_mode[i]==true){ modeconfig.push(ui.create.switcher('ai_strategy', ['ai_strategy_1','ai_strategy_2','ai_strategy_3','ai_strategy_4','ai_strategy_5','ai_strategy_6'], - get.config('ai_strategy'),ui.click.sidebar.ai_strategy)); + get.config('ai_strategy'),ui.click.sidebar.local)); } else if(i=='ai_identity'&&lib.config.current_mode[i]==true){ - modeconfig.push(ui.create.switcher('ai_identity',get.config('ai_identity'),ui.click.sidebar.ai_identity)); + modeconfig.push(ui.create.switcher('ai_identity',get.config('ai_identity'),ui.click.sidebar.local)); } else if(i=='auto_identity'&&lib.config.current_mode[i]==true){ modeconfig.push(ui.create.switcher('auto_identity',['一轮','两轮','三轮','关闭'],get.config('auto_identity'),ui.click.sidebar.auto_identity)); @@ -6548,16 +6538,16 @@ window.play={}; modeconfig.push(ui.create.switcher('player_number',[2,3,4,5,6,7,8],get.config('player_number'),ui.click.sidebar.player_number)); } else if(i=='double_character'&&lib.config.current_mode[i]==true){ - modeconfig.push(ui.create.switcher('double_character',get.config('double_character'),ui.click.sidebar.double_character)); + modeconfig.push(ui.create.switcher('double_character',get.config('double_character'),ui.click.sidebar.local2)); } else if(i=='double_hp'&&lib.config.current_mode[i]==true){ - modeconfig.push(ui.create.switcher('double_hp',lib.config.all.double_hp,get.config('double_hp'),ui.click.sidebar.double_hp)); + modeconfig.push(ui.create.switcher('double_hp',lib.config.all.double_hp,get.config('double_hp'),ui.click.sidebar.local2)); } else if(i=='free_choose'&&lib.config.current_mode[i]==true){ modeconfig.push(ui.create.switcher('free_choose',get.config('free_choose'),ui.click.sidebar.free_choose)); } else if(i=='change_card'&&lib.config.current_mode[i]==true){ - modeconfig.push(ui.create.switcher('change_card',get.config('change_card'),ui.click.sidebar.change_card)); + modeconfig.push(ui.create.switcher('change_card',get.config('change_card'),ui.click.sidebar.local)); } else if(i=='change_choice'&&lib.config.current_mode[i]==true){ modeconfig.push(ui.create.switcher('change_choice',get.config('change_choice'),ui.click.sidebar.change_choice)); @@ -6572,97 +6562,18 @@ window.play={}; modeconfig.push(ui.create.switcher('revive',get.config('revive'),ui.click.sidebar.revive)); } else if(i=='dierestart'&&lib.config.current_mode[i]==true){ - modeconfig.push(ui.create.switcher('dierestart',get.config('dierestart'),ui.click.sidebar.dierestart)); - } - else if(i=='keep_max_hp'&&lib.config.current_mode[i]==true){ - modeconfig.push(ui.create.switcher('keep_max_hp',get.config('keep_max_hp'),ui.click.sidebar.keep_max_hp)); + modeconfig.push(ui.create.switcher('dierestart',get.config('dierestart'),ui.click.sidebar.local2)); } else if(i=='ban_weak'&&lib.config.current_mode[i]==true){ - modeconfig.push(ui.create.switcher('ban_weak',get.config('ban_weak'),ui.click.sidebar.ban_weak)); + modeconfig.push(ui.create.switcher('ban_weak',get.config('ban_weak'),ui.click.sidebar.local2)); } else if(i=='enhance_zhu'&&lib.config.current_mode[i]==true){ - modeconfig.push(ui.create.switcher('enhance_zhu',get.config('enhance_zhu'),ui.click.sidebar.enhance_zhu)); + modeconfig.push(ui.create.switcher('enhance_zhu',get.config('enhance_zhu'),ui.click.sidebar.local2)); } else if(i=='strict_sort'&&lib.config.current_mode[i]==true){ - modeconfig.push(ui.create.switcher('strict_sort',get.config('strict_sort'),ui.click.sidebar.strict_sort)); + modeconfig.push(ui.create.switcher('strict_sort',get.config('strict_sort'),ui.click.sidebar.local)); modeconfig.push(ui.create.switcher('reverse_sort',get.config('reverse_sort'),ui.click.sidebar.reverse_sort)); } - else if(i=='save_progress'&&lib.config.current_mode[i]==true){ - modeconfig.push(ui.create.switcher('save_progress',get.config('save_progress'),ui.click.sidebar.save_progress)); - var node=ui.create.div('.config'); - modeconfig.push(node); - ui.create.div(node).innerHTML='清除进度'; - node.addEventListener(lib.config.touchscreen?'touchend':'click',function(){ - var node2=ui.create.div('.toggle',this).animate('start'); - node2.innerHTML='已清除'; - setTimeout(function(){node2.delete()},1000); - if(game.clearProgress){ - game.clearProgress(); - } - else{ - game.save(); - } - }); - var node1=ui.create.div('.config'); - modeconfig.push(node1); - ui.create.div(node1).innerHTML='导出进度'; - var node2=ui.create.div('.config'); - node2.contentEditable=true; - node2.style.backgroundColor='rgba(255,255,255,0.5'; - var node3=ui.create.div('.config'); - node3.contentEditable=true; - node3.style.backgroundColor='rgba(255,255,255,0.5'; - node1.listen(function(){ - if(this.clicked) return; - if(this.fold){ - this.fold=false; - node2.delete(); - } - else{ - node2.innerHTML=lib.init.encode(localStorage.getItem(lib.configprefix+lib.config.mode)); - this.clicked=true; - this.fold=true; - this.parentNode.insertBefore(node2.animate('start'),this.nextSibling); - var that=this; - setTimeout(function(){that.clicked=false},500); - } - }); - var node4=ui.create.div('.config'); - modeconfig.push(node4); - ui.create.div(node4).innerHTML='导入进度'; - node4.listen(function(){ - if(this.clicked) return; - if(this.fold){ - this.fold=false; - node3.delete(); - var modestorage; - try{ - modestorage=JSON.parse(lib.init.decode(node3.innerHTML)); - if(typeof modestorage!='object') throw('err'); - if(game.minversion&&modestorage.version