@cc-component/cc-ex-component 1.1.5 → 1.1.7

package/assets/platform/wx/wxmini.d.ts

@@ -521,11 +521,11 @@ declare namespace wx {
         /** 监听激励视频错误事件*/
         onError(callback: (res: { errMsg: string, errCode: 1000 | 1001 | 1002 | 1003 | 1004 | 1005 | 1006 | 1007 | 1008 }) => void): void;
         /** 取消监听激励视频错误事件*/
-        offError(callback: () => void): void;
+        offError(callback: (res) => void): void;
         /** 监听用户点击 关闭广告 按钮的事件*/
         onClose(callback: (res: { isEnded: boolean }) => void);
         /** 取消监听用户点击 关闭广告 按钮的事件*/
-        offClose(callback: () => void);
+        offClose(callback: (res) => void);
     }
 
     /**

package/index.ts

@@ -1,7 +1,5 @@
 // 负责导出assets下的模块，如: export { default } from './assets/xxx.ts'
-export { } from './assets/ex/BaseEx';
+export { } from './assets/ex/ExCommon';
 export { } from './assets/video/Interface';
-export { ReferenceCollector } from './assets/core/ReferenceCollector';
-
 export { } from './assets/platform/Interface';
 

package/package.json

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

package/assets/core/ReferenceCollector.ts

@@ -1,172 +0,0 @@
-import { _decorator, Component, js, Node } from "cc";
-import { EDITOR_NOT_IN_PREVIEW } from "cc/env";
-
-const { ccclass, property, executeInEditMode, executionOrder, disallowMultiple } = _decorator;
-
-@ccclass("CollectorNodeData")
-class CollectorNodeData {
-    @property({ readonly: true })
-    public key = "";
-    @property({ type: Node, readonly: true })
-    public node: Node = null;
-}
-
-@ccclass("ReferenceCollector")
-@disallowMultiple
-@executeInEditMode(true)
-@executionOrder(-100)
-export class ReferenceCollector extends Component {
-
-    @property
-    private _refresh = false;
-    @property({ displayName: "复制属性" })
-    private get refresh() { return this._refresh; }
-    private set refresh(val: boolean) {
-        if (EDITOR_NOT_IN_PREVIEW) {
-            this.initNodeList();
-            this.genCode();
-        }
-        this._refresh = false;
-    }
-
-    @property({ type: CollectorNodeData, readonly: true })
-    private _nodes: CollectorNodeData[] = [];
-    @property({ type: CollectorNodeData, tooltip: "自动引用节点(名字以$开头的)", readonly: true })
-    private get nodes() { return this._nodes; }
-    private set nodes(val: CollectorNodeData[]) { this._nodes = val; }
-
-    private _isInitNodeMap = false;
-    private _nodeMap: Map<string, Node> = new Map();
-
-    protected onLoad(): void {
-        if (EDITOR_NOT_IN_PREVIEW) {//处理编辑器逻辑
-            this.initNodeList();
-        } else {//处理运行时逻辑
-            this.initNodeMap();
-        }
-    }
-
-    private initNodeMap() {
-        if (this._isInitNodeMap) return;
-        this._isInitNodeMap = true;
-        this._nodeMap.clear();
-        for (const collectorNodeData of this.nodes) {
-            let key = collectorNodeData.key.trim();
-            if (!this._nodeMap.has(key)) {
-                this._nodeMap.set(key, collectorNodeData.node);
-            } else {
-                console.error("[MLogger Error]", this.node.name, "引用的节点名字重复 Key=" + key);
-            }
-        }
-    }
-
-    public getNode(key: string) {
-        if (this._nodeMap.size == 0) this.initNodeMap();
-        return this._nodeMap.get(key);
-    }
-
-    public get(key: string, type: typeof Node): Node;
-    public get<T extends Component>(key: string, type: new (...args: any[]) => T): T;
-    public get(key: string, type: any): any {
-        if (this._nodeMap.size == 0) this.initNodeMap();
-        let node = this._nodeMap.get(key);
-        if (node?.isValid) {
-            if (type as any === Node) {
-                return node;
-            } else {
-                return node.getComponent(type);
-            }
-        }
-        return undefined;
-    }
-
-    //#region 编辑器逻辑
-
-    /** 收集名字以$开头的节点 */
-    private _tag = "$";
-
-    private initNodeList() {
-        if (!EDITOR_NOT_IN_PREVIEW) return;
-        this.nodes.length = 0;
-        let nodes = this.getValidNode(this.node);
-        for (const node of nodes) {
-            let refData = new CollectorNodeData();
-            let name = node.name.replace(this._tag, "").trim();
-            refData.key = name;
-            refData.node = node;
-            this.nodes.push(refData);
-        }
-    }
-
-
-    /** 获取符合需求的节点 */
-    private getValidNode(root: Node) {
-        if (!EDITOR_NOT_IN_PREVIEW) return;
-        let arr: Node[] = [];
-        let checkArr: Node[] = [];
-        checkArr.push(root);
-        while (checkArr.length > 0) {
-            let v = checkArr.shift();
-            let rc = v.getComponent(ReferenceCollector);
-            if (rc && rc != this) continue;
-            arr.push(...v.children.filter(v => this.isNodeValid(v)));
-            checkArr.push(...v.children);
-        }
-        return arr;
-    }
-
-    private isNodeValid(node: Node) {
-        if (!EDITOR_NOT_IN_PREVIEW) return;
-        if (node.name.startsWith(this._tag)) return true;
-        return false;
-    }
-
-    /** 生成引用节点的获取代码 并复制到剪切板 */
-    private genCode() {
-        if (!EDITOR_NOT_IN_PREVIEW) return;
-        let text = "";
-        //生成get属性
-        this.nodes.forEach(data => {
-            let key = data.key;
-            if (text) text += "\n";
-            let name = key[0].toLowerCase() + key.substring(1);
-            let line = `private get ${name}() { return this.rc.get("${key}", ${this.getPropertyType(data.node)}); }`;
-            text += line;
-        });
-        Editor.Clipboard.write("text", text);
-        console.log("已复制到剪切板");
-    }
-
-    /** 获取属性类型名字 */
-    private getPropertyType(node: Node) {
-        if (!EDITOR_NOT_IN_PREVIEW) return;
-
-        //自定义脚本
-        let comp = node.getComponent('MComponent');
-        if (comp) return js.getClassName(comp);
-        //自定义组件
-        if (node.getComponent("Switch")) return "Switch";
-        if (node.getComponent("MSlider")) return "MSlider";
-        if (node.getComponent("MToggle")) return "MToggle";
-        if (node.getComponent("MButton")) return "MButton";
-        if (node.getComponent("Dropdown")) return "Dropdown";
-        //UI组件
-        if (node.getComponent("cc.EditBox")) return "EditBox";
-        if (node.getComponent("cc.Toggle")) return "Toggle";
-        if (node.getComponent("cc.Slider")) return "Slider";
-        if (node.getComponent("cc.Button")) return "Button";
-        if (node.getComponent("cc.ProgressBar")) return "ProgressBar";
-        if (node.getComponent("cc.ScrollView")) return "ScrollView";
-        if (node.getComponent("cc.PageView")) return "PageView";
-        if (node.getComponent("cc.Animation")) return "Animation";
-        //渲染组件
-        if (node.getComponent("cc.Sprite")) return "Sprite";
-        if (node.getComponent("cc.Label")) return "Label";
-        if (node.getComponent("cc.RichText")) return "RichText";
-        if (node.getComponent("cc.ParticleSystem2D")) return "ParticleSystem2D";
-        if (node.getComponent("sp.Skeleton")) return "sp.Skeleton";
-
-        return "Node";
-    }
-    //#endregion
-}

