Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts: # Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.luadev_chengFeng
						commit
						bfe29c5601
					
				
											
												Binary file not shown.
											
										
									
								| 
						 | 
					@ -58,6 +58,8 @@ GETPLAYERINFORESPONSE_MISSINGREFRESHCOUNT_FIELD = protobuf.FieldDescriptor();
 | 
				
			||||||
GETPLAYERINFORESPONSE_MONTHINFOS_FIELD = protobuf.FieldDescriptor();
 | 
					GETPLAYERINFORESPONSE_MONTHINFOS_FIELD = protobuf.FieldDescriptor();
 | 
				
			||||||
GETPLAYERINFORESPONSE_DAILYCHALLENGEINFO_FIELD = protobuf.FieldDescriptor();
 | 
					GETPLAYERINFORESPONSE_DAILYCHALLENGEINFO_FIELD = protobuf.FieldDescriptor();
 | 
				
			||||||
GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD = protobuf.FieldDescriptor();
 | 
					GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD = protobuf.FieldDescriptor();
 | 
				
			||||||
 | 
					GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD = protobuf.FieldDescriptor();
 | 
				
			||||||
 | 
					GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD = protobuf.FieldDescriptor();
 | 
				
			||||||
GETITEMINFOREQUEST = protobuf.Descriptor();
 | 
					GETITEMINFOREQUEST = protobuf.Descriptor();
 | 
				
			||||||
GETITEMINFOREQUEST_INDEX_FIELD = protobuf.FieldDescriptor();
 | 
					GETITEMINFOREQUEST_INDEX_FIELD = protobuf.FieldDescriptor();
 | 
				
			||||||
GETITEMINFORESPONSE = protobuf.Descriptor();
 | 
					GETITEMINFORESPONSE = protobuf.Descriptor();
 | 
				
			||||||
| 
						 | 
					@ -238,6 +240,8 @@ FIVEPLAYERUPDATEINDICATION_MONTHDAILYTAKE_FIELD = protobuf.FieldDescriptor();
 | 
				
			||||||
FIVEPLAYERUPDATEINDICATION_LASTFETETYPE_FIELD = protobuf.FieldDescriptor();
 | 
					FIVEPLAYERUPDATEINDICATION_LASTFETETYPE_FIELD = protobuf.FieldDescriptor();
 | 
				
			||||||
FIVEPLAYERUPDATEINDICATION_TAKEFETEREWARD_FIELD = protobuf.FieldDescriptor();
 | 
					FIVEPLAYERUPDATEINDICATION_TAKEFETEREWARD_FIELD = protobuf.FieldDescriptor();
 | 
				
			||||||
FIVEPLAYERUPDATEINDICATION_EXPEDITIONLEVE_FIELD = protobuf.FieldDescriptor();
 | 
					FIVEPLAYERUPDATEINDICATION_EXPEDITIONLEVE_FIELD = protobuf.FieldDescriptor();
 | 
				
			||||||
 | 
					FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD = protobuf.FieldDescriptor();
 | 
				
			||||||
 | 
					FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD = protobuf.FieldDescriptor();
 | 
				
			||||||
GETMISSIONRESPONSE = protobuf.Descriptor();
 | 
					GETMISSIONRESPONSE = protobuf.Descriptor();
 | 
				
			||||||
GETMISSIONRESPONSE_USERMISSIONINFO_FIELD = protobuf.FieldDescriptor();
 | 
					GETMISSIONRESPONSE_USERMISSIONINFO_FIELD = protobuf.FieldDescriptor();
 | 
				
			||||||
REFRESHITEMNUMREQUEST = protobuf.Descriptor();
 | 
					REFRESHITEMNUMREQUEST = protobuf.Descriptor();
 | 
				
			||||||
| 
						 | 
					@ -973,11 +977,31 @@ GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD.default_value = 0
 | 
				
			||||||
GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD.type = 5
 | 
					GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD.type = 5
 | 
				
			||||||
GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD.cpp_type = 1
 | 
					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.name = "GetPlayerInfoResponse"
 | 
				
			||||||
