Merge branch 'yd11_20200922' of gitlab2.dui88.com:wanghongyuan/new_taobao into yd11_20200922

project/src/canvas/game/resCanvasListCsd.js

 const resCanvasListCsd = {
-  '63cb446e-1158-4a94-bf0c-c19ecc7d2cc6': {
-    name: 'openTexture',
-    ext: '.png',
-    url: 'https://yun.duiba.com.cn/spark/assets/openTexture__.b7037af9b8c768386bbe994c40e5331fbd8d4e8a.png',
-    uuid: '63cb446e-1158-4a94-bf0c-c19ecc7d2cc6'
-  },
+  // '63cb446e-1158-4a94-bf0c-c19ecc7d2cc6': {
+  //   name: 'openTexture',
+  //   ext: '.png',
+  //   url: 'https://yun.duiba.com.cn/spark/assets/openTexture__.b7037af9b8c768386bbe994c40e5331fbd8d4e8a.png',
+  //   uuid: '63cb446e-1158-4a94-bf0c-c19ecc7d2cc6'
+  // },
   'bdb3cbec-1af5-49e9-89ba-2c2ecd90f760': {
     name: 'guangTexture',
     ext: '.png',
@@ -142,6 +142,12 @@ const resCanvasListCsd = {
     ext: '.png',
     url: 'https://yun.duiba.com.cn/spark/assets/csd引导3.3cb22a085628a6e43b4e13182c1a26c1ec4c259d.png',
     uuid: '0668f8d0-6fb3-46f9-a5e4-952aef42f05c'
+  },
+  '62a701fa-32cc-42a4-a097-b7c451440b36': {
+    name: '导出lottie',
+    ext: '.png',
+    url: 'https://yun.duiba.com.cn/spark/assets/导出lottie.4f99495be3d5447ac215107bcb935d1434261088.png',
+    uuid: '62a701fa-32cc-42a4-a097-b7c451440b36'
   }
 };
 export default resCanvasListCsd;
\ No newline at end of file

project/src/canvas/game/src/Main.ts

@@ -111,7 +111,7 @@ export class Main {
                             resolve('complete')
                         }, 200);
                     }
-                }, resCanvasList['63cb446e-1158-4a94-bf0c-c19ecc7d2cc6'].url)
+                }, resCanvasList['62a701fa-32cc-42a4-a097-b7c451440b36'].url)
             // [
             //     resCanvasList['bdb3cbec-1af5-49e9-89ba-2c2ecd90f760'].url,
             //     resCanvasList['e2adae2c-ac89-49cc-a200-8daec42da146'].url