diff --git a/character/ow.js b/character/ow.js index 7863b8b14..625bdf377 100644 --- a/character/ow.js +++ b/character/ow.js @@ -507,7 +507,7 @@ character.ow={ } } }, - juji:{ + juji_old:{ trigger:{player:'shaBegin'}, forced:true, filter:function(event,player){ @@ -2216,7 +2216,7 @@ character.ow={ juji:'狙击', juji2:'狙击', juji3:'狙击', - juji_info:'出牌阶段限一次，你可以指定一名角色，你对该角色使用卡牌无视距离且该角色对你使用卡牌无视距离，直到该角色的下一回合结束；锁定技，攻击范围不含你的角色无法闪避你的杀', + juji_info:'出牌阶段限一次，你可以弃置任意张花色不同的牌并指定一名有手牌的其他角色，若该角色的手牌中含有与你弃置的牌花色相同的牌，则本回合内你与其距离为1且该角色不能闪避你的杀', duwen:'毒吻', duwen_info:'锁定技，当你使用杀造成伤害时，若你的手牌数与受伤害角色相等，此杀的伤害+1；若你的体力值与受伤害角色相等，此杀的伤害+1；在伤害结算后，若伤害值不小于3，你流失两点体力', zhuagou:'抓钩', diff --git a/character/sp.js b/character/sp.js index 4217623b0..3fcb39188 100755 --- a/character/sp.js +++ b/character/sp.js @@ -6261,7 +6261,7 @@ character.sp={ tianming_info:'当你成为【杀】的目标时，你可以弃置两张牌(不足则全弃，无牌则不弃)，然后摸两张牌;若此时全场体力值最多的角色仅有一名(且不是你)，该角色也可以如此做。', mizhao_info:'出牌阶段，你可以将所有手牌(至少一张)交给一名其他角色。若如此做，你令该角色与你指定的另一名有手牌的角色拼点。视为拼点赢的角色对没赢的角色使用一张【杀】。每阶段限一次。', yuanhu_info:'回合结束阶段开始时，你可以将一张装备牌置于一名角色的装备区里，然后根据此装备牌的种类执行以下效果。武器牌：弃置距离该角色1以内的一名角色区域中的一张牌；防具牌：该角色摸一张牌；坐骑牌：该角色回复1点体力。', - lihun_info:'出牌阶段，你可以弃置一张牌并将你的武将牌翻面，若如此做，制定一名男性角色，获得其所有手牌。出牌阶段结束时，你需为该角色每一点体力分配给其一张牌。每回合限一次。', + lihun_info:'出牌阶段，你可以弃置一张牌并将你的武将牌翻面，若如此做，你指定一名男性角色，获得其所有手牌。出牌阶段结束时，你需为该角色每一点体力分配给其一张牌。每回合限一次。', chongzhen_info:'每当你发动“龙胆”使用或打出一张手牌时，你可以立即获得对方的一张手牌。', bifa_info:'回合结束阶段开始时，你可以将一张手牌移出游戏并指定一名其他角色。该角色的回合开始时，其观看你移出游戏的牌并选择一项：交给你一张与此牌同类型的手牌并获得此牌；或将此牌置入弃牌堆，然后失去1点体力。', songci_info:'出牌阶段，你可以选择一项：令一名手牌数小于其体力值的角色摸两张牌；或令一名手牌数大于其体力值的角色弃置两张牌。此技能对每名角色只能使用一次。', diff --git a/font/lishu.ttf b/font/lishu.ttf new file mode 100644 index 000000000..f5c3236f4 Binary files /dev/null and b/font/lishu.ttf differ diff --git a/game/asset.js b/game/asset.js index ad5eb6821..a918048b7 100644 --- a/game/asset.js +++ b/game/asset.js @@ -1,5 +1,5 @@ window.noname_asset_list=[ - '1.8.14', + '1.8.15', 'image/background/huangtian_bg.jpg', 'image/background/shengshi_bg.jpg', 'image/background/xueji_bg.jpg', @@ -2286,6 +2286,7 @@ window.noname_asset_list=[ 'audio/skill/zuoding1.mp3', 'audio/skill/zuoding2.mp3', 'font/xiaozhuan.ttf', + 'font/lishu.ttf', 'font/huangcao.ttf', 'font/xinwei.ttf', 'theme/music/grid.png', diff --git a/game/game.js b/game/game.js index 82a398483..e3145c070 100755 --- a/game/game.js +++ b/game/game.js @@ -1062,10 +1062,10 @@ onclick:function(bool){ game.saveConfig('blur_ui',bool); if(bool){ - ui.css.blur_ui=lib.init.css(lib.assetURL+'layout/default','blur'); + ui.window.classList.add('blur_ui'); } - else if(ui.css.blur_ui){ - ui.css.blur_ui.remove(); + else{ + ui.window.classList.remove('blur_ui'); } } }, @@ -1395,7 +1395,7 @@ clear:true }, reset_database:{ - name:'重置自定义武将及录像', + name:'重置游戏录像', onclick:function(){ var node=this; if(node._clearing){ @@ -1410,7 +1410,7 @@ setTimeout(function(){ node.innerHTML='单击以确认 (1)'; setTimeout(function(){ - node.innerHTML='重置自定义武将及录像'; + node.innerHTML='重置游戏录像'; delete node._clearing; },1000); },1000); @@ -3290,10 +3290,10 @@ if(!lib.config.gameRecord){ lib.config.gameRecord={}; } - if(lib.config.debug){ - mode.pack.story='群侠'; - mode.pack.realtime='即时'; - } + // if(lib.config.debug){ + // mode.pack.story='群侠'; + // mode.pack.realtime='即时'; + // } for(i in mode.pack){ if(lib.config.hiddenModePack.indexOf(i)==-1){ lib.config.all.mode.push(i); @@ -3450,7 +3450,6 @@ } } ui.css.layout=lib.init.css(lib.assetURL+'layout/'+layout,'layout'); - if(lib.config.blur_ui) ui.css.blur_ui=lib.init.css(lib.assetURL+'layout/default','blur'); ui.css.theme=lib.init.css(lib.assetURL+'theme/'+lib.config.theme,'style'); ui.css.card_style=lib.init.css(lib.assetURL+'theme/style/card',lib.config.card_style); ui.css.cardback_style=lib.init.css(lib.assetURL+'theme/style/cardback',lib.config.cardback_style); @@ -3500,54 +3499,54 @@ db.createObjectStore('skill'); } }; - request.onsuccess=function(e){ - var db=e.target.result; - lib.db=db; - for(var i=0;i←返回',page,function(){ + page.hide(); + pageboard.show(); + }); + var newCharacter; + var toggle=ui.create.div('.config.more','创建武将
>
',page,function(){ + this.classList.toggle('on'); + if(this.classList.contains('on')){ + newCharacter.style.display=''; + } + else{ + newCharacter.style.display='none'; + } + }); + var resetEditor=function(){ + toggle.classList.remove('on'); + newCharacter.style.display='none'; + fakeme.classList.remove('inited'); + delete fakeme.image; + fakeme.style.backgroundImage=''; + var inputs=newCharacter.querySelectorAll('input'); + for(var i=0;i',newCharacter).style.paddingTop='10px'; + ui.create.div('.indent','体力：',newCharacter).style.paddingTop='10px'; + var sexes=ui.create.selectlist([ + ['male','男'], + ['female','女'], + ['none','无'], + ],null,ui.create.div('.indent','性别：',newCharacter)); + var groups=ui.create.selectlist([ + ['wei','魏'], + ['shu','蜀'], + ['wu','吴'], + ['qun','群'], + ],null,ui.create.div('.indent','势力：',newCharacter)); + var options=ui.create.div('.add_skill.options','主公BOSSAI禁选
',newCharacter); + var addSkill=ui.create.div('.add_skill','添加技能
',newCharacter); + var list=[]; + for(var i in lib.character){ + if(!lib.customCharacters.contains(i)&&lib.character[i][3].length) + list.push([i,lib.translate[i]]); + } + list.sort(function(a,b){ + a=a[0];b=b[0]; + var aa=a,bb=b; + if(aa.indexOf('_')!=-1){ + aa=aa.slice(aa.indexOf('_')+1); + } + if(bb.indexOf('_')!=-1){ + bb=bb.slice(bb.indexOf('_')+1); + } + if(aa!=bb){ + return aa>bb?1:-1; + } + return a>b?1:-1; + }); + var list2=[]; + var skills=lib.character[list[0][0]][3]; + for(var i=0;i#arena{ - filter:blur(3px); - -webkit-filter:blur(3px); -} -#arena.menupaused{ - opacity: 0.6; -} -#arena.thrownhighlight>.card.thrown:not(.thrownhighlight){ - filter:blur(2px); - -webkit-filter:blur(2px); -} diff --git a/layout/default/layout.css b/layout/default/layout.css index b31ab74f6..5e861bec3 100755 --- a/layout/default/layout.css +++ b/layout/default/layout.css @@ -43,6 +43,23 @@ table{table-layout: fixed;} #window.shortcutpaused>#arena>div:not(#timer):not(.removing):not(.hidden):not(#autonode){opacity: 0.3 !important} #window.noclick_important *{pointer-events: none !important;} #window.noclick_important .noclick_click_important div{pointer-events: auto !important} + +#window.blur_ui #arena.paused, +#window.blur_ui #arena.unfocus, +#window.blur_ui #arena.right, +#window.blur_ui #arena.menupaused, +#window.blur_ui.shortcutpaused>#arena{ + filter:blur(3px); + -webkit-filter:blur(3px); +} +#window.blur_ui #arena.menupaused{ + opacity: 0.6; +} +#window.blur_ui #arena.thrownhighlight>.card.thrown:not(.thrownhighlight){ + filter:blur(2px); + -webkit-filter:blur(2px); +} + #shortcut{ width:100%; height:100%; @@ -181,6 +198,9 @@ table{table-layout: fixed;} #arena[data-global_font='xiaozhuan']{ font-family: 'xiaozhuan'; } +#arena[data-global_font='lishu']{ + font-family: 'lishu'; +} #arena[data-global_font='xinwei']{ font-family: 'xinwei'; } @@ -188,6 +208,7 @@ table{table-layout: fixed;} font-family: 'huangcao','xinwei'; } #arena[data-global_font='xiaozhuan'] #control, +#arena[data-global_font='lishu'] #control, #arena[data-global_font='xinwei'] #control, #arena[data-global_font='huangcao'] #control{ font-family:'STHeiti','SimHei','Microsoft JhengHei','Microsoft YaHei','WenQuanYi Micro Hei',Helvetica,Arial,sans-serif @@ -775,6 +796,10 @@ margin-bottom: 5px; #arena[data-name_font='xiaozhuan'] .button.character>.name{ font-family: 'xiaozhuan'; } +#arena[data-name_font='lishu'] .player>.name, +#arena[data-name_font='lishu'] .button.character>.name{ + font-family: 'lishu'; +} #arena[data-name_font='xinwei'] .player>.name, #arena[data-name_font='xinwei'] .button.character>.name{ font-family: 'xinwei'; @@ -1354,6 +1379,9 @@ div:hover>.intro{opacity: 1;} #arena[data-identity_font='xiaozhuan'] .player .identity>div{ font-family: 'xiaozhuan'; } +#arena[data-identity_font='lishu'] .player .identity>div{ + font-family: 'lishu'; +} #arena[data-identity_font='xinwei'] .player .identity>div{ font-family: 'xinwei'; } @@ -1365,6 +1393,9 @@ div:hover>.intro{opacity: 1;} #arena[data-cardtext_font='xiaozhuan'] .card div:not(.info):not(.background){ font-family: 'xiaozhuan'; } +#arena[data-cardtext_font='lishu'] .card div:not(.info):not(.background){ + font-family: 'lishu'; +} #arena[data-cardtext_font='xinwei'] .card div:not(.info):not(.background){ font-family: 'xinwei'; } diff --git a/layout/default/menu.css b/layout/default/menu.css index 45093e5a7..92a5e48c2 100644 --- a/layout/default/menu.css +++ b/layout/default/menu.css @@ -707,3 +707,62 @@ left: 0 !important; top:0; } + +#extension-dashboard>.menubutton.large{ + width: 80px; + height: 80px; + margin: 6px; +} +#extension-dashboard>.menubutton.large>div:first-child{ + font-family: 'lishu','xiaozhuan'; + font-size: 60px; + line-height: 60px; + position: absolute; + left: 0; + top: 10px; + width: 100%; + height: 60px; +} +#extension-dashboard>.menubutton.large>div:last-child{ + font-size: 18px; + position: absolute; + left: 0; + bottom: 0; + width: 100%; +} +#create-extension{ + height: calc(100% - 5px); +} +#create-extension>div{ + position: absolute; + width: 100%; + height: 100%; + overflow: scroll; + left: 0; + top: 0; +} +#create-extension>.menu-buttons{ + left:10px; + height: calc(100% - 5px); +} +#create-extension>.menu-buttons>.config.more{ + margin-left: 0px !important; + margin-top: 10px !important; +} +#create-extension>.hidden{ + pointer-events: none; +} +#create-extension>div:not(*:first-child).hidden{ + transform: translateX(200px); +} +#create-extension>.menu-buttons>.new_character>.skill_list{ + top: 210px; +} +#create-extension>.menu-buttons>.new_character>.skill_list>div:first-child:not(*:empty){ + margin-top: 10px; + margin-bottom: 17px; +} +#create-extension>.menu-buttons>.new_character>.skill_list>div:first-child>button{ + margin-right: 3px; + margin-bottom: 3px; +}