GETPLAYERINFORESPONSE.full_name = ".com.ljsd.jieling.protocols.GetPlayerInfoResponse"
 | 
					GETPLAYERINFORESPONSE.full_name = ".com.ljsd.jieling.protocols.GetPlayerInfoResponse"
 | 
				
			||||||
GETPLAYERINFORESPONSE.nested_types = {}
 | 
					GETPLAYERINFORESPONSE.nested_types = {}
 | 
				
			||||||
GETPLAYERINFORESPONSE.enum_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.is_extendable = false
 | 
				
			||||||
GETPLAYERINFORESPONSE.extensions = {}
 | 
					GETPLAYERINFORESPONSE.extensions = {}
 | 
				
			||||||
GETITEMINFOREQUEST_INDEX_FIELD.name = "index"
 | 
					GETITEMINFOREQUEST_INDEX_FIELD.name = "index"
 | 
				
			||||||
| 
						 | 
					@ -2621,11 +2645,31 @@ FIVEPLAYERUPDATEINDICATION_EXPEDITIONLEVE_FIELD.default_value = 0
 | 
				
			||||||
FIVEPLAYERUPDATEINDICATION_EXPEDITIONLEVE_FIELD.type = 5
 | 
					FIVEPLAYERUPDATEINDICATION_EXPEDITIONLEVE_FIELD.type = 5
 | 
				
			||||||
FIVEPLAYERUPDATEINDICATION_EXPEDITIONLEVE_FIELD.cpp_type = 1
 | 
					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.name = "FivePlayerUpdateIndication"
 | 
				
			||||||
FIVEPLAYERUPDATEINDICATION.full_name = ".com.ljsd.jieling.protocols.FivePlayerUpdateIndication"
 | 
					FIVEPLAYERUPDATEINDICATION.full_name = ".com.ljsd.jieling.protocols.FivePlayerUpdateIndication"
 | 
				
			||||||
FIVEPLAYERUPDATEINDICATION.nested_types = {}
 | 
					FIVEPLAYERUPDATEINDICATION.nested_types = {}
 | 
				
			||||||
FIVEPLAYERUPDATEINDICATION.enum_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.is_extendable = false
 | 
				
			||||||
FIVEPLAYERUPDATEINDICATION.extensions = {}
 | 
					FIVEPLAYERUPDATEINDICATION.extensions = {}
 | 
				
			||||||
GETMISSIONRESPONSE_USERMISSIONINFO_FIELD.name = "userMissionInfo"
 | 
					GETMISSIONRESPONSE_USERMISSIONINFO_FIELD.name = "userMissionInfo"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -231,7 +231,7 @@ end
 | 
				
			||||||
function Skill:GetDirectTargetsNoMiss()
 | 
					function Skill:GetDirectTargetsNoMiss()
 | 
				
			||||||
    local list = {}
 | 
					    local list = {}
 | 
				
			||||||
    for _, role in ipairs(self.effectTargets[1]) do
 | 
					    for _, role in ipairs(self.effectTargets[1]) do
 | 
				
			||||||
        if self.CheckTargetIsHit(role) then
 | 
					        if self:CheckTargetIsHit(role) then
 | 
				
			||||||
            table.insert(list, role)
 | 
					            table.insert(list, role)
 | 
				
			||||||
        end
 | 
					        end
 | 
				
			||||||
    end
 | 
					    end
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -38,6 +38,17 @@ local TreasureType={
 | 
				
			||||||
    Advanced=31,
 | 
					    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()
 | 
					function this.Initialize()
 | 
				
			||||||
    --世界跑马灯数据存储
 | 
					    --世界跑马灯数据存储
 | 
				
			||||||
    this.worldMessageData={}
 | 
					    this.worldMessageData={}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -246,12 +246,7 @@ function this.SwitchTreasureType(treasureType)
 | 
				
			||||||
    this.ClearDefault()
 | 
					    this.ClearDefault()
 | 
				
			||||||
    if treasureType==TreasureType.Lucky then
 | 
					    if treasureType==TreasureType.Lucky then
 | 
				
			||||||
        LuckyTurnTableManager.curTreasureType=treasureType
 | 
					        LuckyTurnTableManager.curTreasureType=treasureType
 | 
				
			||||||
 | 
					        this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",LuckyTurnTableManager.luckyTimes,maxTimesCount)
 | 
				
			||||||
        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.upView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.LuckyTreasure })
 | 
					        this.upView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.LuckyTreasure })
 | 
				
			||||||
        this.bg1.sprite=Util.LoadSprite(BgName[1])
 | 
					        this.bg1.sprite=Util.LoadSprite(BgName[1])
 | 
				
			||||||
