YunFeiyang
/
noname
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

b

This commit is contained in:
libccy 2017-02-01 23:42:44 +08:00
parent 72ab453f19
commit bc5f3d334a
5 changed files with 111 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
card/guozhan.js
View File

@ -436,18 +436,30 @@ card.guozhan={
var content;
var str=get.translation(target)+'的';
if(result.control){
if(result.control=='手牌') content=[str+'手牌',target.get('h')];
else if(result.control=='主将') content=[str+'主将',[[target.name1],'character']];
else content=[str+'副将',[[target.name2],'character']];
if(result.control=='手牌'){
content=[str+'手牌',target.get('h')];
game.log(player,'观看了',target,'的手牌');
}
else if(result.control=='主将'){
content=[str+'主将',[[target.name1],'character']];
game.log(player,'观看了',target,'的主将');
}
else{
content=[str+'副将',[[target.name2],'character']];
game.log(player,'观看了',target,'的副将');
}
}
else if(target.get('h').length){
content=[str+'手牌',target.get('h')];
game.log(player,'观看了',target,'的手牌');
}
else if(target.classList.contains('unseen')){
content=[str+'主将',[[target.name1],'character']];
game.log(player,'观看了',target,'的主将');
}
else{
content=[str+'副将',[[target.name2],'character']];
game.log(player,'观看了',target,'的副将');
}
player.chooseControl('ok').set('dialog',content);
},

72
game/game.js
View File

