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

l3

This commit is contained in:
libccy 2017-03-17 09:38:59 +08:00
parent 3d7217867a
commit 8c98036f0e
7 changed files with 48 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
game/game.js
View File

@ -9443,8 +9443,22 @@
lose:function(){
"step 0"
var hs=[],es=[],js=[];
var hej=player.get('hej');
event.stockcards=cards.slice(0);
for(var i=0;i<cards.length;i++){
if(cards[i].parentNode){
cards[i].style.transform+=' scale(0.2)';
cards[i].classList.remove('glow');
cards[i].recheck();
if(event.position){
cards[i].goto(event.position);
}
else{
cards[i].delete();
}
if(!hej.contains(cards[i])){
cards.splice(i--,1);
}
else if(cards[i].parentNode){
if(cards[i].parentNode.classList.contains('equips')){
cards[i].original='e';
es.push(cards[i]);
@ -9461,15 +9475,6 @@
cards[i].original=null;
}
}
cards[i].style.transform+=' scale(0.2)';
cards[i].classList.remove('glow');
cards[i].recheck();
if(event.position){
cards[i].goto(event.position);
}
else{
cards[i].delete();
}
}
if(player==game.me) ui.updatehl();
ui.updatej(player);
@ -9479,18 +9484,6 @@
cards[i].delete();
}
if(player==game.me){
for(var i=player.node.handcards1.childNodes.length-1;i>0;i--){
if(player.node.handcards1.childNodes[i].classList.contains('removing')==false){
player.node.handcards1.childNodes[i].animate('last');
break;
}
}
for(var i=player.node.handcards2.childNodes.length-1;i>0;i--){
if(player.node.handcards2.childNodes[i].classList.contains('removing')==false){
player.node.handcards2.childNodes[i].animate('last');
break;
}
}
ui.updatehl();
}
ui.updatej(player);
@ -9499,18 +9492,6 @@
game.addVideo('lose',player,[get.cardsInfo(hs),get.cardsInfo(es),get.cardsInfo(js)]);
player.update();
game.addVideo('loseAfter',player);
for(var i=player.node.handcards1.childNodes.length-1;i>0;i--){
if(player.node.handcards1.childNodes[i].classList.contains('removing')==false){
player.node.handcards1.childNodes[i].animate('last');
break;
}
}
for(var i=player.node.handcards2.childNodes.length-1;i>0;i--){
if(player.node.handcards2.childNodes[i].classList.contains('removing')==false){
player.node.handcards2.childNodes[i].animate('last');
break;
}
}
event.num=0;
"step 1"
if(num<cards.length){
@ -12140,9 +12121,14 @@
next.position=arguments[i];
}
}
if(next.cards==undefined) _status.event.next.remove(next);
if(next.position==undefined) next.position=ui.discardPile;
next.setContent('lose');
if(next.cards==undefined){
_status.event.next.remove(next);
}
else{
if(next.position==undefined) next.position=ui.discardPile;
next.cards=next.cards.slice(0);
}
next.setContent('lose');
return next;
},
damage:function(){
@ -19583,18 +19569,6 @@
console.log('loseAfter');
return;
}
for(var i=player.node.handcards1.childNodes.length-1;i>0;i--){
if(player.node.handcards1.childNodes[i].classList.contains('removing')==false){
player.node.handcards1.childNodes[i].animate('last');
break;
}
}
for(var i=player.node.handcards2.childNodes.length-1;i>0;i--){
if(player.node.handcards2.childNodes[i].classList.contains('removing')==false){
player.node.handcards2.childNodes[i].animate('last');
break;
}
}
},
link:function(player,bool){
if(player&&player.classList){

14
game/update.js
View File

@ -1,16 +1,16 @@
window.noname_update={
version:'1.9.10.8',
update:'1.9.10.7',
// update:'1.9.10.7',
changeLog:[
'bug修复',
],
files:[
'game/game.js',
// 'game/game.js',
// 'game/package.js',
// 'game/config.js',
// 'game/source.js',
// 'game/asset.js',
'card/guozhan.js',
// 'card/guozhan.js',
// 'character/rank.js',
// 'character/gwent.js',
// 'character/ow.js',
@ -26,11 +26,11 @@ window.noname_update={
// 'mode/stone.js',
// 'theme/simple/style.css',
// 'layout/default/layout.css',
'layout/default/menu.css',
'layout/long/layout.css',
'layout/long2/layout.css',
// 'layout/default/menu.css',
// 'layout/long/layout.css',
// 'layout/long2/layout.css',
// 'layout/mobile/layout.css',
'layout/newlayout/global.css',
// 'layout/newlayout/global.css',
// 'layout/mode/chess.css',
// 'extension/boss/extension.js',
]

2
layout/default/layout.css
View File

@ -485,7 +485,7 @@ not(.removing):not(.dialog):not(.centermenu):not(.popup-container):not(.forceopa
width: 100%;
height: 20px;
line-height: 20px;
top: 44px;
top: 37px;
left: 0;
text-align: center;
}

16
mode/guozhan.js
View File

@ -651,9 +651,9 @@ mode.guozhan={
if(!player.storage.zhangwu){
player.storage.zhangwu=[];
}
for(var i=0;i<trigger.cards.length;i++){
if(trigger.cards[i].name=='feilongduofeng'){
player.storage.zhangwu.add(trigger.cards[i]);
for(var i=0;i<trigger.stockcards.length;i++){
if(trigger.stockcards[i].name=='feilongduofeng'){
player.storage.zhangwu.add(trigger.stockcards[i]);
}
}
}
@ -665,8 +665,8 @@ mode.guozhan={
if(lib.skill.zhangwu_count1.filter(event,player)){
return false;
}
for(var i=0;i<event.cards.length;i++){
if(event.cards[i].name=='feilongduofeng'){
for(var i=0;i<event.stockcards.length;i++){
if(event.stockcards[i].name=='feilongduofeng'){
return true;
}
}
@ -674,9 +674,9 @@ mode.guozhan={
content:function(){
'step 0'
var list=[];
for(var i=0;i<trigger.cards.length;i++){
if(trigger.cards[i].name=='feilongduofeng'){
list.add(trigger.cards[i]);
for(var i=0;i<trigger.stockcards.length;i++){
if(trigger.stockcards[i].name=='feilongduofeng'){
list.add(trigger.stockcards[i]);
}
}
if(list.length){

5
theme/music/style.css
View File

@ -46,12 +46,13 @@ body[data-background_color_music='blue'] #arena.mobile:not(.chess) .player[data-
#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,
#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{
#arena.long:not(.mobile):not(.oldlayout) .player.unseen2 .equips:not(*:empty)>.card:not(.selected){
background: none !important;
}

5
theme/simple/style.css
View File

@ -50,11 +50,12 @@ body{
#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,
#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{
#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 {

5
theme/woodden/style.css
View File

@ -46,12 +46,13 @@ html{
#arena.long:not(.mobile):not(.oldlayout) .player.unseen2 .equips:not(*:empty){
background: url('wood.png');
border-radius:4px;
overflow: hidden;
box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px, rgba(0, 0, 0, 0.2) 0 2px 10px;
}
#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,
#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{
#arena.long:not(.mobile):not(.oldlayout) .player.unseen2 .equips:not(*:empty)>.card:not(.selected){
background: none !important;
}