Browse Source

增加二倍速弹窗

mojunshou 8 months ago
parent
commit
116f5d7646

+ 19 - 16
assets/bundle/gui/eliminate/eliminate.prefab

@@ -276,7 +276,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1600
+      "height": 1599.9999999999998
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -507,7 +507,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 790.143,
+      "y": 790.1429999999999,
       "z": 0
     },
     "_lrot": {
@@ -1100,7 +1100,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 80,
+      "width": 104,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -1139,8 +1139,8 @@
     "_string": "自动提现",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 20,
-    "_fontSize": 20,
+    "_actualFontSize": 26,
+    "_fontSize": 26,
     "_fontFamily": "Arial",
     "_lineHeight": 40,
     "_overflow": 0,
@@ -4421,7 +4421,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -118.89999389648438,
+      "x": -151.01998901367188,
       "y": 0,
       "z": 0
     },
@@ -4598,7 +4598,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 50.79998779296875,
+      "width": 105.03997802734375,
       "height": 110.8
     },
     "_anchorPoint": {
@@ -4634,7 +4634,7 @@
       "b": 135,
       "a": 255
     },
-    "_string": "1",
+    "_string": "10",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 80,
@@ -4719,7 +4719,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 57.899993896484375,
+      "x": 90.01998901367188,
       "y": 0,
       "z": 0
     },
@@ -4846,7 +4846,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 312.79998779296875,
+      "width": 377.03997802734375,
       "height": 100
     },
     "_anchorPoint": {
@@ -4884,7 +4884,7 @@
     "_paddingRight": 0,
     "_paddingTop": 0,
     "_paddingBottom": 0,
-    "_spacingX": -5,
+    "_spacingX": 0,
     "_spacingY": 0,
     "_verticalDirection": 1,
     "_horizontalDirection": 0,
@@ -6097,7 +6097,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -308.668,
+      "x": -306.025,
       "y": -287.639,
       "z": 0
     },
@@ -6233,7 +6233,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 316.118,
+      "x": 318.036,
       "y": -47.863,
       "z": 0
     },
@@ -6463,7 +6463,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -652.161,
+      "y": -652.1609999999998,
       "z": 0
     },
     "_lrot": {
@@ -8945,7 +8945,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1600
+      "height": 1599.9999999999998
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -9022,7 +9022,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1600
+      "height": 1599.9999999999998
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -9158,6 +9158,9 @@
     "autoBtn": {
       "__id__": 303
     },
+    "addSpeedBtn": {
+      "__id__": 324
+    },
     "eliminateBaseScore": 10,
     "_id": ""
   },

+ 187 - 16
assets/bundle/gui/eliminate/prefab/doubleSpeed.prefab

@@ -25,17 +25,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 74
+        "__id__": 80
       },
       {
-        "__id__": 76
+        "__id__": 82
       },
       {
-        "__id__": 78
+        "__id__": 84
       }
     ],
     "_prefab": {
-      "__id__": 80
+      "__id__": 86
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -95,19 +95,22 @@
       },
       {
         "__id__": 59
+      },
+      {
+        "__id__": 69
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 69
+        "__id__": 75
       },
       {
-        "__id__": 71
+        "__id__": 77
       }
     ],
     "_prefab": {
-      "__id__": 73
+      "__id__": 79
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -892,7 +895,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 391.123046875,
+      "width": 390,
       "height": 56.49999999999999
     },
     "_anchorPoint": {
@@ -919,7 +922,7 @@
       "__id__": 35
     },
     "_lineHeight": 25,
-    "_string": "是否需要开启2倍智能放置?每看一个视频,\n可享受3分钟的二倍速放置哦",
+    "_string": "是否需要开启2倍智能放置?每看一个视频,可享受3分钟的二倍速放置哦",
     "_horizontalAlign": 0,
     "_verticalAlign": 0,
     "_fontSize": 20,
@@ -930,7 +933,7 @@
       "b": 255,
       "a": 255
     },
-    "_maxWidth": 0,
+    "_maxWidth": 390,
     "_fontFamily": "Arial",
     "_font": null,
     "_isSystemFontUsed": true,
