This commit is contained in:
libccy
parent
39c57b72c6
commit
b7a5232e54
|
|
@ -52,10 +52,10 @@ window.characterRank={
|
|||
'ow_ana',
|
||||
'hs_aya',
|
||||
'hs_tyrande',
|
||||
'swd_shuwaner',
|
||||
],
|
||||
a:[
|
||||
'swd_kendi',
|
||||
'swd_shuwaner',
|
||||
'hs_enzoth',
|
||||
'hs_sapphiron',
|
||||
'gw_airuiting',
|
||||
|
|
|
|||
|
|
@ -417,10 +417,11 @@ character.swd={
|
|||
contentBefore:function(){
|
||||
player.loseHp();
|
||||
},
|
||||
alter:true,
|
||||
content:function(){
|
||||
if(targets.length==1){
|
||||
target.damage('fire',2);
|
||||
target.draw();
|
||||
if(get.is.altered('huodan')) target.draw();
|
||||
}
|
||||
else{
|
||||
target.damage('fire');
|
||||
|
|
@ -9299,7 +9300,8 @@ character.swd={
|
|||
datong:'大同',
|
||||
datong_info:'任意一名角色的结束阶段，若全场手牌数最多和最少的角色手牌数之差不超过1（人数不少于7时改为2），你摸两张牌',
|
||||
huodan:'火丹',
|
||||
huodan_info:'出牌阶段限一次，你可以弃置一张红色牌并失去一点体力，然后将两点火属性伤害分配给1~2名角色；若你只分配了一名角色，该角色在结算后摸一张牌',
|
||||
huodan_info:'出牌阶段限一次，你可以弃置一张红色牌并失去一点体力，然后将两点火属性伤害分配给1~2名角色',
|
||||
huodan_info_alter:'出牌阶段限一次，你可以弃置一张红色牌并失去一点体力，然后将两点火属性伤害分配给1~2名角色；若你只分配了一名角色，该角色在结算后摸一张牌',
|
||||
sxianjing:'陷阱',
|
||||
sxianjing_bg:'阱',
|
||||
sxianjing_info:'出牌阶段，你可以将一张手牌背面朝上置于你的武将牌上（不能与已有花色相同）。当一名其他角色使用与一张“陷阱”牌花色相同的牌指定你为目标时，你移去对应的“陷阱”牌，然后随机获得该角色的一张牌。每当你受到一次伤害，你随机将一张“陷阱”牌返回手牌',
|
||||
|
|
|
|||
110
game/game.js
110
game/game.js
|
|
@ -5219,51 +5219,7 @@
|
|||
},
|
||||
init:{
|
||||
init:function(){
|
||||
window.resetGameTimeout=setTimeout(function(){
|
||||
if(window.inSplash) return;
|
||||
if(window.resetExtension){
|
||||
if(confirm('游戏似乎未正常载入，是否禁用扩展并重新打开？')){
|
||||
window.resetExtension();
|
||||
window.location.reload();
|
||||
}
|
||||
}
|
||||
else{
|
||||
if(lib.device){
|
||||
if(navigator.notification){
|
||||
navigator.notification.confirm(
|
||||
'游戏似乎未正常载入，是否重置游戏？',
|
||||
function(index){
|
||||
if(index==2){
|
||||
localStorage.removeItem('noname_inited');
|
||||
window.location.reload();
|
||||
}
|
||||
else if(index==3){
|
||||
localStorage.clear();
|
||||
localStorage.setItem('noname_inited',true);
|
||||
if(indexedDB) indexedDB.deleteDatabase(lib.configprefix+'data');
|
||||
window.location.reload();
|
||||
}
|
||||
},
|
||||
'确认退出',
|
||||
['取消','重新下载','重置设置']
|
||||
);
|
||||
}
|
||||
else{
|
||||
if(confirm('游戏似乎未正常载入，是否重置游戏？')){
|
||||
localStorage.removeItem('noname_inited');
|
||||
window.location.reload();
|
||||
}
|
||||
}
|
||||
}
|
||||
else{
|
||||
if(confirm('游戏似乎未正常载入，是否重置游戏？')){
|
||||
localStorage.clear();
|
||||
if(indexedDB) indexedDB.deleteDatabase(lib.configprefix+'data');
|
||||
window.location.reload();
|
||||
}
|
||||
}
|
||||
}
|
||||
},5000);
|
||||
window.resetGameTimeout=setTimeout(lib.init.reset,5000);
|
||||
if(window.cordovaLoadTimeout){
|
||||
clearTimeout(window.cordovaLoadTimeout);
|
||||
delete window.cordovaLoadTimeout;
|
||||
|
|
@ -6521,6 +6477,51 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
reset:function(){
|
||||
if(window.inSplash) return;
|
||||
if(window.resetExtension){
|
||||
if(confirm('游戏似乎未正常载入，是否禁用扩展并重新打开？')){
|
||||
window.resetExtension();
|
||||
window.location.reload();
|
||||
}
|
||||
}
|
||||
else{
|
||||
if(lib.device){
|
||||
if(navigator.notification){
|
||||
navigator.notification.confirm(
|
||||
'游戏似乎未正常载入，是否重置游戏？',
|
||||
function(index){
|
||||
if(index==2){
|
||||
localStorage.removeItem('noname_inited');
|
||||
window.location.reload();
|
||||
}
|
||||
else if(index==3){
|
||||
localStorage.clear();
|
||||
localStorage.setItem('noname_inited',true);
|
||||
if(indexedDB) indexedDB.deleteDatabase(lib.configprefix+'data');
|
||||
window.location.reload();
|
||||
}
|
||||
},
|
||||
'确认退出',
|
||||
['取消','重新下载','重置设置']
|
||||
);
|
||||
}
|
||||
else{
|
||||
if(confirm('游戏似乎未正常载入，是否重置游戏？')){
|
||||
localStorage.removeItem('noname_inited');
|
||||
window.location.reload();
|
||||
}
|
||||
}
|
||||
}
|
||||
else{
|
||||
if(confirm('游戏似乎未正常载入，是否重置游戏？')){
|
||||
localStorage.clear();
|
||||
if(indexedDB) indexedDB.deleteDatabase(lib.configprefix+'data');
|
||||
window.location.reload();
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
onload:function(){
|
||||
if(navigator.userAgent.toLowerCase().indexOf('crosswalk')!=-1){
|
||||
lib.crosswalk=true;
|
||||
|
|
@ -7152,6 +7153,8 @@
|
|||
}
|
||||
if(!mode[lib.config.mode]){
|
||||
window.inSplash=true;
|
||||
clearTimeout(window.resetGameTimeout);
|
||||
delete window.resetGameTimeout;
|
||||
var clickedNode=false;
|
||||
var clickNode=function(){
|
||||
if(clickedNode) return;
|
||||
|
|
@ -7161,6 +7164,7 @@
|
|||
game.saveConfig('mode',this.link);
|
||||
splash.delete(1000);
|
||||
delete window.inSplash;
|
||||
window.resetGameTimeout=setTimeout(lib.init.reset,5000);
|
||||
|
||||
this.listenTransition(function(){
|
||||
lib.init.js(lib.assetURL+'mode',lib.config.mode,proceed);
|
||||
|
|
@ -7237,8 +7241,10 @@
|
|||
if(lib.onfree){
|
||||
clearTimeout(window.resetGameTimeout);
|
||||
delete window.resetGameTimeout;
|
||||
delete window.resetExtension;
|
||||
localStorage.removeItem(lib.configprefix+'disable_extension',true);
|
||||
if(!game.syncMenu){
|
||||
delete window.resetExtension;
|
||||
localStorage.removeItem(lib.configprefix+'disable_extension',true);
|
||||
}
|
||||
|
||||
var onfree=lib.onfree;
|
||||
delete lib.onfree;
|
||||
|
|
@ -26282,6 +26288,10 @@
|
|||
return select;
|
||||
},
|
||||
menu:function(connectMenu){
|
||||
var menuTimeout=null;
|
||||
if(!connectMenu&&!game.syncMenu){
|
||||
menuTimeout=setTimeout(lib.init.reset,1000);
|
||||
}
|
||||
var menu,menuContainer;
|
||||
var startButton;
|
||||
var popupContainer;
|
||||
|
|
@ -32714,6 +32724,12 @@
|
|||
}
|
||||
rightPane.appendChild(active.link);
|
||||
}());
|
||||
|
||||
if(menuTimeout){
|
||||
clearTimeout(menuTimeout);
|
||||
delete window.resetExtension;
|
||||
localStorage.removeItem(lib.configprefix+'disable_extension',true);
|
||||
}
|
||||
},
|
||||
table:function(){
|
||||
var str,row,col,position,position2,fixed,style,divposition;
|
||||
|
|
|
|||
|
|
@ -225,6 +225,7 @@ not(.removing):not(.dialog):not(.centermenu):not(.popup-container):not(.forceopa
|
|||
margin-right: 10px;
|
||||
position: relative;
|
||||
transition: all 0.8s;
|
||||
cursor: pointer;
|
||||
}
|
||||
#splash>div:first-child {
|
||||
margin-left: 20px;
|
||||
|
|
|
|||
Loading…
Reference in New Issue