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

x

This commit is contained in:
libccy 2016-04-12 15:49:02 +08:00
parent ff9b24477f
commit f59a953c87
20 changed files with 3560 additions and 3303 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
card/ex.js
View File

@ -1,5 +1,6 @@
'use strict';
card.ex={
connect:true,
card:{
hanbing:{
fullskin:true,

1
card/extra.js
View File

@ -1,4 +1,5 @@
card.extra={
connect:true,
card:{
jiu:{
audio:true,

1
card/hearth.js
View File

@ -1,6 +1,5 @@
'use strict';
card.hearth={
// forbid:['stone'],
card:{
linghunzhihuo:{
fullskin:true,

1
card/mingzhong.js
View File

@ -1,5 +1,6 @@
'use strict';
card.mingzhong={
connect:true,
card:{
shengdong:{
fullskin:true,

1
card/refresh.js
View File

@ -1,5 +1,6 @@
'use strict';
card.refresh={
connect:true,
card:{
muniu:{
fullskin:true,

1
card/standard.js
View File

@ -1,5 +1,6 @@
'use strict';
card.standard={
connect:true,
card:{
damage:{
ai:{

4
character/refresh.js
View File

@ -155,7 +155,9 @@ character.refresh={
}
ui.discardPile.appendChild(trigger.player.judging[0]);
trigger.player.judging[0]=result.cards[0];
trigger.position.appendChild(result.cards[0]);
if(!get.owner(result.cards[0],'judge')){
trigger.position.appendChild(result.cards[0]);
}
game.log(trigger.player,'的判定牌改为',result.cards[0]);
game.delay(2);
}

9
character/shenhua.js
View File

@ -1,5 +1,6 @@
'use strict';
character.shenhua={
connect:true,
character:{
xiahouyuan:['male','wei',4,['shensu']],
caoren:['male','wei',4,['jushou','jiewei']],
@ -708,7 +709,7 @@ character.shenhua={
return (player!=zhu&&player.group=='wu'&&player.num('h')>0&&zhu.num('h')>0);
},
filterTarget:function(card,player,target){
return target.isZhu&&target.get('s').contains('zhiba');
return player!=target&&target.isZhu&&target.get('s').contains('zhiba');
},
usable:1,
content:function(){
@ -2895,7 +2896,9 @@ character.shenhua={
player.$gain2(trigger.player.judging[0]);
player.gain(trigger.player.judging[0]);
trigger.player.judging[0]=result.cards[0];
trigger.position.appendChild(result.cards[0]);
if(!get.owner(result.cards[0],'judge')){
trigger.position.appendChild(result.cards[0]);
}
game.log(trigger.player,'的判定牌改为',result.cards[0]);
}
"step 3"
@ -2944,7 +2947,7 @@ character.shenhua={
return (card.name=='shan'||card.name=='shandian')
},
filterTarget:function(card,player,target){
return target.isZhu&&target.get('s').contains('huangtian');
return player!=target&&target.isZhu&&target.get('s').contains('huangtian');
},
usable:1,
forceaudio:true,

5
character/standard.js
View File

@ -1,5 +1,6 @@
'use strict';
character.standard={
connect:true,
character:{
caocao:['male','wei',4,['hujia','jianxiong'],['zhu']],
simayi:['male','wei',3,['fankui','guicai']],
@ -183,7 +184,9 @@ character.standard={
}
ui.discardPile.appendChild(trigger.player.judging[0]);
trigger.player.judging[0]=result.cards[0];
trigger.position.appendChild(result.cards[0]);
if(!get.owner(result.cards[0],'judge')){
trigger.position.appendChild(result.cards[0]);
}
game.log(trigger.player,'的判定牌改为',result.cards[0]);
game.delay(2);
}

8
character/swd.js
View File

@ -1261,6 +1261,14 @@ character.swd={
}
}
else{
var hasFriend=false;
for(var i=0;i<game.players.length;i++){
if(get.distance(player,game.players[i],'attack')>1&&
player!=game.players[i]&&ai.get.attitude(player,game.players[i]>0)){
hasFriend=true;break;
}
}
if(!hasFriend) return;
var hs=target.num('h');
if(get.tag(card,'respondShan')){
var shans=target.num('h','shan');

2
game/config.js
View File

@ -259,6 +259,8 @@ window.config={
cards:['standard','ex','extra','refresh'],
characters:['standard','shenhua','refresh','sp','yijiang'],
connect_characters:[],
connect_cards:[],
plays:[],
extensions:[],
banned:[],

6736
game/game.js
View File

File diff suppressed because it is too large Load Diff

2
game/package.js
View File

@ -40,10 +40,10 @@ mode.pack={
identity:'身份',
guozhan:'国战',
versus:'对决',
connect:'联机',
boss:'挑战',
chess:'战棋',
stone:'炉石',
connect:'联机',
};
background.pack={
zhulian_bg:'璧合',

5
game/update.js
View File

@ -1,7 +1,8 @@
window.noname_update={
version:'1.8.5.1',
version:'1.8.6',
changeLog:[
'联机大厅',
'模式排序',
'国战联机',
'修复bug'
]
}

2
layout/default/layout.css
View File

@ -39,7 +39,7 @@ table{table-layout: fixed;}
position: absolute;
transition: all 1s;
}
#window.shortcutpaused>div:not(.background):not(#shortcut):not(#system):not(#arena):not(.hidden):not(.removing):not(.dialog){opacity: 0.3 !important}
#window.shortcutpaused>div:not(.background):not(#shortcut):not(#system):not(#arena):not(.hidden):not(.removing):not(.dialog):not(.centermenu):not(.popup-container){opacity: 0.3 !important}
#window.shortcutpaused>#arena>div:not(#timer):not(.removing):not(.hidden){opacity: 0.3 !important}
#window.noclick_important *{pointer-events: none !important;}
#window.noclick_important .noclick_click_important div{pointer-events: auto !important}

27
layout/default/menu.css
View File

@ -95,14 +95,6 @@
left:calc(50% - 200px);
top:calc(50% - 150px);
}
/*.menu.main.slideup{
animation:menuslideup 0.5s forwards;
-webkit-animation:menuslideup 0.5s forwards;
}
.menu.main.slidedown{
animation:menuslidedown 0.5s forwards;
-webkit-animation:menuslidedown 0.5s forwards;
}*/
.menu-container.hidden>.menu.main{
transform:scale(0.5);
transform-origin:2px -35px;
@ -112,20 +104,13 @@
transition: all 0.3s;
transform-origin:2px -35px;
}
/*.menu.main.zoomin{
animation:menuzoomin 0.3s forwards;
-webkit-animation:menuzoomin 0.3s forwards;
transform:scale(0.5);
transform-origin:2px -35px;
opacity:0;
.menu-container.hidden>.menu.main.center{
/*transform:translateY(300px);*/
transform-origin: center center;
}
.menu-container>.menu.main.center{
transform-origin: center center;
}
.menu.main.zoomout{
animation:menuzoomout 0.3s forwards;
-webkit-animation:menuzoomout 0.3s forwards;
transform:scale(0.5);
transform-origin:2px -35px;
opacity:0;
}*/
.menu.main{
width: 400px;
height:300px;

12
layout/phone/layout.css
View File

@ -57,17 +57,13 @@
#pausebutton,#autobutton,#restartbutton{
display: none !important;
}
/*#system1>div:first-child{
display: none !important;
}
#system1>div:last-child{
display: none !important;
}*/
.menu-container>.menu.main {
.menu-container>.menu.main{
zoom:1.3;
}
.menu-container>.menu.main:not(.center){
top: 12px !important;
left: 10px !important;
zoom:1.3;
}
#arena.phonetop{

16
mode/connect.js
View File

@ -1,8 +1,22 @@
'use strict';
mode.connect={
start:function(){
var directstartmode=lib.config.directstartmode;
game.saveConfig('directstartmode');
ui.create.menu(true);
var createNode=function(){
if(event.created) return;
if(directstartmode){
game.switchMode(directstartmode);
return;
}
if(lib.node&&window.require){
ui.startServer=ui.create.system('启动服务器',function(e){
e.stopPropagation();
ui.click.connectMenu();
},true);
}
event.created=true;
var node=ui.create.div('.shadowed');
node.style.width='400px';
@ -11,7 +25,7 @@ mode.connect={
node.style.fontFamily='xinwei';
node.style.fontSize='30px';
node.style.padding='10px';
node.style.left='calc(50% - 200px)';
node.style.left='calc(50% - 210px)';
node.style.top='calc(50% - 20px)';
node.style.whiteSpace='nowrap';
node.innerHTML=lib.config.last_ip||'';

17
mode/identity.js
View File

@ -146,29 +146,12 @@ mode.identity={
}
if(_status.connectMode){
game.waitForPlayer(function(){
for(var i in lib.mode.identity.config){
if(lib.mode.identity.config[i].connect){
lib.configOL[i]=get.config(i);
}
}
if(_status.mode=='zhong'){
lib.configOL.number=8;
}
else{
lib.configOL.number=lib.configOL.player_number;
}
lib.configOL.characterPack=['standard','shenhua'];
lib.configOL.cardPack=['standard','ex','extra','refresh','mingzhong'];
lib.configOL.mode='identity';
var cardPackList=[];
for(var i=0;i<lib.configOL.cardPack.length;i++){
cardPackList=cardPackList.concat(lib.cardPack[lib.configOL.cardPack[i]]);
}
for(var i=0;i<lib.card.list.length;i++){
if(!cardPackList.contains(lib.card.list[i][2])){
lib.card.list.splice(i--,1);
}
}
});
}
"step 4"

12
mode/stone.js
View File

@ -1089,7 +1089,7 @@ mode.stone={
stone_xunmenglong:['male','wei',2,['druid_qicheng'],['minskin','stone'],[3,3,'druid']],
stone_caoyuanshi:['male','qun',5,['hunter_nuhou'],['minskin','stone'],[5,2,'hunter']],
stone_leiouke:['male','shu',3,['hunter_zhanhuo'],['minskin','stone'],[3,1,'hunter']],
stone_leiouke:['male','shu',2,['hunter_zhanhuo'],['minskin','stone'],[3,1,'hunter']],
stone_huofu:['male','qun',2,['stone_chongfeng'],['minskin','stone'],[3,4,'hunter']],
stone_misha:['male','shu',3,['chaofeng'],['minskin','stone'],[3,3,'hunter']],
stone_jiewangzhu:['male','wu',1,['hunter_jiewang'],['minskin','stone'],[1,2,'hunter']],
@ -2195,17 +2195,15 @@ mode.stone={
},
spell_yongshizhufu:{
type:'stonecard',
stoneact:3,
stoneact:2,
career:'paladin',
enable:true,
fullimage:true,
filterTarget:function(card,player,target){
return target.isMin();
return target.isMin()&&target.num('h')>0;
},
content:function(){
target.hp*=2;
target.maxHp*=2;
target.update();
target.draw(target.num('h'));
},
ai:{
order:4,
@ -2213,7 +2211,7 @@ mode.stone={
useful:2,
result:{
target:function(player,target){
return Math.max(0,target.hp-1);
return Math.max(0,target.num('h')-1);
}
}
}