From 0259117f7b77ec8e6f6bb11a0f67c086e0aeffb6 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 31 May 2021 15:00:28 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=90=8D=E5=AD=97=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E3=80=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Message/Family_pb.lua | 13 ++++++++++++- .../~Lua/Modules/Arena/ArenaManager.lua | 11 ++++++----- .../Guild/CarDelay/GuildCarDelayLootPopup.lua | 3 +++ 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Message/Family_pb.lua b/Assets/ManagedResources/~Lua/Message/Family_pb.lua index 00fb4f62b0..8fb82e16a5 100644 --- a/Assets/ManagedResources/~Lua/Message/Family_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/Family_pb.lua @@ -252,6 +252,7 @@ CARCHALLENGEITEM_SCORE_FIELD = protobuf.FieldDescriptor(); CARCHALLENGEITEM_HADCHALLENGE_FIELD = protobuf.FieldDescriptor(); CARCHALLENGEITEM_RANK_FIELD = protobuf.FieldDescriptor(); CARCHALLENGEITEM_TEAMINFO_FIELD = protobuf.FieldDescriptor(); +CARCHALLENGEITEM_PRACTICELEVEL_FIELD = protobuf.FieldDescriptor(); GETCARCHALLENEGLISTRESPONSE = protobuf.Descriptor(); GETCARCHALLENEGLISTRESPONSE_CARCHALLENGEITEM_FIELD = protobuf.FieldDescriptor(); GETCARCHALLENEGLISTRESPONSE_MYRANK_FIELD = protobuf.FieldDescriptor(); @@ -2672,11 +2673,21 @@ CARCHALLENGEITEM_TEAMINFO_FIELD.message_type = CommonProto_pb.TEAMSIMPLEINFO CARCHALLENGEITEM_TEAMINFO_FIELD.type = 11 CARCHALLENGEITEM_TEAMINFO_FIELD.cpp_type = 10 +CARCHALLENGEITEM_PRACTICELEVEL_FIELD.name = "practiceLevel" +CARCHALLENGEITEM_PRACTICELEVEL_FIELD.full_name = ".rpc.protocols.CarChallengeItem.practiceLevel" +CARCHALLENGEITEM_PRACTICELEVEL_FIELD.number = 9 +CARCHALLENGEITEM_PRACTICELEVEL_FIELD.index = 8 +CARCHALLENGEITEM_PRACTICELEVEL_FIELD.label = 1 +CARCHALLENGEITEM_PRACTICELEVEL_FIELD.has_default_value = false +CARCHALLENGEITEM_PRACTICELEVEL_FIELD.default_value = 0 +CARCHALLENGEITEM_PRACTICELEVEL_FIELD.type = 5 +CARCHALLENGEITEM_PRACTICELEVEL_FIELD.cpp_type = 1 + CARCHALLENGEITEM.name = "CarChallengeItem" CARCHALLENGEITEM.full_name = ".rpc.protocols.CarChallengeItem" CARCHALLENGEITEM.nested_types = {} CARCHALLENGEITEM.enum_types = {} -CARCHALLENGEITEM.fields = {CARCHALLENGEITEM_UID_FIELD, CARCHALLENGEITEM_USERNAME_FIELD, CARCHALLENGEITEM_FORCE_FIELD, CARCHALLENGEITEM_GUILDNAME_FIELD, CARCHALLENGEITEM_SCORE_FIELD, CARCHALLENGEITEM_HADCHALLENGE_FIELD, CARCHALLENGEITEM_RANK_FIELD, CARCHALLENGEITEM_TEAMINFO_FIELD} +CARCHALLENGEITEM.fields = {CARCHALLENGEITEM_UID_FIELD, CARCHALLENGEITEM_USERNAME_FIELD, CARCHALLENGEITEM_FORCE_FIELD, CARCHALLENGEITEM_GUILDNAME_FIELD, CARCHALLENGEITEM_SCORE_FIELD, CARCHALLENGEITEM_HADCHALLENGE_FIELD, CARCHALLENGEITEM_RANK_FIELD, CARCHALLENGEITEM_TEAMINFO_FIELD, CARCHALLENGEITEM_PRACTICELEVEL_FIELD} CARCHALLENGEITEM.is_extendable = false CARCHALLENGEITEM.extensions = {} GETCARCHALLENEGLISTRESPONSE_CARCHALLENGEITEM_FIELD.name = "carChallengeItem" diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua index de172abaf4..bba0c5c55e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua @@ -159,13 +159,13 @@ function this.RequestArenaChallenge(index, isSkip, func) arg.result = msg.fightResult arg.blue = {} arg.blue.uid = PlayerManager.uid - arg.blue.name = JingJiShouWeiToEn(PlayerManager.nickName) + arg.blue.name = JingJiShouWeiToEn(PracticeManager.SetNameColor(PlayerManager.nickName,PracticeManager.PracticeLevel)) arg.blue.head = PlayerManager.head arg.blue.frame = HeadManager.GetCurFrameId() arg.blue.deltaScore = msg.myScoreChange arg.red= {} arg.red.uid = enemy.personInfo.uid - arg.red.name = JingJiShouWeiToEn(enemy.personInfo.name) + arg.red.name = JingJiShouWeiToEn(PracticeManager.SetNameColor(enemy.personInfo.name,enemy.personInfo.practiceLevel))--enemy.personInfo.name) arg.red.head = enemy.personInfo.head arg.red.frame = enemy.personInfo.headFrame arg.red.deltaScore = msg.defScoreChange @@ -225,10 +225,11 @@ this.ArenaRecords = {} function this.RequestArenaRecord() -- 请求刷新数据,并刷新显示 NetManager.RequestArenaRecord(function(msg) - this.ArenaRecords = msg.arenaRecordInfo - for k,v in ipairs(this.ArenaRecords) do - v.attackInfo.name = JingJiShouWeiToEn(v.attackInfo.name) + for k,v in ipairs(msg.arenaRecordInfo) do + LogRed("v.attackInfo.practiceLevel:"..tostring(v.attackInfo.practiceLevel)) + v.attackInfo.name = JingJiShouWeiToEn(PracticeManager.SetNameColor(v.attackInfo.name,v.attackInfo.practiceLevel)) end + this.ArenaRecords = msg.arenaRecordInfo table.sort(this.ArenaRecords, function(a,b) return a.attackTime > b.attackTime end) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua index b00fbe264e..67841b29e6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua @@ -53,6 +53,9 @@ function GuildCarDelayLootPopup:OnShow() --for i = 1, #msg.carChallengeItem do -- LogError("uid "..msg.carChallengeItem[i].uid) --end + for i = 1, #msg.carChallengeItem do + msg.carChallengeItem[i].userName = PracticeManager.SetNameColor(msg.carChallengeItem[i].userName,msg.carChallengeItem[i].practiceLevel) + end CarChallenegList = msg this.titleText.text = Language[11002]..ConfigManager.GetConfigData(ConfigName.WorldBossSetting,1).GrabPercent/100 ..Language[11003] if CarChallenegList then