@cc-component/cc-ex-component 1.7.4 → 1.7.6

package/assets/core/BaseWindow.ts

@@ -1,6 +1,9 @@
 import { UIOpacity, tween, Vec3 } from 'cc';
 import { _decorator, Component, Node } from 'cc';
 import { BaseReference } from './BaseReference';
+import { UITransform } from 'cc';
+import { view } from 'cc';
+import { Widget } from 'cc';
 const { ccclass, property } = _decorator;
 
 @ccclass('BaseWindow')
@@ -27,6 +30,9 @@ export class BaseWindow extends BaseReference {
     protected onLoad(): void {
         this.maskOpacity = this.node.getChildByName('mask')?.getComponent(UIOpacity)
         this.root = this.node.getChildByName('root')
+        this.resetMaskSize()
+        this.maskAinm(true)
+
     }
 
     /**
@@ -46,6 +52,7 @@ export class BaseWindow extends BaseReference {
     * @param param.time 关闭的按钮的时间 
     */
     public pop(param?: { is_anim?: boolean, param?: any, finish?: Function }) {
+        //this.maskAinm(false)
         this.paramClose = param;
         this.param?.callBack?.(param?.param)//回调方法
         if (param?.is_anim && this.root && this.maskOpacity) {
@@ -61,8 +68,6 @@ export class BaseWindow extends BaseReference {
     /**打开动画-可重写动画*/
     public showAnim() {
         this.root.setScale(0.001, 0.001);
-        this.maskOpacity.opacity = 0;
-        tween(this.maskOpacity).to(0.2, { opacity: 255 }).start()
         tween(this.root)
             .to(0.068, { scale: new Vec3(1.15, 1.15, 1.15) })
             .to(0.088, { scale: new Vec3(0.88, 0.88, 0.88) })
@@ -71,7 +76,6 @@ export class BaseWindow extends BaseReference {
     }
     /**关闭动画-可重写动画*/
     public hideAnim() {
-        tween(this.maskOpacity).to(0.2, { opacity: 0 }).start()
         //销毁动画
         tween(this.root)
             .to(0.1, { scale: new Vec3(1.028, 1.028, 1.028) })
@@ -86,11 +90,27 @@ export class BaseWindow extends BaseReference {
         this.paramClose?.param?.finish()
         setTimeout(() => { if (this.node && this.node.isValid) { this.destroyWindow() } });
     }
+    maskAinm(show: boolean) {
+        if (!this.maskOpacity) return
+        if (show) {
+            this.maskOpacity.opacity = 0;
+            tween(this.maskOpacity).to(0.2, { opacity: 255 }).start()
+        } else {
+            tween(this.maskOpacity).to(0.2, { opacity: 0 }).start()
+        }
+    }
     /**关闭事件-当系统级关闭所有打开的界面时。如果关闭界面时需要执行自己的业务逻辑,重写此方法
    * eventName：关闭方法名称
    * param：参数
   */
     closeEvent(): { eventName: string, param?: any } { return null }
+
+    resetMaskSize() {
+        if (!this.maskOpacity) return
+        const widget = this.maskOpacity.node.getComponent(Widget);
+        widget.left = -view.getVisibleSize().width
+        widget.right = -view.getVisibleSize().width
+    }
 }
 
 

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;

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.4",
+    "version": "1.7.6",
     "engine": ">=3.8.6",
     "description": "系统组件添加常用扩展方法",
     "main": "index.ts",