AALC 升级到 V1.6.1 并按零协汉化核对镜牢补丁
- vendor/aalc: e1d1749 -> 2fcb1b4(V1.6.1)。上游 8196e72 修好了商店三个清单的 路径, 删掉本地 install_shop_lists, test_shop_lists 改成守着上游 5/19/31。 - 上游 18deb77 把事件里找 "???" 改成 find_element 后自己点, 原事件表补丁挂在 click_element 上会悄悄失效。改挂 find_element, 上游拿返回位置再点的那下吞掉; 小指良单通模式再找 "???" 时返回没有, 不会改点别的选项。 - 事件表改成按同一屏其它选项的原文认事件(零协汉化的事件数据没有标题), 选项原文 照抄 LLC_zh-CN/ActionEvents_*.json 并带事件 id; 去掉 index 规则。核对后保留 6 条, 删掉汉化里对不上或说法矛盾的 4 条(两个睡袋、浸染棉花、终末日历); 失明巨人 是判定, 标 check。选项比较前去标点。 - 饰品关键词按零协汉化体系名核对, 删掉汉化里从未出现的 出血。 - 事件表、饰品排序安装时检查上游源码里还有被拦截的调用, 没有就记 [ERROR] 跳过; 包装函数带 __wrapped__, 叠装时也能查到上游源码。 - BACKLOG 记录这次升级对各补丁的影响和核对结果。 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -214,12 +214,12 @@ class UpstreamAcquireEgoGiftTest(unittest.TestCase):
|
||||
self.assertEqual(self.choose(cards)[0], self.choose(cards, patched=False)[0])
|
||||
|
||||
def test_three_cards_pick_one(self):
|
||||
cards = [card(300, '烧伤'), card(600, '震颤'), card(900, '流血伤害提高', '出血')]
|
||||
cards = [card(300, '烧伤'), card(600, '震颤'), card(900, '流血伤害提高', '施加流血')]
|
||||
self.assertEqual(self.choose(cards, patched=False)[0], [0])
|
||||
self.assertEqual(self.choose(cards)[0], [2])
|
||||
|
||||
def test_three_cards_pick_two(self):
|
||||
cards = [card(300, '烧伤'), card(600, '流血'), card(900, '流血', '出血')]
|
||||
cards = [card(300, '烧伤'), card(600, '流血'), card(900, '流血', '施加流血')]
|
||||
self.assertEqual(self.choose(cards, pick='0/2')[0], [2, 1])
|
||||
|
||||
def test_misread_keyword_for_tremor(self):
|
||||
@@ -233,9 +233,9 @@ class UpstreamAcquireEgoGiftTest(unittest.TestCase):
|
||||
|
||||
def test_duplicate_lines_on_two_cards_both_count(self):
|
||||
# {文本: 坐标} 会把两张卡上的同一句合并成一条; 补丁直接读 OCR 引擎的逐行结果
|
||||
cards = [card(300, '流血'), card(600, '流血', '出血')]
|
||||
cards = [card(300, '流血'), card(600, '流血', '施加流血')]
|
||||
self.assertEqual(self.choose(cards)[0], [1])
|
||||
self.assertIn('第1张=1(流血) 第2张=2(流血/出血)', self.log)
|
||||
self.assertIn('第1张=1(流血) 第2张=2(流血/流血)', self.log)
|
||||
|
||||
def test_decision_is_recorded_left_to_right(self):
|
||||
cards = [card(300, '烧伤层数+1'), card(600, '施加2层流血')]
|
||||
@@ -300,8 +300,11 @@ class InstallGiftPreferenceTest(unittest.TestCase):
|
||||
def test_ranking_error_keeps_upstream_order(self):
|
||||
cards = [(300, 300), (600, 300)]
|
||||
|
||||
auto = self.auto
|
||||
|
||||
def original(mirror):
|
||||
return self.auto.find_element(ap.GIFT_CARD, find_type='image_with_multiple_targets')
|
||||
return auto.find_element("mirror/road_in_mir/acquire_ego_gift_card.png",
|
||||
find_type='image_with_multiple_targets')
|
||||
|
||||
self.mirror_cls.acquire_ego_gift = original
|
||||
self.install()
|
||||
@@ -311,6 +314,18 @@ class InstallGiftPreferenceTest(unittest.TestCase):
|
||||
self.assertEqual(mirror.acquire_ego_gift(), cards)
|
||||
self.assertIn('关键词排序出错(RuntimeError: ocr down)', '\n'.join(self.lines))
|
||||
|
||||
def test_upstream_without_the_card_lookup_is_an_error(self):
|
||||
auto = self.auto
|
||||
|
||||
def original(mirror):
|
||||
return auto.find_element("mirror/road_in_mir/some_other_card.png")
|
||||
|
||||
self.mirror_cls.acquire_ego_gift = original
|
||||
self.install()
|
||||
self.assertIs(self.mirror_cls.acquire_ego_gift, original)
|
||||
self.assertIn('[ERROR] [lc_mcp] 饰品体系优先补丁跳过: 上游 Mirror.acquire_ego_gift 不再调用 find_element',
|
||||
'\n'.join(self.lines))
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
||||
Reference in New Issue
Block a user