diff --git a/character/sb.js b/character/sb.js index 2216f8ac4..3583713fd 100644 --- a/character/sb.js +++ b/character/sb.js @@ -342,6 +342,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ async content(event,trigger,player){ if (_status.connectMode) game.broadcastAll(() => { _status.noclearcountdown = true }); const given_map = {}; + event.given_map = given_map; const expansions = player.getExpansions('sbqingjian'); let result; while (true) { @@ -358,8 +359,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){ result = await player.chooseTarget(`选择一名角色获得${get.translation(toGive)}`, expansions.length === 1).set('ai', target => { const att = get.attitude(get.player(), target); if (get.event('toEnemy')) return Math.max(0.01, 100 - att); - else if (att > 0) return Math.max(0.1, att / (1 + target.countCards('h') + (get.event().getParent().given_map[target.playerid] || 0))); - else return Math.max(0.01, (100 + att) / 100); + else if (att > 0) return Math.max(0.1, att / Math.sqrt(1 + target.countCards('h') + (get.event().getParent().given_map[target.playerid] || 0))); + else return Math.max(0.01, (100 + att) / 200); }).set('toEnemy', get.value(toGive[0], player, 'raw') < 0).forResult(); if (result.bool) { expansions.removeArray(toGive); diff --git a/character/yingbian.js b/character/yingbian.js index ec35c88ca..5a88b5a82 100644 --- a/character/yingbian.js +++ b/character/yingbian.js @@ -3554,7 +3554,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ trigger:{global:'phaseJieshuBegin'}, filter:function(event,player){ return player.hasMark('xijue')&&event.player.isAlive()&&event.player!=player&&player.countCards('h',function(card){ - if(_status.connectMode) return true; + if(_status.connectMode||get.mode()!='guozhan') return true; return get.type(card)=='basic'; }); }, @@ -3567,7 +3567,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){ if(get.damageEffect(trigger.player,player,player)<=0){ nono=true; } - var next=player.chooseToDiscard('是否弃置一枚“爵”和一张基本牌，对'+get.translation(trigger.player)+'发动【骁果】？',{type:'basic'}); + var next=player.chooseToDiscard(`是否弃置一枚“爵”和一张${get.mode()=='guozhan'?'基本':'手'}牌，对${get.translation(trigger.player)}发动【骁果】？`,'h',function(card,player){ + if(get.mode()!='guozhan') return true; + return get.type(card,player)=='basic'; + }); next.set('ai',function(card){ if(_status.event.nono) return 0; return 8-get.useful(card); @@ -3799,7 +3802,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ xijue_tuxi_info:'摸牌阶段摸牌时，你可以少摸任意张牌，然后获得等量的角色的各一张手牌。', xijue_tuxi_info_guozhan:'摸牌阶段摸牌时，你可以少摸至多两张牌，然后获得等量的角色的各一张手牌。', xijue_xiaoguo:'骁果', - xijue_xiaoguo_info:'其他角色的结束阶段开始时，你可以弃置一张基本牌，令该角色选择一项：1.弃置一张装备牌，然后你摸一张牌；2.受到你对其造成的1点伤害。', + xijue_xiaoguo_info:'其他角色的结束阶段开始时，你可以弃置一张手牌，令该角色选择一项：1.弃置一张装备牌，然后你摸一张牌；2.受到你对其造成的1点伤害。', xijue_xiaoguo_info_guozhan:'其他角色的结束阶段开始时，你可以弃置一张基本牌，令该角色选择一项：1.弃置一张装备牌；2.受到你对其造成的1点伤害。', gz_duyu:'杜预', duyu:'晋杜预', diff --git a/game/asset.js b/game/asset.js index ecb8fc610..80a424b5c 100644 --- a/game/asset.js +++ b/game/asset.js @@ -1,5 +1,5 @@ window.noname_asset_list=[ - 'v1.10.8', + 'v1.10.10', /*audio start*/ 'audio/background/aozhan_chaoming.mp3', 'audio/background/aozhan_online.mp3', @@ -296,6 +296,8 @@ window.noname_asset_list=[ 'audio/die/dc_mengda.mp3', 'audio/die/dc_ruiji.mp3', 'audio/die/dc_sb_lusu.mp3', + 'audio/die/dc_sb_simayi.mp3', + 'audio/die/dc_sb_simayi_shadow.mp3', 'audio/die/dc_sb_zhouyu.mp3', 'audio/die/dc_sp_jiaxu.mp3', 'audio/die/dc_sunchen.mp3', @@ -627,6 +629,7 @@ window.noname_asset_list=[ 'audio/die/ol_sb_jiangwei.mp3', 'audio/die/ol_sb_taishici.mp3', 'audio/die/ol_sb_yuanshao.mp3', + 'audio/die/ol_sb_yuanshao_shadow.mp3', 'audio/die/ol_sp_zhugeliang.mp3', 'audio/die/ol_sunjian.mp3', 'audio/die/ol_wangrong.mp3', @@ -2103,6 +2106,14 @@ window.noname_asset_list=[ 'audio/skill/dcsbmengmou2.mp3', 'audio/skill/dcsbmingshi1.mp3', 'audio/skill/dcsbmingshi2.mp3', + 'audio/skill/dcsbpingliao_dc_sb_simayi_shadow1.mp3', + 'audio/skill/dcsbpingliao_dc_sb_simayi_shadow2.mp3', + 'audio/skill/dcsbpingliao1.mp3', + 'audio/skill/dcsbpingliao2.mp3', + 'audio/skill/dcsbquanmou_dc_sb_simayi_shadow1.mp3', + 'audio/skill/dcsbquanmou_dc_sb_simayi_shadow2.mp3', + 'audio/skill/dcsbquanmou1.mp3', + 'audio/skill/dcsbquanmou2.mp3', 'audio/skill/dcsbronghuo1.mp3', 'audio/skill/dcsbronghuo2.mp3', 'audio/skill/dcsbyingmou1.mp3', @@ -3671,17 +3682,31 @@ window.noname_asset_list=[ 'audio/skill/olsbfumeng2.mp3', 'audio/skill/olsbguidao1.mp3', 'audio/skill/olsbguidao2.mp3', + 'audio/skill/olsbhetao_ol_sb_yuanshao_shadow1.mp3', + 'audio/skill/olsbhetao_ol_sb_yuanshao_shadow2.mp3', + 'audio/skill/olsbhetao_ol_sb_yuanshao_shadow3.mp3', 'audio/skill/olsbhetao1.mp3', 'audio/skill/olsbhetao2.mp3', + 'audio/skill/olsbhetao3.mp3', 'audio/skill/olsbranji1.mp3', 'audio/skill/olsbranji2.mp3', + 'audio/skill/olsbshenli_ol_sb_yuanshao_shadow1.mp3', + 'audio/skill/olsbshenli_ol_sb_yuanshao_shadow2.mp3', + 'audio/skill/olsbshenli_ol_sb_yuanshao_shadow3.mp3', 'audio/skill/olsbshenli1.mp3', 'audio/skill/olsbshenli2.mp3', + 'audio/skill/olsbshenli3.mp3', + 'audio/skill/olsbshishou_ol_sb_yuanshao_shadow1.mp3', + 'audio/skill/olsbshishou_ol_sb_yuanshao_shadow2.mp3', + 'audio/skill/olsbshishou_ol_sb_yuanshao_shadow3.mp3', 'audio/skill/olsbshishou1.mp3', 'audio/skill/olsbshishou2.mp3', + 'audio/skill/olsbshishou3.mp3', 'audio/skill/olsbweilin1.mp3', 'audio/skill/olsbweilin2.mp3', + 'audio/skill/olsbyufeng_ol_sb_yuanshao_shadow1.mp3', 'audio/skill/olsbyufeng1.mp3', + 'audio/skill/olsbyufeng2.mp3', 'audio/skill/olsbzhuri1.mp3', 'audio/skill/olsbzhuri2.mp3', 'audio/skill/olshandao1.mp3', @@ -7250,6 +7275,7 @@ window.noname_asset_list=[ 'image/character/hhzz_shiona.jpg', 'image/character/hhzz_takaramono1.jpg', 'image/character/hhzz_takaramono2.jpg', + 'image/character/hidden_image.jpg', 'image/character/hs_aedwin.jpg', 'image/character/hs_aerfusi.jpg', 'image/character/hs_aiqinvyao.jpg', @@ -7749,6 +7775,7 @@ window.noname_asset_list=[ 'image/character/ol_caiwenji.jpg', 'image/character/ol_caozhang.jpg', 'image/character/ol_chendeng.jpg', + 'image/character/ol_chengpu.jpg', 'image/character/ol_dengai.jpg', 'image/character/ol_dengzhi.jpg', 'image/character/ol_dianwei.jpg', @@ -7787,6 +7814,7 @@ window.noname_asset_list=[ 'image/character/ol_sb_jiangwei.jpg', 'image/character/ol_sb_taishici.jpg', 'image/character/ol_sb_yuanshao.jpg', + 'image/character/ol_sb_yuanshao_shadow.jpg', 'image/character/ol_sp_zhugeliang.jpg', 'image/character/ol_sunjian.jpg', 'image/character/ol_wanglang.jpg', @@ -7802,6 +7830,7 @@ window.noname_asset_list=[ 'image/character/ol_yanwen.jpg', 'image/character/ol_yuanshao.jpg', 'image/character/ol_yuanshu.jpg', + 'image/character/ol_yufan.jpg', 'image/character/ol_yujin.jpg', 'image/character/ol_zhangchangpu.jpg', 'image/character/ol_zhangliao.jpg', diff --git a/game/source.js b/game/source.js index 36938a3b9..2d3f440a6 100644 --- a/game/source.js +++ b/game/source.js @@ -124,6 +124,7 @@ window.noname_source_list=[ 'game/asset.js', 'game/codemirror.js', + 'game/compiler-sfc.browser.js', 'game/config.js', 'game/core-js-bundle.js', 'game/directory.js', @@ -140,6 +141,7 @@ window.noname_source_list=[ 'game/server.js', 'game/source.js', 'game/update.js', + 'game/vue.esm-browser.js', 'image/card/cardtempname_bg.png', 'image/flappybird/BG.png', diff --git a/game/update.js b/game/update.js index 85f4da8fe..a7c83417e 100644 --- a/game/update.js +++ b/game/update.js @@ -2,29 +2,26 @@ window.noname_update={ version:'1.10.9', update:'1.10.8', changeLog:[ - '整合@mengxinzxz @copcap @hadeszoro @universe-st @cjk7989 @PZ157 @lieren2023 @Ansolve @Rintim @kuangshen04 @XboxSoldier 的Pull Request', - 'OL谋袁绍、郭图、刘磐、陆凯、谋关羽(初版)', - '十周年谋司马懿、曹爽、星张春华、司马师、王凌、蒋济、公孙修、胡遵、吕范、李傕郭汜、臧霸、陈武董袭', - '“转化牌花色/点数”的模糊匹配', + '整合@kuangshen04 @mengxinzxz @lieren2023 @nonameShijian @PZ157 @XboxSoldier @universe-st @copcap 的Pull Request', + 'OL界程普、界虞翻', + '手杀杨奉、谋夏侯惇、谋高顺', + '引入Vue框架和新的换肤机制', '其他AI优化与bug修复', ], files:[ - 'card/extra.js', - 'card/guozhan.js', + 'service-worker.js', + + 'card/mtg.js', 'card/standard.js', - 'character/clan.js', - 'character/collab.js', - 'character/ddd.js', 'character/diy.js', 'character/extra.js', 'character/gwent.js', 'character/huicui.js', - 'character/jsrg.js', 'character/mobile.js', 'character/offline.js', - 'character/old.js', 'character/onlyOL.js', + 'character/ow.js', 'character/rank.js', 'character/refresh.js', 'character/sb.js', @@ -36,17 +33,17 @@ window.noname_update={ 'character/swd.js', 'character/tw.js', 'character/xianding.js', - 'character/xianjian.js', 'character/xinghuoliaoyuan.js', 'character/yijiang.js', 'character/yingbian.js', + 'character/yxs.js', + 'game/compiler-sfc.browser.js', 'game/game.js', + 'game/pinyinjs.js', + 'game/vue.esm-browser.js', 'mode/boss.js', - 'mode/brawl.js', - 'mode/guozhan.js', - 'mode/identity.js', 'mode/versus.js', 'noname/game/index.js', @@ -56,17 +53,9 @@ window.noname_update={ 'noname/library/index.js', - 'noname/library/element/button.js', 'noname/library/element/content.js', - 'noname/library/element/contents.js', - 'noname/library/element/gameEvent.js', 'noname/library/element/player.js', - 'noname/library/element/vcard.js', 'noname/library/init/index.js', - - 'noname/ui/create/index.js', - - 'noname/ui/create/menu/index.js', ] };