Merge branch 'master' of http://zhi-edu.com:3000/lan/zedu_client

assets/script/rule/GuideRule.ts

@@ -546,7 +546,7 @@ export default class GuideRule extends cc.Component {
                         let shakeTime = 0.05
                         actionTween.then(
                             t().repeat(
-                                Math.ceil((customAction.runTime / shakeTime) * 10),
+                                Math.ceil(customAction.runTime / (shakeTime * 10)),
                                 t()
                                     .by(shakeTime, {x: 5, y: 7})
                                     .by(shakeTime, {x: -6, y: -7})