添加我的奖品兑换商品新适配，添加游戏部分场景引导以及三文鱼精力，三文鱼精力尚未完成

ade201d4 · Edwise · b05082d1 · ade201d4 · ade201d4 · ade201d4
Commit ade201d4 authored Dec 05, 2020 by Edwise 🍷
20 changed files
--- a/project/src/canvas/game/mock/miniTb/tmallCat.getSence.json
+++ b/project/src/canvas/game/mock/miniTb/tmallCat.getSence.json
@@ -5,10 +5,10 @@
        "sence": 2,
        "senceTips":["测试","测试"],
        "senceGuide":{
-            "1":false,
+            "1":true,
            "2":false,
            "3":false,
-            "4":true
+            "4":false
        }
    }

--- a/project/src/canvas/game/mock/miniTb/tmallCat.getUserInfo.json
+++ b/project/src/canvas/game/mock/miniTb/tmallCat.getUserInfo.json
@@ -5,7 +5,7 @@
        "catType": 4,
        "userNick": "Edwise",
        "energy": 1000,
-        "happyCoin":1000,
+        "happyCoin":1000000,
        "experience": 1000,
        "level": "1",
        "avatar": "http://wwc.alicdn.com/avatar/getAvatar.do?userIdStr=Pk*HOFxSPCNGOHgyX8R-MGIyPCZzPk8uOmHuvkxYOHQT&width=80&height=80&type=sns",

