This commit is contained in:
libccy 2015-12-09 12:55:37 +08:00
parent 4059196a0c
commit 079b769986
69 changed files with 31 additions and 4 deletions

BIN
audio/die/caorui.mp3 Executable file

Binary file not shown.

BIN
audio/die/caoxiu.mp3 Executable file

Binary file not shown.

BIN
audio/die/gongsunyuan.mp3 Executable file

Binary file not shown.

BIN
audio/die/guotufengji.mp3 Executable file

Binary file not shown.

BIN
audio/die/liuchen.mp3 Executable file

Binary file not shown.

BIN
audio/die/mayunlu.mp3 Executable file

Binary file not shown.

BIN
audio/die/quancong.mp3 Executable file

Binary file not shown.

BIN
audio/die/sunxiu.mp3 Executable file

Binary file not shown.

BIN
audio/die/wutugu.mp3 Executable file

Binary file not shown.

BIN
audio/die/xiahoushi.mp3 Executable file

Binary file not shown.

BIN
audio/die/zhangyi.mp3 Executable file

Binary file not shown.

BIN
audio/die/zhongyao.mp3 Executable file

Binary file not shown.

BIN
audio/die/zhuzhi.mp3 Executable file

Binary file not shown.

BIN
audio/skill/anguo1.mp3 Executable file

Binary file not shown.

BIN
audio/skill/anguo2.mp3 Executable file

Binary file not shown.

BIN
audio/skill/fengpo1.mp3 Executable file

Binary file not shown.

BIN
audio/skill/fengpo2.mp3 Executable file

Binary file not shown.

BIN
audio/skill/hanyong1.mp3 Executable file

Binary file not shown.

BIN
audio/skill/hanyong2.mp3 Executable file

Binary file not shown.

BIN
audio/skill/huaiyi1.mp3 Executable file

Binary file not shown.

BIN
audio/skill/huaiyi2.mp3 Executable file

Binary file not shown.

BIN
audio/skill/huituo1.mp3 Executable file

Binary file not shown.

BIN
audio/skill/huituo2.mp3 Executable file

Binary file not shown.

BIN
audio/skill/huomo1.mp3 Executable file

Binary file not shown.

BIN
audio/skill/huomo2.mp3 Executable file

Binary file not shown.

BIN
audio/skill/huomo_jiu1.mp3 Executable file

Binary file not shown.

BIN
audio/skill/huomo_jiu2.mp3 Executable file

Binary file not shown.

BIN
audio/skill/huomo_sha1.mp3 Executable file

Binary file not shown.

BIN
audio/skill/huomo_sha2.mp3 Executable file

Binary file not shown.

BIN
audio/skill/huomo_tao1.mp3 Executable file

Binary file not shown.

BIN
audio/skill/huomo_tao2.mp3 Executable file

Binary file not shown.

BIN
audio/skill/jigong1.mp3 Executable file

Binary file not shown.

BIN
audio/skill/jigong2.mp3 Executable file

Binary file not shown.

BIN
audio/skill/mingjian1.mp3 Executable file

Binary file not shown.

BIN
audio/skill/mingjian2.mp3 Executable file

Binary file not shown.

BIN
audio/skill/qiaoshi1.mp3 Executable file

Binary file not shown.

BIN
audio/skill/qiaoshi2.mp3 Executable file

Binary file not shown.

BIN
audio/skill/qinwang11.mp3 Executable file

Binary file not shown.

BIN
audio/skill/qinwang12.mp3 Executable file

Binary file not shown.

BIN
audio/skill/qinwang21.mp3 Executable file

Binary file not shown.

BIN
audio/skill/qinwang22.mp3 Executable file

Binary file not shown.

BIN
audio/skill/ranshang1 .mp3 Executable file

Binary file not shown.

BIN
audio/skill/ranshang2.mp3 Executable file

Binary file not shown.

BIN
audio/skill/ranshang21 .mp3 Executable file

Binary file not shown.

BIN
audio/skill/ranshang22.mp3 Executable file

Binary file not shown.

BIN
audio/skill/shifei1.mp3 Executable file

Binary file not shown.

BIN
audio/skill/shifei2.mp3 Executable file

Binary file not shown.

BIN
audio/skill/taoxi1.mp3 Executable file

Binary file not shown.

BIN
audio/skill/taoxi2.mp3 Executable file

Binary file not shown.

BIN
audio/skill/wurong1.mp3 Executable file

Binary file not shown.

BIN
audio/skill/wurong2.mp3 Executable file

Binary file not shown.

BIN
audio/skill/xingshuai1.mp3 Executable file

