Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

2021-05-07 11:02:14 +08:00 · 2021-05-07 11:02:14 +08:00 · c6a5a7ce01
parent ff8b9b57cc 04e3fec068
commit c6a5a7ce01
1 changed files with 1 additions and 1 deletions
--- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
+++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
@ -292,7 +292,7 @@ function LingShouBaoGe:TimeCountDown()
    local timeDown2 = ActData.endTime - GetTimeStamp()
    this.leftTime.text = Language[10023]..TimeToFelaxible(timeDown2)

-    this.tip1.gameObject:SetActive(timeDown < timeDown2)
+    this.tip1.gameObject:SetActive((timeDown < timeDown2) and (freeTime == 0))

    this.timer = Timer.New(function()
        if timeDown < 1 then