@@ -1744,6 +1747,165 @@
     "nestedPrefabInstanceRoots": null
   },
   {
+    "__type__": "cc.Node",
+    "_name": "lab_time",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 70
+      },
+      {
+        "__id__": 72
+      }
+    ],
+    "_prefab": {
+      "__id__": 74
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": -98.966,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 69
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 71
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 131.123046875,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "79xt+bhalLKqEEbEy1UJjg"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 69
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 73
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_string": "3秒后自动开启",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 20,
+    "_fontSize": 20,
+    "_fontFamily": "Arial",
+    "_lineHeight": 40,
+    "_overflow": 0,
+    "_enableWrapText": true,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": false,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_enableOutline": false,
+    "_outlineColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_outlineWidth": 2,
+    "_enableShadow": false,
+    "_shadowColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_shadowOffset": {
+      "__type__": "cc.Vec2",
+      "x": 2,
+      "y": 2
+    },
+    "_shadowBlur": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "43Sn2vdgtE+Zt49G43VyV9"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "5fJb1/elZBRZu+90NUNCf8",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
     "__type__": "cc.UITransform",
     "_name": "",
     "_objFlags": 0,
@@ -1753,7 +1915,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 70
+      "__id__": 76
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1781,7 +1943,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 72
+      "__id__": 78
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1839,12 +2001,12 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 75
+      "__id__": 81
     },
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1280
+      "height": 1599.9999999999998
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1867,7 +2029,16 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 77
+      "__id__": 83
+    },
+    "lab_title": {
+      "__id__": 6
+    },
+    "lab_time": {
+      "__id__": 72
+    },
+    "rich_tips": {
+      "__id__": 34
     },
     "_id": ""
   },
@@ -1885,7 +2056,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 79
+      "__id__": 85
     },
     "_alignFlags": 45,
     "_target": null,

+ 4 - 2
assets/script/game/common/config/GameEvent.ts

@@ -2,7 +2,7 @@
  * @Author: dgflash
  * @Date: 2021-11-23 15:28:39
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-03-27 18:31:37
+ * @LastEditTime: 2025-04-02 17:53:40
  */
 
 /** 游戏事件 */
@@ -16,5 +16,7 @@ export enum GameEvent {
     /**复活 */
     Resurrection = "Resurrection",
     /**微信登录成功*/
-    WechatLoginSuss = "WechatLoginSuss"
+    WechatLoginSuss = "WechatLoginSuss",
+    /**二倍速开启成功*/
+    DoubleSpeedOpenSuccess = "DoubleSpeedOpenSuccess"
 }

+ 2 - 2
assets/script/game/common/config/GameUIConfig.ts

@@ -1,7 +1,7 @@
 /*
  * @Date: 2021-08-12 09:33:37
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-03-28 14:45:46
+ * @LastEditTime: 2025-04-02 18:29:59
  */
 import { LayerType, UIConfig } from "../../../../../extensions/oops-plugin-framework/assets/core/gui/layer/LayerManager";
 
@@ -61,7 +61,7 @@ export var UIConfigData: { [key: number]: UIConfig } = {
     [UIID.Setting]: { layer: LayerType.UI, prefab: "common/prefab/setting", vacancy: true, mask: true },
     [UIID.AboutUs]: { layer: LayerType.UI, prefab: "common/prefab/about" },
     [UIID.RedPacketWithdraw]: { layer: LayerType.UI, prefab: "gui/eliminate/prefab/redPacketWithdrawal" },
-    [UIID.DoubleSpeed]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/doubleSpeed" },
+    [UIID.DoubleSpeed]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/doubleSpeed", vacancy: true, mask: true },
     [UIID.GameOver]: { layer: LayerType.UI, prefab: "gui/eliminate/prefab/gameOver", vacancy: true, mask: true },
     [UIID.Game]: { layer: LayerType.UI, prefab: "gui/eliminate/Game" },
     [UIID.CashRebate]: { layer: LayerType.PopUp, prefab: "gui/eliminate/prefab/cashRebate" },

+ 2 - 1
assets/script/game/common/manager/CocosHandler.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-03-31 10:45:44
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-01 18:35:01
+ * @LastEditTime: 2025-04-02 18:34:55
  * @Description: CocosHandler 处理类负责与安卓交互
  */
 import { native } from 'cc';
@@ -75,6 +75,7 @@ export class CocosHandler {
         }
 
         let result = await this.sendMessageToAndroid(data);
+        // smc.account.AccountModel.
         return result;
     }
 