--- a/project/src/canvas/game/module/RES.ts
+++ b/project/src/canvas/game/module/RES.ts
@@ -131,7 +131,7 @@ export namespace RES {
        let p: Promise<any> = new Promise((resolve, reject) => {
            loadResList((s) => {
                if (s) {
-                    resolve()
+                    resolve(1)
                } else {
                    reject();
                }
@@ -149,7 +149,7 @@ export namespace RES {
        //已经加载完成的直接返回
        if (groupsCompleteHash[name]) {
            return new Promise((resolve) => {
-                resolve()
+                resolve(1)
            })
        }
        //如果是正在加载中的，返回正在加载中的promise
@@ -163,7 +163,7 @@ export namespace RES {
        if (!arr || !arr.length) {
            groupsCompleteHash[name] = true;
            return new Promise((resolve) => {
-                resolve()
+                resolve(1)
            })
        }
        // 建一个promise
@@ -173,7 +173,7 @@ export namespace RES {
                delete groupsPromiseHash[name];
                if (s) {
                    groupsCompleteHash[name] = true;
-                    resolve()
+                    resolve(1)
                } else {
                    reject();
                }

--- a/project/src/canvas/game/module/views/Module.ts
+++ b/project/src/canvas/game/module/views/Module.ts
@@ -40,7 +40,7 @@ export class Module extends FYGE.Container {
                }
                Promise.all(arr).then(resolve, reject)
            } else {
-                resolve()
+                resolve(1)
            }
        })
    }

--- a/project/src/canvas/game/package-lock.json
+++ b/project/src/canvas/game/package-lock.json
--- a/project/src/canvas/game/package.json
+++ b/project/src/canvas/game/package.json
@@ -15,18 +15,15 @@
    "mock-webpack-plugin": "^2.0.0",
    "path": "^0.12.7",
    "progress": "^2.0.0",
+    "psd": "^0.0.4",
    "ts-loader": "^4.0.0",
    "tslint": "^5.9.1",
    "typescript": "^4.0.2",
+    "uglifyjs-webpack-plugin": "^1.1.2",
    "webpack": "^4.1.0",
    "webpack-cli": "^3.1.1",
    "webpack-dev-server": "^3.1.0",
-    "webpack-merge": "^4.1.2",
+    "webpack-merge": "^4.1.2"
-    "uglifyjs-webpack-plugin": "^2.1.2",
-    "psd": "^3.2.0"
-  },
-  "dependencies": {
-    "tans_lottie": "^1.0.4"
  },
  "scripts": {
    "psd": "node scripts/psdH.js && node scripts/flushRes",

--- a/project/src/canvas/game/resCanvasList.js
+++ b/project/src/canvas/game/resCanvasList.js
@@ -89,54 +89,6 @@ const resCanvasList =   {
    uuid: '4399e878-934c-41e6-bada-a886ebedb7fe',
    url: 'https://yun.duiba.com.cn/spark/assets/493b635d7b64444eee99431feb65e630e86344aa.png'
  },
-  'aa17cfa9-f1db-47eb-9eeb-f5947b7f47a8': {
-    name: '梳毛icon',
-    ext: '.png',
-    uuid: 'aa17cfa9-f1db-47eb-9eeb-f5947b7f47a8',
-    url: 'https://yun.duiba.com.cn/spark/assets/615ae52ccf5e888d50002e1861e143ae53deb5c3.png'
-  },
-  '0b44efa9-1e8a-4c43-a2a5-93852d88918c': {
-    name: '撸猫icon',
-    ext: '.png',
-    uuid: '0b44efa9-1e8a-4c43-a2a5-93852d88918c',
-    url: 'https://yun.duiba.com.cn/spark/assets/430c639158ab024403221ea027e33cf023ffc362.png'
-  },
-  'b7ec0f16-ea48-4e41-8def-7cc660fa93d7': {
-    name: '摸头杀icon',
-    ext: '.png',
-    uuid: 'b7ec0f16-ea48-4e41-8def-7cc660fa93d7',
-    url: 'https://yun.duiba.com.cn/spark/assets/b8b3c5dacb6ff84465a5310081f776d41eef04a4.png'
-  },
-  '922deced-62d2-4995-9dd6-82bc7913f362': {
-    name: '玩耍icon',
-    ext: '.png',
-    uuid: '922deced-62d2-4995-9dd6-82bc7913f362',
-    url: 'https://yun.duiba.com.cn/spark/assets/a3ae99684afa9a1f8d94f4c95ee6f1ed81de9996.png'
-  },
-  '55f703cd-f0d2-4ec1-9430-6193c1cbc1cb': {
-    name: '返回icon',
-    ext: '.png',
-    uuid: '55f703cd-f0d2-4ec1-9430-6193c1cbc1cb',
-    url: 'https://yun.duiba.com.cn/spark/assets/2a914b62b4f3144b1d8aa6c67e4bd03221b2d8ff.png'
-  },
-  'e8b083c7-307a-4446-9bc9-99f75c3573e5': {
-    name: '奖品icon',
-    ext: '.png',
-    uuid: 'e8b083c7-307a-4446-9bc9-99f75c3573e5',
-    url: 'https://yun.duiba.com.cn/spark/assets/43567fa8a14c4dbf30e5c143c07817ef1336f0e7.png'
-  },
-  'e636bd22-361f-442a-8684-ccfe1141485a': {
-    name: '攻略icon',
-    ext: '.png',
-    uuid: 'e636bd22-361f-442a-8684-ccfe1141485a',
-    url: 'https://yun.duiba.com.cn/spark/assets/05d5ad2bfa2fc3a42912749e87f74d48ec2e72dc.png'
-  },
-  'cdb8e186-9872-442e-b71e-bba0a9ce5846': {
-    name: '补充精力icon',
-    ext: '.png',
-    uuid: 'cdb8e186-9872-442e-b71e-bba0a9ce5846',
-    url: 'https://yun.duiba.com.cn/spark/assets/290759639ce4ccb9520fa627232e5e898f30a9f7.png'
-  },
  'af4b699e-5152-4571-8c54-1c06eabf19e9': {
    name: '底8',
    ext: '.png',
@@ -575,12 +527,6 @@ const resCanvasList =   {
    url: 'https://yun.duiba.com.cn/spark/assets/tl.6c3c11ef0983554d3736494a1366a3ad054dfd18.png',
    uuid: '56b0a49b-81c3-42cd-9297-c7dcf86d32fd'
  },
-  '1f8b040d-2fbc-4ff8-92f9-159773364fae': {
-    name: 'tlBtn',
-    ext: '.png',
-    url: 'https://yun.duiba.com.cn/spark/assets/tlBtn.5f8c6fdab68ae41afa33b702a5125fd1d9150a40.png',
-    uuid: '1f8b040d-2fbc-4ff8-92f9-159773364fae'
-  },
  'db53267d-4141-4d3e-afda-9b523c89be3e': {
    name: '选择猫咪背景',
    ext: '.png',
@@ -641,12 +587,6 @@ const resCanvasList =   {
    url: 'https://yun.duiba.com.cn/spark/assets/精力条对话框.da8e059d18cf967026989e3c376b7364210c3d4e.png',
    uuid: '69009eb9-4593-4a43-a9d7-a6356ebd6d04'
  },
-  '72345190-f95b-4152-bccf-393b8a5aa8d0': {
-    name: '召回猫咪icon',
-    ext: '.png',
-    url: 'https://yun.duiba.com.cn/spark/assets/召回猫咪icon.41d0b6bb23a7eccf0facb8918cfb679239b7f82f.png',
-    uuid: '72345190-f95b-4152-bccf-393b8a5aa8d0'
-  },
  '3b12798d-d932-4f5b-a442-6e4877ba5c16': {
    name: 'LetterTexture',
    ext: '.png',
@@ -659,12 +599,6 @@ const resCanvasList =   {
    url: 'https://yun.duiba.com.cn/spark/assets/catTalkDialog.6fa85b0929d7d8e0d42d0d30587cdbdc33059a8f.png',
    uuid: '624e8c63-963f-4b20-9802-b0fb006fbf93'
  },
-  '8b0d746a-524e-4dc5-984a-2da2f7f6f862': {
-    name: 'avatarBg',
-    ext: '.png',
-    url: 'https://yun.duiba.com.cn/spark/assets/avatarBg.ab4622741c93fb3b2a08f0f8f01c8c4b31ae5cb0.png',
-    uuid: '8b0d746a-524e-4dc5-984a-2da2f7f6f862'
-  },
  '60d6bb5e-5af1-459d-8a0f-ac7a3edcb703': {
    name: 'exLoadingBg',
    ext: '.png',
@@ -683,12 +617,6 @@ const resCanvasList =   {
    url: 'https://yun.duiba.com.cn/spark/assets/shapGoBtn.78caf5d5af696b5510dd675e626089a320a5c3f1.png',
    uuid: '3e9351dd-787d-4dca-bbf3-793d129c6332'
  },
-  'dba58651-57a3-4b75-9447-0e4d498dd8cd': {
-    name: 'shapGoBtn1',
-    ext: '.png',
-    url: 'https://yun.duiba.com.cn/spark/assets/shapGoBtn1.d4d2cbdd9ab87642e34600c20ca627c9a377ffb7.png',
-    uuid: 'dba58651-57a3-4b75-9447-0e4d498dd8cd'
-  },
  '5ae12c38-05d8-4105-9101-765e7f32525e': {
    name: 'classRoomGuide1',
@@ -840,6 +768,131 @@ const resCanvasList =   {
    url: 'https://yun.duiba.com.cn/spark/assets/playGroundGuide2Final.32c9c4f1494cd3b06d56b70dd1653af996a88834.png',
    uuid: '7f326499-0adb-40ff-9a99-7de524460652'
  },
+  'b314a190-ea03-4998-bde4-d37adb3acfab': {
+    name: '补充精力icon1',
+    ext: '.png',
+    url: 'https://yun.duiba.com.cn/spark/assets/7f51b1a1ec0686f5f95764654e1bc321f49980f4.png',
+    uuid: 'b314a190-ea03-4998-bde4-d37adb3acfab'
+  },
+  '56e05ead-d8ba-4f66-9118-bab53d764a35': {
+    name: '返回icon1',
+    ext: '.png',
+    url: 'https://yun.duiba.com.cn/spark/assets/5687eb7952e1536b4627641e06996d6046550e2c.png',
+    uuid: '56e05ead-d8ba-4f66-9118-bab53d764a35'
+  },
+  'd57470bd-a80a-412d-92a3-13dfbfc37f6a': {
+    name: '攻略icon1',
+    ext: '.png',
+    url: 'https://yun.duiba.com.cn/spark/assets/3e062fcab98f01c4b655fa9187d7d8039d05f846.png',
+    uuid: 'd57470bd-a80a-412d-92a3-13dfbfc37f6a'
+  },
+  '8baf6a30-0463-4946-9cfd-705caf09ab68': {
+    name: '进入欢乐商城按钮',
+    ext: '.png',
+    url: 'https://yun.duiba.com.cn/spark/assets/6797840f5b16b5acff27b1a1e5dd8f9528b4ba2a.png',
+    uuid: '8baf6a30-0463-4946-9cfd-705caf09ab68'
+  },
+  'fc0e0990-755b-418e-a4a4-cd603b3acf09': {
+    name: '奖品icon1',
+    ext: '.png',
+    url: 'https://yun.duiba.com.cn/spark/assets/ea909638d53b1f348f188c3b80495c15c0061b1f.png',
+    uuid: 'fc0e0990-755b-418e-a4a4-cd603b3acf09'
+  },
+  '96345871-b3f3-4e06-89f5-98e91be4d19c': {
+    name: '梳毛icon1',
+    ext: '.png',
+    url: 'https://yun.duiba.com.cn/spark/assets/de34e7c293286b26e92bcd559e8dcfd015c1319f.png',
+    uuid: '96345871-b3f3-4e06-89f5-98e91be4d19c'
+  },
+  'cbe75eb0-5ab8-48ea-ac2e-fb0cfb3bf5d1': {
+    name: '摸头杀icon1',
+    ext: '.png',
+    url: 'https://yun.duiba.com.cn/spark/assets/4117c70b6fd0fdaf01ee7bdd54b303f13f6d131a.png',
+    uuid: 'cbe75eb0-5ab8-48ea-ac2e-fb0cfb3bf5d1'
+  },
+  '838a3c18-06f1-4894-8780-445caceb3ea0': {
+    name: '头像组底',
+    ext: '.png',
+    url: 'https://yun.duiba.com.cn/spark/assets/636e16a36ea64633ea284973d9311d4d23865227.png',
+    uuid: '838a3c18-06f1-4894-8780-445caceb3ea0'
+  },
+  '9ab0fbc3-678c-4959-9981-d2f1cbcdbc19': {
+    name: '撸猫icon1',
+    ext: '.png',
+    url: 'https://yun.duiba.com.cn/spark/assets/f73ffff202c0df37d7d19e6383804d1008c2cf51.png',
+    uuid: '9ab0fbc3-678c-4959-9981-d2f1cbcdbc19'
+  },
+  'bccd5f19-7aec-428b-82fd-66d7e7a6033e': {
+    name: '玩耍icon1',
+    ext: '.png',
+    url: 'https://yun.duiba.com.cn/spark/assets/acdd90cf2eba86f0b9bb43ce923ed20726c370bc.png',
+    uuid: 'bccd5f19-7aec-428b-82fd-66d7e7a6033e'
+  },
+  '8933876d-d39e-49d8-9df9-985b598620ae': {
+    name: '召回猫咪icon1',
+    ext: '.png',
+    url: 'https://yun.duiba.com.cn/spark/assets/9a3fa0c0f251ad1ab432d659d1fd42feb475f1fd.png',
+    uuid: '8933876d-d39e-49d8-9df9-985b598620ae'
+  },
+  '5fe3d0ec-043f-4337-bcbe-e191fe933e92': {
+    name: '不在操场icon1',
+    ext: '.png',
+    url: 'https://yun.duiba.com.cn/spark/assets/20690c16469f7f466e78d29c6ef6fee423be0842.png',
+    uuid: '5fe3d0ec-043f-4337-bcbe-e191fe933e92'
+  },
+  'c246aaf3-84bc-4f26-ae81-f2311d25be7b': {
+    name: '不在教室icon',
+    ext: '.png',
+    url: 'https://yun.duiba.com.cn/spark/assets/6d79f5d910695c2ccd5cd7e55e1a63c796430c4a.png',
+    uuid: 'c246aaf3-84bc-4f26-ae81-f2311d25be7b'
+  },
+  '9bcdaf47-3bb5-4603-90d4-464705e955db': {
+    name: '毛线球icon1',
+    ext: '.png',
+    url: 'https://yun.duiba.com.cn/spark/assets/6af5b365f4dc7be8939a188d341757575276ab31.png',
+    uuid: '9bcdaf47-3bb5-4603-90d4-464705e955db'
+  },
+  '00c79619-95df-4980-883c-102f1011919d': {
+    name: '台历icon1',
+    ext: '.png',
+    url: 'https://yun.duiba.com.cn/spark/assets/b13d28c54440500392a5c0d17ea31cd97867ed03.png',
+    uuid: '00c79619-95df-4980-883c-102f1011919d'
+  },
+  '0dc71764-0d52-41e2-baa2-53a787db892b': {
+    name: '在操场icon1',
+    ext: '.png',
+    url: 'https://yun.duiba.com.cn/spark/assets/946ffcc6c838a85c07045bb58a16f758c4be2848.png',
+    uuid: '0dc71764-0d52-41e2-baa2-53a787db892b'
+  },
+  'b8959848-40a2-48b6-a0f0-b2311e9e9ec2': {
+    name: '在教室icon',
+    ext: '.png',
+    url: 'https://yun.duiba.com.cn/spark/assets/07ea04ba7f816ae0c62a896f3be431463d82a542.png',
+    uuid: 'b8959848-40a2-48b6-a0f0-b2311e9e9ec2'
+  },
+  '25abb1fa-58a8-4fed-a962-ab7fb7eed528': {
+    name: '外出提示语',
+    ext: '.png',
+    url: 'https://yun.duiba.com.cn/spark/assets/dd5159c7232f9026dcfbe6d6f33ea90b0c8d088d.png',
+    uuid: '25abb1fa-58a8-4fed-a962-ab7fb7eed528'
+  },
+  '985cb328-3ded-4170-b812-08f6cf23fc86': {
+    name: '三文鱼气泡',
+    ext: '.png',
+    url: '//yun.duiba.com.cn/spark/assets/1962fa9189afeaa108cd8bcbcacae7e74e2d4682.png',
+    uuid: '985cb328-3ded-4170-b812-08f6cf23fc86'
+  },
+  'c5bfe80d-1728-40d5-af69-8fe6374a2c45': {
+    name: '三文鱼',
+    ext: '.png',
+    url: '//yun.duiba.com.cn/spark/assets/6ade6253c708a4ca0fe01240ee5844f623b14fa6.png',
+    uuid: 'c5bfe80d-1728-40d5-af69-8fe6374a2c45'
+  },
+  '1f8172eb-4663-4499-9fff-1d736998df7d': {
+    name: '鱼鱼icon',
+    ext: '.png',
+    url: '//yun.duiba.com.cn/spark/assets/ce378b211b805755ba785f6bcc7b043ef827fdc8.png',
+    uuid: '1f8172eb-4663-4499-9fff-1d736998df7d'
+  }
 };
 export default resCanvasList;
--- a/project/src/canvas/game/src/InitLottie.ts
+++ b/project/src/canvas/game/src/InitLottie.ts
@@ -12,7 +12,7 @@ export namespace InitLottie {
        let p: Promise<any> = new Promise((resolve, reject) => {8  
            initLottie((s) => {
                if (s) {
-                    resolve()
+                    resolve(1)
                } else {
                    reject();
                }

--- a/project/src/canvas/game/src/cat/Fish.ts
+++ b/project/src/canvas/game/src/cat/Fish.ts
+import { Module } from "../../module/views/Module";
+import { Ins } from "../Ins";
+export class Fish extends Module{
+    public constructor(){
+        super();
+    }
+    /**欢乐币鱼的图片 */
+    private fishImg:FYGE.Sprite;
+    initUi(){
+        this.fishImg = Ins.initSprite("1f8172eb-4663-4499-9fff-1d736998df7d");
+        this.addChild(this.fishImg);
+        this.fishImg.x = -this.fishImg.width*0.5;
+        this.fishImg.y = -this.fishImg.height*0.5;
+    }
+}
\ No newline at end of file
--- a/project/src/canvas/game/src/cat/Salmon.ts
+++ b/project/src/canvas/game/src/cat/Salmon.ts
+import { Module } from "../../module/views/Module";
+import { Ins } from "../Ins";
+/**三文鱼类，当小猫自然恢复精力时获得的三文鱼 */
+export class Salmon extends Module{
+    public constructor(value){
+        super();
+        this.salmonCnt = value;
+    }
+    /**三文鱼泡泡 */
+    private salmonBubble:FYGE.Sprite;
+    /**三文鱼增加精力数量文本 */
+    private cntLabel:FYGE.TextField;
+    /**三文鱼图片 */
+    private salmonImg:FYGE.Sprite;
+    /**这条三文鱼所拥有的精力值 */
+    private salmonCnt:number = 0;
+    initUi(){
+        var that = this;
+        that.salmonBubble = Ins.initSprite("985cb328-3ded-4170-b812-08f6cf23fc86");
+        that.addChild(that.salmonBubble);
+        that.salmonBubble.x = -that.salmonBubble.width*0.5;
+        that.salmonBubble.y = -that.salmonBubble.height*0.5;
+        that.salmonImg = Ins.initSprite("c5bfe80d-1728-40d5-af69-8fe6374a2c45");
+        that.addChild(that.salmonImg);
+        that.salmonImg.x = -that.salmonImg.width*0.5;
+        that.salmonImg.y = -that.salmonImg.height*0.7;
+        that.cntLabel = Ins.initLabel({size:24,color:"#612b0e"})
+        // that.cntLabel.fillColor = "white"
+        that.addChild(that.cntLabel);
+        that.cntLabel.y = 10;
+        that.setCnt(this.salmonCnt);
+        that.mouseEnable = true;
+        that.addEvent();
+    }
+    /**添加事件 */
+    addEvent(){
+        this.addEventListener(FYGE.MouseEvent.CLICK,this.getEnegry,this);
+    }
+    /**删除事件 */
+    removeEvents(){
+        this.removeEventListener(FYGE.MouseEvent.CLICK,this.getEnegry,this);
+    }
+    /**收取精力 */
+    getEnegry(){
+        var that = this;
+        console.log("收取精力值：",that.salmonCnt);
+        that.mouseEnable = false;
+    }
+    setCnt(value){
+        this.salmonCnt = value;
+        this.updateCntLabel();
+    }
+    plusCnt(){
+        this.salmonCnt++;
+        this.updateCntLabel();
+    }
+    updateCntLabel(){
+        this.cntLabel.text = `+${this.salmonCnt}`
+        this.cntLabel.x = -this.cntLabel.textWidth*0.5;
+    }
+}
\ No newline at end of file
--- a/project/src/canvas/game/src/scenes/MainScene.ts
+++ b/project/src/canvas/game/src/scenes/MainScene.ts
@@ -10,6 +10,7 @@ import { Cat } from "../cat/Cat";
 import { sendTbNet, TbNetName } from "../TaoBaoNet";
 import { letter } from "../lottieSrc/lottieTs/letter";
 import { Guide } from "../guide/Guide";
+import { Salmon } from "../cat/Salmon";
 export class MainScene extends Scene {
    /**场景背景 */
@@ -20,10 +21,24 @@ export class MainScene extends Scene {
    private bgUUID: string[] = [];
    /**主页面UI */
    private mainUi: MainSceneBtnUi;
+    /**台历组，有台历按钮和两个台历的tips */
+    private tlGroup: FYGE.Sprite;
+    /**台历tips1，当猫咪不在教室的时候 */
+    private tlTips1: FYGE.Sprite;
+    /**台历tips2，当猫咪在教室的时候 */
+    private tlTips2: FYGE.Sprite;
    /**台历按钮，进入教室 */
    private tlBtn: FYGE.Sprite;
+    /**毛线球组，有毛线球按钮和两个毛线球的tips */
+    private mxqGroup: FYGE.Sprite;
+    /**毛线球tips1，当猫咪不在操场的时候 */
+    private mxqTips1: FYGE.Sprite;
+    /**毛线球tips2，当猫咪在操场的时候 */
+    private mxqTips2: FYGE.Sprite;
    /**毛线球按钮，进入操场 */
    private mxqBtn: FYGE.Sprite;
+    /**外出提示语 */
+    private outTips: FYGE.Sprite;
    /**猫猫 */
    private cat: Cat;
    /**信封 */
@@ -50,12 +65,19 @@ export class MainScene extends Scene {
    private Guide: Guide;
    /**恢复精力的时间 */
-    private recoverEnergyTime:number; 
+    private recoverEnergyTime: number;
    /**页面是否显示 */
-    private isShow:boolean = false;
+    private isShow: boolean = false;
-    constructor(data?){
+    /**当前场景上的三文鱼数组 */
+    private salmonArr: Salmon[] = [];
+    /**最多8条三文鱼，每条三文鱼所对应的位置 */
+    private salmonPos = [{ x: 250, y: 580 },{x:360,y:552},{x:462,y:608},{x:568,y:574},{x:208,y:710},{x:318,y:678},{x:436,y:708},{x:564,y:695}]
+    /**三文鱼组 */
+    private salmonGroup:FYGE.Sprite;
+    constructor(data?) {
        super(data);
        this.initScene();
    }
@@ -72,7 +94,7 @@ export class MainScene extends Scene {
        console.log(that.y);
        that.mouseChildren = true;
        Ins.curScene = Ins.senceInfo.sence;
-        console.log("当前场景",Ins.curScene);
+        console.log("当前场景", Ins.curScene);
        //0：教室，1：操场，2：寝室
        that.bgUUID = ["c6d699b0-b276-4985-b3ea-47bcef13f2ea", "efaf990e-5392-49ad-94d8-25c04f651ede", "b3c8c187-e5c9-4968-9a00-a118d18ab2fc"];
        //生成默认场景，后面要改成根据接口值判断
@@ -83,36 +105,73 @@ export class MainScene extends Scene {
        that.mainUi = new MainSceneBtnUi({ uiType: Ins.curScene == 4 ? 3 : Ins.curScene, callF: () => { that.initGuide(Ins.curScene > 3 ? 3 : Ins.curScene) } });
        that.addChild(that.mainUi);
+        that.outTips = Ins.initSprite("25abb1fa-58a8-4fed-a962-ab7fb7eed528", (Ins.stageW - 388) * 0.5, 460);
+        that.addChild(that.outTips);
+        that.outTips.visible = false;
-        that.tlBtn = Ins.initSprite("1f8b040d-2fbc-4ff8-92f9-159773364fae", 0, 640);
+        that.salmonGroup = new FYGE.Sprite();
-        that.tlBtn.alpha = 0.1;
+        that.addChild(that.salmonGroup);
-        that.tlBtn.mouseEnable = true;
-        that.addChild(that.tlBtn);
-        that.mxqBtn = Ins.initSprite("1f8b040d-2fbc-4ff8-92f9-159773364fae", 50, 940);
-        that.mxqBtn.width = 80;
-        that.mxqBtn.height = 80;
-        that.mxqBtn.alpha = 0.1;
-        that.mxqBtn.mouseEnable = true;
-        that.addChild(that.mxqBtn);
-        if (Ins.curScene == SCENETYPE.BEADROOM || Ins.curScene == 4) {
-            that.tlBtn.visible = true;
-            that.mxqBtn.visible = true;
-        } else {
-            that.tlBtn.visible = false;
-            that.mxqBtn.visible = false;
-        }
+        that.initTlBtnGroup();
        that.initCat();
        that.initEnergy();
        that.energyUp1();
+        that.initMxqBtnGroup();
+        that.setSceneTips(1);
        console.log("初始化结束")
+        that.initSalmon();
        // that.initGuide(Ins.curScene > 3 ? 3 : Ins.curScene);
        // var a = Ins.initLabel({text:"ergergergergerg",x:300,y:800});
        // this.addChildAt(a,999);
    }
+    /**初始化台历切换按钮组 */
+    initTlBtnGroup() {
+        var that = this;
+        //台历组初始化
+        that.tlGroup = new FYGE.Sprite();
+        that.addChild(that.tlGroup);
+        that.tlGroup.y = 636;
+        //台历按钮初始化
+        that.tlBtn = Ins.initSprite("00c79619-95df-4980-883c-102f1011919d");
+        that.tlBtn.mouseEnable = true;
+        that.tlGroup.addChild(that.tlBtn);
+        //台历tips不在教室初始化
+        that.tlTips1 = Ins.initSprite("c246aaf3-84bc-4f26-ae81-f2311d25be7b", 200, -25);
+        that.tlGroup.addChild(that.tlTips1);
+        //台历tips在教室初始化
+        that.tlTips2 = Ins.initSprite("b8959848-40a2-48b6-a0f0-b2311e9e9ec2", 140, -25);
+        that.tlGroup.addChild(that.tlTips2);
+    }
+    /**初始化毛线球切换按钮组 */
+    initMxqBtnGroup() {
+        var that = this;
+        //毛线球组初始化
+        that.mxqGroup = new FYGE.Sprite();
+        that.addChild(that.mxqGroup);
+        that.mxqGroup.x = 50;
+        that.mxqGroup.y = 940;
+        //毛线球按钮初始化
+        that.mxqBtn = Ins.initSprite("9bcdaf47-3bb5-4603-90d4-464705e955db");
+        that.mxqBtn.mouseEnable = true;
+        that.mxqGroup.addChild(that.mxqBtn);
+        //毛线球tips不在操场初始化
+        that.mxqTips1 = Ins.initSprite("5fe3d0ec-043f-4337-bcbe-e191fe933e92", 35, -50);
+        that.mxqGroup.addChild(that.mxqTips1);
+        //毛线球tips在操场初始化
+        that.mxqTips2 = Ins.initSprite("0dc71764-0d52-41e2-baa2-53a787db892b", -20, -50);
+        that.mxqGroup.addChild(that.mxqTips2);
+        if (Ins.curScene == SCENETYPE.BEADROOM || Ins.curScene == 4) {
+            that.tlGroup.visible = true;
+            that.mxqGroup.visible = true;
+        } else {
+            that.tlGroup.visible = false;
+            that.mxqGroup.visible = false;
+        }
+    }
    /**初始化猫咪 */
    initCat() {
        var that = this;
@@ -133,15 +192,15 @@ export class MainScene extends Scene {
    }
    /**当猫出走的时候，初始化前端的召回倒计时 */
-    initRecallCatTimer(){
+    initRecallCatTimer() {
        var that = this;
-        sendTbNet(TbNetName.recallInfo,{},(s,r)=>{
+        sendTbNet(TbNetName.recallInfo, {}, (s, r) => {
            console.log("猫咪出走拉")
-            if(s){
+            if (s) {
-                if(that.recallTimer) clearTimeout(that.recallTimer)
+                if (that.recallTimer) clearTimeout(that.recallTimer)
-                that.recallTimer = setTimeout(()=>{
+                that.recallTimer = setTimeout(() => {
                    that.recallCat();
-                },r.data.backTime-r.data.serverTime)
+                }, r.data.backTime - r.data.serverTime)
            }
        })
    }
@@ -152,7 +211,7 @@ export class MainScene extends Scene {
        if (!Ins.senceInfo.senceGuide['' + sence]) {
            that.cat.visible = false;
            that.Guide = new Guide({ type: sence, callBack: () => { that.senceGuideEnd(sence); } });
-            that.addChildAt(this.Guide,999);
+            that.addChildAt(this.Guide, 999);
        }
        // setTimeout(()=>{
        console.log("引导", sence)
@@ -166,11 +225,11 @@ export class MainScene extends Scene {
        var that = this;
        that.updateUserInfo();
        Ins.showLoading();
-        sendTbNet(TbNetName.updateSenceGuide, {sence:sence}, (s, r) => {
+        sendTbNet(TbNetName.updateSenceGuide, { sence: sence }, (s, r) => {
            if (s) {
                Ins.hideLoading();
                var userSence = Ins.senceInfo.sence > 4 ? 3 : Ins.senceInfo.sence;
-                Ins.senceInfo.senceGuide[''+sence] = true
+                Ins.senceInfo.senceGuide['' + sence] = true
                if (sence == userSence) {
                    that.cat.visible = true;
                    that.cat.catTalk();
@@ -190,11 +249,11 @@ export class MainScene extends Scene {
        console.log("打开信封弹窗")
        if (this.letter && this.letter.visible) {
            Ins.showLoading();
-            sendTbNet(TbNetName.recallInfo,{},(s,r)=>{
+            sendTbNet(TbNetName.recallInfo, {}, (s, r) => {
-                if(s){
+                if (s) {
                    Ins.hideLoading();
-                    Ins.showModule('messageModal', { catName: Ins.userInfo.catName ,recallInfo:r.data})
+                    Ins.showModule('messageModal', { catName: Ins.userInfo.catName, recallInfo: r.data })
-                }else{
+                } else {
                    Ins.hideLoading();
                    Ins.showToast(r.message);
                }
@@ -212,7 +271,7 @@ export class MainScene extends Scene {
    /**初始化精力组 */
    initEnergy() {
        var that = this;
-        that.energyGroup = Ins.initSprite("fa59e617-f1d9-4065-85e1-6f6ebefb230f", 60, 1119);
+        that.energyGroup = Ins.initSprite("fa59e617-f1d9-4065-85e1-6f6ebefb230f", 60, 1112);
        that.energyGroup.mouseEnable = false;
        that.energyGroup.mouseChildren = false;
        that.addChild(that.energyGroup);
@@ -227,7 +286,7 @@ export class MainScene extends Scene {
        that.energyDialog.addChild(that.energyDialogLabel);
        that.energyDialogLabel.x = (that.energyDialog.width - that.energyDialogLabel.textWidth) * 0.5;
        that.energyDialogLabel.y = (that.energyDialog.height - that.energyDialogLabel.textHeight) * 0.5 - 6;
-        that.energyLabel = Ins.initLabel({ size: 26, y: 85 });
+        that.energyLabel = Ins.initLabel({ size: 26, y: 75 });
        that.energyGroup.addChild(that.energyLabel);
        var mask = new FYGE.Shape();
        mask.beginFill(6, 1);
@@ -253,22 +312,32 @@ export class MainScene extends Scene {
        console.log("设置精力组数据结束")
    }
+    /**根据可以领取的精力值获取三文鱼 */
+    initSalmon() {
+        for(let i=0;i<this.salmonPos.length;i++){
+            let salmon = new Salmon(5);
+            this.salmonGroup.addChild(salmon);
+            salmon.x = this.salmonPos[i].x;
+            salmon.y = this.salmonPos[i].y;
+        }
+    }
    /**按照首次登录时间恢复精力 */
    energyUp1() {
        var that = this;
-        if(that.recoverEnergyHandler) clearInterval(that.recoverEnergyHandler);
+        if (that.recoverEnergyHandler) clearInterval(that.recoverEnergyHandler);
-        console.log("上一次恢复精力的时间",new Date(Ins.userInfo.lastEnergyTime).getMinutes())
+        console.log("上一次恢复精力的时间", new Date(Ins.userInfo.lastEnergyTime).getMinutes())
-        let time = new Date().getTime()-Ins.userInfo.lastEnergyTime;
+        let time = new Date().getTime() - Ins.userInfo.lastEnergyTime;
-        console.log("相差的时间",Math.floor(time % 3600 / 60))
+        console.log("相差的时间", Math.floor(time % 3600 / 60))
-        if(time<=Ins.recoverEnergy){
+        if (time <= Ins.recoverEnergy) {
            that.recoverEnergyTime = Ins.recoverEnergy - time;
-        }else{
+        } else {
            that.recoverEnergyTime = Ins.recoverEnergy;
        }
        that.recoverEnergyHandler = setInterval(() => {
            sendTbNet(TbNetName.recoverEnergy, {}, (s, r) => {
                if (s) {
-                    console.log("恢复精力时间：",new Date().getMinutes())
+                    console.log("恢复精力时间：", new Date().getMinutes())
                    clearInterval(that.recoverEnergyHandler);
                    that.energyUp2();
                    that.getUserEnergy();
@@ -281,14 +350,14 @@ export class MainScene extends Scene {
    }
    /**按照固定时间恢复精力 */
-    energyUp2(){
+    energyUp2() {
        var that = this;
-        if(that.recoverEnergyHandler) clearInterval(that.recoverEnergyHandler);
+        if (that.recoverEnergyHandler) clearInterval(that.recoverEnergyHandler);
        that.recoverEnergyTime = Ins.recoverEnergy;
        that.recoverEnergyHandler = setInterval(() => {
            sendTbNet(TbNetName.recoverEnergy, {}, (s, r) => {
                if (s) {
-                    console.log("恢复精力时间2：",new Date().getMinutes())
+                    console.log("恢复精力时间2：", new Date().getMinutes())
                    that.getUserEnergy();
                } else {
                    Ins.showToast(r.message);
@@ -298,7 +367,7 @@ export class MainScene extends Scene {
    }
    /**显示页面时重新计算时间恢复精力 */
-    showPageEnergyUp(){
+    showPageEnergyUp() {
    }
@@ -308,7 +377,7 @@ export class MainScene extends Scene {
        sendTbNet(TbNetName.getUserEnergy, {}, (s, r) => {
            if (s) {
                that.recoverEnergyTime = Ins.recoverEnergy;
-                console.log("设置恢复时间",that.recoverEnergyTime)
+                console.log("设置恢复时间", that.recoverEnergyTime)
                if (r.data != Ins.userInfo.energy) {
                    Ins.userInfo.energy = r.data;
                    // that.recoverEnergyTime = Ins.recoverEnergy;
@@ -317,9 +386,9 @@ export class MainScene extends Scene {
                    return;
                } else {
                    if (r.data != Ins.userInfo.energyMax) {
-                        setTimeout(()=>{
+                        setTimeout(() => {
                            that.getUserEnergy();
-                        },500)   
+                        }, 500)
                    }
                    else {
                        return;
@@ -331,6 +400,51 @@ export class MainScene extends Scene {
        })
    }
+    /**根据猫咪所在场景设置寝室的台历与毛线球的tips */
+    setSceneTips(type = 0) {
+        var that = this;
+        switch (Ins.senceInfo.sence) {
+            case SCENETYPE.BEADROOM:
+                if (type == 0)
+                    that.outTips.visible = false;
+                that.tlTips1.visible = true;
+                that.tlTips2.visible = false;
+                that.mxqTips1.visible = true;
+                that.mxqTips2.visible = false;
+                break;
+            case SCENETYPE.CLASSROOM:
+                if (type == 0 && Ins.curScene == SCENETYPE.BEADROOM) {
+                    that.outTips.visible = true;
+                } else {
+                    that.outTips.visible = false;
+                }
+                that.tlTips1.visible = false;
+                that.tlTips2.visible = true;
+                that.mxqTips1.visible = true;
+                that.mxqTips2.visible = false;
+                break;
+            case SCENETYPE.PLAYGROUND:
+                if (type == 0 && Ins.curScene == SCENETYPE.BEADROOM) {
+                    that.outTips.visible = true;
+                } else {
+                    that.outTips.visible = false;
+                }
+                that.tlTips1.visible = true;
+                that.tlTips2.visible = false;
+                that.mxqTips1.visible = false;
+                that.mxqTips2.visible = true;
+                break;
+            default:
+                that.outTips.visible = false;
+                that.tlTips1.visible = true;
+                that.tlTips2.visible = false;
+                that.mxqTips1.visible = true;
+                that.mxqTips2.visible = false;
+                break;
+        }
+    }
    /**切换场景 */
    changeMainScene(type: SCENETYPE) {
        console.log("切换到" + type)
@@ -345,32 +459,35 @@ export class MainScene extends Scene {
        } else {
            if ((type) == Ins.senceInfo.sence) {
                that.cat.visible = true;
+                that.salmonGroup.visible = true;
                that.cat.stopCatAct();
            } else {
                that.cat.visible = false;
+                that.salmonGroup.visible = false;
                that.cat.stopCatAct();
            }
        }
        switch (type) {
            case SCENETYPE.BEADROOM:        //切换到寝室
-                that.mxqBtn.visible = that.tlBtn.visible = true;
+                that.mxqGroup.visible = that.tlGroup.visible = true;
                if (that.letter && Ins.catIsOut) {
                    that.letter.visible = true;
                }
                break;
            case SCENETYPE.CLASSROOM:       //切换到教室
-                that.mxqBtn.visible = that.tlBtn.visible = false;
+                that.mxqGroup.visible = that.tlGroup.visible = false;
                if (that.letter) {
                    that.letter.visible = false;
                }
                break;
            case SCENETYPE.PLAYGROUND:      //切换到操场
-                that.mxqBtn.visible = that.tlBtn.visible = false;
+                that.mxqGroup.visible = that.tlGroup.visible = false;
                if (that.letter) {
                    that.letter.visible = false;
                }
                break;
        }
+        that.setSceneTips();
        if (!Ins.senceInfo.senceGuide['' + Ins.curScene]) {
            that.mainUi.changeBtnByUiType(type, true);
        } else {
@@ -391,8 +508,8 @@ export class MainScene extends Scene {
        sendTbNet(TbNetName.getUserInfo, {}, (s, r) => {
            if (s) {
                Ins.userInfo = r.data;
-                if(that.isShow){
+                if (that.isShow) {
-                    if(Ins.catIsOut){
+                    if (Ins.catIsOut) {
                        that.initRecallCatTimer();
                    }
                    that.isShow = false;
@@ -421,10 +538,10 @@ export class MainScene extends Scene {
                            Ins.senceInfo = r.data;
                            if (r.data.sence < 4) {
                                Ins.catIsOut = false;
-                                if(that.recallTimer){
+                                if (that.recallTimer) {
                                    clearTimeout(that.recallTimer)
                                }
-                                console.log("删除召回倒计时",that.recallTimer)
+                                console.log("删除召回倒计时", that.recallTimer)
                                that.letter.visible = false;
                                if (r.data.sence == 3) {
                                    that.cat.visible = true;
@@ -444,15 +561,17 @@ export class MainScene extends Scene {
    }
    /**页面显示 */
-    onShow(){
+    onShow() {
        console.log("canvas页面显示，isShow设置为true")
        this.isShow = true;
    }
    /**页面隐藏 */
-    onHide(){
+    onHide() {
-        console.log("canvas页面显示, isShow设置为false")
+        console.log("canvas页面隐藏, isShow设置为false")
        this.isShow = false;
+        if (this.recoverEnergyHandler)
+            clearInterval(this.recoverEnergyHandler);
    }
    initEvents() {
@@ -464,8 +583,8 @@ export class MainScene extends Scene {
        FYGE.GDispatcher.addEventListener(MSG.CHANGE_SCENE, () => { that.changeMainScene(SCENETYPE.BEADROOM) }, that);
        GDispatcher.addEventListener(MSG.UPDATE_USERINFO, that.updateUserInfo, that);
        GDispatcher.addEventListener(MSG.RECALL_CAT, that.recallCat, that);
-        GDispatcher.addEventListener("onShow",that.onShow,that);
+        GDispatcher.addEventListener("onShow", that.onShow, that);
-        GDispatcher.addEventListener("onHide",that.onHide,that);
+        GDispatcher.addEventListener("onHide", that.onHide, that);
    }
    removeEvents() {
@@ -478,7 +597,7 @@ export class MainScene extends Scene {
        FYGE.GDispatcher.removeEventListener(MSG.CHANGE_SCENE, () => { that.changeMainScene(SCENETYPE.BEADROOM) }, that);
        GDispatcher.removeEventListener(MSG.UPDATE_USERINFO, that.updateUserInfo, that);
        GDispatcher.removeEventListener(MSG.RECALL_CAT, that.recallCat, that);
-        GDispatcher.removeEventListener("onShow",that.onShow,that);
+        GDispatcher.removeEventListener("onShow", that.onShow, that);
-        GDispatcher.removeEventListener("onHide",that.onHide,that);
+        GDispatcher.removeEventListener("onHide", that.onHide, that);
    }
 }
\ No newline at end of file
--- a/project/src/canvas/game/src/ui/MainSceneBtnUi.ts
+++ b/project/src/canvas/game/src/ui/MainSceneBtnUi.ts
@@ -87,21 +87,24 @@ export class MainSceneBtnUi extends Module {
        that.bottomBtnGroup.mouseEnable = that.bottomBtnGroup.mouseChildren = true;
        that.addChild(that.bottomBtnGroup);
-        that.strategyBtn = Ins.initButton("e636bd22-361f-442a-8684-ccfe1141485a", 579, 112);
+        that.strategyBtn = Ins.initButton("d57470bd-a80a-412d-92a3-13dfbfc37f6a", 579, 112);
        that.topBtnGroup.addChild(that.strategyBtn);
-        that.prizeBtn = Ins.initButton("e8b083c7-307a-4446-9bc9-99f75c3573e5", 579, 237);
+        that.prizeBtn = Ins.initButton("fc0e0990-755b-418e-a4a4-cd603b3acf09", 579, 237);
        that.topBtnGroup.addChild(that.prizeBtn);
-        that.energyBtn = Ins.initButton("cdb8e186-9872-442e-b71e-bba0a9ce5846", 542, -7);
+        that.energyBtn = Ins.initButton("b314a190-ea03-4998-bde4-d37adb3acfab", 542, -7);
        that.bottomBtnGroup.addChild(that.energyBtn);
        that.initActBtn();
        that.initCatInfoGroup();
        that.initFishPointGroup();
-        that.shapGoBtn = Ins.initButton("dba58651-57a3-4b75-9447-0e4d498dd8cd")
+        that.shapGoBtn = Ins.initSprite("8baf6a30-0463-4946-9cfd-705caf09ab68")
        that.shapGoBtn.position.set((Ins.stageW - that.shapGoBtn.width) >> 1, 126);
+        that.shapGoBtn.anchorX = that.shapGoBtn.width*0.5;
+        that.shapGoBtn.anchorY = that.shapGoBtn.height*0.5;
        that.bottomBtnGroup.addChild(that.shapGoBtn);
+        FYGE.Tween.get(that.shapGoBtn,{loop:true}).to({scaleX:0.9,scaleY:0.9},300).to({scaleX:1,scaleY:1},300)
        that.updateUserInfo();
        that.start();
        that.callF && that.callF();
@@ -110,28 +113,30 @@ export class MainSceneBtnUi extends Module {
    /**初始化猫猫信息 */
    initCatInfoGroup() {
        var that = this;
-        that.catInfoGroup = Ins.initSprite("8b0d746a-524e-4dc5-984a-2da2f7f6f862", 69),
+        that.catInfoGroup = Ins.initSprite("838a3c18-06f1-4894-8780-445caceb3ea0", 69),
            that.topBtnGroup.addChild(that.catInfoGroup);
        that.catAvatar = new FYGE.Sprite();
        that.catInfoGroup.addChild(that.catAvatar);
+        that.catAvatar.x = 16;
+        that.catAvatar.y = 16;
        var mask = new FYGE.Shape();
-        mask.beginFill(6, 0.2);
+        mask.beginFill(666, 0.4);
-        mask.drawCircle(0, 0, 24)
+        mask.drawCircle(0, 0, 28)
        mask.endFill();
-        mask.position.set(33, 33)
+        mask.position.set(44, 44)
        that.catInfoGroup.addChild(mask);
        that.catAvatar.mask = mask;
-        that.catNameLabel = Ins.initLabel({ color: "black", size: 24, text: "喵喵喵", x: 66, y: (167 - 145) })
+        that.catNameLabel = Ins.initLabel({ color: "black", size: 24, text: "喵喵喵", x: 86, y: (167 - 145) })
        that.catInfoGroup.addChild(that.catNameLabel);
-        that.catLevelLabel = Ins.initLabel({ color: "black", size: 24, text: "Lv.1", x: (212 - 19), y: (167 - 145) })
+        that.catLevelLabel = Ins.initLabel({ color: "black", size: 24, text: "Lv.1", x: 230, y: (167 - 145) })
        that.catInfoGroup.addChild(that.catLevelLabel);
-        that.catExperienceBg = Ins.initSprite("c647044e-5cc9-4701-8b98-53451ae49b40", 66, 52);
+        that.catExperienceBg = Ins.initSprite("c647044e-5cc9-4701-8b98-53451ae49b40", 86, 52);
        // that.catExperienceBg.width = 89;
        that.catInfoGroup.addChild(that.catExperienceBg);
        that.catExperience = Ins.initSprite("8d5533a1-1d88-489f-bf6b-70b27c3e694b");
@@ -148,8 +153,8 @@ export class MainSceneBtnUi extends Module {
        that.catExperienceBg.addChild(mask);
        that.catExperience.mask = mask;
-        that.experience = Ins.initLabel({size:16});
+        that.experience = Ins.initLabel({size:20});
-        that.experience.position.set(144,55)
+        that.experience.position.set(174,53)
        that.experience.textWidth = 110;
        that.experience.bold = true;
        that.experience.textAlign = FYGE.TEXT_ALIGN.CENTER
@@ -164,24 +169,26 @@ export class MainSceneBtnUi extends Module {
        that.fishPointGroup = Ins.initSprite("f0810375-c8f1-4939-9b11-1cbde6840e2a", 465);
        that.topBtnGroup.addChild(that.fishPointGroup);
-        that.fishPointLabel = Ins.initLabel({ color: "black", size: 24, text: "111111", x: 99, y: 24 })
+        that.fishPointLabel = Ins.initLabel({ color: "black", size: 24, text: "111111", x: 56, y: 24 })
        that.fishPointGroup.addChild(that.fishPointLabel);
+        that.fishPointLabel.textWidth = 166;
+        that.fishPointLabel.textAlign = FYGE.TEXT_ALIGN.CENTER;
    }
    /**初始化互动按钮 */
    initActBtn() {
        var that = this;
-        that.combingBtn = Ins.initButton("aa17cfa9-f1db-47eb-9eeb-f5947b7f47a8", 69);
+        that.combingBtn = Ins.initButton("96345871-b3f3-4e06-89f5-98e91be4d19c", 69);
        that.bottomBtnGroup.addChild(that.combingBtn);
-        that.catBtn = Ins.initButton("0b44efa9-1e8a-4c43-a2a5-93852d88918c", 214);
+        that.catBtn = Ins.initButton("9ab0fbc3-678c-4959-9981-d2f1cbcdbc19", 214);
        that.bottomBtnGroup.addChild(that.catBtn);
-        that.returnBtn = Ins.initButton("55f703cd-f0d2-4ec1-9430-6193c1cbc1cb", 69);
+        that.returnBtn = Ins.initButton("56e05ead-d8ba-4f66-9118-bab53d764a35", 69);
        that.bottomBtnGroup.addChild(that.returnBtn);
-        that.touchHeadBtn = Ins.initButton("b7ec0f16-ea48-4e41-8def-7cc660fa93d7", 214);
+        that.touchHeadBtn = Ins.initButton("cbe75eb0-5ab8-48ea-ac2e-fb0cfb3bf5d1", 214);
        that.bottomBtnGroup.addChild(that.touchHeadBtn);
-        that.playBtn = Ins.initButton("922deced-62d2-4995-9dd6-82bc7913f362", 214);
+        that.playBtn = Ins.initButton("bccd5f19-7aec-428b-82fd-66d7e7a6033e", 214);
        that.bottomBtnGroup.addChild(that.playBtn);
-        that.catRecall = Ins.initButton("72345190-f95b-4152-bccf-393b8a5aa8d0", 69)
+        that.catRecall = Ins.initButton("8933876d-d39e-49d8-9df9-985b598620ae", 69)
        that.bottomBtnGroup.addChild(that.catRecall);
        that.hideAllActBtn();
        that.changeBtnByUiType(that.uiType)
@@ -192,9 +199,9 @@ export class MainSceneBtnUi extends Module {
        var that = this;
        const { catName, happyCoin, level, avatar, experience, experienceMax } = Ins.userInfo;
        that.catAvatar.texture = FYGE.Texture.fromUrl(avatar);
-        that.catAvatar.width = 52;
+        that.catAvatar.width = 56;
-        that.catAvatar.height = 52;
+        that.catAvatar.height = 56;
-        that.catAvatar.x = that.catAvatar.y = 6;
+        that.catAvatar.x = that.catAvatar.y = 16;
        that.catNameLabel.text = catName;
        that.catLevelLabel.text = "Lv." + level;
        that.fishPointLabel.text = "" + happyCoin;

--- a/taobao_mini/client/components/prizeModal/prizeModal.acss
+++ b/taobao_mini/client/components/prizeModal/prizeModal.acss
 .my-prize-page {
-  width: 100vw;
+  width: 750rpx;
-  height: 100vh;
+  height: 1624rpx;
  opacity: 1;
  position: absolute;
  top: 0;
  left: 0;
+  /* margin-left: -375rpx;
+  margin-top: -812rpx; */
  overflow: hidden;
  /* background: url('') no-repeat center top/cover; */
 }
@@ -25,6 +27,7 @@
 }
 .my-prize-page .my-prize-list {
+  margin-top: 300rpx;
  width: 100%;
  height: auto;
 }
@@ -32,7 +35,7 @@
 .my-prize-page .my-prize-empty {
  text-align: center;
  color: #fff;
-  margin-top: 30rpx;
+  margin-top: 330rpx;
 }
 .my-prize-page .my-prize-item {

--- a/taobao_mini/client/components/prizeModal/prizeModal.axml
+++ b/taobao_mini/client/components/prizeModal/prizeModal.axml
 <view class="my-prize-page" style="{{{'background':`url(${task.image.bg}) no-repeat center top/cover`}}}">
  <view class="my-prize-wrap">
-    <view class="my-prize-label"></view>
+    <!-- <view class="my-prize-label"></view> -->
    <view class="my-prize-list" a:if="{{myPrizeList && myPrizeList.length > 0}}">
      <view class="my-prize-item" a:for="{{myPrizeList}}">
        <image class="my-prize-avatar" src="{{item.image}}"/>

--- a/taobao_mini/client/components/shopModal/shopModal.axml
+++ b/taobao_mini/client/components/shopModal/shopModal.axml
 <view class="shop">
-  <view class="shop-page" style="{{{'background':`url(${resList['da6bc001-768a-4b1c-95af-a9a8853ef6f9'].url}) no-repeat center top/cover`}}}">
+  <view class="shop-page" style="{{{'background':`url(${resList['e2616129-e292-4333-b107-98c102328165'].url}) no-repeat center top/cover`}}}">
    <label class="shop_gold">{{happyCoin}}</label>
    <image a:if={{false}} class="shop_backbtn" src={{resList['bdab9777-8a4d-4659-ba23-66aaddb7fa5b'].url}} />
    <view class="shop-wrap">

--- a/taobao_mini/client/pages/myprize/myprize.js
+++ b/taobao_mini/client/pages/myprize/myprize.js
@@ -28,7 +28,7 @@ Page({
    endTime: null, //到期时间
    task: {
      image: {
-        bg: '//yun.duiba.com.cn/aurora/assets/8fa7cea57cc7071bcc1cbada32f5bfaeb2203981.jpg', //背景图
+        bg: '//yun.duiba.com.cn/spark/assets/f9cd677a5db27e38172b7c63ba6677f6f60d516d.png', //背景图
        copyIcon: '//yun.duiba.com.cn/aurora/assets/721e5319d26a4edbb0282558fb87d9bda1de4887.png', //复制
        addressBth: '//yun.duiba.com.cn/aurora/assets/7ff6342492c2ce1a94ccfce39c88983b296b35fb.png', //填写地址(实物奖品)
        getBth: '//yun.duiba.com.cn/aurora/assets/0725f0f5569ad12d37853ad5c40d163fbe247abf.png', //立即领取(除实物奖品外)

--- a/taobao_mini/client/pages/pagecanvas/pagecanvas.js
+++ b/taobao_mini/client/pages/pagecanvas/pagecanvas.js
@@ -79,6 +79,7 @@ Page({
        if (query) app.inviteId = query.openId;
        console.log('onload=>query', query);
        // my.showToast({
        //     content: "query " + JSON.stringify(query),
        //     duration: 5000
@@ -100,7 +101,12 @@ Page({
        console.log('on ready')
        //授权和登录先搞
-        // await this.getAuth();
+        await this.getAuth();
+        setTimeout(()=>{
+            my.navigateTo({
+                        url: `/pages/myprize/myprize`
+                    });
+        },1000)
        // this.initCanvas();
        my.__onMessage__ = (e) => {
            this.onMessage(e)

--- a/taobao_mini/client/pages/pageshop/pageshop.acss
+++ b/taobao_mini/client/pages/pageshop/pageshop.acss
 .shop-page {
-  width: 100vw;
+  width: 750rpx;
-  height: 100vh;
+  height: 1624rpx;
  opacity: 1;
  position: absolute;
  top: 0;
  left: 0;
+  /* margin-top: -812rpx;
+  margin-left: -375rpx; */
  overflow: hidden;
  /* background: url('') no-repeat center top/cover; */
 }
@@ -13,7 +15,7 @@
  width: 100%;
  position: absolute;
  bottom: 0;
-  top: 254rpx;
+  top: 464rpx;
  padding-left: 54rpx;
  right:0;
  overflow-x: auto;
@@ -133,8 +135,8 @@
 .shop .shop_gold {
  opacity: 1;
-  left: 348rpx;
+  left: 370rpx;
-  top: 140rpx;
+  top: 326rpx;
  position: absolute;
  transform-origin: 0rpx 0rpx 0rpx;
  font-size: 23.47394rpx;

--- a/taobao_mini/client/resconfig/resList.js
+++ b/taobao_mini/client/resconfig/resList.js
@@ -580,6 +580,18 @@ const resList = {
    ext: '.png',
    url: '//yun.duiba.com.cn/spark/assets/lodingFake.1897ec11d95b52aecae8a6771a1d8b838583ab7b.png',
    uuid: '2ef3e6b8-e635-4007-ba62-36df45e096c1'
+  },
+  'e2616129-e292-4333-b107-98c102328165': {
+    name: '商城背景2',
+    ext: '.png',
+    url: '//yun.duiba.com.cn/spark/assets/46152f0833de1e28ee15cb919a9b3135c567d9bc.png',
+    uuid: 'e2616129-e292-4333-b107-98c102328165'
+  },
+  '83ce073c-c2df-4146-bc4f-529b57f7ae2f': {
+    name: '我的奖品背景1',
+    ext: '.png',
+    url: '//yun.duiba.com.cn/spark/assets/f9cd677a5db27e38172b7c63ba6677f6f60d516d.png',
+    uuid: '83ce073c-c2df-4146-bc4f-529b57f7ae2f'
  }
 };
 export default resList;
--- a/taobao_mini/mocks/yarn.lock
+++ b/taobao_mini/mocks/yarn.lock
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+dom-walk@^0.1.0:
+  version "0.1.2"
+  resolved "http://npm.dui88.com:80/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84"
+  integrity sha1-DFSL7wSPTR8qlySQAiNgYNqj/YQ=
+game-cli@^1.1.3:
+  version "1.1.3"
+  resolved "http://npm.dui88.com:80/game-cli/-/game-cli-1.1.3.tgz#8c2d11b24c53a75364aa8bd47b19e010f1d5dab2"
+  integrity sha1-jC0RskxTp1NkqovUexngEPHV2rI=
+  dependencies:
+    readline-sync "^1.4.3"
+global@^4.4.0:
+  version "4.4.0"
+  resolved "http://npm.dui88.com:80/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406"
+  integrity sha1-PnsQUXkAajI+1xqvyj6cV6XMZAY=
+  dependencies:
+    min-document "^2.19.0"
+    process "^0.11.10"
+min-document@^2.19.0:
+  version "2.19.0"
+  resolved "http://npm.dui88.com:80/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
+  integrity sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=
+  dependencies:
+    dom-walk "^0.1.0"
+process@^0.11.10:
+  version "0.11.10"
+  resolved "http://npm.dui88.com:80/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
+readline-sync@^1.4.3:
+  version "1.4.10"
+  resolved "http://npm.dui88.com:80/readline-sync/-/readline-sync-1.4.10.tgz"
+  integrity sha1-Qd9/u0tjEtZzARWUFFcFv1bYhzs=