zouwuqiang hai 1 ano
pai
achega
05cf09bd49

+ 3 - 0
build-templates/templates-version.json

@@ -0,0 +1,3 @@
+{
+    "wechatgame": "1.0.0"
+}

+ 84 - 0
build-templates/wechatgame/game.ejs

@@ -0,0 +1,84 @@
+function __initApp () {  // init app
+globalThis.__wxRequire = require;  // FIX: require cannot work in separate engine 
+require('./web-adapter');
+var fundebug = require('./libs/fundebug.0.5.0.min.js')
+fundebug.init({
+  apikey: "796a42db3e62a22c68543ea82568e9d30a7e3ab59b727c61b6711e923e2da876"
+});
+const firstScreen = require('./first-screen');
+
+<%- include(cocosTemplate, {}) %>
+
+// Adapt for IOS, swap if opposite
+const info = wx.getSystemInfoSync();
+if (canvas){
+    var _w = canvas.width;
+    var _h = canvas.height;
+    if (info.screenWidth < info.screenHeight) {
+        if (canvas.width > canvas.height) {
+            _w = canvas.height;
+            _h = canvas.width;
+        }
+    } else {
+        if (canvas.width < canvas.height) {
+            _w = canvas.height;
+            _h = canvas.width;
+        }
+    }
+    canvas.width = _w;
+    canvas.height = _h;
+}
+// Adjust initial canvas size
+if (canvas && window.devicePixelRatio >= 2) {canvas.width *= info.devicePixelRatio; canvas.height *= info.devicePixelRatio;}
+
+const importMap = require("<%= importMapFile%>").default;
+System.warmup({
+    importMap,
+    importMapUrl: '<%= importMapFile%>',
+    defaultHandler: (urlNoSchema) => {
+        require('.' + urlNoSchema);
+    },
+    handlers: {
+        'plugin:': (urlNoSchema) => {
+            requirePlugin(urlNoSchema);
+        },
+        'project:': (urlNoSchema) => {
+            require(urlNoSchema);
+        },
+    },
+});
+
+firstScreen.start('<%= alpha %>', '<%= antialias %>', '<%= useWebgl2 %>').then(() => {
+    return System.import('<%= applicationJs %>');
+}).then((module) => {
+    return firstScreen.setProgress(0.2).then(() => Promise.resolve(module));
+}).then(({ Application }) => {
+    return new Application();
+}).then((application) => {
+    return firstScreen.setProgress(0.4).then(() => Promise.resolve(application));
+}).then((application) => {
+    return onApplicationCreated(application);
+}).catch((err) => {
+    console.error(err);
+});
+
+function onApplicationCreated(application) {
+    return System.import('cc').then((module) => {
+        return firstScreen.setProgress(0.6).then(() => Promise.resolve(module));
+    }).then((cc) => {
+        require('./engine-adapter');
+        return application.init(cc);
+    }).then(() => {
+        return firstScreen.end().then(() => application.start());
+    });
+}
+
+}  // init app
+
+// NOTE: on WeChat Android end, we can only get the correct screen size at the second tick of game.
+var sysInfo = wx.getSystemInfoSync();
+if (sysInfo.platform.toLocaleLowerCase() === 'android') {
+    GameGlobal.requestAnimationFrame (__initApp);
+} else {
+    __initApp();
+}

+ 9 - 0
build-templates/wechatgame/game.json

@@ -0,0 +1,9 @@
+{
+  "deviceOrientation": "portrait",
+  "networkTimeout": {
+    "request": 5000,
+    "connectSocket": 5000,
+    "uploadFile": 5000,
+    "downloadFile": 500000
+  }
+}

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
build-templates/wechatgame/libs/fundebug.0.5.0.min.js


+ 35 - 0
build-templates/wechatgame/project.config.json

@@ -0,0 +1,35 @@
+{
+    "description": "项目配置文件。",
+    "miniprogramRoot": "./",
+    "setting": {
+        "urlCheck": true,
+        "postcss": true,
+        "minified": true,
+        "newFeature": false,
+        "enhance": true,
+        "useIsolateContext": true
+    },
+    "compileType": "game",
+    "libVersion": "game",
+    "appid": "",
+    "projectname": "",
+    "condition": {
+        "search": {
+            "current": -1,
+            "list": []
+        },
+        "conversation": {
+            "current": -1,
+            "list": []
+        },
+        "game": {
+            "currentL": -1,
+            "list": [],
+            "current": -1
+        },
+        "miniprogram": {
+            "current": -1,
+            "list": []
+        }
+    }
+}

