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

egret/src/panels/HongbaoRain/HbCutTime.ts

@@ -4,6 +4,7 @@ import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl";
 import { NetManager } from "../../../libs/tw/manager/NetManager";
 import HbRule from "./HbRule";
 import { getlogItem } from "../../Main";
+import { GDispatcher } from "../../../libs/tc/util/GDispatcher";
 
 /**
  * 红包雨倒计时
@@ -44,7 +45,10 @@ export default class HbCutTime extends Panel {
             this.ok_btn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchOK, this);
             return;
         }
-        this.cutTimer = new CutTimer(this.cutTimeLabel, 'hh时mm分ss秒', () => this.hidePanel());
+        this.cutTimer = new CutTimer(this.cutTimeLabel, 'hh时mm分ss秒', () => {
+            this.hidePanel();
+            GDispatcher.dispatchEvent('updateHbRainIcon');
+        });
         let sysTime = res.timestamp;    // 当前系统时间
         let time;
         if(data.currentSession) {

egret/src/panels/HongbaoRain/HbNoPrize.ts

@@ -25,6 +25,7 @@ export default class HbNoPrize extends Panel {
     async start() {
         super.start();
         this.initUI();
+        GDispatcher.dispatchEvent('updateHbRainIcon');
     }
 
     initUI() {

egret/src/panels/HongbaoRain/HbPrize.ts

@@ -27,6 +27,7 @@ export default class HbPrize extends Panel {
 
         let str = `一共抢到<b>${this.data.score}</b>个红包`;
         this.tipLabel.textFlow = (new HtmlTextParser).parser(str);
+        GDispatcher.dispatchEvent('updateHbRainIcon');
     }
 
     updateOption(option: any) {

egret/src/something/chapters/Chapter12.ts

@@ -45,7 +45,7 @@ export const Chapters12: ChapterData[] = [
     //222
     {
         baseElementTypes: [0, 1, 2, 3, 4],
-        bubbleProbability: 10,
+        bubbleProbability: 0.1,
         stepCount: 29,
         passTarget: { type: 1, elements: [{ type: 6, count: 2 }] },
         starScores: [5000, 12000, 21000],
@@ -101,7 +101,7 @@ export const Chapters12: ChapterData[] = [
                 1, 1, 1, 0, 2, 0, 1, 1, 1,
                 1, 1, 1, 2, 2, 2, 1, 1, 1,
                 0, 0, 3, 3, 3, 3, 3, 0, 0,
-                3, 3, 3, 1, 3, 1, 3, 1, 1,
+                3, 3, 3, 3, 3, 1, 3, 1, 1,
                 0, 0, 3, 3, 3, 3, 3, 0, 0,
                 1, 1, 1, 2, 2, 2, 1, 1, 1,
                 1, 1, 1, 0, 2, 0, 1, 1, 1,