@cc-component/cc-core 1.2.8 → 1.2.9

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

@@ -2,7 +2,7 @@
   "ver": "4.0.24",
   "importer": "typescript",
   "imported": true,
-  "uuid": "9ca64a42-77ad-4ea2-a0bd-74b8ab2f6336",
+  "uuid": "1257be8f-ef7a-4251-8c29-2425e12b503d",
   "files": [],
   "subMetas": {},
   "userData": {}

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/CameraAngel.ts.meta

@@ -2,7 +2,7 @@
   "ver": "4.0.24",
   "importer": "typescript",
   "imported": true,
-  "uuid": "9c8ac71f-a3fd-4a2f-9c60-dbce3c3bee0b",
+  "uuid": "881467d2-d92a-495a-a3b4-0a3bc6e95691",
   "files": [],
   "subMetas": {},
   "userData": {}

package/assets/core/home/DouYinShow.ts

@@ -9,7 +9,7 @@ export class DouYinShow extends Component {
     isTip = false;
     protected onLoad(): void {
         if (BYTEDANCE) {
-            if (!MainModule.IsDouYin() && !this.isTip) {
+            if (!App.IsDouYin() && !this.isTip) {
                 this.node.active = false;
             } else {
             }

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

@@ -2,7 +2,7 @@
   "ver": "4.0.24",
   "importer": "typescript",
   "imported": true,
-  "uuid": "a4a32ee3-6149-4996-ba7b-a710f599ec40",
+  "uuid": "451fbb21-03ed-458c-a98d-a76ead2c9082",
   "files": [],
   "subMetas": {},
   "userData": {}

package/assets/core/home/EventManager.ts

@@ -4,20 +4,12 @@ const { ccclass } = _decorator;
 
 @ccclass('EventManager')
 export class EventManager {
-
-    private static instance: EventManager;
     private eventTarget: EventTarget;
-
-    private constructor() {
+    constructor() {
         this.eventTarget = new EventTarget();
     }
 
-    static get ins() {
-        if (!this.instance) {
-            this.instance = new EventManager();
-        }
-        return this.instance;
-    }
+
 
     on(eventName: string, callback: any, target?: any) {
         this.eventTarget.on(eventName, callback, target);

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

@@ -2,7 +2,7 @@
   "ver": "4.0.24",
   "importer": "typescript",
   "imported": true,
-  "uuid": "b7d768ad-679b-4760-a895-453952c0f884",
+  "uuid": "e8e76955-760c-4fb2-9274-8e066c61b60e",
   "files": [],
   "subMetas": {},
   "userData": {}

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/FollowCamera.ts.meta

@@ -2,7 +2,7 @@
   "ver": "4.0.24",
   "importer": "typescript",
   "imported": true,
-  "uuid": "c9bd92e7-c01c-4515-8c8c-145663b2f03d",
+  "uuid": "124d2302-2f9b-4dfc-a9ca-d41b0f1d964b",
   "files": [],
   "subMetas": {},
   "userData": {}

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/InViewCenter.ts.meta

@@ -2,7 +2,7 @@
   "ver": "4.0.24",
   "importer": "typescript",
   "imported": true,
-  "uuid": "cca892ef-33a8-4132-bc31-14534cfa126b",
+  "uuid": "1482780d-fa13-4617-bd28-a67507cb3fd6",
   "files": [],
   "subMetas": {},
   "userData": {}

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

@@ -2,7 +2,7 @@
   "ver": "4.0.24",
   "importer": "typescript",
   "imported": true,
-  "uuid": "39159e5b-86c8-4e73-8fb2-83cbeb71ba38",
+  "uuid": "9b7ba854-4546-4b4f-9d06-1b51068b5383",
   "files": [],
   "subMetas": {},
   "userData": {}

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

@@ -2,7 +2,7 @@
   "ver": "4.0.24",
   "importer": "typescript",
   "imported": true,
-  "uuid": "3fd4c65e-d51d-46a4-a8d5-e77008afbca2",
+  "uuid": "7c0bc967-6d0c-4341-a6d4-1694b8e9c533",
   "files": [],
   "subMetas": {},
   "userData": {}

package/assets/core/home/ProgessWindow.ts

@@ -0,0 +1,109 @@
+
+import { tween } from 'cc';
+import { Label } from 'cc';
+import { ProgressBar } from 'cc';
+import { _decorator, Component, Node, game, find, director } from 'cc';
+const { ccclass, property, menu } = _decorator;
+
+/**
+ * Predefined variables
+ * Name = ProgessView
+ * DateTime = Wed Sep 28 2022 22:24:36 GMT+0800 (中国标准时间)
+ * Author = yf123mb
+ * FileBasename = ProgessView.ts
+ * FileBasenameNoExtension = ProgessView
+ * URL = db://assets/home/Home/ProgessView.ts
+ * ManualUrl = https://docs.cocos.com/creator/3.4/manual/zh/
+ *
+ */
+
+@ccclass('ProgessWindow')
+@menu('组件进度条/ProgessWindow')
+export class ProgessWindow extends Component {
+
+    // static Ins:ProgessWindow;
+    @property({
+        type: ProgressBar,
+        displayName: "进度条"
+    })
+    pro_bar: ProgressBar;
+
+    @property({
+        type: Label,
+        displayName: "进度条文本"
+    })
+    pro_lb: Label;
+    /**监听进度 
+     * pro:0-100
+    */
+    public onProgress: (pro: number) => void
+
+    protected onLoad(): void {
+
+    }
+
+    SHowPro(isShow: boolean) {
+        this.pro_bar.node.active = isShow
+    }
+
+    /***更新进度--假的进度 */
+    async ProgessValueAuto(param: { startTime: number, endTime: number }) {
+        await this.loadProgress(param.startTime, param.endTime, (pro: number) => { this.ProgessValue((pro)); })
+    }
+
+    /***更新进度 */
+    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, anim_time);
+        }
+    }
+
+    Show() {
+        this.node.active = true;
+    }
+
+    Hide() {
+        this.node.active = false;
+    }
+
+
+    pro(proBar: ProgressBar, progress: number, max: number, anim_time?: number): void {
+        const com_max_pro = proBar.totalLength//getComponent(UITransform).width
+        const max_progress = com_max_pro;
+        const s = max_progress / max;
+        const pro = progress * s / max_progress;
+        if (anim_time) {
+            tween(proBar).to(anim_time, {
+                progress: pro
+            }).start();
+
+        } else {
+            proBar.progress = pro;
+        }
+    }
+
+    /** 模拟假加载进度（仅用于调试） */
+    loadProgress(startTime: number = 0, durationSeconds: number = 2, pro: (pro: number) => void): Promise<void> {
+        return new Promise((resolve) => {
+            let progress = startTime;
+            const step = 1; // 每次增加 1%
+            const intervalMs = (durationSeconds * 1000) / 100; // 总毫秒数 / 100 步
+            const timer = setInterval(() => {
+                progress += step;
+                if (progress >= 100) {
+                    progress = 100;
+                    clearInterval(timer);
+                    pro?.(progress);
+                    resolve();
+                } else {
+                    pro?.(progress);
+                }
+            }, intervalMs);
+        });
+    }
+}
+

package/assets/core/home/{ExView.ts.meta → ProgessWindow.ts.meta}

@@ -2,7 +2,7 @@
   "ver": "4.0.24",
   "importer": "typescript",
   "imported": true,
-  "uuid": "d7ac4bd9-ab7f-434f-ad91-523ac5c49622",
+  "uuid": "7bad0c85-d2c6-4f19-a2f6-3c9b9894f87b",
   "files": [],
   "subMetas": {},
   "userData": {}

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

@@ -2,7 +2,7 @@
   "ver": "4.0.24",
   "importer": "typescript",
   "imported": true,
-  "uuid": "49a06417-7524-4309-a366-0f7261b05ed8",
+  "uuid": "0e05a5c6-8651-4ca6-a15b-523af7edaa35",
   "files": [],
   "subMetas": {},
   "userData": {}

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

@@ -2,7 +2,7 @@
   "ver": "4.0.24",
   "importer": "typescript",
   "imported": true,
-  "uuid": "02922e2c-51f4-411c-b344-f20c2e98489e",
+  "uuid": "b255a448-dea9-4aff-8efd-c529de1b5584",
   "files": [],
   "subMetas": {},
   "userData": {}