@cc-component/cc-guide 1.1.8 → 1.1.9

package/assets/guide/guide/GuideCenter.ts

@@ -34,6 +34,8 @@ export class GuideCenter {
     callClick: (step: number) => void;
     callJumpWindow: (urls: string[]) => void;
     callFinishGroup: (param: ITableGuide) => void;
+
+    callButtonClick: (node: Node) => boolean
     /** 游戏初始化模块 */
     guide: Guide = null!;
     node: Node;
@@ -328,6 +330,10 @@ export class GuideCenter {
         this.callFinishGroup = call
     }
 
+    OnButtonClick(finish: (node: Node) => boolean) {
+        this.callButtonClick = finish
+    }
+
     LoadSprite(sp: Sprite, param: string, callback?: () => void) {
         const path = param + '/spriteFrame'
         const bundleName = this.param.bundleName

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

@@ -191,13 +191,10 @@ export class GuideViewComp extends Component {
                     });
 
                 } else {
-                    //@ts-ignore
-                    const mbutton_event = button?.onClick;//自定义事件
-                    if (mbutton_event) {
-                        mbutton_event.dispatch()
+                    const isCust = GuideModule.GuideCenter.callButtonClick(btn)
+                    if (isCust) {
                         this.onClick()
-                    }
-                    else {
+                    } else {
                         button.clickEvents.forEach((e, index) => {
                             if (button.interactable)
                                 e.emit([event]);
@@ -206,6 +203,15 @@ export class GuideViewComp extends Component {
                             }
                         });
                     }
+                    //@ts-ignore
+                    // const mbutton_event = button?.onClick;//自定义事件
+                    // if (mbutton_event) {
+                    //     mbutton_event.dispatch()
+                    //     this.onClick()
+                    // }
+                    // else {
+
+                    // }
                 }
             } else {
                 const item = this.model.current
@@ -213,10 +219,9 @@ export class GuideViewComp extends Component {
                     const view = item.getComponent(GuideViewItem)
                     //按钮
                     let target_button = view.findButton()
-                    //@ts-ignore
-                    const mbutton_event = target_button?.onClick;//自定义事件
-                    if (mbutton_event) {
-                        mbutton_event.dispatch()
+                    const isCust = GuideModule.GuideCenter.callButtonClick(target_button.node)
+                    if (isCust) {
+
                     } else {
                         const clickEvents = target_button?.clickEvents ?? [];
                         if (target_button?.interactable) {
@@ -240,19 +245,15 @@ export class GuideViewComp extends Component {
                             } else {
                                 btn.dispatchEvent(event)
                             }
-
                         }
                     }
                 }
                 this.onClick()
             }
-
             this.next();
         } catch (error) {
-
             Log.error('报错了：', error)
         }
-
     }
 
     /** 刷新引导位置 */

package/assets/guide/interface/GuideModule.ts

@@ -25,32 +25,12 @@ class GuideModule {
   static OnMessageClick(call: (step: number) => void) { GuideCenter.instance.OnMessageClick(call) }
   static OnMessageJumpWindow(call: (urls: string[]) => void) { GuideCenter.instance.OnMessageJumpWindow(call) }
   static OnMessageFinishGroup(call: (param: ITableGuide) => void) { GuideCenter.instance.OnMessageFinishGroup(call) }
-  /**是否引导中 */
-  static GuideShow(): boolean { return GuideSDK.GuideShow() };
-
 
-  // //#region  任务引导
-  // static get TaskCenter(): TaskCenter { return TaskCenter.instance; }
-  // static TaskInit(node: Node, step?: number, step_week?: number) { return TaskSDK.init(node, step, step_week); }
+  static OnButtonClick(finish: (node: Node) => boolean) { GuideCenter.instance.OnButtonClick(finish) }
 
-  //#region  任务引导
-  // static TaskInit(node: Node, step?: number, step_week?: number) { return TaskSDK.init(node, step, step_week); }
-  // static CheckGroup(id: number, index: number) { TaskSDK.CheckGroup(id, index); }
-  // static TaskStartGuideGroup<T>(group_id: number): Promise<T> { return TaskSDK.startTaskGroup(group_id); }
+  /**是否引导中 */
+  static GuideShow(): boolean { return GuideSDK.GuideShow() };
 
-  // static TaskGuideSDK() { return TaskCenter.instance; }
-  // static TaskMoveTo(param: any, window_name: string): { window: string, row: number } { return TaskSDK.MoveTo(param, window_name) };
-  // /**是否Task引导中 */
-  // static TaskGuideShow(): boolean { return TaskSDK.TaskShow() };
-  // static HideAll() { TaskSDK.HideAll() };
-  // static GetPromptView() { return TaskSDK.GetPromptView() }
-  // static GetCurrentHard() { return TaskCenter.instance.GetCurrentHard() }
-  // static FinishTaskHard(ground_id: number, step: number) { TaskCenter.instance.guide.TaskView.FinishTaskHard(ground_id, step) }
-  // static GetGroup(id: number) { return TaskCenter.instance.guide.TaskModel?.guide_group.get(id) ?? [] }
-  // static Step(value: number) { TaskSDK.step(value) }
-  // static GetWindowNmaeStep(id: number, class_name: string) { return TaskCenter.instance.guide.TaskModel.GetWindowNmaeStep(id, class_name) }
-  // static HideGroupAll(id: number) { TaskCenter.instance.HideGroupAll(id) }
-  // static ResetMinStep() { TaskCenter.instance.guide.TaskModel.ResetMinStep() }
 }
 window.GuideModule = GuideModule;
 

package/assets/guide/interface/Interface.ts

@@ -28,6 +28,8 @@ declare global {
         function OnMessageJumpWindow(call: (urls: string[]) => void)
         /**监听完成引导组引导 */
         function OnMessageFinishGroup(call: (param: ITableGuide) => void)
+        /**引导按钮点击事件 */
+        function OnButtonClick(finish: (node: Node) => boolean)
         /**是否引导中 */
         function GuideShow(): boolean;
         /**开启日志打印 */

package/package.json

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