package/assets/video/IVideo.ts

@@ -1,73 +0,0 @@
-import { Component, Node } from "cc";
-
-export interface InitParam {
-     node: Node,
-     cover: Node,
-     bg: Node,
-     bundle: string,
-     dir: string,
-     cover_dir: string,
-     remote_url: string,
-     proCall?: (pro: number) => void
-}
-export interface IVideoData {
-     /**视频文件名称 */
-     name: string,
-     /**开始时间*/
-     start_time?: number,
-     /**结束时间 */
-     end_time?: number
-}
-
-export interface IVideoParam {
-     /**本次播放或者加载，是否指定目标大小*/
-     isTargetSize?: boolean,
-     /**是否是 时间段 视频,备注：多个小视频合成一个大视频 */
-     isPlayTime?: boolean,
-     /**循环播放 */
-     isLoop?: boolean,
-     /**封面图片 */
-     coverImage?: string,
-     /**全屏并且-保持原比例 */
-     isVideoFit?: boolean,
-     /**视频封面 */
-     onRead?: Function,
-     /**播放完成 */
-     onFinish?: Function,
-     /**可不设置
-      * 是本地视频还是远程，
-      * 小游戏会设置为：远程视频，
-      * 安卓和ios原生端会可不设置，根据url 判断是远程还是本地视频 */
-     isLocal?: boolean,
-}
-
-
-// export interface IVideoParam {
-//      isPlayTime?: boolean,
-//      isLoop?: boolean,
-//      finish?: Function,
-
-// }
-
-export class BaseVideo extends Component {
-     initVideo(initParam: { bundle: string, dir: string }) { }
-     loadVideo(name: string, param?: IVideoParam) { }
-     play(isloop?: boolean) { }
-     async pause() { }
-     stop() { }
-     resume() { }
-     seek(time: number) { }
-     destroyVideo() { }
-     setSize(param: { x: number, y: number, width: number, height: number }) { }
-     autoSize() { }
-     onTimeUpdate: (data: { position: number, duration: number }) => void;
-     onError: Function
-     onVideoEnd: Function
-     onRead: Function
-     getisPause(): boolean {
-          return false
-     }
-     //  getDuration(): number;
-     // isPlaying: boolean;
-     // isLocal:boolean;
-}

package/assets/video/Interface.ts

@@ -1,25 +0,0 @@
-import { IVideoData, IVideoParam } from "./IVideo";
-declare global {
-    namespace VideoModule {
-        /**开启日志打印 */
-        function Debug(enabled: boolean);
-        /**提前加载视频 */
-        function LoadVideo(url: string, param: IVideoParam)
-        /**播放单个视频 */
-        function PlayVideo(video: IVideoData, param: IVideoParam)
-        /** 播放多个视频*/
-        function PlayVideoMore(video_list: IVideoData[], param: IVideoParam)
-        /**暂停 */
-        function Pause()
-        /**继续 */
-        function Resume()
-        /**停止视频 */
-        function StopVideoTask()
-        /**视频设置到指定大小 */
-        function SetSize(param: { x: number, y: number, width: number, height: number })
-        /**节点位置适配-自动适配 */
-        function AutoSize()
-    }
-}
-// // 必须在 game.init() 之前设置！
-//macro.ENABLE_TRANSPARENT_CANVAS = true;