diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index d041ff9d81..33e9a03b52 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -4501,7 +4501,7 @@ function this.UpPokemonLevelRequest(pokemonDId, upLv,oldLv, func) local data = buffer:DataByte() local msg = HeroInfoProto_pb.PokenmonUpLevelResponse() msg:ParseFromString(data) - Log(Language[11429]..msg.level) + -- Log(Language[11429]..msg.level) if func then func(msg) end diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua index 7a01b15aeb..5e7e83d380 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua @@ -68,6 +68,7 @@ this._onPointerDown = function(Pointgo, data) _isClicked = true this.timePressStarted = Time.realtimeSinceStartup oldLv = curPokemonData.lv + allAddProVal = PokemonManager.GetSinglePokemonAddProData(curPokemonData.dynamicId) end --长按升级抬起状态 this._onPointerUp = function(Pointgo, data) @@ -198,11 +199,12 @@ function this.ShowPokemonInfo() end --长按升级结束后请求协议 function this.LongLvUpClick(oldLv) - LogPink("ssssssssssssssss") local oldWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) NetManager.UpPokemonLevelRequest(curPokemonData.dynamicId,curPokemonData.lv,oldLv,function (msg) PokemonManager.UpdateSinglePokemonData(curPokemonData.dynamicId,msg.level,curPokemonData.star) curPokemonData = PokemonManager.GetSinglePokemonData(curPokemonData.dynamicId) + local allAddProValNet = PokemonManager.GetSinglePokemonAddProData(curPokemonData.dynamicId) + this.ShowProAddVal(allAddProValNet) this.ShowPokemonInfo() _isReqLvUp = false local newWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) @@ -227,10 +229,13 @@ function this.LvUpClick(isSingleLvUp) return end if isSingleLvUp then + allAddProVal = PokemonManager.GetSinglePokemonAddProData(curPokemonData.dynamicId) local oldWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) - NetManager.UpPokemonLevelRequest(curPokemonData.dynamicId,curPokemonData.lv + 1,curPokemonData.lv, function() - PokemonManager.UpdateSinglePokemonData(curPokemonData.dynamicId,curPokemonData.lv + 1,curPokemonData.star) + NetManager.UpPokemonLevelRequest(curPokemonData.dynamicId,curPokemonData.lv + 1,curPokemonData.lv, function(msg) + PokemonManager.UpdateSinglePokemonData(curPokemonData.dynamicId,msg.level,curPokemonData.star) curPokemonData = PokemonManager.GetSinglePokemonData(curPokemonData.dynamicId) + local allAddProValNet = PokemonManager.GetSinglePokemonAddProData(curPokemonData.dynamicId) + this.ShowProAddVal(allAddProValNet) this.ShowPokemonInfo() local newWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) PokemonManager.PiaoWarPowerChange(oldWarPower,newWarPower) @@ -248,13 +253,12 @@ function this.LvUpClick(isSingleLvUp) end end --播放升级 属性提升动画 -function this.ShowProAddVal(allAddProValOld) +function this.ShowProAddVal(allAddProValNet) this.lvUpGo:SetActive(true) - Util.GetGameObject(lvUpShowProList[1], "proPre/vale"):GetComponent("Text").text="+"..allAddProVal[HeroProType.Attack]-allAddProValOld[HeroProType.Attack] - Util.GetGameObject(lvUpShowProList[2], "proPre/vale"):GetComponent("Text").text="+"..allAddProVal[HeroProType.Hp]-allAddProValOld[HeroProType.Hp] - Util.GetGameObject(lvUpShowProList[3], "proPre/vale"):GetComponent("Text").text="+"..allAddProVal[HeroProType.PhysicalDefence]-allAddProValOld[HeroProType.PhysicalDefence] - Util.GetGameObject(lvUpShowProList[4], "proPre/vale"):GetComponent("Text").text="+"..allAddProVal[HeroProType.MagicDefence]-allAddProValOld[HeroProType.MagicDefence] - --Util.GetGameObject(lvUpShowProList[5], "proPre/vale"):GetComponent("Text").text="+"..allAddProVal[HeroProType.Speed]-allAddProValOld[HeroProType.Speed] + Util.GetGameObject(lvUpShowProList[1], "proPre/vale"):GetComponent("Text").text="+"..allAddProValNet[HeroProType.Attack]-allAddProVal[HeroProType.Attack] + Util.GetGameObject(lvUpShowProList[2], "proPre/vale"):GetComponent("Text").text="+"..allAddProValNet[HeroProType.Hp]-allAddProVal[HeroProType.Hp] + Util.GetGameObject(lvUpShowProList[3], "proPre/vale"):GetComponent("Text").text="+"..allAddProValNet[HeroProType.PhysicalDefence]-allAddProVal[HeroProType.PhysicalDefence] + Util.GetGameObject(lvUpShowProList[4], "proPre/vale"):GetComponent("Text").text="+"..allAddProValNet[HeroProType.MagicDefence]-allAddProVal[HeroProType.MagicDefence] this.ThreadShowProAddVal() end function this.ThreadShowProAddVal()