Bläddra i källkod

fix(Guild): Close chat window popup when entering guild page #1571

ryland 5 månader sedan
förälder
incheckning
84220cb605

BIN
tasks/GameUi/additional/additional_close_chat_window.png


+ 11 - 0
tasks/GameUi/additional/guild.json

@@ -0,0 +1,11 @@
+[
+  {
+    "itemName": "close_chat_window",
+    "imageName": "additional_close_chat_window.png",
+    "roiFront": "653,397,18,18",
+    "roiBack": "653,397,18,18",
+    "method": "Template matching",
+    "threshold": 0.91,
+    "description": "关闭聊天窗口"
+  }
+]

+ 5 - 0
tasks/GameUi/assets.py

@@ -24,6 +24,11 @@ class GameUiAssets:
 	O_CLICK_CLOSE_2 = RuleOcr(roi=(508,584,214,40), area=(508,584,214,40), mode="Single", method="Default", keyword="点击空白处关闭弹窗", name="click_close_2")
 	O_CLICK_CLOSE_2 = RuleOcr(roi=(508,584,214,40), area=(508,584,214,40), mode="Single", method="Default", keyword="点击空白处关闭弹窗", name="click_close_2")
 
 
 
 
+	# Image Rule Assets
+	# 关闭聊天窗口 
+	I_CLOSE_CHAT_WINDOW = RuleImage(roi_front=(653,397,18,18), roi_back=(653,397,18,18), threshold=0.91, method="Template matching", file="./tasks/GameUi/additional/additional_close_chat_window.png")
+
+
 	# Image Rule Assets
 	# Image Rule Assets
 	# 商店弹窗红色关闭 
 	# 商店弹窗红色关闭 
 	I_AD_CLOSE_RED = RuleImage(roi_front=(993,130,33,36), roi_back=(953,91,215,121), threshold=0.8, method="Template matching", file="./tasks/GameUi/additional/additional_ad_close_red.png")
 	I_AD_CLOSE_RED = RuleImage(roi_front=(993,130,33,36), roi_back=(953,91,215,121), threshold=0.8, method="Template matching", file="./tasks/GameUi/additional/additional_ad_close_red.png")

+ 7 - 3
tasks/GameUi/game_ui.py

@@ -353,9 +353,13 @@ class GameUi(BaseTask, GameUiAssets):
 if __name__ == '__main__':
 if __name__ == '__main__':
     from module.config.config import Config
     from module.config.config import Config
     from module.device.device import Device
     from module.device.device import Device
+    from tasks.GameUi.page import page_guild
 
 
-    c = Config('oas2')
+    c = Config('oas1')
     d = Device(c)
     d = Device(c)
     game = GameUi(config=c, device=d)
     game = GameUi(config=c, device=d)
-    game.ui_get_current_page()
-    game.ui_goto(page_main)
+    for i in range(10):
+        game.ui_get_current_page()
+        game.ui_goto(page_guild)
+        game.ui_get_current_page()
+        game.ui_goto(page_main)

+ 3 - 2
tasks/GameUi/page.py

@@ -54,7 +54,8 @@ page_login = Page(G.I_CHECK_LOGIN_FORM)
 # Main Home 主页
 # Main Home 主页
 page_main = Page(G.I_CHECK_MAIN)
 page_main = Page(G.I_CHECK_MAIN)
 page_main.additional = [G.I_AD_CLOSE_RED, G.I_BACK_FRIENDS, RestartAssets.I_CANCEL_BATTLE,
 page_main.additional = [G.I_AD_CLOSE_RED, G.I_BACK_FRIENDS, RestartAssets.I_CANCEL_BATTLE,
-                        [RestartAssets.I_LOGIN_COURTYARD, RestartAssets.C_LOGIN_SCROLL_CLOSE_AREA]]
+                        [RestartAssets.I_LOGIN_COURTYARD, RestartAssets.C_LOGIN_SCROLL_CLOSE_AREA,
+                         G.I_CLOSE_CHAT_WINDOW]]
 # 召唤summon
 # 召唤summon
 page_summon = Page(G.I_CHECK_SUMMON)
 page_summon = Page(G.I_CHECK_SUMMON)
 page_summon.link(button=G.I_SUMMON_GOTO_MAIN, destination=page_main)
 page_summon.link(button=G.I_SUMMON_GOTO_MAIN, destination=page_main)
@@ -181,7 +182,7 @@ page_mall.link(button=G.I_BACK_YOLLOW, destination=page_main)
 page_main.link(button=G.I_MAIN_GOTO_MALL, destination=page_mall)
 page_main.link(button=G.I_MAIN_GOTO_MALL, destination=page_mall)
 # 阴阳寮 guild
 # 阴阳寮 guild
 page_guild = Page(G.I_CHECK_GUILD)
 page_guild = Page(G.I_CHECK_GUILD)
-page_guild.additional = [KekkaiUtilizeAssets.I_PLANT_TREE_CLOSE]
+page_guild.additional = [KekkaiUtilizeAssets.I_PLANT_TREE_CLOSE, G.I_CLOSE_CHAT_WINDOW]
 page_guild.link(button=G.I_BACK_Y, destination=page_main)
 page_guild.link(button=G.I_BACK_Y, destination=page_main)
 page_main.link(button=G.I_MAIN_GOTO_GUILD, destination=page_guild)
 page_main.link(button=G.I_MAIN_GOTO_GUILD, destination=page_guild)
 # 组队 team
 # 组队 team

+ 0 - 1
tasks/Sougenbi/assets.py

@@ -47,4 +47,3 @@ class SougenbiAssets:
 	O_S_FOOLERY = RuleOcr(roi=(955,10,68,36), area=(955,10,68,36), mode="Digit", method="Default", keyword="", name="s_foolery")
 	O_S_FOOLERY = RuleOcr(roi=(955,10,68,36), area=(955,10,68,36), mode="Digit", method="Default", keyword="", name="s_foolery")
 
 
 
 
-