Merge branch 'master' of http://git.mokasz.com/zouyong/team1_nc

assets/script/game/module/turntable/Turnable.ts

@@ -142,8 +142,13 @@ export default class Turnable extends cc.Component {
         if(times == 0)
             this.lbl_probability.string = `<color=#FBE5D0>当前概率: 5%</color>`;
         else
+        {
+            if(times >= 10)
+            {
+                times = 9;
+            }
             this.lbl_probability.string = `<color=#FBE5D0>当前概率: 5%</c><color=#A3FF0A>+${times*10}%</color>`;
-        
+        }      
     }
 
     update() {