1

Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua

@@ -1132,8 +1132,8 @@ end
 -- 战斗加速控制
 BATTLE_TIME_SCALE_ZERO = 0
 BATTLE_TIME_SCALE_ONE = 1
-BATTLE_TIME_SCALE_TWO = 1.5
-BATTLE_TIME_SCALE_THREE = 2
+BATTLE_TIME_SCALE_TWO = 2
+BATTLE_TIME_SCALE_THREE = 3
 this.TimeScale = 0
 function this.InitTimeScale()
     this.TimeScale = 0

Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua

@@ -174,17 +174,17 @@ function this:BindEvent()
         -- 判断当前倍速
         local scale = BattleManager.GetTimeScale()
         scale = math.floor(scale * 10 + 0.5) / 10
-
+        --LogError("sssssssssssssssssssssss"..scale)
         if scale == BATTLE_TIME_SCALE_ONE then
             -- 一倍速回到二倍速
             BattleManager.SetTimeScale(BATTLE_TIME_SCALE_TWO)
         elseif scale == BATTLE_TIME_SCALE_TWO then
             -- 2倍速时判断是否解锁了3倍速，没解锁就回到1倍速
-            -- if BattleManager.IsUnlockBattleSpeedThree() then
-            --   BattleManager.SetTimeScale(BATTLE_TIME_SCALE_THREE)
-            --else
-            BattleManager.SetTimeScale(BATTLE_TIME_SCALE_ONE)
-            --end
+             if BattleManager.IsUnlockBattleSpeedThree() then
+               BattleManager.SetTimeScale(BATTLE_TIME_SCALE_THREE)
+            else
+                BattleManager.SetTimeScale(BATTLE_TIME_SCALE_ONE)
+            end
         elseif scale == BATTLE_TIME_SCALE_THREE then
             -- 三倍速回到一倍速
             BattleManager.SetTimeScale(BATTLE_TIME_SCALE_ONE)

Assets/ManagedResources/~Lua/Modules/Hero/PropHero.lua

@@ -738,7 +738,6 @@ Hero_Prop_Func = {
     end,
     [Hero_Prop_Type.Shenji] = function(_heroData)
         --属性相关修改
-        LogError("bnbbbbbbbbbbbbbbbbbbbbbbbbbbb")
         local propList, conPropList, teamPropList, conTeamPropList, dePropList 
         local SingleProVal = PracticeManager.GetTailsmanPassivePower1(_heroData)
         if SingleProVal and #SingleProVal > 0 then 

Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua

@@ -881,8 +881,10 @@ function this.GetTailsmanPassivePower1(_heroData)
     for i, v in ConfigPairs(XiuXianSkillConfig) do
         if this.ImprintServerData[v.Id] then
             local config =v
+            
             if config.FitList[1] == 0 or (config.FitList[1] == 1 and _heroData.zhenYingId == config.FitList[2])
                 or (config.FitList[1] == 2 and heroConfig[_heroData.tId].Profession == config.FitList[2]) then
+                
                 for i = 1, #config.SkillId do
                     table.insert(idList, config.SkillId[i])
                 end