Merge pull request #162 from infstellar/dev

Dev -> main

.gitignore

@@ -224,5 +224,5 @@ requirements2.txt
 config/missiondownload/missiondownload_meta.json
 config/cookies/web_genshin_cookies.json
 local_edit_missions/
-
+collected_images/
 *.giamode

assets/domain_names/Domain_Names_en_US.json

@@ -1,23 +1,27 @@
 [
-  "Court of Flowing Sand",
-  "Momiji-Dyed Court",
-  "菫色之庭",
-  "Slumbering Court",
+  "Valley of Remembrance",
+  "Forsaken Rift",
+  "Midsummer Courtyard",
+  "Cecilia Garden",
+  "Taishan Mansion",
   "Clear Pool and Mountain Cavern",
-  "Domain of Guyun",
-  "Hidden Palace of Lianshan Formula",
   "Hidden Palace of Zhou Formula",
+  "Hidden Palace of Lianshan Formula",
+  "Domain of Guyun",
   "Ridge Watch",
-  "Taishan Mansion",
+  "菫色之庭",
+  "Momiji-Dyed Court",
+  "Court of Flowing Sand",
   "The Lost Valley",
-  "Cecilia Garden",
-  "Forsaken Rift",
-  "Midsummer Courtyard",
-  "Valley of Remembrance",
+  "Slumbering Court",
   "Peak of Vindagnyr",
-  "Spire of Solitary Enlightenment",
   "Steeple of Ignorance",
+  "Spire of Solitary Enlightenment",
   "Tower of Abject Pride",
   "City of Gold",
-  "Molten Iron Fortress"
+  "Molten Iron Fortress",
+  "罪祸的终末",
+  "深潮的余响",
+  "苍白的遗荣",
+  "临瀑之城"
 ]

assets/domain_names/Domain_Names_zh_CN.json

@@ -1,23 +1,27 @@
 [
-  "椛染之庭",
-  "砂流之庭",
-  "菫色之庭",
-  "沉眠之庭",
-  "华池岩岫",
+  "铭记之谷",
+  "忘却之峡",
+  "仲夏庭园",
+  "塞西莉亚苗圃",
   "太山府",
-  "孤云凌霄之处",
-  "山脊守望",
+  "华池岩岫",
   "无妄引咎密宫",
   "震雷连山密宫",
+  "孤云凌霄之处",
+  "山脊守望",
+  "菫色之庭",
+  "椛染之庭",
+  "砂流之庭",
   "岩中幽谷",
-  "仲夏庭园",
-  "塞西莉亚苗圃",
-  "忘却之峡",
-  "铭记之谷",
+  "沉眠之庭",
   "芬德尼尔之顶",
   "昏识塔",
-  "有顶塔",
   "缘觉塔",
+  "有顶塔",
   "赤金的城墟",
-  "熔铁的孤塞"
+  "熔铁的孤塞",
+  "罪祸的终末",
+  "深潮的余响",
+  "苍白的遗荣",
+  "临瀑之城"
 ]

config/json_template/General.jsontemplate

@@ -12,6 +12,6 @@
   "DeterminingStrictWeight":0.9,
   "InteractionMode": "Desktop",
   "Python32Path": "",
-  "Version":"v0.9.1.1158",
+  "Version":"v1.1.0.1279",
   "GenshinEXEPath":""
 }

requirements.txt

@@ -1,15 +1,13 @@
 # TODO: Update with exact module version
-numpy
-torch
+urllib3<2.0.0
+numpy==1.21.6
+torch==1.13.1
 loguru
 tqdm
 torchvision
 tabulate
-
-paddleocr
-
 thop
-
+fastdeploy-python
 opencv-python
 Pillow
 pypiwin32
@@ -18,26 +16,21 @@ pytweening
 matplotlib
 keyboard
 scipy
-
 PyAutoGUI==0.9.53
 pywebio==1.8.3
 pydirectinput
-
-
 adbutils
 uiautomator2
 uiautomator2cache
 filelock
 lxml
-pydantic==1.10.11
-gimap==3.4.6
+pydantic>2.0.0
+gimapdev==4.6.1
 giadep
 giaocr
 giayolo
 pyyaml
 urllib3
-
-fastdeploy-python
 json5
 sortedcontainers
 pytz
@@ -46,3 +39,6 @@ scikit-learn
 requests
 dataclasses
 psutil
+pponnxcr
+websockets
+

setup.py

@@ -27,5 +27,6 @@
     elif sys.argv[0] == 'build':
         import source.config.config_updater
         import source.manager.asset_index_generator
+        from source.map.extractor.get_domain_list import *
 
 

source/assets/domain.py

@@ -1,3 +1,8 @@
-from source.manager.asset import ImgIcon, Area, Text, LOG_WHEN_TRUE
+from source.manager.asset import ImgIcon, Area, Text, LOG_WHEN_TRUE, Button
 
-IconGeneralChallengeSuccess = ImgIcon(threshold=0.99, print_log=LOG_WHEN_TRUE)
+IconGeneralChallengeSuccess = ImgIcon(threshold=0.99, print_log=LOG_WHEN_TRUE)
+ButtonDomainFailure = Button(threshold=0.98)
+ButtonDomainRetry = Button(threshold=0.98)
+AreaDomainFailure = Area()
+TextDomainExit = Text(zh='退出秘境',cap_area=AreaDomainFailure.position)
+TextDomainRechallenge = Text(zh='再次挑战',cap_area=AreaDomainFailure.position)