Merge branch 'master' of gitlab2.dui88.com:wanghongyuan/taobaominiDemo

client/pages/index/index.js

@@ -21,7 +21,7 @@ Page({
         if (query.inviteId) this.inviteId = query.inviteId
     },
     onReady() {
-
+        
     },
 
     onCanvasReady() {

client/pages/index/output.js

@@ -1372,6 +1372,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResJson = {
     "groups": [
         {
+<<<<<<< HEAD
             "keys": "comCloseBtn.png,toastBg.png,waitingBg.png,waitingRot.png",
             "name": "common"
         },
@@ -1393,6 +1394,89 @@ exports.ResJson = {
         }
     ],
     "path": "./resource/"
+=======
+            "keys": "duang.png",
+            "name": "animation",
+            "atlas": "animation.json"
+        },
+        {
+            "keys": "addCard1000.png,addCard2000.png,addCard8000.png,cancelBtn.png,comCloseBtn.png,reviveCard.png,toastBg.png,waitingBg.png,waitingRot.png",
+            "name": "common",
+            "atlas": "common.json"
+        },
+        {
+            "keys": "ball_0.png,ball_1.png,ball_2.png,ball_3.png,ball_4.png,ball_5.png,bullet.png,car.png,car_particle.png,drop_bullet_0.png,drop_bullet_1.png,drop_power_0.png,drop_power_1.png,drop_power_2.png,main_bg.jpg,main_bullet.png,main_power.png,mask.png,ring.png,star.png",
+            "name": "dxqPlayScene",
+            "atlas": "dxqPlayScene.json"
+        },
+        {
+            "keys": "game_dead_bg.png,game_dead_cancel.png,game_dead_restart.png",
+            "name": "gameDeadPanel",
+            "atlas": "gameDeadPanel.json"
+        },
+        {
+            "keys": "game_over_bg.png,game_over_use_props.png,touBg.png",
+            "name": "gameOverPanel",
+            "atlas": "gameOverPanel.json"
+        },
+        {
+            "keys": "recordSceneLine.png,recordUseBtn.png,recordUseBtnDis.png,returnBtn.png",
+            "name": "goodListScene",
+            "atlas": "goodListScene.json"
+        },
+        {
+            "keys": "inviteBg.png,inviteBtn.png",
+            "name": "invitePanel",
+            "atlas": "invitePanel.json"
+        },
+        {
+            "keys": "adIamge.png,bar1.png,bar2.png,loadtex.png",
+            "name": "loading",
+            "atlas": "loading.json"
+        },
+        {
+            "keys": "addCard1000gray.png,addCard2000gray.png,addCard8000gray.png,myPropsBg.png,reviveCardgray.png,taskBtn.png",
+            "name": "propsPanel",
+            "atlas": "propsPanel.json"
+        },
+        {
+            "keys": "btn_view_reward.png,numIcon1.png,numIcon2.png,numIcon3.png,numIconOther.png,rank_bg.png,rank_content_bg_left.png,rank_content_bg_right.png,rank_separator.png,rank_toggle_off.png",
+            "name": "rankPanel",
+            "atlas": "rankPanel.json"
+        },
+        {
+            "keys": "knowBtn.png,ruleBg.png",
+            "name": "rulePanel",
+            "atlas": "rulePanel.json"
+        },
+        {
+            "keys": "1000.png,1bg.png,2000.png,2bg.png,3bg.png,4bg.png,5bg.png,6bg.png,7bg.png,8000.png,bingo.png,close.png,light_bg.png,revive.png,signAniBtn.png,sign_bg.png",
+            "name": "signPanel",
+            "atlas": "signPanel.json"
+        },
+        {
+            "keys": "doHelpIcon.png,drawBtn.png,music_Close.png,music_Open.png,propBtn.png,rankBtn.png,recordBtn.png,ruleBtn.png,signInBtn.png,startBg.jpg,startBg.png,startBtn.png,task_Btn.png",
+            "name": "startScene",
+            "atlas": "startScene.json"
+        },
+        {
+            "keys": "takePrizeBg.png",
+            "name": "takePrizePanel",
+            "atlas": "takePrizePanel.json"
+        },
+        {
+            "keys": "goTaskBtn.png,task1.png,task2.png,task3.png,taskBg.png",
+            "name": "taskPanel",
+            "atlas": "taskPanel.json"
+        },
+        {
+            "keys": "use_props_bg.png,use_props_btn_dis.png,use_props_btn_use.png,use_props_item_bg.png",
+            "name": "usePropsPanel",
+            "atlas": "usePropsPanel.json"
+        }
+    ],
+    "path": "https://yun.duiba.com.cn/db_games/activity/anything/1592899614/resource/"
+>>>>>>> f10538620c7b89dceaa8e142165d4ef3240b7dbd
 };