@ -1501,6 +1501,7 @@
name:'音效音量',
init:8,
item:{
'0':'〇',
'1':'一',
'2':'二',
'3':'三',
@ -1518,6 +1519,7 @@
name:'音乐音量',
init:8,
item:{
'0':'〇',
'1':'一',
'2':'二',
'3':'三',
@ -4353,9 +4355,6 @@
get[i]=lib.init.eval(mode[lib.config.mode].get[i]);
}
lib.init.start=mode[lib.config.mode].start;
if(typeof mode[lib.config.mode].init=='function'){
mode[lib.config.mode].init();
}
if(game.onwash){
lib.onwash.push(game.onwash);
delete game.onwash;
@ -4383,6 +4382,9 @@
lib[i][j]=lib.init.eval(mode[lib.config.mode][i][j]);
}
}
if(typeof mode[lib.config.mode].init=='function'){
(lib.init.eval(mode[lib.config.mode].init))();
}
var connectCharacterPack=[];
var connectCardPack=[];
@ -5094,6 +5096,9 @@
window.lib=lib;
window._status=_status;
},
o:function(){
ui.arena.classList.remove('observe');
},
p:function(name,i){
var list=['swd','hs','pal','gjqt','ow'];
if(!lib.character[name]){
@ -9178,7 +9183,7 @@
this.node.hp.innerHTML='';
this.roomfull=false;
this.roomgaming=false;
this.versionOL=null;
this.version=null;
if(info=='server'){
this.serving=true;
this.node.serving.show();
@ -9206,6 +9211,7 @@
this.maxHp=parseInt(config.number);
this.hp=info[3];
this.update();
this.version=config.version;
if(this.hp==this.maxHp&&!config.gameStarted){
this.roomfull=true;
}
@ -19217,7 +19223,7 @@
dialog.add(ui.create.div('.placeholder'));
for(var i=0;i<game.players.length;i++){
if(game.players[i].isUnderControl(true)) continue;
if(!_status.connectMode&&game.players[i].isUnderControl(true)) continue;
var hs=game.players[i].get('h');
if(hs.length){
dialog.add('<div class="text center">'+get.translation(game.players[i])+'</div>');
@ -20162,6 +20168,7 @@
}
lib.configOL.banned=lib.config['connect_'+name+'_banned'];
lib.configOL.bannedcards=lib.config['connect_'+name+'_bannedcards'];
lib.configOL.version=lib.versionOL;
}
for(var i in lib.cardPackList){
if(lib.configOL.cardPack.contains(i)){
@ -22565,7 +22572,9 @@
var banned=lib.config[lib.config.all.mode[i]+'_banned'];
if(banned){
for(var j=0;j<banned.length;j++){
lib.characterPack.mode_banned[banned[j]]=lib.character[banned[j]];
if(lib.character[banned[j]]){
lib.characterPack.mode_banned[banned[j]]=lib.character[banned[j]];
}
}
}
}
@ -30217,8 +30226,13 @@
else if(this.roomgaming&&!game.onlineID){
alert('房间不允许旁观');
}
else if(this.versionOL!=lib.versionOL){
alert('版本不匹配');
else if(this.version&&this.version!=lib.versionOL){
if(this.version>lib.versionOL){
alert('加入失败：你的游戏版本过低');
}
else{
alert('加入失败：房主的游戏版本过低');
}
}
else if(this.hasOwnProperty('roomindex')){
if(!_status.enteringroom){
@ -31207,36 +31221,26 @@
}
return parseInt(num)||2;
},
benchmark:function(func1,func2,arg,iteration){
benchmark:function(func1,func2,iteration,arg){
var tic,toc;
if(!arg) arg=[];
if(Array.isArray(func2)){
tic=get.utc();
for(var i=0;i<iteration;i++){
func1[func2[0]](arg.randomGet());
}
toc=get.utc();
console.log('time1: '+(toc-tic));
tic=get.utc();
for(var i=0;i<iteration;i++){
func1[func2[1]](arg.randomGet());
}
toc=get.utc();
console.log('time2: '+(toc-tic));
var key1=func2[0],key2=func2[1];
func2=func1[key2];
func1=func1[key1];
}
else{
tic=get.utc();
for(var i=0;i<iteration;i++){
func1(arg.randomGet());
}
toc=get.utc();
console.log('time1: '+(toc-tic));
tic=get.utc();
for(var i=0;i<iteration;i++){
func2(arg.randomGet());
}
toc=get.utc();
console.log('time2: '+(toc-tic));
tic=get.utc();
for(var i=0;i<iteration;i++){
func1(arg.randomGet());
}
toc=get.utc();
console.log('time1: '+(toc-tic));
tic=get.utc();
for(var i=0;i<iteration;i++){
func2(arg.randomGet());
}
toc=get.utc();
console.log('time2: '+(toc-tic));
},
stringify:function(obj,level){
level=level||0;

40
game/update.js
View File

@ -1,41 +1,41 @@
window.noname_update={
version:'1.9.6.6',
update:'1.9.6.5',
version:'1.9.7',
update:'1.9.7',
changeLog:[
'bug修复',
'联机可禁卡',
'素材下载改进',
],
files:[
'game/game.js',
'game/config.js',
'game/package.js',
'game/asset.js',
'game/source.js',
// 'game/game.js',
// 'game/config.js',
// 'game/package.js',
// 'game/asset.js',
// 'game/source.js',
// 'card/hearth.js',
'card/swd.js',
'card/gujian.js',
// 'card/swd.js',
// 'card/gujian.js',
// 'card/sp.js',
// 'card/guozhan.js',
'character/rank.js',
// 'character/rank.js',
// 'character/extra.js',
'character/ow.js',
// 'character/ow.js',
// 'character/hearth.js',
'character/refresh.js',
// 'character/refresh.js',
// 'character/shenhua.js',
'character/sp.js',
// 'character/sp.js',
// 'character/xianjian.js',
'character/swd.js',
// 'character/swd.js',
// 'character/yxs.js',
'character/yijiang.js',
// 'character/yijiang.js',
// 'mode/boss.js',
'mode/chess.js',
'mode/versus.js',
'mode/guozhan.js',
'mode/identity.js',
// 'mode/chess.js',
// 'mode/versus.js',
// 'mode/guozhan.js',
// 'mode/identity.js',
// 'mode/stone.js',
// 'theme/simple/style.css',
'layout/default/layout.css',
// 'layout/default/layout.css',
// 'layout/long/layout.css',
// 'layout/long2/layout.css',
// 'layout/mobile/layout.css',

42
layout/long2/layout.css
View File

@ -186,55 +186,69 @@
#window[data-radius_size='increase'] #arena>.player.fullskin2:not(.minskin)>.avatar2{
border-radius: 16px !important;
}
#arena>.player.fullskin2:not(.minskin):not(.unseen2)>.avatar{
#arena>.player.fullskin2:not(.minskin):not(.unseen2)>.avatar,
#arena>.player.fullskin2:not(.minskin).unseen2[data-position='0']>.avatar{
border-radius: 8px 8px 0 0 !important;
height: calc(50% + 14px) !important;
-webkit-clip-path: polygon(-10px -10px, 116px -10px, 116px 92px, 106px 92px, 0px 114px, -10px 114px);
}
#arena[data-player_height='default']>.player.fullskin2:not(.minskin):not(.unseen2)>.avatar{
#arena[data-player_height='default']>.player.fullskin2:not(.minskin):not(.unseen2)>.avatar,
#arena[data-player_height='default']>.player.fullskin2:not(.minskin).unseen2[data-position='0']>.avatar{
-webkit-clip-path: polygon(-10px -10px, 116px -10px, 116px 82px, 106px 82px, 0px 104px, -10px 104px);
}
#arena[data-player_height='short']>.player.fullskin2:not(.minskin):not(.unseen2)>.avatar{
#arena[data-player_height='short']>.player.fullskin2:not(.minskin):not(.unseen2)>.avatar,
#arena[data-player_height='short']>.player.fullskin2:not(.minskin).unseen2[data-position='0']>.avatar{
-webkit-clip-path: polygon(-10px -10px, 116px -10px, 116px 72px, 106px 72px, 0px 94px, -10px 94px);
}
#arena.uslim_player>.player.fullskin2:not(.minskin):not(.unseen2)>.avatar{
#arena.uslim_player>.player.fullskin2:not(.minskin):not(.unseen2)>.avatar,
#arena.uslim_player>.player.fullskin2:not(.minskin).unseen2[data-position='0']>.avatar{
height: calc(50% + 18px) !important;
-webkit-clip-path: polygon(-10px -10px, 124px -10px, 124px 96px, 114px 96px, 0px 118px, -10px 118px);
}
#arena.uslim_player[data-player_height='default']>.player.fullskin2:not(.minskin):not(.unseen2)>.avatar{
#arena.uslim_player[data-player_height='default']>.player.fullskin2:not(.minskin):not(.unseen2)>.avatar,
#arena.uslim_player[data-player_height='default']>.player.fullskin2:not(.minskin).unseen2[data-position='0']>.avatar{
-webkit-clip-path: polygon(-10px -10px, 124px -10px, 124px 86px, 114px 86px, 0px 108px, -10px 108px);
}
#arena.uslim_player[data-player_height='short']>.player.fullskin2:not(.minskin):not(.unseen2)>.avatar{
#arena.uslim_player[data-player_height='short']>.player.fullskin2:not(.minskin):not(.unseen2)>.avatar,
#arena.uslim_player[data-player_height='short']>.player.fullskin2:not(.minskin).unseen2[data-position='0']>.avatar{
-webkit-clip-path: polygon(-10px -10px, 124px -10px, 124px 76px, 114px 76px, 0px 98px, -10px 98px);
}
#window[data-radius_size='reduce'] #arena>.player.fullskin2:not(.minskin):not(.unseen2)>.avatar{
#window[data-radius_size='reduce'] #arena>.player.fullskin2:not(.minskin):not(.unseen2)>.avatar,
#window[data-radius_size='reduce'] #arena>.player.fullskin2:not(.minskin).unseen2[data-position='0']>.avatar{
border-radius: 4px 4px 0 0 !important;
}
#window[data-radius_size='off'] #arena>.player.fullskin2:not(.minskin):not(.unseen2)>.avatar{
#window[data-radius_size='off'] #arena>.player.fullskin2:not(.minskin):not(.unseen2)>.avatar,
#window[data-radius_size='off'] #arena>.player.fullskin2:not(.minskin).unseen2[data-position='0']>.avatar{
border-radius: 0 0 0 0 !important;
}
#window[data-radius_size='increase'] #arena>.player.fullskin2:not(.minskin):not(.unseen2)>.avatar{
#window[data-radius_size='increase'] #arena>.player.fullskin2:not(.minskin):not(.unseen2)>.avatar,
#window[data-radius_size='increase'] #arena>.player.fullskin2:not(.minskin).unseen2[data-position='0']>.avatar{
border-radius: 16px 16px 0 0 !important;
}
#arena>.player.fullskin2:not(.minskin):not(.unseen)>.avatar2{
#arena>.player.fullskin2:not(.minskin):not(.unseen)>.avatar2,
#arena>.player.fullskin2:not(.minskin).unseen[data-position='0']>.avatar2{
border-radius: 0 0 8px 8px !important;
top: calc(50% - 21px) !important;
height: calc(50% + 14px) !important;
background-position: 0 10px !important;
-webkit-clip-path: polygon(-10px 32px, 0 32px, 106px 10px, 116px 10px, 116px 134px, -10px 134px);
}
#arena.uslim_player>.player.fullskin2:not(.minskin):not(.unseen)>.avatar2{
#arena.uslim_player>.player.fullskin2:not(.minskin):not(.unseen)>.avatar2,
#arena.uslim_player>.player.fullskin2:not(.minskin).unseen[data-position='0']>.avatar2{
top: calc(50% - 21px) !important;
height: calc(50% + 18px) !important;
-webkit-clip-path: polygon(-10px 32px, 0 32px, 114px 10px, 124px 10px, 124px 138px, -10px 138px);
}
#window[data-radius_size='reduce'] #arena>.player.fullskin2:not(.minskin):not(.unseen)>.avatar2{
#window[data-radius_size='reduce'] #arena>.player.fullskin2:not(.minskin):not(.unseen)>.avatar2,
#window[data-radius_size='reduce'] #arena>.player.fullskin2:not(.minskin).unseen[data-position='0']>.avatar2{
border-radius: 0 0 4px 4px !important;
}
#window[data-radius_size='off'] #arena>.player.fullskin2:not(.minskin):not(.unseen)>.avatar2{
#window[data-radius_size='off'] #arena>.player.fullskin2:not(.minskin):not(.unseen)>.avatar2,
#window[data-radius_size='off'] #arena>.player.fullskin2:not(.minskin).unseen[data-position='0']>.avatar2{
border-radius: 0 0 0 0 !important;
}
#window[data-radius_size='increase'] #arena>.player.fullskin2:not(.minskin):not(.unseen)>.avatar2{
#window[data-radius_size='increase'] #arena>.player.fullskin2:not(.minskin):not(.unseen)>.avatar2,
#window[data-radius_size='increase'] #arena>.player.fullskin2:not(.minskin).unseen[data-position='0']>.avatar2{
border-radius: 0 0 16px 16px !important;
}
#arena>.player.fullskin2:not(.minskin)>.avatar2{

11
mode/boss.js
View File

@ -78,7 +78,7 @@ mode.boss={
var list=[];
for(var i in lib.character){
var info=lib.character[i];
if(info[4].contains('boss')&&!lib.config.banned.contains(i)){
if(info[4].contains('boss')&&get.config(i+'_boss_config')){
var cfg=i+'_bossconfig';
if(get.config(cfg)==undefined){
game.saveConfig(cfg,true,true);
@ -424,6 +424,15 @@ mode.boss={
// boss_shuijing:['male','qun',8,[],['boss','bossallowed'],'wei'],
}
},
init:function(){
for(var i in lib.characterPack.mode_boss){
lib.mode.boss.config[i+'_boss_config']={
name:get.translation(i),
init:true,
unfrequent:true,
}
}
},
game:{
reserveDead:true,
changeBoss:function(name){