diff --git a/kotonebot-resource/sprites/jp/daily/daily_shop_items_2.png.json b/kotonebot-resource/sprites/jp/daily/daily_shop_items_2.png.json index 83ec2fc..30b0164 100644 --- a/kotonebot-resource/sprites/jp/daily/daily_shop_items_2.png.json +++ b/kotonebot-resource/sprites/jp/daily/daily_shop_items_2.png.json @@ -1 +1 @@ -{"definitions":{"9340b854-025c-40da-9387-385d38433bef":{"name":"Shop.ItemAnomalyNoteVisual","displayName":"アノマリーノート（ビジュアル）非凡笔记（形象）","type":"template","annotationId":"9340b854-025c-40da-9387-385d38433bef","useHintRect":false},"ea1ba124-9cb3-4427-969a-bacd47e7d920":{"name":"Shop.ItemRechallengeTicket","displayName":"再挑戦チケット 重新挑战券","type":"template","annotationId":"ea1ba124-9cb3-4427-969a-bacd47e7d920","useHintRect":false},"1926f2f9-4bd7-48eb-9eba-28ec4efb0606":{"name":"Shop.ItemRecordKey","displayName":"記録の鍵 解锁交流的物品","type":"template","annotationId":"1926f2f9-4bd7-48eb-9eba-28ec4efb0606","useHintRect":false},"6720b6e8-ae80-4cc0-a885-518efe12b707":{"name":"Shop.IdolPiece.倉本千奈_WonderScale","displayName":"倉本千奈 WonderScale 碎片","type":"template","annotationId":"6720b6e8-ae80-4cc0-a885-518efe12b707","useHintRect":false},"afa06fdc-a345-4384-b25d-b16540830256":{"name":"Shop.IdolPiece.篠泽广_光景","displayName":"篠泽广 光景 碎片","type":"template","annotationId":"afa06fdc-a345-4384-b25d-b16540830256","useHintRect":false},"278b7d9c-707e-4392-9677-74574b5cdf42":{"name":"Shop.IdolPiece.紫云清夏_TameLieOneStep","displayName":"紫云清夏 Tame-Lie-One-Step 碎片","type":"template","annotationId":"278b7d9c-707e-4392-9677-74574b5cdf42","useHintRect":false},"e9ee330d-dfca-440e-8b8c-0a3b4e8c8730":{"name":"Daily.IconTitleDailyShop","displayName":"日常商店标题图标","type":"template","annotationId":"e9ee330d-dfca-440e-8b8c-0a3b4e8c8730","useHintRect":false}},"annotations":[{"id":"9340b854-025c-40da-9387-385d38433bef","type":"rect","data":{"x1":72,"y1":611,"x2":138,"y2":693}},{"id":"ea1ba124-9cb3-4427-969a-bacd47e7d920","type":"rect","data":{"x1":227,"y1":639,"x2":316,"y2":674}},{"id":"1926f2f9-4bd7-48eb-9eba-28ec4efb0606","type":"rect","data":{"x1":385,"y1":591,"x2":508,"y2":694}},{"id":"6720b6e8-ae80-4cc0-a885-518efe12b707","type":"rect","data":{"x1":589,"y1":633,"x2":638,"y2":678}},{"id":"afa06fdc-a345-4384-b25d-b16540830256","type":"rect","data":{"x1":83,"y1":867,"x2":134,"y2":912}},{"id":"278b7d9c-707e-4392-9677-74574b5cdf42","type":"rect","data":{"x1":247,"y1":864,"x2":301,"y2":907}},{"id":"e9ee330d-dfca-440e-8b8c-0a3b4e8c8730","type":"rect","data":{"x1":17,"y1":35,"x2":59,"y2":76}}]} \ No newline at end of file +{"definitions":{"9340b854-025c-40da-9387-385d38433bef":{"name":"Shop.ItemAnomalyNoteVisual","displayName":"アノマリーノート（ビジュアル）非凡笔记（形象）","type":"template","annotationId":"9340b854-025c-40da-9387-385d38433bef","useHintRect":false},"ea1ba124-9cb3-4427-969a-bacd47e7d920":{"name":"Shop.ItemRechallengeTicket","displayName":"再挑戦チケット 重新挑战券","type":"template","annotationId":"ea1ba124-9cb3-4427-969a-bacd47e7d920","useHintRect":false},"1926f2f9-4bd7-48eb-9eba-28ec4efb0606":{"name":"Shop.ItemRecordKey","displayName":"記録の鍵 解锁交流的物品","type":"template","annotationId":"1926f2f9-4bd7-48eb-9eba-28ec4efb0606","useHintRect":false},"e9ee330d-dfca-440e-8b8c-0a3b4e8c8730":{"name":"Daily.IconTitleDailyShop","displayName":"日常商店标题图标","type":"template","annotationId":"e9ee330d-dfca-440e-8b8c-0a3b4e8c8730","useHintRect":false}},"annotations":[{"id":"9340b854-025c-40da-9387-385d38433bef","type":"rect","data":{"x1":72,"y1":611,"x2":138,"y2":693}},{"id":"ea1ba124-9cb3-4427-969a-bacd47e7d920","type":"rect","data":{"x1":227,"y1":639,"x2":316,"y2":674}},{"id":"1926f2f9-4bd7-48eb-9eba-28ec4efb0606","type":"rect","data":{"x1":385,"y1":591,"x2":508,"y2":694}},{"id":"e9ee330d-dfca-440e-8b8c-0a3b4e8c8730","type":"rect","data":{"x1":17,"y1":35,"x2":59,"y2":76}}]} \ No newline at end of file diff --git a/kotonebot-resource/sprites/jp/daily/daily_shop_items_3.png b/kotonebot-resource/sprites/jp/daily/daily_shop_items_3.png deleted file mode 100644 index 831df28..0000000 Binary files a/kotonebot-resource/sprites/jp/daily/daily_shop_items_3.png and /dev/null differ diff --git a/kotonebot-resource/sprites/jp/daily/daily_shop_items_3.png.json b/kotonebot-resource/sprites/jp/daily/daily_shop_items_3.png.json deleted file mode 100644 index a9a3b14..0000000 --- a/kotonebot-resource/sprites/jp/daily/daily_shop_items_3.png.json +++ /dev/null @@ -1 +0,0 @@ -{"definitions":{"74ff07b3-d91c-4579-80cd-379ed7020622":{"name":"Shop.IdolPiece.葛城リーリヤ_白線","displayName":"葛城リーリヤ 白線 碎片","type":"template","annotationId":"74ff07b3-d91c-4579-80cd-379ed7020622","useHintRect":false}},"annotations":[{"id":"74ff07b3-d91c-4579-80cd-379ed7020622","type":"rect","data":{"x1":101,"y1":630,"x2":135,"y2":664}}]} \ No newline at end of file diff --git a/kotonebot-resource/sprites/jp/daily/daily_shop_items_4.png b/kotonebot-resource/sprites/jp/daily/daily_shop_items_4.png deleted file mode 100644 index b21c23e..0000000 Binary files a/kotonebot-resource/sprites/jp/daily/daily_shop_items_4.png and /dev/null differ diff --git a/kotonebot-resource/sprites/jp/daily/daily_shop_items_4.png.json b/kotonebot-resource/sprites/jp/daily/daily_shop_items_4.png.json deleted file mode 100644 index def7f55..0000000 --- a/kotonebot-resource/sprites/jp/daily/daily_shop_items_4.png.json +++ /dev/null @@ -1 +0,0 @@ -{"definitions":{"a7f5abf1-982f-4a55-8d41-3ad6f56798e0":{"name":"Shop.IdolPiece.姫崎薪波_cIclumsy_trick ","displayName":"姫崎薪波 cIclumsy trick 碎片","type":"template","annotationId":"a7f5abf1-982f-4a55-8d41-3ad6f56798e0","useHintRect":false}},"annotations":[{"id":"a7f5abf1-982f-4a55-8d41-3ad6f56798e0","type":"rect","data":{"x1":113,"y1":628,"x2":148,"y2":656}}]} \ No newline at end of file diff --git a/kotonebot-resource/sprites/jp/daily/daily_shop_items_5.png b/kotonebot-resource/sprites/jp/daily/daily_shop_items_5.png deleted file mode 100644 index 5d39fc7..0000000 Binary files a/kotonebot-resource/sprites/jp/daily/daily_shop_items_5.png and /dev/null differ diff --git a/kotonebot-resource/sprites/jp/daily/daily_shop_items_5.png.json b/kotonebot-resource/sprites/jp/daily/daily_shop_items_5.png.json deleted file mode 100644 index 67edd48..0000000 --- a/kotonebot-resource/sprites/jp/daily/daily_shop_items_5.png.json +++ /dev/null @@ -1 +0,0 @@ -{"definitions":{"2bc00520-0afe-40e5-8743-d33fc6b2945a":{"name":"Shop.IdolPiece.花海咲季_FightingMyWay","displayName":"花海咲季 FightingMyWay 碎片","type":"template","annotationId":"2bc00520-0afe-40e5-8743-d33fc6b2945a","useHintRect":false}},"annotations":[{"id":"2bc00520-0afe-40e5-8743-d33fc6b2945a","type":"rect","data":{"x1":112,"y1":601,"x2":148,"y2":640}}]} \ No newline at end of file diff --git a/kotonebot-resource/sprites/jp/daily/daily_shop_items_6.png b/kotonebot-resource/sprites/jp/daily/daily_shop_items_6.png deleted file mode 100644 index f7f0946..0000000 Binary files a/kotonebot-resource/sprites/jp/daily/daily_shop_items_6.png and /dev/null differ diff --git a/kotonebot-resource/sprites/jp/daily/daily_shop_items_6.png.json b/kotonebot-resource/sprites/jp/daily/daily_shop_items_6.png.json deleted file mode 100644 index 820184a..0000000 --- a/kotonebot-resource/sprites/jp/daily/daily_shop_items_6.png.json +++ /dev/null @@ -1 +0,0 @@ -{"definitions":{"135ee57a-d30d-4ba8-83f0-9f1681a49ff7":{"name":"Shop.IdolPiece.藤田ことね_世界一可愛い私","displayName":"藤田ことね 世界一可愛い私 碎片","type":"template","annotationId":"135ee57a-d30d-4ba8-83f0-9f1681a49ff7","useHintRect":false}},"annotations":[{"id":"135ee57a-d30d-4ba8-83f0-9f1681a49ff7","type":"rect","data":{"x1":113,"y1":602,"x2":146,"y2":635}}]} \ No newline at end of file diff --git a/kotonebot-resource/sprites/jp/daily/daily_shop_items_7.png b/kotonebot-resource/sprites/jp/daily/daily_shop_items_7.png deleted file mode 100644 index f5528d2..0000000 Binary files a/kotonebot-resource/sprites/jp/daily/daily_shop_items_7.png and /dev/null differ diff --git a/kotonebot-resource/sprites/jp/daily/daily_shop_items_7.png.json b/kotonebot-resource/sprites/jp/daily/daily_shop_items_7.png.json deleted file mode 100644 index 149d54a..0000000 --- a/kotonebot-resource/sprites/jp/daily/daily_shop_items_7.png.json +++ /dev/null @@ -1 +0,0 @@ -{"definitions":{"d15959bf-d07b-4f07-948a-c0aeaf17756a":{"name":"Shop.IdolPiece.花海佑芽_TheRollingRiceball","displayName":"花海佑芽 The Rolling Riceball 碎片","type":"template","annotationId":"d15959bf-d07b-4f07-948a-c0aeaf17756a","useHintRect":false}},"annotations":[{"id":"d15959bf-d07b-4f07-948a-c0aeaf17756a","type":"rect","data":{"x1":103,"y1":605,"x2":137,"y2":635}}]} \ No newline at end of file diff --git a/kotonebot-resource/sprites/jp/daily/daily_shop_items_8.png b/kotonebot-resource/sprites/jp/daily/daily_shop_items_8.png deleted file mode 100644 index ce12157..0000000 Binary files a/kotonebot-resource/sprites/jp/daily/daily_shop_items_8.png and /dev/null differ diff --git a/kotonebot-resource/sprites/jp/daily/daily_shop_items_8.png.json b/kotonebot-resource/sprites/jp/daily/daily_shop_items_8.png.json deleted file mode 100644 index 45c899e..0000000 --- a/kotonebot-resource/sprites/jp/daily/daily_shop_items_8.png.json +++ /dev/null @@ -1 +0,0 @@ -{"definitions":{"868b97a9-492e-4712-b47f-82b97495b019":{"name":"Shop.IdolPiece.月村手毬_LunaSayMaybe","displayName":"月村手毬 Luna say maybe 碎片","type":"template","annotationId":"868b97a9-492e-4712-b47f-82b97495b019","useHintRect":false}},"annotations":[{"id":"868b97a9-492e-4712-b47f-82b97495b019","type":"rect","data":{"x1":106,"y1":601,"x2":145,"y2":633}}]} \ No newline at end of file diff --git a/kotonebot-resource/sprites/jp/daily/screenshot_idol_pieces_0.png b/kotonebot-resource/sprites/jp/daily/screenshot_idol_pieces_0.png new file mode 100644 index 0000000..e568d57 Binary files /dev/null and b/kotonebot-resource/sprites/jp/daily/screenshot_idol_pieces_0.png differ diff --git a/kotonebot-resource/sprites/jp/daily/screenshot_idol_pieces_0.png.json b/kotonebot-resource/sprites/jp/daily/screenshot_idol_pieces_0.png.json new file mode 100644 index 0000000..31562b0 --- /dev/null +++ b/kotonebot-resource/sprites/jp/daily/screenshot_idol_pieces_0.png.json @@ -0,0 +1 @@ +{"definitions":{"3942ae40-7f22-412c-aebe-4b064f68db9b":{"name":"Shop.IdolPiece.花海咲季_FightingMyWay","displayName":"","type":"template","annotationId":"3942ae40-7f22-412c-aebe-4b064f68db9b","useHintRect":false},"185f7838-92a7-460b-9340-f60858948ce9":{"name":"Shop.IdolPiece.月村手毬_LunaSayMaybe","displayName":"","type":"template","annotationId":"185f7838-92a7-460b-9340-f60858948ce9","useHintRect":false},"cb3d0ca7-8d14-408a-a2f5-2e25f7b86d6c":{"name":"Shop.IdolPiece.藤田ことね_世界一可愛い私 ","displayName":"","type":"template","annotationId":"cb3d0ca7-8d14-408a-a2f5-2e25f7b86d6c","useHintRect":false},"213016c2-c3a2-43d8-86a3-ab4d27666ced":{"name":"Shop.IdolPiece.花海佑芽_TheRollingRiceball","displayName":"","type":"template","annotationId":"213016c2-c3a2-43d8-86a3-ab4d27666ced","useHintRect":false},"cc60b509-2ed5-493d-bb9f-333c6d2a6006":{"name":"Shop.IdolPiece.葛城リーリヤ_白線","displayName":"","type":"template","annotationId":"cc60b509-2ed5-493d-bb9f-333c6d2a6006","useHintRect":false},"5031808b-5525-4118-92b4-317ec8bda985":{"name":"Shop.IdolPiece.紫云清夏_TameLieOneStep","displayName":"","type":"template","annotationId":"5031808b-5525-4118-92b4-317ec8bda985","useHintRect":false},"ae9fe233-9acc-4e96-ba8e-1fb1d9bc2ea5":{"name":"Shop.IdolPiece.篠泽广_光景","displayName":"","type":"template","annotationId":"ae9fe233-9acc-4e96-ba8e-1fb1d9bc2ea5","useHintRect":false},"8f8b7b46-53bb-42ab-907a-4ea87eb09ab4":{"name":"Shop.IdolPiece.倉本千奈_WonderScale","displayName":"","type":"template","annotationId":"8f8b7b46-53bb-42ab-907a-4ea87eb09ab4","useHintRect":false},"0d9ac648-eefa-4869-ac99-1b0c83649681":{"name":"Shop.IdolPiece.有村麻央_Fluorite","displayName":"","type":"template","annotationId":"0d9ac648-eefa-4869-ac99-1b0c83649681","useHintRect":false}},"annotations":[{"id":"3942ae40-7f22-412c-aebe-4b064f68db9b","type":"rect","data":{"x1":409,"y1":342,"x2":477,"y2":413}},{"id":"185f7838-92a7-460b-9340-f60858948ce9","type":"rect","data":{"x1":71,"y1":512,"x2":140,"y2":585}},{"id":"cb3d0ca7-8d14-408a-a2f5-2e25f7b86d6c","type":"rect","data":{"x1":410,"y1":513,"x2":475,"y2":581}},{"id":"213016c2-c3a2-43d8-86a3-ab4d27666ced","type":"rect","data":{"x1":585,"y1":858,"x2":640,"y2":913}},{"id":"cc60b509-2ed5-493d-bb9f-333c6d2a6006","type":"rect","data":{"x1":247,"y1":690,"x2":303,"y2":743}},{"id":"5031808b-5525-4118-92b4-317ec8bda985","type":"rect","data":{"x1":80,"y1":860,"x2":133,"y2":908}},{"id":"ae9fe233-9acc-4e96-ba8e-1fb1d9bc2ea5","type":"rect","data":{"x1":418,"y1":852,"x2":471,"y2":912}},{"id":"8f8b7b46-53bb-42ab-907a-4ea87eb09ab4","type":"rect","data":{"x1":589,"y1":679,"x2":639,"y2":742}},{"id":"0d9ac648-eefa-4869-ac99-1b0c83649681","type":"rect","data":{"x1":83,"y1":690,"x2":136,"y2":744}}]} \ No newline at end of file diff --git a/kotonebot-resource/sprites/jp/daily/screenshot_idol_pieces_1.png b/kotonebot-resource/sprites/jp/daily/screenshot_idol_pieces_1.png new file mode 100644 index 0000000..bbe3041 Binary files /dev/null and b/kotonebot-resource/sprites/jp/daily/screenshot_idol_pieces_1.png differ diff --git a/kotonebot-resource/sprites/jp/daily/screenshot_idol_pieces_1.png.json b/kotonebot-resource/sprites/jp/daily/screenshot_idol_pieces_1.png.json new file mode 100644 index 0000000..e392c1c --- /dev/null +++ b/kotonebot-resource/sprites/jp/daily/screenshot_idol_pieces_1.png.json @@ -0,0 +1 @@ +{"definitions":{"921eefeb-730e-46fc-9924-d338fb286592":{"name":"Shop.IdolPiece.姬崎莉波_clumsy_trick","displayName":"","type":"template","annotationId":"921eefeb-730e-46fc-9924-d338fb286592","useHintRect":false}},"annotations":[{"id":"921eefeb-730e-46fc-9924-d338fb286592","type":"rect","data":{"x1":88,"y1":914,"x2":141,"y2":963}}]} \ No newline at end of file diff --git a/kotonebot/kaa/common.py b/kotonebot/kaa/common.py index f9cea1e..50bb06f 100644 --- a/kotonebot/kaa/common.py +++ b/kotonebot/kaa/common.py @@ -80,7 +80,7 @@ class DailyMoneyShopItems(IntEnum): """紫云清夏 Tame-Lie-One-Step 碎片""" IdolPiece_葛城リーリヤ_白線 = 17 """葛城リーリヤ 白線 碎片""" - IdolPiece_姫崎薪波_cIclumsy_trick = 18 + IdolPiece_姬崎莉波_clumsy_trick = 18 """姫崎薪波 cIclumsy trick 碎片""" IdolPiece_花海咲季_FightingMyWay = 19 """花海咲季 FightingMyWay 碎片""" @@ -90,6 +90,8 @@ class DailyMoneyShopItems(IntEnum): """花海佑芽 The Rolling Riceball 碎片""" IdolPiece_月村手毬_LunaSayMaybe = 22 """月村手毬 Luna say maybe 碎片""" + IdolPiece_有村麻央_Fluorite = 23 + """有村麻央 Fluorite 碎片""" @classmethod def to_ui_text(cls, item: "DailyMoneyShopItems") -> str: @@ -126,23 +128,25 @@ class DailyMoneyShopItems(IntEnum): case cls.RecordKey: return "记录钥匙" case cls.IdolPiece_倉本千奈_WonderScale: - return "倉本千奈 WonderScale 碎片" + return "倉本千奈　WonderScale 碎片" case cls.IdolPiece_篠泽广_光景: - return "篠泽广 光景 碎片" + return "篠泽广　光景 碎片" case cls.IdolPiece_紫云清夏_TameLieOneStep: - return "紫云清夏 Tame-Lie-One-Step 碎片" + return "紫云清夏　Tame-Lie-One-Step 碎片" case cls.IdolPiece_葛城リーリヤ_白線: - return "葛城リーリヤ 白線 碎片" - case cls.IdolPiece_姫崎薪波_cIclumsy_trick: - return "姫崎薪波 cIclumsy trick 碎片" + return "葛城リーリヤ　白線 碎片" + case cls.IdolPiece_姬崎莉波_clumsy_trick: + return "姫崎薪波　clumsy trick 碎片" case cls.IdolPiece_花海咲季_FightingMyWay: - return "花海咲季 FightingMyWay 碎片" + return "花海咲季　FightingMyWay 碎片" case cls.IdolPiece_藤田ことね_世界一可愛い私: - return "藤田ことね 世界一可愛い私 碎片" + return "藤田ことね　世界一可愛い私 碎片" case cls.IdolPiece_花海佑芽_TheRollingRiceball: - return "花海佑芽 The Rolling Riceball 碎片" + return "花海佑芽　The Rolling Riceball 碎片" case cls.IdolPiece_月村手毬_LunaSayMaybe: - return "月村手毬 Luna say maybe 碎片" + return "月村手毬　Luna say maybe 碎片" + case cls.IdolPiece_有村麻央_Fluorite: + return "有村麻央　Fluorite 碎片" case _: assert_never(item) @@ -202,8 +206,8 @@ class DailyMoneyShopItems(IntEnum): return R.Shop.IdolPiece.紫云清夏_TameLieOneStep case DailyMoneyShopItems.IdolPiece_葛城リーリヤ_白線: return R.Shop.IdolPiece.葛城リーリヤ_白線 - case DailyMoneyShopItems.IdolPiece_姫崎薪波_cIclumsy_trick: - return R.Shop.IdolPiece.姫崎薪波_cIclumsy_trick + case DailyMoneyShopItems.IdolPiece_姬崎莉波_clumsy_trick: + return R.Shop.IdolPiece.姬崎莉波_clumsy_trick case DailyMoneyShopItems.IdolPiece_花海咲季_FightingMyWay: return R.Shop.IdolPiece.花海咲季_FightingMyWay case DailyMoneyShopItems.IdolPiece_藤田ことね_世界一可愛い私: @@ -212,6 +216,8 @@ class DailyMoneyShopItems(IntEnum): return R.Shop.IdolPiece.花海佑芽_TheRollingRiceball case DailyMoneyShopItems.IdolPiece_月村手毬_LunaSayMaybe: return R.Shop.IdolPiece.月村手毬_LunaSayMaybe + case DailyMoneyShopItems.IdolPiece_有村麻央_Fluorite: + return R.Shop.IdolPiece.有村麻央_Fluorite case _: assert_never(self)