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

egret/src/panels/TurntablePanel/Turntable.ts

@@ -97,6 +97,7 @@ export default class Turntable extends Panel {
     private setBtnTouch(touchEnabled: boolean) {
         this.start_btn.touchEnabled = touchEnabled;
         this["closeBtn"].touchEnabled = touchEnabled;
+        this.rulebtn.touchEnabled = touchEnabled;
     }
 
     /**
@@ -154,6 +155,7 @@ export default class Turntable extends Panel {
                             break;
 
                         default:
+                            PanelCtrl.instance.show("TurntableNoPrizePanel", {type: 3});
                             break;
                     }
                     return;