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

1

This commit is contained in:
libccy 2017-03-18 21:42:05 +08:00
parent f090aaea5b
commit 0b428b4f93
29 changed files with 312 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
game/asset.js
View File

@ -1,5 +1,5 @@
window.noname_asset_list=[
'1.9.11.1',
'1.9.12',
'image/background/huangtian_bg.jpg',
'image/background/september_bg.jpg',
'image/background/shengshi_bg.jpg',
@ -2463,10 +2463,18 @@ window.noname_asset_list=[
'theme/style/cardback/image/new2.png',
'theme/style/cardback/image/official.png',
'theme/style/cardback/image/official2.png',
'theme/style/hp/image/hp1.png',
'theme/style/hp/image/hp2.png',
'theme/style/hp/image/hp3.png',
'theme/style/hp/image/hp4.png',
'theme/style/hp/image/emotion1.png',
'theme/style/hp/image/emotion2.png',
'theme/style/hp/image/emotion3.png',
'theme/style/hp/image/emotion4.png',
'theme/style/hp/image/glass1.png',
'theme/style/hp/image/glass2.png',
'theme/style/hp/image/glass3.png',
'theme/style/hp/image/glass4.png',
'theme/style/hp/image/official1.png',
'theme/style/hp/image/official2.png',
'theme/style/hp/image/official3.png',
'theme/style/hp/image/official4.png',
];
window.noname_skin_list={
bulianshi:4,

19
game/game.js
View File

@ -1004,18 +1004,14 @@
item:{
default:'默认',
official:'勾玉',
emotion:'表情',
glass:'手杀',
},
onclick:function(layout){
game.saveConfig('hp_style',layout);
var style=ui.css.hp_style;
ui.css.hp_style=lib.init.css(lib.assetURL+'theme/style/hp',lib.config.hp_style);
style.remove();
if(game.layout=='default'&&lib.config.hp_style=='official'){
ui.arena.classList.add('hpimage');
}
else{
ui.arena.classList.remove('hpimage');
}
},
unfrequent:true,
},
@ -1557,11 +1553,13 @@
name:'游戏特效',
intro:'开启后属性伤害等会显示动画',
init:true,
unfrequent:true,
},
skill_animation:{
name:'技能特效',
intro:'开启后觉醒技、限定技将显示全屏文字',
init:true,
unfrequent:true,
},
target_shake:{
name:'目标特效',
@ -6001,12 +5999,6 @@
else{
ui.arena.classList.remove('oldlayout');
}
if(game.layout=='default'&&lib.config.hp_style=='official'){
ui.arena.classList.add('hpimage');
}
else{
ui.arena.classList.remove('hpimage');
}
if(lib.config.cardshape=='oblong'&&(game.layout=='long'||game.layout=='mobile'||game.layout=='long2')){
ui.arena.classList.add('oblongcard');
}
@ -31678,9 +31670,6 @@
ui.arena.classList.add('lslim_player');
}
ui.window.dataset.radius_size=lib.config.radius_size||'default';
if(game.layout=='default'&&lib.config.hp_style=='official'){
ui.arena.classList.add('hpimage');
}
if(game.layout=='long'||game.layout=='mobile'){
if(lib.config.textequip=='text') ui.arena.classList.add('textequip');
}

16
game/source.js
View File

