This commit is contained in:
libccy 2017-02-15 20:44:01 +08:00
parent 28d60b6d92
commit cb1993f00a
5 changed files with 41 additions and 4 deletions

View File

@ -496,6 +496,7 @@ window.characterRank={
're_xiahoudun', 're_xiahoudun',
'zhangliang', 'zhangliang',
'xiahouyuan', 'xiahouyuan',
'pangde',
'yanwen', 'yanwen',
], ],
c:[ c:[
@ -523,7 +524,6 @@ window.characterRank={
'huanggai', 'huanggai',
'xiahoudun', 'xiahoudun',
'zhangbao', 'zhangbao',
'pangde',
'zhangfei', 'zhangfei',
'old_huaxiong', 'old_huaxiong',
], ],

View File

@ -19,7 +19,7 @@ character.shenhua={
taishici:['male','wu',4,['tianyi']], taishici:['male','wu',4,['tianyi']],
yanwen:['male','qun',4,['shuangxiong']], yanwen:['male','qun',4,['shuangxiong']],
re_yuanshao:['male','qun',4,['reluanji','xueyi'],['zhu']], re_yuanshao:['male','qun',4,['reluanji','xueyi'],['zhu']],
pangde:['male','qun',4,['mashu','mengjin']], pangde:['male','qun',4,['mashu','jianchu']],
menghuo:['male','shu',4,['huoshou','zaiqi']], menghuo:['male','shu',4,['huoshou','zaiqi']],
zhurong:['female','shu',4,['juxiang','lieren']], zhurong:['female','shu',4,['juxiang','lieren']],
@ -44,6 +44,33 @@ character.shenhua={
menghuo:['zhurong'], menghuo:['zhurong'],
}, },
skill:{ skill:{
jianchu:{
trigger:{player:'shaBegin'},
filter:function(event){
return event.target.num('he')>0;
},
check:function(event,player){
return ai.get.attitude(player,event.player)<=0;
},
direct:true,
content:function(){
'step 0'
player.discardPlayerCard(trigger.target,get.prompt('jianchu',trigger.target)).set('ai',function(button){
if(!_status.event.att) return 0;
if(get.position(button.link)=='e') return ai.get.value(button.link);
return 1;
}).set('logSkill',['jianchu',trigger.target]).set('att',ai.get.attitude(player,trigger.target)<=0);
'step 1'
if(result.links.length){
if(get.type(result.links[0])=='equip'){
trigger.directHit=true;
}
else if(trigger.cards){
trigger.target.gain(trigger.cards,'gain2','log');
}
}
}
},
redimeng:{ redimeng:{
audio:'dimeng', audio:'dimeng',
enable:'phaseUse', enable:'phaseUse',
@ -3900,6 +3927,8 @@ character.shenhua={
re_yuanshao:'袁绍', re_yuanshao:'袁绍',
re_lusu:'鲁肃', re_lusu:'鲁肃',
jianchu:'鞬出',
jianchu_info:'当你使用【杀】指定一名角色为目标后,你可以弃置其一张牌,若以此法弃置的牌为装备牌,此【杀】不可被【闪】响应,若不为装备牌,该角色获得此【杀】',
redimeng:'缔盟', redimeng:'缔盟',
redimeng_info:'出牌阶段限一次你可以弃置X张牌选择两名其他角色X为这两名角色的手牌差你混合他们的手牌然后令其中一名角色获得其中的一张牌并令另一名角色获得其中的一张牌然后重复此流程直到这些牌均被获得为止', redimeng_info:'出牌阶段限一次你可以弃置X张牌选择两名其他角色X为这两名角色的手牌差你混合他们的手牌然后令其中一名角色获得其中的一张牌并令另一名角色获得其中的一张牌然后重复此流程直到这些牌均被获得为止',
reluanji:'乱击', reluanji:'乱击',

View File

@ -21656,6 +21656,7 @@
lib.onresize.push(event.resize); lib.onresize.push(event.resize);
event.clickAvatar=function(){ event.clickAvatar=function(){
if(event.deciding){ if(event.deciding){
if(this.index<event.config.width) return;
if(event.friendlist.contains(this)){ if(event.friendlist.contains(this)){
event.friendlist.remove(this); event.friendlist.remove(this);
event.moveNode(this,this.index); event.moveNode(this,this.index);
@ -21933,6 +21934,11 @@
'step 5' 'step 5'
event.prompt('选择'+get.cnNumber(event.config.num)+'名出场武将'); event.prompt('选择'+get.cnNumber(event.config.num)+'名出场武将');
event.enemylist=[]; event.enemylist=[];
for(var i=0;i<event.avatars.length;i++){
if(event.avatars[i].index>event.config.width){
event.avatars[i].classList.add('selecting');
}
}
var rand=[]; var rand=[];
for(var i=0;i<event.config.width;i++){ for(var i=0;i<event.config.width;i++){
for(var j=0;j<event.config.width-i;j++){ for(var j=0;j<event.config.width-i;j++){

View File

@ -1,9 +1,8 @@
window.noname_update={ window.noname_update={
version:'1.9.9.2', version:'1.9.9.3',
update:'1.9.9', update:'1.9.9',
changeLog:[ changeLog:[
'bug修复', 'bug修复',
'兼容模式'
], ],
files:[ files:[
'game/game.js', 'game/game.js',

View File

@ -2917,6 +2917,9 @@ div:hover>.intro {
#window>.choosedouble.character.moved { #window>.choosedouble.character.moved {
z-index: 1; z-index: 1;
} }
#window:not(.nopointer)>.choosedouble.character.moved:not(.selecting){
cursor: default;
}
#window>.choosedouble.character>.name { #window>.choosedouble.character>.name {
left: 6%; left: 6%;
top: 8%; top: 8%;