浏览代码

修改数据和bug

修改数据和bug
Kziwws 4 天之前
父节点
当前提交
c12070b0b1

二进制
assets/audios/.DS_Store


二进制
assets/audios/bgm/BGM.mp3


二进制
assets/audios/bgm/bgm_1.mp3


二进制
assets/audios/bgm/bgm_2.mp3


二进制
assets/audios/bgm/bgm_3.mp3


二进制
assets/audios/sound/reload.mp3


+ 4 - 4
assets/prefabs/ui/settingUI.prefab

@@ -1569,7 +1569,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 75.165283203125,
+      "width": 56.58485412597656,
       "height": 26.875799999999998
     },
     "_anchorPoint": {
@@ -1605,7 +1605,7 @@
       "b": 255,
       "a": 255
     },
-    "_string": "vibrate",
+    "_string": "music",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 21.33,
@@ -1932,7 +1932,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 75.165283203125,
+      "width": 59.03239440917969,
       "height": 26.875799999999998
     },
     "_anchorPoint": {
@@ -1968,7 +1968,7 @@
       "b": 255,
       "a": 255
     },
-    "_string": "vibrate",
+    "_string": "sound",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 21.33,

文件差异内容过多而无法显示
+ 1921 - 219
assets/prefabs/ui/tossBoomerangUI.prefab


+ 4 - 4
assets/scenes/launch.scene

