@cc-component/cc-core 1.2.1 → 1.2.3

package/assets/core/config/LayerUI.ts

@@ -5,11 +5,11 @@ import { LayerType } from './LayerType';
 import { Canvas, director } from 'cc';
 import { ResourceManager } from '../home/ResourceManager';
 import { IInitConfig } from './CommonEnum';
-import { Logger, LogType } from '../lib/Logger';
 import { ISceneParam } from '../interface/ISceneParam';
 import { BlockInputEvents } from 'cc';
 import { BaseLaunchComponent } from '../home/BaseLaunchComponent';
 import { AssetManager } from 'cc';
+import { assetManager } from 'cc';
 
 const { ccclass, property } = _decorator;
 
@@ -42,7 +42,8 @@ export class LayerUI {
         const parent = this.launch.node
         const data = await MainModule.loadAsset<JsonAsset>(params.bundleName, "config", JsonAsset)
         this.config = data.json as IConfig;
-        console.log(this.config)
+        MainModule.releaseAssetPath('config', params.bundleName)
+        //Logger.debug(this.config)
 
         const config = this.config;
         config.gui.forEach(element => {
@@ -95,11 +96,8 @@ export class LayerUI {
     setBundleName(value: string) { this.bundleName = value; }
     initLog() {
         const debug = this.config.debug
-        Logger.setTags(debug ? null : LogType.Close)
-        Logger.logView(debug);
-
         if (debug) {
-            console.log("是debug模式");
+            Logger.debug("是debug模式");
         } else {
             console.log("发布模式");
             console.log = function () { };   // 关闭普通日志输出

package/assets/core/editor/LanguageManager.ts

@@ -116,7 +116,7 @@
 //         try {
 //             let index = 0;
 //             return value.replace(/d%/g, function () {
-//                 //console.log(`${index}个参数：${args[index]}`);
+//                 //Logger.debug(`${index}个参数：${args[index]}`);
 
 //                 let str = args[index++] || "";
 //                 return str;
@@ -161,7 +161,7 @@
 //             assetManager.loadBundle(bundleName, (err, bundle) => {
 //                 bundle.load(url, SpriteFrame, (err, spriteFrame: SpriteFrame) => {
 //                     if (err) {
-//                         if (DEBUG) console.warn(err);
+//                         if (DEBUG) Logger.warn(err);
 //                         return cb(null);
 //                     }
 //                     cb(spriteFrame);
@@ -279,7 +279,7 @@
 //         try {
 //             let index = 0;
 //             return value.replace(/d%/g, function () {
-//                 //console.log(`${index}个参数：${args[index]}`);
+//                 //Logger.debug(`${index}个参数：${args[index]}`);
 
 //                 let str = args[index++] || "d%";
 //                 return str;
@@ -315,7 +315,7 @@
 //                 break;
 //             }
 //         }
-//         //console.log("bundleName:",bundleName);
+//         //Logger.debug("bundleName:",bundleName);
 //         return bundleName;
 //     }
 // }

package/assets/core/editor/i18nEditorComponent.ts

@@ -29,7 +29,7 @@ export class i18nEditorComponent extends Component {
             await this.loadConfig()
             LanguageData.current = language
 
-            console.log("编辑器语言设置成功", language);
+            Logger.debug("编辑器语言设置成功", language);
             // MainModule.language.setLanguage('', language)
             // this.node.children.forEach(child => {
             //     console.error(child.name)
@@ -60,7 +60,7 @@ export class i18nEditorComponent extends Component {
             let url = absoluteUrl.split("://");
             let paths = url[1].split("/");
             dbUrl = url[0] + "://" + paths[0] + "/" + paths[1];
-            // console.log("absoluteUrl11:", absoluteUrl, dbUrl);
+            // Logger.debug("absoluteUrl11:", absoluteUrl, dbUrl);
             //label
             return dbUrl
 
@@ -68,7 +68,7 @@ export class i18nEditorComponent extends Component {
     }
 
     public editorChangeBundle(language: string) {
-        console.log("bundle", language);
+        Logger.debug("bundle", language);
         MainModule.language.setLanguage('', language)
         //i18nMgr.editorChangeBundle(language);
     }
@@ -78,7 +78,7 @@ export class i18nEditorComponent extends Component {
         let uuid = await Editor.Message.request("asset-db", "query-uuid", db_json);
         await new Promise<void>((resolve) => {
             assetManager.loadAny(uuid, (err, jsonAsset: JsonAsset) => {
-                //console.log("加载表格", jsonAsset, err);
+                //Logger.debug("加载表格", jsonAsset, err);
                 MainModule.gui.config = jsonAsset.json as IConfig;
                 //console.error(MainModule.gui.config)
                 resolve()
@@ -89,10 +89,10 @@ export class i18nEditorComponent extends Component {
     /**编辑器环境下改变多语言 */
     public async changeLabel(dbUrl: string, language?: string) {
         const db_json = dbUrl + `/${MainModule.gui.config.language.path.json}/${language}.json`
-        console.log(db_json)
+        Logger.debug(db_json)
         let uuid = await Editor.Message.request("asset-db", "query-uuid", db_json);
         assetManager.loadAny(uuid, (err, jsonAsset: JsonAsset) => {
-            //     console.log("加载表格", jsonAsset, err);
+            //     Logger.debug("加载表格", jsonAsset, err);
             if (!jsonAsset) return;
             let labelData = jsonAsset.json;
             LanguageData.language.set(LanguageDataType.Json, jsonAsset.json);
@@ -121,7 +121,7 @@ export class i18nEditorComponent extends Component {
                 return;
             }
             assetManager.loadAny(uuid, (err, imageAsset: ImageAsset) => {
-                //console.log("加载图片", imageAsset, err);
+                //Logger.debug("加载图片", imageAsset, err);
                 if (!imageAsset) return;
                 let spriteFrame = SpriteFrame.createWithImage(imageAsset);
                 com.updateSpriteEditor(spriteFrame)

package/assets/core/home/BaseBoxView.ts

@@ -37,7 +37,7 @@ export class BaseBoxView extends Component {
     //     const box2 = this.GetBox(this.target_enemy);
 
     //     const ok = MainModule.Collision(box1, box2);
-    //     //  console.log("碰撞了吗？", ok, this.node.name)
+    //     //  Logger.debug("碰撞了吗？", ok, this.node.name)
     //     return ok
     // }
 

package/assets/core/home/BaseLoading.ts

@@ -27,7 +27,6 @@ export abstract class BaseLoading extends Component {
     progress_ratio: number = 1
     /**总进度 值范围 0-100*/
     pro_total: number;
-    is_init: boolean = false;
 
     sceneParam: ISceneParam = {
         param: null,
@@ -45,26 +44,24 @@ export abstract class BaseLoading extends Component {
     }
 
     async Init() {
-        if (this.is_init) {
-            await this.loadProgress(1)
-        } else {
-            const count = this.path_list.length;
-            const ratio = 1 / count * this.progress_ratio;
-            this.pro_total = 0;
-            for (let index = 0; index < this.path_list.length; index++) {
-                const key_path = this.path_list[index];
-                let temp_pro = 0;
-                await MainModule.loadDir(BundleConfig[key_path.bundleName], key_path.path, GetAssetType(key_path.type), (pro: number) => {
-                    temp_pro = pro * ratio
-                    const progess = (this.pro_total + pro * ratio)
-                    MainModule.gui.progess.progess?.(progess)//进度在OpenScene方法中先打开才可以 设置进度
-                })
-                this.pro_total = (this.pro_total + temp_pro)
-            }
-            console.log("完成", this.pro_total)
-            // ✅ 先调用子类的 Finish（允许子类做自定义操作）
-            await this.Finish(); // 支持异步
+        const count = this.path_list.length;
+        const ratio = 1 / count * this.progress_ratio;
+        this.pro_total = 0;
+        MainModule.gui.progess.progess?.(0)//进度在OpenScene方法中先打开才可以 设置进度
+        for (let index = 0; index < this.path_list.length; index++) {
+            const key_path = this.path_list[index];
+            let temp_pro = 0;
+            await MainModule.loadDir(BundleConfig[key_path.bundleName], key_path.path, GetAssetType(key_path.type), (pro: number) => {
+                temp_pro = pro * ratio
+                const progess = (this.pro_total + pro * ratio)
+                MainModule.gui.progess.progess?.(progess)//进度在OpenScene方法中先打开才可以 设置进度
+            })
+            this.pro_total = (this.pro_total + temp_pro)
         }
+        Logger.debug("完成", this.pro_total)
+        // ✅ 先调用子类的 Finish（允许子类做自定义操作）
+        await this.Finish(); // 支持异步
+
         this.FinishLoad()
     }
 
@@ -93,11 +90,11 @@ export abstract class BaseLoading extends Component {
     }
 
     /** 模拟假加载进度（仅用于调试） */
-    loadProgress(durationSeconds: number = 2): Promise<void> {
+    loadProgress(durationSeconds: number = 2, max: number = 100): Promise<void> {
         return new Promise((resolve) => {
             let progress = 0;
             const step = 1; // 每次增加 1%
-            const intervalMs = (durationSeconds * 1000) / 100; // 总毫秒数 / 100 步
+            const intervalMs = (durationSeconds * 1000) / max; // 总毫秒数 / 100 步
             const timer = setInterval(() => {
                 progress += step;
                 if (progress >= 100) {

package/assets/core/home/BaseSkeleton.ts

@@ -27,10 +27,10 @@ export class SkeletonAnim {
         // 设置事件监听器
         skeleton.setEventListener((entry, event: sp.spine.Event) => {
             const index = animations.findIndex((anim => anim.name === entry.animation.name))
-            // console.log("1--事件", event.data.name, event.data.intValue, event.data)
-            // console.log("2--事件", event.data.intValue)
-            // console.log("2--事件", event.data.stringValue)
-            // console.log("2--事件", event.data.floatValue,entry.animation.name)
+            // Logger.debug("1--事件", event.data.name, event.data.intValue, event.data)
+            // Logger.debug("2--事件", event.data.intValue)
+            // Logger.debug("2--事件", event.data.stringValue)
+            // Logger.debug("2--事件", event.data.floatValue,entry.animation.name)
             animations[index].event?.(event.data.name)
         });
     }

package/assets/core/home/CameraAngel.ts

@@ -18,8 +18,8 @@ export class CameraAngel extends Component {
 
     distance = 50;
 
-    touNode:Node;
-    touNodeSize:UITransform;
+    touNode: Node;
+    touNodeSize: UITransform;
     start() {
 
         // this.node.on(Node.EventType.MOUSE_DOWN, this.MouseDown, this);
@@ -42,16 +42,16 @@ export class CameraAngel extends Component {
 
     }
 
-    StartGame(targetCube:Node) {
+    StartGame(targetCube: Node) {
         this.targetCube = targetCube;
         this.followCamera = this.getComponent(FollowCamera)
-        this.followCamera.StartGame(this.targetCube,this.distance)
+        this.followCamera.StartGame(this.targetCube, this.distance)
     }
 
-    
+
     private MouseDown(e: Event) {
 
-        console.log("222");
+        Logger.debug("222");
     }
 
 
@@ -59,7 +59,7 @@ export class CameraAngel extends Component {
         if (this.targetCube) {
             let fff = Vec3.FORWARD
             fff = v3(0, 0, -1).multiplyScalar(0.01)
-            //  console.log(fff);
+            //  Logger.debug(fff);
             //   this.targetCube.worldPosition = this.targetCube.worldPosition.add(fff)
             // this.UpdatePos(0, 0)
             // this.SetPos();
@@ -83,18 +83,18 @@ export class CameraAngel extends Component {
     private TouchStart(e: EventTouch) {
         this.isTouching = true;
         this.touchStartPos = this.GetPos(e);
-      //å  console.log("开始", this.touchStartPos)
+        //å  Logger.debug("开始", this.touchStartPos)
 
         this.isHave = false
         this.f_x = v3(0)
 
     }
 
-    GetPos(e:EventTouch){
+    GetPos(e: EventTouch) {
 
         let super_pos = this.touNode.parent.worldPosition
-        let pos = v3(super_pos.x ,super_pos.y,0)//this.touNode.parent.position;
-        return v3(e.getUILocation().x-pos.x, e.getUILocation().y-pos.y,0)
+        let pos = v3(super_pos.x, super_pos.y, 0)//this.touNode.parent.position;
+        return v3(e.getUILocation().x - pos.x, e.getUILocation().y - pos.y, 0)
 
 
     }
@@ -111,56 +111,56 @@ export class CameraAngel extends Component {
 
         let pos = this.GetPos(e);;
         this.UpdatePos(pos.x, pos.y);
-    
+
 
     }
 
     private TouchEnd(e: EventTouch) {
 
         this.ResetPos();
-        if( this.touNode){
-            this.touNode.position = v3(75,75)
+        if (this.touNode) {
+            this.touNode.position = v3(75, 75)
 
         }
 
- 
+
     }
 
 
-    ResetPos(){
+    ResetPos() {
         this.followCamera.isMove = false;
         this.followCamera.resetPos();
     }
 
 
     UpdatePos(x, y) {
-    
+
         if (this.followCamera.isUpdatePos) {
             return
         }
 
-     
-        if(this.touNode){
-            this.touNode.position = v3(x,y)
-            
+
+        if (this.touNode) {
+            this.touNode.position = v3(x, y)
+
 
         }
-       // console.log(x,y)
-       // console.log("ddd");
+        // Logger.debug(x,y)
+        // Logger.debug("ddd");
         this.followCamera.isMove = true;
         let currentPos = new Vec3(x, y, 0);
         let delta = currentPos.clone().subtract(this.touchStartPos);
 
         if (delta.x < this.f_x.x && !this.f_x.equals(v3(0), 0.01)) {
             this.touchStartPos = this.f_x
-            //  console.log("转");
+            //  Logger.debug("转");
         }
 
-        //console.log(currentPos)
+        //Logger.debug(currentPos)
         this.f_x = currentPos.clone();
         // 根据 deltaX 进行旋转
-       // console.log(delta);
-        this.rotateByDeltaX(delta.x,delta.y);
+        // Logger.debug(delta);
+        this.rotateByDeltaX(delta.x, delta.y);
         //this.rotateAndLookAtTarget()
 
         this.touchStartPos.clone().set(currentPos);
@@ -231,11 +231,11 @@ export class CameraAngel extends Component {
         // 创建围绕X轴和Y轴旋转的两个四元数
         let rotationQuatX = this.fromRotation(v3(1, 1, 0), misc.radiansToDegrees(rotationAngleX));
         let rotationQuatY = this.fromRotation(v3(0, 1, 0), misc.radiansToDegrees(rotationAngleY));
-      //  let rotationQuatz = this.fromRotation(v3(0, 0, 1), misc.radiansToDegrees(rotationAngleY));
+        //  let rotationQuatz = this.fromRotation(v3(0, 0, 1), misc.radiansToDegrees(rotationAngleY));
 
         let combinedQuat = rotationQuatY//this.multiplyQuaternions(rotationQuatX, rotationQuatY)
         // 将两个四元数相乘，以获得综合的旋转效果
-       // let combinedQuat = math.Quat.multiply(rotationQuatX, rotationQuatY, rotationQuatX);
+        // let combinedQuat = math.Quat.multiply(rotationQuatX, rotationQuatY, rotationQuatX);
 
         // 计算从相机到targetCube的向量
         let cameraToTarget = this.node.worldPosition.clone().subtract(this.targetCube.worldPosition);
@@ -254,17 +254,17 @@ export class CameraAngel extends Component {
         this.node.lookAt(this.targetCube.worldPosition);
     }
 
-     multiplyQuaternions(quat1: math.Quat, quat2: math.Quat): math.Quat {
-    let result = new math.Quat();
+    multiplyQuaternions(quat1: math.Quat, quat2: math.Quat): math.Quat {
+        let result = new math.Quat();
 
-    // Quaternion multiplication formula: result = quat2 * quat1
-    result.x = quat2.x * quat1.w + quat2.y * quat1.z - quat2.z * quat1.y + quat2.w * quat1.x;
-    result.y = -quat2.x * quat1.z + quat2.y * quat1.w + quat2.z * quat1.x + quat2.w * quat1.y;
-    result.z = quat2.x * quat1.y - quat2.y * quat1.x + quat2.z * quat1.w + quat2.w * quat1.z;
-    result.w = -quat2.x * quat1.x - quat2.y * quat1.y - quat2.z * quat1.z + quat2.w * quat1.w;
+        // Quaternion multiplication formula: result = quat2 * quat1
+        result.x = quat2.x * quat1.w + quat2.y * quat1.z - quat2.z * quat1.y + quat2.w * quat1.x;
+        result.y = -quat2.x * quat1.z + quat2.y * quat1.w + quat2.z * quat1.x + quat2.w * quat1.y;
+        result.z = quat2.x * quat1.y - quat2.y * quat1.x + quat2.z * quat1.w + quat2.w * quat1.z;
+        result.w = -quat2.x * quat1.x - quat2.y * quat1.y - quat2.z * quat1.z + quat2.w * quat1.w;
 
-    return result;
-}
+        return result;
+    }
 
     rotateAndLookAtTarget() {
         if (!this.targetCube) {
@@ -283,7 +283,7 @@ export class CameraAngel extends Component {
         let rotatedPos = this.targetCube.worldPosition.clone().add(rotatedDirection.clone().multiplyScalar(distance));
         let rotatedPos2 = this.targetCube.worldPosition.clone().add(this.node.forward.multiplyScalar(distance * -1));
 
-        console.log(rotatedDirection.clone(), rotatedPos2)
+        Logger.debug(rotatedDirection.clone(), rotatedPos2)
         // 更新相机位置
         this.node.setWorldPosition(rotatedPos);
 
@@ -312,11 +312,11 @@ export class CameraAngel extends Component {
                 this.targetCube.worldPosition = this.targetCube.worldPosition.add3f(this.speed * director.getDeltaTime(), 0, 0);
                 break;
         }
-     
+
 
         this.ResetPos()
 
-       // this.targetCube_lastPos = this.targetCube.worldPosition.clone();
+        // this.targetCube_lastPos = this.targetCube.worldPosition.clone();
     }
 
     onKeyUp(event: EventKeyboard) {

package/assets/core/home/FollowCamera.ts

@@ -39,37 +39,37 @@ export class FollowCamera extends Component {
     protected _targetWorldPos = new Vec3;
     protected _lastTargetPos = new Vec3;
 
-    private static Deg2Rad:number=(Math.PI) / 180;
+    private static Deg2Rad: number = (Math.PI) / 180;
 
 
     isMove = false;
     start() {
 
-       // let node = find("Canvas/yaogan")
+        // let node = find("Canvas/yaogan")
 
         // node.on(Node.EventType.TOUCH_START, this.TouchStart, this);
         // node.on(Node.EventType.TOUCH_MOVE, this.TouchMove, this);
         // node.on(Node.EventType.TOUCH_END, this.TouchEnd, this);
 
 
-        
+
     }
 
-    StartGame(focusTarget:Node,dis:number){
+    StartGame(focusTarget: Node, dis: number) {
+
 
-        
         this.focusTarget = focusTarget;
         this._lastTargetPos.set(this.focusTarget.worldPosition.clone());
         this.distance = dis
         this._updateTargetWorldPos();
 
         tween(this.node)
-        .to(0.5, { worldPosition: this._targetWorldPos })
-        .start();
-        
+            .to(0.5, { worldPosition: this._targetWorldPos })
+            .start();
+
         //this.node.setWorldPosition(this._targetWorldPos);
 
-       // this.UpdatePos(0, 0)
+        // this.UpdatePos(0, 0)
     }
     protected _updateTargetWorldPos() {
         this._targetWorldPos.set(this.focusTarget.worldPosition.clone());
@@ -79,16 +79,16 @@ export class FollowCamera extends Component {
         }
 
         this._targetWorldPos.add(this.node.forward.multiplyScalar(this.distance * -1));
-       // this._targetWorldPos.add3f(this._targetWorldPos.x,this._targetWorldPos.y,this._targetWorldPos.z);
+        // this._targetWorldPos.add3f(this._targetWorldPos.x,this._targetWorldPos.y,this._targetWorldPos.z);
     }
 
     update() {
         if (!this.focusTarget) {
             return
         }
-        if(this.isMove){
+        if (this.isMove) {
 
-           // console.log("阻止")
+            // Logger.debug("阻止")
             return;
         }
 
@@ -96,7 +96,7 @@ export class FollowCamera extends Component {
     }
 
     isUpdatePos = false;
-    UpdateP(){
+    UpdateP() {
         if (!this._lastTargetPos.equals(this.focusTarget.worldPosition.clone())) {
             this._lastTargetPos.set(this.focusTarget.worldPosition.clone());
             this._updateTargetWorldPos();
@@ -111,17 +111,17 @@ export class FollowCamera extends Component {
             let ret = this.node.worldPosition.clone().add(diff.multiplyScalar(this.speedFactor));
             //ret =  ret.add(v3(0,0.5,0));
             this.node.setWorldPosition(ret);
-            //console.log('-----',this.node.worldPosition);
+            //Logger.debug('-----',this.node.worldPosition);
             //this.node.setWorldPosition(v3(ret.x,37,ret.z));
 
             this.isUpdatePos = true
-        }else{
+        } else {
             this.isUpdatePos = false
         }
     }
 
 
-    IsMovePos(){
+    IsMovePos() {
 
         v3_1.set(this._targetWorldPos);
         let diff = v3_1.subtract(this.node.worldPosition);
@@ -143,22 +143,21 @@ export class FollowCamera extends Component {
      * @param axis 旋转轴
      * @param angle 旋转角度
      */
-    public static RotationAroundNode(self:Node,pos:Vec3,axis:Vec3,angle:number):Quat
-    {
-        let _quat=new Quat();
-        let v1=new Vec3();
-        let v2=new Vec3();
-        let pos2:Vec3=self.position;
-        let rad=angle* this.Deg2Rad;
+    public static RotationAroundNode(self: Node, pos: Vec3, axis: Vec3, angle: number): Quat {
+        let _quat = new Quat();
+        let v1 = new Vec3();
+        let v2 = new Vec3();
+        let pos2: Vec3 = self.position;
+        let rad = angle * this.Deg2Rad;
         //根据旋转轴和旋转弧度计算四元数
-        Quat.fromAxisAngle(_quat,axis,rad);
+        Quat.fromAxisAngle(_quat, axis, rad);
         //相减，目标点与相机点之间的向量
-        Vec3.subtract(v1,pos2,pos);
+        Vec3.subtract(v1, pos2, pos);
         //把向量dir根据计算到的四元数旋转，然后计算出旋转后的距离
-        Vec3.transformQuat(v2,v1,_quat);
-        self.position=Vec3.add(v2,pos,v2);
+        Vec3.transformQuat(v2, v1, _quat);
+        self.position = Vec3.add(v2, pos, v2);
         //根据轴和弧度绕世界空间下指定轴旋转四元数
-        Quat.rotateAround(_quat,self.rotation,axis,rad);
+        Quat.rotateAround(_quat, self.rotation, axis, rad);
         return _quat;
     }
 
@@ -201,5 +200,5 @@ export class FollowCamera extends Component {
 
 
 
-   
+
 }

package/assets/core/home/InViewCenter.ts

@@ -44,7 +44,7 @@ export class InViewCenter {
 
     isPointInsideCanvas(point: Vec3): boolean {
         const canvasSize = this.screenSize;
-        //console.log(this.width)
+        //Logger.debug(this.width)
         return (point.x >= -this.width && point.x <= this.width &&
             point.y >= -this.height && point.y <= this.height);
     }

package/assets/core/home/ProgessWindow.ts

@@ -52,13 +52,13 @@ export class ProgessWindow extends Component {
     }
 
     /***更新进度 */
-    public ProgessValue(value: number) {
+    public ProgessValue(value: number, anim_time: number = 0.1) {
         if (this.pro_bar) {
             this.onProgress?.(value)
             if (this.pro_lb) {
                 this.pro_lb.string = `${value}%`
             }
-            this.pro(this.pro_bar, value, 100, 0);
+            this.pro(this.pro_bar, value, 100, anim_time);
         }
     }