This commit is contained in:
libccy 2017-08-03 11:08:25 +08:00
parent 96e84e63a4
commit 7aa7b9349c
5 changed files with 29 additions and 18 deletions

View File

@ -861,14 +861,13 @@ game.import('card',function(lib,game,ui,get,ai,_status){
es2.push(game.createCard(list.randomGet()));
}
if(es2.length){
event.delay=true;
game.delay();
player.$draw(es2);
for(var i=0;i<es2.length;i++){
player.equip(es2[i]);
}
}
'step 3'
if(event.delay) game.delay();
player.addTempSkill('qianxing',{player:'phaseBegin'});
},
contentAfter:function(){

View File

@ -17,7 +17,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
gw_bulanwang:['male','qun',4,['bolang']],
gw_kuite:['male','qun',4,['gwxuezhan']],
gw_fuertaisite:['male','qun',3,['zhengjun']],
gw_fuertaisite:['male','wei',3,['zhengjun']],
gw_hengsaite:['male','wei',3,['jielue']],
gw_fulisi:['male','qun',3,['lanquan']],
gw_gaier:['male','shu',3,['hunmo']],
@ -2145,7 +2145,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
gw_kuite:'奎特',
gw_dagong:'达贡',
gw_airuiting:'艾瑞汀',
gw_fuertaisite:'弗泰斯特',
gw_fuertaisite:'弗泰斯特',
gw_falanxisika:'法兰西斯卡',
gw_haluo:'哈洛',
gw_hengsaite:'亨赛特',
@ -2199,7 +2199,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
gwjieyin:'结印',
gwjieyin_info:'出牌阶段,你可以视为使用瘟疫、燕子药水或昆恩法印(不能重复使用同一法术),技能两轮重置一次',
zhengjun:'整军',
zhengjun_info:'结束阶段你可以观看牌堆顶的X张牌并获得其中一张X为你在本局游戏中累计使用或打出过至少两张同名牌的牌数每当X的值增加你增加一点体力和体力上限',
zhengjun_info:'锁定技每当你使用或打出一张卡牌若这是你在本局游戏中使用或打出的第二张与之同名的牌你增加一点体力和体力上限结束阶段你可以观看牌堆顶的X张牌并获得其中一张X为你以此法增加的体力上限数',
gwxuezhan:'血战',
gwxuezhan_info:'准备阶段,若你的手牌数为全场最少或之一,你可以获得一张十字召唤',
jielue:'劫掠',

View File

@ -41,6 +41,7 @@ window.config={
game:'sgs',
duration:500,
hoveration:1000,
doubleclick_intro:true,
cheat:false,
volumn_background:8,
volumn_audio:8,

View File

@ -380,6 +380,12 @@
'2500':'2.5秒',
}
},
doubleclick_intro:{
name:'双击显示武将资料',
init:true,
unfrequent:true,
intro:'双击武将头像后显示其资料卡',
},
video:{
name:'保存录像',
init:'20',
@ -1076,7 +1082,7 @@
change_skin:{
name:'开启换肤',
init:true,
intro:'双点头像或在右键菜单中换肤,皮肤可在选项-文件-图片文件-皮肤图片中添加'
intro:'武将的右键菜单中换肤,皮肤可在选项-文件-图片文件-皮肤图片中添加'
},
change_skin_auto:{
name:'自动换肤',
@ -8137,7 +8143,7 @@
mode.remove('brawl');
var banned=['yxs_luzhishen','xuhuang','zhenji','shen_guanyu','shen_caocao','zhurong',
'daqiao','lingcao','liuzan','lusu','luxun','yanwen','zhouyu','xiahouyuan',
'zhuzhi','old_caozhen','guojia','simayi','sp_pangde','swd_kangnalishi'];
'zhuzhi','old_caozhen','guojia','simayi','sp_pangde','swd_kangnalishi','hs_siwangzhiyi'];
var bannedcards=['zengbin','toulianghuanzhu','huoshan','hongshui','guiyoujie','fengyinzhidan'];
for(var i=0;i<mode.length;i++){
game.saveConfig(mode[i]+'_banned',banned);
@ -39035,9 +39041,9 @@
game.check();
},
avatar:function(){
if(!lib.config.change_skin) return;
if(!lib.config.doubleclick_intro) return;
if(this.parentNode.isUnseen(0)) return;
if(!this.parentNode.name) return;
if(!lib.character[this.parentNode.name]) return;
var avatar=this;
var player=this.parentNode;
if(!this._doubleClicking){
@ -39047,12 +39053,14 @@
},500);
return;
}
ui.click.skin(this,player.name);
// ui.click.skin(this,player.name);
game.pause2();
ui.click.charactercard(player.name,null,null,true);
},
avatar2:function(){
if(!lib.config.change_skin) return;
if(!lib.config.doubleclick_intro) return;
if(this.parentNode.classList.contains('unseen2')) return;
if(!this.parentNode.name2) return;
if(!lib.character[this.parentNode.name2]) return;
var avatar=this;
var player=this.parentNode;
if(!this._doubleClicking){
@ -39062,7 +39070,9 @@
},500);
return;
}
ui.click.skin(this,player.name2);
// ui.click.skin(this,player.name2);
game.pause2();
ui.click.charactercard(player.name2,null,null,true);
},
player:function(){
return ui.click.target.apply(this,arguments);
@ -39432,7 +39442,7 @@
delete this.logvtimeout;
}
},
charactercard:function(name,sourcenode,noedit){
charactercard:function(name,sourcenode,noedit,resume){
if(_status.dragged) return;
if(lib.config.theme!='simple'){
ui.window.classList.add('shortcutpaused');
@ -39460,6 +39470,7 @@
ui.menuContainer.classList.remove('blur');
this.delete();
e.stopPropagation();
if(resume) game.resume2();
return false;
}
var uiintro=ui.create.div('.menubg.charactercard',layer);
@ -39497,13 +39508,13 @@
if(this._link){
lib.config.skin[nameskin]=this._link;
bg.style.backgroundImage=this.style.backgroundImage;
sourcenode.style.backgroundImage=this.style.backgroundImage;
if(sourcenode) sourcenode.style.backgroundImage=this.style.backgroundImage;
game.saveConfig('skin',lib.config.skin);
}
else{
delete lib.config.skin[nameskin];
bg.setBackground(nameskin,'character');
sourcenode.setBackground(nameskin,'character');
if(sourcenode) sourcenode.setBackground(nameskin,'character');
game.saveConfig('skin',lib.config.skin);
}
});
@ -39578,7 +39589,7 @@
else{
ban.classList.remove('active');
}
if(sourcenode.updateBanned){
if(sourcenode&&sourcenode.updateBanned){
sourcenode.updateBanned();
}
};

View File

@ -3152,7 +3152,7 @@ div:hover>.intro {
.tdnode{
position:relative !important;
display:inline-block !important;
display:inline-block;
padding:5px !important;
padding-left:8px !important;
padding-right:8px !important;