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

egret/src/mainScene/MainScene.ts

@@ -88,7 +88,7 @@ export default class MainScene extends Scene {
     exposure
     chapterData: ChapterData;
     //关数
-    chapter:number
+    chapter: number
     //所有的格子数组
     lattices: Lattice[];
     //最后一行的行数
@@ -2026,14 +2026,20 @@ export default class MainScene extends Scene {
         Loading.instace.show();
         NetManager.ins.hc_submit((s, data) => {
             if (s) {
+                //提交成功后捞结果
                 NetManager.ins.getOrderStatus((s) => {
                     Loading.instace.hide();
                     playSound(SoundType.sucess);
                     if (s) {
-                        //区分奖品,待写
-                        PanelCtrl.instance.show(ModuleTypes.PRIZE_PANEL);
+                        //区分奖品
+                        if (DataManager.ins.getCustomOrderStatusData.lottery) {
+                            PanelCtrl.instance.show(ModuleTypes.PRIZE_PANEL, { starCount: this.scoreProgress.starCount });
                         } else {
-                        PanelCtrl.instance.show(ModuleTypes.NO_PRIZE_PANEL);
+                            PanelCtrl.instance.show(ModuleTypes.NO_PRIZE_PANEL, { starCount: this.scoreProgress.starCount });
+                        }
+                    } else {
+                        //失败直接显示未中奖
+
                     }
                 },
                     DataManager.ins.getData("hc_doJoin").data,

egret/src/something/uis/ScoreProgress.ts

@@ -50,6 +50,7 @@ export class ScoreProgress {
                 this.starCount = 3;
             };
         }
+        //是否超过2星
         else if (value >= this.starScores[1]) {
             scale = (value - this.starScores[1]) / (this.starScores[2] - this.starScores[1]);
             w = (595 - 522) * scale + 522;
@@ -58,6 +59,7 @@ export class ScoreProgress {
                 this.starCount = 2;
             };
         }
+        //是否超过1星
         else if (value >= this.starScores[0]) {
             scale = (value - this.starScores[0]) / (this.starScores[1] - this.starScores[0]);
             w = (522 - 446) * scale + 446;