diff --git a/assets/Script/HUD/HUDM.ts b/assets/Script/HUD/HUDM.ts index 2ae493b..b277c81 100644 --- a/assets/Script/HUD/HUDM.ts +++ b/assets/Script/HUD/HUDM.ts @@ -1,5 +1,6 @@ import { CoroutineV2 } from "../Engine/CatanEngine/CoroutineV2/CoroutineV2"; import UpdatePanel from "../UpdatePanel"; +import BusinessTypeSetting from "../_BusinessTypeSetting/BusinessTypeSetting"; import Enum_HUDM from "./Enum_HUDM"; const { ccclass, property } = cc._decorator; @@ -44,17 +45,13 @@ export default class HUDM extends cc.Component { } HUDM._instance = this; this._updatePanel = params[0]; - - // let packageUrl: string = params[1]; - // let BundleData: Enum_Loading.BundleDataObj = AssetBundleMamager.Instance.RemoteVerList[this.BundleName]; - // let packageUrl: string = BundleData.BundleUrl; - let packageUrl: string = `https://jianmiau.tk/Resources/App/JMKA/update/remote-assets`; + let packageUrl: string = `https://jianmiau.tk/Resources/App/JMKA/update/remote-assets/${BusinessTypeSetting.COMPILE_VERSION}`; this._customManifest = JSON.stringify({ "packageUrl": packageUrl, "remoteManifestUrl": `${packageUrl}/project.manifest`, "remoteVersionUrl": `${packageUrl}/version.json`, - "version": "1.0.0", + "version": "0.0", }); this._storagePath = `${(jsb.fileUtils ? jsb.fileUtils.getWritablePath() : "./")}${this._path}`; @@ -192,6 +189,7 @@ export default class HUDM extends cc.Component { } public *HUD(onFileProgress?: (finish: number, total: number, item: string) => void): IterableIterator { + this._updatePanel.updateBtn.active = false; this._updateingData = null; if (this._am && !this._updating) { this._am.setEventCallback(this._updateCb.bind(this)); diff --git a/assets/Script/Manager.ts b/assets/Script/Manager.ts index 343c5d1..834b5d0 100644 --- a/assets/Script/Manager.ts +++ b/assets/Script/Manager.ts @@ -10,6 +10,7 @@ import { Enum_HUDM } from "./HUD/Enum_HUDM"; import HUDM from "./HUD/HUDM"; import NativeClass from "./NativeClass"; import UpdatePanel from "./UpdatePanel"; +import BusinessTypeSetting from "./_BusinessTypeSetting/BusinessTypeSetting"; const { ccclass, property } = cc._decorator; @@ -35,11 +36,8 @@ export default class Manager extends cc.Component { } private *_init(): IterableIterator { - console.log(`2022/08/30 16:26`); + console.log(`COMPILE VERSION: ${BusinessTypeSetting.COMPILE_VERSION}`); cc.debug.setDisplayStats(false); - if (CC_DEBUG) { - console.log("Debug"); - } new NativeClass(this.webview); if (cc.sys.isNative) { diff --git a/assets/Script/_BusinessTypeSetting.meta b/assets/Script/_BusinessTypeSetting.meta new file mode 100644 index 0000000..035636c --- /dev/null +++ b/assets/Script/_BusinessTypeSetting.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.3", + "uuid": "78c83bfa-4d05-4a0a-ade0-864ea68a5837", + "importer": "folder", + "isBundle": false, + "bundleName": "", + "priority": 1, + "compressionType": {}, + "optimizeHotUpdate": {}, + "inlineSpriteFrames": {}, + "isRemoteBundle": {}, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/Script/_BusinessTypeSetting/BusinessTypeSetting.ts b/assets/Script/_BusinessTypeSetting/BusinessTypeSetting.ts new file mode 100644 index 0000000..4e3732d --- /dev/null +++ b/assets/Script/_BusinessTypeSetting/BusinessTypeSetting.ts @@ -0,0 +1,4 @@ +export default class BusinessTypeSetting { + /** 編譯版本 */ + public static readonly COMPILE_VERSION: string = "3.0"; +} \ No newline at end of file diff --git a/assets/Script/_BusinessTypeSetting/BusinessTypeSetting.ts.meta b/assets/Script/_BusinessTypeSetting/BusinessTypeSetting.ts.meta new file mode 100644 index 0000000..67dd9d3 --- /dev/null +++ b/assets/Script/_BusinessTypeSetting/BusinessTypeSetting.ts.meta @@ -0,0 +1,10 @@ +{ + "ver": "1.1.0", + "uuid": "b913b231-4f44-467c-a60f-065ce8e1fa42", + "importer": "typescript", + "isPlugin": false, + "loadPluginInWeb": true, + "loadPluginInNative": true, + "loadPluginInEditor": false, + "subMetas": {} +} \ No newline at end of file diff --git a/hotupdate.bat b/hotupdate.bat index 4955c61..76e98fe 100644 --- a/hotupdate.bat +++ b/hotupdate.bat @@ -1,15 +1,16 @@ @echo off -set Ver=1.0.2 +set Ver=3.0 set START1=%~dp0\build\jsb-default\remote-assets set START2=%~dp0\remote-assets -set END=W:\web\MyWeb\Resources\App\JMKA\update\remote-assets +set END=W:\web\MyWeb\Resources\App\JMKA\update\remote-assets\%Ver% -node version_generator.js -v %Ver% -u https://jianmiau.tk/Resources/App/JMKA/update/remote-assets/ -s build/jsb-default/remote-assets -d remote-assets +node version_generator.js -v %Ver% -u https://jianmiau.tk/Resources/App/JMKA/update/remote-assets/%Ver%/ -s build/jsb-default/remote-assets -d remote-assets @REM rmdir /s /q %END% @REM del /f "%END%" @REM mkdir %END% +mkdir %END% chcp 950 >NUL GOTO ALL diff --git a/remote-assets/project.manifest b/remote-assets/project.manifest index 13fa209..1747619 100644 --- a/remote-assets/project.manifest +++ b/remote-assets/project.manifest @@ -1 +1 @@ -{"packageUrl":"https://jianmiau.tk/Resources/App/JMKA/update/remote-assets/","remoteManifestUrl":"https://jianmiau.tk/Resources/App/JMKA/update/remote-assets/project.manifest","remoteVersionUrl":"https://jianmiau.tk/Resources/App/JMKA/update/remote-assets/version.manifest","version":"1.0.2","assets":{"src/cocos2d-jsb.js":{"size":2994873,"md5":"54eb9e8c7718557d8e6aa101ad137d37"},"src/settings.js":{"size":500,"md5":"d989547c4773fe77c3dac0293e87e174"},"assets/main/index.js":{"size":435919,"md5":"ae48365ba7b69d9e57fccd8308cb262d"}},"searchPaths":[]} \ No newline at end of file +{"packageUrl":"https://jianmiau.tk/Resources/App/JMKA/update/remote-assets/3.0/","remoteManifestUrl":"https://jianmiau.tk/Resources/App/JMKA/update/remote-assets/3.0/project.manifest","remoteVersionUrl":"https://jianmiau.tk/Resources/App/JMKA/update/remote-assets/3.0/version.manifest","version":"3.0","assets":{"src/assets/Plugins/responsivevoice.js":{"size":104943,"md5":"9f71d303fc7feda51261c2bf856ad4f1"},"src/assets/Script/Engine/Component/Animation/SkeletonExt.js":{"size":1161,"md5":"7e27cb40c535213460334d5f536e16b9"},"src/cocos2d-jsb.js":{"size":2995026,"md5":"8f7fa2615af9cf7f2121cf3077b97c0a"},"src/settings.js":{"size":500,"md5":"d989547c4773fe77c3dac0293e87e174"},"assets/main/config.json":{"size":1720,"md5":"4f2027d695a724c279c1f4faaea59ae9"},"assets/main/import/02/0254af710.json":{"size":281,"md5":"e859c04502eab6f53d55174bbd4f1d3d"},"assets/main/import/06/06cf73164.json":{"size":34830,"md5":"8288692b6f635b983ecf7ef2b804b03d"},"assets/main/index.js":{"size":436910,"md5":"5f1faf4ab0134b83b75ebd7a06539f25"},"assets/main/native/2d/2ddfe005-2129-41d8-aeec-2b1f51f02962.png":{"size":2290,"md5":"740ebade1729539882383360b2066d36"},"assets/main/native/34/3459ab36-782c-4c4e-8aef-7280aff8b272.png":{"size":18969,"md5":"96e39d211db65235f425ba3957b723b0"},"assets/main/native/70/700faa17-11a6-46cd-aeb5-d6900bc264f8.png":{"size":3765,"md5":"60ab4dfb6d3e8a147753b5665dcba27a"},"assets/main/native/71/71561142-4c83-4933-afca-cb7a17f67053.png":{"size":1050,"md5":"72c8f8527cdbe8246b8223a54f409ca3"},"assets/main/native/b4/b43ff3c2-02bb-4874-81f7-f2dea6970f18.png":{"size":1114,"md5":"49624805cb214b8d78d34a0c03dfbd00"},"assets/main/native/c3/c39ea496-96eb-4dc5-945a-e7c919b77c21.png":{"size":2548,"md5":"c3b93af99c4a65d85ad414e8e46dbfd5"},"assets/main/native/ca/caaaf9ff-5036-4232-a8a7-88b80b2e4c88.png":{"size":1829,"md5":"e3e1ef9049e7c82cbb696bc4e8cfa64b"},"assets/main/native/e5/e56254ca-0ee4-42ea-b69e-d2e57804a4f1.jpg":{"size":5809,"md5":"8fbe8a70e5b43c90bed44cf38e0e2a50"}},"searchPaths":[]} \ No newline at end of file diff --git a/remote-assets/version.manifest b/remote-assets/version.manifest index 5deb797..9cf212c 100644 --- a/remote-assets/version.manifest +++ b/remote-assets/version.manifest @@ -1 +1 @@ -{"packageUrl":"https://jianmiau.tk/Resources/App/JMKA/update/remote-assets/","remoteManifestUrl":"https://jianmiau.tk/Resources/App/JMKA/update/remote-assets/project.manifest","remoteVersionUrl":"https://jianmiau.tk/Resources/App/JMKA/update/remote-assets/version.manifest","version":"1.0.2"} \ No newline at end of file +{"packageUrl":"https://jianmiau.tk/Resources/App/JMKA/update/remote-assets/3.0/","remoteManifestUrl":"https://jianmiau.tk/Resources/App/JMKA/update/remote-assets/3.0/project.manifest","remoteVersionUrl":"https://jianmiau.tk/Resources/App/JMKA/update/remote-assets/3.0/version.manifest","version":"3.0"} \ No newline at end of file diff --git a/settings/project.json b/settings/project.json index 6c2ba22..03542c3 100644 --- a/settings/project.json +++ b/settings/project.json @@ -26,7 +26,7 @@ "height": 640, "width": 960 }, - "last-module-event-record-time": 1661333345776, + "last-module-event-record-time": 1662216568639, "assets-sort-type": "name", "facebook": { "appID": "",