renamed and combined methods (OnInit and OnBind)

michael811125 · Apr 26, 2023 · c22ef8f · c22ef8f
1 parent 433dba7
commit c22ef8f
Show file tree

Hide file tree

Showing 22 changed files with 74 additions and 139 deletions.
diff --git a/Assets/OxGFrame/CHANGELOG.md b/Assets/OxGFrame/CHANGELOG.md
@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## [2.0.4] - 2023-04-26
+- Renamed BeginInit be OnInit.
+- Combined InitOnceComponents and InitOnceEvents be OnBind (after bind will call this method) method.
+- Removed InitOnceComponents method.
+- Removed InitOnceEvents method.
+
 ## [2.0.3] - 2023-04-25
 - Fixed unload issue (When ref is zero will call package.UnloadUnusedAssets()).
 - Fixed progression calculate bug.

diff --git a/Assets/OxGFrame/CoreFrame/Example/EPFrameDemo/Scripts/DemoEntity1.cs b/Assets/OxGFrame/CoreFrame/Example/EPFrameDemo/Scripts/DemoEntity1.cs
@@ -3,15 +3,13 @@
 
 public class DemoEntity1 : EPBase
 {
-    public override void BeginInit()
+    public override void OnInit()
     {
         Debug.Log($"<color=#FF2A20>InitThis:</color> {this.gameObject.name}");
     }
 
-    protected override void InitOnceComponents()
+    protected override void OnBind()
     {
-        Debug.Log($"<color=#FFA720>InitOnceComponents:</color> {this.gameObject.name}");
-
         // Single Bind
         Debug.Log($"<color=#FFA720>Found:</color> {this.gameObject.name} => {this.collector.GetNode("B1").name}");
 
@@ -23,11 +21,6 @@ protected override void InitOnceComponents()
         }
     }
 
