@cc-component/cc-guide 1.1.4 → 1.1.6

package/assets/guide/guide/GuideCenter.ts

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

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

@@ -192,9 +192,9 @@ export class GuideViewComp extends Component {
 
                 } else {
                     //@ts-ignore
-                    const event = button.onClick;//自定义事件
-                    if (event) {
-                        event.dispatch()
+                    const mbutton_event = target_button?.onClick;//自定义事件
+                    if (mbutton_event) {
+                        mbutton_event.dispatch()
                         this.onClick()
                     }
                     else {
@@ -213,29 +213,35 @@ export class GuideViewComp extends Component {
                     const view = item.getComponent(GuideViewItem)
                     //按钮
                     let target_button = view.findButton()
-                    const clickEvents = target_button?.clickEvents ?? [];
-                    if (target_button?.interactable) {
-                        clickEvents.forEach((e, index) => { e.emit([event]); });
-                    }
-                    //解决用node.on("click") 监听的事件
-                    if (target_button && clickEvents.length <= 0) {
-                        if (target_button.interactable) {
-                            target_button.node.emit("click");
+                    //@ts-ignore
+                    const mbutton_event = target_button?.onClick;//自定义事件
+                    if (mbutton_event) {
+                        mbutton_event.dispatch()
+                    } else {
+                        const clickEvents = target_button?.clickEvents ?? [];
+                        if (target_button?.interactable) {
+                            clickEvents.forEach((e, index) => { e.emit([event]); });
                         }
-                    }
-                    else {
-                        //toggle组件
-                        const target_toggle = view.findToggle()
-                        const target_toggle_container = view.findToggleContainer()
-                        if (target_toggle_container && target_toggle) {
-                            target_toggle_container?.checkEvents.forEach(event => {
-                                if (target_toggle.interactable)
-                                    event.emit([target_toggle]);
-                            })
-                        } else {
-                            btn.dispatchEvent(event)
+                        //解决用node.on("click") 监听的事件
+                        if (target_button && clickEvents.length <= 0) {
+                            if (target_button.interactable) {
+                                target_button.node.emit("click");
+                            }
                         }
+                        else {
+                            //toggle组件
+                            const target_toggle = view.findToggle()
+                            const target_toggle_container = view.findToggleContainer()
+                            if (target_toggle_container && target_toggle) {
+                                target_toggle_container?.checkEvents.forEach(event => {
+                                    if (target_toggle.interactable)
+                                        event.emit([target_toggle]);
+                                })
+                            } else {
+                                btn.dispatchEvent(event)
+                            }
 
+                        }
                     }
                 }
                 this.onClick()

package/assets/guide/interface/GuideModule.ts

@@ -24,7 +24,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: (groupId: number, enableGroup: number) => void) { GuideCenter.instance.OnMessageFinishGroup(call) }
+  static OnMessageFinishGroup(call: (param: ITableGuide) => void) { GuideCenter.instance.OnMessageFinishGroup(call) }
   /**是否引导中 */
   static GuideShow(): boolean { return GuideSDK.GuideShow() };
 

package/assets/guide/interface/Interface.ts

@@ -27,7 +27,7 @@ declare global {
         /**监听跳转界面 */
         function OnMessageJumpWindow(call: (urls: string[]) => void)
         /**监听完成引导组引导 */
-        function OnMessageFinishGroup(call: (groupId: number, enableGroup: number) => void)
+        function OnMessageFinishGroup(call: (param: ITableGuide) => void)
         /**是否引导中 */
         function GuideShow(): boolean;
         /**开启日志打印 */

package/package.json

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