+ 49 - 2
assets/script/game/eliminate/view/DoubleSpeedViewComp.ts

@@ -2,14 +2,17 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-03-21 11:17:22
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-03-21 11:32:11
+ * @LastEditTime: 2025-04-02 18:13:24
  * @Description: 二倍速弹窗
  */
-import { _decorator } from "cc";
+import { _decorator, Node } from "cc";
 import { oops } from "db://oops-framework/core/Oops";
 import { ecs } from "db://oops-framework/libs/ecs/ECS";
 import { CCComp } from "db://oops-framework/module/common/CCComp";
 import { UIID } from "../../common/config/GameUIConfig";
+import { Label } from "cc";
+import { RichText } from "cc";
+import { UICallbacks } from "db://oops-framework/core/gui/layer/Defines";
 
 const { ccclass, property } = _decorator;
 
@@ -18,6 +21,19 @@ const { ccclass, property } = _decorator;
 @ecs.register('DoubleSpeedView', false)
 export class DoubleSpeedViewComp extends CCComp {
     /** 视图层逻辑代码分离演示 */
+    @property({ type: Label, displayName: "标题" })
+    private lab_title: Label = null!;
+
+    @property({ type: Label, displayName: "倒数时间" })
+    private lab_time: Label = null!;
+
+    @property({ type: RichText, displayName: "倒数时间" })
+    private rich_tips: RichText = null!;
+
+
+    private _isAutoOpen: boolean = false;  //是否倒数三秒自动开始
+    private _time: number = 3;
+
     start() {
         // const entity = this.ent as ecs.Entity;         // ecs.Entity 可转为当前模块的具体实体对象
         this.setButton();
@@ -28,7 +44,38 @@ export class DoubleSpeedViewComp extends CCComp {
         this.node.destroy();
     }
 
+
+    private updateInfo() {
+        this.lab_title.string = this._isAutoOpen ? "二倍速" : "是否继续";
+        this.rich_tips.string = this._isAutoOpen ? "是否需要开启2倍智能放置?每看一个视频,可享受3分钟的二倍速放置哦" : "2倍速智能放置已经结束,是否继续开启?";
+        this.lab_time.node.active = this._isAutoOpen;
+        //倒数三秒
+        this.scheduleOnce(() => {
+            //播放广告
+            this.openAd();
+            this._isAutoOpen = false;
+        }, 3);
+    }
+
+
+
+    private btn_open() {
+        this.openAd();
+        oops.gui.remove(UIID.DoubleSpeed);
+    }
+
+
+    //打开广告
+    private openAd() {
+
+
+
+    }
+
+
+
     private btn_close() {
         oops.gui.remove(UIID.DoubleSpeed);
+        //播放插屏广告
     }
 }

+ 27 - 2
assets/script/game/eliminate/view/EliminateViewComp.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-03-20 15:01:09
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-02 15:57:03
+ * @LastEditTime: 2025-04-02 17:55:03
  * @Description: 消除游戏主场景
  */
 import { _decorator, Color, EventTouch, instantiate, JsonAsset, Label, Node, Prefab, randomRangeInt, Sprite, Toggle, tween, UITransform, Vec2, Vec3, Widget } from "cc";
@@ -139,6 +139,9 @@ export class EliminateViewComp extends CCComp {
 
     @property({ type: Button, displayName: "自动按钮" })
     private autoBtn: Button = null!;
+    @property({ type: Button, displayName: "二倍速按钮" })
+    private addSpeedBtn: Button = null!;
+
 
 
     //游戏配置行列
@@ -154,6 +157,8 @@ export class EliminateViewComp extends CCComp {
 
     private totalNum: number = 0;   //累计消除次数,断了就是又从0开始
 
+    private _isDoubleSpeed: boolean = false;  //是否开启二倍速
+
     //网格列表
     // gridsNode: Node | null = null;          //中间网格区域
     // brickNode: Node | null = null;           //底部三个item块区域
@@ -225,6 +230,7 @@ export class EliminateViewComp extends CCComp {
 
     addEventList() {
         oops.message.on(GameEvent.RestartGame, this.restartGame, this);
+        oops.message.on(GameEvent.DoubleSpeedOpenSuccess, this.doubleSpeedOpenSuccess, this);
     }
 
 
@@ -1475,19 +1481,28 @@ export class EliminateViewComp extends CCComp {
         this.node.destroy();
     }
 
+    //设置按钮
     private btn_setting() {
         oops.gui.open(UIID.Setting);
     }
 
+    //左边微信按钮
     private btn_withdraw() {
         oops.gui.open(UIID.WechatWithdraw);
     }
 
+    //顶部红包按钮
     private btn_award() {
         oops.gui.open(UIID.RedPacketWithdraw);
     }
 
+    //二倍速按钮
+    private btn_double() {
+        oops.gui.open(UIID.DoubleSpeed);
+    }
+
 
+    //自动按钮
     private btn_auto() {
         //自动放置
         this.autoState = !this.autoState;
@@ -1496,7 +1511,6 @@ export class EliminateViewComp extends CCComp {
             this.gameState = GameState.PLAYING;
             this.executeAutoPlace()
         }
-
     }
 
 
@@ -1708,6 +1722,17 @@ export class EliminateViewComp extends CCComp {
     }
 
 
+    doubleSpeedOpenSuccess() {
+        this._isDoubleSpeed = true;
+        //3分钟后关闭
+        this.scheduleOnce(() => {
+            this._isDoubleSpeed = false;
+            //关闭会自动触发二倍速弹窗,这要带参数
+            // oops.gui.open(UIID.DoubleSpeed, { isAutoOpen: true });
+        }, 180);
+    }
+
+
     //重新开始
     private restartGame() {
         if (this.gameState === GameState.READY) return;

+ 0 - 7
assets/script/game/initialize/view/LoadingViewComp.ts

@@ -43,9 +43,6 @@ export class LoadingViewComp extends CCVMParentComp {
     start() {
         this.enter();
         this.setButton();
-
-        // 初始化安卓消息处理中心
-        AndroidMessageCenter.getInstance().init();
     }
 
     enter() {
@@ -77,11 +74,7 @@ export class LoadingViewComp extends CCVMParentComp {
 
     private loginSuss() {
         //关闭按钮
-
-
         //加载资源
-
-
     }
 
     private onAgreePrivacy() {

BIN
excel/~$Grid.xlsx


+ 2 - 2
package.json

@@ -1,7 +1,7 @@
 {
   "_sourceId": "c30b28da-749e-479b-bcb6-cecd8d7be9e3",
   "creator": {
-    "version": "3.8.5"
+    "version": "3.8.6"
   },
   "dependencies": {
     "crypto-es": "^1.2.7"
@@ -10,4 +10,4 @@
   "name": "com-game-eliminate",
   "uuid": "00d7d957-a3e8-4ad6-80f4-2fcfb235bca4",
   "version": "3.6.3"
-}
+}

+ 15 - 0
settings/v2/packages/builder.json

@@ -105,5 +105,20 @@
         }
       }
     }
+  },
+  "splash-setting": {
+    "logo": {
+      "type": "custom",
+      "image": "project://settings/7.png"
+    },
+    "background": {
+      "type": "color",
+      "color": {
+        "x": 1,
+        "y": 1,
+        "z": 1,
+        "w": 1
+      }
+    }
   }
 }

+ 214 - 194
settings/v2/packages/engine.json

@@ -1,207 +1,227 @@
 {
-  "__version__": "1.0.10",
+  "__version__": "1.0.12",
   "modules": {
-    "cache": {
-      "base": {
-        "_value": true
-      },
-      "gfx-webgl": {
-        "_value": true
-      },
-      "gfx-webgl2": {
-        "_value": true
-      },
-      "gfx-webgpu": {
-        "_value": false
-      },
-      "animation": {
-        "_value": true
-      },
-      "skeletal-animation": {
-        "_value": false
-      },
-      "3d": {
-        "_value": true
-      },
-      "meshopt": {
-        "_value": true
-      },
-      "2d": {
-        "_value": true
-      },
-      "xr": {
-        "_value": false
-      },
-      "ui": {
-        "_value": true
-      },
-      "particle": {
-        "_value": false
-      },
-      "physics": {
-        "_value": false,
-        "_option": "physics-ammo",
-        "_flags": {
-          "physics-ammo": {
-            "LOAD_BULLET_MANUALLY": false
+    "graphics": {
+      "pipeline": "legacy-pipeline"
+    },
+    "configs": {
+      "migrationsConfig": {
+        "name": "迁移生成的配置",
+        "cache": {
+          "base": {
+            "_value": true
+          },
+          "gfx-webgl": {
+            "_value": true
+          },
+          "gfx-webgl2": {
+            "_value": true
+          },
+          "gfx-webgpu": {
+            "_value": false
+          },
+          "animation": {
+            "_value": true
+          },
+          "skeletal-animation": {
+            "_value": false
+          },
+          "3d": {
+            "_value": true
+          },
+          "meshopt": {
+            "_value": true
+          },
+          "2d": {
+            "_value": true
+          },
+          "xr": {
+            "_value": false
+          },
+          "rich-text": {
+            "_value": true
+          },
+          "mask": {
+            "_value": true
+          },
+          "graphics": {
+            "_value": true
+          },
+          "ui-skew": {
+            "_value": false
+          },
+          "affine-transform": {
+            "_value": true
+          },
+          "ui": {
+            "_value": true
+          },
+          "particle": {
+            "_value": false
+          },
+          "physics": {
+            "_value": false,
+            "_option": "physics-ammo"
           },
-          "physics-physx": {
-            "LOAD_PHYSX_MANUALLY": false
-          }
-        }
-      },
-      "physics-ammo": {
-        "_value": true,
-        "_flags": {
           "physics-ammo": {
-            "LOAD_BULLET_MANUALLY": false
-          }
-        }
-      },
-      "physics-cannon": {
-        "_value": false
-      },
-      "physics-physx": {
-        "_value": false,
-        "_flags": {
+            "_value": true,
+            "_flags": {
+              "LOAD_BULLET_MANUALLY": false
+            }
+          },
+          "physics-cannon": {
+            "_value": false
+          },
           "physics-physx": {
-            "LOAD_PHYSX_MANUALLY": false
-          }
-        }
-      },
-      "physics-builtin": {
-        "_value": false
-      },
-      "physics-2d": {
-        "_value": false,
-        "_option": "physics-2d-box2d",
-        "_flags": {
-          "physics-2d-box2d-wasm": {
-            "LOAD_BOX2D_MANUALLY": false
-          }
-        }
-      },
-      "physics-2d-box2d": {
-        "_value": true
-      },
-      "physics-2d-box2d-wasm": {
-        "_value": false,
-        "_flags": {
+            "_value": false,
+            "_flags": {
+              "LOAD_PHYSX_MANUALLY": false
+            }
+          },
+          "physics-builtin": {
+            "_value": false
+          },
+          "physics-2d": {
+            "_value": false,
+            "_option": "physics-2d-box2d"
+          },
+          "physics-2d-box2d": {
+            "_value": true
+          },
           "physics-2d-box2d-wasm": {
-            "LOAD_BOX2D_MANUALLY": false
-          }
-        }
-      },
-      "physics-2d-builtin": {
-        "_value": false
-      },
-      "intersection-2d": {
-        "_value": true
-      },
-      "primitive": {
-        "_value": false
-      },
-      "profiler": {
-        "_value": true
-      },
-      "occlusion-query": {
-        "_value": false
-      },
-      "geometry-renderer": {
-        "_value": false
-      },
-      "debug-renderer": {
-        "_value": false
-      },
-      "particle-2d": {
-        "_value": true
-      },
-      "audio": {
-        "_value": true
-      },
-      "video": {
-        "_value": false
-      },
-      "webview": {
-        "_value": false
-      },
-      "tween": {
-        "_value": true
-      },
-      "websocket": {
-        "_value": true
-      },
-      "websocket-server": {
-        "_value": false
-      },
-      "terrain": {
-        "_value": false
-      },
-      "light-probe": {
-        "_value": false
-      },
-      "tiled-map": {
-        "_value": false
-      },
-      "vendor-google": {
-        "_value": false
-      },
-      "spine": {
-        "_value": true,
-        "_flags": {
+            "_value": false,
+            "_flags": {
+              "LOAD_BOX2D_MANUALLY": false
+            }
+          },
+          "physics-2d-builtin": {
+            "_value": false
+          },
+          "physics-2d-box2d-jsb": {
+            "_value": false
+          },
+          "intersection-2d": {
+            "_value": true
+          },
+          "primitive": {
+            "_value": false
+          },
+          "profiler": {
+            "_value": true
+          },
+          "occlusion-query": {
+            "_value": false
+          },
+          "geometry-renderer": {
+            "_value": false
+          },
+          "debug-renderer": {
+            "_value": false
+          },
+          "particle-2d": {
+            "_value": true
+          },
+          "audio": {
+            "_value": true
+          },
+          "video": {
+            "_value": false
+          },
+          "webview": {
+            "_value": false
+          },
+          "tween": {
+            "_value": true
+          },
+          "websocket": {
+            "_value": true
+          },
+          "websocket-server": {
+            "_value": false
+          },
+          "terrain": {
+            "_value": false
+          },
+          "light-probe": {
+            "_value": false
+          },
+          "tiled-map": {
+            "_value": false
+          },
+          "vendor-google": {
+            "_value": false
+          },
           "spine": {
-            "LOAD_SPINE_MANUALLY": false
+            "_value": true,
+            "_option": "spine-3.8"
+          },
+          "spine-3.8": {
+            "_value": true,
+            "_flags": {
+              "LOAD_SPINE_MANUALLY": false
+            }
+          },
+          "spine-4.2": {
+            "_value": false,
+            "_flags": {
+              "LOAD_SPINE_MANUALLY": false
+            }
+          },
+          "dragon-bones": {
+            "_value": true
+          },
+          "marionette": {
+            "_value": true
+          },
+          "procedural-animation": {
+            "_value": true
+          },
+          "custom-pipeline-post-process": {
+            "_value": false
+          },
+          "render-pipeline": {
+            "_value": true,
+            "_option": "legacy-pipeline"
+          },
+          "custom-pipeline": {
+            "_value": true
+          },
+          "legacy-pipeline": {
+            "_value": false
           }
+        },
+        "flags": {},
+        "includeModules": [
+          "2d",
+          "3d",
+          "affine-transform",
+          "animation",
+          "audio",
+          "base",
+          "dragon-bones",
+          "gfx-webgl",
+          "gfx-webgl2",
+          "graphics",
+          "intersection-2d",
+          "legacy-pipeline",
+          "marionette",
+          "mask",
+          "meshopt",
+          "particle-2d",
+          "procedural-animation",
+          "profiler",
+          "rich-text",
+          "spine-3.8",
+          "tween",
+          "ui",
+          "websocket"
+        ],
+        "noDeprecatedFeatures": {
+          "value": false,
+          "version": ""
         }
-      },
-      "dragon-bones": {
-        "_value": true
-      },
-      "marionette": {
-        "_value": true
-      },
-      "procedural-animation": {
-        "_value": true
-      },
-      "custom-pipeline-post-process": {
-        "_value": false
-      },
-      "render-pipeline": {
-        "_value": true,
-        "_option": "legacy-pipeline"
-      },
-      "custom-pipeline": {
-        "_value": true
-      },
-      "legacy-pipeline": {
-        "_value": false
       }
     },
-    "flags": {},
-    "includeModules": [
-      "2d",
-      "3d",
-      "animation",
-      "audio",
-      "base",
-      "dragon-bones",
-      "gfx-webgl",
-      "gfx-webgl2",
-      "intersection-2d",
-      "legacy-pipeline",
-      "marionette",
-      "meshopt",
-      "particle-2d",
-      "procedural-animation",
-      "profiler",
-      "spine",
-      "tween",
-      "ui",
-      "websocket"
-    ],
-    "noDeprecatedFeatures": {
-      "value": false,
-      "version": ""
-    }
+    "globalConfigKey": "migrationsConfig"
   }
 }

+ 1 - 1
settings/v2/packages/project.json

@@ -3,7 +3,7 @@
     "designResolution": {
       "fitWidth": true,
       "fitHeight": false,
-      "height": 1280,
+      "height": 1600,
       "width": 720
     }
   },