@cc-component/cc-core 1.4.6 → 1.4.8

package/assets/core/home/BaseModuleConfig.ts.meta

@@ -1,9 +1,9 @@
-{
-  "ver": "4.0.24",
-  "importer": "typescript",
-  "imported": true,
-  "uuid": "be82897c-95e5-4d69-9c19-4ff84d7f02eb",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}
+{
+  "ver": "4.0.24",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "be82897c-95e5-4d69-9c19-4ff84d7f02eb",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

package/assets/core/home/Tools.ts

@@ -29,7 +29,7 @@ export enum NodeLayer {
 @ccclass('Tools')
 export class Tools {
 
-    static SetNodeLayer(node: Node, layer: number) {
+    SetNodeLayer(node: Node, layer: number) {
         for (var i = 0; i < node.children.length; i++) {
             let item = node.children[i];
             item.layer = layer
@@ -41,7 +41,7 @@ export class Tools {
 
     //#region  工具
     /**任务进度队列 */
-    static PromiseQueue<T>(promises: Promise<T>[], onProgress: (completed: number, total: number) => void): Promise<T[]> {
+    PromiseQueue<T>(promises: Promise<T>[], onProgress: (completed: number, total: number) => void): Promise<T[]> {
         const total = promises.length;
         let completed = 0;
 
@@ -78,7 +78,7 @@ export class Tools {
 
     //抛物线
     //计算贝塞尔曲线坐标函数
-    static twoBezier(k3, startPos, controlPos, endPos) {
+    twoBezier(k3, startPos, controlPos, endPos) {
         let twoBezier = (t: number, p1: Vec3, cp: Vec3, p2: Vec3) => {
             let x = (1 - t) * (1 - t) * p1.x + 2 * t * (1 - t) * cp.x + t * t * p2.x;
             let y = (1 - t) * (1 - t) * p1.y + 2 * t * (1 - t) * cp.y + t * t * p2.y;
@@ -88,25 +88,25 @@ export class Tools {
         let result_pos = twoBezier(k3, startPos, controlPos, endPos)
         return result_pos
     }
-    static customEaseOutInWithSpeed(t) {
+    customEaseOutInWithSpeed(t) {
         let speedFactor = 0.6
         if (t < 0.5) {
-            return 0.5 * Tools.customEaseOut(2 * t, speedFactor);
+            return 0.5 * this.customEaseOut(2 * t, speedFactor);
         } else {
-            return 0.5 * Tools.customEaseIn(2 * t - 1, speedFactor) + 0.5;
+            return 0.5 * this.customEaseIn(2 * t - 1, speedFactor) + 0.5;
         }
     }
 
-    static customEaseOut(t, speedFactor) {
+    customEaseOut(t, speedFactor) {
         return 1 - Math.pow(1 - t, 2 * speedFactor);
     }
 
-    static customEaseIn(t, speedFactor) {
+    customEaseIn(t, speedFactor) {
         return Math.pow(t, 2 * speedFactor);
     }
 
     //检测碰撞
-    static Collision(box1: { x1: number, y1: number, x2: number, y2: number },
+    Collision(box1: { x1: number, y1: number, x2: number, y2: number },
         box2: { x1: number, y1: number, x2: number, y2: number }): boolean {
         // 碰撞检测逻辑
         return !(box1.x2 <= box2.x1 || box1.x1 >= box2.x2 ||
@@ -114,7 +114,7 @@ export class Tools {
     }
 
     //朝向
-    static CalculateAngle(pointA: Vec3, pointB: Vec3): number {
+    CalculateAngle(pointA: Vec3, pointB: Vec3): number {
         // const dx = pointB.x - pointA.x;
         // const dy = pointB.y - pointA.y;
         // return Math.atan2(dy, dx) * (180 / Math.PI);
@@ -126,15 +126,15 @@ export class Tools {
         return angle
     }
 
-    static LookAtTarget(self: Vec3, target: Vec3) {
+    LookAtTarget(self: Vec3, target: Vec3) {
         if (target == null) { return }
         // //计算朝向
-        let angle = Tools.CalculateAngle(self, target);
+        let angle = this.CalculateAngle(self, target);
         //物体朝向
         return v3(0, 0, angle);
     }
     /**向量的新的位置 */
-    static DirectionPosition(start: Vec3, endPos: Vec3, scalar: number) {
+    DirectionPosition(start: Vec3, endPos: Vec3, scalar: number) {
         const direction = endPos.clone().subtract(start);
         const pos = direction.normalize().multiplyScalar(scalar);
         return pos
@@ -148,11 +148,11 @@ export class Tools {
      * @param offset_ratio 最高点 的偏移量
      * @param time 动画时间
      */
-    static RunParabolaTween(item: Node, target_postion: Vec3, update: (ratio: number) => void, param?: { offset_ratio?: number, is_random: boolean, time?: number, start_position?: Vec3 }) {
+    RunParabolaTween(item: Node, target_postion: Vec3, update: (ratio: number) => void, param?: { offset_ratio?: number, is_random: boolean, time?: number, start_position?: Vec3 }) {
         new ParabolaTween().RunParabolaTween(item, target_postion, update, param);
     }
 
-    public static IsTT() {
+    public IsTT() {
         if (BYTEDANCE) {
             //@ts-ignore
             const info = tt.getSystemInfoSync();
@@ -213,8 +213,8 @@ export class Tools {
     }
 
     //抖音排行榜数据
-    public static UpdatePlayerRankData_tt(count: number) {
-        const isdy = Tools.IsTT()
+    public UpdatePlayerRankData_tt(count: number) {
+        const isdy = this.IsTT()
         // console.error('抖音22==', isdy)
         if (!isdy) { return }
         // const playerLevel = MeCenter.Ins.player.playerLevel;

package/assets/core/interface/App.ts

@@ -40,7 +40,8 @@ export class App {
     static get message(): EventManager { return this.instance._message };
     /**声音 */
     static get sound(): AudioUtil { return this.instance._sound };
-
+    /**声音 */
+    static get tools(): Tools { return this.instance._tools };
 
     _gui: LayerUI;
     _http: HttpManager;
@@ -50,7 +51,7 @@ export class App {
     _language: LanguageManager;
     _message: EventManager;
     _sound: AudioUtil;
-
+    _tools: Tools;
     private static instance: App | null = null;
     public static get Ins(): App {
         if (!App.instance) { App.instance = new App(); }
@@ -81,6 +82,7 @@ export class App {
         self._http = new HttpManager();
         self._message = new EventManager();
         self._sound = new AudioUtil();
+        self._tools = new Tools();
 
         if (EDITOR) { return }//编辑器环境，不执行下面逻辑
         Logger.setLevel(ELoggerLevel.Error);
@@ -133,7 +135,7 @@ export class App {
     static OffAll(target: any) { this.message.OffAll(target); }
 
     //#region 监听模块消息
-    static OnRequstNet(param: { open: (finish: (isOk: boolean) => void) => void }) { App.http.open = param.open; }
+    static OnRequstNet(param: { open: (finish: (isOk: boolean) => void) => void }) { App.http.param = param; }
     static OnLoading(param: { open: (finish: () => void) => void, close: () => void }) { App.gui.loading_call = param; }
     static OnProgess(param: { open: (finish: () => void) => void, close: () => void, progess: (progress: number) => void }) { App.gui.progess = param; }
 
@@ -179,7 +181,7 @@ export class App {
 
                         const userChoice = await new Promise<boolean>((resolve) => {
                             const finish = (isOk: boolean) => { resolve(isOk) }
-                            App.http.open?.(finish)
+                            App.http.param?.open?.(finish)
                             //param.callBack = (isOk: boolean) => resolve(isOk);
                         });
 
@@ -548,7 +550,7 @@ s     */
         }
     }
 
-    static PromiseQueue<T>(promises: Promise<T>[], onProgress: (completed: number, total: number) => void): Promise<T[]> { return Tools.PromiseQueue(promises, onProgress) }
+    static PromiseQueue<T>(promises: Promise<T>[], onProgress: (completed: number, total: number) => void): Promise<T[]> { return App.Ins._tools.PromiseQueue(promises, onProgress) }
 }
 
 window.App = App;

package/assets/core/interface/Interface.ts

@@ -12,6 +12,7 @@ import { Component } from "cc";
 import { MLogger } from "../lib/logger/MLogger";
 import { EventManager } from "../home/EventManager";
 import { AudioUtil } from "../home/AudioUtil";
+import { Tools } from "../home/Tools";
 
 declare global {
   /** 日志打印类 */
@@ -34,7 +35,9 @@ declare global {
     /**消息 */
     const message: EventManager
     /**声音 */
-    const sound: AudioUtil
+    const sound: AudioUtil;
+    /**工具类 */
+    const tools: Tools;
     /**当前所在bundle名称 */
     const bundleName: string;
     /**=====================================⚠️⚠️⚠️ 初始化必须实现的监听======================= */

package/assets/core/lib/ecs.meta

@@ -1,9 +1,9 @@
-{
-  "ver": "1.2.0",
-  "importer": "directory",
-  "imported": true,
-  "uuid": "becc7741-24ad-4102-b41f-b4e76ec62918",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "becc7741-24ad-4102-b41f-b4e76ec62918",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

package/assets/core/lib/net/net/HttpManager.ts

@@ -5,7 +5,8 @@
  * @LastEditTime: 2022-09-09 18:10:50
  */
 
-import { IExtData } from "db://assets/start/Interface/base/BaseCommon";
+import { IExtData } from "db://assets/cc-core";
+
 
 /** HTTP请求返回值 */
 export class HttpReturn<T> {
@@ -63,7 +64,8 @@ export class HttpManager {
     server: string = "http://127.0.0.1/";
     /** 请求超时(毫秒) */
     timeout: number = 10000;
-
+    /**内部使用 */
+    param: any;
     /**
      * GET请求获取文本格式数据
      * @param name      协议名

package/assets/core/lib/tabbar/TabBarController.ts

@@ -33,27 +33,35 @@ export class TabBarController extends Component {
 
     @property(Prefab)
     HomeTabbarItem: Prefab = null;
-
+    @property(Node)
+    bottom: Node = null;
 
     layout: Layout;
     itemList: Node[] = [];
     public selectRow: number = 0;
 
+    isonload = false;
 
-
-
+    isReload = false;
     onLoad() {
-        this.layout = this.getComponent(Layout);
-
+        this.layout = this.bottom.getComponent(Layout);
+        this.isonload = true
+        if (this.isReload) {
+            this.reload();
+        }
     }
 
     reload() {
+        this.isReload = true
+        if (this.isReload && !this.isonload) {
+            return;
+        }
         for (let index = 0; index < this.count; index++) {
             let node = this.itemList[index]
             if (!node) {
                 node = instantiate(this.HomeTabbarItem)
                 this.itemList.push(node);
-                node.parent = this.node;
+                node.parent = this.bottom;
             }
             node.name = index.toString();
             node.active = true;
@@ -72,6 +80,7 @@ export class TabBarController extends Component {
     }
 
     switchTab(index: number, isDefault: boolean = false) {
+        if (!this.isonload) return
         if (this.selectRow === index && !isDefault) { return }
         this.callbackSelect?.(index, this.itemList[index], this.itemList[this.selectRow])
         this.selectRow = index;

package/index.ts.meta

@@ -1,9 +1,9 @@
-{
-  "ver": "4.0.24",
-  "importer": "typescript",
-  "imported": true,
-  "uuid": "7a336b7d-79a3-48ef-9451-d925e367809b",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}
+{
+  "ver": "4.0.24",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "7a336b7d-79a3-48ef-9451-d925e367809b",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

package/package.json

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

package/package.json.meta

@@ -1,11 +1,11 @@
-{
-  "ver": "2.0.1",
-  "importer": "json",
-  "imported": true,
-  "uuid": "561e76c1-e517-4977-ac87-442704e3de8f",
-  "files": [
-    ".json"
-  ],
-  "subMetas": {},
-  "userData": {}
-}
+{
+  "ver": "2.0.1",
+  "importer": "json",
+  "imported": true,
+  "uuid": "561e76c1-e517-4977-ac87-442704e3de8f",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}