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

dev_chengFeng
DESKTOP-98AVA47\Administrator 2021-07-22 16:41:13 +08:00
commit 1c75527f36
4 changed files with 637 additions and 627 deletions

View File

@ -934,7 +934,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1189879797113255339}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@ -11256,7 +11256,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2671413894708845251}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@ -21578,7 +21578,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3915160258044306129}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:

File diff suppressed because one or more lines are too long

View File

@ -839,9 +839,9 @@ function this.InitTreasureData(msg)
this.treasureData.tip = "完成无尽副本的任务提升秘宝等级,激活秘宝后还可领取额外奖励"
this.treasureData.resetTime = msg.resetTime
--购买状态
-- --LogGreen("msg.isBuy:"..msg.isBuy)
--LogGreen("msg.isBuy:"..msg.isBuy)
this.SetTreasureGiftState(msg.isBuy)
-- --LogGreen("msg.score:"..msg.score)
--LogGreen("msg.score:"..msg.score)
this.treasureData.curScore = BagManager.GetItemCountById(EndLessMapManager.scoreValueId) or 0
this.GetTreasureData()
this.treasureData.rewardData = this.treasureDataReward

View File

@ -136,7 +136,16 @@ function this.RegisterMessage(network)
socket:RegistNetMessage(MessageTypeProto_pb.VIP_LEVEL_STATE_RESPONSE, this.RefreshLevleRewardDatas)
-- --心愿抽卡信息推送
socket:RegistNetMessage(MessageTypeProto_pb.wishDrawCardIndication, this.WishDrawCardInfoIndication)
-- --心愿抽卡信息推送
socket:RegistNetMessage(MessageTypeProto_pb.ENDLESS_TREASURE_REFRESH_INDICATION, this.EenlessTreasureRefreshIndication)
end
--后端推送福利红包数据
function this.EenlessTreasureRefreshIndication(buffer)
local data = buffer:DataByte()
local msg = MapInfoProto_pb.EndlessTreasureInfoResponse()
msg:ParseFromString(data)
EndLessMapManager.InitTreasureData(msg)
end
--后端推送福利红包数据
@ -144,7 +153,6 @@ function this.WelfareRedPacketPush(buffer)
local data = buffer:DataByte()
local msg = PlayerInfoProto_pb.WelfareRedPacketPush()
msg:ParseFromString(data)
LogError("推送过来红包数据")
if msg.redpacket then
MyGuildManager.SetMyGuidRedPackage(msg.redpacket)
--CheckRedPointStatus(RedPointType.Guid_SendPackage)
@ -783,8 +791,6 @@ end
-- 更新关卡ID
function this.FreshFightId(buffer)
Log("后端推送关卡状态!")
LogError("==============")
local data=buffer:DataByte()
local msg=FightInfoProto_pb.MainLevelFightUpdateIndication()
msg:ParseFromString(data)
@ -914,7 +920,6 @@ function this.WorldLevelIndication(buffer)
local data = buffer:DataByte()
local msg = PlayerInfoProto_pb.WorldLevelIndication()
msg:ParseFromString(data)
-- LogError("%%%%%%%%%%世界等级推送 "..msg.worldLeve)
PlayerManager.RefreshWorldLeveData(msg.worldLeve)
end