This commit is contained in:
libccy 2016-02-01 17:32:18 +08:00
parent a0cf8a8559
commit 812a0d4e5e
64 changed files with 1313 additions and 112 deletions

View File

@ -517,7 +517,9 @@ character.extra={
trigger:{global:'dieAfter'}, trigger:{global:'dieAfter'},
forced:true, forced:true,
content:function(){ content:function(){
player.loseHp(player.hp); if(player.hp<Infinity){
player.loseHp(player.hp);
}
player.removeSkill('wuhun2'); player.removeSkill('wuhun2');
} }
}, },

View File

@ -166,7 +166,7 @@ character.shenhua={
content:function(){ content:function(){
"step 0" "step 0"
var fang=player.hp>=2&&player.num('h')<=player.hp+1; var fang=player.hp>=2&&player.num('h')<=player.hp+1;
player.chooseTarget('是否发动放权?',function(card,player,target){ player.chooseTarget('是否发动放权',function(card,player,target){
return target!=player; return target!=player;
}).ai=function(target){ }).ai=function(target){
if(!fang) return -1; if(!fang) return -1;
@ -877,7 +877,7 @@ character.shenhua={
}, },
content:function(){ content:function(){
"step 0" "step 0"
var next=player.chooseToDiscard('he','是否发动悲歌?'); var next=player.chooseToDiscard('he','是否发动悲歌');
next.ai=ai.get.unuseful2; next.ai=ai.get.unuseful2;
next.logSkill='beige'; next.logSkill='beige';
"step 1" "step 1"
@ -1957,7 +1957,7 @@ character.shenhua={
if(player==target&&get.subtype(card)=='equip2'){ if(player==target&&get.subtype(card)=='equip2'){
if(ai.get.equipValue(card)<=8) return 0; if(ai.get.equipValue(card)<=8) return 0;
} }
if(target.num('e','2')) return; if(target.get('e','2')) return;
if(player.skills.contains('unequip')) return; if(player.skills.contains('unequip')) return;
if(get.tag(card,'respondShan')) return [0.5,0]; if(get.tag(card,'respondShan')) return [0.5,0];
} }
@ -2039,13 +2039,16 @@ character.shenhua={
if(player.storage.niepan) return false; if(player.storage.niepan) return false;
}, },
content:function(){ content:function(){
'step 0'
player.hp=Math.min(3,player.maxHp); player.hp=Math.min(3,player.maxHp);
player.discard(player.get('hej')); player.discard(player.get('hej'));
player.draw(3); player.draw(3);
player.unmarkSkill('niepan'); player.unmarkSkill('niepan');
if(player.classList.contains('linked')) player.link();
if(player.classList.contains('turnedover')) player.turnOver();
player.storage.niepan=true; player.storage.niepan=true;
'step 1'
if(player.classList.contains('linked')) player.link();
'step 2'
if(player.classList.contains('turnedover')) player.turnOver();
}, },
ai:{ ai:{
skillTagFilter:function(player){ skillTagFilter:function(player){
@ -2150,7 +2153,7 @@ character.shenhua={
}, },
content:function(){ content:function(){
"step 0" "step 0"
player.chooseTarget([1,trigger.num],function(card,player,target){ player.chooseTarget('是否发动【节命】?',[1,trigger.num],function(card,player,target){
return target.num('h')<Math.min(target.maxHp,5); return target.num('h')<Math.min(target.maxHp,5);
}).ai=function(target){ }).ai=function(target){
var att=ai.get.attitude(_status.event.player,target); var att=ai.get.attitude(_status.event.player,target);
@ -2470,7 +2473,7 @@ character.shenhua={
direct:true, direct:true,
content:function(){ content:function(){
"step 0"; "step 0";
player.chooseTarget('是否发动新雷击').ai=function(target){ player.chooseTarget('是否发动【雷击·新】').ai=function(target){
return ai.get.damageEffect(target,player,player,'thunder'); return ai.get.damageEffect(target,player,player,'thunder');
}; };
"step 1" "step 1"
@ -2800,7 +2803,7 @@ character.shenhua={
direct:true, direct:true,
content:function(){ content:function(){
"step 0"; "step 0";
player.chooseTarget('是否发动雷击?').ai=function(target){ player.chooseTarget('是否发动雷击').ai=function(target){
return ai.get.damageEffect(target,player,player); return ai.get.damageEffect(target,player,player);
}; };
"step 1" "step 1"
@ -3116,7 +3119,7 @@ character.shenhua={
hongyan:'红颜', hongyan:'红颜',
buqu:'不屈', buqu:'不屈',
leiji:'雷击', leiji:'雷击',
spleiji:'雷击', spleiji:'雷击·新',
guidao:'鬼道', guidao:'鬼道',
huangtian:'黄天', huangtian:'黄天',
huangtian2:'黄天', huangtian2:'黄天',

View File

@ -66,6 +66,7 @@ character.sp={
yinbing:{ yinbing:{
trigger:{player:'phaseEnd'}, trigger:{player:'phaseEnd'},
direct:true, direct:true,
audio:2,
init:function(player){ init:function(player){
player.storage.yinbing=[]; player.storage.yinbing=[];
}, },
@ -145,6 +146,7 @@ character.sp={
return player.storage.yinbing&&player.storage.yinbing.length>0; return player.storage.yinbing&&player.storage.yinbing.length>0;
}, },
direct:true, direct:true,
audio:2,
content:function(){ content:function(){
'step 0' 'step 0'
player.chooseTarget('是否发动【绝地】?',function(card,player,target){ player.chooseTarget('是否发动【绝地】?',function(card,player,target){
@ -293,7 +295,7 @@ character.sp={
}, },
mumu:{ mumu:{
enable:'phaseUse', enable:'phaseUse',
// usable:1, usable:1,
filterCard:function(card,player,target){ filterCard:function(card,player,target){
return card.name=='sha'||(get.type(card,'trick')=='trick'&&get.color(card)=='black'); return card.name=='sha'||(get.type(card,'trick')=='trick'&&get.color(card)=='black');
}, },

View File

@ -851,7 +851,7 @@ character.swd={
"step 0" "step 0"
var save=false; var save=false;
if(ai.get.attitude(player,trigger.target)>2){ if(ai.get.attitude(player,trigger.target)>2){
if(player.num('h','shan')||player.num('e','2')|| if(player.num('h','shan')||player.get('e','2')||
trigger.target.hp==1||player.hp>trigger.target.hp+1){ trigger.target.hp==1||player.hp>trigger.target.hp+1){
if(!trigger.target.num('h','shan')||trigger.target.num('h')<player.num('h')){ if(!trigger.target.num('h','shan')||trigger.target.num('h')<player.num('h')){
save=true; save=true;

View File

@ -5,7 +5,9 @@ window.config={
forbidall:['caocao','simayi','guanyu','zhangfei','zhaoyun','ganning','lvmeng','lvbu', forbidall:['caocao','simayi','guanyu','zhangfei','zhaoyun','ganning','lvmeng','lvbu',
'xiahouyuan','huangzhong','weiyan','dianwei','gongsunzan','zhangjiao'], 'xiahouyuan','huangzhong','weiyan','dianwei','gongsunzan','zhangjiao'],
forbidversus:['swd_kangnalishi'], forbidversus:['swd_kangnalishi'],
forbidstone:['zhugedan','pal_xuanxiao'], forbidstone:['zhugedan','pal_xuanxiao','hs_malfurion','lusu','chenlin','gjqt_bailitusu',
'swd_anka','swd_nicole','daqiao','re_daqiao','zhuran','huatuo','swd_tuwei','hs_guldan','wangyi',
'swd_guyue','swd_jiangziya','guojia','re_guojia','shen_caocao','swd_qiner','gjqt_aruan'],
forbidchess:['hetaihou','swd_kangnalishi'], forbidchess:['hetaihou','swd_kangnalishi'],
forbidboss:['caiwenji','gjqt_aruan','pal_xuanxiao','swd_hupo'], forbidboss:['caiwenji','gjqt_aruan','pal_xuanxiao','swd_hupo'],
forbiddouble:['zhugedan','swd_kangnalishi','dongzhuo','wutugu','jg_simayi','hs_siwangzhiyi','hs_ronghejuren','hs_shanlingjuren'], forbiddouble:['zhugedan','swd_kangnalishi','dongzhuo','wutugu','jg_simayi','hs_siwangzhiyi','hs_ronghejuren','hs_shanlingjuren'],

View File

@ -419,6 +419,42 @@
} }
} }
}, },
// background_color_music:{
// name:'背景色',
// init:'black',
// item:{
// blue:'蓝色',
// black:'黑色',
// },
// onclick:function(color){
// game.saveConfig('background_color_music',color);
// document.body.dataset.background_color_music=color;
// }
// },
// background_color_wood:{
// name:'背景色',
// init:'blue',
// item:{
// blue:'蓝色',
// black:'黑色',
// },
// onclick:function(color){
// game.saveConfig('background_color_wood',color);
// document.body.dataset.background_color_wood=color;
// }
// },
// theme_color_music:{
// name:'主题色',
// init:'black',
// item:{
// blue:'蓝色',
// black:'黑色',
// },
// onclick:function(color){
// game.saveConfig('theme_color_music',color);
// document.body.dataset.theme_color_music=color;
// }
// },
ui_zoom:{ ui_zoom:{
name:'界面缩放', name:'界面缩放',
unfrequent:true, unfrequent:true,
@ -666,6 +702,20 @@
} }
} }
}, },
reduce_radius:{
name:'减小圆角',
init:false,
unfrequent:true,
onclick:function(bool){
game.saveConfig('reduce_radius',bool);
if(bool){
ui.window.classList.add('reduce_radius');
}
else{
ui.window.classList.remove('reduce_radius');
}
}
},
// popup_style:{ // popup_style:{
// name:'提示样式', // name:'提示样式',
// init:'newstyle', // init:'newstyle',
@ -1019,6 +1069,21 @@
ui.arena.dataset.identity_font=font; ui.arena.dataset.identity_font=font;
} }
}, },
cardtext_font:{
name:'卡牌字体',
init:'default',
unfrequent:true,
item:{
xinwei:'新魏',
huangcao:'黄草',
xiaozhuan:'小篆',
default:'默认',
},
onclick:function(font){
game.saveConfig('cardtext_font',font);
ui.arena.dataset.cardtext_font=font;
}
},
global_font:{ global_font:{
name:'界面字体', name:'界面字体',
init:'default', init:'default',
@ -1078,6 +1143,24 @@
map.hide_card_prompt_basic.hide(); map.hide_card_prompt_basic.hide();
map.hide_card_prompt_equip.hide(); map.hide_card_prompt_equip.hide();
} }
// if(config.theme=='woodden'&&config.image_background=='default'){
// map.background_color_wood.show();
// }
// else{
// map.background_color_wood.hide();
// }
// if(config.theme=='music'&&config.image_background=='default'){
// map.background_color_music.show();
// }
// else{
// map.background_color_music.hide();
// }
// if(config.theme=='music'){
// map.theme_color_music.show();
// }
// else{
// map.theme_color_music.hide();
// }
}, },
} }
}, },
@ -1511,7 +1594,7 @@
map.player_number.show(); map.player_number.show();
map.enhance_zhu.show(); map.enhance_zhu.show();
map.auto_identity.show(); map.auto_identity.show();
if(config.player_number=='8'){ if(config.player_number!='2'){
map.double_nei.show(); map.double_nei.show();
} }
else{ else{
@ -2556,7 +2639,7 @@
'随从与其他所有角色相互距离基数为1<li>'+ '随从与其他所有角色相互距离基数为1<li>'+
'主将杀死对方随从后获得一个额外的行动值并摸两张牌,杀死己方随从无惩罚,随从杀死随从无效果'+ '主将杀死对方随从后获得一个额外的行动值并摸两张牌,杀死己方随从无惩罚,随从杀死随从无效果'+
'<li>主将可重铸随从牌但回合内总的重铸次数不能超过3随从不能重铸任何牌包括铁索等默认可以重铸的牌若重铸的牌为随从牌或法术牌则摸牌改为从牌库中获得一张法术牌'+ '<li>主将可重铸随从牌但回合内总的重铸次数不能超过3随从不能重铸任何牌包括铁索等默认可以重铸的牌若重铸的牌为随从牌或法术牌则摸牌改为从牌库中获得一张法术牌'+
'<li>嘲讽:若一方阵营中有嘲讽角色,则同阵营的无嘲讽角色不以能成为杀或决斗的目标'+ '<li>嘲讽:若一方阵营中有嘲讽角色,则同阵营的无嘲讽角色不以能成为杀目标'+
'<li>行动顺序为先主将后随从。主将或随从死亡后立即移出游戏主将死亡后替补登场替补登场时摸3+X张牌X为对方存活的随从数无替补时游戏结束' '<li>行动顺序为先主将后随从。主将或随从死亡后立即移出游戏主将死亡后替补登场替补登场时摸3+X张牌X为对方存活的随从数无替补时游戏结束'
}, },
setPopped:function(node,func,width,height){ setPopped:function(node,func,width,height){
@ -12461,7 +12544,7 @@
} }
} }
}, },
asyncDraw:function(players,num){ asyncDraw:function(players,num,drawDeck){
for(var i=0;i<players.length;i++){ for(var i=0;i<players.length;i++){
var num2=1; var num2=1;
if(typeof num=='number'){ if(typeof num=='number'){
@ -12470,7 +12553,12 @@
else if(Array.isArray(num)){ else if(Array.isArray(num)){
num2=num[i]; num2=num[i];
} }
players[i].draw(num2,false); if(drawDeck&&drawDeck.drawDeck){
players[i].draw(num2,false,drawDeck);
}
else{
players[i].draw(num2,false);
}
players[i].$draw(num2); players[i].$draw(num2);
} }
}, },
@ -13748,14 +13836,27 @@
if(lib.config.slim_player){ if(lib.config.slim_player){
ui.arena.classList.add('slim_player'); ui.arena.classList.add('slim_player');
} }
if(lib.config.reduce_radius){
ui.window.classList.add('reduce_radius');
}
if(lib.config.layout=='default'&&lib.config.hp_style=='official'){ if(lib.config.layout=='default'&&lib.config.hp_style=='official'){
ui.arena.classList.add('hpimage'); ui.arena.classList.add('hpimage');
} }
if(!lib.config.target_shake){ if(!lib.config.target_shake){
ui.arena.classList.add('no_target_shake'); ui.arena.classList.add('no_target_shake');
} }
// var themeentry='background_color_'+lib.config.theme;
// if(lib.config[themeentry]){
// document.body.dataset[themeentry]=lib.config[themeentry];
// }
// themeentry='theme_color_'+lib.config.theme;
// if(lib.config[themeentry]){
// document.body.dataset[themeentry]=lib.config[themeentry];
// }
ui.arena.dataset.name_font=lib.config.name_font||'xinwei'; ui.arena.dataset.name_font=lib.config.name_font||'xinwei';
ui.arena.dataset.identity_font=lib.config.identity_font||'huangcao'; ui.arena.dataset.identity_font=lib.config.identity_font||'huangcao';
ui.arena.dataset.cardtext_font=lib.config.cardtext_font||'default';
ui.arena.dataset.global_font=lib.config.global_font||'default'; ui.arena.dataset.global_font=lib.config.global_font||'default';
// ui.arena.dataset.font_size=lib.config.font_size||'16'; // ui.arena.dataset.font_size=lib.config.font_size||'16';
ui.arena.dataset.glow_phase=lib.config.glow_phase; ui.arena.dataset.glow_phase=lib.config.glow_phase;
@ -16857,6 +16958,7 @@
for(var i=0;i<lib.card.list.length;i++){ for(var i=0;i<lib.card.list.length;i++){
if(lib.card[lib.card.list[i][2]]){ if(lib.card[lib.card.list[i][2]]){
if(lib.config.bannedcards.contains(lib.card.list[i][2])) continue; if(lib.config.bannedcards.contains(lib.card.list[i][2])) continue;
if(game.bannedcards&&game.bannedcards.contains(lib.card.list[i][2])) continue;
ui.create.card(ui.cardPile).init(lib.card.list[i]); ui.create.card(ui.cardPile).init(lib.card.list[i]);
} }
} }

BIN
image/background/xueji_bg.jpg Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 219 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 125 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 55 KiB

BIN
image/character/stone_faqishi.jpg Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 90 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 80 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 55 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

BIN
image/character/stone_tujiu.jpg Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 90 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 80 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 173 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 67 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

View File

@ -447,6 +447,9 @@ div:not(.handcards)>.card>.info>span,
border-radius:6px; border-radius:6px;
transition: opacity 0.3s; transition: opacity 0.3s;
} }
#window.reduce_radius>.dialog.popped{
border-radius:4px;
}
#window>.dialog.popped>.bar{ #window>.dialog.popped>.bar{
display:none !important; display:none !important;
} }
@ -723,6 +726,10 @@ margin-bottom: 5px;
background: rgba(63, 119, 173,1); background: rgba(63, 119, 173,1);
border: 1px solid rgba(31, 82, 131, 1); border: 1px solid rgba(31, 82, 131, 1);
} }
.hp.actcount>div.overflow:not(.lost){
background: rgb(162, 162, 162);
border: 1px solid rgb(117, 117, 117);
}
.hp.actcount>.lost{ .hp.actcount>.lost{
background: rgba(63, 119, 173,1); background: rgba(63, 119, 173,1);
border: 1px solid rgba(31, 82, 131, 1); border: 1px solid rgba(31, 82, 131, 1);
@ -881,7 +888,7 @@ margin-bottom: 5px;
animation: dialog_start2 0.3s; animation: dialog_start2 0.3s;
-webkit-animation: dialog_start2 0.3s; -webkit-animation: dialog_start2 0.3s;
} }
.dialog.removing{top: 100px} /*.dialog.removing{top: 100px}*/
.card.drawing{ .card.drawing{
animation: drawing 1s; animation: drawing 1s;
animation-fill-mode: forwards; animation-fill-mode: forwards;
@ -920,6 +927,9 @@ margin-bottom: 5px;
left:10px; left:10px;
background-size:cover; background-size:cover;
} }
#window.reduce_radius #me>.fakeme.avatar{
border-radius:4px;
}
.card.removing{transform:scale(0);} .card.removing{transform:scale(0);}
#me>div>div>.card.removing{margin-left: -52px;margin-right: -52px;} #me>div>div>.card.removing{margin-left: -52px;margin-right: -52px;}
@ -1042,6 +1052,9 @@ div:hover>.intro{opacity: 1;}
box-shadow: rgba(0, 0, 0, 0.3) 0 0 0 1px; box-shadow: rgba(0, 0, 0, 0.3) 0 0 0 1px;
border-radius:8px; border-radius:8px;
} }
#window.reduce_radius .shadowed{
border-radius: 4px;
}
.underline,.underlinenode{ .underline,.underlinenode{
padding:3px; padding:3px;
width:auto; width:auto;
@ -1093,6 +1106,18 @@ div:hover>.intro{opacity: 1;}
#arena[data-identity_font='huangcao'] .player .identity>div{ #arena[data-identity_font='huangcao'] .player .identity>div{
font-family: 'huangcao','xinwei'; font-family: 'huangcao','xinwei';
} }
#arena[data-cardtext_font='xiaozhuan'] .card div:not(.info):not(.background){
font-family: 'xiaozhuan';
}
#arena[data-cardtext_font='xinwei'] .card div:not(.info):not(.background){
font-family: 'xinwei';
}
#arena[data-cardtext_font='huangcao'] .card div:not(.info):not(.background){
font-family: 'huangcao','xinwei';
}
.player .identity>div{ .player .identity>div{
margin: auto; margin: auto;
position: relative; position: relative;
@ -1430,6 +1455,11 @@ div:hover>.wunature{
border-radius:8px; border-radius:8px;
min-height:240px; min-height:240px;
} }
#window.reduce_radius .dialog.scroll1,
#window.reduce_radius .dialog.scroll2,
#window.reduce_radius .dialog.withbg{
border-radius:4px;
}
/*--------动画--------*/ /*--------动画--------*/
@keyframes cardeffect{ @keyframes cardeffect{

View File

@ -428,6 +428,9 @@
top:0; top:0;
position: absolute; position: absolute;
} }
#window.reduce_radius .menu-buttons>.new_character>.avatar>input{
border-radius: 4px;
}
.menu-buttons>.new_character>.avatar>.select_avatar{ .menu-buttons>.new_character>.avatar>.select_avatar{
font-family: 'xinwei'; font-family: 'xinwei';
font-size: 20px; font-size: 20px;
@ -545,11 +548,8 @@
.menubutton{ .menubutton{
box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0, 0.2) 0 3px 10px; box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0, 0.2) 0 3px 10px;
border-radius:8px;
background-image: linear-gradient(rgba(75,75,75,1), rgba(70,70,70,1));
}
.menubutton{
border-radius:4px; border-radius:4px;
background-image: linear-gradient(rgba(75,75,75,1), rgba(70,70,70,1));
} }
.menubutton.active{ .menubutton.active{
background-image: linear-gradient(rgba(47,101,150,1), rgba(43, 90, 132,1)); background-image: linear-gradient(rgba(47,101,150,1), rgba(43, 90, 132,1));

View File

@ -25,7 +25,7 @@
width: calc(5000% / 47); width: calc(5000% / 47);
left:calc(-150% / 47); left:calc(-150% / 47);
top:auto; top:auto;
border-radius:0; border-radius:0 !important;
height:120px; height:120px;
} }
#arena:not(.chess) #handcards1{ #arena:not(.chess) #handcards1{