@ -105,10 +105,18 @@ window.noname_source_list=[
'theme/style/cardback/image/official2.png',
'theme/style/hp/default.css',
'theme/style/hp/official.css',
'theme/style/hp/image/hp1.png',
'theme/style/hp/image/hp2.png',
'theme/style/hp/image/hp3.png',
'theme/style/hp/image/hp4.png',
'theme/style/hp/image/emotion1.png',
'theme/style/hp/image/emotion2.png',
'theme/style/hp/image/emotion3.png',
'theme/style/hp/image/emotion4.png',
'theme/style/hp/image/glass1.png',
'theme/style/hp/image/glass2.png',
'theme/style/hp/image/glass3.png',
'theme/style/hp/image/glass4.png',
'theme/style/hp/image/official1.png',
'theme/style/hp/image/official2.png',
'theme/style/hp/image/official3.png',
'theme/style/hp/image/official4.png',
'node_modules/ws/index.js',
'node_modules/ws/package.json',
'node_modules/ws/lib/BufferPool.js',

6
game/update.js
View File

@ -1,8 +1,8 @@
window.noname_update={
version:'1.9.11.1',
update:'1.9.11',
version:'1.9.12',
// update:'1.9.11',
changeLog:[
'bug修复',
'新样式',
],
files:[
'game/game.js',

BIN
theme/ol/card.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 30 KiB

BIN
theme/ol/grid.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 250 B

BIN
theme/ol/player_blank.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 68 KiB

BIN
theme/ol/player_bronze.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 115 KiB

BIN
theme/ol/player_gold.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 117 KiB

BIN
theme/ol/player_silver.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 119 KiB

184
theme/ol/style.css Normal file
View File

@ -0,0 +1,184 @@
html{
color: white;
text-shadow: black 0 0 2px;
min-height: 100%;
background-image: url('../../image/background/shengshi_bg.jpg');
background-size: cover;
}
body{
width: 100%;
height: 100%;
min-height: 100%;
left: 0;
top: 0;
position: absolute;
display: block;
}
#system>div>div,#mebg,.control,.player,.card,.avatar,.avatar2,.button,#window>.dialog.popped,
#arena:not(.long) .player.unseen .equips:not(*:empty),
#arena.long .player.unseen2 .equips:not(*:empty),.menu,.menubutton,#splash>div,
#arena.mobile:not(.chess) .player[data-position='0'] .equips,.playerbg,.menubg,.mebg{
box-shadow: rgba(0, 0, 0, 0.4) 0 0 0 1px, rgba(0, 0, 0, 0.2) 0 3px 10px;
background-image: linear-gradient(rgba(0,0,0,0.4), rgba(0,0,0,0.4));
border-radius: 8px;
}
#arena.mobile.textequip:not(.chess) .player[data-position='0'] .equips{
background-image: none;
box-shadow: rgba(0, 0, 0, 0.2) -1px 0px 0px 0px;
}
#arena:not(.chess).textequip .player[data-position='0'] .equips>.card{
background-image: linear-gradient(rgba(0,0,0,0.4), rgba(0,0,0,0.4)) !important;
}
#arena.observe .handcards>.card{
background: linear-gradient(rgba(0,0,0,0.4), rgba(0,0,0,0.4)) !important;
}
/*.player.current_action{
background-image: linear-gradient(rgba(47,101,150,1), rgba(43, 90, 132,1));
}*/
.menubutton{
border-radius: 4px;
}
/*.player{
background-image: url('card.png');
background-size: cover;
}*/
#window>.dialog.popped{
border-radius: 6px;
}
.control,#system>div>div,.judges>div,.marks>div,
#arena:not(.long) .player.unseen .equips:not(*:empty),
#arena.long .player.unseen2 .equips:not(*:empty){
border-radius:4px;
overflow: hidden;
}
#arena:not(.long).mobile:not(.oldlayout) .player.unseen:not([data-position="0"]) .equips:not(*:empty)>.card,
#arena:not(.long):not(.mobile):not(.oldlayout) .player.unseen .equips:not(*:empty)>.card:not(.selected),
#arena.long.mobile:not(.oldlayout) .player.unseen2:not([data-position="0"]) .equips:not(*:empty)>.card,
#arena.long:not(.mobile):not(.oldlayout) .player.unseen2 .equips:not(*:empty)>.card:not(.selected){
background: none !important;
}
#arena.mobile:not(.chess) .player[data-position='0']>.equips>.equip5 {
border-radius: 4px;
}
#arena.mobile:not(.chess) .player[data-position='0']>.equips>.equip5>.image{
width: 100%;
height: 100%;
left: 0;
top: 0;
}
#arena.mobile:not(.chess) .player[data-position='0']>.equips>.equip5>.name{
display: block;
transform: scale(0.43) !important;
transform-origin: left top;
left: 2px;
top: 3px;
}
#arena.mobile:not(.chess) .player[data-position='0']>.equips>.equip5>.name.long{
top: 2px;
}
#arena.mobile:not(.chess) .player[data-position='0']>.equips>.equip5>.info{
display: block;
transform: scale(0.43) !important;
transform-origin: right top;
right: 3px;
top: 3px;
}
.cardbg{
background-size: 100% 100% !important;
}
.card{
color:white;
}
.card:not(*:empty),.cardbg{
color:rgb(77, 60, 51);
text-shadow:none;
background: url('card.png');
background-size:100% 100%;
}
.card .markcount{
box-shadow: rgba(0, 0, 0, 0.8) 0 0 0 1px, rgba(0, 0, 0, 0.2) 0 3px 10px;
background: url('card.png');
background-size: cover;
/*color: white;*/
}
#me>div>div>.card,#arena>.card:not(*:empty){
box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0, 0.45) 0 3px 10px;
}
/*.player{
background:repeating-linear-gradient(
135deg,
rgba(0,0,0,0.4),
rgba(0,0,0,0.4) 2px,
rgba(0,0,0,0.2) 2px,
rgba(0,0,0,0.2) 4px
);
}*/
.card:empty,.card.infohidden{
background: url('../style/cardback/image/official.png');
background-size: cover;
}
.card.infohidden:not(.infoflip){
background: url('../style/cardback/image/official2.png');
background-size: cover;
}
#system>div>.glow{
background-image: linear-gradient(rgba(47,101,150,1), rgba(43, 90, 132,1));
box-shadow: rgba(0, 0, 0, 0.4) 0 0 0 1px, rgba(0, 0, 0, 0.2) 0 3px 10px !important;
}
.menupaused{
opacity: 0.3 !important;
}
.player .marks>div:first-child>div{
-webkit-filter: invert(0.8) sepia(1);
}
.fire{
color: rgb(255,119,63);
}
.thunder{
color: rgb(117,186,255);
}
.poison{
color: rgb(104,221,127);
}
.brown{
color: rgb(195,161,223);
}
#roundmenu.clock>div:nth-of-type(15){
background: rgba(0,0,0,0.3);
box-shadow: rgba(0,0,0,0.6) 0 0 5px inset;
}
.player>.glassbg{
left: 0;
top: 0;
margin: 0;
padding: 0;
width: 100%;
height: 100%;
overflow: hidden;
border-radius: 8px;
box-shadow: none;
z-index: 1;
pointer-events: none;
}
.player>.glassbg>div:last-child{
width: 100%;
height: 100%;
background: rgba(0,0,0,0.4);
}
.player>.glassbg>div:first-child{
left: 0;
top: 0;
margin: 0;
padding: 0;
transition-property: transform;
transition-duration: 0s;
background-size: cover;
-webkit-filter: blur(3px);
}

