diff --git a/assets/resource/base/image/StartUp/GameLoading2.png b/assets/resource/base/image/StartUp/GameLoading2.png new file mode 100644 index 00000000..cbfb67e1 Binary files /dev/null and b/assets/resource/base/image/StartUp/GameLoading2.png differ diff --git a/assets/resource/base/pipeline/activity/ANightmareAtGreenLake.json b/assets/resource/base/pipeline/activity/ANightmareAtGreenLake.json index 3e581b11..bf496876 100644 --- a/assets/resource/base/pipeline/activity/ANightmareAtGreenLake.json +++ b/assets/resource/base/pipeline/activity/ANightmareAtGreenLake.json @@ -1,8 +1,10 @@ { "ANightmareAtGreenLake": { "next": [ - "ANightmareAtGreenLakeEnterTheShow", - "Sub_StartUp" + "ANightmareAtGreenLakeEnterTheShow" + ], + "interrupt": [ + "ReturnMain" ] }, "ANightmareAtGreenLakeEnterTheShow": { diff --git a/assets/resource/base/pipeline/activity/EchoesinInTheMountain.json b/assets/resource/base/pipeline/activity/EchoesinInTheMountain.json index e15b33a2..ba17e1b2 100644 --- a/assets/resource/base/pipeline/activity/EchoesinInTheMountain.json +++ b/assets/resource/base/pipeline/activity/EchoesinInTheMountain.json @@ -6,8 +6,10 @@ "EITM_入口2", "EITM_入口1", "EITM_重置", - "EITM_退出", - "Sub_StartUp" + "EITM_退出" + ], + "interrupt": [ + "ReturnMain" ] }, "EITM_入口1": { diff --git a/assets/resource/base/pipeline/activity/FloorItToTheGoldenCity.json b/assets/resource/base/pipeline/activity/FloorItToTheGoldenCity.json index 39990e5c..500171fd 100644 --- a/assets/resource/base/pipeline/activity/FloorItToTheGoldenCity.json +++ b/assets/resource/base/pipeline/activity/FloorItToTheGoldenCity.json @@ -1,8 +1,10 @@ { "FloorItToTheGoldenCity": { "next": [ - "FloorItToTheGoldenCityEnterTheShow", - "Sub_StartUp" + "FloorItToTheGoldenCityEnterTheShow" + ], + "interrupt": [ + "ReturnMain" ] }, "FloorItToTheGoldenCityEnterTheShow": { @@ -35,8 +37,10 @@ }, "FloorItToTheGoldenCity_StagePromotion": { "next": [ - "FloorItToTheGoldenCityEnterTheShow_StagePromotion", - "Sub_StartUp" + "FloorItToTheGoldenCityEnterTheShow_StagePromotion" + ], + "interrupt": [ + "ReturnMain" ] }, "FloorItToTheGoldenCityEnterTheShow_StagePromotion": { @@ -69,4 +73,4 @@ "ActivityStageModelSellect" ] } -} +} \ No newline at end of file diff --git a/assets/resource/base/pipeline/activity/GoodbyeRaya.json b/assets/resource/base/pipeline/activity/GoodbyeRaya.json index 42de88e2..4ad1fc9b 100644 --- a/assets/resource/base/pipeline/activity/GoodbyeRaya.json +++ b/assets/resource/base/pipeline/activity/GoodbyeRaya.json @@ -1,8 +1,10 @@ { "GoodbyeRaya": { "next": [ - "GoodbyeRayaEnterTheShow", - "Sub_StartUp" + "GoodbyeRayaEnterTheShow" + ], + "interrupt": [ + "ReturnMain" ] }, "GoodbyeRayaEnterTheShow": { diff --git a/assets/resource/base/pipeline/activity/JourneytoMorPankh.json b/assets/resource/base/pipeline/activity/JourneytoMorPankh.json index 0b15cd60..e4d05eba 100644 --- a/assets/resource/base/pipeline/activity/JourneytoMorPankh.json +++ b/assets/resource/base/pipeline/activity/JourneytoMorPankh.json @@ -1,8 +1,10 @@ { "JourneytoMorPankh": { "next": [ - "JourneytoMorPankhEnterTheShow", - "Sub_StartUp" + "JourneytoMorPankhEnterTheShow" + ], + "interrupt": [ + "ReturnMain" ] }, "JourneytoMorPankhEnterTheShow": { @@ -36,4 +38,4 @@ "SwipeLeftAndFindStage" ] } -} +} \ No newline at end of file diff --git a/assets/resource/base/pipeline/activity/NotesOnShuoRi.json b/assets/resource/base/pipeline/activity/NotesOnShuoRi.json index c9277949..3c6eeec2 100644 --- a/assets/resource/base/pipeline/activity/NotesOnShuoRi.json +++ b/assets/resource/base/pipeline/activity/NotesOnShuoRi.json @@ -1,8 +1,10 @@ { "NotesOnShuoRi": { "next": [ - "NotesOnShuoRiEnterTheShow", - "Sub_StartUp" + "NotesOnShuoRiEnterTheShow" + ], + "interrupt": [ + "ReturnMain" ] }, "NotesOnShuoRiEnterTheShow": { diff --git a/assets/resource/base/pipeline/activity/RevivalTheUluruGames.json b/assets/resource/base/pipeline/activity/RevivalTheUluruGames.json index 74f93d85..b1b97922 100644 --- a/assets/resource/base/pipeline/activity/RevivalTheUluruGames.json +++ b/assets/resource/base/pipeline/activity/RevivalTheUluruGames.json @@ -1,8 +1,10 @@ { "RevivalTheUluruGames": { "next": [ - "RevivalTheUluruGamesEnterTheShow", - "Sub_StartUp" + "RevivalTheUluruGamesEnterTheShow" + ], + "interrupt": [ + "ReturnMain" ] }, "RevivalTheUluruGamesEnterTheShow": { @@ -34,8 +36,10 @@ }, "RevivalTheUluruGames_Reproduction": { "next": [ - "RevivalTheUluruGames_ReproductionEnterTheShow", - "Sub_StartUp" + "RevivalTheUluruGames_ReproductionEnterTheShow" + ], + "interrupt": [ + "ReturnMain" ] }, "RevivalTheUluruGames_ReproductionEnterTheShow": { @@ -72,4 +76,4 @@ "action": "Click", "next": "SwipeLeftAndFindStage" } -} +} \ No newline at end of file diff --git a/assets/resource/base/pipeline/activity/Route77.json b/assets/resource/base/pipeline/activity/Route77.json index 0cec9c66..8368df2e 100644 --- a/assets/resource/base/pipeline/activity/Route77.json +++ b/assets/resource/base/pipeline/activity/Route77.json @@ -1,8 +1,10 @@ { "Route77": { "next": [ - "Route77EnterTheShow", - "Sub_StartUp" + "Route77EnterTheShow" + ], + "interrupt": [ + "ReturnMain" ] }, "Route77EnterTheShow": { @@ -35,8 +37,10 @@ }, "Route77_StagePromotion": { "next": [ - "Route77EnterTheShow_StagePromotion", - "Sub_StartUp" + "Route77EnterTheShow_StagePromotion" + ], + "interrupt": [ + "ReturnMain" ] }, "Route77EnterTheShow_StagePromotion": { @@ -69,4 +73,4 @@ "ActivityStageModelSellect" ] } -} +} \ No newline at end of file diff --git a/assets/resource/base/pipeline/activity/ThePrisonerintheCave.json b/assets/resource/base/pipeline/activity/ThePrisonerintheCave.json index 4a88b87d..7696dd20 100644 --- a/assets/resource/base/pipeline/activity/ThePrisonerintheCave.json +++ b/assets/resource/base/pipeline/activity/ThePrisonerintheCave.json @@ -1,8 +1,10 @@ { "ThePrisonerintheCave": { "next": [ - "ThePrisonerintheCaveEnterTheShow", - "Sub_StartUp" + "ThePrisonerintheCaveEnterTheShow" + ], + "interrupt": [ + "ReturnMain" ] }, "ThePrisonerintheCaveEnterTheShow": { diff --git a/assets/resource/base/pipeline/activity/outside_deduction.json b/assets/resource/base/pipeline/activity/outside_deduction.json index d14955c8..dd9905a0 100644 --- a/assets/resource/base/pipeline/activity/outside_deduction.json +++ b/assets/resource/base/pipeline/activity/outside_deduction.json @@ -2532,8 +2532,10 @@ ], "action": "Click", "next": [ - "SOD_Main", - "Sub_BackButton" + "SOD_Main" + ], + "interrupt": [ + "BackButton" ] }, "SOD_Skip": { diff --git a/assets/resource/base/pipeline/all_in.json b/assets/resource/base/pipeline/all_in.json index 3a099dd7..e56d60a4 100644 --- a/assets/resource/base/pipeline/all_in.json +++ b/assets/resource/base/pipeline/all_in.json @@ -303,8 +303,10 @@ "next": [ "EatCandyWithin24H", "Sub_QuitEatCandyPage", - "HomeFlag", - "Sub_StartUp" + "HomeFlag" + ], + "interrupt": [ + "ReturnMain" ] } } \ No newline at end of file diff --git a/assets/resource/base/pipeline/awards.json b/assets/resource/base/pipeline/awards.json index 4c96440f..f5dc1aec 100644 --- a/assets/resource/base/pipeline/awards.json +++ b/assets/resource/base/pipeline/awards.json @@ -4,9 +4,10 @@ "Sub_MailBadge", "Sub_JukeboxBadge", "Sub_DailyBadge", - "HomeFlag", - "Sub_ObtainedAwards", - "Sub_StartUp" + "HomeFlag" + ], + "interrupt": [ + "ReturnMain" ] }, "Sub_MailBadge": { @@ -75,8 +76,10 @@ 163 ], "next": [ - "HomeFlag", - "Sub_BackButton" + "HomeFlag" + ], + "interrupt": [ + "BackButton" ] }, "Sub_DailyBadge": { @@ -95,8 +98,10 @@ "next": [ "Sub_CollectDailyAwards", "Sub_ObtainedAwards", - "WeeklyAwardsBadge", - "Sub_BackButton" + "WeeklyAwardsBadge" + ], + "interrupt": [ + "BackButton" ] }, "Sub_CollectDailyAwards": { diff --git a/assets/resource/base/pipeline/combat.json b/assets/resource/base/pipeline/combat.json index 7d1c5da2..d2a33294 100644 --- a/assets/resource/base/pipeline/combat.json +++ b/assets/resource/base/pipeline/combat.json @@ -1,8 +1,10 @@ { "Combat": { "next": [ - "EnterTheShow", - "Sub_StartUp" + "EnterTheShow" + ], + "interrupt": [ + "ReturnMain" ] }, "EnterTheShow": { @@ -748,8 +750,10 @@ "action": "Click", "target": "StartReplay", "next": [ - "HomeFlag", - "Sub_StartUp" + "HomeFlag" + ], + "interrupt": [ + "ReturnMain" ] }, "Replaying": { @@ -795,8 +799,10 @@ "next": [ "Victory", "AllIn", - "HomeFlag", - "Sub_HomeButton" + "HomeFlag" + ], + "interrupt": [ + "HomeButton" ] } } \ No newline at end of file diff --git a/assets/resource/base/pipeline/combat_activity.json b/assets/resource/base/pipeline/combat_activity.json index 0ca042f9..c97638eb 100644 --- a/assets/resource/base/pipeline/combat_activity.json +++ b/assets/resource/base/pipeline/combat_activity.json @@ -1,8 +1,10 @@ { "ActivityEntry": { "next": [ - "ActivityEnterTheShow", - "Sub_StartUp" + "ActivityEnterTheShow" + ], + "interrupt": [ + "ReturnMain" ] }, "ActivityEnterTheShow": { diff --git a/assets/resource/base/pipeline/eat_candy.json b/assets/resource/base/pipeline/eat_candy.json index ba3fd9b0..6f1d457e 100644 --- a/assets/resource/base/pipeline/eat_candy.json +++ b/assets/resource/base/pipeline/eat_candy.json @@ -61,8 +61,10 @@ ], "next": [ "Sub_QuitEatCandyPage", - "HomeFlag", - "Sub_StartUp" + "HomeFlag" + ], + "interrupt": [ + "ReturnMain" ] }, "EatMiniCandy24H": { @@ -149,8 +151,10 @@ "next": [ "SmallCandy24H", "Sub_QuitEatCandyPage", - "HomeFlag", - "Sub_StartUp" + "HomeFlag" + ], + "interrupt": [ + "ReturnMain" ] }, "SmallCandy24HNotEnough": { @@ -165,8 +169,10 @@ "next": [ "BigCandy24H", "Sub_QuitEatCandyPage", - "HomeFlag", - "Sub_StartUp" + "HomeFlag" + ], + "interrupt": [ + "ReturnMain" ] }, "BigCandy24HNotEnough": { @@ -180,8 +186,10 @@ ], "next": [ "Sub_QuitEatCandyPage", - "HomeFlag", - "Sub_StartUp" + "HomeFlag" + ], + "interrupt": [ + "ReturnMain" ] }, "Sub_QuitEatCandyPage": { diff --git a/assets/resource/base/pipeline/psychube.json b/assets/resource/base/pipeline/psychube.json index 810e4a91..48a0b61c 100644 --- a/assets/resource/base/pipeline/psychube.json +++ b/assets/resource/base/pipeline/psychube.json @@ -4,8 +4,10 @@ "PsychubeEnterTheShow", "PsychubeResourceStages", "FreePsychubeStages", - "PsychubeStages_7", - "Sub_StartUp" + "PsychubeStages_7" + ], + "interrupt": [ + "ReturnMain" ] }, "PsychubeEnterTheShow": { @@ -63,8 +65,10 @@ 297 ], "next": [ - "HomeFlag", - "Sub_StartUp" + "HomeFlag" + ], + "interrupt": [ + "ReturnMain" ] }, "PsychubeStages_7": { diff --git a/assets/resource/base/pipeline/startup.json b/assets/resource/base/pipeline/startup.json index edd87a69..b206eb94 100644 --- a/assets/resource/base/pipeline/startup.json +++ b/assets/resource/base/pipeline/startup.json @@ -1,22 +1,26 @@ { "StartUp": { + "post_wait_freezes": 300, "next": [ "HomeFlag", - "Sub_HomeButton", - "Sub_BackButton", - "Sub_HomeLoading", - "Sub_ObtainedAwards", - "Sub_AccumulatedSignIn", - "Sub_BirthdayReward", - "Sub_Reward", - "Sub_CloseDuringFestivalDipaRewardPage", - "StartGame", - "CloseAnnouncement", - "Download", - "GameLoading", + "StartGame" + ], + "interrupt": [ + "GameLoading2", "BluePochLogo", "Disclaimer", - "Sub_Start1999" + "HomeLoading", + "GameLoading", + "CloseAnnouncement", + "ObtainedAwards", + "AccumulatedSignIn", + "BirthdayReward", + "Reward", + "CloseDuringFestivalDipaRewardPage", + "Download", + "BackButton", + "HomeButton", + "Start1999" ] }, "ReturnMain": { @@ -24,43 +28,17 @@ "next": [ "HomeButton", "BackButton", + "HomeLoading", "ObtainedAwards", + "CloseAnnouncement", "AccumulatedSignIn", "BirthdayReward", "Reward", "CloseDuringFestivalDipaRewardPage", - "StartGame", - "CloseAnnouncement", - "Download", - "GameLoading", - "BluePochLogo", - "Disclaimer", "Stop" ] }, - "Sub_StartUp": { - "is_sub": true, - "next": [ - "HomeFlag", - "Sub_HomeButton", - "Sub_BackButton", - "Sub_HomeLoading", - "Sub_ObtainedAwards", - "Sub_AccumulatedSignIn", - "Sub_BirthdayReward", - "Sub_Reward", - "Sub_CloseDuringFestivalDipaRewardPage", - "StartGame", - "CloseAnnouncement", - "Download", - "GameLoading", - "BluePochLogo", - "Disclaimer", - "Stop" - ] - }, - "Sub_Start1999": { - "is_sub": true, + "Start1999": { "action": "StartApp", "package": "com.shenlan.m.reverse1999/com.ssgame.mobile.gamesdk.frame.AppStartUpActivity" }, @@ -73,14 +51,7 @@ 620, 336 ], - "next": [ - "BluePochLogo", - "Disclaimer", - "GameLoading", - "Download", - "StartGame", - "CloseAnnouncement" - ] + "post_wait_freezes": 300 }, "Disclaimer": { "recognition": "TemplateMatch", @@ -91,14 +62,7 @@ 238, 214 ], - "next": [ - "Disclaimer", - "GameLoading", - "Download", - "StartGame", - "CloseAnnouncement", - "HomeFlag" - ] + "post_wait_freezes": 1000 }, "GameLoading": { "recognition": "TemplateMatch", @@ -109,12 +73,18 @@ 599, 563 ], - "next": [ - "GameLoading", - "Download", - "StartGame", - "CloseAnnouncement" - ] + "post_wait_freezes": 500 + }, + "GameLoading2": { + "recognition": "TemplateMatch", + "template": "StartUp/GameLoading2.png", + "roi": [ + 1161, + 0, + 119, + 120 + ], + "post_delay": 2000 }, "Download": { "recognition": "OCR", @@ -128,13 +98,7 @@ 187, 150 ], - "action": "Click", - "next": [ - "GameLoading", - "Download", - "StartGame", - "CloseAnnouncement" - ] + "action": "Click" }, "CloseAnnouncement": { "recognition": "TemplateMatch", @@ -145,13 +109,7 @@ 143, 140 ], - "action": "Click", - "next": [ - "Sub_HomeLoading", - "HomeFlag", - "StartGame", - "CloseAnnouncement" - ] + "action": "Click" }, "StartGame": { "recognition": "TemplateMatch", @@ -165,20 +123,21 @@ ], "action": "Click", "next": [ - "Sub_BackButton", - "Sub_ObtainedAwards", - "Sub_AccumulatedSignIn", - "Sub_BirthdayReward", - "Sub_Reward", - "Sub_HomeLoading", - "Sub_CloseDuringFestivalDipaRewardPage", "HomeFlag", - "StartGame", - "CloseAnnouncement" + "StartGame" + ], + "interrupt": [ + "HomeLoading_wait", + "ObtainedAwards", + "AccumulatedSignIn", + "BirthdayReward", + "CloseAnnouncement", + "Reward", + "CloseDuringFestivalDipaRewardPage", + "BackButton" ] }, - "Sub_HomeLoading": { - "is_sub": true, + "HomeLoading": { "recognition": "TemplateMatch", "template": "StartUp/HomeLoading.png", "roi": [ @@ -188,6 +147,18 @@ 152 ] }, + "HomeLoading_wait": { + "doc": "专供启动时使用，与原版分开以防止ReturnMain大面积报错", + "recognition": "TemplateMatch", + "template": "StartUp/HomeLoading.png", + "roi": [ + 459, + 359, + 364, + 152 + ], + "pre_wait_freezes": 1000 + }, "HomeFlag": { "recognition": "TemplateMatch", "template": "StartUp/HomeFlag.png", @@ -248,44 +219,9 @@ ], "action": "Click" }, - "Sub_HomeButton": { - "is_sub": true, - "recognition": "TemplateMatch", - "template": [ - "StartUp/HomeButton.png", - "StartUp/HomeButton_White.png" - ], - "roi": [ - 70, - 0, - 144, - 144 - ], - "action": "Click" - }, "Stop": {}, "Reward": { - "recognition": "TemplateMatch", - "template": [ - "StartUp/Reward.png", - "StartUp/Reward1.png" - ], - "roi": [ - 419, - 90, - 297, - 148 - ], - "action": "Click", - "target": [ - 0, - 0, - 526, - 590 - ] - }, - "Sub_Reward": { - "is_sub": true, + "doc": "防卡日历", "recognition": "TemplateMatch", "template": [ "StartUp/Reward.png", @@ -316,18 +252,6 @@ ], "action": "Click" }, - "Sub_AccumulatedSignIn": { - "is_sub": true, - "recognition": "TemplateMatch", - "template": "StartUp/AccumulatedSignIn.png", - "roi": [ - 562, - 483, - 347, - 163 - ], - "action": "Click" - }, "BirthdayReward": { "recognition": "TemplateMatch", "template": "StartUp/BirthdayReward.png", @@ -340,19 +264,6 @@ ], "action": "Click" }, - "Sub_BirthdayReward": { - "is_sub": true, - "recognition": "TemplateMatch", - "template": "StartUp/BirthdayReward.png", - "threshold": 0.8, - "roi": [ - 803, - 273, - 121, - 121 - ], - "action": "Click" - }, "CloseDuringFestivalDipaRewardPage": { "green_mask": true, "recognition": "TemplateMatch", @@ -364,18 +275,5 @@ 138 ], "action": "Click" - }, - "Sub_CloseDuringFestivalDipaRewardPage": { - "is_sub": true, - "green_mask": true, - "recognition": "TemplateMatch", - "template": "StartUp/CloseDuringFestivalDipaRewardPage.png", - "roi": [ - 1069, - 68, - 138, - 138 - ], - "action": "Click" } } \ No newline at end of file diff --git a/assets/resource/base/pipeline/wilderness.json b/assets/resource/base/pipeline/wilderness.json index 57ae222e..dfbfe89b 100644 --- a/assets/resource/base/pipeline/wilderness.json +++ b/assets/resource/base/pipeline/wilderness.json @@ -8,11 +8,12 @@ "CollectAwards", "CollectTrust", "TrustDialogueNext", - "TrustDialogueInteraction", - "Sub_StartUp" + "TrustDialogueInteraction" + ], + "interrupt": [ + "ReturnMain" ] }, - "EnterWilderness": { "recognition": "TemplateMatch", "template": "Wilderness/EnterWilderness.png", @@ -31,8 +32,10 @@ "CollectAwards", "CollectTrust", "TrustDialogueNext", - "TrustDialogueInteraction", - "Sub_HomeLoading" + "TrustDialogueInteraction" + ], + "interrupt": [ + "HomeLoading" ] }, "CollectEXP": { @@ -61,8 +64,10 @@ "CollectTrust", "TrustDialogueNext", "TrustDialogueInteraction", - "Sub_HomeButton", "HomeFlag" + ], + "interrupt": [ + "HomeButton" ] }, "CollectMoney": { @@ -90,8 +95,10 @@ "CollectTrust", "TrustDialogueNext", "TrustDialogueInteraction", - "Sub_HomeButton", "HomeFlag" + ], + "interrupt": [ + "HomeButton" ] }, "CollectAwards": { @@ -109,8 +116,10 @@ "CollectTrust", "TrustDialogueNext", "TrustDialogueInteraction", - "Sub_HomeButton", "HomeFlag" + ], + "interrupt": [ + "HomeButton" ] }, "CollectTrust": { @@ -128,8 +137,28 @@ "CollectTrust", "TrustDialogueNext", "TrustDialogueInteraction", - "Sub_HomeButton", "HomeFlag" + ], + "interrupt": [ + "TestCritterTraining", + "HomeButton" + ] + }, + "TestCritterTraining": { + "recognition": "OCR", + "expected": "培训位置", + "roi": [ + 1076, + 0, + 204, + 131 + ], + "action": "Click", + "target": [ + 44, + 44, + 8, + 8 ] }, "TrustDialogueNext": { @@ -145,8 +174,10 @@ "next": [ "TrustDialogueNext", "TrustDialogueInteraction", - "Sub_HomeButton", "HomeFlag" + ], + "interrupt": [ + "HomeButton" ] }, "TrustDialogueInteraction": { @@ -162,8 +193,10 @@ "next": [ "TrustDialogueNext", "TrustDialogueInteraction", - "Sub_HomeButton", "HomeFlag" + ], + "interrupt": [ + "HomeButton" ] }, "TrustMax": { @@ -179,8 +212,10 @@ ], "action": "Click", "next": [ - "Sub_HomeButton", "HomeFlag" + ], + "interrupt": [ + "HomeButton" ] }, "EnterProduct": { @@ -297,8 +332,10 @@ "CollectAwards", "CollectTrust", "TrustDialogueNext", - "TrustDialogueInteraction", - "Sub_BackButton" + "TrustDialogueInteraction" + ], + "interrupt": [ + "BackButton" ] }, "AutoAssignCritters": { @@ -347,8 +384,10 @@ "CollectAwards", "CollectTrust", "TrustDialogueNext", - "TrustDialogueInteraction", - "Sub_BackButton" + "TrustDialogueInteraction" + ], + "interrupt": [ + "BackButton" ] }, "SummonlngSuccess": { @@ -366,6 +405,10 @@ "SummonlngSuccessBack" ] }, + "test": { + "recognition": "TemplateMatch", + "template": "Wilderness/UniqueParxxxx.png" + }, "SummonlngSuccessBack": { "recognition": "TemplateMatch", "template": "Wilderness/SummonlngSuccess.png", @@ -388,8 +431,10 @@ "CollectAwards", "CollectTrust", "TrustDialogueNext", - "TrustDialogueInteraction", - "Sub_BackButton" + "TrustDialogueInteraction" + ], + "interrupt": [ + "BackButton" ] }, "interrupt_SummonlngSuccessBack": { @@ -409,4 +454,4 @@ ], "action": "Click" } -} +} \ No newline at end of file diff --git a/assets/resource/bilibili/pipeline/startup.json b/assets/resource/bilibili/pipeline/startup.json index 4a5a0e4d..5c4e4a21 100644 --- a/assets/resource/bilibili/pipeline/startup.json +++ b/assets/resource/bilibili/pipeline/startup.json @@ -1,6 +1,5 @@ { - "Sub_Start1999": { - "is_sub": true, + "Start1999": { "action": "StartApp", "package": "com.shenlan.m.reverse1999.bilibili/com.ssgame.mobile.gamesdk.frame.AppStartUpActivity" } diff --git a/assets/resource/global_en/pipeline/startup.json b/assets/resource/global_en/pipeline/startup.json index 1a5c2d2f..b75a68f1 100644 --- a/assets/resource/global_en/pipeline/startup.json +++ b/assets/resource/global_en/pipeline/startup.json @@ -1,6 +1,5 @@ { - "Sub_Start1999": { - "is_sub": true, + "Start1999": { "action": "StartApp", "package": "com.bluepoch.m.en.reverse1999" } diff --git a/assets/resource/global_jp/pipeline/startup.json b/assets/resource/global_jp/pipeline/startup.json index 751ee6b6..b1fd5115 100644 --- a/assets/resource/global_jp/pipeline/startup.json +++ b/assets/resource/global_jp/pipeline/startup.json @@ -1,6 +1,5 @@ { - "Sub_Start1999": { - "is_sub": true, + "Start1999": { "action": "StartApp", "package": "com.bluepoch.m.jp.reverse1999.and" }