From 99bc99bf41214cfe8ee31c8abba7b1248e94758d Mon Sep 17 00:00:00 2001
From: Huang Minzhi <m_fan@geishatokyo.com>
Date: Wed, 9 Mar 2022 13:17:13 +0800
Subject: [PATCH] fix cconb file

---
 package.json            |  2 +-
 source/merge.ts         | 17 ++++++++---------
 static/download-hook.js | 16 ++++++++++++++++
 static/wrapper.js       |  2 +-
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index a7463bb..940a812 100755
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "name": "playable-build-tool",
     "title": "Playable build tool",
     "package_version": 2,
-    "version": "1.0.0",
+    "version": "1.0.1",
     "author": "minzhi",
     "description": "i18n:playable-build-tool.description",
     "contributions": {
diff --git a/source/merge.ts b/source/merge.ts
index 2d67245..7885565 100644
--- a/source/merge.ts
+++ b/source/merge.ts
@@ -41,12 +41,12 @@ const import_map_match_key = "<!--IMPORT_MAP-->";
 const dapi_match_key = "<!--DAPI_HEAD-->";
 const google_match_key = "<!--GOOGLE_HEAD-->";
 const start_match_key = "<!--START-->";
-const fileByteList = [".png", ".bin", ".mp3"];
 const excludeList = ["/index.js"];
 const base64PreList = new Map<string, string>([
   [".png", "data:image/png;base64,"],
   [".bin", "data:application/octet-stream;base64,"],
   [".mp3", "data:audio/mpeg;base64,"],
+  [".cconb", "data:application/octet-stream;base64,"],
   [".ttf", ""],
 ]);
 export class MergeBuilder {
@@ -208,9 +208,7 @@ export class MergeBuilder {
     switch (adNetwork) {
       case "mintegral":
         const mintegral_str =
-          "<script>\n" +
-          this.readFile(this.mintegral_path) +
-          "\n</script>\n";
+          "<script>\n" + this.readFile(this.mintegral_path) + "\n</script>\n";
         html_str = html_str.replace(start_match_key, mintegral_str);
         break;
       case "ironsource":
@@ -219,7 +217,8 @@ export class MergeBuilder {
         html_str = html_str.replace(start_match_key, dapi_body_str);
         break;
       case "unity":
-        const unity_path = "<script>\n" + this.readFile(this.unity_path) + "</script>\n";
+        const unity_path =
+          "<script>\n" + this.readFile(this.unity_path) + "</script>\n";
         html_str = html_str.replace(start_match_key, unity_path);
         break;
       case "applovin":
@@ -235,16 +234,16 @@ export class MergeBuilder {
 
     //bundle
     const bundle_str =
-      "<script>\nfunction loadBundle(){\n" +
+      "<script>\nfunction loadMyBundle(){\n" +
       this.readFile(this.bundle_path) +
-      "}\n</script>\n";
+      "\n}\n</script>\n";
     html_str = this.simpleReplace(html_str, bundle_match_key, bundle_str);
 
     //engine
     const engine_str =
       "<script>\nfunction loadCC(){\n" +
       this.readFile(this.engine_path) +
-      "}\n</script>\n";
+      "\n}\n</script>\n";
     html_str = this.simpleReplace(html_str, engine_match_key, engine_str);
 
     // resmap
@@ -252,7 +251,7 @@ export class MergeBuilder {
     const cc_index_str =
       "<script>\nfunction loadCCIndex(){\n" +
       this.readFile(this.cc_index_js_path) +
-      "}\n</script>\n";
+      "\n}\n</script>\n";
     const setting_str =
       "<script>window._CCSettings = " +
       this.readFile(this.setting_path) +
diff --git a/static/download-hook.js b/static/download-hook.js
index ac5ecef..1ad9c69 100644
--- a/static/download-hook.js
+++ b/static/download-hook.js
@@ -143,9 +143,25 @@ function downloadAudio(url, options, onComplete) {
   oldHook(url, options, onComplete)
 }
 
+function downloadCCONB(url, options, onComplete) {
+  downloadArrayBuffer(url, options, function (err, arrayBuffer) {
+    if (err) {
+      onComplete(err);
+      return;
+    }
+    try {
+      var ccon = cc.internal.decodeCCONBinary(new Uint8Array(arrayBuffer));
+      onComplete(null, ccon);
+    } catch (err) {
+      onComplete(err);
+    }
+  });
+}
+
 window.hook = function (cc) {
   console.log('run hook')
   cc.assetManager.downloader.register('.bin', downloadArrayBuffer);
+  cc.assetManager.downloader.register('.cconb', downloadCCONB);
   cc.assetManager.downloader.register('.png', downloadDomImage);
   cc.assetManager.downloader.register('.json', downloadJson);
   cc.assetManager.downloader.register('.js', downloadScript);
diff --git a/static/wrapper.js b/static/wrapper.js
index 7acebf9..de065f2 100644
--- a/static/wrapper.js
+++ b/static/wrapper.js
@@ -10,7 +10,7 @@ function load(name){
     loadCC()
     return true
   }else if (name === "bundle.js"){
-    loadBundle()
+    loadMyBundle()
     return true
   }else {
     return false