Merge branch 'master' of gitlab2.dui88.com:sparkprojects/tngd_cavecruiser

assets/Bundles/GuideScene/GuideScene.scene

@@ -115,7 +115,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 375,
-      "y": 811.9999999999999,
+      "y": 812.0000000000001,
       "z": 0
     },
     "_lrot": {
@@ -200,19 +200,19 @@
     "_priority": 1073741824,
     "_fov": 45,
     "_fovAxis": 0,
-    "_orthoHeight": 811.9999999999999,
+    "_orthoHeight": 812.0000000000001,
     "_near": 1,
     "_far": 2000,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 11,
+      "g": 5,
+      "b": 79,
       "a": 255
     },
     "_depth": 1,
     "_stencil": 0,
-    "_clearFlags": 6,
+    "_clearFlags": 7,
     "_rect": {
       "__type__": "cc.Rect",
       "x": 0,
@@ -514,7 +514,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 750,
-      "height": 1623.9999999999998
+      "height": 1624.0000000000002
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -766,7 +766,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 750,
-      "height": 1623.9999999999998
+      "height": 1624.0000000000002
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1893,7 +1893,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 750,
-      "height": 1623.9999999999998
+      "height": 1624.0000000000002
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

assets/Bundles/MainGame/MainGame.scene

@@ -102,7 +102,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 375,
-      "y": 812,
+      "y": 812.0000000000001,
       "z": 0
     },
     "_lrot": {
@@ -187,19 +187,19 @@
     "_priority": 50000,
     "_fov": 45,
     "_fovAxis": 0,
-    "_orthoHeight": 812,
+    "_orthoHeight": 812.0000000000001,
     "_near": 1,
     "_far": 2000,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 11,
+      "g": 5,
+      "b": 79,
       "a": 255
     },
     "_depth": 1,
     "_stencil": 0,
-    "_clearFlags": 6,
+    "_clearFlags": 7,
     "_rect": {
       "__type__": "cc.Rect",
       "x": 0,
@@ -251,7 +251,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 812,
+      "y": 812.0000000000001,
       "z": 0
     },
     "_lrot": {
@@ -1005,7 +1005,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 750,
-      "height": 1624
+      "height": 1624.0000000000002
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

assets/Start/Start.scene

@@ -96,7 +96,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 375,
-      "y": 812,
+      "y": 812.0000000000001,
       "z": 0
     },
     "_lrot": {
@@ -181,14 +181,14 @@
     "_priority": 6553,
     "_fov": 45,
     "_fovAxis": 0,
-    "_orthoHeight": 812,
+    "_orthoHeight": 812.0000000000001,
     "_near": 1,
     "_far": 2000,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 11,
+      "g": 5,
+      "b": 79,
       "a": 255
     },
     "_depth": 1,
@@ -393,7 +393,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 57.69999999999993,
+      "y": 57.700000000000045,
       "z": 0
     },
     "_lrot": {
@@ -962,7 +962,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 749.9999999999998,
-      "height": 1624
+      "height": 1624.0000000000002
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

assets/Start/Start.ts

-import { _decorator, assetManager, Component, Label, Node, Prefab, ProgressBar, resources, } from 'cc';
+import { _decorator, assetManager, Component, Label, Node, Prefab, ProgressBar, ResolutionPolicy, resources, screen, view, } from 'cc';
 import { PREVIEW } from 'cc/env';
 import { UIMgr } from "../Module/UIMgr";
 import { changeScene, showPanel, showToast } from "db://assets/Module/UIFast";
@@ -34,6 +34,17 @@ export class Start extends Component {
         // game.frameRate = _FPS;
         
 
+        let winsize = screen.windowSize;
+        let ratio = winsize.width / winsize.height;
+        // let drs = view.getDesignResolutionSize();
+        // let drsRatio = drs.width/drs.height;
+        if (ratio > 0.7) {
+            view.setResolutionPolicy(ResolutionPolicy.FIXED_HEIGHT);
+        } else {
+            console.log("进来了");
+            view.setResolutionPolicy(ResolutionPolicy.FIXED_WIDTH);
+        }
+
         // 预览调试时，显示性能统计面板
         if (PREVIEW) {
             // profiler.showStats();

build-templates/web-mobile/index.ejs

@@ -49,6 +49,7 @@
             -ms-user-select: none;
             -khtml-user-select: none;
             -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+            background-color: #0b054f;
         }
 
         /* Remove spin of input type number */

preview-template/index.ejs

@@ -20,7 +20,7 @@
     <script type="text/javascript" src="https://appx/web-view.min.js"></script>
 
 </head>
-<body style="overflow: hidden;">
+<body style="overflow: hidden; background-color: #0b054f;">
 <%- include(cocosToolBar, {config: config}) %>
 <div id="content" class="content" style="overflow: hidden;">
     <div class="contentWrap">

profiles/v2/packages/reference-image.json

@@ -3,7 +3,7 @@
   "config": {
     "images": [],
     "sceneUUID": {},
-    "scene": "7b5de2a0-8504-46ba-9019-37a3548ce8e1"
+    "scene": "9e293cde-e27b-4902-808b-e884f3e9da32"
   },
   "show": false
 }

profiles/v2/packages/scene.json

@@ -965,31 +965,6 @@
       },
       "scale": 0.2579971130259416
     },
