From a00e3c03b4257d954ba3fee0ccc64170537c1b9a Mon Sep 17 00:00:00 2001 From: libccy Date: Mon, 9 Nov 2015 11:15:16 +0800 Subject: [PATCH] 1.5.3 --- CHANGELOG.MD | 6 +- card/standard.js | 2 + card/swd.js | 18 +- character/extra.js | 3 +- character/mountain.js | 1 + character/sp.js | 1 + character/swd.js | 12 +- character/xianjian.js | 4 +- character/zhuogui.js | 2 +- game/game.js | 216 +++- image/card/chess_chuzhang.png | Bin 0 -> 60979 bytes image/card/chess_shezhang.png | Bin 0 -> 53921 bytes image/card/huimiezhichui.png | Bin 0 -> 104595 bytes image/character/default/mamian.jpg | Bin 10202 -> 6006 bytes image/character/default/mamian.png | Bin 0 -> 14567 bytes .../default/treasure_dubiaoxianjing.jpg | Bin 0 -> 15403 bytes image/character/default/treasure_jiqishi.jpg | Bin 0 -> 7839 bytes .../default/treasure_shenmidiaoxiang.jpg | Bin 0 -> 16417 bytes .../default/treasure_shenpanxianjing.jpg | Bin 0 -> 16151 bytes .../character/default/treasure_shiyuansu.jpg | Bin 0 -> 18619 bytes .../default/treasure_wuyashenxiang.jpg | Bin 0 -> 22734 bytes layout/default/layout.css | 21 +- layout/mobile/equip.css | 2 +- layout/mode/chess.css | 35 +- layout/newlayout/equip.css | 2 +- mode/boss.js | 1 + mode/chess.js | 965 +++++++++++++++--- mode/identity.js | 10 +- mode/stone.js | 118 ++- theme/cardstyle/simple.css | 2 +- theme/simple/style.css | 13 + 31 files changed, 1189 insertions(+), 245 deletions(-) create mode 100644 image/card/chess_chuzhang.png create mode 100644 image/card/chess_shezhang.png create mode 100644 image/card/huimiezhichui.png mode change 100755 => 100644 image/character/default/mamian.jpg create mode 100644 image/character/default/mamian.png create mode 100644 image/character/default/treasure_dubiaoxianjing.jpg create mode 100644 image/character/default/treasure_jiqishi.jpg create mode 100644 image/character/default/treasure_shenmidiaoxiang.jpg create mode 100644 image/character/default/treasure_shenpanxianjing.jpg create mode 100644 image/character/default/treasure_shiyuansu.jpg create mode 100644 image/character/default/treasure_wuyashenxiang.jpg diff --git a/CHANGELOG.MD b/CHANGELOG.MD index 5f54c5eb5..95a029651 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -1,2 +1,4 @@ -1.5.2 -明忠模式 +1.5.3 +战棋路障、特殊战场角色 +战棋自动显示距离 +修正部分区域点击困难的问题 diff --git a/card/standard.js b/card/standard.js index f407f3989..85f559c73 100755 --- a/card/standard.js +++ b/card/standard.js @@ -435,6 +435,7 @@ card.standard={ ui.clear(); var cards=get.cards(game.players.length); var dialog=ui.create.dialog('五谷丰登',cards,true); + _status.dieClose.push(dialog); dialog.videoId=lib.status.videoId++; game.addVideo('cardDialog',null,['五谷丰登',get.cardsInfo(cards),dialog.videoId]); event.parent.preResult=dialog.videoId; @@ -479,6 +480,7 @@ card.standard={ for(var i=0;i1){ + if(i==0) return 5; + return 1; + } + if(i==0) return 7.3; + return 3; + }, + value:function(card,player){ + if(player.hp>1){ + if(i==0) return 5; + return 1; + } + if(i==0) return 7.3; + return 3; + }, }, order:function(){ return lib.card.sha.ai.order+0.2; diff --git a/character/extra.js b/character/extra.js index 278cdf675..bc8f13917 100755 --- a/character/extra.js +++ b/character/extra.js @@ -1107,7 +1107,8 @@ character.extra={ shelie_info:'摸牌阶段，你可以放弃摸牌，改为从牌堆顶亮出五张牌，你获得不同花色的牌各一张，将其余的牌置入弃牌堆。', gongxin_info:'出牌阶段，你可以观看一名其他角色的手牌，并可以展示其中一张红桃牌，然后将其弃置或置于牌堆顶，每阶段限一次。', guixin_info:'每当你受到1次伤害后，若至少一名其他角色的区域里有牌，你可以选择所有其他角色，获得这些角色区域里的一张牌，然后将你的武将牌翻面。', - qinyin_info:'每当你于弃牌阶段内因你的弃置而失去第X张手牌时（X至少为2），你可以选择一项：1.令所有角色各回复1点体力；2.令所有角色各失去1点体力。每阶段限一次。', + qinyin_info:'弃牌阶段结束时，若你于此阶段内弃置过你的至少两张手牌，则你可以选择一项：1. 所有角色各回复1点体力；2. 所有角色各失去1点体力。', + // qinyin_info:'每当你于弃牌阶段内因你的弃置而失去第X张手牌时（X至少为2），你可以选择一项：1.令所有角色各回复1点体力；2.令所有角色各失去1点体力。每阶段限一次。', yeyan_info:'限定技，出牌阶段，你可以对一至三名角色造成至多共3点火焰伤害（你可以任意分配每名目标角色受到的伤害点数），若你将对一名角色分配2点或更多的火焰伤害，你须先弃置四张不同花色的手牌再失去3点体力。', qixing:'七星', qixing_bg:'星', diff --git a/character/mountain.js b/character/mountain.js index 1371c9df1..24c7c4c80 100755 --- a/character/mountain.js +++ b/character/mountain.js @@ -918,6 +918,7 @@ character.mountain={ priority:10, content:function(){ for(var i in lib.character){ + if(i.indexOf('stone_')==0) continue; var add=false; for(var j=0;jrecover&&lose>0) return 0; if(lose0) return 1; @@ -7944,8 +7946,6 @@ character.swd={ fushen2:'附身', tiandao:'天道', tiandao_info:'任意一名角色的判定生效前，你可以打出一张牌替换之', - swdqinyin:'琴音', - swdqinyin_info:'回合结束阶段，若你于本回合内未造成过伤害，你可以令所有角色失去或回复一点体力', wangchen:'忘尘', wangchen_info:'若你于弃牌阶段弃置了基本牌，可令一名角色翻面', guiyin:'归隐', diff --git a/character/xianjian.js b/character/xianjian.js index cb7565e55..66b883ad5 100755 --- a/character/xianjian.js +++ b/character/xianjian.js @@ -68,7 +68,7 @@ character.xianjian={ } }, ningbin:{ - trigger:{player:'damageEnd',source:'damageEnd'}, + trigger:{player:'damageEnd'}, forced:true, filter:function(event){ return event.nature=='thunder'; @@ -1360,7 +1360,7 @@ character.xianjian={ xuanyan2:'玄炎', xuanyan_info:'锁定技，你的火属性伤害+1；你造成火属性伤害后流失1点体力', ningbin:'凝冰', - ningbin_info:'锁定技，每当你造成或受到1次雷属性伤害，你回复1点体力', + ningbin_info:'锁定技，每当你受到1次雷属性伤害，你回复1点体力', fenxin:'焚心', fenxin2:'焚心', fenxin_info:'锁定技，每当你的体力值发生改变，你摸等量的牌；每当你杀死一名角色，你增加一点体力上限并回复一点体力', diff --git a/character/zhuogui.js b/character/zhuogui.js index 525174d4c..eb473f7a8 100755 --- a/character/zhuogui.js +++ b/character/zhuogui.js @@ -1,7 +1,7 @@ character.zhuogui={ character:{ nianshou:['male','shu',4,['nianrui','qixiang']], - mamian:['male','qun',4,['lianyu','guiji']], + // mamian:['male','qun',4,['lianyu','guiji']], niutou:['male','shu',4,['manjia','xiaoshou'],['fullskin']], baiwuchang:['male','qun',3,['qiangzheng','moukui']], heiwuchang:['male','qun',3,['suoling','xixing']], diff --git a/game/game.js b/game/game.js index 010a20aef..631f6af8f 100755 --- a/game/game.js +++ b/game/game.js @@ -13,6 +13,7 @@ ai:{}, lastdragchange:[], skillaudio:[], + dieClose:[] }; var lib={ configprefix:'noname_0.9_', @@ -1312,25 +1313,48 @@ } }, }, + chess_treasure:{ + name:'特殊战场角色', + init:'0.2', + frequent:true, + item:{ + '0':'关闭', + '0.1':'较少出现', + '0.2':'偶尔出现', + '0.333':'时常出现', + '0.5':'频繁出现', + } + }, + chess_obstacle:{ + name:'随机路障', + init:'0.333', + item:{ + '0':'关闭', + '0.2':'少量', + '0.333':'中量', + '0.5':'大量', + }, + frequent:true, + }, + show_distance:{ + name:'显示距离', + init:true, + // frequent:true, + }, chess_ordered:{ name:'交替行动', init:true, - frequent:true, + // frequent:true, }, chess_character:{ name:'战棋武将', init:true, - frequent:true, + // frequent:true, }, - chessscroll_speed:{ - name:'边缘滚动速度', - init:'20', - item:{ - '0':'不滚动', - '10':'10格/秒', - '20':'20格/秒', - '30':'30格/秒', - } + chess_card:{ + name:'战棋卡牌', + init:true, + // frequent:true, }, free_choose:{ name:'自由选将', @@ -1367,6 +1391,16 @@ init:false, restart:true, }, + chessscroll_speed:{ + name:'边缘滚动速度', + init:'20', + item:{ + '0':'不滚动', + '10':'10格/秒', + '20':'20格/秒', + '30':'30格/秒', + } + }, } }, stone:{ @@ -1463,12 +1497,15 @@ '身份模式':'
明忠