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

egret/src/mainScene/MainScene.ts

@@ -387,7 +387,7 @@ export default class MainScene extends Scene {
         this.propBtnCon.hammerBtn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_hammerBtn, this)
         this.propBtnCon.stepBtn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_stepBtn, this)
         //初始化道具信息 
-        this.updatePropNum();
+        this.updateScene();
         //选择框 无需加入场景
         var textureChoosed: egret.Texture = RES.getRes("chooseRect_png")
         this.choosed = new eui.Image(textureChoosed);
@@ -753,7 +753,7 @@ export default class MainScene extends Scene {
     /**
      * 更新三个道具
      */
-    updatePropNum() {
+    updateScene() {
         this.propBtnCon.boomBtn.propNumShow.count = getPropNums(PropType.BOOM);
         this.propBtnCon.hammerBtn.propNumShow.count = getPropNums(PropType.HAMMER);
         this.propBtnCon.stepBtn.propNumShow.count = getPropNums(PropType.CHANCE_NUM);
@@ -1020,7 +1020,7 @@ export default class MainScene extends Scene {
                 //如果有返回数据，没有说明是网络问题，不发home
                 //更新道具数量
                 NetManager.ins.hc_home(() => {
-                    this.updatePropNum();
+                    this.updateScene();
                 }, window['collectRuleId']);
             }
         }, prop)