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

dev_chengFeng
gaoxin 2021-05-27 16:51:20 +08:00
commit b25a6c01ff
7 changed files with 67 additions and 31 deletions

View File

@ -5693,7 +5693,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &3507432425270326966 --- !u!224 &3507432425270326966
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -6048,7 +6048,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {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_SizeDelta: {x: 379.34, y: 48.9}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8199684686231032773 --- !u!222 &8199684686231032773
@ -6086,7 +6086,7 @@ MonoBehaviour:
m_BestFit: 0 m_BestFit: 0
m_MinSize: 3 m_MinSize: 3
m_MaxSize: 40 m_MaxSize: 40
m_Alignment: 3 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0

View File

@ -614,6 +614,8 @@ GUILDHELPLOG_HELPERNAME_FIELD = protobuf.FieldDescriptor();
GUILDHELPLOG_TARGETNAME_FIELD = protobuf.FieldDescriptor(); GUILDHELPLOG_TARGETNAME_FIELD = protobuf.FieldDescriptor();
GUILDHELPLOG_TYPE_FIELD = protobuf.FieldDescriptor(); GUILDHELPLOG_TYPE_FIELD = protobuf.FieldDescriptor();
GUILDHELPLOG_TIME_FIELD = protobuf.FieldDescriptor(); GUILDHELPLOG_TIME_FIELD = protobuf.FieldDescriptor();
GUILDHELPLOG_HELPPRACTICELEVEL_FIELD = protobuf.FieldDescriptor();
GUILDHELPLOG_TARGETPRACTICELEVEL_FIELD = protobuf.FieldDescriptor();
VIEWHEROINFO = protobuf.Descriptor(); VIEWHEROINFO = protobuf.Descriptor();
VIEWHEROINFO_HERO_FIELD = protobuf.FieldDescriptor(); VIEWHEROINFO_HERO_FIELD = protobuf.FieldDescriptor();
VIEWHEROINFO_EQUIP_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.type = 5
GUILDHELPLOG_TIME_FIELD.cpp_type = 1 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.name = "GuildHelpLog"
GUILDHELPLOG.full_name = ".rpc.protocols.GuildHelpLog" GUILDHELPLOG.full_name = ".rpc.protocols.GuildHelpLog"
GUILDHELPLOG.nested_types = {} GUILDHELPLOG.nested_types = {}
GUILDHELPLOG.enum_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.is_extendable = false
GUILDHELPLOG.extensions = {} GUILDHELPLOG.extensions = {}
VIEWHEROINFO_HERO_FIELD.name = "hero" VIEWHEROINFO_HERO_FIELD.name = "hero"

View File

@ -325,6 +325,7 @@ GUILDHELPINFOINDICATION = protobuf.Descriptor();
GUILDHELPINFOINDICATION_UID_FIELD = protobuf.FieldDescriptor(); GUILDHELPINFOINDICATION_UID_FIELD = protobuf.FieldDescriptor();
GUILDHELPINFOINDICATION_NAME_FIELD = protobuf.FieldDescriptor(); GUILDHELPINFOINDICATION_NAME_FIELD = protobuf.FieldDescriptor();
GUILDHELPINFOINDICATION_GUILDHELPINFO_FIELD = protobuf.FieldDescriptor(); GUILDHELPINFOINDICATION_GUILDHELPINFO_FIELD = protobuf.FieldDescriptor();
GUILDHELPINFOINDICATION_PRACTICELEVEL_FIELD = protobuf.FieldDescriptor();
GUILDHELPHELPOTHERREQUEST = protobuf.Descriptor(); GUILDHELPHELPOTHERREQUEST = protobuf.Descriptor();
GUILDHELPHELPOTHERREQUEST_UID_FIELD = protobuf.FieldDescriptor(); GUILDHELPHELPOTHERREQUEST_UID_FIELD = protobuf.FieldDescriptor();
GUILDHELPHELPOTHERREQUEST_TYPE_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.type = 11
GUILDHELPINFOINDICATION_GUILDHELPINFO_FIELD.cpp_type = 10 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.name = "GuildHelpInfoIndication"
GUILDHELPINFOINDICATION.full_name = ".rpc.protocols.GuildHelpInfoIndication" GUILDHELPINFOINDICATION.full_name = ".rpc.protocols.GuildHelpInfoIndication"
GUILDHELPINFOINDICATION.nested_types = {} GUILDHELPINFOINDICATION.nested_types = {}
GUILDHELPINFOINDICATION.enum_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.is_extendable = false
GUILDHELPINFOINDICATION.extensions = {} GUILDHELPINFOINDICATION.extensions = {}
GUILDHELPHELPOTHERREQUEST_UID_FIELD.name = "uid" GUILDHELPHELPOTHERREQUEST_UID_FIELD.name = "uid"

View File

@ -87,11 +87,11 @@ end
function this.GetSingleStrInfo(curallAidData) function this.GetSingleStrInfo(curallAidData)
local str = "" local str = ""
if curallAidData.helperuid == PlayerManager.uid then 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 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 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 end
return str return str
end end

View File

@ -710,7 +710,8 @@ function MyGuildManager.SetAllGuildHelpInfo(msg)
if msg.guildHelpInfoIndication[i].uid and msg.guildHelpInfoIndication[i].uid > 0 then if msg.guildHelpInfoIndication[i].uid and msg.guildHelpInfoIndication[i].uid > 0 then
local singleHelpInfo = {} local singleHelpInfo = {}
singleHelpInfo.uid = msg.guildHelpInfoIndication[i].uid 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 = {} singleHelpInfo.guildHelpInfo = {}
for j = 1, #msg.guildHelpInfoIndication[i].guildHelpInfo do for j = 1, #msg.guildHelpInfoIndication[i].guildHelpInfo do
if msg.guildHelpInfoIndication[i].guildHelpInfo[j].num ~= -1 then if msg.guildHelpInfoIndication[i].guildHelpInfo[j].num ~= -1 then
@ -746,7 +747,7 @@ function MyGuildManager.SetSingleGuildHelpInfo(msg)
if uid == msg.uid then if uid == msg.uid then
isStarAdd = false isStarAdd = false
this.allGuildHelpInfo[uid].uid = msg.uid 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 = {} this.allGuildHelpInfo[uid].guildHelpInfo = {}
--LogGreen("msg.guildHelpInfo "..#msg.guildHelpInfo) --LogGreen("msg.guildHelpInfo "..#msg.guildHelpInfo)
for j = 1, #msg.guildHelpInfo do for j = 1, #msg.guildHelpInfo do
@ -767,7 +768,7 @@ function MyGuildManager.SetSingleGuildHelpInfo(msg)
if msg.uid and msg.uid > 0 then if msg.uid and msg.uid > 0 then
local singleHelpInfo = {} local singleHelpInfo = {}
singleHelpInfo.uid = msg.uid singleHelpInfo.uid = msg.uid
singleHelpInfo.name = msg.name singleHelpInfo.name = PracticeManager.SetNameColor(msg.name,msg.practiceLevel)
singleHelpInfo.guildHelpInfo = {} singleHelpInfo.guildHelpInfo = {}
-- --LogGreen("msg.guildHelpInfo "..#msg.guildHelpInfo) -- --LogGreen("msg.guildHelpInfo "..#msg.guildHelpInfo)
for j = 1, #msg.guildHelpInfo do for j = 1, #msg.guildHelpInfo do

View File

@ -62,6 +62,7 @@ function this.ReceiveNextRankingData(msg,fun)
local length=#this.curRankingData local length=#this.curRankingData
for i, rank in ipairs(msg.ranks) do 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) -- 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) rank.userName = PracticeManager.SetNameColor(rank.userName,rank.practiceLevel)
this.curRankingData[length+i]=rank this.curRankingData[length+i]=rank
end end

View File

@ -13,7 +13,8 @@ function TreasureStorePopup:InitComponent()
this.backBtn=Util.GetGameObject(this.panel,"BackBtn") this.backBtn=Util.GetGameObject(this.panel,"BackBtn")
this.time=Util.GetGameObject(this.panel,"Time"):GetComponent("Text") this.time=Util.GetGameObject(this.panel,"Time"):GetComponent("Text")
this.oneKeyBtn=Util.GetGameObject(this.panel,"oneKeyBtn") 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.scroll=Util.GetGameObject(this.panel,"Scroll")
this.scrollPre=Util.GetGameObject(this.scroll,"Pre") this.scrollPre=Util.GetGameObject(this.scroll,"Pre")
this.scrollView=SubUIManager.Open(SubUIConfig.ScrollCycleView,this.scroll.transform,this.scrollPre, nil, this.scrollView=SubUIManager.Open(SubUIConfig.ScrollCycleView,this.scroll.transform,this.scrollPre, nil,
@ -30,12 +31,12 @@ function TreasureStorePopup:BindEvent()
Util.AddClick(this.backBtn,function() Util.AddClick(this.backBtn,function()
self:ClosePanel() self:ClosePanel()
end) end)
Util.AddClick(this.oneKeyBtn,function() -- Util.AddClick(this.oneKeyBtn,function()
LogGreen("rechargeId:"..rechargeId) -- LogGreen("rechargeId:"..rechargeId)
PayManager.Pay(rechargeId, function(id) -- PayManager.Pay(rechargeId, function(id)
this.RechargeSuccessFunc(id) -- this.RechargeSuccessFunc(id)
end) -- end)
end) -- end)
end end
function TreasureStorePopup:AddListener() function TreasureStorePopup:AddListener()
@ -71,18 +72,18 @@ function TreasureStorePopup:OnDestroy()
itemsGrid = nil itemsGrid = nil
end end
function TreasureStorePopup:RefreshOneKeyBuy(allData) -- function TreasureStorePopup:RefreshOneKeyBuy(allData)
this.oneKeyBtnButton.enabled = true -- this.oneKeyBtnButton.enabled = true
Util.SetGray(this.oneKeyBtn,false) -- Util.SetGray(this.oneKeyBtn,false)
for i = 1, #allData do -- for i = 1, #allData do
local boughtNum = OperatingManager.GetGoodsBuyTime(GoodsTypeDef.DirectPurchaseGift, allData[i].Id) or 0 -- local boughtNum = OperatingManager.GetGoodsBuyTime(GoodsTypeDef.DirectPurchaseGift, allData[i].Id) or 0
if allData[i].Limit - boughtNum < 1 then -- if allData[i].Limit - boughtNum < 1 then
this.oneKeyBtnButton.enabled = false -- this.oneKeyBtnButton.enabled = false
Util.SetGray(this.oneKeyBtn,true) -- Util.SetGray(this.oneKeyBtn,true)
return -- return
end -- end
end -- end
end -- end
--刷新面板 --刷新面板
function TreasureStorePopup:RefreshPanel(isAni) function TreasureStorePopup:RefreshPanel(isAni)
local allData = {} local allData = {}
@ -97,7 +98,7 @@ function TreasureStorePopup:RefreshPanel(isAni)
local data = ConfigManager.GetConfigDataByKey(ConfigName.RechargeCommodityConfig, "Id", data[i]) local data = ConfigManager.GetConfigDataByKey(ConfigName.RechargeCommodityConfig, "Id", data[i])
table.insert(allData,data) table.insert(allData,data)
end end
self:RefreshOneKeyBuy(allData) -- self:RefreshOneKeyBuy(allData)
if allData then if allData then
allData = this.SortData(allData) allData = this.SortData(allData)
this.scrollView:SetData(allData, function (index, go) this.scrollView:SetData(allData, function (index, go)