BIN=BIN
excel/CheckpointLevel.xlsx


+ 2 - 2
package.json

@@ -6,8 +6,8 @@
   "dependencies": {
     "crypto-es": "^1.2.7"
   },
-  "description": "游戏项目模板",
-  "name": "oops-game-kit",
+  "description": "上车游戏",
+  "name": "cargame",
   "uuid": "00d7d957-a3e8-4ad6-80f4-2fcfb235bca4",
   "version": "3.6.3"
 }

+ 80 - 56
settings/v2/packages/builder.json

@@ -15,60 +15,10 @@
             }
           },
           "miniGame": {
-            "configMode": "overwrite",
-            "overwriteSettings": {
-              "alipay-mini-game": {
-                "compressionType": "merge_dep",
-                "isRemote": false
-              },
-              "taobao-creative-app": {
-                "compressionType": "merge_dep",
-                "isRemote": false
-              },
-              "taobao-mini-game": {
-                "compressionType": "merge_dep",
-                "isRemote": false
-              },
-              "bytedance-mini-game": {
-                "compressionType": "merge_dep",
-                "isRemote": false
-              },
-              "oppo-mini-game": {
-                "compressionType": "merge_dep",
-                "isRemote": false
-              },
-              "huawei-quick-game": {
-                "compressionType": "merge_dep",
-                "isRemote": false
-              },
-              "vivo-mini-game": {
-                "compressionType": "merge_dep",
-                "isRemote": false
-              },
-              "xiaomi-quick-game": {
-                "compressionType": "merge_dep",
-                "isRemote": false
-              },
-              "baidu-mini-game": {
-                "compressionType": "merge_dep",
-                "isRemote": false
-              },
-              "link-sure": {
-                "compressionType": "merge_dep",
-                "isRemote": false
-              },
-              "qtt": {
-                "compressionType": "merge_dep",
-                "isRemote": false
-              },
-              "cocos-play": {
-                "compressionType": "merge_dep",
-                "isRemote": false
-              },
-              "wechatgame": {
-                "compressionType": "merge_dep",
-                "isRemote": true
-              }
+            "configMode": "fallback",
+            "overwriteSettings": {},
+            "fallbackOptions": {
+              "isRemote": true
             }
           },
           "web": {
@@ -85,11 +35,11 @@
           "native": {
             "preferredOptions": {
               "compressionType": "merge_dep",
-              "isRemote": false
+              "isRemote": true
             }
           },
           "miniGame": {
-            "configMode": "overwrite",
+            "configMode": "fallback",
             "overwriteSettings": {
               "alipay-mini-game": {
                 "compressionType": "merge_dep",
@@ -143,6 +93,9 @@
                 "compressionType": "merge_dep",
                 "isRemote": false
               }
+            },
+            "fallbackOptions": {
+              "isRemote": true
             }
           },
           "web": {
@@ -152,7 +105,78 @@
             }
           }
         }
+      },
+      "default": {
+        "displayName": "i18n:builder.asset_bundle.defaultConfig",
+        "configs": {
+          "native": {
+            "preferredOptions": {
+              "isRemote": false,
+              "compressionType": "merge_dep"
+            }
+          },
+          "web": {
+            "preferredOptions": {
+              "isRemote": false,
+              "compressionType": "merge_dep"
+            },
+            "fallbackOptions": {
+              "compressionType": "merge_dep"
+            }
+          },
+          "miniGame": {
+            "fallbackOptions": {
+              "isRemote": true,
+              "compressionType": "merge_dep"
+            },
+            "configMode": "fallback",
+            "overwriteSettings": {
+              "wechatgame": {
+                "isRemote": false,
+                "compressionType": "merge_dep"
+              },
+              "alipay-mini-game": {
+                "isRemote": false,
+                "compressionType": "merge_dep"
+              },
+              "bytedance-mini-game": {
+                "isRemote": false,
+                "compressionType": "merge_dep"
+              },
+              "fb-instant-games": {
+                "isRemote": false,
+                "compressionType": "merge_dep"
+              },
+              "huawei-quick-game": {
+                "isRemote": false,
+                "compressionType": "merge_dep"
+              },
+              "oppo-mini-game": {
+                "isRemote": false,
+                "compressionType": "merge_dep"
+              },
+              "taobao-mini-game": {
+                "isRemote": false,
+                "compressionType": "merge_dep"
+              },
+              "vivo-mini-game": {
+                "isRemote": false,
+                "compressionType": "merge_dep"
+              },
+              "xiaomi-quick-game": {
+                "isRemote": false,
+                "compressionType": "merge_dep"
+              }
+            }
+          }
+        }
       }
     }
