@cc-component/cc-ex-component 1.3.1 → 1.3.3

package/assets/core/BaseWindow.ts

@@ -1,6 +1,7 @@
 import { UIOpacity, tween, Vec3 } from 'cc';
 import { _decorator, Component, Node } from 'cc';
 import { BaseReference } from './BaseReference';
+import { Button } from 'cc';
 const { ccclass, property } = _decorator;
 
 @ccclass('BaseWindow')
@@ -29,13 +30,22 @@ export class BaseWindow extends BaseReference {
         if (!this.root || !this.maskOpacity) { return }
         this.showAnim()
     }
+    /**
+    * 关闭界面
+    * @param param
+    * @param param.is_anim 是否有动画
+    * @param param.param 关闭参数
+    * @param param.finish 关闭完成回调
+    * @param param.comp 关闭的按钮组件
+    * @param param.time 关闭的按钮的时间 
+    */
     public close(param?: { is_anim?: boolean, param?: any, finish?: Function }) {
         this.paramClose = param;
         this.param?.callBack?.(param?.param)//回调方法
         if (param?.is_anim && this.root && this.maskOpacity) {
             this.hideAnim()
         } else {
-            param?.finish()
+            param?.finish?.()
             this.destroyWindow()
         }
     }

package/assets/core/ReferenceComponent.ts

@@ -27,7 +27,6 @@ export class ReferenceComponent extends Component {
     @property({ displayName: "复制属性" })
     private get refresh() { return this._refresh; }
     private set refresh(val: boolean) {
-        console.error('打印了')
         if (EDITOR_NOT_IN_PREVIEW) {
             this.initNodeList();
             this.genCode();
@@ -85,6 +84,8 @@ export class ReferenceComponent extends Component {
     comList2 = ["YXCollectionView", "TableView"]
     comList_base = ["EditBox", "Toggle", "ToggleContainer", "Slider", "Button", "ProgressBar"]
 
+    /** 生成代码基础窗口名称 */
+    public baseWindowName = "BaseWindow"
     skipList = ["Button"]//跳过按钮类型
     protected onLoad(): void {
         if (EDITOR_NOT_IN_PREVIEW) {//处理编辑器逻辑
@@ -343,9 +344,10 @@ ${sx_this}
     /** 生成引用节点的获取代码 并复制到剪切板 */
     private genCodeVmDataAll() {
         if (!EDITOR_NOT_IN_PREVIEW) return;
+        this.baseWindowName = ExComponentModule.ResetBaseWindow('', true)
         let importStr = `
 import { Label, RichText, ProgressBar, Sprite, EditBox, Toggle, Slider, ToggleContainer, Button, math, SpriteFrame, _decorator , Node} from 'cc';
-import { ViewModel, BindViewModel, BindTable, BindCollect, Bind, Ref, BaseViewModelData, YXCollectionView, YXFlowLayout, TableView, BaseReference } from 'db://assets/pkg-export/@cc-component/cc-ex-component';
+import { ViewModel, BindViewModel, BindTable, BindCollect, Bind, Ref, BaseViewModelData, YXCollectionView, YXFlowLayout, TableView, BaseWindow } from 'db://assets/pkg-export/@cc-component/cc-ex-component';
 const { ccclass, property } = _decorator;`
 
         if (this.isComDebug) {
@@ -378,7 +380,7 @@ const { ccclass, property } = _decorator;
         const classView = `
 @BindViewModel(${className}Data)
 @ccclass('${className}')
-export class ${className} extends ViewModel(BaseReference) {${sx.text}\n${onload}\n\n${sx.event}\n}`
+export class ${className} extends ViewModel(${this.baseWindowName}) {${sx.text}\n${onload}\n\n${sx.event}\n}`
 
         text += classView
 

package/assets/ex/ExCommon.ts

@@ -627,6 +627,18 @@ sp.Skeleton.prototype.fromHEX = function (this: sp.Skeleton, hex: string): void
     const label = this;
     label.color = (new Color()).fromHEX(hex)
 };
+
+
+// 保存原始方法
+const originalOnTouchEnded = Button.prototype["_onTouchEnded"];
+// 重写 _onTouchEnded
+Button.prototype["_onTouchEnded"] = function (...args: any[]) {
+    // 播放点击音效
+    ExComponentModule.Emit(this);
+    // 调用原始逻辑
+    return originalOnTouchEnded.apply(this, args);
+};
+
 export { };
 
 

package/assets/interface/ExComponentModule.ts

@@ -0,0 +1,38 @@
+import { Button } from "cc";
+
+
+export class ExComponentModule {
+    static _instance: ExComponentModule;
+    static get Ins() {
+        if (!this._instance) {
+            this._instance = new ExComponentModule();
+        }
+        return this._instance;
+    }
+
+    param: { click: (comp: Button) => void }
+    ResetBaseWindow: string = "BaseWindow";
+    static Init() {
+
+    }
+
+    static OnButtonClick(param: { click: (comp: Button) => void }) {
+        ExComponentModule.Ins.param = param
+    }
+    static Emit(btn: Button) {
+        ExComponentModule.Ins.param.click(btn)
+    }
+
+    static ResetBaseWindow(name?: string, isGet?: boolean) {
+        if (!isGet) ExComponentModule.Ins.ResetBaseWindow = name
+        return ExComponentModule.Ins.ResetBaseWindow
+    }
+
+
+}
+window.ExComponentModule = ExComponentModule;
+
+
+export function ResetBaseWindow(path?: string) {
+    return function (target: any) { ExComponentModule.ResetBaseWindow(path) }
+}

package/assets/interface/ExComponentModule.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.24",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "52b81889-807f-4ef9-a4a9-9e1c65bf5f66",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

package/assets/interface/Interface.ts

@@ -0,0 +1,13 @@
+import { Button } from "cc";
+declare global {
+    namespace ExComponentModule {
+        /**初始化 */
+        function Init();
+        /**监听所有按钮的点击事件 */
+        function OnButtonClick(param: { click: (comp: Button) => void });
+        function ResetBaseWindow(name?: string, isGet?: boolean);
+        /**组件：内部使用方法 */
+        function Emit(btn: Button);
+
+    }
+}

package/assets/interface/Interface.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.24",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "3305619d-58c5-407d-adb3-38b2311b1991",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

package/assets/interface.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "ea52192e-26a9-4174-8b32-d4f103aafbd4",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

package/index.ts

@@ -5,7 +5,8 @@ export * from './assets/core/ViewModel';
 export * from './assets/core/ReferenceComponent';
 export * from './assets/core/BaseReference';
 export * from './assets/core/BaseViewModelData';
-
+export * from './assets/interface/Interface';
+export * from './assets/interface/ExComponentModule';
 
 export * from './assets/lib/tableView/TableView';
 export * from './assets/lib/collectView/lib_collect/yx-collection-view';

package/package.json

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