| 
						 | 
					@ -288,20 +283,18 @@ function this.SwitchTreasureType(treasureType)
 | 
				
			||||||
        --探宝1次按钮
 | 
					        --探宝1次按钮
 | 
				
			||||||
        Util.AddOnceClick(this.treasureOnceBtn, function()
 | 
					        Util.AddOnceClick(this.treasureOnceBtn, function()
 | 
				
			||||||
            if LuckyTurnTableManager.GetTreasureTicketNum(treasureType)-oneData[2]>=0 
 | 
					            if LuckyTurnTableManager.GetTreasureTicketNum(treasureType)-oneData[2]>=0 
 | 
				
			||||||
            and tempnum + 1 <= maxTimesCount then
 | 
					            and LuckyTurnTableManager.luckyTimes + 1 <= maxTimesCount then
 | 
				
			||||||
                LuckyTurnTableManager.GetLuckyTurnRankRequest(TreasureType.Lucky,false,function()
 | 
					                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))
 | 
					                    --Log("==YSP== 幸运探宝返回的是什么"..tostring(LuckyTurnTableManager.luckyTempData.posInfos))
 | 
				
			||||||
                    this.SetTableTurnEffect(TableTurnType.Expedite,TreasureType.Lucky,LuckyTurnTableManager.luckyTempData.posInfos[1].pos)
 | 
					                    this.SetTableTurnEffect(TableTurnType.Expedite,TreasureType.Lucky,LuckyTurnTableManager.luckyTempData.posInfos[1].pos)
 | 
				
			||||||
                    this.SetPropShow(60,TreasureType.Lucky)--更新消耗道具显示
 | 
					                    this.SetPropShow(60,TreasureType.Lucky)--更新消耗道具显示
 | 
				
			||||||
                    this.RrFreshInfo()
 | 
					                    this.RrFreshInfo()
 | 
				
			||||||
 | 
					                    LuckyTurnTableManager.SetTimes(LuckyTurnTableManager.luckyTimes + 1)
 | 
				
			||||||
 | 
					                    this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",LuckyTurnTableManager.luckyTimes,maxTimesCount)
 | 
				
			||||||
                end)
 | 
					                end)
 | 
				
			||||||
            else
 | 
					            else
 | 
				
			||||||
                --PopupTipPanel.ShowTip("幸运探宝券不足!")
 | 
					                --PopupTipPanel.ShowTip("幸运探宝券不足!")
 | 
				
			||||||
                if tempnum + 1 > maxTimesCount then
 | 
					                if LuckyTurnTableManager.luckyTimes + 1 > maxTimesCount then
 | 
				
			||||||
                    PopupTipPanel.ShowTip("不可超出最大探宝次数!")
 | 
					                    PopupTipPanel.ShowTip("不可超出最大探宝次数!")
 | 
				
			||||||
                    return
 | 
					                    return
 | 
				
			||||||
                else
 | 
					                else
 | 
				
			||||||
