Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/macao_army

SuperTwo762/js/main_2020_show.js

@@ -7231,7 +7231,7 @@ window.Modernizr = function(n, e, t) {
                         t.goToHighlight([i.data("index"),0])//改
                         //当定时器执行完毕，重新发开节流阀
                         window.myTimer =null;
-                      },1500);
+                      },1000);
                 }),