From 23153ec00a1c8d7e133f01102279ebce5e86a74f Mon Sep 17 00:00:00 2001 From: Spmario233 Date: Thu, 8 Feb 2024 15:23:03 +0800 Subject: [PATCH] v1.10.7.1 metadata --- .gitignore | 2 + game/asset.js | 70 ++++++++++++++++++++++++++++++- game/source.js | 1 + game/update.js | 41 ++++++++++++++---- noname/library/element/content.js | 2 - noname/library/index.js | 13 ++++-- 6 files changed, 115 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 966499c9c..cf3bd6cc2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +audio/*.TXT +image/*.TXT !extension/boss !extension/cardpile !extension/coin diff --git a/game/asset.js b/game/asset.js index fcd92fa0b..f28592485 100644 --- a/game/asset.js +++ b/game/asset.js @@ -1,5 +1,5 @@ window.noname_asset_list=[ - 'v1.10.7', + 'v1.10.7.1', /*audio start*/ 'audio/background/aozhan_chaoming.mp3', 'audio/background/aozhan_online.mp3', @@ -312,6 +312,7 @@ window.noname_asset_list=[ 'audio/die/dc_zhangmancheng.mp3', 'audio/die/dc_zhaotongzhaoguang.mp3', 'audio/die/dc_zhaoyǎn.mp3', + 'audio/die/dc_zhaoyun.mp3', 'audio/die/dc_zhouxuān.mp3', 'audio/die/dc_zhuling.mp3', 'audio/die/dengai.mp3', @@ -616,6 +617,7 @@ window.noname_asset_list=[ 'audio/die/ol_huangzhong.mp3', 'audio/die/ol_huaxin.mp3', 'audio/die/ol_huban.mp3', + 'audio/die/ol_hujinding.mp3', 'audio/die/ol_jiangwei.mp3', 'audio/die/ol_lisu.mp3', 'audio/die/ol_liuba.mp3', @@ -627,7 +629,9 @@ window.noname_asset_list=[ 'audio/die/ol_pangtong.mp3', 'audio/die/ol_puyuan.mp3', 'audio/die/ol_qianzhao.mp3', + 'audio/die/ol_sb_guanyu.mp3', 'audio/die/ol_sb_jiangwei.mp3', + 'audio/die/ol_sb_taishici.mp3', 'audio/die/ol_sp_zhugeliang.mp3', 'audio/die/ol_sunjian.mp3', 'audio/die/ol_wangrong.mp3', @@ -846,6 +850,7 @@ window.noname_asset_list=[ 'audio/die/sb_xiahoushi.mp3', 'audio/die/sb_xiaoqiao.mp3', 'audio/die/sb_xuhuang.mp3', + 'audio/die/sb_xunyu.mp3', 'audio/die/sb_yl_luzhi.mp3', 'audio/die/sb_yuanshao.mp3', 'audio/die/sb_yujin.mp3', @@ -869,6 +874,7 @@ window.noname_asset_list=[ 'audio/die/shen_huatuo.mp3', 'audio/die/shen_jiangwei.mp3', 'audio/die/shen_liubei.mp3', + 'audio/die/shen_lusu.mp3', 'audio/die/shen_luxun.mp3', 'audio/die/shen_lvbu.mp3', 'audio/die/shen_lvbu1.mp3', @@ -960,6 +966,7 @@ window.noname_asset_list=[ 'audio/die/st_yuanshu.mp3', 'audio/die/star_caoren.mp3', 'audio/die/star_dongzhuo.mp3', + 'audio/die/star_yuanshao.mp3', 'audio/die/star_yuanshu.mp3', 'audio/die/sufei.mp3', 'audio/die/sunce.mp3', @@ -993,6 +1000,7 @@ window.noname_asset_list=[ 'audio/die/tengfanglan.mp3', 'audio/die/tenggongzhu.mp3', 'audio/die/tengyin.mp3', + 'audio/die/tianchou.mp3', 'audio/die/tianfeng.mp3', 'audio/die/tianshangyi.mp3', 'audio/die/tianyu.mp3', @@ -1217,6 +1225,7 @@ window.noname_asset_list=[ 'audio/die/yuantanyuanshang.mp3', 'audio/die/yuantanyuanxiyuanshang.mp3', 'audio/die/yue_caiwenji.mp3', + 'audio/die/yue_daqiao.mp3', 'audio/die/yue_xiaoqiao.mp3', 'audio/die/yue_zhoufei.mp3', 'audio/die/yuechen.mp3', @@ -1947,6 +1956,8 @@ window.noname_asset_list=[ 'audio/skill/dcjizhong2.mp3', 'audio/skill/dcjue1.mp3', 'audio/skill/dcjue2.mp3', + 'audio/skill/dcjuejing1.mp3', + 'audio/skill/dcjuejing2.mp3', 'audio/skill/dcjuying1.mp3', 'audio/skill/dcjuying2.mp3', 'audio/skill/dckaiji1.mp3', @@ -1981,6 +1992,8 @@ window.noname_asset_list=[ 'audio/skill/dcliying2.mp3', 'audio/skill/dclonggong1.mp3', 'audio/skill/dclonggong2.mp3', + 'audio/skill/dclonghun1.mp3', + 'audio/skill/dclonghun2.mp3', 'audio/skill/dclongsong1.mp3', 'audio/skill/dclongsong2.mp3', 'audio/skill/dcluochong1.mp3', @@ -2053,6 +2066,8 @@ window.noname_asset_list=[ 'audio/skill/dcqinshen2.mp3', 'audio/skill/dcqiongying1.mp3', 'audio/skill/dcqiongying2.mp3', + 'audio/skill/dcqiqin_yue_daqiao1.mp3', + 'audio/skill/dcqiqin_yue_daqiao2.mp3', 'audio/skill/dcqiqin1.mp3', 'audio/skill/dcqiqin2.mp3', 'audio/skill/dcquanjian1.mp3', @@ -2257,6 +2272,8 @@ window.noname_asset_list=[ 'audio/skill/dczigu1.mp3', 'audio/skill/dczigu2.mp3', 'audio/skill/dczimu1.mp3', + 'audio/skill/dczixi1.mp3', + 'audio/skill/dczixi2.mp3', 'audio/skill/dczuojian1.mp3', 'audio/skill/dczuojian2.mp3', 'audio/skill/dczuowei1.mp3', @@ -2316,6 +2333,8 @@ window.noname_asset_list=[ 'audio/skill/dingpan2.mp3', 'audio/skill/dingpin1.mp3', 'audio/skill/dingpin2.mp3', + 'audio/skill/dingzhou1.mp3', + 'audio/skill/dingzhou2.mp3', 'audio/skill/disordersidi1.mp3', 'audio/skill/disordersidi2.mp3', 'audio/skill/donggui1.mp3', @@ -3072,6 +3091,10 @@ window.noname_asset_list=[ 'audio/skill/juesi2.mp3', 'audio/skill/juetao1.mp3', 'audio/skill/juetao2.mp3', + 'audio/skill/juexiang_he1.mp3', + 'audio/skill/juexiang_ji1.mp3', + 'audio/skill/juexiang_lie1.mp3', + 'audio/skill/juexiang_rou1.mp3', 'audio/skill/juexiang1.mp3', 'audio/skill/juexiang2.mp3', 'audio/skill/jueyong1.mp3', @@ -3539,6 +3562,8 @@ window.noname_asset_list=[ 'audio/skill/olchenglie2.mp3', 'audio/skill/olchenshuo1.mp3', 'audio/skill/olchenshuo2.mp3', + 'audio/skill/olchongshen1.mp3', + 'audio/skill/olchongshen2.mp3', 'audio/skill/olchuanwu1.mp3', 'audio/skill/olchuanwu2.mp3', 'audio/skill/olchuming1.mp3', @@ -3651,16 +3676,32 @@ window.noname_asset_list=[ 'audio/skill/olqiejian2.mp3', 'audio/skill/olqingyi1.mp3', 'audio/skill/olqingyi2.mp3', + 'audio/skill/olqingyuan1.mp3', + 'audio/skill/olqingyuan2.mp3', 'audio/skill/olqisi1.mp3', 'audio/skill/olqisi2.mp3', 'audio/skill/olruoyu1.mp3', 'audio/skill/olruoyu2.mp3', 'audio/skill/olsaogu1.mp3', 'audio/skill/olsaogu2.mp3', + 'audio/skill/olsbdouchan1.mp3', + 'audio/skill/olsbdouchan2.mp3', + 'audio/skill/olsbdulie1.mp3', + 'audio/skill/olsbdulie2.mp3', + 'audio/skill/olsbduoshou1.mp3', + 'audio/skill/olsbduoshou2.mp3', + 'audio/skill/olsbfumeng1.mp3', + 'audio/skill/olsbfumeng2.mp3', + 'audio/skill/olsbguidao1.mp3', + 'audio/skill/olsbguidao2.mp3', 'audio/skill/olsbranji1.mp3', 'audio/skill/olsbranji2.mp3', + 'audio/skill/olsbweilin1.mp3', + 'audio/skill/olsbweilin2.mp3', 'audio/skill/olsbzhuri1.mp3', 'audio/skill/olsbzhuri2.mp3', + 'audio/skill/olshandao1.mp3', + 'audio/skill/olshandao2.mp3', 'audio/skill/olshengong1.mp3', 'audio/skill/olshengong2.mp3', 'audio/skill/olshilu1.mp3', @@ -4365,6 +4406,8 @@ window.noname_asset_list=[ 'audio/skill/sbjiang2.mp3', 'audio/skill/sbjianxiong1.mp3', 'audio/skill/sbjianxiong2.mp3', + 'audio/skill/sbjieming1.mp3', + 'audio/skill/sbjieming2.mp3', 'audio/skill/sbjiewei1.mp3', 'audio/skill/sbjiewei2.mp3', 'audio/skill/sbjieyin1.mp3', @@ -4431,6 +4474,8 @@ window.noname_asset_list=[ 'audio/skill/sbqingzheng2.mp3', 'audio/skill/sbqixi1.mp3', 'audio/skill/sbqixi2.mp3', + 'audio/skill/sbquhu1.mp3', + 'audio/skill/sbquhu2.mp3', 'audio/skill/sbrende1.mp3', 'audio/skill/sbrende2.mp3', 'audio/skill/sbrende3.mp3', @@ -4813,10 +4858,14 @@ window.noname_asset_list=[ 'audio/skill/spzhuilie2.mp3', 'audio/skill/spzundi1.mp3', 'audio/skill/spzundi2.mp3', + 'audio/skill/staraoshi1.mp3', + 'audio/skill/staraoshi2.mp3', 'audio/skill/starcanxi1.mp3', 'audio/skill/starcanxi2.mp3', 'audio/skill/starhaoshou1.mp3', 'audio/skill/starhaoshou2.mp3', + 'audio/skill/starjiaowang1.mp3', + 'audio/skill/starjiaowang2.mp3', 'audio/skill/starlifeng1.mp3', 'audio/skill/starlifeng2.mp3', 'audio/skill/starpizhi1.mp3', @@ -4825,10 +4874,14 @@ window.noname_asset_list=[ 'audio/skill/starsujun2.mp3', 'audio/skill/starweilin1.mp3', 'audio/skill/starweilin2.mp3', + 'audio/skill/starxiaoyan1.mp3', + 'audio/skill/starxiaoyan2.mp3', 'audio/skill/starzhangrong1.mp3', 'audio/skill/starzhangrong2.mp3', 'audio/skill/starzhonggu1.mp3', 'audio/skill/starzhonggu2.mp3', + 'audio/skill/starzongshi1.mp3', + 'audio/skill/starzongshi2.mp3', 'audio/skill/stianyi1.mp3', 'audio/skill/stianyi2.mp3', 'audio/skill/suishi1.mp3', @@ -4847,6 +4900,8 @@ window.noname_asset_list=[ 'audio/skill/syxiongyi2.mp3', 'audio/skill/tairan1.mp3', 'audio/skill/tairan2.mp3', + 'audio/skill/tamo1.mp3', + 'audio/skill/tamo2.mp3', 'audio/skill/taoluan1.mp3', 'audio/skill/taoluan2.mp3', 'audio/skill/taomie1.mp3', @@ -6060,6 +6115,8 @@ window.noname_asset_list=[ 'audio/skill/zhiman_re_masu2.mp3', 'audio/skill/zhiman1.mp3', 'audio/skill/zhiman2.mp3', + 'audio/skill/zhimeng1.mp3', + 'audio/skill/zhimeng2.mp3', 'audio/skill/zhiming1.mp3', 'audio/skill/zhiming2.mp3', 'audio/skill/zhiren1.mp3', @@ -6873,6 +6930,7 @@ window.noname_asset_list=[ 'image/character/dc_jikang.jpg', 'image/character/dc_jiling.jpg', 'image/character/dc_jsp_guanyu.jpg', + 'image/character/dc_kongrong.jpg', 'image/character/dc_liru.jpg', 'image/character/dc_liuba.jpg', 'image/character/dc_liubei.jpg', @@ -6909,6 +6967,7 @@ window.noname_asset_list=[ 'image/character/dc_zhaotongzhaoguang.jpg', 'image/character/dc_zhaoxiang.jpg', 'image/character/dc_zhaoyǎn.jpg', + 'image/character/dc_zhaoyun.jpg', 'image/character/dc_zhouxuān.jpg', 'image/character/dc_zhuling.jpg', 'image/character/ddd_baosanniang.jpg', @@ -7696,11 +7755,13 @@ window.noname_asset_list=[ 'image/character/ol_dongzhuo.jpg', 'image/character/ol_feiyi.jpg', 'image/character/ol_furong.jpg', + 'image/character/ol_gaoshun.jpg', 'image/character/ol_guohuai.jpg', 'image/character/ol_huangzhong.jpg', 'image/character/ol_huaxin.jpg', 'image/character/ol_huaxiong.jpg', 'image/character/ol_huban.jpg', + 'image/character/ol_hujinding.jpg', 'image/character/ol_jiangwei.jpg', 'image/character/ol_jianyong.jpg', 'image/character/ol_lingtong.jpg', @@ -7720,6 +7781,7 @@ window.noname_asset_list=[ 'image/character/ol_qianzhao.jpg', 'image/character/ol_sb_guanyu.jpg', 'image/character/ol_sb_jiangwei.jpg', + 'image/character/ol_sb_taishici.jpg', 'image/character/ol_sp_zhugeliang.jpg', 'image/character/ol_sunjian.jpg', 'image/character/ol_wanglang.jpg', @@ -7920,6 +7982,7 @@ window.noname_asset_list=[ 'image/character/re_caocao.jpg', 'image/character/re_caochong.jpg', 'image/character/re_caopi.jpg', + 'image/character/re_caorui.jpg', 'image/character/re_caoxiu.jpg', 'image/character/re_caozhang.jpg', 'image/character/re_caozhen.jpg', @@ -8249,6 +8312,7 @@ window.noname_asset_list=[ 'image/character/sp_zongyu.jpg', 'image/character/star_caoren.jpg', 'image/character/star_dongzhuo.jpg', + 'image/character/star_yuanshao.jpg', 'image/character/star_yuanshu.jpg', 'image/character/std_panfeng.jpg', 'image/character/sunce.jpg', @@ -8367,6 +8431,7 @@ window.noname_asset_list=[ 'image/character/tengfanglan.jpg', 'image/character/tenggongzhu.jpg', 'image/character/tengyin.jpg', + 'image/character/tianchou.jpg', 'image/character/tianfeng.jpg', 'image/character/tianshangyi.jpg', 'image/character/tianyu.jpg', @@ -8616,6 +8681,7 @@ window.noname_asset_list=[ 'image/character/yanpu.jpg', 'image/character/yanrou.jpg', 'image/character/yanwen.jpg', + 'image/character/yanxiang.jpg', 'image/character/yanyan.jpg', 'image/character/yeshiwen.jpg', 'image/character/yinfuren.jpg', @@ -8647,6 +8713,7 @@ window.noname_asset_list=[ 'image/character/yuantanyuanshang.jpg', 'image/character/yuantanyuanxiyuanshang.jpg', 'image/character/yue_caiwenji.jpg', + 'image/character/yue_daqiao.jpg', 'image/character/yue_xiaoqiao.jpg', 'image/character/yue_zhoufei.jpg', 'image/character/yuechen.jpg', @@ -8770,6 +8837,7 @@ window.noname_asset_list=[ 'image/character/zhugejin.jpg', 'image/character/zhugeke.jpg', 'image/character/zhugeliang.jpg', + 'image/character/zhugemengxue.jpg', 'image/character/zhugeruoxue.jpg', 'image/character/zhugeshang.jpg', 'image/character/zhugezhan.jpg', diff --git a/game/source.js b/game/source.js index 00f621b5e..238aa4e7f 100644 --- a/game/source.js +++ b/game/source.js @@ -1,6 +1,7 @@ window.noname_source_list=[ 'LICENSE', 'noname.js', + 'service-worker.js', 'noname/ai/basic.js', 'noname/ai/index.js', diff --git a/game/update.js b/game/update.js index 79ada6b59..ea9cf8ef0 100644 --- a/game/update.js +++ b/game/update.js @@ -1,15 +1,19 @@ window.noname_update={ - version:'1.10.7', - update:'1.10.6.2', + version:'1.10.7.1', + update:'1.10.7', changeLog:[ - '整合@PZ157 @nonameShijian @universe-st @mengxinzxz @copcap @Tipx-L 的Pull Request', + '整合@PZ157 @nonameShijian @copcap @mengxinzxz @lieren2023 @kuangshen04 @universe-st 的Pull Request', 'OL族吴乔、谋关羽；手杀谋荀彧；海外服侠关羽、石韬、史阿、玉真子', '其他AI优化与bug修复', ], files:[ + 'card/guozhan.js', 'card/standard.js', + 'card/yongjian.js', 'character/clan.js', + 'character/collab.js', + 'character/ddd.js', 'character/diy.js', 'character/extra.js', 'character/gujian.js', @@ -24,35 +28,56 @@ window.noname_update={ 'character/refresh.js', 'character/sb.js', 'character/shenhua.js', + 'character/shiji.js', 'character/sp.js', 'character/sp2.js', 'character/standard.js', 'character/tw.js', 'character/xianding.js', + 'character/xinghuoliaoyuan.js', 'character/yijiang.js', + 'character/yingbian.js', + 'game/entry.js', + 'game/game.js', + 'game/pinyinjs.js', + + 'mode/doudizhu.js', 'mode/guozhan.js', + 'mode/identity.js', + 'mode/versus.js', 'noname/ai/basic.js', 'noname/game/index.js', + 'noname/game/promises.js', 'noname/get/index.js', + 'noname/init/import.js', + 'noname/init/index.js', + 'noname/init/polyfill.js', + 'noname/library/index.js', - 'noname/library/update-urls.js', 'noname/library/cache/cacheContext.js', - 'noname/library/cache/childNodesWatcher.js', - - 'noname/library/crypt/md5.js', + 'noname/library/element/button.js', 'noname/library/element/card.js', 'noname/library/element/content.js', + 'noname/library/element/contents.js', + 'noname/library/element/control.js', + 'noname/library/element/dialog.js', + 'noname/library/element/gameEvent.js', 'noname/library/element/gameEventPromise.js', 'noname/library/element/player.js', - 'noname/library/element/vcard.js', + + 'noname/library/init/index.js', 'noname/ui/index.js', + + 'noname/util/index.js', + + 'service-worker.js', ] }; diff --git a/noname/library/element/content.js b/noname/library/element/content.js index aeb871633..b21ba1395 100644 --- a/noname/library/element/content.js +++ b/noname/library/element/content.js @@ -1043,7 +1043,6 @@ export const Content = { }, chooseUseTarget: function () { 'step 0'; - debugger if (get.is.object(card) && event.viewAs === false) card.isCard = true; if (cards && get.itemtype(card) != 'card') { card = get.copy(card); @@ -8119,7 +8118,6 @@ export const Content = { }, addJudge: function () { "step 0"; - debugger const cardName = typeof card == 'string' ? card : card.name , cardInfo = lib.card[cardName]; if (cards) { var owner = get.owner(cards[0]); diff --git a/noname/library/index.js b/noname/library/index.js index e1398899a..048559b4f 100644 --- a/noname/library/index.js +++ b/noname/library/index.js @@ -9400,7 +9400,14 @@ export class Library extends Uninstantable { charge: '蓄力值', expandedSlots: '扩展装备栏', stratagem_fury: '怒气', - _stratagem_add_buff: '强化' + _stratagem_add_buff: '强化', + + phaseZhunbei: '准备阶段', + phaseJudge: '判定阶段', + phaseDraw: '摸牌阶段', + phaseUse: '出牌阶段', + phaseDiscard: '弃牌阶段', + phaseJieshu: '结束阶段', }; static experimental = Experimental @@ -13164,8 +13171,8 @@ export class Library extends Uninstantable { ignore: () => void 0 }; static InitFilter = { - 'noZhuHp': '做主公不增加体力上限', - 'noZhuSkill': '做主公不获得飞扬跋扈', + 'noZhuHp': '不享受主公的额外体力上限', + 'noZhuSkill': '不享受地主的额外技能', }; }