From f0279f5c485669d38618ea3a97f3f2f7af60f164 Mon Sep 17 00:00:00 2001 From: libccy Date: Wed, 25 Nov 2015 23:42:29 +0800 Subject: [PATCH] scroll --- character/diy.js | 2 +- game/game.js | 32 +++++++++++++++----------------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/character/diy.js b/character/diy.js index eeaf06e2b..2705a013a 100755 --- a/character/diy.js +++ b/character/diy.js @@ -794,7 +794,7 @@ character.diy={ zonghuo_info:'你可弃置一张牌将你即将造成的伤害变为火焰伤害', shaoying_info:'每当你造成一次火焰伤害，可指定距离受伤害角色1以内的另一名角色，并展示牌堆顶的一张牌，若此牌为红色，该角色受到一点火焰伤害', tiangong_info:'锁定技，你防止即将受到的雷电伤害，每当你造成一次雷电伤害，你摸一张牌', - diyleiji_info:'每当你使用或打出一张【闪】，可令任意一名角色进行一次判定，若结果为梅花，其受到一点雷电伤害，然后你摸回复一点体力；若结果为黑桃，其受到两点雷电伤害', + diyleiji_info:'每当你使用或打出一张【闪】，可令任意一名角色进行一次判定，若结果为梅花，其受到一点雷电伤害，然后你回复一点体力；若结果为黑桃，其受到两点雷电伤害', juedao_info:'出牌阶段，你可以弃置一张手牌，横置你的武将牌；锁定技，若你处于连环状态，你与其他角色的距离、其他角色与你的距离各+1。', geju_info:'准备阶段开始时，你可以摸X张牌（X为攻击范围内不含有你的势力数）。', siji_info:'弃牌阶段结束后，你可以摸2X张牌（X为你于此阶段内弃置的【杀】的数量）。', diff --git a/game/game.js b/game/game.js index 0e9dc4d58..cb2011ea2 100755 --- a/game/game.js +++ b/game/game.js @@ -183,12 +183,12 @@ game.saveConfig('mousewheel',bool); if(lib.config.touchscreen) return; if(lib.config.mousewheel){ - game.me.node.handcards1.onmousewheel=ui.click.mousewheel; - game.me.node.handcards2.onmousewheel=ui.click.mousewheel; + ui.handcards1Container.onmousewheel=ui.click.mousewheel; + ui.handcards2Container.onmousewheel=ui.click.mousewheel; } else{ - game.me.node.handcards1.onmousewheel=null; - game.me.node.handcards2.onmousewheel=null; + ui.handcards1Container.onmousewheel=null; + ui.handcards2Container.onmousewheel=null; } } }, @@ -14033,19 +14033,6 @@ node.ai={friend:[],enemy:[],neutral:[]}; node.queueCount=0; - if(lib.config.mousewheel&&!lib.config.touchscreen){ - node.node.handcards1.onmousewheel=ui.click.mousewheel; - node.node.handcards2.onmousewheel=ui.click.mousewheel; - // node.node.equips.onmousewheel=ui.click.mousewheel; - } - - node.node.handcards1.ontouchstart = ui.click.touchStart; - node.node.handcards2.ontouchstart = ui.click.touchStart; - node.node.handcards1.ontouchmove = ui.click.touchScroll; - node.node.handcards2.ontouchmove = ui.click.touchScroll; - node.node.handcards1.style.WebkitOverflowScrolling='touch'; - node.node.handcards2.style.WebkitOverflowScrolling='touch'; - for(var i in lib.element.player){ node[i]=lib.element.player[i]; } @@ -14091,6 +14078,17 @@ ui.me=ui.create.div('#me',ui.arena).animate('start'); ui.handcards1Container=ui.create.div('#handcards1',ui.me); ui.handcards2Container=ui.create.div('#handcards2',ui.me); + if(lib.config.mousewheel&&!lib.config.touchscreen){ + ui.handcards1Container.onmousewheel=ui.click.mousewheel; + ui.handcards2Container.onmousewheel=ui.click.mousewheel; + } + ui.handcards1Container.ontouchstart = ui.click.touchStart; + ui.handcards2Container.ontouchstart = ui.click.touchStart; + ui.handcards1Container.ontouchmove = ui.click.touchScroll; + ui.handcards2Container.ontouchmove = ui.click.touchScroll; + ui.handcards1Container.style.WebkitOverflowScrolling='touch'; + ui.handcards2Container.style.WebkitOverflowScrolling='touch'; + if(game.players.length){ game.me=game.players[0]; ui.handcards1=game.me.node.handcards1;