This commit is contained in:
parent
5f9ea3ee22
commit
b4f4646cfd
|
@ -244,6 +244,7 @@ character.extra={
|
|||
if(result.bool){
|
||||
player.logSkill('jilue_guicai');
|
||||
player.storage.renjie--;
|
||||
player.updateMarks();
|
||||
if(trigger.player.judging.clone){
|
||||
trigger.player.judging.clone.delete();
|
||||
game.addVideo('deletenode',player,get.cardsInfo([trigger.player.judging.clone]));
|
||||
|
@ -287,6 +288,7 @@ character.extra={
|
|||
"step 1"
|
||||
if(result.bool){
|
||||
player.storage.renjie--;
|
||||
player.updateMarks();
|
||||
player.logSkill('jilue_fangzhu',result.targets);
|
||||
result.targets[0].draw(player.maxHp-player.hp);
|
||||
result.targets[0].turnOver();
|
||||
|
@ -302,6 +304,7 @@ character.extra={
|
|||
},
|
||||
content:function(){
|
||||
player.storage.renjie--;
|
||||
player.updateMarks();
|
||||
player.addTempSkill('wansha','phaseAfter');
|
||||
}
|
||||
},
|
||||
|
@ -319,6 +322,7 @@ character.extra={
|
|||
check:function(card){return 6-ai.get.value(card)},
|
||||
content:function(){
|
||||
player.storage.renjie--;
|
||||
player.updateMarks();
|
||||
player.draw(cards.length);
|
||||
},
|
||||
ai:{
|
||||
|
@ -348,6 +352,7 @@ character.extra={
|
|||
},
|
||||
content:function(){
|
||||
player.storage.renjie--;
|
||||
player.updateMarks();
|
||||
player.draw();
|
||||
},
|
||||
ai:{
|
||||
|
|
53
game/game.js
53
game/game.js
|
@ -4661,6 +4661,10 @@
|
|||
delete this.marks[i].markcount;
|
||||
}
|
||||
}
|
||||
else if(this.marks[i].markcount){
|
||||
this.marks[i].markcount.delete();
|
||||
delete this.marks[i].markcount;
|
||||
}
|
||||
}
|
||||
},
|
||||
num:function(arg1,arg2,arg3){
|
||||
|
@ -9703,7 +9707,7 @@
|
|||
addVideo:function(type,player,content){
|
||||
if(_status.video) return;
|
||||
if(!_status.videoInited) return;
|
||||
if(type=='storage'&&player&&player.update){
|
||||
if(type=='storage'&&player&&player.updateMarks){
|
||||
player.updateMarks();
|
||||
}
|
||||
if(game.getVideoName){
|
||||
|
@ -10731,13 +10735,16 @@
|
|||
|
||||
|
||||
var globalskills=[];
|
||||
var globallist=lib.skill.global.slice(0);
|
||||
game.expandSkills(globallist);
|
||||
for(var i=0;i<skills.length;i++){
|
||||
if(lib.skill.global.contains(skills[i])){
|
||||
if(globallist.contains(skills[i])){
|
||||
globalskills.push(skills.splice(i--,1)[0]);
|
||||
}
|
||||
}
|
||||
var equipskills=[];
|
||||
var ownedskills=player.get('s',true,false);
|
||||
game.expandSkills(ownedskills);
|
||||
for(var i=0;i<skills.length;i++){
|
||||
if(!ownedskills.contains(skills[i])){
|
||||
equipskills.push(skills.splice(i--,1)[0]);
|
||||
|
@ -11963,6 +11970,7 @@
|
|||
// }
|
||||
var i,controls;
|
||||
var nozoom=false;
|
||||
var noupdate=false;
|
||||
if(get.objtype(arguments[0])=='array') controls=arguments[0];
|
||||
else controls=arguments;
|
||||
var control=ui.create.div('.control');
|
||||
|
@ -11977,6 +11985,9 @@
|
|||
else if(controls[i]=='nozoom'){
|
||||
nozoom=true;
|
||||
}
|
||||
else if(controls[i]=='noupdate'){
|
||||
noupdate=true;
|
||||
}
|
||||
else{
|
||||
control.add(controls[i]);
|
||||
}
|
||||
|
@ -12005,7 +12016,7 @@
|
|||
ui.refresh(control);
|
||||
control.style.transition='';
|
||||
}
|
||||
ui.updatec();
|
||||
if(!noupdate) ui.updatec();
|
||||
return control;
|
||||
},
|
||||
confirm:function(str,func){
|
||||
|
@ -12063,10 +12074,13 @@
|
|||
delete ui.skills;
|
||||
}
|
||||
if(skills==undefined||skills.length==0) return;
|
||||
ui.skills=ui.create.control(skills.concat([ui.click.skill]));
|
||||
ui.skills=ui.create.control(skills.concat([ui.click.skill]),'noupdate');
|
||||
if(!_status.event.isMine()){
|
||||
ui.skills.style.display='none';
|
||||
}
|
||||
else{
|
||||
ui.updatec();
|
||||
}
|
||||
ui.skills.skills=skills;
|
||||
ui.skills._nomove=true;
|
||||
return ui.skills;
|
||||
|
@ -12088,10 +12102,13 @@
|
|||
delete ui.skills2;
|
||||
}
|
||||
if(skills==undefined||skills.length==0) return;
|
||||
ui.skills2=ui.create.control(skills.concat([ui.click.skill]));
|
||||
ui.skills2=ui.create.control(skills.concat([ui.click.skill]),'noupdate');
|
||||
if(!_status.event.isMine()){
|
||||
ui.skills2.style.display='none';
|
||||
}
|
||||
else{
|
||||
ui.updatec();
|
||||
}
|
||||
ui.skills2.skills=skills;
|
||||
return ui.skills2;
|
||||
},
|
||||
|
@ -12112,10 +12129,13 @@
|
|||
delete ui.skills3;
|
||||
}
|
||||
if(skills==undefined||skills.length==0) return;
|
||||
ui.skills3=ui.create.control(skills.concat([ui.click.skill]));
|
||||
ui.skills3=ui.create.control(skills.concat([ui.click.skill]),'noupdate');
|
||||
if(!_status.event.isMine()){
|
||||
ui.skills3.style.display='none';
|
||||
}
|
||||
else{
|
||||
ui.updatec();
|
||||
}
|
||||
ui.skills3.skills=skills;
|
||||
return ui.skills3;
|
||||
},
|
||||
|
@ -14937,7 +14957,12 @@
|
|||
node.dataset.color=i;
|
||||
ui.refresh(node);
|
||||
node.show();
|
||||
if(lib.config.layout=='phone'){
|
||||
node.style.transform='scale(1.3) translateY('+((num++)*30)+'px)';
|
||||
}
|
||||
else{
|
||||
node.style.transform='translateY('+((num++)*30)+'px)';
|
||||
}
|
||||
nodes.push(node);
|
||||
}
|
||||
}
|
||||
|
@ -16046,8 +16071,16 @@
|
|||
lib.config.skin[player.name]=num;
|
||||
game.saveConfig('skin',lib.config.skin);
|
||||
avatar.style.backgroundImage='url("'+img.src+'")';
|
||||
if(lib.config.animation&&!lib.config.low_performance){
|
||||
player.$rare();
|
||||
}
|
||||
}
|
||||
img.onerror=function(){
|
||||
if(lib.config.skin[player.name]){
|
||||
if(lib.config.animation&&!lib.config.low_performance){
|
||||
player.$rare();
|
||||
}
|
||||
}
|
||||
delete lib.config.skin[player.name];
|
||||
game.saveConfig('skin',lib.config.skin);
|
||||
avatar.setBackground(player.name,'character');
|
||||
|
@ -16075,8 +16108,16 @@
|
|||
lib.config.skin[player.name2]=num;
|
||||
game.saveConfig('skin',lib.config.skin);
|
||||
avatar.style.backgroundImage='url("'+img.src+'")';
|
||||
if(lib.config.animation&&!lib.config.low_performance){
|
||||
player.$rare();
|
||||
}
|
||||
}
|
||||
img.onerror=function(){
|
||||
if(lib.config.skin[player.name2]){
|
||||
if(lib.config.animation&&!lib.config.low_performance){
|
||||
player.$rare();
|
||||
}
|
||||
}
|
||||
delete lib.config.skin[player.name2];
|
||||
game.saveConfig('skin',lib.config.skin);
|
||||
avatar.setBackground(player.name2,'character');
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 26 KiB |
Binary file not shown.
Before Width: | Height: | Size: 26 KiB |
Binary file not shown.
Before Width: | Height: | Size: 32 KiB |
Binary file not shown.
Before Width: | Height: | Size: 14 KiB |
Binary file not shown.
Before Width: | Height: | Size: 59 KiB |
Binary file not shown.
After Width: | Height: | Size: 56 KiB |
|
@ -5,3 +5,7 @@
|
|||
#arena.menupaused{
|
||||
opacity: 0.6;
|
||||
}
|
||||
#arena.thrownhighlight>.card.thrown:not(.thrownhighlight){
|
||||
filter:blur(2px);
|
||||
-webkit-filter:blur(2px);
|
||||
}
|
||||
|
|
|
@ -28,6 +28,9 @@ table{table-layout: fixed;}
|
|||
#arena[data-global_font='xinwei']{
|
||||
font-family: 'xinwei';
|
||||
}
|
||||
#arena[data-global_font='huangcao']{
|
||||
font-family: 'huangcao','xinwei';
|
||||
}
|
||||
/*#arena[data-font_size='14']{
|
||||
font-size:14px;
|
||||
}
|
||||
|
@ -397,7 +400,7 @@ margin-bottom: 5px;
|
|||
.caption>.ctext{text-align:center;font-size:16px;}
|
||||
.button.character,.button.card{width: 90px;height: 90px;position: relative;margin: 6px;}
|
||||
.button.character>.name{left:5px;top:22px;}
|
||||
.button.character>.hp{left:5px;top:2px;}
|
||||
.button.character>.hp{left:5px;top:3px;}
|
||||
.button.character>.hp.text{
|
||||
top:8px;
|
||||
left:6px;
|
||||
|
@ -492,6 +495,9 @@ margin-bottom: 5px;
|
|||
opacity: 0;
|
||||
transform:scale(0.7);
|
||||
}
|
||||
.player[data-position='0']>.damage.dieidentity{
|
||||
opacity: 0 !important
|
||||
}
|
||||
.player>.cardeffect{
|
||||
font-family: 'huangcao','xinwei';
|
||||
font-size:108px;
|
||||
|
@ -858,7 +864,8 @@ div:hover>.intro{opacity: 1;}
|
|||
0 10px 10px -9px rgba(0,0,0,0.1),0 10px 0 -9px rgba(0,0,0,0.05);}*/
|
||||
.selected,.target{/*transform: scale(1.05);*/}
|
||||
/*.player.target{-webkit-filter:brightness(1.2)}*/
|
||||
.target{transform: rotate(-3deg);box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(255, 0, 0, 0.8) 0 0 15px !important;}
|
||||
.target{transform: rotate(-3deg);
|
||||
box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px,rgba(255, 0, 0, 0.4) 0 0 5px, rgba(255, 0, 0, 0.5) 0 0 12px, rgba(255, 0, 0, 0.8) 0 0 15px !important}
|
||||
.target2{transform: rotate(3deg);}
|
||||
.content>.config.line2{
|
||||
transform:translateX(-5px);
|
||||
|
@ -1163,16 +1170,16 @@ div:hover>.wunature{
|
|||
|
||||
|
||||
.player.selectable{
|
||||
box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 133, 255, 0.8) 0 0 15px;
|
||||
box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 133, 255, 0.5) 0 0 5px, rgba(0, 133, 255, 0.6) 0 0 12px, rgba(0, 133, 255, 0.8) 0 0 15px;
|
||||
}
|
||||
.selected{
|
||||
box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(255, 0, 0, 0.8) 0 0 15px !important;
|
||||
box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px,rgba(255, 0, 0, 0.4) 0 0 5px, rgba(255, 0, 0, 0.4) 0 0 12px, rgba(255, 0, 0, 0.8) 0 0 15px !important;
|
||||
}
|
||||
#me .card.selected{
|
||||
box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px,rgb(255, 0, 0) 0 0 5px, rgba(255, 0, 0, 1) 0 0 10px !important;
|
||||
}
|
||||
.glow{
|
||||
box-shadow: rgba(0, 0, 0, 0.3) 0 0 0 1px, rgba(0, 133, 255, 0.8) 0 0 15px !important;
|
||||
box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 133, 255, 0.4) 0 0 5px, rgba(0, 133, 255, 0.5) 0 0 12px, rgba(0, 133, 255, 0.8) 0 0 15px !important;
|
||||
}
|
||||
.glow2:not(.player.glow_phase)>.avatar{
|
||||
/*-webkit-animation:control_glow 4s infinite;*/
|
||||
|
|
|
@ -113,6 +113,12 @@
|
|||
#arena:not(.chess) .player[data-position='0']:not(.minskin)>.count{
|
||||
bottom:10px;
|
||||
}
|
||||
#arena:not(.chess).slim_player .player[data-position='0']:not(.minskin)>.count{
|
||||
border-radius: 0 2px 2px 0;
|
||||
left:-4px;
|
||||
z-index: 3;
|
||||
text-align: right;
|
||||
}
|
||||
#arena:not(.chess) .player[data-position='0']>.hp.actcount{
|
||||
top:10px;
|
||||
left:2px;
|
||||
|
|
|
@ -182,16 +182,19 @@
|
|||
.player .count{
|
||||
top:auto;
|
||||
bottom:30px;
|
||||
left:-1px;
|
||||
left:-3px;
|
||||
padding:2px;
|
||||
line-height:20px;
|
||||
width:8px;
|
||||
width:10px;
|
||||
text-align:left;
|
||||
border-radius:2px;
|
||||
z-index:3;
|
||||
border-radius:0 2px 2px 0;
|
||||
z-index:1;
|
||||
border-radius:3px 0 0 3px;
|
||||
box-shadow: rgba(0,0,0,0.2) 1px -1px 2px inset,rgba(255,255,255,0.15) -1px 1px 5px inset;
|
||||
}
|
||||
#arena.slim_player .player .count{
|
||||
left: -6px;
|
||||
}
|
||||
.player .count.action{
|
||||
bottom:60px;
|
||||
}
|
||||
|
|
|
@ -66,6 +66,9 @@
|
|||
#arena.phonetop{
|
||||
top:80px !important;
|
||||
}
|
||||
.player>.identity{
|
||||
transform: scale(1.3);
|
||||
}
|
||||
|
||||
@media screen and (orientation:portrait) {
|
||||
|
||||
|
|
|
@ -799,7 +799,7 @@ mode.identity={
|
|||
game.delay(2);
|
||||
game.zhu.playerfocus(1000);
|
||||
}
|
||||
var node=ui.create.div('.damage',get.translation(this.identity+'2'),this);
|
||||
var node=ui.create.div('.damage.dieidentity',get.translation(this.identity+'2'),this);
|
||||
ui.refresh(node);
|
||||
node.style.opacity=1;
|
||||
},
|
||||
|
|
|
@ -9,7 +9,7 @@ body{
|
|||
min-height: 100%;
|
||||
left: 0;
|
||||
top: 0;
|
||||
background-image: url('../../image/background/huangtian_bg.jpg');
|
||||
background-image: url('../../image/background/shengshi_bg.jpg');
|
||||
background-size: cover;
|
||||
position: absolute;
|
||||
display: block;
|
||||
|
|
Loading…
Reference in New Issue