This commit is contained in:
libccy 2017-08-03 12:15:31 +08:00
parent 7aa7b9349c
commit 1bb96e5989
14 changed files with 112 additions and 40 deletions

View File

@ -1681,6 +1681,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
var info=get.info(skills[i]);
if(info&&info.ai&&info.ai.weather){
target.removeSkill(skills[i]);
game.log(target,'解除了','【'+get.translation(skills[i])+'】','的效果');
}
}
}
@ -1755,11 +1756,11 @@ game.import('card',function(lib,game,ui,get,ai,_status){
subtype:'spell_bronze',
enable:true,
filterTarget:function(card,player,target){
return target.isMinHp()&&target.countCards('he');
return target.isMinHp()&&target.countCards('h');
},
selectTarget:-1,
content:function(){
target.randomDiscard();
target.randomDiscard('h');
},
ai:{
basic:{
@ -1795,14 +1796,30 @@ game.import('card',function(lib,game,ui,get,ai,_status){
selectTarget:-1,
content:function(){
var list=target.getEnemies();
var equips=[];
for(var i=0;i<list.length;i++){
if(!list[i].countCards('e')){
list.splice(i--,1);
equips.addArray(list[i].getCards('e'));
}
equips=equips.randomGets(2);
if(equips.length==2){
var target1=get.owner(equips[0]);
var target2=get.owner(equips[1]);
if(target1==target2){
target1.discard(equips);
player.line(target1);
}
else{
target1.discard(equips[0]).delay=false;
target2.discard(equips[1]);
player.line(target1);
player.line(target2);
}
}
var target=list.randomGet();
player.line(target);
target.randomDiscard('e',2);
else if(equips.length){
var target1=get.owner(equips[0]);
target1.discard(equips[0]);
player.line(target1);
}
},
ai:{
basic:{
@ -2207,11 +2224,11 @@ game.import('card',function(lib,game,ui,get,ai,_status){
gw_ciguhanshuang_bg:'霜',
gw_ciguhanshuang_info:'天气牌,出牌阶段对一名角色及其相邻角色使用,目标下个摸牌阶段摸牌数-1',
gw_wenyi:'瘟疫',
gw_wenyi_info:'令所有体力值为全场最少的角色随机弃置一张牌',
gw_wenyi_info:'令所有体力值为全场最少的角色随机弃置一张牌',
gw_yanziyaoshui:'燕子药水',
gw_yanziyaoshui_info:'令一名角色摸一张牌,若其手牌数为全场最少或之一,改为摸两张',
gw_shanbengshu:'山崩术',
gw_shanbengshu_info:'出牌阶段对自己使用,令一名随机敌方角色随机弃置两件装备',
gw_shanbengshu_info:'出牌阶段对自己使用,随机弃置两件敌方角色场上的装备',
gw_kunenfayin:'昆恩法印',
gw_kunenfayin_info:'出牌阶段对一名角色使用目标不能成为其他角色的普通锦囊牌的目标持续3回合',
},

View File

@ -752,18 +752,17 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
},
gwjinyan:{
trigger:{player:['damageBegin','loseHpBegin']},
trigger:{player:['damageBefore']},
forced:true,
priority:-55,
mark:true,
filter:function(event,player){
if(game.roundNumber%3==0) return false;
return player.hp-event.num<2;
return game.roundNumber%3!=0;
},
content:function(){
trigger.num=Math.max(0,player.hp-2);
trigger.untrigger();
trigger.finish();
},
group:['gwjinyan_gain','gwjinyan_hp'],
group:['gwjinyan_gain'],
subSkill:{
gain:{
trigger:{player:'phaseBegin'},
@ -777,21 +776,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.gain(game.createCard(list.randomGet()),'gain2');
}
}
},
hp:{
trigger:{global:'roundStart'},
forced:true,
filter:function(event,player){
if(game.roundNumber%3==0) return false;
return player.hp<2;
},
content:function(){
player.hp=2;
if(player.maxHp<player.hp){
player.maxHp=player.hp;
}
player.update();
}
}
},
ai:{
@ -799,11 +783,16 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(game.roundNumber%3==0) return 1.6;
return 0.8;
},
nofire:true,
nothunder:true,
nodamage:true,
skillTagFilter:function(){
if(game.roundNumber%3==0) return false;
},
effect:{
target:function(card,player,target){
if(game.roundNumber%3==0) return;
if(get.tag(card,'damage')||get.tag(card,'loseHp')){
if(target.hp<=game.roundNumber%3) return 0;
if(game.roundNumber%3!=0&&get.tag(card,'damage')){
return [0,0];
}
}
}
@ -2214,7 +2203,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
lingji:'灵计',
lingji_info:'出牌阶段限一次,你可以摸两张牌并弃置两张牌,若弃置的牌花色相同,你获得一张随机铜卡;若弃置的牌点数相同,你获得一张随机银卡',
gwjinyan:'金焰',
gwjinyan_info:'锁定技准备阶段若游戏轮数为3的倍数你获得一张随机金卡当游戏轮数不是3的倍数时的体力值不能少于2',
gwjinyan_info:'锁定技准备阶段若游戏轮数为3的倍数你获得一张随机金卡当游戏轮数不是3的倍数时防止所有伤害',
gwshenyu:'神愈',
gwshenyu_info:'准备阶段,你可以令一名角色选择一项:回复一点体力,或从弃牌堆中获得一张非金法术牌(直到洗牌前该牌不能再以此法获得)',
junchi:'骏驰',

View File

@ -38698,15 +38698,19 @@
_status.mouseleft=false;
_status.mousedragorigin=null;
_status.dragstatuschanged=false;
if(ui.arena){
ui.canvas.width=ui.arena.offsetWidth;
ui.canvas.height=ui.arena.offsetHeight;
}
if(tmpflag){
ui.click[get.itemtype(tmpflag)].call(tmpflag);
game.check();
}
// ui.updatehl();
}
if(ui.arena){
ui.arena.classList.remove('dragging');
}
},
mousemove:function(){
if(!lib.config.hover_handcard&&this.parentNode&&this.parentNode.parentNode==ui.me){
@ -39044,8 +39048,10 @@
if(!lib.config.doubleclick_intro) return;
if(this.parentNode.isUnseen(0)) return;
if(!lib.character[this.parentNode.name]) return;
if(!ui.menuContainer) return;
var avatar=this;
var player=this.parentNode;
if(!game.players.contains(player)&&!game.dead.contains(player)) return;
if(!this._doubleClicking){
this._doubleClicking=true;
setTimeout(function(){
@ -39061,8 +39067,10 @@
if(!lib.config.doubleclick_intro) return;
if(this.parentNode.classList.contains('unseen2')) return;
if(!lib.character[this.parentNode.name2]) return;
if(!ui.menuContainer) return;
var avatar=this;
var player=this.parentNode;
if(!game.players.contains(player)&&!game.dead.contains(player)) return;
if(!this._doubleClicking){
this._doubleClicking=true;
setTimeout(function(){

View File

@ -3,6 +3,7 @@ window.noname_update={
// update:'1.9.34',
changeLog:[
'bug修复',
'双击头像显示资料'
],
files:[
'game/game.js',

View File

@ -2145,6 +2145,10 @@ div:not(.handcards)>.card>.info>span,
background-position: -4px -4px;
background-repeat: no-repeat;
}
#arena:not(.chess) .player[data-position='0']>.equips>div>.image{
background-size: 115%;
}
/*.equips>div:hover>.info{display: inline-block;
animation:equip_hover 1s;
-webkit-animation:equip_hover 1s;

View File

@ -1575,10 +1575,10 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
game.pause();
var list=_status.mylist.slice(0);
if(_status.double_character){
event.dialog=ui.create.dialog('','hidden');
event.dialog=ui.create.dialog('','hidden','forcebutton');
}
else{
event.dialog=ui.create.dialog('','hidden');
event.dialog=ui.create.dialog('','hidden','forcebutton');
}
var buttons=ui.create.div('.buttons',event.dialog.content);

View File

@ -104,3 +104,7 @@ body[data-background_color_music='blue'] #arena.mobile:not(.chess) .player[data-
background: linear-gradient(#4b4b4b, #464646);
box-shadow: rgba(0,0,0,0.6) 0 0 5px inset;
}
#arena:not(.chess) .player[data-position='0']>.equips>.equip5>.image{
background-position: -6px -6px;
}

View File

@ -29,3 +29,7 @@
right: 3px;
top: 3px;
}
#arena:not(.chess) .player[data-position='0']>.equips>.equip5>.image{
background-position: -4px -4px;
}

View File

@ -4,3 +4,17 @@
background: url('../../music/wood3.png');
background-size:auto;
}
#arena:not(.chess) .player[data-position='0']>.equips>.equip5>.image{
background-position: -6px -6px;
}
#arena.mobile:not(.chess) .player[data-position='0']>.equips>.equip5 {
border-radius: 100%;
}
#arena.mobile:not(.chess) .player[data-position='0']>.equips>.equip5>.name{
display: none;
}
#arena.mobile:not(.chess) .player[data-position='0']>.equips>.equip5>.info{
display: none;
}

View File

@ -30,3 +30,7 @@
right: 3px;
top: 3px;
}
#arena:not(.chess) .player[data-position='0']>.equips>.equip5>.image{
background-position: -4px -4px;
}

View File

@ -30,3 +30,8 @@
right: 3px;
top: 3px;
}
#arena:not(.chess) .player[data-position='0']>.equips>.equip5>.image{
background-position: -4px -4px;
}

View File

@ -30,3 +30,7 @@
right: 3px;
top: 3px;
}
#arena:not(.chess) .player[data-position='0']>.equips>.equip5>.image{
background-position: -4px -4px;
}

View File

@ -4,3 +4,17 @@
background: url('../../woodden/wood.jpg');
background-size:auto;
}
#arena:not(.chess) .player[data-position='0']>.equips>.equip5>.image{
background-position: -6px -6px;
}
#arena.mobile:not(.chess) .player[data-position='0']>.equips>.equip5 {
border-radius: 100%;
}
#arena.mobile:not(.chess) .player[data-position='0']>.equips>.equip5>.name{
display: none;
}
#arena.mobile:not(.chess) .player[data-position='0']>.equips>.equip5>.info{
display: none;
}

View File

@ -242,3 +242,7 @@ html{
.menubg.charactercard>.ava>.avatar{
box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0, 0.3) 0 0 5px;
}
#arena:not(.chess) .player[data-position='0']>.equips>.equip5>.image{
background-position: -6px -6px;
}