| 
						 | 
					@ -312,19 +305,18 @@ function this.SwitchTreasureType(treasureType)
 | 
				
			||||||
        --探宝10次按钮
 | 
					        --探宝10次按钮
 | 
				
			||||||
        Util.AddOnceClick(this.treasureMultipleBtn, function()
 | 
					        Util.AddOnceClick(this.treasureMultipleBtn, function()
 | 
				
			||||||
            if LuckyTurnTableManager.GetTreasureTicketNum(treasureType)-moreData[2]>=0 
 | 
					            if LuckyTurnTableManager.GetTreasureTicketNum(treasureType)-moreData[2]>=0 
 | 
				
			||||||
            and tempnum + 15 <= maxTimesCount then              
 | 
					            and LuckyTurnTableManager.luckyTimes + 15 <= maxTimesCount then              
 | 
				
			||||||
                LuckyTurnTableManager.GetLuckyTurnRankRequest(TreasureType.Lucky,true,function()
 | 
					                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))
 | 
					                    --Log("==YSP== 幸运探宝返回的是什么"..tostring(LuckyTurnTableManager.luckyTempData))
 | 
				
			||||||
                    this.SetTableTurnEffect(TableTurnType.Expedite,TreasureType.Lucky,LuckyTurnTableManager.luckyTempData.posInfos[1].pos)
 | 
					                    this.SetTableTurnEffect(TableTurnType.Expedite,TreasureType.Lucky,LuckyTurnTableManager.luckyTempData.posInfos[1].pos)
 | 
				
			||||||
                    this.SetPropShow(60,TreasureType.Lucky)--更新消耗道具显示
 | 
					                    this.SetPropShow(60,TreasureType.Lucky)--更新消耗道具显示
 | 
				
			||||||
                    this.RrFreshInfo()
 | 
					                    this.RrFreshInfo()
 | 
				
			||||||
 | 
					                    LuckyTurnTableManager.SetTimes(LuckyTurnTableManager.luckyTimes + 15)
 | 
				
			||||||
 | 
					                    this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",LuckyTurnTableManager.luckyTimes,maxTimesCount)
 | 
				
			||||||
                end)
 | 
					                end)
 | 
				
			||||||
            else
 | 
					            else
 | 
				
			||||||
                --PopupTipPanel.ShowTip("幸运探宝券不足!")
 | 
					                --PopupTipPanel.ShowTip("幸运探宝券不足!")
 | 
				
			||||||
                if tempnum + 15 > maxTimesCount then
 | 
					                if LuckyTurnTableManager.luckyTimes + 15 > maxTimesCount then
 | 
				
			||||||
                    PopupTipPanel.ShowTip("不可超出最大探宝次数!")
 | 
					                    PopupTipPanel.ShowTip("不可超出最大探宝次数!")
 | 
				
			||||||
                    return
 | 
					                    return
 | 
				
			||||||
                else
 | 
					                else
 | 
				
			||||||
| 
						 | 
					@ -365,11 +357,7 @@ function this.SwitchTreasureType(treasureType)
 | 
				
			||||||
    elseif treasureType==TreasureType.Advanced then
 | 
					    elseif treasureType==TreasureType.Advanced then
 | 
				
			||||||
        LuckyTurnTableManager.curTreasureType=treasureType
 | 
					        LuckyTurnTableManager.curTreasureType=treasureType
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if not PlayerPrefs.HasKey("treasure" .. treasureType) then
 | 
					        this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",LuckyTurnTableManager.advanceTimes,maxTimesCount)
 | 
				
			||||||
            PlayerPrefs.SetInt("treasure" .. treasureType, 0)
 | 
					 | 
				
			||||||
        end
 | 
					 | 
				
			||||||
        local tempnum = PlayerPrefs.GetInt("treasure" .. treasureType)
 | 
					 | 
				
			||||||
        this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",tempnum,maxTimesCount)
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        this.upView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.AdvancedTreasure })
 | 
					        this.upView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.AdvancedTreasure })
 | 
				
			||||||
        this.bg1.sprite=Util.LoadSprite(BgName[3])
 | 
					        this.bg1.sprite=Util.LoadSprite(BgName[3])
 | 
				
			||||||
