diff --git a/ArknightsGameData b/ArknightsGameData index d66b7826..3067d342 160000 --- a/ArknightsGameData +++ b/ArknightsGameData @@ -1 +1 @@ -Subproject commit d66b7826a1765d7203d021f43989aaad2ccee8f3 +Subproject commit 3067d34211501f7bbf618e51139056dda1613c23 diff --git a/ArknightsGameResource b/ArknightsGameResource index 9c5c1d79..1542242a 160000 --- a/ArknightsGameResource +++ b/ArknightsGameResource @@ -1 +1 @@ -Subproject commit 9c5c1d79716b05715cf70a5a2ff082496ba8a85a +Subproject commit 1542242a77b7bf4e647d5780103a8ac7e7f4107c diff --git a/mower/data/key_mapping.json b/mower/data/key_mapping.json index a037cfea..1d35f851 100644 --- a/mower/data/key_mapping.json +++ b/mower/data/key_mapping.json @@ -55,13 +55,6 @@ "NORMAL", 10008 ], - "LMTGS_COIN_5801": [ - "LMTGS_COIN_5801", - "LMTGS_COIN_5801", - "寻访数据契约", - "NORMAL", - 10026 - ], "EPGS_COIN": [ "EPGS_COIN", "EPGS_COIN", @@ -258,13 +251,6 @@ "NORMAL", 40001 ], - "LIMITED_TKT_GACHA_10_5801": [ - "LIMITED_TKT_GACHA_10_5801", - "LIMITED_TKT_GACHA_10_5801", - "欢宴良宵寻访凭证", - "NORMAL", - 40003 - ], "7003": [ "7003", "TKT_GACHA", diff --git a/mower/static/CONSUME.pkl b/mower/static/CONSUME.pkl index 0a27bdb1..bf5f01f8 100644 --- a/mower/static/CONSUME.pkl +++ b/mower/static/CONSUME.pkl @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86659c2d36900484f14d3a542c0cdf6a27b60026ac95e7c1e4373083dd5b3893 -size 4984876 +oid sha256:7a83eee750ed9a0d2a8ac351ce69cdcb852f3922af9e7d8fe3dc8f82771b709c +size 4983720 diff --git a/mower/static/MATERIAL.pkl b/mower/static/MATERIAL.pkl index 8fd89bdf..d2f2e4bd 100644 --- a/mower/static/MATERIAL.pkl +++ b/mower/static/MATERIAL.pkl @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1244f8d59e0d291de6fc7a08d729e50911d2e2c43eba6ca02f10cefc39647714 -size 36632132 +oid sha256:7e49a724fc8c52a0039b4f46e5660903f662fb04215a4428d45cfbcdcf11574a +size 36427380 diff --git a/mower/static/NORMAL.pkl b/mower/static/NORMAL.pkl index f085b828..cefa1294 100644 --- a/mower/static/NORMAL.pkl +++ b/mower/static/NORMAL.pkl @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa08f912efb963e664b2e373ee5c2dd3a2d74af2e2578177996c48d31618c2ac -size 2726788 +oid sha256:2eed086f9175315473766096d186b081afc228d4d0b7b0e8b348f4d852bbefb9 +size 2547996 diff --git a/mower/static/avatar.pkl b/mower/static/avatar.pkl index 5fbdb6df..c93a5493 100644 --- a/mower/static/avatar.pkl +++ b/mower/static/avatar.pkl @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:599ec08c19d62950b58f75ec8fab07ac0bc9f4a9fe83d527b5016bcddb4d8655 -size 19318372 +oid sha256:8e2160ece17a27961c87d5790e142a8e083711c8309555150b6c67bed701d001 +size 19379836 diff --git a/mower/static/levels.pkl b/mower/static/levels.pkl index d1ff1aef..b8a02f07 100644 --- a/mower/static/levels.pkl +++ b/mower/static/levels.pkl @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4867b3cb7bcdd221a4707abff0f260770bc3028eed4dee34a5df6639c7bd21a2 -size 142444 +oid sha256:a0c09cbed4e7550c3bc706c4b4995b74bf343a59e4cf9f1be18b1b08281a427c +size 143068 diff --git a/mower/static/operator_room.model b/mower/static/operator_room.model index 2301680e..16ddde4d 100644 --- a/mower/static/operator_room.model +++ b/mower/static/operator_room.model @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f25d084ee600a78d60ef76aa7bb5f53321060f777a74797062739334ce6a7160 -size 80288 +oid sha256:483b462e4522fa43e566e7c49a448d08a7ed11ac994cc6cce248a54c8b218fed +size 80104 diff --git a/mower/static/portrait.pkl b/mower/static/portrait.pkl index 29996488..6a01862e 100644 --- a/mower/static/portrait.pkl +++ b/mower/static/portrait.pkl @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb053f2477388c90f0e34ececa691fb4e7c2838103df0ec34af1c96c0db809a4 -size 12683236 +oid sha256:7ef367b956728ce9aebf3d3997c5ec6534b4b702dc95381a9e77606d43fcf847 +size 12737076 diff --git a/mower/static/recruit.pkl b/mower/static/recruit.pkl index 9e19ac2a..4f5a5c28 100644 --- a/mower/static/recruit.pkl +++ b/mower/static/recruit.pkl @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18281ae8504809f13687c643ee7c462ef5118bde6e6c06630aab44efad7680ae -size 21516 +oid sha256:dd773f2a2df03145ad563f1a9df8d48671c4684d6f90bc851b5b8f36baebe45b +size 21600 diff --git a/mower/static/recruit_result.pkl b/mower/static/recruit_result.pkl index d8883bc0..01b9272b 100644 --- a/mower/static/recruit_result.pkl +++ b/mower/static/recruit_result.pkl @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a9b23e0e9a294440f7bde50bf59a2dc380d6a60f420e44a88910d838309ee2a -size 127560 +oid sha256:6a1d479d5776e3623437257657e680ffcb5a89876391314c9f6857ac86a97073 +size 127172 diff --git a/ui/src/pages/basement_skill/skill.json b/ui/src/pages/basement_skill/skill.json index 529d13e6..438490a3 100644 --- a/ui/src/pages/basement_skill/skill.json +++ b/ui/src/pages/basement_skill/skill.json @@ -3661,7 +3661,7 @@ "cc_bd_b1", "cc_g_sui" ], - "des": "进驻控制中枢时,自身心情每小时消耗<@cc.vdown>+0.5;每个<$cc.g.sui><@cc.kw>岁干员进驻在宿舍以外的设施则<$cc.bd_b1><@cc.rem>人间烟火<@cc.vup>+5(最多5名)", + "des": "进驻控制中枢时,自身心情每小时消耗<@cc.vdown>+0.5;每个<$cc.g.sui><@cc.kw>岁干员进驻在宿舍和活动室以外的设施则<$cc.bd_b1><@cc.rem>人间烟火<@cc.vup>+5(最多5名)", "roomType": "中枢", "buffCategory": "FUNCTION", "skillIcon": "bskill_ctrl_cost_bd3", @@ -4350,7 +4350,7 @@ "buffer_des": [ "cc_bd_malist" ], - "des": "进驻制造站时,基建内每间设施每级<@cc.vup>+1个<@cc.kw><$cc.bd_malist>工程机器人,上限<@cc.vup>64个", + "des": "进驻制造站时,基建内除活动室外每间设施每级<@cc.vup>+1个<@cc.kw><$cc.bd_malist>工程机器人,上限<@cc.vup>64个", "roomType": "制造站", "buffCategory": "OUTPUT", "skillIcon": "bskill_man_constrLv",