1234

project/src/canvas/game/output.js

@@ -1907,29 +1907,29 @@ const resCanvasList =   {
     uuid: '5996c68c-2626-4a97-a36a-8d5af6b777c0'
   },
 
-  '90b114e6-83cb-46f1-b607-f88c50077b05': {
+  '3e6311fd-15ab-4656-bb84-1c49f4ad4ed9': {
     name: 'bluCat',
     ext: '.png',
     url: 'https://yun.duiba.com.cn/spark/assets/bluCat.57cf00351ffde1985720a877d2e1384390970cd6.png',
-    uuid: '90b114e6-83cb-46f1-b607-f88c50077b05'
+    uuid: '3e6311fd-15ab-4656-bb84-1c49f4ad4ed9'
   },
-  '4e471df6-01ab-421d-ba0b-084b2110dc6d': {
+  'bbb10ff2-f4fb-43a8-83d8-abbb04949f2d': {
     name: 'orengeCat',
     ext: '.png',
-    url: 'https://yun.duiba.com.cn/spark/assets/orengeCat.c664a89d9d7f63895c5460144098a5bac5fc31f5.png',
-    uuid: '4e471df6-01ab-421d-ba0b-084b2110dc6d'
+    url: 'https://yun.duiba.com.cn/spark/assets/orengeCat.179c6c1a961466d5004f80e3ca7962a44acfb3cd.png',
+    uuid: 'bbb10ff2-f4fb-43a8-83d8-abbb04949f2d'
   },
-  '003e9904-aee4-4b8d-8d5d-fb4b1188bec1': {
+  '9fc6517e-debe-4457-88ef-9c733d5bc072': {
     name: 'sanhuaCat',
     ext: '.png',
-    url: 'https://yun.duiba.com.cn/spark/assets/sanhuaCat.b58ed1a3960ecd123ff0b0ff38b9cb8ad44c1b4d.png',
-    uuid: '003e9904-aee4-4b8d-8d5d-fb4b1188bec1'
+    url: 'https://yun.duiba.com.cn/spark/assets/sanhuaCat.f188241d6a2d867b7eb527c60c428ddb2c1b5417.png',
+    uuid: '9fc6517e-debe-4457-88ef-9c733d5bc072'
   },
-  '90283bd3-4b18-4535-97a8-90318f068781': {
+  'ecb49f23-2e65-4507-8be6-1eee021a3b35': {
     name: 'xianluoCat',
     ext: '.png',
-    url: 'https://yun.duiba.com.cn/spark/assets/xianluoCat.c28961a75753d2d6ffe788a3ae38e7f3c3937344.png',
-    uuid: '90283bd3-4b18-4535-97a8-90318f068781'
+    url: 'https://yun.duiba.com.cn/spark/assets/xianluoCat.982316c7b355e65adee931652158a01db7f0c29e.png',
+    uuid: 'ecb49f23-2e65-4507-8be6-1eee021a3b35'
   },
 
 
@@ -2846,8 +2846,8 @@ var Guide = (function (_super) {
     Guide.prototype.initUi = function () {
         var that = this;
         that.index = 0;
-        that.catPosArr = [80, 80, 80, 70];
-        that.catImgUUIDArr = ['90b114e6-83cb-46f1-b607-f88c50077b05', '4e471df6-01ab-421d-ba0b-084b2110dc6d', '003e9904-aee4-4b8d-8d5d-fb4b1188bec1', '90283bd3-4b18-4535-97a8-90318f068781'];
+        that.catPosArr = [80, 40, 60, 70];
+        that.catImgUUIDArr = ['3e6311fd-15ab-4656-bb84-1c49f4ad4ed9', 'bbb10ff2-f4fb-43a8-83d8-abbb04949f2d', '9fc6517e-debe-4457-88ef-9c733d5bc072', 'ecb49f23-2e65-4507-8be6-1eee021a3b35'];
         that.guideUUIDArr_1 = ['5ae12c38-05d8-4105-9101-765e7f32525e', 'e8ad2e4e-925c-4db5-b229-882ee98881a7', 'c549f0a7-085e-444d-b839-4f2172094b0b', '3f48a757-495b-4ed7-957c-9ec95f82ea5e'];
         that.guideUUIDArr_2 = ['d37358ea-ba10-4c08-ab3c-7ff682629ada', 'f44dd5ee-2fa3-4a47-b398-527b0398544b', '6583475b-201e-4324-b15e-4632f33f57ec', 'a90aa98b-2ff1-41a2-8a71-749bb76d6ba3'];
         that.guideUUIDArr_3 = ['d4740497-ed95-4e35-b107-df545896cf05', 'ba92a69d-fc74-482a-8839-6b483d2290b8', 'ff460e08-76fd-4888-8361-2b65b7ee95ea',
@@ -2856,7 +2856,10 @@ var Guide = (function (_super) {
         that.addChild(that.guide);
         that.catImg = new FYGE.Sprite(Ins_1.Ins.getRes(that.catImgUUIDArr[Ins_1.Ins.userInfo.catType - 1]));
         that.addChild(that.catImg);
-        that.catImg.position.set(128, (Ins_1.Ins.stageH * 0.5 + that.catPosArr[Ins_1.Ins.userInfo.catType - 1]));
+        var x = (Ins_1.Ins.stageW - that.catImg.width) * 0.5;
+        var y = (Ins_1.Ins.stageH * 0.5);
+        that.catImg.position.set(x, y);
+        console.log("引导猫的位置", x, y);
         that.guideTouch = new FYGE.Sprite(RES_1.RES.getRes(resCanvasList_1.default["5996c68c-2626-4a97-a36a-8d5af6b777c0"].url));
         that.addChild(that.guideTouch);
         that.guideTouch.mouseEnable = true;
@@ -46876,14 +46879,14 @@ var MainScene = (function (_super) {
     };
     MainScene.prototype.initSceneEle = function () {
         var that = this;
-        that.x = (Ins_1.Ins.stageW - 750) >> 1;
-        that.y = (Ins_1.Ins.stageH - 1624) >> 1;
         console.log(that.y);
         that.mouseChildren = true;
         Ins_1.Ins.curScene = Ins_1.Ins.senceInfo.sence;
         that.bgUUID = ["c6d699b0-b276-4985-b3ea-47bcef13f2ea", "efaf990e-5392-49ad-94d8-25c04f651ede", "b3c8c187-e5c9-4968-9a00-a118d18ab2fc"];
         that.sceneBg = Ins_1.Ins.initSprite(that.bgUUID[Ins_1.Ins.curScene == 4 ? 2 : Ins_1.Ins.curScene - 1]);
         that.addChild(that.sceneBg);
+        that.x = (Ins_1.Ins.stageW - that.sceneBg.width) >> 1;
+        that.y = (Ins_1.Ins.stageH - that.sceneBg.height) >> 1;
         that.mainUi = new mainSceneBtnUi_1.MainSceneBtnUi({ uiType: Ins_1.Ins.curScene == 4 ? 3 : Ins_1.Ins.curScene, callF: function () { that.initGuide(Ins_1.Ins.curScene > 3 ? 3 : Ins_1.Ins.curScene); } });
         that.addChild(that.mainUi);
         that.tlBtn = Ins_1.Ins.initSprite("1f8b040d-2fbc-4ff8-92f9-159773364fae", 0, 640);
@@ -47213,6 +47216,7 @@ var StartScene = (function (_super) {
                 }
                 else {
                     sceneBg.visible = true;
+                    Ins_1.Ins.hideLoading();
                     Ins_1.Ins.showModule("selectcatModal");
                 }
             }
@@ -47225,7 +47229,7 @@ var StartScene = (function (_super) {
     };
     StartScene.prototype.getCat = function (r) {
         console.log("选择完猫咪", r);
-        Ins_1.Ins.userInfo = r.data;
+        Ins_1.Ins.userInfo = r.data.data;
         this.judgeCatIsOutAChangeMainScene();
     };
     StartScene.prototype.judgeCatIsOutAChangeMainScene = function () {

project/src/canvas/game/released/output.js

@@ -1909,29 +1909,29 @@ const resCanvasList =   {
     uuid: '5996c68c-2626-4a97-a36a-8d5af6b777c0'
   },
 
-  '90b114e6-83cb-46f1-b607-f88c50077b05': {
+  '3e6311fd-15ab-4656-bb84-1c49f4ad4ed9': {
     name: 'bluCat',
     ext: '.png',
     url: 'https://yun.duiba.com.cn/spark/assets/bluCat.57cf00351ffde1985720a877d2e1384390970cd6.png',
-    uuid: '90b114e6-83cb-46f1-b607-f88c50077b05'
+    uuid: '3e6311fd-15ab-4656-bb84-1c49f4ad4ed9'
   },
-  '4e471df6-01ab-421d-ba0b-084b2110dc6d': {
+  'bbb10ff2-f4fb-43a8-83d8-abbb04949f2d': {
     name: 'orengeCat',
     ext: '.png',
-    url: 'https://yun.duiba.com.cn/spark/assets/orengeCat.c664a89d9d7f63895c5460144098a5bac5fc31f5.png',
-    uuid: '4e471df6-01ab-421d-ba0b-084b2110dc6d'
+    url: 'https://yun.duiba.com.cn/spark/assets/orengeCat.179c6c1a961466d5004f80e3ca7962a44acfb3cd.png',
+    uuid: 'bbb10ff2-f4fb-43a8-83d8-abbb04949f2d'
   },
-  '003e9904-aee4-4b8d-8d5d-fb4b1188bec1': {
+  '9fc6517e-debe-4457-88ef-9c733d5bc072': {
     name: 'sanhuaCat',
     ext: '.png',
-    url: 'https://yun.duiba.com.cn/spark/assets/sanhuaCat.b58ed1a3960ecd123ff0b0ff38b9cb8ad44c1b4d.png',
-    uuid: '003e9904-aee4-4b8d-8d5d-fb4b1188bec1'
+    url: 'https://yun.duiba.com.cn/spark/assets/sanhuaCat.f188241d6a2d867b7eb527c60c428ddb2c1b5417.png',
+    uuid: '9fc6517e-debe-4457-88ef-9c733d5bc072'
   },
-  '90283bd3-4b18-4535-97a8-90318f068781': {
+  'ecb49f23-2e65-4507-8be6-1eee021a3b35': {
     name: 'xianluoCat',
     ext: '.png',
-    url: 'https://yun.duiba.com.cn/spark/assets/xianluoCat.c28961a75753d2d6ffe788a3ae38e7f3c3937344.png',
-    uuid: '90283bd3-4b18-4535-97a8-90318f068781'
+    url: 'https://yun.duiba.com.cn/spark/assets/xianluoCat.982316c7b355e65adee931652158a01db7f0c29e.png',
+    uuid: 'ecb49f23-2e65-4507-8be6-1eee021a3b35'
   },
 
 
@@ -2848,8 +2848,8 @@ var Guide = (function (_super) {
     Guide.prototype.initUi = function () {
         var that = this;
         that.index = 0;
-        that.catPosArr = [80, 80, 80, 70];
-        that.catImgUUIDArr = ['90b114e6-83cb-46f1-b607-f88c50077b05', '4e471df6-01ab-421d-ba0b-084b2110dc6d', '003e9904-aee4-4b8d-8d5d-fb4b1188bec1', '90283bd3-4b18-4535-97a8-90318f068781'];
+        that.catPosArr = [80, 40, 60, 70];
+        that.catImgUUIDArr = ['3e6311fd-15ab-4656-bb84-1c49f4ad4ed9', 'bbb10ff2-f4fb-43a8-83d8-abbb04949f2d', '9fc6517e-debe-4457-88ef-9c733d5bc072', 'ecb49f23-2e65-4507-8be6-1eee021a3b35'];
         that.guideUUIDArr_1 = ['5ae12c38-05d8-4105-9101-765e7f32525e', 'e8ad2e4e-925c-4db5-b229-882ee98881a7', 'c549f0a7-085e-444d-b839-4f2172094b0b', '3f48a757-495b-4ed7-957c-9ec95f82ea5e'];
         that.guideUUIDArr_2 = ['d37358ea-ba10-4c08-ab3c-7ff682629ada', 'f44dd5ee-2fa3-4a47-b398-527b0398544b', '6583475b-201e-4324-b15e-4632f33f57ec', 'a90aa98b-2ff1-41a2-8a71-749bb76d6ba3'];
         that.guideUUIDArr_3 = ['d4740497-ed95-4e35-b107-df545896cf05', 'ba92a69d-fc74-482a-8839-6b483d2290b8', 'ff460e08-76fd-4888-8361-2b65b7ee95ea',
@@ -2858,7 +2858,10 @@ var Guide = (function (_super) {
         that.addChild(that.guide);
         that.catImg = new FYGE.Sprite(Ins_1.Ins.getRes(that.catImgUUIDArr[Ins_1.Ins.userInfo.catType - 1]));
         that.addChild(that.catImg);
-        that.catImg.position.set(128, (Ins_1.Ins.stageH * 0.5 + that.catPosArr[Ins_1.Ins.userInfo.catType - 1]));
+        var x = (Ins_1.Ins.stageW - that.catImg.width) * 0.5;
+        var y = (Ins_1.Ins.stageH * 0.5);
+        that.catImg.position.set(x, y);
+        console.log("引导猫的位置", x, y);
         that.guideTouch = new FYGE.Sprite(RES_1.RES.getRes(resCanvasList_1.default["5996c68c-2626-4a97-a36a-8d5af6b777c0"].url));
         that.addChild(that.guideTouch);
         that.guideTouch.mouseEnable = true;
@@ -46878,14 +46881,14 @@ var MainScene = (function (_super) {
     };
     MainScene.prototype.initSceneEle = function () {
         var that = this;
-        that.x = (Ins_1.Ins.stageW - 750) >> 1;
-        that.y = (Ins_1.Ins.stageH - 1624) >> 1;
         console.log(that.y);
         that.mouseChildren = true;
         Ins_1.Ins.curScene = Ins_1.Ins.senceInfo.sence;
         that.bgUUID = ["c6d699b0-b276-4985-b3ea-47bcef13f2ea", "efaf990e-5392-49ad-94d8-25c04f651ede", "b3c8c187-e5c9-4968-9a00-a118d18ab2fc"];
         that.sceneBg = Ins_1.Ins.initSprite(that.bgUUID[Ins_1.Ins.curScene == 4 ? 2 : Ins_1.Ins.curScene - 1]);
         that.addChild(that.sceneBg);
+        that.x = (Ins_1.Ins.stageW - that.sceneBg.width) >> 1;
+        that.y = (Ins_1.Ins.stageH - that.sceneBg.height) >> 1;
         that.mainUi = new mainSceneBtnUi_1.MainSceneBtnUi({ uiType: Ins_1.Ins.curScene == 4 ? 3 : Ins_1.Ins.curScene, callF: function () { that.initGuide(Ins_1.Ins.curScene > 3 ? 3 : Ins_1.Ins.curScene); } });
         that.addChild(that.mainUi);
         that.tlBtn = Ins_1.Ins.initSprite("1f8b040d-2fbc-4ff8-92f9-159773364fae", 0, 640);
@@ -47215,6 +47218,7 @@ var StartScene = (function (_super) {
                 }
                 else {
                     sceneBg.visible = true;
+                    Ins_1.Ins.hideLoading();
                     Ins_1.Ins.showModule("selectcatModal");
                 }
             }
@@ -47227,7 +47231,7 @@ var StartScene = (function (_super) {
     };
     StartScene.prototype.getCat = function (r) {
         console.log("选择完猫咪", r);
-        Ins_1.Ins.userInfo = r.data;
+        Ins_1.Ins.userInfo = r.data.data;
         this.judgeCatIsOutAChangeMainScene();
     };
     StartScene.prototype.judgeCatIsOutAChangeMainScene = function () {

project/src/canvas/game/resCanvasList.js

@@ -748,29 +748,29 @@ const resCanvasList =   {
     uuid: '5996c68c-2626-4a97-a36a-8d5af6b777c0'
   },
 
-  '90b114e6-83cb-46f1-b607-f88c50077b05': {
+  '3e6311fd-15ab-4656-bb84-1c49f4ad4ed9': {
     name: 'bluCat',
     ext: '.png',
     url: 'https://yun.duiba.com.cn/spark/assets/bluCat.57cf00351ffde1985720a877d2e1384390970cd6.png',
-    uuid: '90b114e6-83cb-46f1-b607-f88c50077b05'
+    uuid: '3e6311fd-15ab-4656-bb84-1c49f4ad4ed9'
   },
-  '4e471df6-01ab-421d-ba0b-084b2110dc6d': {
+  'bbb10ff2-f4fb-43a8-83d8-abbb04949f2d': {
     name: 'orengeCat',
     ext: '.png',
-    url: 'https://yun.duiba.com.cn/spark/assets/orengeCat.c664a89d9d7f63895c5460144098a5bac5fc31f5.png',
-    uuid: '4e471df6-01ab-421d-ba0b-084b2110dc6d'
+    url: 'https://yun.duiba.com.cn/spark/assets/orengeCat.179c6c1a961466d5004f80e3ca7962a44acfb3cd.png',
+    uuid: 'bbb10ff2-f4fb-43a8-83d8-abbb04949f2d'
   },
-  '003e9904-aee4-4b8d-8d5d-fb4b1188bec1': {
+  '9fc6517e-debe-4457-88ef-9c733d5bc072': {
     name: 'sanhuaCat',
     ext: '.png',
-    url: 'https://yun.duiba.com.cn/spark/assets/sanhuaCat.b58ed1a3960ecd123ff0b0ff38b9cb8ad44c1b4d.png',
-    uuid: '003e9904-aee4-4b8d-8d5d-fb4b1188bec1'
+    url: 'https://yun.duiba.com.cn/spark/assets/sanhuaCat.f188241d6a2d867b7eb527c60c428ddb2c1b5417.png',
+    uuid: '9fc6517e-debe-4457-88ef-9c733d5bc072'
   },
-  '90283bd3-4b18-4535-97a8-90318f068781': {
+  'ecb49f23-2e65-4507-8be6-1eee021a3b35': {
     name: 'xianluoCat',
     ext: '.png',
-    url: 'https://yun.duiba.com.cn/spark/assets/xianluoCat.c28961a75753d2d6ffe788a3ae38e7f3c3937344.png',
-    uuid: '90283bd3-4b18-4535-97a8-90318f068781'
+    url: 'https://yun.duiba.com.cn/spark/assets/xianluoCat.982316c7b355e65adee931652158a01db7f0c29e.png',
+    uuid: 'ecb49f23-2e65-4507-8be6-1eee021a3b35'
   },
 
 

project/src/canvas/game/src/guide/Guide.ts

@@ -43,7 +43,7 @@ export class Guide extends Module {
 
 
         /**猫咪图片 */
-        that.catImgUUIDArr = ['90b114e6-83cb-46f1-b607-f88c50077b05', '4e471df6-01ab-421d-ba0b-084b2110dc6d', '003e9904-aee4-4b8d-8d5d-fb4b1188bec1', '90283bd3-4b18-4535-97a8-90318f068781']
+        that.catImgUUIDArr = ['3e6311fd-15ab-4656-bb84-1c49f4ad4ed9', 'bbb10ff2-f4fb-43a8-83d8-abbb04949f2d', '9fc6517e-debe-4457-88ef-9c733d5bc072', 'ecb49f23-2e65-4507-8be6-1eee021a3b35']
         /**教室引导图片 */
         that.guideUUIDArr_1 = ['5ae12c38-05d8-4105-9101-765e7f32525e', 'e8ad2e4e-925c-4db5-b229-882ee98881a7', 'c549f0a7-085e-444d-b839-4f2172094b0b', '3f48a757-495b-4ed7-957c-9ec95f82ea5e'];
         /**操场引导图片 */

project/src/canvas/game/src/scenes/StartScene.ts

@@ -27,6 +27,7 @@ export class StartScene extends Scene {
                     that.judgeCatIsOutAChangeMainScene();
                 } else {
                     sceneBg.visible = true;
+                    Ins.hideLoading();
                     Ins.showModule("selectcatModal")
                 }
             } else {
@@ -43,7 +44,7 @@ export class StartScene extends Scene {
     /**领养完毕猫咪 */
     getCat(r) {
         console.log("选择完猫咪",r)
-        Ins.userInfo = r.data;
+        Ins.userInfo = r.data.data;
         /**判断猫咪是否出寝，只在用户进入游戏时判断，后面要根据接口改写，现在先做测试 */
         this.judgeCatIsOutAChangeMainScene();
     }

taobao_mini/client/components/comcatname/comcatname.js

@@ -48,15 +48,18 @@ Component({
                     content: "名字不能为空哦",
                 });
             } else {
+                my.showLoading();
                 /**检查敏感词 */
 
                 /**调用领养接口 */
                 const adoptCat = await API.adoptCat({
                     catName: name,
                     catType: this.props.selectType
+                    // invitedId: 
                 });
                 console.log("aaaa",adoptCat)
                 if (adoptCat && adoptCat.success) {
+                    my.hideLoading();
                     this.onModalClose();
                     this.onSelectCatOk();
                 } else {

taobao_mini/client/components/comgetcat/comgetcat.acss

@@ -48,5 +48,5 @@
   left: 107rpx;
   top: 565rpx;
   position: absolute;
-  transform-origin: 0rpx 0rpx 0rpx;
+  transform-origin: 50% 50% 0rpx;
 }

taobao_mini/client/components/comgetcat/comgetcat.axml

@@ -4,5 +4,5 @@
           <image class="getcatdialogbg" src={{resList['24b7d459-41d6-408c-9829-4768fe38abf5'].url}} />
           <label class="getcatdialogtext">好了，现在你就是{{catName}}的铲屎官了～</label>
         </view>
-        <image class="getcatgo" onTap="onPostSelectCat" src={{resList['97484cf2-5146-4287-b104-ed1f43c71ee0'].url}} />
+        <image class="getcatgo btn" onTap="onPostSelectCat" src={{resList['97484cf2-5146-4287-b104-ed1f43c71ee0'].url}} />
       </view> 
\ No newline at end of file

taobao_mini/client/components/comselectcat/comselectcat.axml

@@ -3,25 +3,25 @@
   <view class="selectcatblue" id="cat_1" onTap="changeSelectCat">
     <image class="bluebg" src={{resList['02183198-f4da-4ac2-8bf3-d6b7a07d3279'].url}} />
     <image class="blueimg" src={{resList['95a6b0a9-3e7a-4a0b-82b6-6742e2a8bddf'].url}} />
-    <label class="bluename">1</label>
+    <label class="bluename">蓝猫</label>
     <image class="bluesure" a:if="{{curSelect==1}}" src={{resList['f956cda2-5eef-4942-8737-742d171527bd'].url}} />
   </view>
   <view class="selectcatsh" id="cat_3" onTap="changeSelectCat">
     <image class="shbg" src={{resList['02183198-f4da-4ac2-8bf3-d6b7a07d3279'].url}} />
     <image class="shimg" src={{resList['fe52ffae-fadd-40f3-97b5-d3d56fd04781'].url}} />
-    <label class="shname">3</label>
+    <label class="shname">三花</label>
     <image class="shsure" a:if="{{curSelect==3}}" src={{resList['f956cda2-5eef-4942-8737-742d171527bd'].url}} />
   </view>
   <view class="selectcatxl" id="cat_4" onTap="changeSelectCat">
     <image class="xlbg" src={{resList['02183198-f4da-4ac2-8bf3-d6b7a07d3279'].url}} />
     <image class="xlimg" src={{resList['193f6955-d754-4b9f-80ca-b9b9a72e8a8b'].url}} />
-    <label class="xlname">4</label>
+    <label class="xlname">暹罗</label>
     <image class="xlsure" a:if="{{curSelect==4}}" src={{resList['f956cda2-5eef-4942-8737-742d171527bd'].url}} />
   </view>
   <view class="selectcatorge" id="cat_2" onTap="changeSelectCat">
     <image class="orgebg" src={{resList['02183198-f4da-4ac2-8bf3-d6b7a07d3279'].url}} />
     <image class="orgeimg" src={{resList['e28e5250-c740-4e4f-a855-c415c557e77e'].url}} />
-    <label class="orgename">2</label>
+    <label class="orgename">橘猫</label>
     <image class="orgesure" a:if="{{curSelect==2}}" src={{resList['f956cda2-5eef-4942-8737-742d171527bd'].url}} />
   </view>
   <image class="selectcattrue btn" onTap="selectSure" src={{resList['628fc38b-7dc0-4c69-aac1-279d60c8f1ed'].url}} />

taobao_mini/client/pages/pagecanvas/output.js

@@ -1908,29 +1908,29 @@ const resCanvasList =   {
     uuid: '5996c68c-2626-4a97-a36a-8d5af6b777c0'
   },
 
-  '90b114e6-83cb-46f1-b607-f88c50077b05': {
+  '3e6311fd-15ab-4656-bb84-1c49f4ad4ed9': {
     name: 'bluCat',
     ext: '.png',
     url: 'https://yun.duiba.com.cn/spark/assets/bluCat.57cf00351ffde1985720a877d2e1384390970cd6.png',
-    uuid: '90b114e6-83cb-46f1-b607-f88c50077b05'
+    uuid: '3e6311fd-15ab-4656-bb84-1c49f4ad4ed9'
   },
-  '4e471df6-01ab-421d-ba0b-084b2110dc6d': {
+  'bbb10ff2-f4fb-43a8-83d8-abbb04949f2d': {
     name: 'orengeCat',
     ext: '.png',
-    url: 'https://yun.duiba.com.cn/spark/assets/orengeCat.c664a89d9d7f63895c5460144098a5bac5fc31f5.png',
-    uuid: '4e471df6-01ab-421d-ba0b-084b2110dc6d'
+    url: 'https://yun.duiba.com.cn/spark/assets/orengeCat.179c6c1a961466d5004f80e3ca7962a44acfb3cd.png',
+    uuid: 'bbb10ff2-f4fb-43a8-83d8-abbb04949f2d'
   },
-  '003e9904-aee4-4b8d-8d5d-fb4b1188bec1': {
+  '9fc6517e-debe-4457-88ef-9c733d5bc072': {
     name: 'sanhuaCat',
     ext: '.png',
-    url: 'https://yun.duiba.com.cn/spark/assets/sanhuaCat.b58ed1a3960ecd123ff0b0ff38b9cb8ad44c1b4d.png',
-    uuid: '003e9904-aee4-4b8d-8d5d-fb4b1188bec1'
+    url: 'https://yun.duiba.com.cn/spark/assets/sanhuaCat.f188241d6a2d867b7eb527c60c428ddb2c1b5417.png',
+    uuid: '9fc6517e-debe-4457-88ef-9c733d5bc072'
   },
-  '90283bd3-4b18-4535-97a8-90318f068781': {
+  'ecb49f23-2e65-4507-8be6-1eee021a3b35': {
     name: 'xianluoCat',
     ext: '.png',
-    url: 'https://yun.duiba.com.cn/spark/assets/xianluoCat.c28961a75753d2d6ffe788a3ae38e7f3c3937344.png',
-    uuid: '90283bd3-4b18-4535-97a8-90318f068781'
+    url: 'https://yun.duiba.com.cn/spark/assets/xianluoCat.982316c7b355e65adee931652158a01db7f0c29e.png',
+    uuid: 'ecb49f23-2e65-4507-8be6-1eee021a3b35'
   },
 
 
@@ -2847,8 +2847,8 @@ var Guide = (function (_super) {
     Guide.prototype.initUi = function () {
         var that = this;
         that.index = 0;
-        that.catPosArr = [80, 80, 80, 70];
-        that.catImgUUIDArr = ['90b114e6-83cb-46f1-b607-f88c50077b05', '4e471df6-01ab-421d-ba0b-084b2110dc6d', '003e9904-aee4-4b8d-8d5d-fb4b1188bec1', '90283bd3-4b18-4535-97a8-90318f068781'];
+        that.catPosArr = [80, 40, 60, 70];
+        that.catImgUUIDArr = ['3e6311fd-15ab-4656-bb84-1c49f4ad4ed9', 'bbb10ff2-f4fb-43a8-83d8-abbb04949f2d', '9fc6517e-debe-4457-88ef-9c733d5bc072', 'ecb49f23-2e65-4507-8be6-1eee021a3b35'];
         that.guideUUIDArr_1 = ['5ae12c38-05d8-4105-9101-765e7f32525e', 'e8ad2e4e-925c-4db5-b229-882ee98881a7', 'c549f0a7-085e-444d-b839-4f2172094b0b', '3f48a757-495b-4ed7-957c-9ec95f82ea5e'];
         that.guideUUIDArr_2 = ['d37358ea-ba10-4c08-ab3c-7ff682629ada', 'f44dd5ee-2fa3-4a47-b398-527b0398544b', '6583475b-201e-4324-b15e-4632f33f57ec', 'a90aa98b-2ff1-41a2-8a71-749bb76d6ba3'];
         that.guideUUIDArr_3 = ['d4740497-ed95-4e35-b107-df545896cf05', 'ba92a69d-fc74-482a-8839-6b483d2290b8', 'ff460e08-76fd-4888-8361-2b65b7ee95ea',
@@ -2857,7 +2857,10 @@ var Guide = (function (_super) {
         that.addChild(that.guide);
         that.catImg = new FYGE.Sprite(Ins_1.Ins.getRes(that.catImgUUIDArr[Ins_1.Ins.userInfo.catType - 1]));
         that.addChild(that.catImg);
-        that.catImg.position.set(128, (Ins_1.Ins.stageH * 0.5 + that.catPosArr[Ins_1.Ins.userInfo.catType - 1]));
+        var x = (Ins_1.Ins.stageW - that.catImg.width) * 0.5;
+        var y = (Ins_1.Ins.stageH * 0.5);
+        that.catImg.position.set(x, y);
+        console.log("引导猫的位置", x, y);
         that.guideTouch = new FYGE.Sprite(RES_1.RES.getRes(resCanvasList_1.default["5996c68c-2626-4a97-a36a-8d5af6b777c0"].url));
         that.addChild(that.guideTouch);
         that.guideTouch.mouseEnable = true;
@@ -46877,14 +46880,14 @@ var MainScene = (function (_super) {
     };
     MainScene.prototype.initSceneEle = function () {
         var that = this;
-        that.x = (Ins_1.Ins.stageW - 750) >> 1;
-        that.y = (Ins_1.Ins.stageH - 1624) >> 1;
         console.log(that.y);
         that.mouseChildren = true;
         Ins_1.Ins.curScene = Ins_1.Ins.senceInfo.sence;
         that.bgUUID = ["c6d699b0-b276-4985-b3ea-47bcef13f2ea", "efaf990e-5392-49ad-94d8-25c04f651ede", "b3c8c187-e5c9-4968-9a00-a118d18ab2fc"];
         that.sceneBg = Ins_1.Ins.initSprite(that.bgUUID[Ins_1.Ins.curScene == 4 ? 2 : Ins_1.Ins.curScene - 1]);
         that.addChild(that.sceneBg);
+        that.x = (Ins_1.Ins.stageW - that.sceneBg.width) >> 1;
+        that.y = (Ins_1.Ins.stageH - that.sceneBg.height) >> 1;
         that.mainUi = new mainSceneBtnUi_1.MainSceneBtnUi({ uiType: Ins_1.Ins.curScene == 4 ? 3 : Ins_1.Ins.curScene, callF: function () { that.initGuide(Ins_1.Ins.curScene > 3 ? 3 : Ins_1.Ins.curScene); } });
         that.addChild(that.mainUi);
         that.tlBtn = Ins_1.Ins.initSprite("1f8b040d-2fbc-4ff8-92f9-159773364fae", 0, 640);
@@ -47214,6 +47217,7 @@ var StartScene = (function (_super) {
                 }
                 else {
                     sceneBg.visible = true;
+                    Ins_1.Ins.hideLoading();
                     Ins_1.Ins.showModule("selectcatModal");
                 }
             }
@@ -47226,7 +47230,7 @@ var StartScene = (function (_super) {
     };
     StartScene.prototype.getCat = function (r) {
         console.log("选择完猫咪", r);
-        Ins_1.Ins.userInfo = r.data;
+        Ins_1.Ins.userInfo = r.data.data;
         this.judgeCatIsOutAChangeMainScene();
     };
     StartScene.prototype.judgeCatIsOutAChangeMainScene = function () {

taobao_mini/client/pages/pagecanvasoutput.js

@@ -1909,29 +1909,29 @@ const resCanvasList =   {
     uuid: '5996c68c-2626-4a97-a36a-8d5af6b777c0'
   },
 
-  '90b114e6-83cb-46f1-b607-f88c50077b05': {
+  '3e6311fd-15ab-4656-bb84-1c49f4ad4ed9': {
     name: 'bluCat',
     ext: '.png',
     url: 'https://yun.duiba.com.cn/spark/assets/bluCat.57cf00351ffde1985720a877d2e1384390970cd6.png',
-    uuid: '90b114e6-83cb-46f1-b607-f88c50077b05'
+    uuid: '3e6311fd-15ab-4656-bb84-1c49f4ad4ed9'
   },
-  '4e471df6-01ab-421d-ba0b-084b2110dc6d': {
+  'bbb10ff2-f4fb-43a8-83d8-abbb04949f2d': {
     name: 'orengeCat',
     ext: '.png',
-    url: 'https://yun.duiba.com.cn/spark/assets/orengeCat.c664a89d9d7f63895c5460144098a5bac5fc31f5.png',
-    uuid: '4e471df6-01ab-421d-ba0b-084b2110dc6d'
+    url: 'https://yun.duiba.com.cn/spark/assets/orengeCat.179c6c1a961466d5004f80e3ca7962a44acfb3cd.png',
+    uuid: 'bbb10ff2-f4fb-43a8-83d8-abbb04949f2d'
   },
-  '003e9904-aee4-4b8d-8d5d-fb4b1188bec1': {
+  '9fc6517e-debe-4457-88ef-9c733d5bc072': {
     name: 'sanhuaCat',
     ext: '.png',
-    url: 'https://yun.duiba.com.cn/spark/assets/sanhuaCat.b58ed1a3960ecd123ff0b0ff38b9cb8ad44c1b4d.png',
-    uuid: '003e9904-aee4-4b8d-8d5d-fb4b1188bec1'
+    url: 'https://yun.duiba.com.cn/spark/assets/sanhuaCat.f188241d6a2d867b7eb527c60c428ddb2c1b5417.png',
+    uuid: '9fc6517e-debe-4457-88ef-9c733d5bc072'
   },
-  '90283bd3-4b18-4535-97a8-90318f068781': {
+  'ecb49f23-2e65-4507-8be6-1eee021a3b35': {
     name: 'xianluoCat',
     ext: '.png',
-    url: 'https://yun.duiba.com.cn/spark/assets/xianluoCat.c28961a75753d2d6ffe788a3ae38e7f3c3937344.png',
-    uuid: '90283bd3-4b18-4535-97a8-90318f068781'
+    url: 'https://yun.duiba.com.cn/spark/assets/xianluoCat.982316c7b355e65adee931652158a01db7f0c29e.png',
+    uuid: 'ecb49f23-2e65-4507-8be6-1eee021a3b35'
   },
 
 
@@ -2848,8 +2848,8 @@ var Guide = (function (_super) {
     Guide.prototype.initUi = function () {
         var that = this;
         that.index = 0;
-        that.catPosArr = [80, 80, 80, 70];
-        that.catImgUUIDArr = ['90b114e6-83cb-46f1-b607-f88c50077b05', '4e471df6-01ab-421d-ba0b-084b2110dc6d', '003e9904-aee4-4b8d-8d5d-fb4b1188bec1', '90283bd3-4b18-4535-97a8-90318f068781'];
+        that.catPosArr = [80, 40, 60, 70];
+        that.catImgUUIDArr = ['3e6311fd-15ab-4656-bb84-1c49f4ad4ed9', 'bbb10ff2-f4fb-43a8-83d8-abbb04949f2d', '9fc6517e-debe-4457-88ef-9c733d5bc072', 'ecb49f23-2e65-4507-8be6-1eee021a3b35'];
         that.guideUUIDArr_1 = ['5ae12c38-05d8-4105-9101-765e7f32525e', 'e8ad2e4e-925c-4db5-b229-882ee98881a7', 'c549f0a7-085e-444d-b839-4f2172094b0b', '3f48a757-495b-4ed7-957c-9ec95f82ea5e'];
         that.guideUUIDArr_2 = ['d37358ea-ba10-4c08-ab3c-7ff682629ada', 'f44dd5ee-2fa3-4a47-b398-527b0398544b', '6583475b-201e-4324-b15e-4632f33f57ec', 'a90aa98b-2ff1-41a2-8a71-749bb76d6ba3'];
         that.guideUUIDArr_3 = ['d4740497-ed95-4e35-b107-df545896cf05', 'ba92a69d-fc74-482a-8839-6b483d2290b8', 'ff460e08-76fd-4888-8361-2b65b7ee95ea',
@@ -2858,7 +2858,10 @@ var Guide = (function (_super) {
         that.addChild(that.guide);
         that.catImg = new FYGE.Sprite(Ins_1.Ins.getRes(that.catImgUUIDArr[Ins_1.Ins.userInfo.catType - 1]));
         that.addChild(that.catImg);
-        that.catImg.position.set(128, (Ins_1.Ins.stageH * 0.5 + that.catPosArr[Ins_1.Ins.userInfo.catType - 1]));
+        var x = (Ins_1.Ins.stageW - that.catImg.width) * 0.5;
+        var y = (Ins_1.Ins.stageH * 0.5);
+        that.catImg.position.set(x, y);
+        console.log("引导猫的位置", x, y);
         that.guideTouch = new FYGE.Sprite(RES_1.RES.getRes(resCanvasList_1.default["5996c68c-2626-4a97-a36a-8d5af6b777c0"].url));
         that.addChild(that.guideTouch);
         that.guideTouch.mouseEnable = true;
@@ -46878,14 +46881,14 @@ var MainScene = (function (_super) {
     };
     MainScene.prototype.initSceneEle = function () {
         var that = this;
-        that.x = (Ins_1.Ins.stageW - 750) >> 1;
-        that.y = (Ins_1.Ins.stageH - 1624) >> 1;
         console.log(that.y);
         that.mouseChildren = true;
         Ins_1.Ins.curScene = Ins_1.Ins.senceInfo.sence;
         that.bgUUID = ["c6d699b0-b276-4985-b3ea-47bcef13f2ea", "efaf990e-5392-49ad-94d8-25c04f651ede", "b3c8c187-e5c9-4968-9a00-a118d18ab2fc"];
         that.sceneBg = Ins_1.Ins.initSprite(that.bgUUID[Ins_1.Ins.curScene == 4 ? 2 : Ins_1.Ins.curScene - 1]);
         that.addChild(that.sceneBg);
+        that.x = (Ins_1.Ins.stageW - that.sceneBg.width) >> 1;
+        that.y = (Ins_1.Ins.stageH - that.sceneBg.height) >> 1;
         that.mainUi = new mainSceneBtnUi_1.MainSceneBtnUi({ uiType: Ins_1.Ins.curScene == 4 ? 3 : Ins_1.Ins.curScene, callF: function () { that.initGuide(Ins_1.Ins.curScene > 3 ? 3 : Ins_1.Ins.curScene); } });
         that.addChild(that.mainUi);
         that.tlBtn = Ins_1.Ins.initSprite("1f8b040d-2fbc-4ff8-92f9-159773364fae", 0, 640);
@@ -47215,6 +47218,7 @@ var StartScene = (function (_super) {
                 }
                 else {
                     sceneBg.visible = true;
+                    Ins_1.Ins.hideLoading();
                     Ins_1.Ins.showModule("selectcatModal");
                 }
             }
@@ -47227,7 +47231,7 @@ var StartScene = (function (_super) {
     };
     StartScene.prototype.getCat = function (r) {
         console.log("选择完猫咪", r);
-        Ins_1.Ins.userInfo = r.data;
+        Ins_1.Ins.userInfo = r.data.data;
         this.judgeCatIsOutAChangeMainScene();
     };
     StartScene.prototype.judgeCatIsOutAChangeMainScene = function () {