Merge branch 'master_xma_local' into master_xma_test

Assets/ManagedResources/~Lua/Common/functions.lua

@@ -314,7 +314,7 @@ function SecTorPlayAnimByScroll(scroll,_scale)
     end
     scroll:ForeachItemGO(function (index, go)
         Timer.New(function ()
-            -- go.gameObject:SetActive(true)
+            go.gameObject:SetActive(true)
             PlayUIAnim(go.gameObject)
         end, scale*(index-1)):Start()
     end)

Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua

@@ -343,7 +343,7 @@ function SkillCaster:CheckFullSceenSkill(combat, skill)
                 go2.transform.localPosition = startPos
                 go2.transform:DOLocalMove(targetPos, 1, false)
 
-                BattleManager.AddDelayRecycleRes(combat.Bullet, go2, 4)
+                BattleManager.AddDelayRecycleRes(combat.Bullet, go2, combat.KeyFrame/1000)
             end
 
         end

Assets/ManagedResources/~Lua/View/ShopView.lua

@@ -413,10 +413,10 @@ function this:RefreshItemList(isTop)
         if isTop then
             self.ScrollView:SetIndex(1)
         end
-        if isPlayShow then
-            SecTorPlayAnimByScroll(self.ScrollView,0.03)
-            isPlayShow = false
-        end
+        -- if isPlayShow then
+        --     -- SecTorPlayAnimByScroll(self.ScrollView, 0.03)
+        --     isPlayShow = false
+        -- end
     end
 end