-    protected override void InitOnceEvents()
-    {
-        Debug.Log($"<color=#FFE920>InitOnceEvents:</color> {this.gameObject.name}");
-    }
-
     protected override void OnShow(object obj)
     {
         Debug.Log($"<color=#6FFF20>OnShow:</color> {this.gameObject.name}");

diff --git a/Assets/OxGFrame/CoreFrame/Example/EPFrameDemo/Scripts/DemoEntity2.cs b/Assets/OxGFrame/CoreFrame/Example/EPFrameDemo/Scripts/DemoEntity2.cs
@@ -3,23 +3,17 @@
 
 public class DemoEntity2 : EPBase
 {
-    public override void BeginInit()
+    public override void OnInit()
     {
         Debug.Log($"<color=#FF2A20>InitThis:</color> {this.gameObject.name}");
     }
 
-    protected override void InitOnceComponents()
+    protected override void OnBind()
     {
-        Debug.Log($"<color=#FFA720>InitOnceComponents:</color> {this.gameObject.name}");
         Debug.Log($"<color=#FFA720>Found:</color> {this.gameObject.name} => {this.collector.GetNode("B1").name}");
         Debug.Log($"<color=#FFA720>Found:</color> {this.gameObject.name} => {this.collector.GetNode("B2").name}");
     }
 
-    protected override void InitOnceEvents()
-    {
-        Debug.Log($"<color=#FFE920>InitOnceEvents:</color> {this.gameObject.name}");
-    }
-
     protected override void OnShow(object obj)
     {
         Debug.Log($"<color=#6FFF20>OnShow:</color> {this.gameObject.name}");

diff --git a/Assets/OxGFrame/CoreFrame/Example/GSFrameDemo/Scripts/DemoRS.cs b/Assets/OxGFrame/CoreFrame/Example/GSFrameDemo/Scripts/DemoRS.cs
@@ -6,7 +6,7 @@
 
 public class DemoRS : GSBase
 {
-    public override void BeginInit()
+    public override void OnInit()
     {
 
     }
@@ -30,20 +30,13 @@ protected override void OnShow(object obj)
         Debug.Log("DemoRS OnShow");
     }
 
-    protected override void InitOnceComponents()
+    protected override void OnBind()
     {
         /**
-         * Do Somthing Init Once In Here (For Components)
+         * Do Somthing Init Once Components and Events In Here
          */
     }
 
-    protected override void InitOnceEvents()
-    {
-        /**
-          * Do Somthing Init Once In Here (For Events)
-          */
-    }
-
     protected override void OnUpdate(float dt)
     {
         /**

diff --git a/Assets/OxGFrame/CoreFrame/Example/GSFrameDemo/Scripts/DemoSC.cs b/Assets/OxGFrame/CoreFrame/Example/GSFrameDemo/Scripts/DemoSC.cs
@@ -6,7 +6,7 @@
 
 public class DemoSC : GSBase
 {
-    public override void BeginInit()
+    public override void OnInit()
     {
     }
 
@@ -29,20 +29,13 @@ protected override void OnShow(object obj)
         Debug.Log("DemoSC OnShow");
     }
 
-    protected override void InitOnceComponents()
+    protected override void OnBind()
     {
         /**
-         * Do Somthing Init Once In Here (For Components)
+         * Do Somthing Init Once Components and Events In Here
          */
     }
 
-    protected override void InitOnceEvents()
-    {
-        /**
-          * Do Somthing Init Once In Here (For Events)
-          */
-    }
-
     protected override void OnUpdate(float dt)
     {
         /**

diff --git a/Assets/OxGFrame/CoreFrame/Example/UIFrameDemo/Scripts/Demo1UI.cs b/Assets/OxGFrame/CoreFrame/Example/UIFrameDemo/Scripts/Demo1UI.cs
@@ -10,7 +10,7 @@ public class Demo1UI : UIBase
     private Button oepnBtn;
     private Image myImage2;
 
-    public override void BeginInit()
+    public override void OnInit()
     {
     }
 
@@ -33,17 +33,14 @@ protected override void OnShow(object obj)
         Debug.Log(string.Format("{0} Do Something OnShow.", this.gameObject.name));
     }
 
-    protected override void InitOnceComponents()
+    protected override void OnBind()
     {
         this.myImage = this.collector.GetNode("Image1")?.GetComponent<Image>();
         if (this.myImage != null) Debug.Log(string.Format("Binded GameObject: {0}", this.myImage.name));
 
         this.oepnBtn = this.collector.GetNode("OpenBtn")?.GetComponent<Button>();
         if (this.oepnBtn != null) Debug.Log(string.Format("Binded GameObject: {0}", this.oepnBtn.name));
-    }
 
-    protected override void InitOnceEvents()
-    {
         this.oepnBtn.onClick.AddListener(this._ShowDemoPopup2UI);
     }
 

diff --git a/Assets/OxGFrame/CoreFrame/Example/UIFrameDemo/Scripts/Demo2UI.cs b/Assets/OxGFrame/CoreFrame/Example/UIFrameDemo/Scripts/Demo2UI.cs
@@ -9,7 +9,7 @@ public class Demo2UI : UIBase
     private Image myImage;
     private Button oepnBtn;
 
-    public override void BeginInit()
+    public override void OnInit()
     {
     }
 
@@ -32,17 +32,14 @@ protected override void OnShow(object obj)
         Debug.Log(string.Format("{0} - Do Something OnShow.", this.gameObject.name));
     }
 
-    protected override void InitOnceComponents()
+    protected override void OnBind()
     {
         this.myImage = this.collector.GetNode("Image2")?.GetComponent<Image>();
         if (this.myImage != null) Debug.Log(string.Format("Binded GameObject: {0}", this.myImage.name));
 
         this.oepnBtn = this.collector.GetNode("OpenBtn")?.GetComponent<Button>();
         if (this.oepnBtn != null) Debug.Log(string.Format("Binded GameObject: {0}", this.oepnBtn.name));
-    }
 
-    protected override void InitOnceEvents()
-    {
         this.oepnBtn.onClick.AddListener(this._ShowDemoPopup3UI);
     }
 

diff --git a/Assets/OxGFrame/CoreFrame/Example/UIFrameDemo/Scripts/Demo3UI.cs b/Assets/OxGFrame/CoreFrame/Example/UIFrameDemo/Scripts/Demo3UI.cs
@@ -9,7 +9,7 @@ public class Demo3UI : UIBase
     private Image myImage;
     private Button loadSceneBtn;
 
-    public override void BeginInit()
+    public override void OnInit()
     {
     }
 
@@ -32,17 +32,14 @@ protected override void OnShow(object obj)
         Debug.Log(string.Format("{0} - Do Something OnShow.", this.gameObject.name));
     }
 
-    protected override void InitOnceComponents()
+    protected override void OnBind()
     {
         this.myImage = this.collector.GetNode("Image3")?.GetComponent<Image>();
         if (this.myImage != null) Debug.Log(string.Format("Binded GameObject: {0}", this.myImage.gameObject.name));
 
         this.loadSceneBtn = this.collector.GetNode("LoadSceneBtn")?.GetComponent<Button>();
         if (this.loadSceneBtn != null) Debug.Log(string.Format("Binded GameObject: {0}", this.loadSceneBtn.gameObject.name));
-    }
 
-    protected override void InitOnceEvents()
-    {
         this.loadSceneBtn.onClick.AddListener(this._ShowDemoScene);
     }
 

diff --git a/Assets/OxGFrame/CoreFrame/Example/UIFrameDemo/Scripts/DemoLoadingUI.cs b/Assets/OxGFrame/CoreFrame/Example/UIFrameDemo/Scripts/DemoLoadingUI.cs
@@ -3,7 +3,7 @@
 
 public class DemoLoadingUI : UIBase
 {
-    public override void BeginInit()
+    public override void OnInit()
     {
     }
 
@@ -21,20 +21,13 @@ protected override void CloseSub()
         */
     }
 
-    protected override void InitOnceComponents()
+    protected override void OnBind()
     {
         /**
-         * Do Somthing Init Once In Here (For Components)
+         * Do Somthing Init Once Components and Events In Here
          */
     }
 
-    protected override void InitOnceEvents()
-    {
-        /**
-          * Do Somthing Init Once In Here (For Events)
-          */
-    }
-
     protected override void OnShow(object obj)
     {
         /**

diff --git a/Assets/OxGFrame/CoreFrame/Scripts/Editor/TplScripts/EPFrame/TplEP.cs.txt b/Assets/OxGFrame/CoreFrame/Scripts/Editor/TplScripts/EPFrame/TplEP.cs.txt
@@ -4,24 +4,17 @@ public class #SCRIPTNAME# : EPBase
 {
     // Use ~Node@XXX to Bind
 
-    public override void BeginInit()
+    public override void OnInit()
     {
         /**
          * Do Somthing Init Once In Here
          */
     }
 
-    protected override void InitOnceComponents()
+    protected override void OnBind()
     {
         /**
-         * Do Somthing Init Once In Here (For Components)
-         */
-    }
-
-    protected override void InitOnceEvents()
-    {
-        /**
-         * Do Somthing Init Once In Here (For Events)
+         * Do Somthing Init Once Components and Events In Here (For Bind)
          */
     }
 

diff --git a/Assets/OxGFrame/CoreFrame/Scripts/Editor/TplScripts/GSFrame/TplGS.cs.txt b/Assets/OxGFrame/CoreFrame/Scripts/Editor/TplScripts/GSFrame/TplGS.cs.txt
@@ -5,7 +5,7 @@ public class #SCRIPTNAME# : GSBase
 {
     // Use _Node@XXX to Bind
 
-    public override void BeginInit()
+    public override void OnInit()
     {
         /**
          * Do Somthing Init Once In Here
@@ -26,17 +26,10 @@ public class #SCRIPTNAME# : GSBase
          */
     }
 
-    protected override void InitOnceComponents()
+    protected override void OnBind()
     {
         /**
-         * Do Somthing Init Once In Here (For Components)
-         */
-    }
-
-    protected override void InitOnceEvents()
-    {
-        /**
-         * Do Somthing Init Once In Here (For Events)
+         * Do Somthing Init Once Components and Events In Here (For Bind)
          */
     }
 
@@ -63,11 +56,15 @@ public class #SCRIPTNAME# : GSBase
 
     protected override void OnClose()
     {
-
+        /**
+         * Do Something on close (Close)
+         */
     }
 
     public override void OnRelease()
     {
-
+        /**
+         * Do Something on release (CloseAndDestroy)
+         */
     }
 }
diff --git a/Assets/OxGFrame/CoreFrame/Scripts/Editor/TplScripts/UIFrame/TplUI.cs.txt b/Assets/OxGFrame/CoreFrame/Scripts/Editor/TplScripts/UIFrame/TplUI.cs.txt
@@ -5,7 +5,7 @@ public class #SCRIPTNAME# : UIBase
 {
     // Use _Node@XXX to Bind
 
-    public override void BeginInit()
+    public override void OnInit()
     {
         /**
          * Do Somthing Init Once In Here
@@ -26,17 +26,10 @@ public class #SCRIPTNAME# : UIBase
          */
     }
 
-    protected override void InitOnceComponents()
+    protected override void OnBind()
     {
         /**
-         * Do Somthing Init Once In Here (For Components)
-         */
-    }
-
-    protected override void InitOnceEvents()
-    {
-        /**
-         * Do Somthing Init Once In Here (For Events)
+         * Do Somthing Init Once Components and Events In Here (For Bind)
          */
     }
 
@@ -73,11 +66,15 @@ public class #SCRIPTNAME# : UIBase
 
     protected override void OnClose()
     {
-
+        /**
+         * Do Something on close (Close)
+         */
     }
 
     public override void OnRelease()
     {
-
+        /**
+         * Do Something on release (CloseAndDestroy)
+         */
     }
 }
diff --git a/Assets/OxGFrame/CoreFrame/Scripts/Runtime/Core/EPFrame/EPBase.cs b/Assets/OxGFrame/CoreFrame/Scripts/Runtime/Core/EPFrame/EPBase.cs
@@ -26,16 +26,14 @@ private void OnDestroy()
             AssetLoaders.UnloadAsset(this.assetName);
         }
 
-        public override void BeginInit() { }
+        public override void OnInit() { }
 
         public sealed override void InitFirst()
         {
             base.InitFirst();
         }
 
-        protected override void InitOnceComponents() { }
-
-        protected override void InitOnceEvents() { }
+        protected override void OnBind() { }
 
         protected override void OnShow(object obj) { }