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

1.9.7

This commit is contained in:
libccy 2017-02-02 19:03:27 +08:00
parent 123c4ea4de
commit dc6f1ca73b
6 changed files with 102 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
card/gujian.js
View File

@ -161,12 +161,14 @@ card.gujian={
target.chooseCard(true).ai=function(card){ target.chooseCard(true).ai=function(card){
var num=0; var num=0;
if(get.color(card)=='red'){ if(get.color(card)=='red'){
if(rand) num-=5; if(rand) num-=6;
} }
else{ else{
if(!rand) num-=5; if(!rand) num-=6;
} }
return num-ai.get.value(card); var value=ai.get.value(card);
if(value>=8) return -100;
return num-value;
}; };
"step 2" "step 2"
event.card2=result.cards[0]; event.card2=result.cards[0];
@ -371,17 +373,29 @@ card.gujian={
// food:'食物', // food:'食物',
// chunbing:'春饼', // chunbing:'春饼',
// chunbing_info:'春饼',
// gudonggeng:'骨董羹', // gudonggeng:'骨董羹',
// gudonggeng_info:'骨董羹',
// yougeng:'酉羹', // yougeng:'酉羹',
// yougeng_info:'酉羹',
// liyutang:'鲤鱼汤', // liyutang:'鲤鱼汤',
// liyutang_info:'鲤鱼汤',
// mizhilianou:'蜜汁藕', // mizhilianou:'蜜汁藕',
// mizhilianou_info:'蜜汁藕',
// xiajiao:'虾饺', // xiajiao:'虾饺',
// xiajiao_info:'虾饺',
// tanhuadong:'昙花冻', // tanhuadong:'昙花冻',
// tanhuadong_info:'昙花冻',
// qingtuan:'青团', // qingtuan:'青团',
// qingtuan_info:'青团',
// luyugeng:'鲈鱼羹', // luyugeng:'鲈鱼羹',
// luyugeng_info:'鲈鱼羹',
// yuanbaorou:'元宝肉', // yuanbaorou:'元宝肉',
// yuanbaorou_info:'元宝肉',
// molicha:'茉莉茶', // molicha:'茉莉茶',
// molicha_info:'茉莉茶',
// mapodoufu:'麻婆豆腐', // mapodoufu:'麻婆豆腐',
// mapodoufu_info:'麻婆豆腐',
}, },
list:[ list:[
['club',8,'feibiao','poison'], ['club',8,'feibiao','poison'],

2
game/asset.js
View File

@ -30,7 +30,6 @@ window.noname_asset_list=[
'image/card/diaohulishan.png', 'image/card/diaohulishan.png',
'image/card/donghuangzhong.png', 'image/card/donghuangzhong.png',
'image/card/du.png', 'image/card/du.png',
// 'image/card/dujian.png',
'image/card/dunpaigedang.png', 'image/card/dunpaigedang.png',
'image/card/fangtian.png', 'image/card/fangtian.png',
'image/card/feibiao.png', 'image/card/feibiao.png',
@ -190,7 +189,6 @@ window.noname_asset_list=[
'image/card/wuxingpan.png', 'image/card/wuxingpan.png',
'image/card/wuzhong.png', 'image/card/wuzhong.png',
'image/card/xiajiao.png', 'image/card/xiajiao.png',
// 'image/card/xiangyuye.png',
'image/card/xianluhui.png', 'image/card/xianluhui.png',
'image/card/xiayuncailing.png', 'image/card/xiayuncailing.png',
'image/card/xietianzi.png', 'image/card/xietianzi.png',

6
game/config.js
View File

@ -27,9 +27,9 @@ window.config={
forbidboss:['caiwenji','gjqt_aruan','pal_xuanxiao','swd_hupo'], forbidboss:['caiwenji','gjqt_aruan','pal_xuanxiao','swd_hupo'],
forbiddouble:['zhugedan','swd_kangnalishi','dongzhuo','wutugu','hs_siwangzhiyi','hs_ronghejuren','hs_shanlingjuren'], forbiddouble:['zhugedan','swd_kangnalishi','dongzhuo','wutugu','hs_siwangzhiyi','hs_ronghejuren','hs_shanlingjuren'],
all:{ all:{
diymode:['stone','chess','boss','tafang'], sgscharacters:['standard','shenhua','refresh','yijiang','sp','extra','guozhan','old'],
diycharacter:['diy','yxs','hearth','swd','gujian','xianjian','boss','ow'], sgscards:['standard','extra','sp','guozhan'],
diycard:['zhenfa','yunchou','swd','shenqi','hearth','gujian'], sgsmodes:['identity','guozhan','versus','brawl','connect'],
stockmode:['identity','guozhan','versus','boss','chess','stone','connect','brawl','tafang','hearthstone'], stockmode:['identity','guozhan','versus','boss','chess','stone','connect','brawl','tafang','hearthstone'],
stockextension:['boss','cardpile','character','coin','soldier','weather','wuxing','hs_mod'], stockextension:['boss','cardpile','character','coin','soldier','weather','wuxing','hs_mod'],
layout:['default','newlayout'], layout:['default','newlayout'],

93
game/game.js
View File

@ -55,7 +55,7 @@
}; };
var lib={ var lib={
configprefix:'noname_0.9_', configprefix:'noname_0.9_',
versionOL:16, versionOL:17,
sourceURL:'https://rawgit.com/libccy/noname/$version$/', sourceURL:'https://rawgit.com/libccy/noname/$version$/',
updateURL:'https://raw.githubusercontent.com/libccy/noname/$version$/', updateURL:'https://raw.githubusercontent.com/libccy/noname/$version$/',
assetURL:'', assetURL:'',
@ -1678,9 +1678,45 @@
onclick:function(){ onclick:function(){
if(this.innerHTML!='已隐藏'){ if(this.innerHTML!='已隐藏'){
this.innerHTML='已隐藏'; this.innerHTML='已隐藏';
game.saveConfig('hiddenModePack',lib.config.all.diymode); var pack=lib.config.all.cards.slice(0);
game.saveConfig('hiddenCardPack',lib.config.all.diycard); if(Array.isArray(lib.config.hiddenCardPack)){
game.saveConfig('hiddenCharacterPack',lib.config.all.diycharacter); for(var i=0;i<lib.config.hiddenCardPack.length;i++){
pack.add(lib.config.hiddenCardPack[i]);
}
}
for(var i=0;i<pack.length;i++){
if(lib.config.all.sgscards.contains(pack[i])){
pack.splice(i--,1);
}
}
game.saveConfig('hiddenCardPack',pack);
var pack=lib.config.all.characters.slice(0);
if(Array.isArray(lib.config.hiddenCharacterPack)){
for(var i=0;i<lib.config.hiddenCharacterPack.length;i++){
pack.add(lib.config.hiddenCharacterPack[i]);
}
}
for(var i=0;i<pack.length;i++){
if(lib.config.all.sgscharacters.contains(pack[i])){
pack.splice(i--,1);
}
}
game.saveConfig('hiddenCharacterPack',pack);
var pack=lib.config.all.mode.slice(0);
if(Array.isArray(lib.config.hiddenModePack)){
for(var i=0;i<lib.config.hiddenModePack.length;i++){
pack.add(lib.config.hiddenModePack[i]);
}
}
for(var i=0;i<pack.length;i++){
if(lib.config.all.sgsmodes.contains(pack[i])){
pack.splice(i--,1);
}
}
game.saveConfig('hiddenModePack',pack);
var that=this; var that=this;
setTimeout(function(){ setTimeout(function(){
that.innerHTML='隐藏非官方扩展包'; that.innerHTML='隐藏非官方扩展包';
@ -22521,6 +22557,7 @@
mode!='mode_favourite'&&mode!='mode_banned'){ mode!='mode_favourite'&&mode!='mode_banned'){
return; return;
} }
ui.click.touchpop();
this._banning=connectMenu?'online':'offline'; this._banning=connectMenu?'online':'offline';
ui.click.intro.call(this,e); ui.click.intro.call(this,e);
_status.clicked=false; _status.clicked=false;
@ -22774,6 +22811,7 @@
if(mode.indexOf('mode_')==0&&mode.indexOf('mode_extension_')!=0&&mode!='mode_banned'){ if(mode.indexOf('mode_')==0&&mode.indexOf('mode_extension_')!=0&&mode!='mode_banned'){
return; return;
} }
ui.click.touchpop();
this._banning=connectMenu?'online':'offline'; this._banning=connectMenu?'online':'offline';
ui.click.intro.call(this,e); ui.click.intro.call(this,e);
_status.clicked=false; _status.clicked=false;
@ -22940,7 +22978,7 @@
var banned=lib.config[lib.config.all.mode[i]+'_bannedcards']; var banned=lib.config[lib.config.all.mode[i]+'_bannedcards'];
if(banned){ if(banned){
for(var j=0;j<banned.length;j++){ for(var j=0;j<banned.length;j++){
lib.cardPack.mode_banned.push(banned[j]); lib.cardPack.mode_banned.add(banned[j]);
} }
} }
} }
@ -25727,18 +25765,16 @@
delete window.noname_skin_list; delete window.noname_skin_list;
var asset_version=updates.shift(); var asset_version=updates.shift();
var skipcharacter=[],skipcard=[]; var skipcharacter=[],skipcard=['tiesuo_mark'];
if(!lib.config.asset_full){ if(!lib.config.asset_full){
for(var i=0;i<lib.config.all.characters.length;i++){ for(var i=0;i<lib.config.all.sgscharacters.length;i++){
if(lib.config.diycharacter.contains(lib.config.all.characters)[i]) continue; var pack=lib.characterPack[lib.config.all.sgscharacters[i]];
var pack=lib.characterPack[lib.config.all.characters[i]];
for(var j in pack){ for(var j in pack){
skipcharacter.add(j); skipcharacter.add(j);
} }
} }
for(var i=0;i<lib.config.all.cards.length;i++){ for(var i=0;i<lib.config.all.sgscards.length;i++){
if(lib.config.diycard.contains(lib.config.all.cards)[i]) continue; var pack=lib.cardPack[lib.config.all.sgscards[i]];
var pack=lib.cardPack[lib.config.all.cards[i]];
if(pack){ if(pack){
skipcard=skipcard.concat(pack); skipcard=skipcard.concat(pack);
} }
@ -25803,6 +25839,7 @@
var p=button2.parentNode; var p=button2.parentNode;
button2.remove(); button2.remove();
var span=document.createElement('span'); var span=document.createElement('span');
span.style.whiteSpace='nowrap';
var n1=0; var n1=0;
var n2=updates.length; var n2=updates.length;
span.innerHTML='正在下载素材（'+n1+'/'+n2+'）'; span.innerHTML='正在下载素材（'+n1+'/'+n2+'）';
@ -25823,6 +25860,16 @@
br4.remove(); br4.remove();
br5.remove(); br5.remove();
p.appendChild(span); p.appendChild(span);
var br6=ui.create.node('br');
var span7=ui.create.div('','详细信息');
span7.style.marginTop='6px';
span7.listen(function(){
clickMode.call(ui.commandnode);
});
p.appendChild(br6);
p.appendChild(span7);
var finish=function(){ var finish=function(){
if(n1==n2){ if(n1==n2){
game.saveConfig('asset_version',asset_version); game.saveConfig('asset_version',asset_version);
@ -26217,6 +26264,7 @@
(function(){ (function(){
var page=ui.create.div(''); var page=ui.create.div('');
var node=ui.create.div('.menubutton.large','命令',start.firstChild,clickMode); var node=ui.create.div('.menubutton.large','命令',start.firstChild,clickMode);
ui.commandnode=node;
node.type='cmd'; node.type='cmd';
node.link=page; node.link=page;
page.classList.add('menu-sym'); page.classList.add('menu-sym');
@ -28475,6 +28523,15 @@
}, },
}, },
click:{ click:{
touchpop:function(forced){
if(lib.config.touchscreen||forced){
_status.touchpopping=true;
clearTimeout(_status.touchpoppingtimeout);
_status.touchpoppingtimeout=setTimeout(function(){
_status.touchpopping=false;
},500);
}
},
exit:function(){ exit:function(){
if(game.servermode&&lib.config.reconnect_info&&_status.over){ if(game.servermode&&lib.config.reconnect_info&&_status.over){
if(!_status.roomtimeout){ if(!_status.roomtimeout){
@ -28527,6 +28584,7 @@
if(i==ui.favouriteCharacter.childElementCount){ if(i==ui.favouriteCharacter.childElementCount){
ui.create.button(this.link,'character',ui.favouriteCharacter).listen(function(e){ ui.create.button(this.link,'character',ui.favouriteCharacter).listen(function(e){
this._banning='offline'; this._banning='offline';
ui.click.touchpop();
ui.click.intro.call(this,e); ui.click.intro.call(this,e);
_status.clicked=false; _status.clicked=false;
delete this._banning; delete this._banning;
@ -28977,12 +29035,7 @@
if(!this._poppedfunc){ if(!this._poppedfunc){
return; return;
} }
if(lib.config.touchscreen||this.forceclick){ ui.click.touchpop(this.forceclick);
_status.touchpopping=true;
setTimeout(function(){
_status.touchpopping=false;
},500);
}
var uiintro=this._poppedfunc(); var uiintro=this._poppedfunc();
if(!uiintro) return; if(!uiintro) return;
if(ui.currentpopped&&ui.currentpopped._uiintro){ if(ui.currentpopped&&ui.currentpopped._uiintro){
@ -30221,7 +30274,7 @@
else if(this.roomgaming&&!game.onlineID){ else if(this.roomgaming&&!game.onlineID){
alert('房间不允许旁观'); alert('房间不允许旁观');
} }
else if(this.version&&this.version!=lib.versionOL){ else if(this.version!=lib.versionOL){
if(this.version>lib.versionOL){ if(this.version>lib.versionOL){
alert('加入失败：你的游戏版本过低'); alert('加入失败：你的游戏版本过低');
} }
@ -32913,6 +32966,7 @@
} }
var list=[]; var list=[];
uiintro.contentContainer.listen(function(e){ uiintro.contentContainer.listen(function(e){
ui.click.touchpop();
e.stopPropagation(); e.stopPropagation();
}); });
for(var i=0;i<modeorder.length;i++){ for(var i=0;i<modeorder.length;i++){
@ -33002,6 +33056,7 @@
} }
var list=[]; var list=[];
uiintro.contentContainer.listen(function(e){ uiintro.contentContainer.listen(function(e){
ui.click.touchpop();
e.stopPropagation(); e.stopPropagation();
}); });
for(var i=0;i<modeorder.length;i++){ for(var i=0;i<modeorder.length;i++){

3
game/package.js
View File

@ -6,15 +6,14 @@ character.pack={
sp:'SP', sp:'SP',
extra:'神将', extra:'神将',
guozhan:'国战', guozhan:'国战',
diy:'DIY',
old:'怀旧', old:'怀旧',
diy:'DIY',
yxs:'英雄杀', yxs:'英雄杀',
hearth:'炉石传说', hearth:'炉石传说',
ow:'守望先锋', ow:'守望先锋',
swd:'轩辕剑', swd:'轩辕剑',
gujian:'古剑奇谭', gujian:'古剑奇谭',
xianjian:'仙剑', xianjian:'仙剑',
// xiake:'侠客',
}; };
character.hearthpack={ character.hearthpack={
classic:'经典', classic:'经典',

8
mode/brawl.js
View File

@ -418,7 +418,13 @@ mode.brawl={
var player1,player2; var player1,player2;
if(init){ if(init){
player1=ui.create.player(null,true).init('huangyueying'); player1=ui.create.player(null,true).init('huangyueying');
player2=ui.create.player(null,true).init('re_huangyueying'); player2=ui.create.player(null,true);
if(lib.character.re_huangyueying){
player2.init('re_huangyueying');
}
else{
player2.init('huangyueying');
}
player1.style.left='20px'; player1.style.left='20px';
player1.style.top='20px'; player1.style.top='20px';
player1.style.transform='scale(0.9)'; player1.style.transform='scale(0.9)';