Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
eb6a0c5dde
|
@ -1771,6 +1771,7 @@ function this.RequestUserForceChange(teamId, func)
|
||||||
data.teamId = teamId
|
data.teamId = teamId
|
||||||
local msg = data:SerializeToString()
|
local msg = data:SerializeToString()
|
||||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.USER_FORCE_CHANGE_REQUEST, MessageTypeProto_pb.USER_FORCE_CHANGE_RESPONSE, msg, function()
|
Network:SendMessageWithCallBack(MessageTypeProto_pb.USER_FORCE_CHANGE_REQUEST, MessageTypeProto_pb.USER_FORCE_CHANGE_RESPONSE, msg, function()
|
||||||
|
CheckRedPointStatus(RedPointType.Practice_Cultivation)
|
||||||
if func then
|
if func then
|
||||||
func()
|
func()
|
||||||
end
|
end
|
||||||
|
|
|
@ -309,7 +309,7 @@ function RewardEquipSingleShowPopup2:OnShow()
|
||||||
_homeProList[index]:GetComponent("Text").text = GetLanguageStrById(proConfigData.Info)
|
_homeProList[index]:GetComponent("Text").text = GetLanguageStrById(proConfigData.Info)
|
||||||
local sText = Util.GetGameObject(_homeProList[index], "curProVale"):GetComponent("Text")
|
local sText = Util.GetGameObject(_homeProList[index], "curProVale"):GetComponent("Text")
|
||||||
sText.text = "+"..GetPropertyFormatStr(proConfigData.Style, power)
|
sText.text = "+"..GetPropertyFormatStr(proConfigData.Style, power)
|
||||||
Util.GetGameObject(sText.gameObject, "homeValue"):GetComponent("Text").text = string.format("(摘星阁加持:%s",num).."%)"--摘星阁加持文字显示位置
|
Util.GetGameObject(sText.gameObject, "homeValue"):GetComponent("Text").text = string.format("(%s",num).."%)"--摘星阁加持文字显示位置
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -577,6 +577,7 @@ function RewardItemPopup:RedCheckFuns()
|
||||||
CheckRedPointStatus(RedPointType.XunBaoMiZong)
|
CheckRedPointStatus(RedPointType.XunBaoMiZong)
|
||||||
CheckRedPointStatus(RedPointType.Gem)
|
CheckRedPointStatus(RedPointType.Gem)
|
||||||
CheckRedPointStatus(RedPointType.HomeLand)
|
CheckRedPointStatus(RedPointType.HomeLand)
|
||||||
|
CheckRedPointStatus(RedPointType.Practice)
|
||||||
end
|
end
|
||||||
|
|
||||||
--界面销毁时调用(用于子类重写)
|
--界面销毁时调用(用于子类重写)
|
||||||
|
|
Loading…
Reference in New Issue