Binary file not shown.

BIN
audio/skill/xingshuai2.mp3 Executable file

Binary file not shown.

BIN
audio/skill/xingxue1.mp3 Executable file

Binary file not shown.

BIN
audio/skill/xingxue2.mp3 Executable file

Binary file not shown.

BIN
audio/skill/yanyu1.mp3 Executable file

Binary file not shown.

BIN
audio/skill/yanyu2.mp3 Executable file

Binary file not shown.

BIN
audio/skill/yanzhu1.mp3 Executable file

Binary file not shown.

BIN
audio/skill/yanzhu2.mp3 Executable file

Binary file not shown.

BIN
audio/skill/yaoming1.mp3 Executable file

Binary file not shown.

BIN
audio/skill/yaoming2.mp3 Executable file

Binary file not shown.

BIN
audio/skill/zhanjue1.mp3 Executable file

Binary file not shown.

BIN
audio/skill/zhanjue2.mp3 Executable file

Binary file not shown.

BIN
audio/skill/zuoding1.mp3 Executable file

Binary file not shown.

BIN
audio/skill/zuoding2.mp3 Executable file

Binary file not shown.

View File

@ -250,6 +250,7 @@ character.sp={
}, },
chenqing2:{}, chenqing2:{},
ranshang:{ ranshang:{
audio:2,
trigger:{player:'damageEnd'}, trigger:{player:'damageEnd'},
filter:function(event,player){ filter:function(event,player){
return event.nature=='fire'; return event.nature=='fire';
@ -287,6 +288,7 @@ character.sp={
group:'ranshang2' group:'ranshang2'
}, },
ranshang2:{ ranshang2:{
audio:2,
trigger:{player:'phaseEnd'}, trigger:{player:'phaseEnd'},
forced:true, forced:true,
filter:function(event,player){ filter:function(event,player){
@ -311,6 +313,7 @@ character.sp={
group:'hanyong2' group:'hanyong2'
}, },
hanyong2:{ hanyong2:{
audio:false,
trigger:{player:'phaseBegin'}, trigger:{player:'phaseBegin'},
forced:true, forced:true,
popup:false, popup:false,
@ -320,6 +323,7 @@ character.sp={
} }
}, },
hanyong3:{ hanyong3:{
audio:false,
trigger:{source:'damageBegin'}, trigger:{source:'damageBegin'},
forced:true, forced:true,
filter:function(event,player){ filter:function(event,player){
@ -426,6 +430,7 @@ character.sp={
} }
}, },
fengpo:{ fengpo:{
audio:2,
trigger:{player:['shaBegin','juedouBegin']}, trigger:{player:['shaBegin','juedouBegin']},
filter:function(event,player){ filter:function(event,player){
if(player.skills.contains('fengpo3')) return false; if(player.skills.contains('fengpo3')) return false;
@ -458,6 +463,7 @@ character.sp={
event.parent.name!='_lianhuan'&&event.parent.name!='_lianhuan2'; event.parent.name!='_lianhuan'&&event.parent.name!='_lianhuan2';
}, },
forced:true, forced:true,
audio:false,
content:function(){ content:function(){
if(typeof player.storage.fengpo=='number'){ if(typeof player.storage.fengpo=='number'){
trigger.num+=player.storage.fengpo; trigger.num+=player.storage.fengpo;

View File

@ -708,6 +708,7 @@ character.yijiang={
} }
}, },
jigong:{ jigong:{
audio:2,
trigger:{player:'phaseUseBegin'}, trigger:{player:'phaseUseBegin'},
check:function(event,player){ check:function(event,player){
var nh=player.num('h')-player.num('h',{type:'equip'}); var nh=player.num('h')-player.num('h',{type:'equip'});
@ -732,6 +733,7 @@ character.yijiang={
} }
}, },
shifei:{ shifei:{
audio:2,
trigger:{player:'chooseToRespondBegin'}, trigger:{player:'chooseToRespondBegin'},
filter:function(event,player){ filter:function(event,player){
if(event.responded) return false; if(event.responded) return false;
@ -804,6 +806,7 @@ character.yijiang={
} }
}, },
huaiyi:{ huaiyi:{
audio:2,
enable:'phaseUse', enable:'phaseUse',
usable:1, usable:1,
delay:0, delay:0,
@ -866,6 +869,7 @@ character.yijiang={
} }
}, },
yaoming:{ yaoming:{
audio:2,
trigger:{player:'damageEnd',source:'damageEnd'}, trigger:{player:'damageEnd',source:'damageEnd'},
direct:true, direct:true,
filter:function(event,player){ filter:function(event,player){
@ -905,6 +909,7 @@ character.yijiang={
}, },
yaoming2:{}, yaoming2:{},
anguo:{ anguo:{
audio:2,
enable:'phaseUse', enable:'phaseUse',
usable:1, usable:1,
filterTarget:function(card,player,target){ filterTarget:function(card,player,target){
@ -970,6 +975,7 @@ character.yijiang={
} }
}, },
xingxue:{ xingxue:{
audio:2,
trigger:{player:'phaseEnd'}, trigger:{player:'phaseEnd'},
direct:true, direct:true,
content:function(){ content:function(){
@ -1028,6 +1034,7 @@ character.yijiang={
} }
}, },
yanzhu:{ yanzhu:{
audio:2,
enable:'phaseUse', enable:'phaseUse',
usable:1, usable:1,
filterTarget:function(card,player,target){ filterTarget:function(card,player,target){
@ -1173,6 +1180,7 @@ character.yijiang={
} }
}, },
zhanjue:{ zhanjue:{
audio:2,
enable:'phaseUse', enable:'phaseUse',
filterCard:true, filterCard:true,
selectCard:-1, selectCard:-1,
@ -1207,6 +1215,7 @@ character.yijiang={
} }
}, },
zhanjue2:{ zhanjue2:{
audio:false,
trigger:{player:'phaseBegin'}, trigger:{player:'phaseBegin'},
forced:true, forced:true,
popup:false, popup:false,
@ -1216,6 +1225,7 @@ character.yijiang={
} }
}, },
zhanjue3:{ zhanjue3:{
audio:false,
trigger:{player:'damageAfter',source:'damageAfter'}, trigger:{player:'damageAfter',source:'damageAfter'},
forced:true, forced:true,
popup:false, popup:false,
@ -1243,6 +1253,7 @@ character.yijiang={
group:['qinwang1','qinwang2'], group:['qinwang1','qinwang2'],
}, },
qinwang1:{ qinwang1:{
audio:2,
trigger:{player:'chooseToRespondBegin'}, trigger:{player:'chooseToRespondBegin'},
filter:function(event,player){ filter:function(event,player){
if(event.responded) return false; if(event.responded) return false;
@ -1309,6 +1320,7 @@ character.yijiang={
} }
}, },
qinwang2:{ qinwang2:{
audio:2,
enable:'chooseToUse', enable:'chooseToUse',
filter:function(event,player){ filter:function(event,player){
if(event.filterCard&&!event.filterCard({name:'sha'},player)) return false; if(event.filterCard&&!event.filterCard({name:'sha'},player)) return false;
@ -1432,6 +1444,7 @@ character.yijiang={
} }
}, },
huomo:{ huomo:{
audio:2,
trigger:{player:'chooseToRespondBegin'}, trigger:{player:'chooseToRespondBegin'},
filter:function(event,player){ filter:function(event,player){
if(event.responded) return false; if(event.responded) return false;
@ -1621,6 +1634,7 @@ character.yijiang={
} }
}, },
taoxi:{ taoxi:{
audio:2,
trigger:{player:'useCardToBegin'}, trigger:{player:'useCardToBegin'},
filter:function(event,player){ filter:function(event,player){
return _status.currentPhase==player&&event.targets.length==1&& return _status.currentPhase==player&&event.targets.length==1&&
@ -1647,6 +1661,7 @@ character.yijiang={
group:['taoxi2','taoxi3'] group:['taoxi2','taoxi3']
}, },
taoxi2:{ taoxi2:{
audio:false,
enable:'phaseUse', enable:'phaseUse',
filter:function(event,player){ filter:function(event,player){
if(player.storage.taoxi&&player.storage.taoxi2&& if(player.storage.taoxi&&player.storage.taoxi2&&
@ -1710,6 +1725,7 @@ character.yijiang={
}, },
taoxi4:{}, taoxi4:{},
xingshuai:{ xingshuai:{
audio:2,
trigger:{player:'dying'}, trigger:{player:'dying'},
priority:6, priority:6,
filter:function(event,player){ filter:function(event,player){
@ -1776,6 +1792,7 @@ character.yijiang={
} }
}, },
mingjian:{ mingjian:{
audio:2,
trigger:{player:'phaseUseBefore'}, trigger:{player:'phaseUseBefore'},
direct:true, direct:true,
filter:function(event,player){ filter:function(event,player){
@ -1796,7 +1813,7 @@ character.yijiang={
} }
'step 1' 'step 1'
if(result.bool){ if(result.bool){
player.logSkill('huituo',result.targets); player.logSkill('mingjian',result.targets);
trigger.untrigger(); trigger.untrigger();
trigger.finish(); trigger.finish();
var target=result.targets[0]; var target=result.targets[0];
@ -1808,6 +1825,7 @@ character.yijiang={
} }
}, },
mingjian2:{ mingjian2:{
audio:false,
trigger:{global:'phaseAfter'}, trigger:{global:'phaseAfter'},
forced:true, forced:true,
popup:false, popup:false,
@ -1828,6 +1846,7 @@ character.yijiang={
} }
}, },
huituo:{ huituo:{
audio:2,
trigger:{player:'damageEnd'}, trigger:{player:'damageEnd'},
direct:true, direct:true,
content:function(){ content:function(){
@ -1955,6 +1974,7 @@ character.yijiang={
} }
}, },
qiaoshi:{ qiaoshi:{
audio:2,
trigger:{global:'phaseEnd'}, trigger:{global:'phaseEnd'},
filter:function(event,player){ filter:function(event,player){
return event.player!=player&&event.player.num('h')==player.num('h'); return event.player!=player&&event.player.num('h')==player.num('h');
@ -1971,6 +1991,7 @@ character.yijiang={
} }
}, },
yanyu:{ yanyu:{
audio:2,
enable:'phaseUse', enable:'phaseUse',
filter:function(event,player){ filter:function(event,player){
return player.num('h','sha')>0; return player.num('h','sha')>0;

View File

@ -21,7 +21,7 @@
'折叠手牌显示花色', '折叠手牌显示花色',
'AI改进', 'AI改进',
'武将图修改', '武将图修改',
'boss配音', 'boss、将5配音(@tanyuanjkl提取)',
'隐藏模式、武将、卡牌包', '隐藏模式、武将、卡牌包',
'开始界面', '开始界面',
'中间显示历史记录', '中间显示历史记录',
@ -2206,8 +2206,8 @@
help:{ help:{
'游戏选项':'<ul><li>控制台命令<br>开启后可用浏览器控制台控制游戏<li>自动确认<br>开启后当候选目标仅有1个时点击目标无需再点击确定<li>'+ '游戏选项':'<ul><li>控制台命令<br>开启后可用浏览器控制台控制游戏<li>自动确认<br>开启后当候选目标仅有1个时点击目标无需再点击确定<li>'+
'触屏模式<br>可消除iOS等设备上300ms的点击延迟但开启后无法使用鼠标<li>滚轮控制手牌<br>开启后滚轮可控制手牌的左右滚动建议Mac等具备横向滚动功能的设备关闭此选项'+ '触屏模式<br>可消除iOS等设备上300ms的点击延迟但开启后无法使用鼠标<li>滚轮控制手牌<br>开启后滚轮可控制手牌的左右滚动建议Mac等具备横向滚动功能的设备关闭此选项'+
'<li>隐藏非全身皮肤<br>在新版布局中,若角色没有全身皮肤将被隐藏<li>游戏玩法<br>为游戏增加不同玩法,开启后可在帮助中查看介绍', '<li>游戏玩法<br>为游戏增加不同玩法,开启后可在帮助中查看介绍',
'游戏操作':'<ul><li>长按/鼠标悬停/右键单击(需在设置中开启)显示信息<li>触屏模式中,双指点击切换暂停;下划显示菜单,上划切换托管<li>移动布局中,点击顶部的左半边或右半边可显示按钮,双击顶部可令界面下移(方便标身份)<li>键盘快捷键<br>'+ '游戏操作':'<ul><li>长按/鼠标悬停/右键单击(需在设置中开启)显示信息<li>触屏模式中,双指点击切换暂停;下划显示菜单,上划切换托管<li>键盘快捷键<br>'+
'<table><tr><td>a<td>切换托管<tr><td>c<td>打开设置<tr><td>w<td>切换不询问无懈<tr><td>▭<td>暂停</ul>', '<table><tr><td>a<td>切换托管<tr><td>c<td>打开设置<tr><td>w<td>切换不询问无懈<tr><td>▭<td>暂停</ul>',
'游戏命令':'<div style="margin:10px">变量名</div><ul style="margin-top:0"><li>场上角色<br>game.players<li>阵亡角色<br>game.dead'+ '游戏命令':'<div style="margin:10px">变量名</div><ul style="margin-top:0"><li>场上角色<br>game.players<li>阵亡角色<br>game.dead'+
'<li>玩家<br>game.me<li>玩家的上/下家<br>game.me.previous/next'+ '<li>玩家<br>game.me<li>玩家的上/下家<br>game.me.previous/next'+