优化实现

shabbywu · Jan 7, 2022 · 09fbf00 · 09fbf00
1 parent e0b3aba
commit 09fbf00
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -40,3 +40,4 @@ jobs:
           bin/michangsheng/ShoterLearnTime.dll
           bin/michangsheng/BetterShoppingExperience.dll
           bin/michangsheng/InstantlyForgeAndRefine.dll
+          bin/michangsheng/CollectGains.dll
diff --git a/michangsheng/BetterShoppingExperience/Plugin.cs b/michangsheng/BetterShoppingExperience/Plugin.cs
@@ -3,7 +3,7 @@
 using BepInEx;
 using HarmonyLib;
 
-using GUIPackage;
+using UnityEngine.Events;
 using JiaoYi;
 using UnityEngine;
 
@@ -14,6 +14,8 @@ namespace BetterShoppingExperience
     public class Plugin : BaseUnityPlugin
     {
 
+        static UnityAction closeAction;
+
         private void Awake()
         {
             // Plugin startup logic
@@ -66,7 +68,14 @@ private void Update() {
                     int next = findNext(o, currentId);;
                     Console.WriteLine("Current" + currentId + ", next id = " + next);
 
-                    __instance.Init(next);
+                    // stop closeAction
+                    closeAction = __instance.CloseAction;
+
+                    __instance.CloseAction = delegate() {};
+                    __instance.Close();
+
+                    ResManager.inst.LoadPrefab("JiaoYiUI").Inst(NewUICanvas.Inst.transform);
+                    JiaoYiUIMag.Inst.Init(next, closeAction);
                 }
             }
         }

diff --git a/michangsheng/CollectGains/Plugin.cs b/michangsheng/CollectGains/Plugin.cs
@@ -14,12 +14,12 @@ private void Awake()
             // Plugin startup logic
             Logger.LogInfo($"Plugin {PluginInfo.PLUGIN_GUID} is loaded!");
 
-            Harmony.CreateAndPatchAll(typeof(Plugin));
+            Harmony.CreateAndPatchAll(typeof(CollectGains));
         }
     }
 
     [HarmonyPatch(typeof(CaiJiUIMag), "StartCaiJi")]
-    public class InstantlyRefine {
+    public class CollectGains {
         static readonly object _object = new object(); 
 
         static Harmony singleton;