| 
						 | 
					@ -407,11 +395,10 @@ function this.SwitchTreasureType(treasureType)
 | 
				
			||||||
        --探宝1次按钮
 | 
					        --探宝1次按钮
 | 
				
			||||||
        Util.AddOnceClick(this.treasureOnceBtn, function()
 | 
					        Util.AddOnceClick(this.treasureOnceBtn, function()
 | 
				
			||||||
            if LuckyTurnTableManager.GetTreasureTicketNum(treasureType)-oneData[2]>=0 
 | 
					            if LuckyTurnTableManager.GetTreasureTicketNum(treasureType)-oneData[2]>=0 
 | 
				
			||||||
            and tempnum + 1 <= maxTimesCount then
 | 
					            and LuckyTurnTableManager.advanceTimes + 1 <= maxTimesCount then
 | 
				
			||||||
                LuckyTurnTableManager.GetLuckyTurnRankRequest(TreasureType.Advanced,false,function()
 | 
					                LuckyTurnTableManager.GetLuckyTurnRankRequest(TreasureType.Advanced,false,function()
 | 
				
			||||||
                    tempnum = tempnum + 1
 | 
					                    LuckyTurnTableManager.SetTimes(nil,LuckyTurnTableManager.advanceTimes + 1)
 | 
				
			||||||
                    PlayerPrefs.SetInt("treasure" .. treasureType, tempnum)
 | 
					                    this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",LuckyTurnTableManager.advanceTimes,maxTimesCount)
 | 
				
			||||||
                    this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",tempnum,maxTimesCount)
 | 
					 | 
				
			||||||
                    --Log("==YSP== 高级探宝返回的是什么"..tostring(LuckyTurnTableManager.advancedTempData))
 | 
					                    --Log("==YSP== 高级探宝返回的是什么"..tostring(LuckyTurnTableManager.advancedTempData))
 | 
				
			||||||
                    this.SetTableTurnEffect(TableTurnType.Expedite,TreasureType.Advanced,LuckyTurnTableManager.advancedTempData.posInfos[1].pos)
 | 
					                    this.SetTableTurnEffect(TableTurnType.Expedite,TreasureType.Advanced,LuckyTurnTableManager.advancedTempData.posInfos[1].pos)
 | 
				
			||||||
                    this.SetPropShow(61,TreasureType.Advanced)
 | 
					                    this.SetPropShow(61,TreasureType.Advanced)
 | 
				
			||||||
| 
						 | 
					@ -419,7 +406,7 @@ function this.SwitchTreasureType(treasureType)
 | 
				
			||||||
                end)
 | 
					                end)
 | 
				
			||||||
            else
 | 
					            else
 | 
				
			||||||
                --PopupTipPanel.ShowTip("高级探宝券不足!")
 | 
					                --PopupTipPanel.ShowTip("高级探宝券不足!")
 | 
				
			||||||
                if tempnum + 1 > maxTimesCount then
 | 
					                if LuckyTurnTableManager.advanceTimes + 1 > maxTimesCount then
 | 
				
			||||||
                    PopupTipPanel.ShowTip("不可超出最大探宝次数!")
 | 
					                    PopupTipPanel.ShowTip("不可超出最大探宝次数!")
 | 
				
			||||||
                    return
 | 
					                    return
 | 
				
			||||||
                else
 | 
					                else
 | 
				
			||||||
| 
						 | 
					@ -430,11 +417,10 @@ function this.SwitchTreasureType(treasureType)
 | 
				
			||||||
        --探宝10次按钮
 | 
					        --探宝10次按钮
 | 
				
			||||||
        Util.AddOnceClick(this.treasureMultipleBtn, function()
 | 
					        Util.AddOnceClick(this.treasureMultipleBtn, function()
 | 
				
			||||||
            if LuckyTurnTableManager.GetTreasureTicketNum(treasureType)-moreData[2]>=0 
 | 
					            if LuckyTurnTableManager.GetTreasureTicketNum(treasureType)-moreData[2]>=0 
 | 
				
			||||||
            and tempnum + 10 <= maxTimesCount then
 | 
					            and LuckyTurnTableManager.advanceTimes + 10 <= maxTimesCount then
 | 
				
			||||||
                LuckyTurnTableManager.GetLuckyTurnRankRequest(TreasureType.Advanced,true,function()
 | 
					                LuckyTurnTableManager.GetLuckyTurnRankRequest(TreasureType.Advanced,true,function()
 | 
				
			||||||
                    tempnum = tempnum + 10
 | 
					                    LuckyTurnTableManager.SetTimes(nil,LuckyTurnTableManager.advanceTimes + 10)
 | 
				
			||||||
                    PlayerPrefs.SetInt("treasure" .. treasureType, tempnum)
 | 
					                    this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",LuckyTurnTableManager.advanceTimes,maxTimesCount)
 | 
				
			||||||
                    this.maxTimes.text =string.format("单日最大探宝次数:%s/%s",tempnum,maxTimesCount)
 | 
					 | 
				
			||||||
                    --Log("==YSP== 高级探宝返回的是什么"..tostring(LuckyTurnTableManager.advancedTempData))
 | 
					                    --Log("==YSP== 高级探宝返回的是什么"..tostring(LuckyTurnTableManager.advancedTempData))
 | 
				
			||||||
                    this.SetTableTurnEffect(TableTurnType.Expedite,TreasureType.Advanced,LuckyTurnTableManager.advancedTempData.posInfos[1].pos)
 | 
					                    this.SetTableTurnEffect(TableTurnType.Expedite,TreasureType.Advanced,LuckyTurnTableManager.advancedTempData.posInfos[1].pos)
 | 
				
			||||||
                    this.SetPropShow(61,TreasureType.Advanced)
 | 
					                    this.SetPropShow(61,TreasureType.Advanced)
 | 
				
			||||||
| 
						 | 
					@ -442,7 +428,7 @@ function this.SwitchTreasureType(treasureType)
 | 
				
			||||||
                end)
 | 
					                end)
 | 
				
			||||||
            else
 | 
					            else
 | 
				
			||||||
                --PopupTipPanel.ShowTip("高级探宝券不足!")
 | 
					                --PopupTipPanel.ShowTip("高级探宝券不足!")
 | 
				
			||||||
                if tempnum + 10 > maxTimesCount then
 | 
					                if LuckyTurnTableManager.advanceTimes + 10 > maxTimesCount then
 | 
				
			||||||
                    PopupTipPanel.ShowTip("不可超出最大探宝次数!")
 | 
					                    PopupTipPanel.ShowTip("不可超出最大探宝次数!")
 | 
				
			||||||
                    return
 | 
					                    return
 | 
				
			||||||
                else
 | 
					                else
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -88,7 +88,7 @@ function this.test(itemId)
 | 
				
			||||||
        if not this.turnEffect2 then
 | 
					        if not this.turnEffect2 then
 | 
				
			||||||
            this.turnEffect2 = Timer.New(function()
 | 
					            this.turnEffect2 = Timer.New(function()
 | 
				
			||||||
                this.tableTurnEffect(1/t)
 | 
					                this.tableTurnEffect(1/t)
 | 
				
			||||||
                t=t-5
 | 
					                t=t-3.3
 | 
				
			||||||
            end,0.2,10,true)    
 | 
					            end,0.2,10,true)    
 | 
				
			||||||
            this.turnEffect2:Start()
 | 
					            this.turnEffect2:Start()
 | 
				
			||||||
        end
 | 
					        end
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -157,6 +157,8 @@ function this.RefreshUpdateIndication(buffer)
 | 
				
			||||||
    CheckRedPointStatus(RedPointType.Guild_AidBox)
 | 
					    CheckRedPointStatus(RedPointType.Guild_AidBox)
 | 
				
			||||||
    CheckRedPointStatus(RedPointType.Guild_AidGuild)
 | 
					    CheckRedPointStatus(RedPointType.Guild_AidGuild)
 | 
				
			||||||
    CheckRedPointStatus(RedPointType.Guild_AidMy)
 | 
					    CheckRedPointStatus(RedPointType.Guild_AidMy)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    LuckyTurnTableManager.SetTimes(msg.hadLuckTime,msg.hadAdvanceLuckyTime)
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
--服务器推送红点信息
 | 
					--服务器推送红点信息
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -185,7 +185,7 @@ function this.PlayerInfoRequest(func)
 | 
				
			||||||
        for _, type in ipairs(msg.playedMapTypes) do
 | 
					        for _, type in ipairs(msg.playedMapTypes) do
 | 
				
			||||||
            Log(Language[11425]..type)
 | 
					            Log(Language[11425]..type)
 | 
				
			||||||
        end
 | 
					        end
 | 
				
			||||||
 | 
					        LuckyTurnTableManager.SetTimes(msg.hadLuckTime,msg.hadAdvanceLuckyTime)
 | 
				
			||||||
        if func then
 | 
					        if func then
 | 
				
			||||||
            func(msg)
 | 
					            func(msg)
 | 
				
			||||||
        end
 | 
					        end
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
											
												Binary file not shown.
											
										
									
								
											
												Binary file not shown.
											
										
									
								
											
												Binary file not shown.
											
										
									
								
		Loading…
	
		Reference in New Issue