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

dev_chengFeng
jiaoyangna 2021-07-30 14:05:09 +08:00
commit 3c012bb3f4
7 changed files with 26 additions and 7 deletions

View File

@ -400,6 +400,7 @@ VIEWHEROINFOREQUEST = protobuf.Descriptor();
VIEWHEROINFOREQUEST_TARGETUID_FIELD = protobuf.FieldDescriptor();
VIEWHEROINFOREQUEST_HEROID_FIELD = protobuf.FieldDescriptor();
VIEWHEROINFOREQUEST_SERVERID_FIELD = protobuf.FieldDescriptor();
VIEWHEROINFOREQUEST_TEAMID_FIELD = protobuf.FieldDescriptor();
VIEWHEROINFORESPONSE = protobuf.Descriptor();
VIEWHEROINFORESPONSE_HERO_FIELD = protobuf.FieldDescriptor();
VIEWHEROINFORESPONSE_EQUIP_FIELD = protobuf.FieldDescriptor();
@ -4218,11 +4219,21 @@ VIEWHEROINFOREQUEST_SERVERID_FIELD.default_value = 0
VIEWHEROINFOREQUEST_SERVERID_FIELD.type = 5
VIEWHEROINFOREQUEST_SERVERID_FIELD.cpp_type = 1
VIEWHEROINFOREQUEST_TEAMID_FIELD.name = "teamId"
VIEWHEROINFOREQUEST_TEAMID_FIELD.full_name = ".rpc.protocols.ViewHeroInfoRequest.teamId"
VIEWHEROINFOREQUEST_TEAMID_FIELD.number = 4
VIEWHEROINFOREQUEST_TEAMID_FIELD.index = 3
VIEWHEROINFOREQUEST_TEAMID_FIELD.label = 1
VIEWHEROINFOREQUEST_TEAMID_FIELD.has_default_value = false
VIEWHEROINFOREQUEST_TEAMID_FIELD.default_value = 0
VIEWHEROINFOREQUEST_TEAMID_FIELD.type = 5
VIEWHEROINFOREQUEST_TEAMID_FIELD.cpp_type = 1
VIEWHEROINFOREQUEST.name = "ViewHeroInfoRequest"
VIEWHEROINFOREQUEST.full_name = ".rpc.protocols.ViewHeroInfoRequest"
VIEWHEROINFOREQUEST.nested_types = {}
VIEWHEROINFOREQUEST.enum_types = {}
VIEWHEROINFOREQUEST.fields = {VIEWHEROINFOREQUEST_TARGETUID_FIELD, VIEWHEROINFOREQUEST_HEROID_FIELD, VIEWHEROINFOREQUEST_SERVERID_FIELD}
VIEWHEROINFOREQUEST.fields = {VIEWHEROINFOREQUEST_TARGETUID_FIELD, VIEWHEROINFOREQUEST_HEROID_FIELD, VIEWHEROINFOREQUEST_SERVERID_FIELD, VIEWHEROINFOREQUEST_TEAMID_FIELD}
VIEWHEROINFOREQUEST.is_extendable = false
VIEWHEROINFOREQUEST.extensions = {}
VIEWHEROINFORESPONSE_HERO_FIELD.name = "hero"

View File

@ -538,12 +538,19 @@ function this.ChatItemAdapter(node, data, isShowTime)
if data.senderId == PlayerManager.uid then
lv.text = PlayerManager.level
name.text = PracticeManager.SetNameColor(PlayerManager.nickName,PracticeManager.PracticeLevel)
if data.serverName and data.serverName ~= "" then
name.text = name.text.." "..data.serverName
end
head.sprite = GetPlayerHeadSprite(this.spLoader, PlayerManager.head)
headKuang.sprite = GetPlayerHeadFrameSprite(this.spLoader, HeadManager.GetCurFrameId())
title=PlayerManager.GetPlayerDesignation()
else
lv.text = data.senderlevel
name.text = data.senderName
if data.serverName and data.serverName ~= "" then
name.text = data.serverName .." "..data.senderName
else
name.text = data.senderName
end
head.sprite = GetPlayerHeadSprite(this.spLoader, data.head)
headKuang.sprite = GetPlayerHeadFrameSprite(this.spLoader, data.frame)
title=data.userTitle

View File

@ -136,7 +136,7 @@ function this.SingleInfoDataShow(go,data)
Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text=data.teamInfo[i].level
local heroData = {}
Util.AddOnceClick(Util.GetGameObject(Util.GetGameObject(curHeroGoList[data.teamInfo[i].position], "frame"), "frame"), function()
NetManager.ViewHeroInfoRequest(data.uid,data.teamInfo[i].heroid,nil,function(msg)
NetManager.ViewHeroInfoRequest(data.uid,data.teamInfo[i].heroid,nil,FormationTypeDef.FORMATION_NORMAL,function(msg)
heroData= GoodFriendManager.GetHeroDatas(msg.hero,msg.force,msg.SpecialEffects)
GoodFriendManager.InitEquipData(msg.equip,heroData)
UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,true)

View File

@ -348,7 +348,7 @@ function this.FormationAdapter(teamInfo)
local frameBtn = Util.GetGameObject(this.Demons[hero.position], "frame")
local heroData = {}
Util.AddOnceClick(frameBtn, function()
NetManager.ViewHeroInfoRequest(this._MemId,hero.heroid,nil,function(msg)
NetManager.ViewHeroInfoRequest(this._MemId,hero.heroid,nil,FormationTypeDef.FORMATION_NORMAL,function(msg)
if not hero.heroid then
return
end

View File

@ -3334,11 +3334,12 @@ end
--好友上阵英雄预览信息
function this.ViewHeroInfoRequest(targetUid,heroId,serverName,func)
function this.ViewHeroInfoRequest(targetUid,heroId,serverName,formationId,func)
local data = PlayerInfoProto_pb.ViewHeroInfoRequest()
data.targetUid = targetUid
data.heroId = heroId
data.serverId = serverName and 1 or 0
data.teamId = formationId and formationId or FormationTypeDef.FORMATION_NORMAL
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.VIEW_HERO_INFO_REQUEST, MessageTypeProto_pb.VIEW_HERO_INFO_RESPONSE, msg, function(buffer)
local data = buffer:DataByte()

View File

@ -340,7 +340,7 @@ function this.FormationAdapter(teamInfo)
end)
else
Util.AddOnceClick(frameBtn, function()
NetManager.ViewHeroInfoRequest(this._PlayerId,hero.heroid,netserverName,function(msg)
NetManager.ViewHeroInfoRequest(this._PlayerId,hero.heroid,netserverName,this._Config.formationType,function(msg)
if not hero.heroid then
return
end

View File

@ -220,7 +220,7 @@ function this.SetRankingInfo(isTop, isAnim)
return
end
local dt,db=RankingManager.CutDate(rankingData)
if sData.rankType == RANK_TYPE.CELEBRATION_GUILD or sData.rankType == RANK_TYPE.GUILD_FORCE_RANK then
if sData.rankType == RANK_TYPE.CELEBRATION_GUILD or sData.rankType == RANK_TYPE.GUILD_FORCE_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_GUILD_FORCE_RANK then
dt[1].userName = dt[1].guildName
end
local dtUserName = dt[1].userName