diff --git a/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua b/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua index 467487a04f..f12cdae019 100644 --- a/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua @@ -261,6 +261,7 @@ BLESSRESPONSE_SUPREMEREWARD_FIELD = protobuf.FieldDescriptor(); BLESSRESPONSE_COUNTREWARD_FIELD = protobuf.FieldDescriptor(); BLESSRESPONSE_REWARDVIEW_FIELD = protobuf.FieldDescriptor(); BLESSRESPONSE_LASTREFRESHTIME_FIELD = protobuf.FieldDescriptor(); +BLESSRESPONSE_COUNT_FIELD = protobuf.FieldDescriptor(); BLESSSAVEREQUEST = protobuf.Descriptor(); BLESSSAVEREQUEST_REWARDIDS_FIELD = protobuf.FieldDescriptor(); BLESSCHOOSEREQUEST = protobuf.Descriptor(); @@ -2850,11 +2851,21 @@ BLESSRESPONSE_LASTREFRESHTIME_FIELD.default_value = 0 BLESSRESPONSE_LASTREFRESHTIME_FIELD.type = 5 BLESSRESPONSE_LASTREFRESHTIME_FIELD.cpp_type = 1 +BLESSRESPONSE_COUNT_FIELD.name = "count" +BLESSRESPONSE_COUNT_FIELD.full_name = ".com.ljsd.jieling.protocols.blessResponse.count" +BLESSRESPONSE_COUNT_FIELD.number = 7 +BLESSRESPONSE_COUNT_FIELD.index = 6 +BLESSRESPONSE_COUNT_FIELD.label = 1 +BLESSRESPONSE_COUNT_FIELD.has_default_value = false +BLESSRESPONSE_COUNT_FIELD.default_value = 0 +BLESSRESPONSE_COUNT_FIELD.type = 5 +BLESSRESPONSE_COUNT_FIELD.cpp_type = 1 + BLESSRESPONSE.name = "blessResponse" BLESSRESPONSE.full_name = ".com.ljsd.jieling.protocols.blessResponse" BLESSRESPONSE.nested_types = {} BLESSRESPONSE.enum_types = {} -BLESSRESPONSE.fields = {BLESSRESPONSE_FIXREWARD_FIELD, BLESSRESPONSE_LEGENDREWARD_FIELD, BLESSRESPONSE_SUPREMEREWARD_FIELD, BLESSRESPONSE_COUNTREWARD_FIELD, BLESSRESPONSE_REWARDVIEW_FIELD, BLESSRESPONSE_LASTREFRESHTIME_FIELD} +BLESSRESPONSE.fields = {BLESSRESPONSE_FIXREWARD_FIELD, BLESSRESPONSE_LEGENDREWARD_FIELD, BLESSRESPONSE_SUPREMEREWARD_FIELD, BLESSRESPONSE_COUNTREWARD_FIELD, BLESSRESPONSE_REWARDVIEW_FIELD, BLESSRESPONSE_LASTREFRESHTIME_FIELD, BLESSRESPONSE_COUNT_FIELD} BLESSRESPONSE.is_extendable = false BLESSRESPONSE.extensions = {} BLESSSAVEREQUEST_REWARDIDS_FIELD.name = "rewardIds" diff --git a/Assets/ManagedResources/~Lua/Modules/Pray/PrayMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pray/PrayMainPanel.lua index ba4ddf383b..ca50ccc0aa 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pray/PrayMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pray/PrayMainPanel.lua @@ -327,12 +327,12 @@ end --展示额外奖励 function PrayMainPanel:OnShowExtraRewar() --额外奖励赋值 - allGetFinishRewardNum = 0 + allGetFinishRewardNum = PrayManager.GetCount() allGetRewardNum = 0 for i = 1, #PrayManager.patyRewardData do - if PrayManager.patyRewardData[i].state >= 3 then - allGetFinishRewardNum = allGetFinishRewardNum + 1 - end + -- if PrayManager.patyRewardData[i].state >= 3 then + -- allGetFinishRewardNum = allGetFinishRewardNum + 1 + -- end if PrayManager.patyRewardData[i].state >= 2 then allGetRewardNum = allGetRewardNum + 1 end diff --git a/Assets/ManagedResources/~Lua/Modules/Pray/PrayManager.lua b/Assets/ManagedResources/~Lua/Modules/Pray/PrayManager.lua index 3e93c89664..56b9ff995c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pray/PrayManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pray/PrayManager.lua @@ -9,9 +9,11 @@ this.supremeReward = {}--至尊奖励 this.extraRewardData = {}--额外奖励 抽到一定次数会有额外奖励 3#5#7#10#13#16 this.lastRefreshTime = 0 +local count = 0--抽取过的总次数 function this.Initialize(_msg) end function this.InitializeData(_msg) + this.SetCount(_msg.count) this.patyRewardData = {} this.patyPreviewRewardData = {} this.legendReward = {} @@ -185,9 +187,17 @@ function this.SetPatySingleRewardData(rewardId,chooseRewardId) this.patyPreviewRewardData[i].state = 3 end end + this.SetCount(this.GetCount() + 1) end --重置云梦祈祷 function this.ResetPatyRewardData(_msg) this.InitializeData(_msg) end + +function this.GetCount() + return count +end +function this.SetCount(_count) + count = _count +end return this \ No newline at end of file