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

dev_chengFeng
gaoxin 2021-03-19 17:52:41 +08:00
commit 37668ce757
3 changed files with 15 additions and 4 deletions

View File

@ -108,6 +108,7 @@ function this.SingleDataShow(go,rewardData)
end
end
local lingquButton = Util.GetGameObject(activityRewardGo.gameObject, "lingquButton")
local text = Util.GetGameObject(activityRewardGo.gameObject, "lingquButton/Text"):GetComponent("Text")
Util.GetGameObject(lingquButton.gameObject, "redPoint"):SetActive(false)
local qianwangButton = Util.GetGameObject(activityRewardGo.gameObject, "qianwangButton")
local getFinishText = Util.GetGameObject(activityRewardGo.gameObject, "getFinishText")
@ -116,9 +117,19 @@ function this.SingleDataShow(go,rewardData)
local state = rewardData.state
local value = sConFigData.Values[1][1]
local isPass = FightPointPassManager.IsFightPointPass(value)
lingquButton:SetActive(state == 0 and isPass)
lingquButton:SetActive(isPass)
qianwangButton:SetActive(state == 0 and not isPass)
getFinishText:SetActive(state == 1)
if state == 1 then
text.text = Language[10101]
Util.SetGray(lingquButton,true)
lingquButton:GetComponent("Button").interactable = false
else
text.text = Language[11948]
Util.SetGray(lingquButton,false)
lingquButton:GetComponent("Button").interactable = true
end
-- getFinishText:SetActive(state == 1)
getFinishText:SetActive(false)
needGetUpText:SetActive(state == 0)
if isShowNeedGetUpTextId == 0 and state == 0 or isShowNeedGetUpTextId == rewardData.missionId then
isShowNeedGetUpTextId = rewardData.missionId

View File

@ -43,7 +43,7 @@ function this:OnOpen(heroTId,skinId, damageValue, allDamage, func,_func2)
this.liveName = GetResourcePath(heroTData.Live)
this.liveNode = poolManager:LoadLive(this.liveName, this.firstRole.transform, Vector3.one * heroTData.Scale, Vector3.New(heroTData.Position[1], heroTData.Position[2]))
this.liveNode.transform.sizeDelta = Vector2.New(1000, 1000)
this.liveNode.transform.sizeDelta = Vector2.New(10, 10)
local SkeletonGraphic = this.liveNode:GetComponent("SkeletonGraphic")
local idle = function()
SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true)

View File

@ -1001,7 +1001,7 @@ function this.TimeFormat()
local time = limitSkinGift.endTime - GetTimeStamp()
if time > 0 then
activityTabs[k].go.gameObject:SetActive(true)
activityTabs[k].timeText.text = TimeToHMS(time)
activityTabs[k].timeText.text = TimeToFelaxible(time)
local canGet = BagManager.GetTotalItemNum(1221) > 0 and BagManager.GetTotalItemNum(1222) > 0 and
BagManager.GetTotalItemNum(1223) > 0 and BagManager.GetTotalItemNum(1224) > 0
activityTabs[k].redpot:SetActive(canGet)