BIN
theme/ol/unknown.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 126 KiB

BIN
theme/ol/wood.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
theme/ol/wood3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.9 KiB

44
theme/style/hp/emotion.css Normal file
View File

@ -0,0 +1,44 @@
.hp:not(.text):not(.actcount)[data-condition="high"]>div:not(.lost){
background: url('image/emotion1.png');
box-shadow: none;
border: none;
background-size: cover;
transform: scale(1.4) rotate(180deg);
-webkit-filter:brightness(0.8) contrast(1.5);
}
.hp:not(.text):not(.actcount)[data-condition="mid"]>div:not(.lost){
background: url('image/emotion2.png');
box-shadow: none;
border: none;
background-size: cover;
transform: scale(1.4) rotate(180deg);
-webkit-filter:brightness(0.8) contrast(1.5);
}
.hp:not(.text):not(.actcount)[data-condition="low"]>div:not(.lost){
background: url('image/emotion3.png');
box-shadow: none;
border: none;
background-size: cover;
transform: scale(1.4) rotate(180deg);
-webkit-filter:brightness(0.8) contrast(1.5);
}
.hp:not(.text):not(.actcount)>.lost{
background: url('image/emotion4.png');
box-shadow: none;
border: none;
background-size: cover;
transform: scale(1.4) rotate(180deg);
}
#arena.oldlayout .player .hp:not(.text):not(.actcount)[data-condition="high"]>div:not(.lost){
transform: scale(1.6);
}
#arena.oldlayout .player .hp:not(.text):not(.actcount)[data-condition="mid"]>div:not(.lost){
transform: scale(1.6);
}
#arena.oldlayout .player .hp:not(.text):not(.actcount)[data-condition="low"]>div:not(.lost){
transform: scale(1.6);
}
#arena.oldlayout .player .hp:not(.text):not(.actcount)>.lost{
transform: scale(1.6);
}

44
theme/style/hp/glass.css Normal file
View File