@@ -195,7 +195,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 360,
-      "y": 799.9999999999999,
+      "y": 800,
       "z": 4.643324567305285
     },
     "_lrot": {
@@ -280,7 +280,7 @@
     "_priority": 65535,
     "_fov": 45,
     "_fovAxis": 0,
-    "_orthoHeight": 799.9999999999999,
+    "_orthoHeight": 800,
     "_near": 1,
     "_far": 2000,
     "_color": {
@@ -907,7 +907,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1599.9999999999998
+      "height": 1600
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -998,7 +998,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720.0000000000001,
-      "height": 1600
+      "height": 1600.0000000000002
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

+ 4 - 4
assets/scripts/core/configs/BundleConfig.ts

@@ -39,13 +39,13 @@ export const bundleConfig: any = new Map([
     ['prefabs', {
         loadAtLaunch: true,//参与启动加载
         preloadAssets: [
-            { path: 'enemy/enemy/generalPistol', type: Prefab },
+            /*{ path: 'enemy/enemy/generalPistol', type: Prefab },
             { path: 'enemy/enemy/scatterCaptain', type: Prefab },
             { path: 'enemy/enemy/shieldSoldier', type: Prefab },
             { path: 'enemy/enemy/snipeCaptain', type: Prefab },
             { path: 'enemy/enemy/sniperSoldier', type: Prefab },
             { path: 'enemy/enemy/soldierPistol', type: Prefab },
-            { path: 'enemy/enemy/tank', type: Prefab },
+            { path: 'enemy/enemy/tank', type: Prefab },*/
 
             { path: 'enemy/gun/pistol', type: Prefab },
             { path: 'enemy/gun/scatter', type: Prefab },
@@ -54,13 +54,13 @@ export const bundleConfig: any = new Map([
             { path: 'enemy/gun/tank_pao', type: Prefab },
 
             { path: 'player/98k', type: Prefab },
-            { path: 'player/m24', type: Prefab },
+            /*{ path: 'player/m24', type: Prefab },
             { path: 'player/awm', type: Prefab },
             { path: 'player/barrettM82A1', type: Prefab },
             { path: 'player/m416', type: Prefab },
             { path: 'player/akm', type: Prefab },
             { path: 'player/vss', type: Prefab },
-            { path: 'player/sks', type: Prefab },
+            { path: 'player/sks', type: Prefab },*/
 
             { path: 'texture/msg_hint/spriteFrame', type: SpriteFrame },
             { path: 'texture/test_01/texture', type: Texture2D },

+ 11 - 3
assets/scripts/game/Game.ts

@@ -47,8 +47,9 @@ export class Game extends BaseExp {
         this.canvas.active = true;
         this.map_pos.active = true;
         //加载map
-        this.loadMap();
-        audioMgr.play(Constants.audios.BGM);
+        this.loadMap(()=>{
+            audioMgr.play(Constants.audios.BGM,true);
+        });
     }
 
     /**
@@ -84,7 +85,8 @@ export class Game extends BaseExp {
      * @param cb 回调
      */
     public loadMap(cb: Function = null){
-        const name: string = userIns.getCurLevelData().map;
+        let levelData:any = userIns.getCurLevelData();
+        const name: string = levelData.map;
         if(Utils.isNull(name))return
         Logger.log(`加载地图:${name}`);
         ResUtil.loadRes(`map/${name}`).then((map:Node)=>{
@@ -109,6 +111,12 @@ export class Game extends BaseExp {
             this.camera = cameraNode.getComponent(Camera);
             cb?.();
         });
+        //去加载下一关map所需要的地图 这儿只要加载过 就会缓存 意思就这一次加载的 
+        //把下一次要用的到的地图提前预加载一遍
+        const nextLevelData = userIns.levelsTable.find(e=>e.id == (levelData.id + 1));
+        if(nextLevelData && name != nextLevelData.map){
+           ResUtil.loadRes(`map/${nextLevelData.map}`);
+        }
     }
 
     /**

+ 19 - 0
assets/scripts/game/Main.ts

@@ -11,6 +11,7 @@ import { TaskItem } from '../items/item/TaskItem';
 import { stateMgr } from '../core/manager/StateManager';
 import { Game } from '../game/Game';
 import i18n from '../core/i18n/runtime-scripts/LanguageData';
+import { audioMgr } from '../core/manager/AudioManager';
 const { ccclass, property } = _decorator;
 
 @ccclass('Main')
@@ -48,6 +49,8 @@ export class Main extends BaseExp {
     private originalPositions: Vec3[] = [];
     //是否重新启动加载地图
     private isLoad: boolean = false;
+    //关卡背景音乐
+    private audio_BGM: string = '';
 
     start() {
         this.hasAnim = false;
@@ -123,6 +126,18 @@ export class Main extends BaseExp {
         item.getComponent(TaskItem).init(task);
     }
 
+    /**
+     * 暂停关卡内的背景音乐
+     */
+    public playOrStopBGM(isPlay: boolean){
+        if(!this.audio_BGM)return;
+        if(isPlay){
+            audioMgr.play(this.audio_BGM,true);
+        }else{
+            audioMgr.stop(this.audio_BGM);
+        }
+    }
+
     /**
      * 开始游戏
      */
@@ -130,6 +145,10 @@ export class Main extends BaseExp {
         if(this.isLoad){
            Game.I.loadMap();
         }
+        //播放关卡背景音乐
+        let bgms:string[] = [Constants.audios.bgm_1,Constants.audios.bgm_2,Constants.audios.bgm_3];
+        this.audio_BGM = Utils.randomArray(bgms)[0];
+        audioMgr.play(this.audio_BGM,true);
         Game.I.player.restart();
         if(Constants.isDebug && !Utils.isNull(this.editBox.string)){
            userIns.data.level = parseInt(this.editBox.string);

+ 1 - 0
assets/scripts/ui/ArsenalUI.ts

@@ -58,6 +58,7 @@ export class ArsenalUI extends BaseExp {
      * 强制刷新列表数据
      */
     public forceRefresh(){
+        this.curGunData = userIns.getCurUseGun();
         this.loadArsenalData(this.curTypeData,true)
     }
 

+ 5 - 0
assets/scripts/ui/GunfightShootUI.ts

@@ -13,6 +13,7 @@ import { BulletMagazine } from '../game/BulletMagazine';
 import { audioMgr } from '../core/manager/AudioManager';
 import { settingData } from '../data/SettingData';
 import i18n from '../core/i18n/runtime-scripts/LanguageData';
+import { Main } from '../game/Main';
 const { ccclass, property } = _decorator;
 const { clamp, toRadian } = math;
 
@@ -128,6 +129,10 @@ export class GunfightShootUI extends BaseExp {
         this.register(Constants.eventName.enemy_num_change, this.loadTaskData.bind(this));
     }
 
+    public hide(){
+       uiMgr.getPageComponent(Constants.mainUIs.main)?.playOrStopBGM(false);
+    }
+    
     /**
      * 摄像机初始信息
      * @param args 

+ 2 - 0
assets/scripts/ui/PauseUI.ts

@@ -13,6 +13,7 @@ export class PauseUI extends BaseExp {
         this.hasAnim = true;
         this.closeOnBlank = false;
         Game.I.isPause = true;
+        uiMgr.getPageComponent(Constants.mainUIs.main)?.playOrStopBGM(false);
     }
 
     /**
@@ -29,6 +30,7 @@ export class PauseUI extends BaseExp {
         }else if(btnName === 'continue_btn'){
             uiMgr.hide(Constants.popUIs.pauseUI,()=>{
                 Game.I.isPause = false;
+                uiMgr.getPageComponent(Constants.mainUIs.main)?.playOrStopBGM(true);
             });
         }
     }

+ 85 - 74
assets/scripts/ui/TossBoomerangUI.ts

@@ -1,24 +1,22 @@
-import { _decorator, Node, Label, EventTouch, Vec3, UITransform, Prefab, Size, tween, easing} from 'cc';
+import { _decorator, Node, Label, EventTouch, Vec3, UITransform, Prefab, tween} from 'cc';
 import { BaseExp } from '../core/base/BaseExp';
-import List from '../third/List';
 import { autoBind } from '../extend/AutoBind';
 import { Constants } from '../data/Constants';
-import { stateMgr } from '../core/manager/StateManager';
 import { userIns } from '../data/UserData';
+import { Utils } from '../utils/Utils';
+import { uiMgr } from '../core/manager/UIManager';
+import { stateMgr } from '../core/manager/StateManager';
 import { ITEM_TYPE, ResUtil } from '../utils/ResUtil';
-import MsgHints from '../utils/MsgHints';
 import { PoolManager } from '../core/manager/PoolManager';
 import { bundleMgr } from '../core/manager/BundleManager';
-import { Utils } from '../utils/Utils';
-import { uiMgr } from '../core/manager/UIManager';
 import { audioMgr } from '../core/manager/AudioManager';
 const { ccclass, property } = _decorator;
 
 //扔飞镖
 @ccclass('TossBoomerangUI')
 export class TossBoomerangUI extends BaseExp {
-    @autoBind({ type: Node, tooltip: "靶面" })
-    public target_plate: Node;
+    @autoBind({ type: Node, tooltip: "靶面中的所有靶心" })
+    public content: Node;
     @autoBind({ type: Node, tooltip: "飞镖按钮" })
     public shoot_btn: Node;
     @autoBind({ type: Label, tooltip: "金币文本" })
@@ -37,6 +35,9 @@ export class TossBoomerangUI extends BaseExp {
         //注册动态变化值
         stateMgr.registerUI(Constants.gold, this.gold_lable);
         stateMgr.registerUI(Constants.diamond, this.diamond_lable);
+        this.content.children.forEach(child => {
+            child.on(Node.EventType.TOUCH_END, this.startToss.bind(this), this);
+        })
     }
     
     public show(...args: any[]){
@@ -64,12 +65,20 @@ export class TossBoomerangUI extends BaseExp {
     /**
      * 扔飞镖数据
      */
-    public async startToss(){
+    public startToss(event:EventTouch = null,param:any = null){
         if(this.isBoomeranging)return;
         if(userIns.data.boomerang <= 0){
            this.buyBoomerang();
            return;
         }
+        let target_plate:Node = null;
+        if(event){
+           target_plate = event.target;
+        }else{
+           //获取靶心
+           let r:number = Utils.getRandomInt(0,this.content.children.length);
+           target_plate = this.content.children[r];
+        }
         audioMgr.playOneShot(Constants.audios.dart);
         this.isBoomeranging = true;
         userIns.data.boomerang -= 1;
@@ -92,75 +101,77 @@ export class TossBoomerangUI extends BaseExp {
             selectedItem = userIns.boomerangTable[0];
         }
         //加载飞镖预制体
-        const ret: any = await bundleMgr.loadAsset(Constants.bundleName.prefabs, `items/tossBoomerang`, Prefab);
-        var boomerang:Node = PoolManager.getNode(ret,this.target_plate.parent);
-        //获取靶面尺寸(假设靶面锚点在中心)
-        const targetSize = this.target_plate.getComponent(UITransform)?.contentSize;
-        //生成随机角度(0-360度)
-        const angle = Math.random() * Math.PI * 2;
-        //根据权重计算偏移比例(权重越大,offsetRatio越小) 获取靶面中心的世界坐标
-        const targetWorldPos = this.target_plate.parent.getComponent(UITransform)
-            .convertToWorldSpaceAR(this.target_plate.position);
-        //转换为父节点坐标系下的坐标
-        const targetCenter = this.target_plate.parent.getComponent(UITransform)
-            .convertToNodeSpaceAR(targetWorldPos);
-        //生成基于靶心坐标的随机偏移(权重越大越靠近中心)平方曲线增强中心聚集 缩小最大偏移范围
-        const maxRadius = targetSize.width * 0.2; 
-        const offsetRatio = Math.pow(1 - (selectedItem.weight / totalWeight), 2);
-        //最终落点计算(以靶心为基准)
-        const targetPos = new Vec3(
-            targetCenter.x + Math.cos(angle) * maxRadius * offsetRatio,
-            targetCenter.y + Math.sin(angle) * maxRadius * offsetRatio,
-            0
-        );
-        const targetUITransform = this.target_plate.getComponent(UITransform);
-        const radius = targetUITransform.contentSize.width / 2.0  * 1.5; // 半径取宽度的一半
-        const randomAngle = Math.random() * Math.PI * 2; // 生成0-360度的随机角度
-        //新起始点计算(靶面中心 + 半径 * 随机角度)
-        const startPos = new Vec3(
-            this.target_plate.position.x + radius * Math.cos(randomAngle),
-            this.target_plate.position.y + radius * Math.sin(randomAngle),
-            0
-        );
-        //飞镖初始位置(从屏幕下方飞出)
-        //let startPos: Vec3 = Utils.convertPosition(this.shoot_btn,this.target_plate.parent);
-        boomerang.position = startPos.clone();
-        let middePos = Utils.randomUIPointGenerator(this.target_plate,startPos,200);
-        let pos = Utils.calculateParabolaCenter(startPos,targetPos);
-        let controlPoint = new Vec3(middePos.x + pos.x,middePos.y,middePos.z)
-        //贝塞尔轨迹计算
-        const calculateTrajectory = (t: number, p0: Vec3, p1: Vec3, p2: Vec3) => {
-            const u = 1 - t;
-            return new Vec3(
-                u*u*p0.x + 2*u*t*p1.x + t*t*p2.x,
-                u*u*p0.y + 2*u*t*p1.y + t*t*p2.y,
+        ResUtil.loadRes(`items/tossBoomerang`).then((ret:Node)=>{
+            var boomerang:Node = PoolManager.getNode(ret,this.content);
+            //获取靶面尺寸(假设靶面锚点在中心)
+            const targetSize = target_plate.getComponent(UITransform)?.contentSize;
+            //生成随机角度(0-360度)
+            const angle = Math.random() * Math.PI * 2;
+            //根据权重计算偏移比例(权重越大,offsetRatio越小) 获取靶面中心的世界坐标
+            const targetWorldPos = target_plate.parent.getComponent(UITransform)
+                .convertToWorldSpaceAR(target_plate.position);
+            //转换为父节点坐标系下的坐标
+            const targetCenter = target_plate.parent.getComponent(UITransform)
+                .convertToNodeSpaceAR(targetWorldPos);
+            //生成基于靶心坐标的随机偏移(权重越大越靠近中心)平方曲线增强中心聚集 缩小最大偏移范围
+            const maxRadius = targetSize.width * 0.2; 
+            const offsetRatio = Math.pow(1 - (selectedItem.weight / totalWeight), 2);
+            //最终落点计算(以靶心为基准)
+            const targetPos = new Vec3(
+                targetCenter.x + Math.cos(angle) * maxRadius * offsetRatio,
+                targetCenter.y + Math.sin(angle) * maxRadius * offsetRatio,
+                0
+            );
+            const targetUITransform = target_plate.getComponent(UITransform);
+            const radius = targetUITransform.contentSize.width / 2.0  * 1.5; // 半径取宽度的一半
+            const randomAngle = Math.random() * Math.PI * 2; // 生成0-360度的随机角度
+            //新起始点计算(靶面中心 + 半径 * 随机角度)
+            const startPos = new Vec3(
+                target_plate.position.x + radius * Math.cos(randomAngle),
+                target_plate.position.y + radius * Math.sin(randomAngle),
                 0
             );
-        };
-        tween(boomerang)
-            .to(0.4, {}, {
-                onUpdate: (_, ratio: number) => {//计算当前帧位置
-                    const currentPos = calculateTrajectory(
-                        ratio,
-                        startPos,
-                        controlPoint,
-                        targetPos
-                    );
-                    //更新位置和旋转
-                    boomerang.position = currentPos;
-                    boomerang.angle = Utils.getAngle(currentPos,targetPos)-90;
-                },
-                onComplete: () => {
+            //飞镖初始位置(从屏幕下方飞出)
+            //let startPos: Vec3 = Utils.convertPosition(this.shoot_btn,this.target_plate.parent);
+            boomerang.position = startPos.clone();
+            let middePos = Utils.randomUIPointGenerator(target_plate,startPos,200);
+            let pos = Utils.calculateParabolaCenter(startPos,targetPos);
+            let controlPoint = new Vec3(middePos.x + pos.x,middePos.y,middePos.z)
+            //贝塞尔轨迹计算
+            const calculateTrajectory = (t: number, p0: Vec3, p1: Vec3, p2: Vec3) => {
+                const u = 1 - t;
+                return new Vec3(
+                    u*u*p0.x + 2*u*t*p1.x + t*t*p2.x,
+                    u*u*p0.y + 2*u*t*p1.y + t*t*p2.y,
+                    0
+                );
+            };
+            tween(boomerang)
+                .to(0.8, {}, {
+                    onUpdate: (_, ratio: number) => {//计算当前帧位置
+                        const currentPos = calculateTrajectory(
+                            ratio,
+                            startPos,
+                            controlPoint,
+                            targetPos
+                        );
+                        //更新位置和旋转
+                        boomerang.position = currentPos;
+                        boomerang.angle = Utils.getAngle(currentPos,targetPos)-90;
+                    }
+                })
+                .call(()=>{
+                    boomerang.position = targetPos;
+                })
+                .start();
+                this.scheduleOnce(() => {
                     if(boomerang.parent) {
-                        setTimeout(() => {
-                            PoolManager.putNode(boomerang);
-                            this.handleReward(selectedItem);
-                            this.isBoomeranging = false;
-                        },0.2);
+                        PoolManager.putNode(boomerang);
+                        this.handleReward(selectedItem);
+                        this.isBoomeranging = false;
                     }
-                }
-            })
-            .start();
+                },1)
+        });
     }
 
     /**

二进制
assets/textures/.DS_Store


二进制
assets/textures/boomerang/.DS_Store


二进制
assets/textures/boomerang/Ba_2.png


+ 134 - 0
assets/textures/boomerang/Ba_2.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "dc801d28-8f78-469a-a85c-d166985378e5",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "dc801d28-8f78-469a-a85c-d166985378e5@6c48a",
+      "displayName": "Ba_2",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "dc801d28-8f78-469a-a85c-d166985378e5",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "dc801d28-8f78-469a-a85c-d166985378e5@f9941",
+      "displayName": "Ba_2",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 180,
+        "height": 179,
+        "rawWidth": 180,
+        "rawHeight": 179,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -90,
+            -89.5,
+            0,
+            90,
+            -89.5,
+            0,
+            -90,
+            89.5,
+            0,
+            90,
+            89.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            179,
+            180,
+            179,
+            0,
+            0,
+            180,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -90,
+            -89.5,
+            0
+          ],
+          "maxPos": [
+            90,
+            89.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "dc801d28-8f78-469a-a85c-d166985378e5@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "dc801d28-8f78-469a-a85c-d166985378e5@6c48a"
+  }
+}

二进制
assets/textures/boomerang/FeiBiaoQi.png


+ 134 - 0
assets/textures/boomerang/FeiBiaoQi.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "caa93c72-0c43-4256-ab63-84f655b08db1",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "caa93c72-0c43-4256-ab63-84f655b08db1@6c48a",
+      "displayName": "FeiBiaoQi",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "caa93c72-0c43-4256-ab63-84f655b08db1",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "caa93c72-0c43-4256-ab63-84f655b08db1@f9941",
+      "displayName": "FeiBiaoQi",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 720,
+        "height": 868,
+        "rawWidth": 720,
+        "rawHeight": 868,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -360,
+            -434,
+            0,
+            360,
+            -434,
+            0,
+            -360,
+            434,
+            0,
+            360,
+            434,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            868,
+            720,
+            868,
+            0,
+            0,
+            720,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -360,
+            -434,
+            0
+          ],
+          "maxPos": [
+            360,
+            434,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "caa93c72-0c43-4256-ab63-84f655b08db1@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "caa93c72-0c43-4256-ab63-84f655b08db1@6c48a"
+  }
+}

+ 3 - 3
assets/textures/launch/JinDuTiao_Nei.png.meta

@@ -51,9 +51,9 @@
         "rawWidth": 165,
         "rawHeight": 39,
         "borderTop": 11,
-        "borderBottom": 7,
-        "borderLeft": 14,
-        "borderRight": 16,
+        "borderBottom": 9,
+        "borderLeft": 23,
+        "borderRight": 100,
         "packable": true,
         "pixelsToUnit": 100,
         "pivotX": 0.5,

+ 73 - 73
profiles/v2/packages/scene.json

@@ -5,7 +5,7 @@
     "__version__": "1.3.9"
   },
   "gizmos-infos": {
-    "is2D": false,
+    "is2D": true,
     "is3DIcon": false,
     "iconSize": 2,
     "gridVisible": true,
@@ -767,31 +767,6 @@
       },
       "scale": 1
     },
-    "4844b5ae-cfad-4282-92e9-d58dae3b6445": {
-      "position": {
-        "x": 3477.3522461157663,
-        "y": 400.6199159109947,
-        "z": 5000
-      },
-      "rotation": {
-        "x": 0,
-        "y": 0,
-        "z": 0,
-        "w": 1
-      },
-      "viewCenter": {
-        "x": 6431.489226165714,
-        "y": 228.54986287964368,
-        "z": 144.23594943101943
-      },
-      "contentRect": {
-        "x": 0,
-        "y": 0,
-        "width": 3000,
-        "height": 2000
-      },
-      "scale": 1
-    },
     "4a024490-339a-46f9-880e-c57a1bfe4d6e": {
       "position": {
         "x": 1479.513310718944,
@@ -1042,31 +1017,6 @@
       },
       "scale": 1
     },
-    "6fdfa45a-54d2-427e-9510-d0cbbbc63997": {
-      "position": {
-        "x": 455.74505029508316,
-        "y": 1448.9210932155383,
-        "z": 5000
-      },
-      "rotation": {
-        "x": 0,
-        "y": 0,
-        "z": 0,
-        "w": 1
-      },
-      "viewCenter": {
-        "x": 360,
-        "y": 800.0000000000001,
-        "z": 0
-      },
-      "contentRect": {
-        "x": -320.0776879709698,
-        "y": 658.2737166386689,
-        "width": 942,
-        "height": 960
-      },
-      "scale": 0.6070974421975242
-    },
     "2a6d10bc-9c1e-4420-ae90-e9ba997eea5f": {
       "position": {
         "x": 735.814539822617,
@@ -1294,34 +1244,34 @@
     },
     "b824d4a8-95d2-4112-8d63-f7df26c184ee": {
       "position": {
-        "x": 723.6104389070202,
-        "y": 1613.2606676790974,
-        "z": -0.2371894504767988
+        "x": 748.2450380769434,
+        "y": 1619.3934305239195,
+        "z": 13.87909053225112
       },
       "rotation": {
-        "x": -0.19532710155629088,
-        "y": 0.7796740072659197,
-        "z": 0.29465198762262546,
-        "w": 0.5168519826619195
+        "x": -0.2662506147794975,
+        "y": 0.5903732910621121,
+        "z": 0.21503685066232567,
+        "w": 0.7309782077375898
       },
       "viewCenter": {
-        "x": 709.7589000000002,
-        "y": 1600.0000000000002,
-        "z": 5.619224567305283
+        "x": 726.658,
+        "y": 1600.847,
+        "z": 9.232324567305284
       },
       "contentRect": {
-        "x": -1254.6204312067482,
-        "y": -631.0852101688064,
+        "x": 0,
+        "y": 0,
         "width": 1168,
         "height": 960
       },
-      "scale": 0.6745512671698497
+      "scale": 1
     },
-    "10795865-5525-41fc-8bf7-0e8d6983b214": {
+    "6fdfa45a-54d2-427e-9510-d0cbbbc63997": {
       "position": {
-        "x": 695.2193981333003,
-        "y": 2842.556102101682,
-        "z": 8454.140154960158
+        "x": 455.74505029508316,
+        "y": 1448.9210932155383,
+        "z": 4585.466817280897
       },
       "rotation": {
         "x": 0,
@@ -1335,12 +1285,62 @@
         "z": 0
       },
       "contentRect": {
-        "x": -1254.6204312067482,
-        "y": -631.0852101688064,
+        "x": 0,
+        "y": 0,
         "width": 1168,
         "height": 960
       },
-      "scale": 0.6745512671698497
+      "scale": 1
+    },
+    "4844b5ae-cfad-4282-92e9-d58dae3b6445": {
+      "position": {
+        "x": 360,
+        "y": 800,
+        "z": 2022.6243685808236
+      },
+      "rotation": {
+        "x": 0,
+        "y": 0,
+        "z": 0,
+        "w": 1
+      },
+      "viewCenter": {
+        "x": 360,
+        "y": 800,
+        "z": 4.643324567305285
+      },
+      "contentRect": {
+        "x": 0,
+        "y": 0,
+        "width": 1168,
+        "height": 960
+      },
+      "scale": 1
+    },
+    "10795865-5525-41fc-8bf7-0e8d6983b214": {
+      "position": {
+        "x": 360,
+        "y": 800,
+        "z": 3225.00174484505
+      },
+      "rotation": {
+        "x": 0,
+        "y": 0,
+        "z": 0,
+        "w": 1
+      },
+      "viewCenter": {
+        "x": 360,
+        "y": 800,
+        "z": 4.643324567305285
+      },
+      "contentRect": {
+        "x": 0,
+        "y": 0,
+        "width": 1168,
+        "height": 960
+      },
+      "scale": 1
     }
   },
   "camera-uuids": [
@@ -1371,7 +1371,6 @@
     "94719fcd-0e99-4a54-9b20-bc0a31782638",
     "f4a95669-6998-4e14-855c-0d5242a730f4",
     "7e326685-ca67-4439-866a-c9458fd31e3a",
-    "4844b5ae-cfad-4282-92e9-d58dae3b6445",
     "4a024490-339a-46f9-880e-c57a1bfe4d6e",
     "196971a7-f6fb-4bf3-8588-e5336b5a4b5b",
     "c04220a0-a3ba-466b-8e3d-e07ebc17fd5a",
@@ -1382,7 +1381,6 @@
     "d9d65047-bb99-4e66-80ce-dd8f8e86c067",
     "99b412e6-33d6-4baf-87f9-25502bc99057",
     "0ab8a800-8ba6-4fe1-9b37-6bb77d04047f",
-    "6fdfa45a-54d2-427e-9510-d0cbbbc63997",
     "2a6d10bc-9c1e-4420-ae90-e9ba997eea5f",
     "19486281-e3c1-4739-9220-c9ac2a1c94cb",
     "b07de711-a123-4d3f-b4e8-01eaa35c7e91",
@@ -1393,6 +1391,8 @@
     "6cd0f89e-0f4d-4300-9dca-c0d0eb842b99",
     "eec55ad7-7716-4dec-ae04-01c7f735325e",
     "b824d4a8-95d2-4112-8d63-f7df26c184ee",
+    "6fdfa45a-54d2-427e-9510-d0cbbbc63997",
+    "4844b5ae-cfad-4282-92e9-d58dae3b6445",
     "10795865-5525-41fc-8bf7-0e8d6983b214"
   ],
   "camera": {

部分文件因为文件数量过多而无法显示