View File

@ -75,10 +75,6 @@
top:auto; top:auto;
bottom:65px; bottom:65px;
height:calc(100% - 383px); height:calc(100% - 383px);
/*min-height: 207px;*/
background: rgba(0,0,0,0.2);
box-shadow: rgba(0, 0, 0, 0.3) 0 0 0 1px;
border-radius:8px;
animation: dialog_start2 0.5s; animation: dialog_start2 0.5s;
-webkit-animation: dialog_start2 0.5s; -webkit-animation: dialog_start2 0.5s;
} }

View File

@ -61,6 +61,9 @@
box-shadow: rgba(0, 0, 0, 0.3) 0 0 0 1px; box-shadow: rgba(0, 0, 0, 0.3) 0 0 0 1px;
border-radius:8px; border-radius:8px;
} }
#window.reduce_radius>.dialog{
border-radius:4px;
}
#arena>.dialog.slim:not(.center){ #arena>.dialog.slim:not(.center){
top:40px; top:40px;
} }
@ -139,6 +142,10 @@
box-shadow: rgba(0, 0, 0, 0.3) 0 0 0 1px; box-shadow: rgba(0, 0, 0, 0.3) 0 0 0 1px;
border-radius:8px; border-radius:8px;
} }
#window.reduce_radius .player.playergrid,
#window.reduce_radius .player.obstacle{
border-radius:4px;
}
.player.playerblank{ .player.playerblank{
background: none; background: none;
} }