+  },
+  "splash-setting": {
+    "logo": {
+      "type": "none"
+    },
+    "totalTime": 500
   }
 }

+ 150 - 1
settings/v2/packages/engine.json

@@ -1,3 +1,152 @@
 {
-  "__version__": "1.0.7"
+  "__version__": "1.0.7",
+  "modules": {
+    "cache": {
+      "base": {
+        "_value": true
+      },
+      "graphcis": {
+        "_value": true
+      },
+      "gfx-webgl": {
+        "_value": true
+      },
+      "gfx-webgl2": {
+        "_value": true
+      },
+      "animation": {
+        "_value": true
+      },
+      "skeletal-animation": {
+        "_value": true
+      },
+      "3d": {
+        "_value": true
+      },
+      "2d": {
+        "_value": true
+      },
+      "xr": {
+        "_value": false
+      },
+      "ui": {
+        "_value": true
+      },
+      "particle": {
+        "_value": true
+      },
+      "physics": {
+        "_value": true,
+        "_option": "physics-builtin"
+      },
+      "physics-ammo": {
+        "_value": false
+      },
+      "physics-cannon": {
+        "_value": false
+      },
+      "physics-physx": {
+        "_value": false
+      },
+      "physics-builtin": {
+        "_value": false
+      },
+      "physics-2d": {
+        "_value": true,
+        "_option": "physics-2d-box2d"
+      },
+      "physics-2d-box2d": {
+        "_value": false
+      },
+      "physics-2d-builtin": {
+        "_value": false
+      },
+      "intersection-2d": {
+        "_value": true
+      },
+      "primitive": {
+        "_value": true
+      },
+      "profiler": {
+        "_value": true
+      },
+      "occlusion-query": {
+        "_value": false
+      },
+      "geometry-renderer": {
+        "_value": false
+      },
+      "debug-renderer": {
+        "_value": false
+      },
+      "particle-2d": {
+        "_value": false
+      },
+      "audio": {
+        "_value": true
+      },
+      "video": {
+        "_value": false
+      },
+      "webview": {
+        "_value": false
+      },
+      "tween": {
+        "_value": true
+      },
+      "websocket": {
+        "_value": false
+      },
+      "websocket-server": {
+        "_value": false
+      },
+      "terrain": {
+        "_value": false
+      },
+      "light-probe": {
+        "_value": false
+      },
+      "tiled-map": {
+        "_value": false
+      },
+      "spine": {
+        "_value": false
+      },
+      "dragon-bones": {
+        "_value": false
+      },
+      "marionette": {
+        "_value": false
+      },
+      "procedural-animation": {
+        "_value": false
+      },
+      "custom-pipeline": {
+        "_value": false
+      }
+    },
+    "flags": {},
+    "includeModules": [
+      "2d",
+      "3d",
+      "animation",
+      "audio",
+      "base",
+      "gfx-webgl",
+      "gfx-webgl2",
+      "intersection-2d",
+      "particle",
+      "physics-2d-box2d",
+      "physics-builtin",
+      "primitive",
+      "profiler",
+      "skeletal-animation",
+      "tween",
+      "ui"
+    ],
+    "noDeprecatedFeatures": {
+      "value": false,
+      "version": ""
+    }
+  }
 }

+ 9 - 0
settings/v2/packages/lightmap.json

@@ -0,0 +1,9 @@
+{
+  "__version__": "1.0.4",
+  "latestLightmapResultMap": {
+    "ba0b085f-f8d5-40b0-9964-2fd25728d707": {
+      "results": [],
+      "dir": "D:\\cocospro\\cargame\\assets\\LightFX"
+    }
+  }
+}

+ 9 - 3
settings/v2/packages/project.json

@@ -1,9 +1,9 @@
 {
   "general": {
     "designResolution": {
-      "fitWidth": false,
+      "fitWidth": true,
       "fitHeight": true,
-      "height": 1200,
+      "height": 1280,
       "width": 720
     }
   },
@@ -16,5 +16,11 @@
   "script": {
     "preserveSymlinks": true
   },
-  "custom_joint_texture_layouts": []
+  "custom_joint_texture_layouts": [],
+  "layer": [
+    {
+      "name": "PUPPET",
+      "value": 524288
+    }
+  ]
 }

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio