Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev

egret/resource/skins/MapSkin.exml

@@ -43,7 +43,7 @@
 			</e:Skin>
 		</e:skinName>
 		</e:Button>
-		<e:Label id="countdown" text="00:00:00" verticalAlign="middle" textAlign="center" size="20" fontFamily="FZY4JW" anchorOffsetX="0" width="87" anchorOffsetY="0" height="37" strokeColor="0x4365ac" stroke="2" verticalCenter="0.5" horizontalCenter="-84.25"/>
+		<e:Label id="countdown" text="00:00:00" verticalAlign="middle" textAlign="center" size="19" fontFamily="FZY4JW" anchorOffsetX="0" width="87" anchorOffsetY="0" height="37" strokeColor="0x4365ac" stroke="2" verticalCenter="0.5" horizontalCenter="-84.25"/>
 	</e:Group>
 	<e:Button id="shopBtn" label="" x="613.08" y="174.01" visible="false">
 		<e:skinName>

egret/src/mainScene/MainScene.ts

@@ -1509,7 +1509,7 @@ export default class MainScene extends Scene {
                         this.eliminate();
                         break;
                     case PropType.CHANCE_NUM:
-                        this.playAni(RecoverName.STEP_ANI, [50, 100]);
+                        this.playAni(RecoverName.STEP_ANI, [120, 125]);
                         setTimeout(() => {
                             this.steps += 5;
                         }, 333)

egret/src/mapScene/CountDown.ts

@@ -2,8 +2,9 @@ export default class CountDown extends egret.EventDispatcher {
     _txt: eui.Label;
     _timer: egret.Timer;
     _func;
-    _addspace:boolean = false;
-    constructor(txt?,func?,addspace=false) {
+    _addspace: boolean = false;
+
+    constructor(txt?, func?, addspace = false) {
         super();
         this._txt = txt;
         this._func = func;
@@ -24,12 +25,12 @@ export default class CountDown extends egret.EventDispatcher {
     updateTxt() {
         if(!this._txt) return;
         const left = this._timer.repeatCount - this._timer.currentCount;
-        const h = Math.floor( left / 3600);
-        const m = Math.floor ( (left % 3600) / 60 );
+        const h = Math.floor(left / 3600);
+        const m = Math.floor((left % 3600) / 60);
         const s = left % 3600 % 60;
-        if(this._addspace){
+        if(this._addspace) {
             this._txt.text = `${this.getNumber(h)} : ${this.getNumber(m)} : ${this.getNumber(s)}`;
-        }else{
+        } else {
             this._txt.text = `${this.getNumber(h)}:${this.getNumber(m)}:${this.getNumber(s)}`;
         }
 

mock/happyclear/home.json

@@ -3029,8 +3029,9 @@
                 "num": 3
             }
         ],
-        "remainEnargy": 99,
+        "remainEnargy": 10,
         "askForEnergy": false,
+        "refectionCountdown": 77777,
         "canReceiveTreasureBoxNum": 10,
         "nextRangeStarsNum": 150
     }