From c0e0ce83bcc2ab236f88b4d35363ec343338b50e Mon Sep 17 00:00:00 2001 From: Spmario233 Date: Thu, 28 Sep 2023 11:25:13 +0800 Subject: [PATCH] metadata update --- character/extra.js | 2 +- character/rank.js | 14 +++- game/asset.js | 112 ++++++++++++++++++++++++++----- game/source.js | 14 ++++ game/update.js | 164 +++++++++++++++++---------------------------- 5 files changed, 183 insertions(+), 123 deletions(-) diff --git a/character/extra.js b/character/extra.js index fdc9d0e93..e6069fdc9 100755 --- a/character/extra.js +++ b/character/extra.js @@ -7371,7 +7371,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ qiexie:'挈挟', qiexie_info:'锁定技。准备阶段，你在剩余武将牌堆中随机观看五张牌，选择其中的任意张，将其按照如下规则转化为武器牌置入你的武器栏：{⒈此牌不具有花色，且其攻击范围和点数等于此武将牌的体力上限。⒉此武器牌的技能为该武将牌上所有描述中包含“【杀】”且不具有锁定技以外的标签的技能。⒊此武器牌离开你的装备区时，改为放回武将牌堆。}', cuijue:'摧决', - cuijue_info:'每回合每名角色限一次。出牌阶段，你可以弃置一张牌，并可以选择攻击范围内距离最远的一名其他角色造成1点伤害。', + cuijue_info:'每回合每名角色限一次。出牌阶段，你可以弃置一张牌，然后对攻击范围内距离最远的一名其他角色造成1点伤害（没有则不选）。', extra_feng:'神话再临·风', extra_huo:'神话再临·火', diff --git a/character/rank.js b/character/rank.js index 0b539d683..f92157492 100644 --- a/character/rank.js +++ b/character/rank.js @@ -24,7 +24,7 @@ window.noname_character_rank={ 're_liuzan', 'chunyuqiong', 'yangbiao', - 'zhaoxiang', + 'dc_zhaoxiang', 'sp_xiahoushi', 'ns_zhangwei', 'wanglang', @@ -263,6 +263,7 @@ window.noname_character_rank={ 're_zuoci', 'sunhao', 'shixie', + 'dc_shixie', 'ol_zhangchangpu', 'shamoke', 'diy_wenyang', @@ -599,6 +600,7 @@ window.noname_character_rank={ 're_caorui', 'ol_zhouqun', 'caoxi', + 'zhaoxiang', ], bp:[ 'chess_diaochan', @@ -949,6 +951,7 @@ window.noname_character_rank={ 'jsrg_zhangliao', 'jsrg_zhenji', 'junk_xuyou', + 'sp_machao', ], b:[ 'diy_feishi', @@ -1044,6 +1047,7 @@ window.noname_character_rank={ 'chendeng', 'xin_xiahoudun', 're_jikang', + 'dc_jikang', 'zhuling', 'zhaotongzhaoguang', 'simazhao', @@ -1085,7 +1089,7 @@ window.noname_character_rank={ 'yangxiu', 'sp_caiwenji', 'sp_jiangwei', - 'sp_machao', + 'dc_sp_machao', 'yanbaihu', 'jsp_huangyueying', 'zumao', @@ -1360,6 +1364,7 @@ window.noname_character_rank={ 'wutugu', 'zhugeguo', 'daxiaoqiao', + 'dc_daxiaoqiao', 'sp_pangde', 'sp_jiaxu', 'dc_sp_jiaxu', @@ -1606,6 +1611,7 @@ window.noname_character_rank={ 'xurong', 're_liuzan', 'zhaoxiang', + 'dc_zhaoxiang', 'liuyan', 'miheng', 'majun', @@ -1618,6 +1624,7 @@ window.noname_character_rank={ 'sp_xiahoushi', 'sp_pangtong', 'shixie', + 'dc_shixie', 'guohuai', 're_zuoci', 'ns_zhangwei', @@ -2094,6 +2101,7 @@ window.noname_character_rank={ 'guanyinping', 'zhangxingcai', 'xiahouba', + 'dc_xiahouba', 'sunluyu', 'zhugejin', 'liuxie', @@ -2134,6 +2142,7 @@ window.noname_character_rank={ 'zhangsong', 'caorui', 'zhongyao', + 're_zhongyao', 'liuchen', 'zhuzhi', 'gongsunyuan', @@ -2493,6 +2502,7 @@ window.noname_character_rank={ 're_caochong', 're_caorui', 'junk_xuyou', + 're_zhongyao', ], } }; diff --git a/game/asset.js b/game/asset.js index feb798234..d52c53e18 100644 --- a/game/asset.js +++ b/game/asset.js @@ -1,17 +1,19 @@ window.noname_asset_list=[ - 'v1.10.1.0.1', + 'v1.10.2', + /*audio start*/ 'audio/background/aozhan_chaoming.mp3', 'audio/background/aozhan_online.mp3', 'audio/background/aozhan_rewrite.mp3', 'audio/background/music_danji.mp3', 'audio/background/music_default.mp3', 'audio/background/music_diaochan.mp3', - 'audio/background/music_shezhan.mp3', 'audio/background/music_jifeng.mp3', - 'audio/background/music_phliosophy.mp3', 'audio/background/music_jilve.mp3', + 'audio/background/music_phliosophy.mp3', + 'audio/background/music_shezhan.mp3', + /*cardaudio start*/ 'audio/card/default.mp3', - + 'audio/card/female/caomu.mp3', 'audio/card/female/chiling.mp3', 'audio/card/female/diaohulishan.mp3', @@ -175,7 +177,9 @@ window.noname_asset_list=[ 'audio/card/male/yiyi.mp3', 'audio/card/male/yuanjiao.mp3', 'audio/card/male/zhibi.mp3', - + /*cardaudio end*/ + + /*dieaudio begin*/ 'audio/die/ahuinan.mp3', 'audio/die/baosanniang.mp3', 'audio/die/beimihu.mp3', @@ -796,6 +800,7 @@ window.noname_asset_list=[ 'audio/die/shen_caocao.mp3', 'audio/die/shen_caopi.mp3', 'audio/die/shen_dengai.mp3', + 'audio/die/shen_dianwei.mp3', 'audio/die/shen_diaochan.mp3', 'audio/die/shen_ganning.mp3', 'audio/die/shen_guanyu.mp3', @@ -1223,13 +1228,21 @@ window.noname_asset_list=[ 'audio/die/zumao.mp3', 'audio/die/zuoci.mp3', 'audio/die/zuofen.mp3', - + /*dieaudio end*/ + + /*effect audio begin*/ 'audio/effect/chicken_you_are_so_beautiful.mp3', 'audio/effect/chickun.wav', 'audio/effect/croatian_rhapsody.mp3', 'audio/effect/damage.mp3', 'audio/effect/damage_female.mp3', + 'audio/effect/damage_fire.mp3', + 'audio/effect/damage_fire2.mp3', + 'audio/effect/damage_ice.mp3', + 'audio/effect/damage_ice2.mp3', 'audio/effect/damage_male.mp3', + 'audio/effect/damage_thunder.mp3', + 'audio/effect/damage_thunder2.mp3', 'audio/effect/damage2.mp3', 'audio/effect/die_female.mp3', 'audio/effect/die_male.mp3', @@ -1241,7 +1254,18 @@ window.noname_asset_list=[ 'audio/effect/equip3.mp3', 'audio/effect/equip4.mp3', 'audio/effect/equip5.mp3', + 'audio/effect/flappybird_die.wav', + 'audio/effect/flappybird_flap.wav', + 'audio/effect/flappybird_hit.wav', + 'audio/effect/flappybird_score.wav', + 'audio/effect/flappybird_start.wav', 'audio/effect/hitsound.wav', + 'audio/effect/hujia_damage.mp3', + 'audio/effect/hujia_damage_fire.mp3', + 'audio/effect/hujia_damage_fire2.mp3', + 'audio/effect/hujia_damage_thunder.mp3', + 'audio/effect/hujia_damage_thunder2.mp3', + 'audio/effect/hujia_damage2.mp3', 'audio/effect/ignotus.mp3', 'audio/effect/judge.mp3', 'audio/effect/link.mp3', @@ -1263,7 +1287,9 @@ window.noname_asset_list=[ 'audio/effect/tie.mp3', 'audio/effect/tori_no_uta.mp3', 'audio/effect/win.mp3', + /*effect audio end*/ + /*skill audio begin*/ 'audio/skill/abyusa_dunying1.mp3', 'audio/skill/abyusa_dunying2.mp3', 'audio/skill/abyusa_jueqing1.mp3', @@ -1658,6 +1684,8 @@ window.noname_asset_list=[ 'audio/skill/cuijian2.mp3', 'audio/skill/cuijin1.mp3', 'audio/skill/cuijin2.mp3', + 'audio/skill/cuijue1.mp3', + 'audio/skill/cuijue2.mp3', 'audio/skill/cunsi1.mp3', 'audio/skill/cunsi2.mp3', 'audio/skill/cuorui1.mp3', @@ -2842,6 +2870,8 @@ window.noname_asset_list=[ 'audio/skill/jizhi2.mp3', 'audio/skill/jspdanqi1.mp3', 'audio/skill/jspdanqi2.mp3', + 'audio/skill/juanjia1.mp3', + 'audio/skill/juanjia2.mp3', 'audio/skill/jubao1.mp3', 'audio/skill/jubao2.mp3', 'audio/skill/juece_dc_liru1.mp3', @@ -3575,6 +3605,8 @@ window.noname_asset_list=[ 'audio/skill/qice2.mp3', 'audio/skill/qieting1.mp3', 'audio/skill/qieting2.mp3', + 'audio/skill/qiexie1.mp3', + 'audio/skill/qiexie2.mp3', 'audio/skill/qigong1.mp3', 'audio/skill/qigong2.mp3', 'audio/skill/qilin_skill.mp3', @@ -5845,7 +5877,9 @@ window.noname_asset_list=[ 'audio/skill/zuoxing2.mp3', 'audio/skill/zyqiao1.mp3', 'audio/skill/zyqiao2.mp3', + /*skill audio end*/ + /*voice begin*/ 'audio/voice/male/0.mp3', 'audio/voice/male/1.mp3', 'audio/voice/male/2.mp3', @@ -5892,6 +5926,8 @@ window.noname_asset_list=[ 'audio/voice/female/20.mp3', 'audio/voice/female/21.mp3', 'audio/voice/female/22.mp3', + /*voice end*/ + /*audio end*/ 'font/huangcao.woff2', 'font/shousha.woff2', @@ -5900,6 +5936,7 @@ window.noname_asset_list=[ 'font/xinwei.woff2', 'font/yuanli.woff2', + /*background image begin*/ 'image/background/beipan_bg.jpg', 'image/background/heaven_bg.jpg', 'image/background/huangtian_bg.jpg', @@ -5927,7 +5964,9 @@ window.noname_asset_list=[ 'image/background/zhanhuo_bg.jpg', 'image/background/zhanyun_bg.jpg', 'image/background/zhulin_bg.jpg', + /*background image end*/ + /*card image begin*/ 'image/card/bagua.png', 'image/card/baihupifeng.png', 'image/card/baishouzhihu.png', @@ -5943,6 +5982,7 @@ window.noname_asset_list=[ 'image/card/caochuanjiejian.png', 'image/card/caomu.png', 'image/card/caoyao.png', + 'image/card/cardtempname_bg.png', 'image/card/changandajian_equip1.png', 'image/card/charge.png', 'image/card/cheliji_feilunzhanyu.png', @@ -6004,10 +6044,14 @@ window.noname_asset_list=[ 'image/card/geanguanhuo.png', 'image/card/gongshoujianbei.png', 'image/card/gouhunluo.png', + 'image/card/group_jin.png', 'image/card/group_key.png', 'image/card/group_qun.png', + 'image/card/group_shen.png', 'image/card/group_shu.png', + 'image/card/group_unknown.png', 'image/card/group_wei.png', + 'image/card/group_western.png', 'image/card/group_wu.png', 'image/card/guaguliaodu.png', 'image/card/guangshatianyi.png', @@ -6246,6 +6290,12 @@ window.noname_asset_list=[ 'image/card/sanjian.png', 'image/card/sanlve.png', 'image/card/serafuku.png', + 'image/card/sex_double.png', + 'image/card/sex_female.png', + 'image/card/sex_male.png', + 'image/card/sex_male_castrated.png', + 'image/card/sex_none.png', + 'image/card/sex_unknown.png', 'image/card/sha.png', 'image/card/shan.png', 'image/card/shandian.png', @@ -6386,7 +6436,9 @@ window.noname_asset_list=[ 'image/card/zixin.png', 'image/card/ziyangdan.png', 'image/card/zong.png', + /*card image end*/ + /*character image begin*/ 'image/character/ahuinan.jpg', 'image/character/baiwuchang.jpg', 'image/character/baosanniang.jpg', @@ -6468,6 +6520,7 @@ window.noname_asset_list=[ 'image/character/dc_caocao.jpg', 'image/character/dc_caozhi.jpg', 'image/character/dc_chenqun.jpg', + 'image/character/dc_daxiaoqiao.jpg', 'image/character/dc_duyu.jpg', 'image/character/dc_fuwan.jpg', 'image/character/dc_ganfuren.jpg', @@ -6481,6 +6534,7 @@ window.noname_asset_list=[ 'image/character/dc_hujinding.jpg', 'image/character/dc_huojun.jpg', 'image/character/dc_jiben.jpg', + 'image/character/dc_jikang.jpg', 'image/character/dc_jiling.jpg', 'image/character/dc_jsp_guanyu.jpg', 'image/character/dc_liru.jpg', @@ -6493,7 +6547,9 @@ window.noname_asset_list=[ 'image/character/dc_mengda.jpg', 'image/character/dc_mifuren.jpg', 'image/character/dc_ruiji.jpg', + 'image/character/dc_shixie.jpg', 'image/character/dc_sp_jiaxu.jpg', + 'image/character/dc_sp_machao.jpg', 'image/character/dc_sunhanhua.jpg', 'image/character/dc_sunquan.jpg', 'image/character/dc_sunru.jpg', @@ -6502,11 +6558,13 @@ window.noname_asset_list=[ 'image/character/dc_wangchang.jpg', 'image/character/dc_wangjun.jpg', 'image/character/dc_wangyun.jpg', + 'image/character/dc_xiahouba.jpg', 'image/character/dc_xushu.jpg', 'image/character/dc_yangbiao.jpg', 'image/character/dc_yanghu.jpg', 'image/character/dc_yuejiu.jpg', 'image/character/dc_zhaotongzhaoguang.jpg', + 'image/character/dc_zhaoxiang.jpg', 'image/character/dc_zhaoyǎn.jpg', 'image/character/dc_zhouxuān.jpg', 'image/character/dc_zhuling.jpg', @@ -6990,6 +7048,7 @@ window.noname_asset_list=[ 'image/character/junk_liubei.jpg', 'image/character/junk_simayi.jpg', 'image/character/junk_sunquan.jpg', + 'image/character/junk_xuyou.jpg', 'image/character/junk_zhangrang.jpg', 'image/character/kaisa.jpg', 'image/character/kanze.jpg', @@ -7606,6 +7665,7 @@ window.noname_asset_list=[ 'image/character/re_zhaoyun.jpg', 'image/character/re_zhenji.jpg', 'image/character/re_zhonghui.jpg', + 'image/character/re_zhongyao.jpg', 'image/character/re_zhoucang.jpg', 'image/character/re_zhouyu.jpg', 'image/character/re_zhugeliang.jpg', @@ -8306,6 +8366,7 @@ window.noname_asset_list=[ 'image/character/zumao.jpg', 'image/character/zuoci.jpg', 'image/character/zuofen.jpg', + /*character image end*/ 'image/emotion/shibing_emotion/1.gif', 'image/emotion/shibing_emotion/2.gif', @@ -8927,17 +8988,34 @@ window.noname_asset_list=[ 'image/mode/versus/character/boss_yihanyunchang.jpg', 'image/mode/versus/character/liuqi.jpg', 'image/mode/versus/character/tangzi.jpg', - 'image/splash/boss.jpg', - 'image/splash/brawl.jpg', - 'image/splash/chess.jpg', - 'image/splash/connect.jpg', - 'image/splash/doudizhu.jpg', - 'image/splash/guozhan.jpg', - 'image/splash/identity.jpg', - 'image/splash/single.jpg', - 'image/splash/stone.jpg', - 'image/splash/tafang.jpg', - 'image/splash/versus.jpg', + + /*splash image begin*/ + 'image/splash/style1.jpg', + 'image/splash/style2.jpg', + 'image/splash/style1/boss.jpg', + 'image/splash/style1/brawl.jpg', + 'image/splash/style1/chess.jpg', + 'image/splash/style1/connect.jpg', + 'image/splash/style1/doudizhu.jpg', + 'image/splash/style1/guozhan.jpg', + 'image/splash/style1/identity.jpg', + 'image/splash/style1/single.jpg', + 'image/splash/style1/stone.jpg', + 'image/splash/style1/tafang.jpg', + 'image/splash/style1/versus.jpg', + 'image/splash/style2/boss.jpg', + 'image/splash/style2/brawl.jpg', + 'image/splash/style2/chess.jpg', + 'image/splash/style2/connect.jpg', + 'image/splash/style2/doudizhu.jpg', + 'image/splash/style2/guozhan.jpg', + 'image/splash/style2/identity.jpg', + 'image/splash/style2/single.jpg', + 'image/splash/style2/stone.jpg', + 'image/splash/style2/tafang.jpg', + 'image/splash/style2/versus.jpg', + /*splash image end*/ + 'theme/music/grid.png', 'theme/music/wood.png', 'theme/music/wood3.png', diff --git a/game/source.js b/game/source.js index 99f1d204c..d8c161df2 100644 --- a/game/source.js +++ b/game/source.js @@ -67,6 +67,20 @@ window.noname_source_list=[ 'game/source.js', 'game/update.js', 'image/card/cardtempname_bg.png', + 'image/flappybird/BG.png', + 'image/flappybird/botpipe.png', + 'image/flappybird/gameclear.png', + 'image/flappybird/gameover.png', + 'image/flappybird/getready.png', + 'image/flappybird/ground.png', + 'image/flappybird/toppipe.png', + 'image/flappybird/bird/b0.png', + 'image/flappybird/bird/b1.png', + 'image/flappybird/bird/b2.png', + 'image/flappybird/ground/g0.png', + 'image/flappybird/ground/g1.png', + 'image/flappybird/tap/t0.png', + 'image/flappybird/tap/t1.png', 'layout/default/codemirror.css', 'layout/default/layout.css', 'layout/default/menu.css', diff --git a/game/update.js b/game/update.js index 98fe218b8..41b39a6b8 100644 --- a/game/update.js +++ b/game/update.js @@ -1,114 +1,72 @@ window.noname_update={ - version:'1.10.1.0.1', - update:'1.10.1', + version:'1.10.2', + update:'1.10.1.0.1', changeLog:[ - '整合@rintim @mengxinzxz @Tipx-L @chen079 @lieren2023 @universe-st @nonameShijian @copcap的Pull Request', - '增加/更改一系列全新的机制写法', - '视为牌的新样式（需要手动切换）', - '伊吹风子', - 'OL彭羕、曹羲、何进、牛金、韩遂、牵招；十周年高翔', - '手杀郭照、界张嶷、谋张郃；海外张昭、张纮；怀旧神曹操', - '武将详情页显示人名/技能拼音', - '小扩表情包', - 'bug修复', + '整合@rintim @mengxinzxz @lieren2023 @PZ157 @Tipx-L @kuangshen04 @nonameShijian @copcap的Pull Request', + '新武将：界钟繇、OL陆郁生', + '技能优化：神典韦、手杀南华老仙等', + '机制更新: 属性【杀】机制完善优化等', + '界面更新: 优化自带代码编辑器；启动页增加新样式；武将资料页美化等', + '其他技能修改与bug修复', ], files:[ - //'LICENSE', 'card/extra.js', - //'card/gujian.js', - //'card/guozhan.js', - //'card/gwent.js', - //'card/hearth.js', - //'card/huanlekapai.js', - //'card/mtg.js', - //'card/sp.js', - //'card/standard.js', - //'card/swd.js', - //'card/yunchou.js', - //'card/yingbian.js', - //'card/yongjian.js', - //'card/zhenfa.js', - //'card/zhulu.js', - //'character/clan.js', - //'character/collab.js', - //'character/ddd.js', - //'character/diy.js', - //'character/extra.js', - //'character/gujian.js', - //'character/gwent.js', - //'character/hearth.js', - //'character/huicui.js', - //'character/jsrg.js', - //'character/mobile.js', - //'character/mtg.js', - //'character/offline.js', - //'character/old.js', - //'character/ow.js', - //'character/rank.js', - //'character/refresh.js', - //'character/sb.js', - //'character/shenhua.js', - //'character/shiji.js', + 'card/guozhan.js', + 'card/standard.js', + 'card/swd.js', + 'card/yingbian.js', + 'card/yongjian.js', + 'character/clan.js', + 'character/collab.js', + 'character/ddd.js', + 'character/diy.js', + 'character/extra.js', + 'character/huicui.js', + 'character/jsrg.js', + 'character/mobile.js', + 'character/offline.js', + 'character/old.js', + 'character/ow.js', + 'character/rank.js', + '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/swd.js', - //'character/xiake.js', + 'character/standard.js', + 'character/swd.js', + 'character/tw.js', 'character/xianding.js', - //'character/xianjian.js', - //'character/xinghuoliaoyuan.js', - //'character/yijiang.js', - //'character/yingbian.js', - //'character/yxs.js', - //'extension/boss/extension.js', - //'font/suits.woff2', - //'image/card/cardtempname_bg.png', - 'layout/default/layout.css', - //'layout/default/menu.css', - //'layout/long2/layout.css', - //'layout/mobile/equip.css', - //'layout/mobile/layout.css', - //'layout/newlayout/global.css', - //'layout/nova/layout.css', - //'mode/boss.js', - //'mode/brawl.js', - //'mode/chess.js', - //'mode/connect.js', - //'mode/doudizhu.js', - //'mode/guozhan.js', - 'mode/identity.js', - //'mode/single.js', - //'mode/stone.js', - //'mode/tafang.js', - //'mode/versus.js', + 'character/xianjian.js', + 'character/xinghuoliaoyuan.js', + 'character/yijiang.js', + 'character/yingbian.js', + 'character/zhuogui.js', + 'game/codemirror.js', + 'game/config.js', 'game/game.js', - //'game/keyWords.js', - //'game/NoSleep.js', - //'game/config.js', - //'game/package.js', - //'game/path.min.js', - //'game/pinyinjs.js', - //'game/asset.js', - //'game/source.js', - //'theme/simple/style.css', - //'theme/style/hp/custom.css', - //'theme/style/hp/emotion.css', - //'theme/style/hp/glass.css', - //'theme/style/hp/image', - //'theme/style/hp/official.css', - //'theme/style/hp/ol.css', - //'theme/style/hp/round.css', - //'theme/style/hp/xinglass.css', - //'theme/style/hp/xinround.css', - //'theme/style/hp/image/shield.png', - //'theme/style/hp/image/xinglass1.png', - //'theme/style/hp/image/xinglass2.png', - //'theme/style/hp/image/xinglass3.png', - //'theme/style/hp/image/xinglass4.png', - //'theme/style/hp/image/xinround1.png', - //'theme/style/hp/image/xinround2.png', - //'theme/style/hp/image/xinround3.png', - //'theme/style/hp/image/xinround4.png', + 'game/source.js', + 'game/pinyinjs.js', + 'image/flappybird/BG.png', + 'image/flappybird/botpipe.png', + 'image/flappybird/gameclear.png', + 'image/flappybird/gameover.png', + 'image/flappybird/getready.png', + 'image/flappybird/ground.png', + 'image/flappybird/toppipe.png', + 'image/flappybird/bird/b0.png', + 'image/flappybird/bird/b1.png', + 'image/flappybird/bird/b2.png', + 'image/flappybird/ground/g0.png', + 'image/flappybird/ground/g1.png', + 'image/flappybird/tap/t0.png', + 'image/flappybird/tap/t1.png', + 'layout/default/codemirror.css', + 'layout/default/layout.css', + 'layout/default/menu.css', + 'mode/boss.js', + 'mode/guozhan.js', + 'mode/versus.js', ] };