Merge remote-tracking branch 'origin/xma/dev' into master_xma_local

dev_chengFeng
gaoxin 2021-03-30 17:26:16 +08:00
commit 03da04762b
2 changed files with 7 additions and 4 deletions

View File

@ -985,7 +985,7 @@ end
-- 通过接口获取战斗数据
function this.RequestBattleDataByFightId(fightId, func)
local uid = string.split(fightId, "_")[1]
local requestUrl = string.format("http://60.1.1.244:8888/req/getFightRecord?uid=%s&fightid=%s", uid, fightId)
local requestUrl = string.format("http://119.28.114.198:8888/req/getFightRecord?uid=%s&fightid=%s", uid, fightId)
LogGreen(requestUrl)
networkMgr:SendGetHttp(requestUrl, function(str)
LogGreen(str)

View File

@ -559,9 +559,10 @@ function RoleInfoLayout:DeleteLvUpMaterials(isSingleLvUp,msg)
local allAddProValOld = allAddProVal
parent:UpdateHeroInfoData()--刷新界面
this.ShowProAddVal(allAddProValOld)
if isSingleLvUp then
parent.upLvEffect:SetActive(false)
parent.upLvEffect:SetActive(true)
end
-- _isReqLvUp = false
Timer.New(function()
_isReqLvUp = false
@ -585,6 +586,8 @@ function RoleInfoLayout:DeleteLvUpMaterials2(msg)
HeroManager.UpdateSingleHeroDatas(curHeroData.dynamicId,curHeroData.lv,curHeroData.star,curHeroData.breakId,curHeroData.upStarId,true)
end
parent:UpdateHeroInfoData()--刷新界面
parent.upLvEffect:SetActive(false)
parent.upLvEffect:SetActive(true)
end
--长按升级处理
function this.OnUpdate()