Merge branch 'master' of http://gitlab2.dui88.com/MrKwon/babycare_xiaoxiao

scripts/aa.js

@@ -2,6 +2,7 @@
 var fs = require("fs");
 var iconv = require('iconv-lite');
 
+return
 //读取json文件
 var data = iconv.decode(fs.readFileSync("./resource/skin.json"), "utf-8");//GBK
 //反序列化

scripts/copyJs.js

@@ -6,7 +6,7 @@ var fs = require("fs");
 //     fs.readFileSync("./output.js")
 // )
 // var endPath = 'D:/duibaGame/测试项目0527/taobaominiTest/client/pages/index1/';
-var endPath = 'D:/duibaGame/淘宝项目/threeSquirrels_tbmini/squirrel_adopt/squirrel_c_client/client/pages/index/';
+var endPath = 'D:/duibaGame/淘宝项目/babycareXiaoxiaoleTBminiTry/client/pages/index/';
 var version = Math.round(new Date().getTime() / 1000);
 // fs.writeFileSync(endPath + "output." + version + ".js", fs.readFileSync("./released/output.js"));
 fs.writeFileSync(endPath + "output.js", fs.readFileSync("./released/output.js"));

src/panels/FreePowerPanel.ts

@@ -4,17 +4,10 @@ export class FreePowerPanel extends Panel {
 	get skinName() { return "FreePowerPanel" }
 	acceptBtn:FYGE.Button;
 	closeBtn:FYGE.Button;
-	
-	initUi() {
- 
-	}
-	start(data) {
-		super.start();
-	}
-	initEvents() {
-		super.initEvents(); 
-	}
-	removeEvents() {
-		super.removeEvents(); 
+
+	get closeBtns(){
+		return [this.closeBtn,this.acceptBtn]
 	}
+	
+	
 }

src/scene/PlayScene.ts

@@ -275,7 +275,7 @@ export class PlayScene extends Scene {
         // data = { chapter: 1 }
         //第几关
         this.chapter = (data && data.chapter) ? data.chapter : 1;
-        // this.chapter = 24;
+        this.chapter = 6;
         //关卡数据
         this.chapterData = getChapterData(this.chapter);
         // this.chapterData.stepCount = 4
@@ -310,9 +310,14 @@ export class PlayScene extends Scene {
                     this.upsetElement();
                 } else {
                     this.enableMouseEvt(true);
-                    //首次送道具，的动画先出，然后再出引导
-                    //引导
-                    this.initGuide();
+                    //首次送道具，的动画先出，然后再出引导  TODO
+                    if (this.chapter == 1 && Tools.gameData.isFristLogin) {
+
+                    } else {
+                        //游戏引导
+                        this.initGuide();
+                    }
+
                 }
             }
         }
@@ -322,10 +327,11 @@ export class PlayScene extends Scene {
         AiControl.ins.init(this.lattices);
 
         //测试波纹
-        // let fun = ()=>{
-        //     RectsWaveAni(this.lattices,this.map,fun);
-        // }
-        // fun()
+        let fun = ()=>{
+            RectsWaveAni(this.lattices,this.map,fun);
+            console.log(1)
+        }
+        fun()
     }
 
     /**

src/something/anisCall/RectsWaveAni.ts

@@ -94,7 +94,14 @@ export function RectsWaveAni(
 
         num++;
     }
-
+    //删除外层空loop
+    for (let m = loops.length - 1; m >= 0; m--) {
+        if (!loops[m].length) {
+            loops.pop();
+        } else {
+            break
+        }
+    }
     //动画
     let loopsLen = loops.length
     for (let m = 0; m < loops.length; m++) {

src/something/uis/FirstPropGift.ts

+import { RES } from "../../../module/RES";
+import { MsgBoard } from "./GameGuide";
+
+// 首次道具赠送
+export class FirstPropGift extends FYGE.Container {
+    constructor() {
+        super();
+        //背景图片
+        this.addChild(new FYGE.Shape).hitTestByPixel = false;
+        //信息板
+        var msgBoard = this.addChild(new MsgBoard());
+        msgBoard.position.set((750 - 604) / 2, 1000);
+        msgBoard.msg = "首次进入游戏，送你三个道具，让你通关无阻力！";
+    }
+}
\ No newline at end of file

src/something/uis/GameGuide.ts

@@ -124,7 +124,7 @@ export class GameGuide extends FYGE.Container {
 /**
  * 提示板
  */
-class MsgBoard extends FYGE.Sprite {
+export class MsgBoard extends FYGE.Sprite {
     private _msg: FYGE.TextField
     set msg(value) {
         this._msg.text = value