From 905e66c4719f7c9408797861d89651cd52de36c1 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 27 May 2021 16:43:59 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=85=AC=E4=BC=9A=E6=8F=B4=E5=8A=A9?= =?UTF-8?q?=E3=80=91=E5=90=8D=E5=AD=97=E9=A2=9C=E8=89=B2=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TreasureStore/TreasureStorePopup.prefab | 6 +-- .../~Lua/Message/CommonProto_pb.lua | 24 ++++++++++- .../~Lua/Message/Family_pb.lua | 13 +++++- .../Modules/Guild/Aid/GuildAid_AidRecord.lua | 6 +-- .../~Lua/Modules/Guild/MyGuildManager.lua | 7 ++-- .../~Lua/Modules/Ranking/RankingManager.lua | 1 + .../TreasureStore/TreasureStorePopup.lua | 41 ++++++++++--------- 7 files changed, 67 insertions(+), 31 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/TreasureStore/TreasureStorePopup.prefab b/Assets/ManagedResources/Prefabs/UI/TreasureStore/TreasureStorePopup.prefab index 381057a91c..5e75ded3b5 100644 --- a/Assets/ManagedResources/Prefabs/UI/TreasureStore/TreasureStorePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TreasureStore/TreasureStorePopup.prefab @@ -5693,7 +5693,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3507432425270326966 RectTransform: m_ObjectHideFlags: 0 @@ -6048,7 +6048,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -189.67, y: -430.89996} + m_AnchoredPosition: {x: 0, y: -430.89996} m_SizeDelta: {x: 379.34, y: 48.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8199684686231032773 @@ -6086,7 +6086,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 diff --git a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua index dc2a56e88a..5f24dec1e1 100644 --- a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua @@ -614,6 +614,8 @@ GUILDHELPLOG_HELPERNAME_FIELD = protobuf.FieldDescriptor(); GUILDHELPLOG_TARGETNAME_FIELD = protobuf.FieldDescriptor(); GUILDHELPLOG_TYPE_FIELD = protobuf.FieldDescriptor(); GUILDHELPLOG_TIME_FIELD = protobuf.FieldDescriptor(); +GUILDHELPLOG_HELPPRACTICELEVEL_FIELD = protobuf.FieldDescriptor(); +GUILDHELPLOG_TARGETPRACTICELEVEL_FIELD = protobuf.FieldDescriptor(); VIEWHEROINFO = protobuf.Descriptor(); VIEWHEROINFO_HERO_FIELD = protobuf.FieldDescriptor(); VIEWHEROINFO_EQUIP_FIELD = protobuf.FieldDescriptor(); @@ -6534,11 +6536,31 @@ GUILDHELPLOG_TIME_FIELD.default_value = 0 GUILDHELPLOG_TIME_FIELD.type = 5 GUILDHELPLOG_TIME_FIELD.cpp_type = 1 +GUILDHELPLOG_HELPPRACTICELEVEL_FIELD.name = "helpPracticeLevel" +GUILDHELPLOG_HELPPRACTICELEVEL_FIELD.full_name = ".rpc.protocols.GuildHelpLog.helpPracticeLevel" +GUILDHELPLOG_HELPPRACTICELEVEL_FIELD.number = 7 +GUILDHELPLOG_HELPPRACTICELEVEL_FIELD.index = 6 +GUILDHELPLOG_HELPPRACTICELEVEL_FIELD.label = 1 +GUILDHELPLOG_HELPPRACTICELEVEL_FIELD.has_default_value = false +GUILDHELPLOG_HELPPRACTICELEVEL_FIELD.default_value = 0 +GUILDHELPLOG_HELPPRACTICELEVEL_FIELD.type = 5 +GUILDHELPLOG_HELPPRACTICELEVEL_FIELD.cpp_type = 1 + +GUILDHELPLOG_TARGETPRACTICELEVEL_FIELD.name = "targetPracticeLevel" +GUILDHELPLOG_TARGETPRACTICELEVEL_FIELD.full_name = ".rpc.protocols.GuildHelpLog.targetPracticeLevel" +GUILDHELPLOG_TARGETPRACTICELEVEL_FIELD.number = 8 +GUILDHELPLOG_TARGETPRACTICELEVEL_FIELD.index = 7 +GUILDHELPLOG_TARGETPRACTICELEVEL_FIELD.label = 1 +GUILDHELPLOG_TARGETPRACTICELEVEL_FIELD.has_default_value = false +GUILDHELPLOG_TARGETPRACTICELEVEL_FIELD.default_value = 0 +GUILDHELPLOG_TARGETPRACTICELEVEL_FIELD.type = 5 +GUILDHELPLOG_TARGETPRACTICELEVEL_FIELD.cpp_type = 1 + GUILDHELPLOG.name = "GuildHelpLog" GUILDHELPLOG.full_name = ".rpc.protocols.GuildHelpLog" GUILDHELPLOG.nested_types = {} GUILDHELPLOG.enum_types = {} -GUILDHELPLOG.fields = {GUILDHELPLOG_HELPERUID_FIELD, GUILDHELPLOG_TARGETUID_FIELD, GUILDHELPLOG_HELPERNAME_FIELD, GUILDHELPLOG_TARGETNAME_FIELD, GUILDHELPLOG_TYPE_FIELD, GUILDHELPLOG_TIME_FIELD} +GUILDHELPLOG.fields = {GUILDHELPLOG_HELPERUID_FIELD, GUILDHELPLOG_TARGETUID_FIELD, GUILDHELPLOG_HELPERNAME_FIELD, GUILDHELPLOG_TARGETNAME_FIELD, GUILDHELPLOG_TYPE_FIELD, GUILDHELPLOG_TIME_FIELD, GUILDHELPLOG_HELPPRACTICELEVEL_FIELD, GUILDHELPLOG_TARGETPRACTICELEVEL_FIELD} GUILDHELPLOG.is_extendable = false GUILDHELPLOG.extensions = {} VIEWHEROINFO_HERO_FIELD.name = "hero" diff --git a/Assets/ManagedResources/~Lua/Message/Family_pb.lua b/Assets/ManagedResources/~Lua/Message/Family_pb.lua index bcb281e292..00fb4f62b0 100644 --- a/Assets/ManagedResources/~Lua/Message/Family_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/Family_pb.lua @@ -325,6 +325,7 @@ GUILDHELPINFOINDICATION = protobuf.Descriptor(); GUILDHELPINFOINDICATION_UID_FIELD = protobuf.FieldDescriptor(); GUILDHELPINFOINDICATION_NAME_FIELD = protobuf.FieldDescriptor(); GUILDHELPINFOINDICATION_GUILDHELPINFO_FIELD = protobuf.FieldDescriptor(); +GUILDHELPINFOINDICATION_PRACTICELEVEL_FIELD = protobuf.FieldDescriptor(); GUILDHELPHELPOTHERREQUEST = protobuf.Descriptor(); GUILDHELPHELPOTHERREQUEST_UID_FIELD = protobuf.FieldDescriptor(); GUILDHELPHELPOTHERREQUEST_TYPE_FIELD = protobuf.FieldDescriptor(); @@ -3331,11 +3332,21 @@ GUILDHELPINFOINDICATION_GUILDHELPINFO_FIELD.message_type = CommonProto_pb.GUILDH GUILDHELPINFOINDICATION_GUILDHELPINFO_FIELD.type = 11 GUILDHELPINFOINDICATION_GUILDHELPINFO_FIELD.cpp_type = 10 +GUILDHELPINFOINDICATION_PRACTICELEVEL_FIELD.name = "practiceLevel" +GUILDHELPINFOINDICATION_PRACTICELEVEL_FIELD.full_name = ".rpc.protocols.GuildHelpInfoIndication.practiceLevel" +GUILDHELPINFOINDICATION_PRACTICELEVEL_FIELD.number = 4 +GUILDHELPINFOINDICATION_PRACTICELEVEL_FIELD.index = 3 +GUILDHELPINFOINDICATION_PRACTICELEVEL_FIELD.label = 1 +GUILDHELPINFOINDICATION_PRACTICELEVEL_FIELD.has_default_value = false +GUILDHELPINFOINDICATION_PRACTICELEVEL_FIELD.default_value = 0 +GUILDHELPINFOINDICATION_PRACTICELEVEL_FIELD.type = 5 +GUILDHELPINFOINDICATION_PRACTICELEVEL_FIELD.cpp_type = 1 + GUILDHELPINFOINDICATION.name = "GuildHelpInfoIndication" GUILDHELPINFOINDICATION.full_name = ".rpc.protocols.GuildHelpInfoIndication" GUILDHELPINFOINDICATION.nested_types = {} GUILDHELPINFOINDICATION.enum_types = {} -GUILDHELPINFOINDICATION.fields = {GUILDHELPINFOINDICATION_UID_FIELD, GUILDHELPINFOINDICATION_NAME_FIELD, GUILDHELPINFOINDICATION_GUILDHELPINFO_FIELD} +GUILDHELPINFOINDICATION.fields = {GUILDHELPINFOINDICATION_UID_FIELD, GUILDHELPINFOINDICATION_NAME_FIELD, GUILDHELPINFOINDICATION_GUILDHELPINFO_FIELD, GUILDHELPINFOINDICATION_PRACTICELEVEL_FIELD} GUILDHELPINFOINDICATION.is_extendable = false GUILDHELPINFOINDICATION.extensions = {} GUILDHELPHELPOTHERREQUEST_UID_FIELD.name = "uid" diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_AidRecord.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_AidRecord.lua index 4d28b9068a..83408613d8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_AidRecord.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_AidRecord.lua @@ -87,11 +87,11 @@ end function this.GetSingleStrInfo(curallAidData) local str = "" if curallAidData.helperuid == PlayerManager.uid then - str = string.format(GetLanguageStrById(errorCodeHint[118].Desc),curallAidData.targetname,GetLanguageStrById(itemConfig[curallAidData.type].Name),"1") + str = string.format(GetLanguageStrById(errorCodeHint[118].Desc),PracticeManager.SetNameColor(curallAidData.targetname,curallAidData.targetPracticeLevel),GetLanguageStrById(itemConfig[curallAidData.type].Name),"1") elseif curallAidData.targetuid == PlayerManager.uid then - str = string.format(GetLanguageStrById(errorCodeHint[119].Desc),curallAidData.helpername,GetLanguageStrById(itemConfig[curallAidData.type].Name),"1") + str = string.format(GetLanguageStrById(errorCodeHint[119].Desc),PracticeManager.SetNameColor(curallAidData.helpername,curallAidData.helpPracticeLevel),GetLanguageStrById(itemConfig[curallAidData.type].Name),"1") else - str = string.format(GetLanguageStrById(errorCodeHint[122].Desc),curallAidData.helpername,curallAidData.targetname,GetLanguageStrById(itemConfig[curallAidData.type].Name),"1") + str = string.format(GetLanguageStrById(errorCodeHint[122].Desc),PracticeManager.SetNameColor(curallAidData.helpername,curallAidData.helpPracticeLevel),PracticeManager.SetNameColor(curallAidData.targetname,curallAidData.targetPracticeLevel),GetLanguageStrById(itemConfig[curallAidData.type].Name),"1") end return str end diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua index 9b82b8b611..1134845932 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua @@ -710,7 +710,8 @@ function MyGuildManager.SetAllGuildHelpInfo(msg) if msg.guildHelpInfoIndication[i].uid and msg.guildHelpInfoIndication[i].uid > 0 then local singleHelpInfo = {} singleHelpInfo.uid = msg.guildHelpInfoIndication[i].uid - singleHelpInfo.name = msg.guildHelpInfoIndication[i].name + singleHelpInfo.name = PracticeManager.SetNameColor(msg.guildHelpInfoIndication[i].name,msg.guildHelpInfoIndication[i].practiceLevel) + Log("singleHelpInfo.name:"..tostring(singleHelpInfo.name)) singleHelpInfo.guildHelpInfo = {} for j = 1, #msg.guildHelpInfoIndication[i].guildHelpInfo do if msg.guildHelpInfoIndication[i].guildHelpInfo[j].num ~= -1 then @@ -746,7 +747,7 @@ function MyGuildManager.SetSingleGuildHelpInfo(msg) if uid == msg.uid then isStarAdd = false this.allGuildHelpInfo[uid].uid = msg.uid - this.allGuildHelpInfo[uid].name = msg.name + this.allGuildHelpInfo[uid].name = PracticeManager.SetNameColor(msg.name,msg.practiceLevel) this.allGuildHelpInfo[uid].guildHelpInfo = {} --LogGreen("msg.guildHelpInfo "..#msg.guildHelpInfo) for j = 1, #msg.guildHelpInfo do @@ -767,7 +768,7 @@ function MyGuildManager.SetSingleGuildHelpInfo(msg) if msg.uid and msg.uid > 0 then local singleHelpInfo = {} singleHelpInfo.uid = msg.uid - singleHelpInfo.name = msg.name + singleHelpInfo.name = PracticeManager.SetNameColor(msg.name,msg.practiceLevel) singleHelpInfo.guildHelpInfo = {} -- --LogGreen("msg.guildHelpInfo "..#msg.guildHelpInfo) for j = 1, #msg.guildHelpInfo do diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua index 9e001ce501..62f4adf86e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua @@ -62,6 +62,7 @@ function this.ReceiveNextRankingData(msg,fun) local length=#this.curRankingData for i, rank in ipairs(msg.ranks) do -- LogGreen("UserRank "..rank.rankInfo.rank.." userName "..rank.userName.." rank.rankInfo.param1 "..rank.rankInfo.param1.." practiceLevel:"..rank.practiceLevel) + LogError("rank.practiceLevel:"..tostring(rank.practiceLevel)) rank.userName = PracticeManager.SetNameColor(rank.userName,rank.practiceLevel) this.curRankingData[length+i]=rank end diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua b/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua index 0c093f9d73..ba70477a60 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua @@ -13,7 +13,8 @@ function TreasureStorePopup:InitComponent() this.backBtn=Util.GetGameObject(this.panel,"BackBtn") this.time=Util.GetGameObject(this.panel,"Time"):GetComponent("Text") this.oneKeyBtn=Util.GetGameObject(this.panel,"oneKeyBtn") - this.oneKeyBtnButton=Util.GetGameObject(this.panel,"oneKeyBtn"):GetComponent("Button") + this.oneKeyBtn:SetActive(false) + -- this.oneKeyBtnButton=Util.GetGameObject(this.panel,"oneKeyBtn"):GetComponent("Button") this.scroll=Util.GetGameObject(this.panel,"Scroll") this.scrollPre=Util.GetGameObject(this.scroll,"Pre") this.scrollView=SubUIManager.Open(SubUIConfig.ScrollCycleView,this.scroll.transform,this.scrollPre, nil, @@ -30,12 +31,12 @@ function TreasureStorePopup:BindEvent() Util.AddClick(this.backBtn,function() self:ClosePanel() end) - Util.AddClick(this.oneKeyBtn,function() - LogGreen("rechargeId:"..rechargeId) - PayManager.Pay(rechargeId, function(id) - this.RechargeSuccessFunc(id) - end) - end) + -- Util.AddClick(this.oneKeyBtn,function() + -- LogGreen("rechargeId:"..rechargeId) + -- PayManager.Pay(rechargeId, function(id) + -- this.RechargeSuccessFunc(id) + -- end) + -- end) end function TreasureStorePopup:AddListener() @@ -71,18 +72,18 @@ function TreasureStorePopup:OnDestroy() itemsGrid = nil end -function TreasureStorePopup:RefreshOneKeyBuy(allData) - this.oneKeyBtnButton.enabled = true - Util.SetGray(this.oneKeyBtn,false) - for i = 1, #allData do - local boughtNum = OperatingManager.GetGoodsBuyTime(GoodsTypeDef.DirectPurchaseGift, allData[i].Id) or 0 - if allData[i].Limit - boughtNum < 1 then - this.oneKeyBtnButton.enabled = false - Util.SetGray(this.oneKeyBtn,true) - return - end - end -end +-- function TreasureStorePopup:RefreshOneKeyBuy(allData) +-- this.oneKeyBtnButton.enabled = true +-- Util.SetGray(this.oneKeyBtn,false) +-- for i = 1, #allData do +-- local boughtNum = OperatingManager.GetGoodsBuyTime(GoodsTypeDef.DirectPurchaseGift, allData[i].Id) or 0 +-- if allData[i].Limit - boughtNum < 1 then +-- this.oneKeyBtnButton.enabled = false +-- Util.SetGray(this.oneKeyBtn,true) +-- return +-- end +-- end +-- end --刷新面板 function TreasureStorePopup:RefreshPanel(isAni) local allData = {} @@ -97,7 +98,7 @@ function TreasureStorePopup:RefreshPanel(isAni) local data = ConfigManager.GetConfigDataByKey(ConfigName.RechargeCommodityConfig, "Id", data[i]) table.insert(allData,data) end - self:RefreshOneKeyBuy(allData) + -- self:RefreshOneKeyBuy(allData) if allData then allData = this.SortData(allData) this.scrollView:SetData(allData, function (index, go)