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

2

This commit is contained in:
libccy 2017-07-13 11:34:45 +08:00
parent ab47ebad77
commit 2454428ee6
4 changed files with 76 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
character/shenhua.js
View File

@ -4481,7 +4481,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
tianyi_info:'出牌阶段，你可以和一名角色拼点，若你赢，你获得以下技能直到回合结束：攻击范围无限；可额外使用一张【杀】；使用【杀】时可额外指定一个目标，若你没赢，你不能使用【杀】直到回合结束。每回合限一次。',
shuangxiong_info:'摸牌阶段，你可选择改为进行一次判定：你获得此判定牌，且于此回合的出牌阶段，你可以将任意一张与此判定牌不同颜色的手牌当【决斗】使用。',
luanji_info:'出牌阶段，你可以将任意两张相同花色的手牌当【万箭齐发】使用。',
xueyi_info:'场上每有一名其他群雄角色存活，你的手牌上限便+2。',
xueyi_info:'主公技，场上每有一名其他群雄角色存活，你的手牌上限便+2。',
mengjin_info:'当你使用的【杀】被【闪】抵消时，你可以弃掉对方的一张牌。',
xiahouyuan:'夏侯渊',

64
game/game.js
View File

@ -394,6 +394,27 @@
},
unfrequent:true,
},
max_loadtime:{
name:'最长载入时间',
intro:'设置游戏从启动到完成载入所需的最长时间，超过此时间未完成载入会报错，若设备较慢或安装了较多扩展可适当延长此时间',
init:'5000',
unfrequent:true,
item:{
5000:'5秒',
10000:'10秒',
20000:'20秒',
60000:'60秒'
},
onclick:function(item){
game.saveConfig('max_loadtime',item);
if(item=='5000'){
localStorage.removeItem(lib.configprefix+'loadtime');
}
else{
localStorage.setItem(lib.configprefix+'loadtime',item);
}
}
},
mousewheel:{
name:'滚轮控制手牌',
init:true,
@ -5360,6 +5381,9 @@
node.style.WebkitOverflowScrolling='touch';
return node;
},
setMousewheel:function(node){
if(lib.config.mousewheel) node.onmousewheel=ui.click.mousewheel;
},
setLongPress:function(node,func){
node.addEventListener('touchstart',ui.click.longpressdown);
node.addEventListener('touchend',ui.click.longpresscancel);
@ -5421,7 +5445,7 @@
},
init:{
init:function(){
window.resetGameTimeout=setTimeout(lib.init.reset,5000);
window.resetGameTimeout=setTimeout(lib.init.reset,parseInt(localStorage.getItem(lib.configprefix+'loadtime'))||5000);
if(window.cordovaLoadTimeout){
clearTimeout(window.cordovaLoadTimeout);
delete window.cordovaLoadTimeout;
@ -39211,7 +39235,7 @@
current.classList.remove('active');
}
this.classList.add('active');
intro2.innerHTML='<span style="font-weight:bold;margin-right:5px">'+get.translation(this.link)+'</span>'+lib.translate[this.link+'_info'];
intro2.innerHTML='<span style="font-weight:bold;margin-right:5px">'+get.translation(this.link)+'</span>'+get.skillInfoTranslation(this.link);
var info=get.info(this.link);
if(info.derivation){
var derivation=info.derivation;
@ -39219,7 +39243,7 @@
derivation=[derivation];
}
for(var i=0;i<derivation.length;i++){
intro2.innerHTML+='<br><br><span style="font-weight:bold;margin-right:5px">'+get.translation(derivation[i])+'</span>'+lib.translate[derivation[i]+'_info'];
intro2.innerHTML+='<br><br><span style="font-weight:bold;margin-right:5px">'+get.translation(derivation[i])+'</span>'+get.skillInfoTranslation(derivation[i]);
}
}
if(lib.config.background_speak&&e!=='init'){
@ -41475,6 +41499,18 @@
}
return get.translation(str);
},
skillInfoTranslation:function(name){
var str=lib.translate[name+'_info'];
if(!str) return '';
return str;
// return str.replace(/锁定技/g,'<span class="yellowtext">锁定技</span>').
// replace(/限定技/g,'<span class="yellowtext">限定技</span>').
// replace(/觉醒技/g,'<span class="greentext">觉醒技</span>').
// replace(/主将技/g,'<span class="bluetext">主将技</span>').
// replace(/副将技/g,'<span class="bluetext">副将技</span>').
// replace(/阵法技/g,'<span class="bluetext">阵法技</span>').
// replace(/主公技/g,'<span class="firetext">主公技</span>');
},
translation:function(str,arg){
if(str&&typeof str=='object'&&str.name){
var str2;
@ -41886,7 +41922,7 @@
var skilltrans=get.translation(skills[i]).slice(0,2);
str+='<div class="skill" style="'+opacity+
'">【'+skilltrans+'】</div><div style="'+opacity+'">'+
lib.translate[skills[i]+'_info']+'</div><div style="display:block;height:10px"></div>';
get.skillInfoTranslation(skills[i])+'</div><div style="display:block;height:10px"></div>';
}
}
return str;
@ -42058,17 +42094,17 @@
else{
forbidstr+='（双将禁用）<br>';
}
forbidstr+=lib.translate[skills[i]+'_info']+'</div></div>'
forbidstr+=get.skillInfoTranslation(skills[i])+'</div></div>'
uiintro.add(forbidstr);
}
else if(!skills2.contains(skills[i])){
uiintro.add('<div style="opacity:0.5"><div class="skill">【'+translation+'】</div><div>'+lib.translate[skills[i]+'_info']+'</div></div>');
uiintro.add('<div style="opacity:0.5"><div class="skill">【'+translation+'】</div><div>'+get.skillInfoTranslation(skills[i])+'</div></div>');
}
else if(lib.skill[skills[i]].temp||!node.skills.contains(skills[i])){
uiintro.add('<div><div class="skill thundertext thunderauto">【'+translation+'】</div><div class="thundertext thunderauto">'+lib.translate[skills[i]+'_info']+'</div></div>');
uiintro.add('<div><div class="skill thundertext thunderauto">【'+translation+'】</div><div class="thundertext thunderauto">'+get.skillInfoTranslation(skills[i])+'</div></div>');
}
else if(lib.skill[skills[i]].frequent){
uiintro.add('<div><div class="skill">【'+translation+'】</div><div>'+lib.translate[skills[i]+'_info']+'<br><div class="underlinenode on gray" style="position:relative;padding-left:0;padding-top:7px">自动发动</div></div></div>');
uiintro.add('<div><div class="skill">【'+translation+'】</div><div>'+get.skillInfoTranslation(skills[i])+'<br><div class="underlinenode on gray" style="position:relative;padding-left:0;padding-top:7px">自动发动</div></div></div>');
var underlinenode=uiintro.content.lastChild.querySelector('.underlinenode');
if(lib.config.autoskilllist.contains(skills[i])){
underlinenode.classList.remove('on');
@ -42080,7 +42116,7 @@
uiintro.add('<div><div class="skill">'+get.translation(skills[i])+'</div><div>'+lib.translate[skills[i]+'_info']+'</div></div>');
}
else{
uiintro.add('<div><div class="skill">【'+translation+'】</div><div>'+lib.translate[skills[i]+'_info']+'</div></div>');
uiintro.add('<div><div class="skill">【'+translation+'】</div><div>'+get.skillInfoTranslation(skills[i])+'</div></div>');
}
if(lib.translate[skills[i]+'_append']){
uiintro._place_text=uiintro.add('<div class="text">'+lib.translate[skills[i]+'_append']+'</div>')
@ -42193,7 +42229,8 @@
introadded=true;
uiintro.add('<div class="text center">更改皮肤</div>');
}
var buttons=ui.create.div('.buttons.smallzoom');
var buttons=ui.create.div('.buttons.smallzoom.scrollbuttons');
lib.setMousewheel(buttons);
var nameskin=(avatar2?node.name2:node.name);
if(nameskin.indexOf('gz_')==0){
nameskin=nameskin.slice(3);
@ -42584,10 +42621,10 @@
if(lib.translate[skills[i]+'_info']){
translation=get.translation(skills[i]).slice(0,2);
if(lib.skill[skills[i]]&&lib.skill[skills[i]].nobracket){
uiintro.add('<div><div class="skill">'+get.translation(skills[i])+'</div><div>'+lib.translate[skills[i]+'_info']+'</div></div>');
uiintro.add('<div><div class="skill">'+get.translation(skills[i])+'</div><div>'+get.skillInfoTranslation(skills[i])+'</div></div>');
}
else{
uiintro.add('<div><div class="skill">【'+translation+'】</div><div>'+lib.translate[skills[i]+'_info']+'</div></div>');
uiintro.add('<div><div class="skill">【'+translation+'】</div><div>'+get.skillInfoTranslation(skills[i])+'</div></div>');
}
if(lib.translate[skills[i]+'_append']){
uiintro._place_text=uiintro.add('<div class="text">'+lib.translate[skills[i]+'_append']+'</div>')
@ -42632,7 +42669,8 @@
introadded=true;
uiintro.add('<div class="text center">更改皮肤</div>');
}
var buttons=ui.create.div('.buttons.smallzoom');
var buttons=ui.create.div('.buttons.smallzoom.scrollbuttons');
lib.setMousewheel(buttons);
for(var i=0;i<=num;i++){
var button=ui.create.div('.button.character.pointerdiv',buttons,function(){
if(this._link){

14
layout/default/layout.css
View File

@ -1264,6 +1264,20 @@ div:not(.handcards)>.card>.info>span,
transform: scale(0.8);
transform-origin: top left;
}
.buttons.scrollbuttons {
white-space: nowrap;
overflow-x: scroll;
overflow-y: hidden;
width: 100%;
margin-left: 0px;
margin-right: 0px;
}
.buttons.scrollbuttons .button:first-child{
margin-left: 10px;
}
.buttons.scrollbuttons .button:last-child{
margin-right: 10px;
}
/*.buttons.smallzoom .card.button>.name,
.buttons.smallzoom .card.button>.info{
transform: scale(0.8) !important;

13
theme/woodden/style.css
View File

@ -72,16 +72,23 @@ html{
color: rgb(117,186,255);
}
.control .thundertext,.thundertext.thunderauto,
.dialog.popped .bluetext{
.dialog.popped .bluetext,
.menubg .bluetext{
color: rgba(29, 63, 137, 1);
}
.control .controlthundertext{
color: rgb(62, 41, 30);
}
.dialog.popped .yellowtext{
.dialog.popped .yellowtext,
.menubg .yellowtext{
color:#631515;
}
.dialog.popped .greentext,.control span.greentext,.poisontext.poisonauto{
.dialog.popped .firetext,
.menubg .firetext{
color:#a20000;
}
.dialog.popped .greentext,
.menubg .greentext,.control span.greentext,.poisontext.poisonauto{
color:#00312d;
}
.control span.firetext{