@ -0,0 +1,44 @@
.hp:not(.text):not(.actcount)[data-condition="high"]>div:not(.lost){
background: url('image/glass1.png');
box-shadow: none;
border: none;
background-size: cover;
transform: scale(1.4) rotate(180deg);
-webkit-filter:none;
}
.hp:not(.text):not(.actcount)[data-condition="mid"]>div:not(.lost){
background: url('image/glass2.png');
box-shadow: none;
border: none;
background-size: cover;
transform: scale(1.4) rotate(180deg);
-webkit-filter:none;
}
.hp:not(.text):not(.actcount)[data-condition="low"]>div:not(.lost){
background: url('image/glass3.png');
box-shadow: none;
border: none;
background-size: cover;
transform: scale(1.4) rotate(180deg);
-webkit-filter:none;
}
.hp:not(.text):not(.actcount)>.lost{
background: url('image/glass4.png');
box-shadow: none;
border: none;
background-size: cover;
transform: scale(1.4) rotate(180deg);
}
#arena.oldlayout .player .hp:not(.text):not(.actcount)[data-condition="high"]>div:not(.lost){
transform: scale(1.6);
}
#arena.oldlayout .player .hp:not(.text):not(.actcount)[data-condition="mid"]>div:not(.lost){
transform: scale(1.6);
}
#arena.oldlayout .player .hp:not(.text):not(.actcount)[data-condition="low"]>div:not(.lost){
transform: scale(1.6);
}
#arena.oldlayout .player .hp:not(.text):not(.actcount)>.lost{
transform: scale(1.6);
}

BIN
theme/style/hp/image/emotion1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
theme/style/hp/image/emotion2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
theme/style/hp/image/emotion3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
theme/style/hp/image/emotion4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
theme/style/hp/image/glass1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
theme/style/hp/image/glass2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
theme/style/hp/image/glass3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
theme/style/hp/image/glass4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.1 KiB

0
theme/style/hp/image/hp1.png → theme/style/hp/image/official1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

0
theme/style/hp/image/hp2.png → theme/style/hp/image/official2.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

0
theme/style/hp/image/hp3.png → theme/style/hp/image/official3.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

0
theme/style/hp/image/hp4.png → theme/style/hp/image/official4.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

16
theme/style/hp/official.css
View File

@ -1,41 +1,41 @@
.hp:not(.text):not(.actcount)[data-condition="high"]>div:not(.lost){
background: url('image/hp1.png');
background: url('image/official1.png');
box-shadow: none;
border: none;
background-size: cover;
transform: scale(1.4) rotate(180deg);
}
.hp:not(.text):not(.actcount)[data-condition="mid"]>div:not(.lost){
background: url('image/hp2.png');
background: url('image/official2.png');
box-shadow: none;
border: none;
background-size: cover;
transform: scale(1.4) rotate(180deg);
}
.hp:not(.text):not(.actcount)[data-condition="low"]>div:not(.lost){
background: url('image/hp3.png');
background: url('image/official3.png');
box-shadow: none;
border: none;
background-size: cover;
transform: scale(1.4) rotate(180deg);
}
.hp:not(.text):not(.actcount)>.lost{
background: url('image/hp4.png');
background: url('image/official4.png');
box-shadow: none;
border: none;
background-size: cover;
transform: scale(1.4) rotate(180deg);
}
#arena.hpimage .player .hp:not(.text):not(.actcount)[data-condition="high"]>div:not(.lost){
#arena.oldlayout .player .hp:not(.text):not(.actcount)[data-condition="high"]>div:not(.lost){
transform: scale(1.6);
}
#arena.hpimage .player .hp:not(.text):not(.actcount)[data-condition="mid"]>div:not(.lost){
#arena.oldlayout .player .hp:not(.text):not(.actcount)[data-condition="mid"]>div:not(.lost){
transform: scale(1.6);
}
#arena.hpimage .player .hp:not(.text):not(.actcount)[data-condition="low"]>div:not(.lost){
#arena.oldlayout .player .hp:not(.text):not(.actcount)[data-condition="low"]>div:not(.lost){
transform: scale(1.6);
}
#arena.hpimage .player .hp:not(.text):not(.actcount)>.lost{
#arena.oldlayout .player .hp:not(.text):not(.actcount)>.lost{
transform: scale(1.6);
}