@cc-component/cc-ex-component 1.7.5 → 1.7.7

package/assets/core/ViewModel.ts

@@ -18,6 +18,8 @@ import { YXCollectionView, YXIndexPath } from '../lib/collectView/lib_collect/yx
 import { EventTouch } from 'cc';
 import { YXPagelayout } from '../lib/collectView/lib_collect/yx-page-layout';
 import { SpriteFrame } from 'cc';
+import { tween } from 'cc';
+import { v3 } from 'cc';
 
 interface IBindingData extends ITableViewEvents, IBindingDataEvents {
     dataPath: string;
@@ -202,6 +204,10 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
         touch_end = 'CALL_TOUCH_END'
         touch_cancel = 'CALL_TOUCH_CANCEL'
 
+        touch_start_scale = 'touch_start_scale'
+        touch_end_scale = 'touch_end_scale'
+        touch_cancel_scale = 'touch_cancel_scale'
+
         touch_click = 'CALL_CLICK'
         touch_slide = 'CALL_SLIDE_EVENT'
         touch_toggle = 'CALL_TOGGLE_EVENT'
@@ -313,6 +319,27 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
         refreshData(key: string, value: any) {
 
         }
+
+        resetButtonScale(btn: Button) {
+            if (btn.transition === Button.Transition.SCALE && ExComponentModule.EmitAnim()) {
+                btn.node.off(Node.EventType.TOUCH_START, btn[this.touch_start_scale]);
+                btn.node.off(Node.EventType.TOUCH_END, btn[this.touch_end_scale]);
+                btn.node.off(Node.EventType.TOUCH_CANCEL, btn[this.touch_end_scale]);
+                const scale = btn.zoomScale;
+                btn[this.touch_start_scale] = () => {
+                    tween(btn.node).to(btn.duration, { scale: v3(scale, scale, scale) }).start()
+                }
+                btn[this.touch_end_scale] = () => {
+                    tween(btn.node).to(btn.duration, { scale: v3(1, 1, 1) }).start()
+                }
+                btn.node.on(Node.EventType.TOUCH_START, btn[this.touch_start_scale])
+                btn.node.on(Node.EventType.TOUCH_END, btn[this.touch_end_scale])
+                btn.node.on(Node.EventType.TOUCH_CANCEL, btn[this.touch_end_scale])
+                btn.transition = Button.Transition.NONE;
+                //  ExComponentModule.EmitAnim(btn as Button)
+            }
+        }
+
         onTouch() {
             const map = bindingMap.get(this.className)
             for (const [propertyKey, value] of map) {
@@ -328,6 +355,15 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
             for (const [propertyKey, value] of map) {
                 const com_btn = this[propertyKey];
                 if (!com_btn) { continue }
+
+                if (com_btn[this.touch_start_scale]) {
+                    com_btn.node.off(Node.EventType.TOUCH_START, com_btn[this.touch_start_scale]);
+                    com_btn.node.off(Node.EventType.TOUCH_END, com_btn[this.touch_end_scale]);
+                    com_btn.node.off(Node.EventType.TOUCH_CANCEL, com_btn[this.touch_end_scale]);
+                    com_btn[this.touch_start_scale] = null
+                    com_btn[this.touch_end_scale] = null
+
+                }
                 if (com_btn[this.touch_click]) {
                     com_btn.node.off(Button.EventType.CLICK, com_btn[this.touch_click]);
                     com_btn[this.touch_click] = null
@@ -371,6 +407,8 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
 
         touch(data: IBindingData, com_btn: Component, value: any, self: any) {
             if (data.type === "cc.Button") {
+                //(com_btn as Button).duration = 2
+                this.resetButtonScale(com_btn as Button)
                 const tempData = { value: value, skip: false }
                 //点击
                 const touch_click = this.touch_click;
@@ -378,11 +416,13 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
                     const sx = data.propertyKey;
                     com_btn.node.off(Button.EventType.CLICK, com_btn[touch_click]);
                     tempData.skip = true;
-                    const btnCall = (btn) => {
-                        tempData.value = btn.node.active
-                        self.viewModel[sx] = tempData
-                        data.event?.call(self)
-                        self[`onClick_${sx}`]?.(btn)
+                    const btnCall = (btn: Button) => {
+                        if (btn.interactable) {
+                            tempData.value = btn.node.active
+                            self.viewModel[sx] = tempData
+                            data.event?.call(self)
+                            self[`onClick_${sx}`]?.(btn)
+                        }
                     }
                     com_btn[touch_click] = btnCall
                     com_btn.node.on(Button.EventType.CLICK, btnCall);
@@ -392,7 +432,8 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
                 if (data.touchStart && !com_btn[touch_start]) {
                     com_btn.node.off(Node.EventType.TOUCH_START, com_btn[touch_start]);
                     const call_start = (btn) => {
-                        data.touchStart?.call(self, btn)
+                        if (btn.interactable)
+                            data.touchStart?.call(self, btn)
                     }
                     com_btn[touch_start] = call_start
                     com_btn.node.on(Node.EventType.TOUCH_START, com_btn[touch_start]);
@@ -401,7 +442,8 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
                 if (data.touchMove && !com_btn[touch_start]) {
                     com_btn.node.off(Node.EventType.TOUCH_MOVE, com_btn[touch_start]);
                     const call_start = (btn) => {
-                        data.touchMove?.call(self, btn)
+                        if (btn.interactable)
+                            data.touchMove?.call(self, btn)
                     }
                     com_btn[touch_start] = call_start
                     com_btn.node.on(Node.EventType.TOUCH_MOVE, com_btn[touch_start]);
@@ -410,7 +452,8 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
                 if (data.touchEnd && !com_btn[touch_start]) {
                     com_btn.node.off(Node.EventType.TOUCH_END, com_btn[touch_start]);
                     const call_start = (btn) => {
-                        data.touchEnd?.call(self, btn)
+                        if (btn.interactable)
+                            data.touchEnd?.call(self, btn)
                     }
                     com_btn[touch_start] = call_start
                     com_btn.node.on(Node.EventType.TOUCH_END, com_btn[touch_start]);
@@ -419,7 +462,8 @@ export function ViewModel<T extends new (...args: any[]) => Component>(Base: T)
                 if (data.touchCancel && !com_btn[touch_start]) {
                     com_btn.node.off(Node.EventType.TOUCH_CANCEL, com_btn[touch_start]);
                     const call_start = (btn) => {
-                        data.touchCancel?.call(self, btn)
+                        if (btn.interactable)
+                            data.touchCancel?.call(self, btn)
                     }
                     com_btn[touch_start] = call_start
                     com_btn.node.on(Node.EventType.TOUCH_CANCEL, com_btn[touch_start]);

package/assets/interface/ExComponentModule.ts

@@ -13,6 +13,7 @@ export class ExComponentModule {
     }
 
     param: { click: (comp: Button) => void }
+    paramAnim: { enable: boolean }
     paramSprite: { loadSprite: (param: { bundle: string, path: string }) => Promise<SpriteFrame>, getSprite: (param: { bundle: string, path: string }) => SpriteFrame }
     paramSpine: { loadSpine: (param: { bundle: string, path: string }) => Promise<sp.SkeletonData>, getSpine: (param: { bundle: string, path: string }) => sp.SkeletonData }
     paramUIWindow: { onLoad: (config: any, viewModel: any) => void }
@@ -22,11 +23,13 @@ export class ExComponentModule {
 
     }
 
+    static EnableButtonScale(param: { enable: boolean }) {
+        ExComponentModule.Ins.paramAnim = param
+    }
     static OnButtonClick(param: { click: (comp: Button) => void }) {
         ExComponentModule.Ins.param = param
     }
 
-
     static ResetBaseWindow(name?: string, isGet?: boolean) {
         if (!isGet) ExComponentModule.Ins.ResetBaseWindow = name
         return ExComponentModule.Ins.ResetBaseWindow
@@ -46,6 +49,9 @@ export class ExComponentModule {
     static Emit(btn: Button) {
         ExComponentModule.Ins.param.click(btn)
     }
+    static EmitAnim() {
+        return ExComponentModule.Ins.paramAnim?.enable
+    }
 
     static async EmitLoadSprite(param: any): Promise<SpriteFrame> {
         return ExComponentModule.Ins.paramSprite?.loadSprite?.(param)

package/assets/interface/Interface.ts

@@ -2,10 +2,23 @@ import { SpriteFrame } from "cc";
 import { sp } from "cc";
 import { Sprite } from "cc";
 import { Button } from "cc";
+interface IConfig {
+    module: string,
+    layer: string,
+    path: string,
+    bundle: string,
+    name?: string,/**窗口名称 */
+    index?: number,
+    is_load_sub?: boolean,
+    /**是否记录-不记录可重复打开窗口 */
+    is_record?: boolean,
+}
 declare global {
     namespace ExComponentModule {
         /**初始化 */
         function Init();
+        /**开启按钮缩放 */
+        function EnableButtonScale(param: { enable: boolean });
         /**监听所有按钮的点击事件 */
         function OnButtonClick(param: { click: (comp: Button) => void });
         /**监听加载图片 */
@@ -14,37 +27,15 @@ declare global {
         /**重置基础窗口 */
         function ResetBaseWindow(name?: string, isGet?: boolean);
         /**监听UI onLoad 给模块manager 赋值  */
-        function OnVMManager(param: {
-            onLoad: (config: {
-                module: string,
-                layer: string,
-                path: string,
-                bundle: string,
-                name?: string,/**窗口名称 */
-                index?: number,
-                is_load_sub?: boolean,
-                /**是否记录-不记录可重复打开窗口 */
-                is_record?: boolean,
-            }, viewModel: any) => void
-        });
+        function OnVMManager(param: { onLoad: (config: IConfig, viewModel: any) => void });
         /**组件：内部使用方法 */
         function Emit(btn: Button);
+        function EmitAnim();
         //#region  组件：内部使用方法----------------
         function EmitLoadSprite(param: any): Promise<SpriteFrame>;
         function EmitGetSprite(param: any): SpriteFrame;
         function EmitLoadSpine(param: any): Promise<sp.SkeletonData>;
         function EmitGetSpine(param: any): sp.SkeletonData;
-        function EmitUIWindow(param: {
-            module: string,
-            layer: string,
-            path: string,
-            bundle: string,
-            name?: string,/**窗口名称 */
-            name_ui?: string,/**窗口名称 */
-            index?: number,
-            is_load_sub?: boolean,
-            /**是否记录-不记录可重复打开窗口 */
-            is_record?: boolean,
-        }, viewModel: any);
+        function EmitUIWindow(param: IConfig, viewModel: any);
     }
 }

package/package.json

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