-    "04224ebd-adcd-4112-8010-da14ed5ea48a": {
-      "position": {
-        "x": 42.3255019022979,
-        "y": 1153.7660120435216,
-        "z": 5000
-      },
-      "rotation": {
-        "x": 0,
-        "y": 0,
-        "z": 0,
-        "w": 1
-      },
-      "viewCenter": {
-        "x": 0,
-        "y": 0,
-        "z": 0
-      },
-      "contentRect": {
-        "x": -166.933695420623,
-        "y": 700.6500967736237,
-        "width": 174.2456896551724,
-        "height": 377.3
-      },
-      "scale": 0.5337486321925865
-    },
     "ff249ea2-131c-46cc-8bb5-e07bfcca3d01": {
       "position": {
         "x": 25.781532652817866,
@@ -1190,31 +1165,6 @@
       },
       "scale": 0.8081151640227069
     },
-    "9e293cde-e27b-4902-808b-e884f3e9da32": {
-      "position": {
-        "x": 478.3405003429166,
-        "y": 856.0198583323003,
-        "z": 5000
-      },
-      "rotation": {
-        "x": 0,
-        "y": 0,
-        "z": 0,
-        "w": 1
-      },
-      "viewCenter": {
-        "x": 0,
-        "y": 0,
-        "z": 0
-      },
-      "contentRect": {
-        "x": -270.588262040965,
-        "y": -175.96859377147348,
-        "width": 508,
-        "height": 700
-      },
-      "scale": 0.339151081861917
-    },
     "a4b435de-dc7c-4f0b-b968-e01f517eb7f6": {
       "position": {
         "x": 101.18938926939029,
@@ -1289,6 +1239,56 @@
         "height": 0
       },
       "scale": 0.22375626773199253
+    },
+    "9e293cde-e27b-4902-808b-e884f3e9da32": {
+      "position": {
+        "x": 478.3405003429166,
+        "y": 856.0198583323003,
+        "z": 5000
+      },
+      "rotation": {
+        "x": 0,
+        "y": 0,
+        "z": 0,
+        "w": 1
+      },
+      "viewCenter": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+      },
+      "contentRect": {
+        "x": -270.5882620409651,
+        "y": -175.96859377147348,
+        "width": 508,
+        "height": 700
+      },
+      "scale": 0.339151081861917
+    },
+    "04224ebd-adcd-4112-8010-da14ed5ea48a": {
+      "position": {
+        "x": 559.0130866172899,
+        "y": 1474.782036419733,
+        "z": 5000
+      },
+      "rotation": {
+        "x": 0,
+        "y": 0,
+        "z": 0,
+        "w": 1
+      },
+      "viewCenter": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+      },
+      "contentRect": {
+        "x": 213.94271763296143,
+        "y": 727.5896641123327,
+        "width": 174.2456896551724,
+        "height": 377.3
+      },
+      "scale": 0.2524784874575621
     }
   },
   "camera-uuids": [
@@ -1329,7 +1329,6 @@
     "e006bcbd-d4b2-4d6e-b86d-b98a06cf9cc7",
     "1ce93d96-f621-4162-9f51-fbfb066ca238",
     "063b0464-e893-46fd-95f9-73a41f19fd25",
-    "04224ebd-adcd-4112-8010-da14ed5ea48a",
     "ff249ea2-131c-46cc-8bb5-e07bfcca3d01",
     "50650cb7-af92-4041-93d7-e8d9a7fa446d",
     "8d656426-fb3d-4f9c-a332-22103459c2d4",
@@ -1338,10 +1337,11 @@
     "7cae554b-bec7-45e7-a1d4-ec5e84e5688c",
     "b6ce0806-8608-4249-a153-720d6ed0bd0f",
     "0fe5b446-0dca-460d-99f1-cf13098f7777",
-    "9e293cde-e27b-4902-808b-e884f3e9da32",
     "a4b435de-dc7c-4f0b-b968-e01f517eb7f6",
     "58af8588-6a46-4cd2-a3e1-23f925f77095",
-    "7b5de2a0-8504-46ba-9019-37a3548ce8e1"
+    "7b5de2a0-8504-46ba-9019-37a3548ce8e1",
+    "9e293cde-e27b-4902-808b-e884f3e9da32",
+    "04224ebd-adcd-4112-8010-da14ed5ea48a"
   ],
   "camera": {
     "color": [

settings/v2/packages/information.json

@@ -7,7 +7,7 @@
       "enable": true,
       "customSplash": {
         "complete": true,
-        "form": "https://creator-api.cocos.com/api/form/show?sid=441e6f8e3e7ba0c9581ed7936daee45d"
+        "form": "https://creator-api.cocos.com/api/form/show?sid=c8b0f711bb162e709b868ea0782d22de"
       }
     },
     "removeSplash": {
@@ -16,7 +16,7 @@
       "enable": true,
       "removeSplash": {
         "complete": true,
-        "form": "https://creator-api.cocos.com/api/form/show?sid=441e6f8e3e7ba0c9581ed7936daee45d"
+        "form": "https://creator-api.cocos.com/api/form/show?sid=c8b0f711bb162e709b868ea0782d22de"
       }
     }
   }

settings/v2/packages/project.json

@@ -3,7 +3,8 @@
   "general": {
     "designResolution": {
       "width": 750,
-      "height": 1624
+      "height": 1624,
+      "fitHeight": false
     },
     "downloadMaxConcurrency": 20,
     "renderPipeline": "c7e748e8-be82-4f6f-b2c0-085b604e40e5"