View File

@ -54,7 +54,7 @@
.player .actcount.hp{ .player .actcount.hp{
top: 18px; top: 18px;
left: 15px; left: 15px;
width: 130px; width: 120px;
bottom: auto; bottom: auto;
right: auto; right: auto;
text-align: left; text-align: left;
@ -76,6 +76,9 @@
.player.fullskin2 .avatar{ .player.fullskin2 .avatar{
border-radius:8px 0 0 8px; border-radius:8px 0 0 8px;
} }
#window.reduce_radius .player.fullskin2 .avatar{
border-radius:4px 0 0 4px;
}
.player.fullskin2 .avatar2{ .player.fullskin2 .avatar2{
top:10px; top:10px;
left:auto; left:auto;
@ -381,7 +384,6 @@
.dialog.withbg{ .dialog.withbg{
background: rgba(0,0,0,0.2); background: rgba(0,0,0,0.2);
box-shadow: rgba(0, 0, 0, 0.3) 0 0 0 1px; box-shadow: rgba(0, 0, 0, 0.3) 0 0 0 1px;
border-radius:8px;
min-height:240px; min-height:240px;
} }
.dialog>.bar{ .dialog>.bar{

View File

@ -528,6 +528,7 @@ mode.boss={
dialog.classList.add('fixed'); dialog.classList.add('fixed');
ui.window.appendChild(dialog); ui.window.appendChild(dialog);
dialog.classList.add('bosscharacter'); dialog.classList.add('bosscharacter');
dialog.classList.add('withbg');
// dialog.add('0/3'); // dialog.add('0/3');
dialog.add([list.slice(0,20),'character']); dialog.add([list.slice(0,20),'character']);
dialog.noopen=true; dialog.noopen=true;
@ -553,6 +554,7 @@ mode.boss={
_status.event.dialog=ui.create.dialog('选择参战角色','hidden'); _status.event.dialog=ui.create.dialog('选择参战角色','hidden');
ui.window.appendChild(_status.event.dialog); ui.window.appendChild(_status.event.dialog);
_status.event.dialog.classList.add('bosscharacter'); _status.event.dialog.classList.add('bosscharacter');
_status.event.dialog.classList.add('withbg');
_status.event.dialog.classList.add('fixed'); _status.event.dialog.classList.add('fixed');
// _status.event.dialog.add('0/3'); // _status.event.dialog.add('0/3');
_status.event.dialog.add([list.slice(0,20),'character']); _status.event.dialog.add([list.slice(0,20),'character']);
@ -566,6 +568,7 @@ mode.boss={
}; };
event.dialogxx=ui.create.characterDialog(); event.dialogxx=ui.create.characterDialog();
event.dialogxx.classList.add('bosscharacter'); event.dialogxx.classList.add('bosscharacter');
event.dialogxx.classList.add('withbg');
event.dialogxx.classList.add('fixed'); event.dialogxx.classList.add('fixed');
ui.create.cheat2=function(){ ui.create.cheat2=function(){
_status.createControl=event.asboss; _status.createControl=event.asboss;

View File

@ -869,7 +869,7 @@ mode.guozhan={
if(from.identity==toidentity&&toidentity!='ye'){ if(from.identity==toidentity&&toidentity!='ye'){
return 4+difficulty; return 4+difficulty;
} }
if(lib.character[from.name1][1]==toidentity){ if(from.identity=='unknown'&&lib.character[from.name1][1]==toidentity){
if(get.totalPopulation(toidentity)+1<=get.population()/2) return 4+difficulty; if(get.totalPopulation(toidentity)+1<=get.population()/2) return 4+difficulty;
} }
var groups=[]; var groups=[];
@ -902,7 +902,7 @@ mode.guozhan={
if(to==game.me) difficulty=(2-get.difficulty())*1.5; if(to==game.me) difficulty=(2-get.difficulty())*1.5;
if(from==to) return 5+difficulty; if(from==to) return 5+difficulty;
if(from.identity==to.identity&&from.identity!='unknown'&&from.identity!='ye') return 5+difficulty; if(from.identity==to.identity&&from.identity!='unknown'&&from.identity!='ye') return 5+difficulty;
if(lib.character[from.name1][1]==to.identity){ if(from.identity=='unknown'&&lib.character[from.name1][1]==to.identity){
if(get.totalPopulation(to.identity)+1<=get.population()/2) return 4+difficulty; if(get.totalPopulation(to.identity)+1<=get.population()/2) return 4+difficulty;
} }
var toidentity=to.identity; var toidentity=to.identity;

View File

@ -326,7 +326,7 @@ mode.identity={
} }
} }
else if(game.me.identity=='nei'){ else if(game.me.identity=='nei'){
if(get.population('fan')+get.population('zhu')+get.population('zhong')==0){ if(game.players.length==1){
game.over(true); game.over(true);
} }
else{ else{
@ -334,7 +334,8 @@ mode.identity={
} }
} }
else{ else{
if(get.population('fan')+get.population('zhong')>0&&game.zhu.classList.contains('dead')){ if((get.population('fan')+get.population('zhong')>0||get.population('nei')>1)&&
game.zhu.classList.contains('dead')){
game.over(true); game.over(true);
} }
else{ else{
@ -441,9 +442,33 @@ mode.identity={
} }
else{ else{
identityList=lib.config.mode_config.identity.identity[game.players.length-2].slice(0); identityList=lib.config.mode_config.identity.identity[game.players.length-2].slice(0);
if(get.config('player_number')=='8'&&get.config('double_nei')){ if(get.config('double_nei')){
identityList.remove('fan'); switch(get.config('player_number')){
identityList.push('nei'); case '8':
identityList.remove('fan');
identityList.push('nei');
break;
case '7':
identityList.remove('zhong');
identityList.push('nei');
break;
case '6':
identityList.remove('fan');
identityList.push('nei');
break;
case '5':
identityList.remove('fan');
identityList.push('nei');
break;
case '4':
identityList.remove('zhong');
identityList.push('nei');
break;
case '3':
identityList.remove('fan');
identityList.push('nei');
break;
}
} }
} }
@ -995,7 +1020,7 @@ mode.identity={
if(from==to) return 10; if(from==to) return 10;
if(from.ai.friend.contains(to)) return 5; if(from.ai.friend.contains(to)) return 5;
if(get.population('fan')+get.population('zhong')>0) return 0; if(get.population('fan')+get.population('zhong')>0) return 0;
return -1; return -5;
case 'fan': case 'fan':
if(strategy==5) return Math.max(-1,situation); if(strategy==5) return Math.max(-1,situation);
if(strategy==6) return Math.min(0,situation); if(strategy==6) return Math.min(0,situation);

File diff suppressed because it is too large Load Diff

View File

@ -481,8 +481,13 @@ mode.versus={
event.list=[]; event.list=[];
event.filterChoice=function(name){ event.filterChoice=function(name){
if(get.config('enable_all')) return false; if(get.config('enable_all')) return false;
if(['yuanshu','re_yuanshu','zhangxingcai','hetaiyou','wenpin','yuji','sunluyu', if(['yuanshu','re_yuanshu','zhangxingcai','hetaiyou','wenpin','yuji',
'sp_zhaoyun','sp_diaochan','sp_pangtong','sp_caoren'].contains(name)){ 'xunyu','lusu','guanping','zhangzong','zhoutai','sp_zhangjiao','zhangjiao',
'shixie','zhanglu','chenlin','mayunlu','yangxiu','zhugeke','chengyu',
'zhangbao','zhangliang','sunhao','wutugu','zhugeguo','liuzan','lingcao',
'sunru','lingju','lifeng','hanba','sunluyu','zhuling',
'sp_zhaoyun','sp_diaochan','sp_pangtong','sp_caoren','sp_daqiao',
'sp_ganning','sp_zhangfei','sp_xiahoudun'].contains(name)){
return true; return true;
} }
if(lib.characterPack.refresh[name]) return false; if(lib.characterPack.refresh[name]) return false;

View File

@ -1,8 +1,13 @@
html{ html{
color: white; color: white;
text-shadow: black 0 0 2px; text-shadow: black 0 0 2px;
}
body{
background: url('grid.png'),linear-gradient(#333333, #222222) fixed; background: url('grid.png'),linear-gradient(#333333, #222222) fixed;
} }
body[data-background_color_music='blue']{
background: url('grid.png'),linear-gradient(#6c7989, #434b55) fixed;
}
#system>div>div,#mebg,.control,.player,.card,.avatar,.avatar2,.button,#window>.dialog.popped, #system>div>div,#mebg,.control,.player,.card,.avatar,.avatar2,.button,#window>.dialog.popped,
.player.unseen .equips:not(*:empty),.menu,#splash>div, .player.unseen .equips:not(*:empty),.menu,#splash>div,
#arena.mobile:not(.chess) .player[data-position='0'] .equips{ #arena.mobile:not(.chess) .player[data-position='0'] .equips{
@ -10,6 +15,40 @@ html{
background-image: linear-gradient(#4b4b4b, #464646); background-image: linear-gradient(#4b4b4b, #464646);
border-radius: 8px; border-radius: 8px;
} }
#window.reduce_radius #system>div>div,
#window.reduce_radius #mebg,
#window.reduce_radius .control,
#window.reduce_radius .player,
#window.reduce_radius .card,
#window.reduce_radius .avatar,
#window.reduce_radius .avatar2,
#window.reduce_radius .button,
#window.reduce_radius #window>.dialog.popped,
#window.reduce_radius .player.unseen .equips:not(*:empty),
#window.reduce_radius .menu,#splash>div,
#window.reduce_radius.mobile:not(.chess) .player[data-position='0'] .equips{
border-radius: 4px;
}
body[data-background_color_music='blue'] #system>div>div,
body[data-background_color_music='blue'] #mebg,
body[data-background_color_music='blue'] .control,
body[data-background_color_music='blue'] .player,
body[data-background_color_music='blue'] .card,
body[data-background_color_music='blue'] .avatar,
body[data-background_color_music='blue'] .avatar2,
body[data-background_color_music='blue'] .button,
body[data-background_color_music='blue'] #window>.dialog.popped,
body[data-background_color_music='blue'] .player.unseen .equips:not(*:empty),
body[data-background_color_music='blue'] .menu,#splash>div,
body[data-background_color_music='blue'] #arena.mobile:not(.chess) .player[data-position='0'] .equips{
background-image: linear-gradient(#6c7989, #434b55);
}
/*.player.current_action{ /*.player.current_action{
background-image: linear-gradient(rgba(57, 123, 4,1), rgb(48, 103, 3)); background-image: linear-gradient(rgba(57, 123, 4,1), rgb(48, 103, 3));
}*/ }*/

View File

@ -21,6 +21,23 @@ body{
background-image: linear-gradient(rgba(0,0,0,0.4), rgba(0,0,0,0.4)); background-image: linear-gradient(rgba(0,0,0,0.4), rgba(0,0,0,0.4));
border-radius: 8px; border-radius: 8px;
} }
#window.reduce_radius #system>div>div,
#window.reduce_radius #mebg,
#window.reduce_radius .control,
#window.reduce_radius .player,
#window.reduce_radius .card,
#window.reduce_radius .avatar,
#window.reduce_radius .avatar2,
#window.reduce_radius .button,
#window.reduce_radius #window>.dialog.popped,
#window.reduce_radius .player.unseen .equips:not(*:empty),
#window.reduce_radius .menu,.menubutton,
#window.reduce_radius #splash>div,
#window.reduce_radius.mobile:not(.chess) .player[data-position='0'] .equips{
border-radius: 4px;
}
/*.player.current_action{ /*.player.current_action{
background-image: linear-gradient(rgba(47,101,150,1), rgba(43, 90, 132,1)); background-image: linear-gradient(rgba(47,101,150,1), rgba(43, 90, 132,1));
}*/ }*/

View File

@ -1,13 +1,35 @@
html{ html{
color: white; color: white;
text-shadow: black 0 0 2px; text-shadow: black 0 0 2px;
}
body{
background: url('grid.png'),linear-gradient(#6c7989, #434b55) fixed; background: url('grid.png'),linear-gradient(#6c7989, #434b55) fixed;
} }
body[data-background_color_wood='black']{
background: url('grid.png'),linear-gradient(#333333, #222222) fixed;
}
#system>div>div,#mebg,.control,.player,.card,.avatar,.avatar2,.button,.dialog>.bar,.menu,#splash>div, #system>div>div,#mebg,.control,.player,.card,.avatar,.avatar2,.button,.dialog>.bar,.menu,#splash>div,
#arena.mobile:not(.chess) .player[data-position='0'] .equips{ #arena.mobile:not(.chess) .player[data-position='0'] .equips{
box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0, 0.45) 0 3px 10px; box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0, 0.45) 0 3px 10px;
border-radius: 8px; border-radius: 8px;
} }
#window.reduce_radius #system>div>div,
#window.reduce_radius #mebg,
#window.reduce_radius .control,
#window.reduce_radius .player,
#window.reduce_radius .card,
#window.reduce_radius .avatar,
#window.reduce_radius .avatar2,
#window.reduce_radius .button,
#window.reduce_radius .dialog>.bar,
#window.reduce_radius .menu,
#window.reduce_radius #splash>div,
#window.reduce_radius.mobile:not(.chess) .player[data-position='0'] .equips{
border-radius: 4px;
}
.menu.main>.menu-tab>div:not(.active):not(*:hover), .menu.main>.menu-tab>div:not(.active):not(*:hover),
.menu.main>.menu-tab>.disabled{ .menu.main>.menu-tab>.disabled{
color: rgba(77, 60, 51,0.5); color: rgba(77, 60, 51,0.5);