@cc-component/cc-ex-component 1.2.6 → 1.2.8

package/assets/core/ReferenceComponent.ts

@@ -1,4 +1,5 @@
 import { Sprite } from "cc";
+import { assetManager } from "cc";
 import { Enum } from "cc";
 import { _decorator, Component, js, Node } from "cc";
 import { EDITOR_NOT_IN_PREVIEW } from "cc/env";
@@ -25,6 +26,7 @@ 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();
@@ -187,6 +189,7 @@ export class ReferenceComponent extends Component {
             text += line;
         });
         Editor.Clipboard.write("text", text);
+
         console.log("已复制到剪切板");
     }
 
@@ -194,8 +197,8 @@ export class ReferenceComponent extends Component {
     private genCodeBind(isCopy: boolean = true, isClass: boolean = false) {
         if (!EDITOR_NOT_IN_PREVIEW) return;
         let text = "";
-        let eventStr: string = "    //#region ✅ 事件"
-        let pix = "onClick_"
+        let eventStr: string = "    //#region ⚠️ ------------方法事件"
+        let pix = "private onClick_"
         // const com = this.node.components.find(v => { return v.reference })
         // const match = com.name.match(/<([^>]+)>/);
         // const className = match && match[1] ? match[1] : "any"
@@ -203,15 +206,16 @@ export class ReferenceComponent extends Component {
         let data = `${className}Data`
         let iinterface = `I${className}Data`
         //console.error("[MLogger Error]", className)
-        const viewModel = `     
+        const viewModel =
+            `\n    //#region ⚠️ ------------自动生成属性
     // ✅ 外部界面调用,刷新UI
     public refreshUI(data: ${iinterface}) { super.refreshUI(data); }   
     
-    //#region ✅ 使用新装饰器（自动响应式 + 路径推导）
+    // ✅ 使用新装饰器（自动响应式 + 路径推导）
     @BindViewModel(${className}Data)
     viewModel: ${className}Data;`
         text += viewModel + "\n\n"
-        text += `    //#region ✅ UI属性`
+        text += `    // ✅ UI属性`
         //生成get属性
         this.nodes.forEach(data => {
             let key = data.key;
@@ -250,7 +254,7 @@ export class ReferenceComponent extends Component {
             }
 
             let bind = `${bind_pix}("${name}"${this.comList.includes(type) ? event : ""})`
-            if (isClass) {
+            if (true) {
                 bind = `${bind_pix}("${name}"${this.comList2.includes(type) ? event : ""})`
             }
             if (this.comList_base.includes(type)) {
@@ -265,12 +269,16 @@ export class ReferenceComponent extends Component {
             let line = `    ${bind} @Ref ${name}: ${type};`
             text += line;
         });
+        text += `\n    //#endregion END`
 
+        text += `\n\n    //#region ⚠️ ------------自定义属性`
+        text += `\n\n    //#endregion END`
 
         if (isCopy) {
             Editor.Clipboard.write("text", text);
             console.log("已复制到剪切板");
         }
+        eventStr += `\n    //#endregion END`
         return { text: text, event: eventStr }
 
     }
@@ -280,33 +288,33 @@ export class ReferenceComponent extends Component {
         if (!EDITOR_NOT_IN_PREVIEW) return;
         let text = ""
         let sx_this = ''
-        let sx = '    \n'
+        let sx = ''
         const className = this.node.name
 
         let data = `${className}Data`
         let iinterface = `I${className}Data`
 
         //生成get属性
-        this.nodes.forEach(data => {
+        this.nodes.forEach((data, index) => {
             let key = data.key;
             let name = key[0].toLowerCase() + key.substring(1);
             const type = this.getPropertyType(data.com)
             //@ts-ignore
             let line = `    ${name}: ${this.getDataTypeByComponentType(type)};`//`private get ${name}() { return this.rc.get("${key}", ${this.getPropertyType(data.node)}); }`;
-            sx += line + "\n";
+            sx += line + "" + (index < this.nodes.length - 1 ? "\n" : "");
 
             let line_sx = `        this.${name} = ${this.getDataTypeByComponentTypeValue(type)}`
-            sx_this += line_sx + '\n'
+            sx_this += line_sx + (index < this.nodes.length - 1 ? "\n" : "");
         });
 
         text = `
-//#region ✅ 数据接口
+//#region ⚠️ ------------数据接口
 export interface ${iinterface}  {
 ${sx}
 }
-        `;
+//#endregion END`;
         text += `
-//#region ✅ 数据VM
+//#region ⚠️ ------------数据对象
 class ${data} extends BaseViewModelData implements ${iinterface} {
 ${sx}
 
@@ -315,7 +323,7 @@ ${sx}
 ${sx_this}
     }
 }
-        `;
+//#endregion END`;
         if (isCopy) {
             Editor.Clipboard.write("text", text);
             console.log("已复制到剪切板");
@@ -331,7 +339,7 @@ ${sx_this}
     private genCodeVmDataAll() {
         if (!EDITOR_NOT_IN_PREVIEW) return;
         let importStr = `
-import { Label, RichText, ProgressBar, Sprite, EditBox, Toggle, Slider, ToggleContainer, Button, math, SpriteFrame, _decorator } from 'cc';
+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';
 const { ccclass, property } = _decorator;`
 
@@ -354,7 +362,7 @@ const { ccclass, property } = _decorator;
 
         let iinterface = `I${className}Data`
         const onload = `
-    //#region ✅ 初始化
+    //#region ⚠️ ------------初始化
     onLoad(): void {
 
     }
@@ -446,5 +454,4 @@ export class ${className} extends ViewModel(BaseReference) {${sx.text}\n${onload
         };
         return typeMap[compType] ?? 'any'; // 默认 fallback
     }
-
 }

package/assets/core/ViewModel.ts

@@ -15,6 +15,7 @@ import { TableView } from '../lib/tableView/TableView';
 import { YXFlowLayout } from '../lib/collectView/lib_collect/yx-flow-layout';
 import { math } from 'cc';
 import { YXCollectionView, YXIndexPath } from '../lib/collectView/lib_collect/yx-collection-view';
+import { EventTouch } from 'cc';
 
 interface IBindingData extends ITableViewEvents, IBindingDataEvents {
     dataPath: string;
@@ -25,8 +26,12 @@ interface IBindingData extends ITableViewEvents, IBindingDataEvents {
 
 
 interface IBindingDataEvents {
-    reset?: Function;
-    event?: Function;
+    reset?: (self: any, value: any, com: Component) => void;
+    event?: (self: any) => void;
+    touchStart?: (self: any, event: EventTouch) => void;
+    touchMove?: (self: any, event: EventTouch) => void;
+    touchEnd?: (self: any, event: EventTouch) => void;
+    touchCancel?: (self: any, event: EventTouch) => void;
 }
 
 
@@ -310,8 +315,9 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
             } else
                 com_btn.node.active = value ?? true;
 
-            //事件
-            com_btn.node.off(Button.EventType.CLICK, com_btn['btnCall']);
+            //事件点击
+            const touch_click = 'CallClick'
+            com_btn.node.off(Button.EventType.CLICK, com_btn[touch_click]);
             tempData.skip = true;
             const btnCall = (btn) => {
                 tempData.value = btn.node.active
@@ -319,8 +325,46 @@ function updateStatus(data: IBindingData, com: Component, value: any, self: any)
                 data.event?.(self)
                 self[`onClick_${sx}`]?.(btn)
             }
-            com_btn['btnCall'] = btnCall
-            com_btn.node.on(Button.EventType.CLICK, com_btn['btnCall']);
+            com_btn[touch_click] = btnCall
+            com_btn.node.on(Button.EventType.CLICK, com_btn[touch_click]);
+
+            //touch
+            if (data.touchStart) {
+                const touch_start = 'CALL_TOUCH_START'
+                com_btn.node.off(Node.EventType.TOUCH_START, com_btn[touch_start]);
+                const call_start = (btn) => {
+                    data.touchStart?.(self, btn)
+                }
+                com_btn[touch_start] = call_start
+                com_btn.node.on(Node.EventType.TOUCH_START, com_btn[touch_start]);
+            }
+            if (data.touchMove) {
+                const touch_start = 'CALL_TOUCH_MOVE'
+                com_btn.node.off(Node.EventType.TOUCH_MOVE, com_btn[touch_start]);
+                const call_start = (btn) => {
+                    data.touchMove?.(self, btn)
+                }
+                com_btn[touch_start] = call_start
+                com_btn.node.on(Node.EventType.TOUCH_MOVE, com_btn[touch_start]);
+            }
+            if (data.touchEnd) {
+                const touch_start = 'CALL_TOUCH_END'
+                com_btn.node.off(Node.EventType.TOUCH_END, com_btn[touch_start]);
+                const call_start = (btn) => {
+                    data.touchEnd?.(self, btn)
+                }
+                com_btn[touch_start] = call_start
+                com_btn.node.on(Node.EventType.TOUCH_END, com_btn[touch_start]);
+            }
+            if (data.touchCancel) {
+                const touch_start = 'CALL_TOUCH_CANCEL'
+                com_btn.node.off(Node.EventType.TOUCH_CANCEL, com_btn[touch_start]);
+                const call_start = (btn) => {
+                    data.touchCancel?.(self, btn)
+                }
+                com_btn[touch_start] = call_start
+                com_btn.node.on(Node.EventType.TOUCH_CANCEL, com_btn[touch_start]);
+            }
             break;
         case 'cc.ProgressBar':
             if (data.reset) {

package/package.json

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

package/assets/platform/Interface.ts

@@ -1,80 +0,0 @@
-import { _decorator, Node } from 'cc';
-import { AdsCall, AdsData, ButtonTouch, PositonData, SDKBuyParam, SDKLoginData, SDKStatus, TTBaseData, TTData, UserInfoData } from './base/SDKEnum';
-import { ICreateUserInfoButton } from './wx/MiniSDK';
-import { SDKBase } from './base/SDKBase';
-declare global {
-    namespace PlatfprmModule {
-        /**小游戏：按钮触摸 需要在按钮onTouchEnd中调用的方法 使用这个属性*/
-        const buttonTouch: ButtonTouch;
-        //#region 通用==============
-        /**模块初始化 */
-        export function Init(): Promise<boolean>
-        /**登录 */
-        export function Login(data?: string): Promise<SDKLoginData>
-        /**抖音：打开侧边栏 
-         * callBack: 从侧边栏点击进入 游戏回调
-        */
-        export function NavigateToScene(param?: { scene?: string; callBack?: () => void })
-        /**cocos node坐标转换为原生坐标 */
-        export function ToPosition(node: Node): PositonData
-        /**添加到桌面 */
-        export function AddShortcut(): Promise<boolean>
-        /**激励视频初始化 */
-        export function InitRewardedVideo(param: AdsData);
-        /**激励视频显示 */
-        export function ShowRewardedVideo(param: AdsCall): Promise<boolean>
-        //开放数据域
-        export function InitOpenDataLayout(node: Node)
-        export function SendMessageToOpenData(params: { type: string, event: string })
-        /** 更新开放数据榜单数据 */
-        export function UpdateCloudRank(key: string, score: number): Promise<boolean>
-        export function ShowRank(keyList: string[], openId?: string)
-
-        //#region 安卓相关===========
-        /**退出登录 */
-        export function Logout(): Promise<SDKStatus>
-        /**支付--目前只有安卓接入了 */
-        export function Pay(param: SDKBuyParam): Promise<SDKStatus>
-
-        //#region 微信相关===========
-        /**创建游戏圈按钮 */
-        export function CreateGameClubButton(): any
-        /**创建用户信息按钮 */
-        export function CreateUserInfoButton(param: ICreateUserInfoButton, callBack: (userInfo: UserInfoData) => void)
-        /**检查是否显示隐私条约 */
-        export function CheckShowPrivacy(): any
-        /**打开隐私条约 */
-        export function OpenPrivacyCUrl(): any
-
-
-        //#region 抖音相关===========
-        /**初始化视频流场景 */
-        export function InitTTFeedScene()
-        /**抖音订阅视频流回调 */
-        export function RequestFeedSubscribe(call: (success: boolean) => void);
-        /**抖音：上报抖音场景 */
-        export function ReportScene()
-        export function ReportFeed(data: TTBaseData)
-        /**抖音：上报抖音订阅视频流数据 */
-        export function StoreFeedData(data: TTData): Promise<boolean>
-        /**抖音：获取抖音订阅视频流数据 */
-        export function GetFeedData(data: TTBaseData): Promise<boolean>
-        /**抖音：检查抖音订阅视频流状态 */
-        export function CheckFeedSubscribeStatus(): Promise<boolean>
-        /**抖音：检查抖音场景状态 默认：scene=sidebar*/
-        export function CheckScene(scene?: string): Promise<boolean>
-
-    }
-
-    namespace AndroidModule {
-        export function Init()
-    }
-
-}
-
-//暂时不用这种方式
-// declare module "cc" {
-//     namespace PlatfprmModule {
-//         function ToSideBar(): void;
-//     }
-// }

package/assets/platform/Interface.ts.meta

@@ -1,9 +0,0 @@
-{
-  "ver": "4.0.24",
-  "importer": "typescript",
-  "imported": true,
-  "uuid": "013ede95-0a7b-4d40-93bd-3ab6623bfe76",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}

package/assets/platform/android/AndroidModule.ts

@@ -1,12 +0,0 @@
-import { assetManager } from "cc"
-import { SDKBase } from "../base/SDKBase"
-import { AndroidSDK } from "./AndroidSDK"
-
-export class AndroidModule {
-
-    static Init() {
-        return new AndroidSDK()
-    }
-}
-
-window.AndroidModule = AndroidModule

package/assets/platform/android/AndroidModule.ts.meta

@@ -1,9 +0,0 @@
-{
-  "ver": "4.0.24",
-  "importer": "typescript",
-  "imported": true,
-  "uuid": "07fbf5f8-5364-4dfd-863b-f9a8e103bb3e",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}

package/assets/platform/android/AndroidSDK.ts

@@ -1,186 +0,0 @@
-import { _decorator, Component, Node } from 'cc';
-import { SDKBase } from '../base/SDKBase';
-import { AdsCall, AdsData, PositonData, SDKBuyParam, SDKEnum, SDKInitParam, SDKLoginData, SDKStatus } from '../base/SDKEnum';
-import { native } from 'cc';
-import { sys } from 'cc';
-import { ATRewardedVideoAutoAdSDK } from './AnyThinkAds/ATRewardedAutoVideo';
-import { ATSDK } from './AnyThinkAds/ATSDK';
-import { assetManager } from 'cc';
-const { ccclass, property } = _decorator;
-
-@ccclass('AndroidSDK')
-export class AndroidSDK extends SDKBase {
-
-    private _loginResolve: ((value: [boolean, string] | PromiseLike<[boolean, string]>) => void) | null = null;
-    private _logoutResolve: ((value: SDKStatus | PromiseLike<SDKStatus>) => void) | null = null;
-    private _showAdResolve: ((value: SDKStatus | PromiseLike<SDKStatus>) => void) | null = null;
-    private _buyResolve: ((value: SDKStatus | PromiseLike<SDKStatus>) => void) | null = null;
-
-    initParam: SDKInitParam = {
-        gameId: '',
-        deviceId: '',
-        deviceOs: '',
-        region: '',
-        mac: '',
-        oaid: '',
-        idfa: '',
-        androidid: '',
-        ip: '',
-        gameRoleID: '',
-        userId: ''
-    }
-
-    //广告
-    // ads_id = "a68897c135273e"
-    // ads_key = "a3f3913b21437f71fe9c55b1656963ffd"
-    // ads_placement_id = "b68897c26d1c09"
-    // ads_scenario = "your scenario id"
-    ads_load_resolve: any = null
-
-    adsParam: AdsData;
-    adsCall: AdsCall;
-
-    init(): Promise<boolean> {
-        native.bridge.onNative = (func: string, param?: string | null): void => {
-            switch (func) {
-                case SDKEnum.Init:
-                    console.log('初始化成功')
-                    break;
-                case SDKEnum.Login:
-                    break;
-                case SDKEnum.Logout:
-                    this._logoutResolve?.(SDKStatus.success);
-                    break;
-                case SDKEnum.DeviceInfo:
-                    const data = JSON.parse(param);
-                    this.initParam.deviceId = data._deviceId || "";
-                    this.initParam.region = data._region || "";
-                    this.initParam.mac = data._mac || "";
-                    this.initParam.oaid = data._oaid || "";
-                    this.initParam.idfa = data._idfa || "";
-                    this.initParam.androidid = data._androidid || "";
-                    this.initParam.ip = data._ip || "";
-                    console.log(SDKEnum.DeviceInfo, param);
-                    break;
-                case SDKEnum.LoginSuccess:
-                    this._loginResolve?.([true, param]);
-                    break;
-                case SDKEnum.LoginFailed:
-                    break;
-                case SDKEnum.PseudoID:
-                    this.initParam.deviceId = param;
-                    break
-                case SDKEnum.Buy:
-                    this._buyResolve?.(Number(param));
-                    break;
-            }
-        }
-        native.bridge.sendToNative(SDKEnum.DeviceInfo);
-        return new Promise<boolean>((resolve, reject) => {
-            assetManager.loadBundle('android', (error, bundle) => {
-                if (error) {
-                    console.error('加载bundle android 失败', error)
-                    resolve(false)
-                } else {
-                    resolve(true)
-                }
-            })
-        })
-    }
-    public async login(data?: string): Promise<SDKLoginData> {
-        return new Promise<SDKLoginData>(async (resolve, reject) => {
-            if (this._loginResolve != null) {
-                this._loginResolve([false, "登录请求未完成"]);
-            }
-            let [success, code] = await new Promise<[boolean, string]>((resolve, reject) => {
-                this._loginResolve = resolve;
-                native.bridge.sendToNative(SDKEnum.Init, data);
-            });
-            this._loginResolve = null;
-            resolve({ success, code });
-        });
-    }
-    public async logout(): Promise<SDKStatus> {
-        const status = await new Promise<SDKStatus>((resolve) => {
-            native.bridge.sendToNative(SDKEnum.Logout);
-            this._logoutResolve = resolve;
-        });
-        this._logoutResolve = null;
-        return status;
-    }
-
-    public async pay(param: SDKBuyParam): Promise<SDKStatus> {
-        // param.description = "安卓sdk"
-        // param.userId = this.initParam.userId
-        // param.gameRoleID = this.initParam.gameRoleID
-        const status = await new Promise<SDKStatus>((resolve) => {
-            native.bridge.sendToNative(SDKEnum.Buy, JSON.stringify(param));
-            this._buyResolve = resolve;
-        });
-        this._buyResolve = null;
-        return status;
-    }
-
-    //#region 广告======================================
-    public initRewardedVideo(param: AdsData) {
-        this.adsParam = param;
-        ATSDK.initSDK(param.appId, param.appKey);
-        // ATSDK.setLogDebug(true);
-        // ATSDK.showDebuggerUI(this.ads_key);
-        //ATRewardedVideoSDK.setAdListener(this.RewardedVideoListener);
-        ATRewardedVideoAutoAdSDK.setAdListener(this.AutoRewardedVideoListener);
-        ATRewardedVideoAutoAdSDK.addPlacementIds([this.adsParam.adUnitId]);
-    }
-
-    public showRewardedVideo(param: AdsCall) {
-        this.adsCall = param;
-        ATRewardedVideoAutoAdSDK.entryAdScenario(this.adsParam.adUnitId, "your scenario id")
-        if (ATRewardedVideoAutoAdSDK.hasAdReady(this.adsParam.adUnitId)) {
-            ATRewardedVideoAutoAdSDK.showAdInScenario(this.adsParam.adUnitId, "your scenario id");
-        } else {
-            param.error?.('视频没有准备好，请重试！')
-        }
-    }
-
-    private AutoRewardedVideoListener = {
-        onRewardedVideoAdLoaded: (placementId: any) => {
-            console.log("已加载", placementId)
-            this.ads_load_resolve?.(true)
-        },
-        onRewardedVideoAdFailed: (placementId: any, errorInfo: any) => {
-            this.ads_load_resolve?.(false)
-            console.log("加载失败", placementId, errorInfo)
-            this.adsCall?.error?.(errorInfo);
-        },
-        onRewardedVideoAdPlayStart: (placementId: any, callbackInfo: any) => {
-            console.log("开始播放", placementId, callbackInfo)
-        },
-        onRewardedVideoAdPlayEnd: (placementId: any, callbackInfo: any) => {
-            console.log("播放结束", placementId, callbackInfo)
-            this.adsCall?.show?.();
-        },
-        onRewardedVideoAdPlayFailed: (placementId: any, errorInfo: any, callbackInfo: any) => {
-            console.log("播放失败", placementId, callbackInfo, errorInfo)
-            this.adsCall?.fail?.(errorInfo);
-        },
-        onRewardedVideoAdClosed: (placementId: any, callbackInfo: any) => {
-            console.log("关闭视频", placementId, callbackInfo)
-            this.adsCall?.close?.();
-        },
-        onRewardedVideoAdPlayClicked: (placementId: any, callbackInfo: any) => {
-            console.log("点击视频", placementId)
-            this.adsCall?.click?.();
-            // this.adsStatus = AdsStatus.click;
-        },
-        onReward: (placementId: any, callbackInfo: any) => {
-            console.log("奖励", placementId, callbackInfo)
-            this.adsCall?.success?.();
-        }
-    };
-
-    public toPosition(node: Node): PositonData {
-        return null
-    }
-}
-
-

package/assets/platform/android/AndroidSDK.ts.meta

@@ -1 +0,0 @@
-{"ver":"4.0.24","importer":"typescript","imported":true,"uuid":"937d378e-b39e-4175-a7c6-52c526c9593b","files":[],"subMetas":{},"userData":{}}