1

project/src/canvas/game/output.js

@@ -2195,6 +2195,15 @@ var Main = (function () {
                         _a.sent();
                         console.log("initLottieList完成");
                         FYGE.GDispatcher.dispatchEvent("loadEnd");
+<<<<<<< HEAD
+=======
+                        TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getAppData, {}, function (s, res) {
+                            console.log('getAppData success,res', s, res);
+                        });
+                        TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getActivityBaseInfoById, {}, function (s, res) {
+                            console.log('getActivityBaseInfoById success,res', s, res);
+                        });
+>>>>>>> d7dfacb49210b7d977b14056cde24ca6994aee22
                         return [2];
                 }
             });
@@ -46887,7 +46896,7 @@ var MainScene = (function (_super) {
     MainScene.prototype.openLetter = function () {
         console.log("打开信封弹窗");
         if (this.letter && this.letter.visible) {
-            TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.showModal, { name: 'ruleModal' }, function (s, res) {
+            TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.showModal, { name: 'messageModal', data: { catName: Ins_1.Ins.userInfo.catName } }, function (s, res) {
                 console.log('showModal ruleModal, success,res', s, res);
             });
         }

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

@@ -2197,6 +2197,15 @@ var Main = (function () {
                         _a.sent();
                         console.log("initLottieList完成");
                         FYGE.GDispatcher.dispatchEvent("loadEnd");
+<<<<<<< HEAD
+=======
+                        TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getAppData, {}, function (s, res) {
+                            console.log('getAppData success,res', s, res);
+                        });
+                        TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getActivityBaseInfoById, {}, function (s, res) {
+                            console.log('getActivityBaseInfoById success,res', s, res);
+                        });
+>>>>>>> d7dfacb49210b7d977b14056cde24ca6994aee22
                         return [2];
                 }
             });
@@ -46889,7 +46898,7 @@ var MainScene = (function (_super) {
     MainScene.prototype.openLetter = function () {
         console.log("打开信封弹窗");
         if (this.letter && this.letter.visible) {
-            TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.showModal, { name: 'ruleModal' }, function (s, res) {
+            TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.showModal, { name: 'messageModal', data: { catName: Ins_1.Ins.userInfo.catName } }, function (s, res) {
                 console.log('showModal ruleModal, success,res', s, res);
             });
         }

project/src/canvas/game/src/ResJson.ts

@@ -10,5 +10,5 @@ export const ResJson = {
 			"name": "startScene"
 		}
 	],
-	"path": "https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/1600743469/resource/"
+	"path": "https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/1600763276/resource/"
 }
\ No newline at end of file

project/src/canvas/game/src/cat/Cat.ts

@@ -52,7 +52,7 @@ export class Cat extends Module {
         console.log(this.catLottieArr);
         this.initCat();
         this.initDialog();
-        this.setCatAnimShow(1);
+        this.setCatAnimShow(0);
         this.initEvents();
     }
 

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

@@ -38,6 +38,9 @@ export class MainScene extends Scene {
     private energyImgW: number;  //精力条宽度
     private maxEnergy: number = 1500;    //最大精力值
 
+    /**猫咪等级 */
+    private level: number = 0;
+
     initUi() {
         var that = this;
         that.initSceneEle();
@@ -92,8 +95,8 @@ export class MainScene extends Scene {
     /**打开信封 */
     openLetter() {
         console.log("打开信封弹窗")
-        if(this.letter&&this.letter.visible){
-            sendTbNet(TbNetName.showModal, { name: 'ruleModal' }, (s, res) => {
+        if (this.letter && this.letter.visible) {
+            sendTbNet(TbNetName.showModal, { name: 'messageModal', data: { catName: Ins.userInfo.catName } }, (s, res) => {
                 console.log('showModal ruleModal, success,res', s, res)
             })
         }
@@ -210,7 +213,7 @@ export class MainScene extends Scene {
         console.log("主场景添加事件")
         that.tlBtn.addEventListener(FYGE.MouseEvent.CLICK, () => { that.changeMainScene(SCENETYPE.CLASSROOM) }, that);
         that.mxqBtn.addEventListener(FYGE.MouseEvent.CLICK, () => { that.changeMainScene(SCENETYPE.PLAYGROUND) }, that);
-        that.letter&&that.letter.addEventListener(FYGE.MouseEvent.CLICK,that.openLetter,that);
+        that.letter && that.letter.addEventListener(FYGE.MouseEvent.CLICK, that.openLetter, that);
         FYGE.GDispatcher.addEventListener(MSG.CHANGE_SCENE, () => { that.changeMainScene(SCENETYPE.BEADROOM) }, that);
         FYGE.GDispatcher.addEventListener(MSG.UPDATE_USERINFO, that.updateUserInfo, that);
     }
@@ -220,7 +223,7 @@ export class MainScene extends Scene {
         console.log("主场景移除事件")
         that.tlBtn.removeEventListener(FYGE.MouseEvent.CLICK, () => { that.changeMainScene(SCENETYPE.CLASSROOM) }, that);
         that.mxqBtn.removeEventListener(FYGE.MouseEvent.CLICK, () => { that.changeMainScene(SCENETYPE.PLAYGROUND) }, that);
-        that.letter&&that.letter.removeEventListener(FYGE.MouseEvent.CLICK,that.openLetter,that);
+        that.letter && that.letter.removeEventListener(FYGE.MouseEvent.CLICK, that.openLetter, that);
         FYGE.GDispatcher.removeEventListener(MSG.CHANGE_SCENE, () => { that.changeMainScene(SCENETYPE.BEADROOM) }, that);
         FYGE.GDispatcher.removeEventListener(MSG.UPDATE_USERINFO, that.updateUserInfo, that);
     }