From 3ae65767d003ddc361e02576f3e3f90e09f7c131 Mon Sep 17 00:00:00 2001 From: jiaoyangna <17610272109@lianjingshidai.com> Date: Thu, 16 Jul 2020 20:36:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B8=E8=BF=90=E6=8E=A2=E5=AE=9D=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Message/PlayerInfoProto_pb.lua | 48 +++++++++++++++++- .../LuckyTurnTable/LuckyTurnTableManager.lua | 11 ++++ .../LuckyTurnTable/LuckyTurnTablePanel.lua | 50 +++++++------------ .../Map/TrialMiniGame/Logic/Game_17.lua | 8 +-- .../~Lua/Modules/Net/IndicationManager.lua | 1 + .../~Lua/Modules/Net/NetManager.lua | 2 +- 6 files changed, 81 insertions(+), 39 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua b/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua index b391325e85..accd7828d7 100644 --- a/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua @@ -58,6 +58,8 @@ GETPLAYERINFORESPONSE_MISSINGREFRESHCOUNT_FIELD = protobuf.FieldDescriptor(); GETPLAYERINFORESPONSE_MONTHINFOS_FIELD = protobuf.FieldDescriptor(); GETPLAYERINFORESPONSE_DAILYCHALLENGEINFO_FIELD = protobuf.FieldDescriptor(); GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD = protobuf.FieldDescriptor(); +GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD = protobuf.FieldDescriptor(); +GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD = protobuf.FieldDescriptor(); GETITEMINFOREQUEST = protobuf.Descriptor(); GETITEMINFOREQUEST_INDEX_FIELD = protobuf.FieldDescriptor(); GETITEMINFORESPONSE = protobuf.Descriptor(); @@ -238,6 +240,8 @@ FIVEPLAYERUPDATEINDICATION_MONTHDAILYTAKE_FIELD = protobuf.FieldDescriptor(); FIVEPLAYERUPDATEINDICATION_LASTFETETYPE_FIELD = protobuf.FieldDescriptor(); FIVEPLAYERUPDATEINDICATION_TAKEFETEREWARD_FIELD = protobuf.FieldDescriptor(); FIVEPLAYERUPDATEINDICATION_EXPEDITIONLEVE_FIELD = protobuf.FieldDescriptor(); +FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD = protobuf.FieldDescriptor(); +FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD = protobuf.FieldDescriptor(); GETMISSIONRESPONSE = protobuf.Descriptor(); GETMISSIONRESPONSE_USERMISSIONINFO_FIELD = protobuf.FieldDescriptor(); REFRESHITEMNUMREQUEST = protobuf.Descriptor(); @@ -973,11 +977,31 @@ GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD.default_value = 0 GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD.type = 5 GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD.cpp_type = 1 +GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD.name = "hadLuckTime" +GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD.full_name = ".com.ljsd.jieling.protocols.GetPlayerInfoResponse.hadLuckTime" +GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD.number = 32 +GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD.index = 31 +GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD.label = 1 +GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD.has_default_value = false +GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD.default_value = 0 +GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD.type = 5 +GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD.cpp_type = 1 + +GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD.name = "hadAdvanceLuckTime" +GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD.full_name = ".com.ljsd.jieling.protocols.GetPlayerInfoResponse.hadAdvanceLuckTime" +GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD.number = 33 +GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD.index = 32 +GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD.label = 1 +GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD.has_default_value = false +GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD.default_value = 0 +GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD.type = 5 +GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD.cpp_type = 1 + GETPLAYERINFORESPONSE.name = "GetPlayerInfoResponse" GETPLAYERINFORESPONSE.full_name = ".com.ljsd.jieling.protocols.GetPlayerInfoResponse" GETPLAYERINFORESPONSE.nested_types = {} GETPLAYERINFORESPONSE.enum_types = {} -GETPLAYERINFORESPONSE.fields = {GETPLAYERINFORESPONSE_PLAYER_FIELD, GETPLAYERINFORESPONSE_NEWPLAYERGUIDEPOINT_FIELD, GETPLAYERINFORESPONSE_PRIVILEGE_FIELD, GETPLAYERINFORESPONSE_GIFTGOODSINFO_FIELD, GETPLAYERINFORESPONSE_BUYGOODSID_FIELD, GETPLAYERINFORESPONSE_SUDDENLYBOSSINFO_FIELD, GETPLAYERINFORESPONSE_VIPLEVETAKE_FIELD, GETPLAYERINFORESPONSE_USERCREATETIME_FIELD, GETPLAYERINFORESPONSE_REDTYPE_FIELD, GETPLAYERINFORESPONSE_RANDCOUNT_FIELD, GETPLAYERINFORESPONSE_HEROHANDBOOK_FIELD, GETPLAYERINFORESPONSE_EQUIPHANDBOOK_FIELD, GETPLAYERINFORESPONSE_TOWERRECEIVEDREWARD_FIELD, GETPLAYERINFORESPONSE_GOODSTYPEDURATION_FIELD, GETPLAYERINFORESPONSE_TREASURELEVEL_FIELD, GETPLAYERINFORESPONSE_HADBUYTREASURE_FIELD, GETPLAYERINFORESPONSE_SIGNININFO_FIELD, GETPLAYERINFORESPONSE_FIRSTTENTH_FIELD, GETPLAYERINFORESPONSE_MONSTERATTACKTIME_FIELD, GETPLAYERINFORESPONSE_ISDAYFIRST_FIELD, GETPLAYERINFORESPONSE_ENDINFO_FIELD, GETPLAYERINFORESPONSE_PLAYERBINDPHONE_FIELD, GETPLAYERINFORESPONSE_QUESTIONSTATE_FIELD, GETPLAYERINFORESPONSE_SOULEQUIPPOOL_FIELD, GETPLAYERINFORESPONSE_PLAYEDMAPTYPES_FIELD, GETPLAYERINFORESPONSE_AMOUNT_FIELD, GETPLAYERINFORESPONSE_VIPDAILY_FIELD, GETPLAYERINFORESPONSE_MISSINGREFRESHCOUNT_FIELD, GETPLAYERINFORESPONSE_MONTHINFOS_FIELD, GETPLAYERINFORESPONSE_DAILYCHALLENGEINFO_FIELD, GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD} +GETPLAYERINFORESPONSE.fields = {GETPLAYERINFORESPONSE_PLAYER_FIELD, GETPLAYERINFORESPONSE_NEWPLAYERGUIDEPOINT_FIELD, GETPLAYERINFORESPONSE_PRIVILEGE_FIELD, GETPLAYERINFORESPONSE_GIFTGOODSINFO_FIELD, GETPLAYERINFORESPONSE_BUYGOODSID_FIELD, GETPLAYERINFORESPONSE_SUDDENLYBOSSINFO_FIELD, GETPLAYERINFORESPONSE_VIPLEVETAKE_FIELD, GETPLAYERINFORESPONSE_USERCREATETIME_FIELD, GETPLAYERINFORESPONSE_REDTYPE_FIELD, GETPLAYERINFORESPONSE_RANDCOUNT_FIELD, GETPLAYERINFORESPONSE_HEROHANDBOOK_FIELD, GETPLAYERINFORESPONSE_EQUIPHANDBOOK_FIELD, GETPLAYERINFORESPONSE_TOWERRECEIVEDREWARD_FIELD, GETPLAYERINFORESPONSE_GOODSTYPEDURATION_FIELD, GETPLAYERINFORESPONSE_TREASURELEVEL_FIELD, GETPLAYERINFORESPONSE_HADBUYTREASURE_FIELD, GETPLAYERINFORESPONSE_SIGNININFO_FIELD, GETPLAYERINFORESPONSE_FIRSTTENTH_FIELD, GETPLAYERINFORESPONSE_MONSTERATTACKTIME_FIELD, GETPLAYERINFORESPONSE_ISDAYFIRST_FIELD, GETPLAYERINFORESPONSE_ENDINFO_FIELD, GETPLAYERINFORESPONSE_PLAYERBINDPHONE_FIELD, GETPLAYERINFORESPONSE_QUESTIONSTATE_FIELD, GETPLAYERINFORESPONSE_SOULEQUIPPOOL_FIELD, GETPLAYERINFORESPONSE_PLAYEDMAPTYPES_FIELD, GETPLAYERINFORESPONSE_AMOUNT_FIELD, GETPLAYERINFORESPONSE_VIPDAILY_FIELD, GETPLAYERINFORESPONSE_MISSINGREFRESHCOUNT_FIELD, GETPLAYERINFORESPONSE_MONTHINFOS_FIELD, GETPLAYERINFORESPONSE_DAILYCHALLENGEINFO_FIELD, GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD, GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD, GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD} GETPLAYERINFORESPONSE.is_extendable = false GETPLAYERINFORESPONSE.extensions = {} GETITEMINFOREQUEST_INDEX_FIELD.name = "index" @@ -2621,11 +2645,31 @@ FIVEPLAYERUPDATEINDICATION_EXPEDITIONLEVE_FIELD.default_value = 0 FIVEPLAYERUPDATEINDICATION_EXPEDITIONLEVE_FIELD.type = 5 FIVEPLAYERUPDATEINDICATION_EXPEDITIONLEVE_FIELD.cpp_type = 1 +FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD.name = "hadLuckTime" +FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD.full_name = ".com.ljsd.jieling.protocols.FivePlayerUpdateIndication.hadLuckTime" +FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD.number = 14 +FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD.index = 13 +FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD.label = 1 +FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD.has_default_value = false +FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD.default_value = 0 +FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD.type = 5 +FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD.cpp_type = 1 + +FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD.name = "hadAdvanceLuckTime" +FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD.full_name = ".com.ljsd.jieling.protocols.FivePlayerUpdateIndication.hadAdvanceLuckTime" +FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD.number = 15 +FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD.index = 14 +FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD.label = 1 +FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD.has_default_value = false +FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD.default_value = 0 +FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD.type = 5 +FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD.cpp_type = 1 + FIVEPLAYERUPDATEINDICATION.name = "FivePlayerUpdateIndication" FIVEPLAYERUPDATEINDICATION.full_name = ".com.ljsd.jieling.protocols.FivePlayerUpdateIndication" FIVEPLAYERUPDATEINDICATION.nested_types = {} FIVEPLAYERUPDATEINDICATION.enum_types = {} -FIVEPLAYERUPDATEINDICATION.fields = {FIVEPLAYERUPDATEINDICATION_HADTAKEDAILYBOX_FIELD, FIVEPLAYERUPDATEINDICATION_PRIVILEGE_FIELD, FIVEPLAYERUPDATEINDICATION_ACTIVITYINFO_FIELD, FIVEPLAYERUPDATEINDICATION_USERMISSIONINFO_FIELD, FIVEPLAYERUPDATEINDICATION_FIVERESETTOWERINFO_FIELD, FIVEPLAYERUPDATEINDICATION_SIGNININFO_FIELD, FIVEPLAYERUPDATEINDICATION_PLAYERBINDPHONE_FIELD, FIVEPLAYERUPDATEINDICATION_POSINFOS_FIELD, FIVEPLAYERUPDATEINDICATION_POSINFOSADVANCE_FIELD, FIVEPLAYERUPDATEINDICATION_MONTHDAILYTAKE_FIELD, FIVEPLAYERUPDATEINDICATION_LASTFETETYPE_FIELD, FIVEPLAYERUPDATEINDICATION_TAKEFETEREWARD_FIELD, FIVEPLAYERUPDATEINDICATION_EXPEDITIONLEVE_FIELD} +FIVEPLAYERUPDATEINDICATION.fields = {FIVEPLAYERUPDATEINDICATION_HADTAKEDAILYBOX_FIELD, FIVEPLAYERUPDATEINDICATION_PRIVILEGE_FIELD, FIVEPLAYERUPDATEINDICATION_ACTIVITYINFO_FIELD, FIVEPLAYERUPDATEINDICATION_USERMISSIONINFO_FIELD, FIVEPLAYERUPDATEINDICATION_FIVERESETTOWERINFO_FIELD, FIVEPLAYERUPDATEINDICATION_SIGNININFO_FIELD, FIVEPLAYERUPDATEINDICATION_PLAYERBINDPHONE_FIELD, FIVEPLAYERUPDATEINDICATION_POSINFOS_FIELD, FIVEPLAYERUPDATEINDICATION_POSINFOSADVANCE_FIELD, FIVEPLAYERUPDATEINDICATION_MONTHDAILYTAKE_FIELD, FIVEPLAYERUPDATEINDICATION_LASTFETETYPE_FIELD, FIVEPLAYERUPDATEINDICATION_TAKEFETEREWARD_FIELD, FIVEPLAYERUPDATEINDICATION_EXPEDITIONLEVE_FIELD, FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD, FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD} FIVEPLAYERUPDATEINDICATION.is_extendable = false FIVEPLAYERUPDATEINDICATION.extensions = {} GETMISSIONRESPONSE_USERMISSIONINFO_FIELD.name = "userMissionInfo" diff --git a/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTableManager.lua b/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTableManager.lua index 47aa4195ed..8b9f93a33e 100644 --- a/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTableManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTableManager.lua @@ -38,6 +38,17 @@ local TreasureType={ Advanced=31, } +this.luckyTimes = 0 +this.advanceTimes = 0 +function this.SetTimes(_luckyTimes,_advanceTimes) + if _luckyTimes then + this.luckyTimes = _luckyTimes + end + if _advanceTimes then + this.advanceTimes = _advanceTimes + end +end + function this.Initialize() --世界跑马灯数据存储 this.worldMessageData={} diff --git a/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua b/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua index 82eb1501b2..0059f20146 100644 --- a/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua @@ -246,12 +246,7 @@ function this.SwitchTreasureType(treasureType) this.ClearDefault() if treasureType==TreasureType.Lucky then LuckyTurnTableManager.curTreasureType=treasureType - - if not PlayerPrefs.HasKey("treasure" .. treasureType) then - PlayerPrefs.SetInt("treasure" .. treasureType, 0) - end - local tempnum = PlayerPrefs.GetInt("treasure" .. treasureType) - this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",tempnum,maxTimesCount) + this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",LuckyTurnTableManager.luckyTimes,maxTimesCount) this.upView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.LuckyTreasure }) this.bg1.sprite=Util.LoadSprite(BgName[1]) @@ -288,20 +283,18 @@ function this.SwitchTreasureType(treasureType) --探宝1次按钮 Util.AddOnceClick(this.treasureOnceBtn, function() if LuckyTurnTableManager.GetTreasureTicketNum(treasureType)-oneData[2]>=0 - and tempnum + 1 <= maxTimesCount then + and LuckyTurnTableManager.luckyTimes + 1 <= maxTimesCount then LuckyTurnTableManager.GetLuckyTurnRankRequest(TreasureType.Lucky,false,function() - tempnum = tempnum + 1 - PlayerPrefs.SetInt("treasure" .. treasureType, tempnum) - this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",tempnum,maxTimesCount) --Log("==YSP== 幸运探宝返回的是什么"..tostring(LuckyTurnTableManager.luckyTempData.posInfos)) this.SetTableTurnEffect(TableTurnType.Expedite,TreasureType.Lucky,LuckyTurnTableManager.luckyTempData.posInfos[1].pos) this.SetPropShow(60,TreasureType.Lucky)--更新消耗道具显示 this.RrFreshInfo() - + LuckyTurnTableManager.SetTimes(LuckyTurnTableManager.luckyTimes + 1) + this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",LuckyTurnTableManager.luckyTimes,maxTimesCount) end) else --PopupTipPanel.ShowTip("幸运探宝券不足!") - if tempnum + 1 > maxTimesCount then + if LuckyTurnTableManager.luckyTimes + 1 > maxTimesCount then PopupTipPanel.ShowTip("不可超出最大探宝次数!") return else @@ -312,19 +305,18 @@ function this.SwitchTreasureType(treasureType) --探宝10次按钮 Util.AddOnceClick(this.treasureMultipleBtn, function() if LuckyTurnTableManager.GetTreasureTicketNum(treasureType)-moreData[2]>=0 - and tempnum + 15 <= maxTimesCount then + and LuckyTurnTableManager.luckyTimes + 15 <= maxTimesCount then LuckyTurnTableManager.GetLuckyTurnRankRequest(TreasureType.Lucky,true,function() - tempnum = tempnum + 15 - PlayerPrefs.SetInt("treasure" .. treasureType, tempnum) - this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",tempnum,maxTimesCount) --Log("==YSP== 幸运探宝返回的是什么"..tostring(LuckyTurnTableManager.luckyTempData)) this.SetTableTurnEffect(TableTurnType.Expedite,TreasureType.Lucky,LuckyTurnTableManager.luckyTempData.posInfos[1].pos) this.SetPropShow(60,TreasureType.Lucky)--更新消耗道具显示 this.RrFreshInfo() + LuckyTurnTableManager.SetTimes(LuckyTurnTableManager.luckyTimes + 15) + this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",LuckyTurnTableManager.luckyTimes,maxTimesCount) end) else --PopupTipPanel.ShowTip("幸运探宝券不足!") - if tempnum + 15 > maxTimesCount then + if LuckyTurnTableManager.luckyTimes + 15 > maxTimesCount then PopupTipPanel.ShowTip("不可超出最大探宝次数!") return else @@ -365,11 +357,7 @@ function this.SwitchTreasureType(treasureType) elseif treasureType==TreasureType.Advanced then LuckyTurnTableManager.curTreasureType=treasureType - if not PlayerPrefs.HasKey("treasure" .. treasureType) then - PlayerPrefs.SetInt("treasure" .. treasureType, 0) - end - local tempnum = PlayerPrefs.GetInt("treasure" .. treasureType) - this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",tempnum,maxTimesCount) + this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",LuckyTurnTableManager.advanceTimes,maxTimesCount) this.upView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.AdvancedTreasure }) this.bg1.sprite=Util.LoadSprite(BgName[3]) @@ -407,11 +395,10 @@ function this.SwitchTreasureType(treasureType) --探宝1次按钮 Util.AddOnceClick(this.treasureOnceBtn, function() if LuckyTurnTableManager.GetTreasureTicketNum(treasureType)-oneData[2]>=0 - and tempnum + 1 <= maxTimesCount then + and LuckyTurnTableManager.advanceTimes + 1 <= maxTimesCount then LuckyTurnTableManager.GetLuckyTurnRankRequest(TreasureType.Advanced,false,function() - tempnum = tempnum + 1 - PlayerPrefs.SetInt("treasure" .. treasureType, tempnum) - this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",tempnum,maxTimesCount) + LuckyTurnTableManager.SetTimes(nil,LuckyTurnTableManager.advanceTimes + 1) + this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",LuckyTurnTableManager.advanceTimes,maxTimesCount) --Log("==YSP== 高级探宝返回的是什么"..tostring(LuckyTurnTableManager.advancedTempData)) this.SetTableTurnEffect(TableTurnType.Expedite,TreasureType.Advanced,LuckyTurnTableManager.advancedTempData.posInfos[1].pos) this.SetPropShow(61,TreasureType.Advanced) @@ -419,7 +406,7 @@ function this.SwitchTreasureType(treasureType) end) else --PopupTipPanel.ShowTip("高级探宝券不足!") - if tempnum + 1 > maxTimesCount then + if LuckyTurnTableManager.advanceTimes + 1 > maxTimesCount then PopupTipPanel.ShowTip("不可超出最大探宝次数!") return else @@ -430,11 +417,10 @@ function this.SwitchTreasureType(treasureType) --探宝10次按钮 Util.AddOnceClick(this.treasureMultipleBtn, function() if LuckyTurnTableManager.GetTreasureTicketNum(treasureType)-moreData[2]>=0 - and tempnum + 10 <= maxTimesCount then + and LuckyTurnTableManager.advanceTimes + 10 <= maxTimesCount then LuckyTurnTableManager.GetLuckyTurnRankRequest(TreasureType.Advanced,true,function() - tempnum = tempnum + 10 - PlayerPrefs.SetInt("treasure" .. treasureType, tempnum) - this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",tempnum,maxTimesCount) + LuckyTurnTableManager.SetTimes(nil,LuckyTurnTableManager.advanceTimes + 10) + this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",LuckyTurnTableManager.advanceTimes,maxTimesCount) --Log("==YSP== 高级探宝返回的是什么"..tostring(LuckyTurnTableManager.advancedTempData)) this.SetTableTurnEffect(TableTurnType.Expedite,TreasureType.Advanced,LuckyTurnTableManager.advancedTempData.posInfos[1].pos) this.SetPropShow(61,TreasureType.Advanced) @@ -442,7 +428,7 @@ function this.SwitchTreasureType(treasureType) end) else --PopupTipPanel.ShowTip("高级探宝券不足!") - if tempnum + 10 > maxTimesCount then + if LuckyTurnTableManager.advanceTimes + 10 > maxTimesCount then PopupTipPanel.ShowTip("不可超出最大探宝次数!") return else diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_17.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_17.lua index 406e01e2bf..0b2c77e0c6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_17.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_17.lua @@ -88,11 +88,11 @@ function this.test(itemId) if not this.turnEffect2 then this.turnEffect2 = Timer.New(function() this.tableTurnEffect(1/t) - t=t-5 - end,0.2,10,true) + t=t-3.3 + end,0.2,10,true) this.turnEffect2:Start() end - coroutine.wait(2) + coroutine.wait(2) this.tableTurnEffect(0.4,itemId) end) end @@ -100,7 +100,7 @@ end --设置速度 local index = 1 function this.tableTurnEffect(speed,itemId) - if this.turnEffect then + if this.turnEffect then this.turnEffect:Stop() this.turnEffect = nil end diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index 58b6f83d18..258cb87309 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -152,6 +152,7 @@ function this.RefreshUpdateIndication(buffer) CheckRedPointStatus(RedPointType.SecretTer_HaveFreeTime) CheckRedPointStatus(RedPointType.DailyGift) CheckRedPointStatus(RedPointType.GrowthPackage) + LuckyTurnTableManager.SetTimes(msg.hadLuckTime,msg.hadAdvanceLuckyTime) end --服务器推送红点信息 diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 63e78ff061..f7a520f1a6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -185,7 +185,7 @@ function this.PlayerInfoRequest(func) for _, type in ipairs(msg.playedMapTypes) do Log(Language[11425]..type) end - + LuckyTurnTableManager.SetTimes(msg.hadLuckTime,msg.hadAdvanceLuckyTime) if func then func(msg) end