@cc-component/cc-guide 1.0.5 → 1.0.7

package/assets/guide/guide/GuideCenter.ts

@@ -31,7 +31,7 @@ export class GuideCenter {
 
     callClick: (step: number) => void;
     callJumpWindow: (urls: string[]) => void;
-    callFinishGroup: () => void;
+    callFinishGroup: (groupId: number) => void;
     /** 游戏初始化模块 */
     guide: Guide = null!;
     node: Node;
@@ -207,7 +207,7 @@ export class GuideCenter {
                 } else {
                     this.step = 100000
                     step_net = this.step;
-                    GuideModule.GuideCenter.callFinishGroup?.()
+                    GuideModule.GuideCenter.callFinishGroup?.(curren.data.groupID)
                 }
                 this.callMessageNet?.(step_net, () => { }) //功能引导
             }
@@ -321,7 +321,7 @@ export class GuideCenter {
     OnMessageJumpWindow(call: (urls: string[]) => void) {
         this.callJumpWindow = call
     }
-    OnMessageFinishGroup(call: () => void) {
+    OnMessageFinishGroup(call: (groupId: number) => void) {
         this.callFinishGroup = call
     }
 

package/assets/guide/guide/view/GuideViewComp.ts

@@ -190,13 +190,21 @@ export class GuideViewComp extends Component {
                     });
 
                 } else {
-                    button.clickEvents.forEach((e, index) => {
-                        if (button.interactable)
-                            e.emit([event]);
-                        if (index === 0) {
-                            this.onClick()
-                        }
-                    });
+                    //@ts-ignore
+                    const event = button.onClick;//自定义事件
+                    if (event) {
+                        event.dispatch()
+                        this.onClick()
+                    }
+                    else {
+                        button.clickEvents.forEach((e, index) => {
+                            if (button.interactable)
+                                e.emit([event]);
+                            if (index === 0) {
+                                this.onClick()
+                            }
+                        });
+                    }
                 }
             } else {
                 const item = this.model.current

package/assets/guide/interface/GuideModule.ts

@@ -22,7 +22,7 @@ class GuideModule {
   static OnMessageStepNet(call: (step: number, finish: Function) => void) { GuideCenter.instance.OnMessageStepNet(call) }
   static OnMessageClick(call: (step: number) => void) { GuideCenter.instance.OnMessageClick(call) }
   static OnMessageJumpWindow(call: (urls: string[]) => void) { GuideCenter.instance.OnMessageJumpWindow(call) }
-  static OnMessageFinishGroup(call: () => void) { GuideCenter.instance.OnMessageFinishGroup(call) }
+  static OnMessageFinishGroup(call: (groupId: number) => void) { GuideCenter.instance.OnMessageFinishGroup(call) }
   /**是否引导中 */
   static GuideShow(): boolean { return GuideSDK.GuideShow() };
 

package/assets/guide/interface/Interface.ts

@@ -25,7 +25,7 @@ declare global {
         /**监听跳转界面 */
         function OnMessageJumpWindow(call: (urls: string[]) => void)
         /**监听完成引导组引导 */
-        function OnMessageFinishGroup(call: () => void)
+        function OnMessageFinishGroup(call: (groupId: number) => void)
         /**是否引导中 */
         function GuideShow(): boolean;
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cc-component/cc-guide",
-    "version": "1.0.5",
+    "version": "1.0.7",
     "engine": ">=3.8.6",
     "description": "系统组件添加常用扩展方法",
     "main": "index.ts",