Skip to content

Commit

Permalink
1.9.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
libccy authored and libccy committed Aug 29, 2016
1 parent f197772 commit 02e8455
Show file tree
Hide file tree
Showing 13 changed files with 96 additions and 36 deletions.
2 changes: 1 addition & 1 deletion card/standard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1365,7 +1365,7 @@ card.standard={
},player);
event.jiu=true;
}
player.chooseToUse('是否发动青龙偃月刀？',{name:'sha'},trigger.target,-1).logSkill='qinglong';
player.chooseToUse('是否发动青龙偃月刀？',{name:'sha'},trigger.target,-1).logSkill='qinglong_skill';
"step 1"
if(result.bool);
else if(event.jiu){
Expand Down
4 changes: 2 additions & 2 deletions character/hearth.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4738,8 +4738,8 @@ character.hearth={
fengxing_info:'每当你使用一张杀，你可以摸一张牌',
xinci:'心刺',
xinci_info:'出牌阶段限一次，你可以弃置一张黑色牌令一名角色流失一点体力',
zhongjia:'重甲',
zhongjia_info:'锁定技，每当你受到一次伤害，你获得一点护甲值；当你的体力值大于1时，你的护甲不为你抵挡伤害',
zhongjia:'战甲',
zhongjia_info:'锁定技，每当你受到一次伤害，你获得一点护甲；当你的体力值大于1时，你的护甲不为你抵挡伤害',
dunji:'盾击',
dunji_info:'出牌阶段，你可以失去你的所有护甲，并对等量的其他角色各造成一点伤害',
qiaodong:'巧动',
Expand Down
2 changes: 1 addition & 1 deletion character/ow.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2572,7 +2572,7 @@ character.ow={
translate:{
mengji:'猛击',
mengji_info:'锁定技，当你没有护甲时，你的杀造成的伤害+1',
lzhongjia:'重甲',
lzhongjia:'重盾',
lzhongjia_info:'游戏开始时，你获得8点护甲；出牌阶段限一次，你可以弃置一张牌并将一点护甲分给一名没有护甲的其他角色',
paotai:'炮台',
paotai2:'炮台',
Expand Down
2 changes: 1 addition & 1 deletion character/yijiang.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2012,7 +2012,7 @@ character.yijiang={
event.jiu=true;
}
player.chooseToUse('是否对'+get.translation(trigger.target)+'再使用一张杀？',
{name:'sha'},trigger.target,-1).logSkill='qinglong';
{name:'sha'},trigger.target,-1).logSkill='qinglong_skill';
"step 3"
if(result.bool);
else if(event.jiu){
Expand Down
2 changes: 1 addition & 1 deletion game/config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ window.config={
forbidchess:['hetaihou','swd_kangnalishi'],
forbidboss:['caiwenji','gjqt_aruan','pal_xuanxiao','swd_hupo'],
forbiddouble:['zhugedan','swd_kangnalishi','dongzhuo','wutugu','jg_simayi','hs_siwangzhiyi','hs_ronghejuren','hs_shanlingjuren'],
layoutfixed:['chess'],
layoutfixed:['chess','brawl'],
all:{
stockmode:['identity','guozhan','versus','boss','chess','stone','connect','brawl','tafang'],
layout:['default','newlayout'],
Expand Down
58 changes: 53 additions & 5 deletions game/game.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6527,13 +6527,15 @@
else{
event.dialog.add('选择'+get.translation(target)+'的一张牌');
}
var directh=true;
for(var i=0;i<event.position.length;i++){
if(event.position[i]=='h'&&target.num('h')){
event.dialog.add('手牌');
var hs=target.get('h');
hs.randomSort();
if(event.visible||target.isUnderControl(true)){
event.dialog.add(hs);
directh=false;
}
else{
event.dialog.add([hs,'blank']);
Expand All @@ -6542,24 +6544,37 @@
else if(event.position[i]=='e'&&target.num('e')){
event.dialog.add('装备牌');
event.dialog.add(target.get('e'));
directh=false;
}
else if(event.position[i]=='j'&&target.num('j')){
event.dialog.add('判定牌');
event.dialog.add(target.get('j'));
directh=false;
}
}
if(event.dialog.buttons.length==0){
event.finish();
return;
}
var cs=target.get(event.position||'h');
if(event.forced&&get.select(event.selectButton)[0]>=cs.length){
var select=get.select(event.selectButton);
if(event.forced&&select[0]>=cs.length){
event.result={
bool:true,
buttons:event.dialog.buttons,
links:cs
}
}
else if(event.forced&&directh&&select[0]==select[1]){
event.result={
bool:true,
buttons:event.dialog.buttons.randomGets(select[0]),
links:[]
}
for(var i=0;i<event.result.buttons.length;i++){
event.result.links[i]=event.result.buttons[i].link;
}
}
else{
if(event.isMine()){
event.dialog.open();
Expand Down Expand Up @@ -6602,13 +6617,15 @@
if(event.prompt){
event.dialog.add(event.prompt);
}
var directh=true;
for(var i=0;i<event.position.length;i++){
if(event.position[i]=='h'&&target.num('h')){
event.dialog.add('手牌');
var hs=target.get('h');
hs.randomSort();
if(event.visible||target.isUnderControl(true)){
event.dialog.add(hs);
directh=false;
}
else{
event.dialog.add([hs,'blank']);
Expand All @@ -6617,24 +6634,37 @@
else if(event.position[i]=='e'&&target.num('e')){
event.dialog.add('装备牌');
event.dialog.add(target.get('e'));
directh=false;
}
else if(event.position[i]=='j'&&target.num('j')){
event.dialog.add('判定牌');
event.dialog.add(target.get('j'));
directh=false;
}
}
if(event.dialog.buttons.length==0){
event.finish();
return;
}
var cs=target.get(event.position||'h');
if(event.forced&&get.select(event.selectButton)[0]>=cs.length){
var select=get.select(event.selectButton);
if(event.forced&&select[0]>=cs.length){
event.result={
bool:true,
buttons:event.dialog.buttons,
links:cs
}
}
else if(event.forced&&directh&&select[0]==select[1]){
event.result={
bool:true,
buttons:event.dialog.buttons.randomGets(select[0]),
links:[]
}
for(var i=0;i<event.result.buttons.length;i++){
event.result.links[i]=event.result.buttons[i].link;
}
}
else{
if(event.isMine()){
event.dialog.open();
Expand Down Expand Up @@ -6693,13 +6723,15 @@
if(event.prompt){
event.dialog.add(event.prompt);
}
var directh=true;
for(var i=0;i<event.position.length;i++){
if(event.position[i]=='h'&&target.num('h')){
event.dialog.add('手牌');
var hs=target.get('h');
hs.randomSort();
if(event.visible||target.isUnderControl(true)){
event.dialog.add(hs);
directh=false;
}
else{
event.dialog.add([hs,'blank']);
Expand All @@ -6708,10 +6740,12 @@
else if(event.position[i]=='e'&&target.num('e')){
event.dialog.add('装备牌');
event.dialog.add(target.get('e'));
directh=false;
}
else if(event.position[i]=='j'&&target.num('j')){
event.dialog.add('判定牌');
event.dialog.add(target.get('j'));
directh=false;
}
}
if(event.dialog.buttons.length==0){
Expand All @@ -6720,13 +6754,24 @@
return;
}
var cs=target.get(event.position||'h');
if(event.forced&&get.select(event.selectButton)[0]>=cs.length){
var select=get.select(event.selectButton);
if(event.forced&&select[0]>=cs.length){
event.result={
bool:true,
buttons:event.dialog.buttons,
links:cs
}
}
else if(event.forced&&directh&&select[0]==select[1]){
event.result={
bool:true,
buttons:event.dialog.buttons.randomGets(select[0]),
links:[]
}
for(var i=0;i<event.result.buttons.length;i++){
event.result.links[i]=event.result.buttons[i].link;
}
}
else{
if(event.isMine()){
event.dialog.open();
Expand Down Expand Up @@ -10362,7 +10407,7 @@
if(logv===true){
game.logv(this,name,targets,null,true);
}
else if(info.logv!==false){
else if(info&&info.logv!==false){
game.logv(this,name,targets);
}
},
Expand Down Expand Up @@ -18981,6 +19026,9 @@
});
},
switchMode:function(name,configx){
if(lib.config.layout=='default'&&lib.config.layoutfixed.contains(lib.config.mode)&&!lib.config.layoutfixed.contains(name)){
lib.init.layout('default');
}
window.mode={};
var script=lib.init.js(lib.assetURL+'mode',name,function(){
script.remove();
Expand Down Expand Up @@ -30326,7 +30374,7 @@
}
}
else{
if(!ui.dialog.buttons||!ui.dialog.buttons.length){
if((!ui.dialog.buttons||!ui.dialog.buttons.length)&&ui.dialog.classList.contains('fullheight')==false){
ui.dialog.classList.add('nobutton');
if(ui.dialog.content.offsetHeight<240){
if(!ui.dialog._heightset){
Expand Down
17 changes: 12 additions & 5 deletions game/update.js
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
window.noname_update={
version:'1.9.0',
version:'1.9.0.1',
changeLog:[
'增加乱斗模式',
'显示时间选项',
'历史记录栏',
'更新源调整',
'bug修复',
],
files:{
global:[
'game/game.js',
'game/config.js',
'card/standard.js',
'character/hearth.js',
'character/ow.js',
'character/yijiang.js',
'mode/brawl.js',
'layout/mode/chess.css',
'layout/default/layout.css',
'layout/mobile/layout.css',
],
'1.9.0':[]
}
}
10 changes: 5 additions & 5 deletions layout/default/layout.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,11 +296,11 @@ table{table-layout: fixed;}
#arena[data-font_size='20']{
font-size:20px;
}*/
#arena{width:90%;height: 90%;top: calc(5% + 10px);left: 5%;}
#arena{width:94%;height: 90%;top: calc(5% + 10px);left: 3%;}
#arena.right:not(.noleft){left:240px;opacity: 0.6;}
#arena.left:not(.noleft){left:calc(10% - 240px);opacity: 0.6;}
#window.leftbar #arena:not(.chess){left:calc(5% + 50px);width: calc(90% - 50px)}
#window.rightbar #arena:not(.chess){width: calc(90% - 50px)}
#window.leftbar #arena:not(.chess){left: calc(3% + 50px);width: calc(94% - 50px);}
#window.rightbar #arena:not(.chess){width: calc(94% - 50px);}
#arena.top{top:-100%;}
#arena.paused,#arena.unfocus,#historybar.paused{opacity: 0.3 !important;}
#arena.paused2{opacity: 0.1 !important;}
Expand Down Expand Up @@ -329,7 +329,7 @@ table{table-layout: fixed;}
opacity: 0.3 !important;
}
#historybar{
left: 2.5%;
left: 1.5%;
width: 50px;
height: calc(90% - 20px);
top: calc(5% + 25px);
Expand Down Expand Up @@ -403,7 +403,7 @@ table{table-layout: fixed;}
}
#window.rightbar #historybar,
#window.rightbar2:not(.leftbar) #historybar{
left: calc(97.5% - 50px);
left: calc(98.5% - 50px);
}
#window.leftbar #historybar,
#window.rightbar #historybar{
Expand Down
26 changes: 12 additions & 14 deletions layout/mobile/layout.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,11 @@
@import "equip.css";

#arena{
width: 94%;
height: calc(95% + 20px);
left: 3%;
}
#window.leftbar #arena:not(.chess){
left: calc(3% + 50px);
width: calc(94% - 50px);
}
#window.rightbar #arena:not(.chess){
width: calc(94% - 50px);
}
#historybar{
left: 1.5%;
height: calc(95% - 160px);
}
#window.rightbar #historybar,
#window.rightbar2:not(.leftbar) #historybar{
left: calc(98.5% - 50px);
}
#control{
width: calc(5000% / 47 - 240px);
left:calc(-150% / 47 + 120px);
Expand All @@ -44,20 +30,32 @@
border-radius:0 !important;
height:120px;
}
#arena:not(.chess)>#autonode{
width: calc(5000% / 47 - 240px);
left:calc(-150% / 47 + 120px);
}
#window.leftbar #arena:not(.chess)>#me,
#window.leftbar #arena:not(.chess)>#mebg,
#window.leftbar #arena:not(.chess)>#autonode,
#window.leftbar #arena:not(.chess) .player[data-position='0']{
width: calc(5000% / 47 + 2500px / 47);
left:calc(-150% / 47 - 50px - 75px / 47);
}
#window.leftbar #arena:not(.chess)>#autonode{
width: calc(5000% / 47 + 2500px / 47 - 240px);
left:calc(-150% / 47 - 50px - 75px / 47 + 120px);
}
#window.rightbar #arena:not(.chess)>#me,
#window.rightbar #arena:not(.chess)>#mebg,
#window.rightbar #arena:not(.chess)>#autonode,
#window.rightbar #arena:not(.chess) .player[data-position='0']{
width: calc(5000% / 47 + 2500px / 47);
left:calc(-150% / 47 - 75px / 47);
}
#window.rightbar #arena:not(.chess)>#autonode{
width: calc(5000% / 47 + 2500px / 47 - 240px);
left:calc(-150% / 47 - 75px / 47 + 120px);
}
#arena:not(.chess) #handcards1{
height:120px;
padding:0;
Expand Down
4 changes: 4 additions & 0 deletions layout/mode/chess.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
top:auto;
border-radius:0;
}
#arena.chess>#autonode{
width: calc(100% - 240px);
left: 120px;
}
#me>.fakeme.avatar {
width: 120px;
height: 120px;
Expand Down
3 changes: 2 additions & 1 deletion mode/brawl.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ mode.brawl={
if(!lib.storage.scene){
lib.storage.scene={};
}
var dialog=ui.create.dialog();
var dialog=ui.create.dialog('hidden');
dialog.classList.add('fixed');
dialog.classList.add('scroll1');
dialog.classList.add('scroll2');
Expand All @@ -16,6 +16,7 @@ mode.brawl={
dialog.style.overflow='hidden';
dialog.content.style.height='100%';
dialog.contentContainer.style.transition='all 0s';
dialog.open();
var packnode=ui.create.div('.packnode',dialog);
lib.setScroll(packnode);
var clickCapt=function(){
Expand Down
1 change: 1 addition & 0 deletions theme/style/card/default.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/*default*/
1 change: 1 addition & 0 deletions theme/style/cardback/default.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/*default*/

0 comments on commit 02e8455

Please sign in to comment.