Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
6adde33bf8
|
|
@ -41,6 +41,15 @@ TASUILINGXIAORESPONSE = protobuf.Descriptor();
|
|||
TASUILINGXIAORESPONSE_FIGHTDATA_FIELD = protobuf.FieldDescriptor();
|
||||
TASUILINGXIAORESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
|
||||
TASUILINGXIAORESPONSE_DAMAGEVAL_FIELD = protobuf.FieldDescriptor();
|
||||
CHOICEHEROREWARDREQUEST = protobuf.Descriptor();
|
||||
CHOICEHEROREWARDREQUEST_ACTIVITYID_FIELD = protobuf.FieldDescriptor();
|
||||
CHOICEHEROREWARDREQUEST_REWARDID_FIELD = protobuf.FieldDescriptor();
|
||||
CHOICEHEROREWARDRESPONSE = protobuf.Descriptor();
|
||||
CHOICEDRAWCARDREQUEST = protobuf.Descriptor();
|
||||
CHOICEDRAWCARDREQUEST_ACTIVITYID_FIELD = protobuf.FieldDescriptor();
|
||||
CHOICEDRAWCARDREQUEST_TYPE_FIELD = protobuf.FieldDescriptor();
|
||||
CHOICEDRAWCARDRESPONSE = protobuf.Descriptor();
|
||||
CHOICEDRAWCARDRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
|
||||
|
||||
COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.name = "itemId"
|
||||
COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.full_name = ".rpc.protocols.CommitShejiActivityItemRequest.itemId"
|
||||
|
|
@ -371,6 +380,85 @@ TASUILINGXIAORESPONSE.enum_types = {}
|
|||
TASUILINGXIAORESPONSE.fields = {TASUILINGXIAORESPONSE_FIGHTDATA_FIELD, TASUILINGXIAORESPONSE_DROP_FIELD, TASUILINGXIAORESPONSE_DAMAGEVAL_FIELD}
|
||||
TASUILINGXIAORESPONSE.is_extendable = false
|
||||
TASUILINGXIAORESPONSE.extensions = {}
|
||||
CHOICEHEROREWARDREQUEST_ACTIVITYID_FIELD.name = "activityId"
|
||||
CHOICEHEROREWARDREQUEST_ACTIVITYID_FIELD.full_name = ".rpc.protocols.choiceHeroRewardRequest.activityId"
|
||||
CHOICEHEROREWARDREQUEST_ACTIVITYID_FIELD.number = 1
|
||||
CHOICEHEROREWARDREQUEST_ACTIVITYID_FIELD.index = 0
|
||||
CHOICEHEROREWARDREQUEST_ACTIVITYID_FIELD.label = 1
|
||||
CHOICEHEROREWARDREQUEST_ACTIVITYID_FIELD.has_default_value = false
|
||||
CHOICEHEROREWARDREQUEST_ACTIVITYID_FIELD.default_value = 0
|
||||
CHOICEHEROREWARDREQUEST_ACTIVITYID_FIELD.type = 5
|
||||
CHOICEHEROREWARDREQUEST_ACTIVITYID_FIELD.cpp_type = 1
|
||||
|
||||
CHOICEHEROREWARDREQUEST_REWARDID_FIELD.name = "rewardId"
|
||||
CHOICEHEROREWARDREQUEST_REWARDID_FIELD.full_name = ".rpc.protocols.choiceHeroRewardRequest.rewardId"
|
||||
CHOICEHEROREWARDREQUEST_REWARDID_FIELD.number = 2
|
||||
CHOICEHEROREWARDREQUEST_REWARDID_FIELD.index = 1
|
||||
CHOICEHEROREWARDREQUEST_REWARDID_FIELD.label = 1
|
||||
CHOICEHEROREWARDREQUEST_REWARDID_FIELD.has_default_value = false
|
||||
CHOICEHEROREWARDREQUEST_REWARDID_FIELD.default_value = 0
|
||||
CHOICEHEROREWARDREQUEST_REWARDID_FIELD.type = 5
|
||||
CHOICEHEROREWARDREQUEST_REWARDID_FIELD.cpp_type = 1
|
||||
|
||||
CHOICEHEROREWARDREQUEST.name = "choiceHeroRewardRequest"
|
||||
CHOICEHEROREWARDREQUEST.full_name = ".rpc.protocols.choiceHeroRewardRequest"
|
||||
CHOICEHEROREWARDREQUEST.nested_types = {}
|
||||
CHOICEHEROREWARDREQUEST.enum_types = {}
|
||||
CHOICEHEROREWARDREQUEST.fields = {CHOICEHEROREWARDREQUEST_ACTIVITYID_FIELD, CHOICEHEROREWARDREQUEST_REWARDID_FIELD}
|
||||
CHOICEHEROREWARDREQUEST.is_extendable = false
|
||||
CHOICEHEROREWARDREQUEST.extensions = {}
|
||||
CHOICEHEROREWARDRESPONSE.name = "choiceHeroRewardResponse"
|
||||
CHOICEHEROREWARDRESPONSE.full_name = ".rpc.protocols.choiceHeroRewardResponse"
|
||||
CHOICEHEROREWARDRESPONSE.nested_types = {}
|
||||
CHOICEHEROREWARDRESPONSE.enum_types = {}
|
||||
CHOICEHEROREWARDRESPONSE.fields = {}
|
||||
CHOICEHEROREWARDRESPONSE.is_extendable = false
|
||||
CHOICEHEROREWARDRESPONSE.extensions = {}
|
||||
CHOICEDRAWCARDREQUEST_ACTIVITYID_FIELD.name = "activityId"
|
||||
CHOICEDRAWCARDREQUEST_ACTIVITYID_FIELD.full_name = ".rpc.protocols.choiceDrawCardRequest.activityId"
|
||||
CHOICEDRAWCARDREQUEST_ACTIVITYID_FIELD.number = 1
|
||||
CHOICEDRAWCARDREQUEST_ACTIVITYID_FIELD.index = 0
|
||||
CHOICEDRAWCARDREQUEST_ACTIVITYID_FIELD.label = 1
|
||||
CHOICEDRAWCARDREQUEST_ACTIVITYID_FIELD.has_default_value = false
|
||||
CHOICEDRAWCARDREQUEST_ACTIVITYID_FIELD.default_value = 0
|
||||
CHOICEDRAWCARDREQUEST_ACTIVITYID_FIELD.type = 5
|
||||
CHOICEDRAWCARDREQUEST_ACTIVITYID_FIELD.cpp_type = 1
|
||||
|
||||
CHOICEDRAWCARDREQUEST_TYPE_FIELD.name = "type"
|
||||
CHOICEDRAWCARDREQUEST_TYPE_FIELD.full_name = ".rpc.protocols.choiceDrawCardRequest.type"
|
||||
CHOICEDRAWCARDREQUEST_TYPE_FIELD.number = 2
|
||||
CHOICEDRAWCARDREQUEST_TYPE_FIELD.index = 1
|
||||
CHOICEDRAWCARDREQUEST_TYPE_FIELD.label = 1
|
||||
CHOICEDRAWCARDREQUEST_TYPE_FIELD.has_default_value = false
|
||||
CHOICEDRAWCARDREQUEST_TYPE_FIELD.default_value = 0
|
||||
CHOICEDRAWCARDREQUEST_TYPE_FIELD.type = 5
|
||||
CHOICEDRAWCARDREQUEST_TYPE_FIELD.cpp_type = 1
|
||||
|
||||
CHOICEDRAWCARDREQUEST.name = "choiceDrawCardRequest"
|
||||
CHOICEDRAWCARDREQUEST.full_name = ".rpc.protocols.choiceDrawCardRequest"
|
||||
CHOICEDRAWCARDREQUEST.nested_types = {}
|
||||
CHOICEDRAWCARDREQUEST.enum_types = {}
|
||||
CHOICEDRAWCARDREQUEST.fields = {CHOICEDRAWCARDREQUEST_ACTIVITYID_FIELD, CHOICEDRAWCARDREQUEST_TYPE_FIELD}
|
||||
CHOICEDRAWCARDREQUEST.is_extendable = false
|
||||
CHOICEDRAWCARDREQUEST.extensions = {}
|
||||
CHOICEDRAWCARDRESPONSE_DROP_FIELD.name = "drop"
|
||||
CHOICEDRAWCARDRESPONSE_DROP_FIELD.full_name = ".rpc.protocols.choiceDrawCardResponse.drop"
|
||||
CHOICEDRAWCARDRESPONSE_DROP_FIELD.number = 1
|
||||
CHOICEDRAWCARDRESPONSE_DROP_FIELD.index = 0
|
||||
CHOICEDRAWCARDRESPONSE_DROP_FIELD.label = 1
|
||||
CHOICEDRAWCARDRESPONSE_DROP_FIELD.has_default_value = false
|
||||
CHOICEDRAWCARDRESPONSE_DROP_FIELD.default_value = nil
|
||||
CHOICEDRAWCARDRESPONSE_DROP_FIELD.message_type = CommonProto_pb.DROP
|
||||
CHOICEDRAWCARDRESPONSE_DROP_FIELD.type = 11
|
||||
CHOICEDRAWCARDRESPONSE_DROP_FIELD.cpp_type = 10
|
||||
|
||||
CHOICEDRAWCARDRESPONSE.name = "choiceDrawCardResponse"
|
||||
CHOICEDRAWCARDRESPONSE.full_name = ".rpc.protocols.choiceDrawCardResponse"
|
||||
CHOICEDRAWCARDRESPONSE.nested_types = {}
|
||||
CHOICEDRAWCARDRESPONSE.enum_types = {}
|
||||
CHOICEDRAWCARDRESPONSE.fields = {CHOICEDRAWCARDRESPONSE_DROP_FIELD}
|
||||
CHOICEDRAWCARDRESPONSE.is_extendable = false
|
||||
CHOICEDRAWCARDRESPONSE.extensions = {}
|
||||
|
||||
CommitShejiActivityItemRequest = protobuf.Message(COMMITSHEJIACTIVITYITEMREQUEST)
|
||||
CommitShejiActivityItemResponse = protobuf.Message(COMMITSHEJIACTIVITYITEMRESPONSE)
|
||||
|
|
@ -388,4 +476,8 @@ TasuilingxiaoRequest = protobuf.Message(TASUILINGXIAOREQUEST)
|
|||
TasuilingxiaoResponse = protobuf.Message(TASUILINGXIAORESPONSE)
|
||||
UpgradeGodTreeRequest = protobuf.Message(UPGRADEGODTREEREQUEST)
|
||||
UpgradeGodTreeResponse = protobuf.Message(UPGRADEGODTREERESPONSE)
|
||||
choiceDrawCardRequest = protobuf.Message(CHOICEDRAWCARDREQUEST)
|
||||
choiceDrawCardResponse = protobuf.Message(CHOICEDRAWCARDRESPONSE)
|
||||
choiceHeroRewardRequest = protobuf.Message(CHOICEHEROREWARDREQUEST)
|
||||
choiceHeroRewardResponse = protobuf.Message(CHOICEHEROREWARDRESPONSE)
|
||||
|
||||
|
|
|
|||
|
|
@ -189,10 +189,11 @@ ACTIVITYINFO_MISSIONINFO_PROGRESS_FIELD = protobuf.FieldDescriptor();
|
|||
ACTIVITYINFO_MISSIONINFO_STATE_FIELD = protobuf.FieldDescriptor();
|
||||
ACTIVITYINFO_ACTIVITYID_FIELD = protobuf.FieldDescriptor();
|
||||
ACTIVITYINFO_MISSION_FIELD = protobuf.FieldDescriptor();
|
||||
ACTIVITYINFO_VALUE_FIELD = protobuf.FieldDescriptor();
|
||||
ACTIVITYINFO_STARTTIME_FIELD = protobuf.FieldDescriptor();
|
||||
ACTIVITYINFO_ENDTIME_FIELD = protobuf.FieldDescriptor();
|
||||
ACTIVITYINFO_REALLYOPEN_FIELD = protobuf.FieldDescriptor();
|
||||
ACTIVITYINFO_STARTTIME_FIELD = protobuf.FieldDescriptor();
|
||||
ACTIVITYINFO_VALUE_FIELD = protobuf.FieldDescriptor();
|
||||
ACTIVITYINFO_CHOICEREWARDID_FIELD = protobuf.FieldDescriptor();
|
||||
GMRESPONSE = protobuf.Descriptor();
|
||||
GMRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
|
||||
GMRESPONSE_INFO_FIELD = protobuf.FieldDescriptor();
|
||||
|
|
@ -2460,30 +2461,10 @@ ACTIVITYINFO_MISSION_FIELD.message_type = ACTIVITYINFO_MISSIONINFO
|
|||
ACTIVITYINFO_MISSION_FIELD.type = 11
|
||||
ACTIVITYINFO_MISSION_FIELD.cpp_type = 10
|
||||
|
||||
ACTIVITYINFO_VALUE_FIELD.name = "value"
|
||||
ACTIVITYINFO_VALUE_FIELD.full_name = ".rpc.protocols.ActivityInfo.value"
|
||||
ACTIVITYINFO_VALUE_FIELD.number = 6
|
||||
ACTIVITYINFO_VALUE_FIELD.index = 2
|
||||
ACTIVITYINFO_VALUE_FIELD.label = 1
|
||||
ACTIVITYINFO_VALUE_FIELD.has_default_value = false
|
||||
ACTIVITYINFO_VALUE_FIELD.default_value = 0
|
||||
ACTIVITYINFO_VALUE_FIELD.type = 5
|
||||
ACTIVITYINFO_VALUE_FIELD.cpp_type = 1
|
||||
|
||||
ACTIVITYINFO_STARTTIME_FIELD.name = "startTime"
|
||||
ACTIVITYINFO_STARTTIME_FIELD.full_name = ".rpc.protocols.ActivityInfo.startTime"
|
||||
ACTIVITYINFO_STARTTIME_FIELD.number = 5
|
||||
ACTIVITYINFO_STARTTIME_FIELD.index = 3
|
||||
ACTIVITYINFO_STARTTIME_FIELD.label = 1
|
||||
ACTIVITYINFO_STARTTIME_FIELD.has_default_value = false
|
||||
ACTIVITYINFO_STARTTIME_FIELD.default_value = 0
|
||||
ACTIVITYINFO_STARTTIME_FIELD.type = 5
|
||||
ACTIVITYINFO_STARTTIME_FIELD.cpp_type = 1
|
||||
|
||||
ACTIVITYINFO_ENDTIME_FIELD.name = "endTime"
|
||||
ACTIVITYINFO_ENDTIME_FIELD.full_name = ".rpc.protocols.ActivityInfo.endTime"
|
||||
ACTIVITYINFO_ENDTIME_FIELD.number = 3
|
||||
ACTIVITYINFO_ENDTIME_FIELD.index = 4
|
||||
ACTIVITYINFO_ENDTIME_FIELD.index = 2
|
||||
ACTIVITYINFO_ENDTIME_FIELD.label = 1
|
||||
ACTIVITYINFO_ENDTIME_FIELD.has_default_value = false
|
||||
ACTIVITYINFO_ENDTIME_FIELD.default_value = 0
|
||||
|
|
@ -2493,18 +2474,48 @@ ACTIVITYINFO_ENDTIME_FIELD.cpp_type = 1
|
|||
ACTIVITYINFO_REALLYOPEN_FIELD.name = "reallyOpen"
|
||||
ACTIVITYINFO_REALLYOPEN_FIELD.full_name = ".rpc.protocols.ActivityInfo.reallyOpen"
|
||||
ACTIVITYINFO_REALLYOPEN_FIELD.number = 4
|
||||
ACTIVITYINFO_REALLYOPEN_FIELD.index = 5
|
||||
ACTIVITYINFO_REALLYOPEN_FIELD.index = 3
|
||||
ACTIVITYINFO_REALLYOPEN_FIELD.label = 1
|
||||
ACTIVITYINFO_REALLYOPEN_FIELD.has_default_value = false
|
||||
ACTIVITYINFO_REALLYOPEN_FIELD.default_value = 0
|
||||
ACTIVITYINFO_REALLYOPEN_FIELD.type = 5
|
||||
ACTIVITYINFO_REALLYOPEN_FIELD.cpp_type = 1
|
||||
|
||||
ACTIVITYINFO_STARTTIME_FIELD.name = "startTime"
|
||||
ACTIVITYINFO_STARTTIME_FIELD.full_name = ".rpc.protocols.ActivityInfo.startTime"
|
||||
ACTIVITYINFO_STARTTIME_FIELD.number = 5
|
||||
ACTIVITYINFO_STARTTIME_FIELD.index = 4
|
||||
ACTIVITYINFO_STARTTIME_FIELD.label = 1
|
||||
ACTIVITYINFO_STARTTIME_FIELD.has_default_value = false
|
||||
ACTIVITYINFO_STARTTIME_FIELD.default_value = 0
|
||||
ACTIVITYINFO_STARTTIME_FIELD.type = 5
|
||||
ACTIVITYINFO_STARTTIME_FIELD.cpp_type = 1
|
||||
|
||||
ACTIVITYINFO_VALUE_FIELD.name = "value"
|
||||
ACTIVITYINFO_VALUE_FIELD.full_name = ".rpc.protocols.ActivityInfo.value"
|
||||
ACTIVITYINFO_VALUE_FIELD.number = 6
|
||||
ACTIVITYINFO_VALUE_FIELD.index = 5
|
||||
ACTIVITYINFO_VALUE_FIELD.label = 1
|
||||
ACTIVITYINFO_VALUE_FIELD.has_default_value = false
|
||||
ACTIVITYINFO_VALUE_FIELD.default_value = 0
|
||||
ACTIVITYINFO_VALUE_FIELD.type = 5
|
||||
ACTIVITYINFO_VALUE_FIELD.cpp_type = 1
|
||||
|
||||
ACTIVITYINFO_CHOICEREWARDID_FIELD.name = "choiceRewardId"
|
||||
ACTIVITYINFO_CHOICEREWARDID_FIELD.full_name = ".rpc.protocols.ActivityInfo.choiceRewardId"
|
||||
ACTIVITYINFO_CHOICEREWARDID_FIELD.number = 7
|
||||
ACTIVITYINFO_CHOICEREWARDID_FIELD.index = 6
|
||||
ACTIVITYINFO_CHOICEREWARDID_FIELD.label = 1
|
||||
ACTIVITYINFO_CHOICEREWARDID_FIELD.has_default_value = false
|
||||
ACTIVITYINFO_CHOICEREWARDID_FIELD.default_value = 0
|
||||
ACTIVITYINFO_CHOICEREWARDID_FIELD.type = 5
|
||||
ACTIVITYINFO_CHOICEREWARDID_FIELD.cpp_type = 1
|
||||
|
||||
ACTIVITYINFO.name = "ActivityInfo"
|
||||
ACTIVITYINFO.full_name = ".rpc.protocols.ActivityInfo"
|
||||
ACTIVITYINFO.nested_types = {ACTIVITYINFO_MISSIONINFO}
|
||||
ACTIVITYINFO.enum_types = {}
|
||||
ACTIVITYINFO.fields = {ACTIVITYINFO_ACTIVITYID_FIELD, ACTIVITYINFO_MISSION_FIELD, ACTIVITYINFO_VALUE_FIELD, ACTIVITYINFO_STARTTIME_FIELD, ACTIVITYINFO_ENDTIME_FIELD, ACTIVITYINFO_REALLYOPEN_FIELD}
|
||||
ACTIVITYINFO.fields = {ACTIVITYINFO_ACTIVITYID_FIELD, ACTIVITYINFO_MISSION_FIELD, ACTIVITYINFO_ENDTIME_FIELD, ACTIVITYINFO_REALLYOPEN_FIELD, ACTIVITYINFO_STARTTIME_FIELD, ACTIVITYINFO_VALUE_FIELD, ACTIVITYINFO_CHOICEREWARDID_FIELD}
|
||||
ACTIVITYINFO.is_extendable = false
|
||||
ACTIVITYINFO.extensions = {}
|
||||
GMRESPONSE_DROP_FIELD.name = "drop"
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -400,6 +400,9 @@ function this.BtnClick(id)
|
|||
end
|
||||
elseif id == FUNCTION_OPEN_TYPE.ENDLESS then
|
||||
if ActTimeCtrlManager.SingleFuncState(id) then
|
||||
local serData = ActTimeCtrlManager.GetSerDataByTypeId()
|
||||
PlayerPrefs.SetInt("WuJin1"..PlayerManager.uid,serData.endTime)
|
||||
CheckRedPointStatus(RedPointType.EndlessPanel)
|
||||
MapManager.curCarbonType = CarBonTypeId.ENDLESS
|
||||
MapManager.SetViewSize(3)--设置视野范围(明雷形式)
|
||||
MapManager.isTimeOut = false
|
||||
|
|
|
|||
|
|
@ -145,19 +145,16 @@ end
|
|||
function this.EnterMap()
|
||||
CarbonManager.difficulty = CARBON_TYPE.ENDLESS
|
||||
CarbonManager.carbonType = CARBON_TYPE.ENDLESS
|
||||
--UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.CARBON, MapManager.curMapId)
|
||||
local serData = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.ENDLESS)
|
||||
if not PlayerPrefs.HasKey("WuJin"..PlayerManager.uid) then
|
||||
PlayerPrefs.SetInt("WuJin"..PlayerManager.uid ,0)
|
||||
end
|
||||
local note = PlayerPrefs.GetInt("WuJin"..PlayerManager.uid)
|
||||
LogGreen("note:"..note.." serData.endTime:"..serData.endTime)
|
||||
MapManager.curMapId = EndLessMapManager.openMapId
|
||||
if serData.endTime ~= note then
|
||||
PlayerPrefs.SetInt("WuJin"..PlayerManager.uid,serData.endTime)
|
||||
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.CARBON, MapManager.curMapId)
|
||||
else
|
||||
LogGreen("EndLessMapManager.openMapId:"..EndLessMapManager.openMapId.." MapManager.curMapId:"..MapManager.curMapId)
|
||||
MapManager.curCarbonType = CarBonTypeId.ENDLESS
|
||||
NetManager.MapInfoRequest(MapManager.curCarbonType, function()
|
||||
MapManager.isReloadEnter = false
|
||||
|
|
@ -227,6 +224,7 @@ function this.ShowCountTime()
|
|||
this.timer1 = Timer.New(function ()
|
||||
freshData = freshData - 1
|
||||
if freshData < 0 then
|
||||
ChecRedPointEndLess(RedPointType.EndlessPanel)
|
||||
this:ClosePanel()
|
||||
else
|
||||
updateTime()
|
||||
|
|
|
|||
|
|
@ -239,15 +239,7 @@ function this.IsThisMapOpen(mapId)
|
|||
return isOpen
|
||||
end
|
||||
|
||||
--红点检测
|
||||
function this.EndlessRedCheck()
|
||||
if this.GetLeftMapEnergy() >= 100 and ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.ENDLESS)then
|
||||
return true
|
||||
else
|
||||
return false
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
|
||||
--------------------------------------------------------------------------------编队 神将-------------------------------------------------------------------------------
|
||||
this.heroDataLists = {}
|
||||
|
|
@ -885,5 +877,23 @@ function this.CheckoutRedPointMission()
|
|||
end
|
||||
return false
|
||||
end
|
||||
function this.ChecRedPointEndLess()
|
||||
if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.ENDLESS) then
|
||||
return false
|
||||
end
|
||||
if not PlayerPrefs.HasKey("WuJin1"..PlayerManager.uid) then
|
||||
PlayerPrefs.SetInt("WuJin1"..PlayerManager.uid ,0)
|
||||
end
|
||||
local note = PlayerPrefs.GetInt("WuJin1"..PlayerManager.uid)
|
||||
local serData = ActTimeCtrlManager.GetSerDataByTypeId()
|
||||
if serData.endTime ~= note then
|
||||
return true
|
||||
end
|
||||
local isShow = this.CheckoutRedPointTreasure()
|
||||
if not isShow then
|
||||
isShow = this.CheckoutRedPointMission()
|
||||
end
|
||||
return isShow
|
||||
end
|
||||
-------------------------------------------------------------------------------------------------------------
|
||||
return this
|
||||
|
|
@ -486,7 +486,6 @@ function this.RegisterRedCheckFunc()
|
|||
RPData:AddCheckFunc(RedPointType.People_Mirror, XuanYuanMirrorManager.CarbonRedCheck)
|
||||
RPData:AddCheckFunc(RedPointType.Trial, MapTrialManager.TrialRedCheck)
|
||||
RPData:AddCheckFunc(RedPointType.TrialReward, MapTrialManager.TrialRewardRedPointCheck)
|
||||
RPData:AddCheckFunc(RedPointType.EndlessPanel, EndLessMapManager.EndlessRedCheck)
|
||||
|
||||
RPData:AddCheckFunc(RedPointType.QinglongSerectTreasure, QinglongSerectTreasureManager.GetQinglongSerectTreasureRedPot)
|
||||
RPData:AddCheckFunc(RedPointType.QinglongSerectTreasureTrail, QinglongSerectTreasureManager.GetSerectTreasureTrailRedPot)
|
||||
|
|
@ -529,6 +528,7 @@ function this.RegisterRedCheckFunc()
|
|||
|
||||
RPData:AddCheckFunc(RedPointType.wujinTreasure,EndLessMapManager.CheckoutRedPointTreasure)
|
||||
RPData:AddCheckFunc(RedPointType.wujinMission,EndLessMapManager.CheckoutRedPointMission)
|
||||
RPData:SetParent(RedPointType.EndlessPanel, EndLessMapManager.ChecRedPointEndLess)
|
||||
--化虚坛英雄合成
|
||||
RPData:AddCheckFunc(RedPointType.Huaxutan_CompoundHero,HeroManager.GetAllHeroCompoundRedPoint)
|
||||
--主角修行
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ local func
|
|||
local armorType = 0
|
||||
local lanTuData = {}
|
||||
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
|
||||
|
||||
local isNoShowSureBtn = false--外部界面调用此界面传的参数 ture 时不显示使用按钮 false 或者不传没影响
|
||||
local isBagPanel = false
|
||||
--初始化组件(用于子类重写)
|
||||
function RewardItemSingleShowPopup:InitComponent()
|
||||
|
|
@ -253,6 +253,9 @@ function RewardItemSingleShowPopup:OnOpen(...)
|
|||
if data[2] then
|
||||
func = data[2]
|
||||
end
|
||||
if data[4] then
|
||||
isNoShowSureBtn = data[4]
|
||||
end
|
||||
end
|
||||
function RewardItemSingleShowPopup:OnShow()
|
||||
this.innateImage:SetActive(false)
|
||||
|
|
@ -278,7 +281,7 @@ function RewardItemSingleShowPopup:OnShow()
|
|||
this.btnSure:SetActive(false)
|
||||
this.btnSureText.text = Language[10197]
|
||||
end
|
||||
this.btnJump:SetActive(itemConfigData.UseJump and itemConfigData.UseJump > 0 and isBagPanel)
|
||||
this.btnJump:SetActive(itemConfigData.UseJump and itemConfigData.UseJump > 0 and isBagPanel and isNoShowSureBtn)
|
||||
Log("itemConfigData.Id " .. itemConfigData.Id)
|
||||
this.equipQuaText.text = GetStringByEquipQua(itemConfigData.Quantity, GetQuaStringByEquipQua(itemConfigData.Quantity))
|
||||
this.itemName.text = GetStringByEquipQua(itemConfigData.Quantity, GetLanguageStrById(itemConfigData.Name))
|
||||
|
|
|
|||
|
|
@ -417,7 +417,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
|
|||
self.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity))
|
||||
self.icon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID))
|
||||
Util.AddOnceClick(self.frameBtn, function()
|
||||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop)
|
||||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop,false)
|
||||
end)
|
||||
elseif itemDataConFig.ItemType == ItemType.Hero then
|
||||
-- 1角色
|
||||
|
|
@ -455,7 +455,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
|
|||
self.fragmentIcon:GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(propertyName))
|
||||
end
|
||||
Util.AddOnceClick(self.frameBtn, function()
|
||||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop)
|
||||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop,false)
|
||||
end)
|
||||
elseif itemDataConFig.ItemType == ItemType.Equip then
|
||||
--3装备
|
||||
|
|
@ -487,7 +487,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
|
|||
--self.pokemonFrame:GetComponent("Image").sprite = self.spLoader:LoadSprite(YaoHunFrame[itemConfig[itemSId].Quantity])
|
||||
--self.pokemonImage.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID))
|
||||
Util.AddOnceClick(self.frameBtn, function()
|
||||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop)
|
||||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop,false)
|
||||
end)
|
||||
if effectLayer > 0 then
|
||||
self.UI_Effect_Kuang_JinSe:SetActive(itemConfig[itemSId].Quantity == 5)
|
||||
|
|
@ -510,7 +510,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
|
|||
self.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity))
|
||||
self.icon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID))
|
||||
Util.AddOnceClick(self.frameBtn, function()
|
||||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop)
|
||||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop,false)
|
||||
end)
|
||||
if itemDataConFig.RingLevel > 0 then
|
||||
self.innateImage:SetActive(true)
|
||||
|
|
@ -580,7 +580,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
|
|||
self:SetFrameEffectLayer(effectLayer)
|
||||
self:SetFrameEffectScale(self.scale * 0.7)
|
||||
Util.AddOnceClick(self.frameBtn, function()
|
||||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,itemSId,nil,self.isRewardItemPop)
|
||||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,itemSId,nil,self.isRewardItemPop,false)
|
||||
end)
|
||||
elseif itemDataConFig.ItemType == ItemType.SelfBox then
|
||||
self.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity))
|
||||
|
|
@ -601,14 +601,14 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
|
|||
local star = _reward[4] or itemConfig[itemSId].HeroStar[1]
|
||||
SetHeroStars(self.starGrid, star,1,Vector2.New(32.5,32.5),-15)
|
||||
Util.AddOnceClick(self.frameBtn, function()
|
||||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop)
|
||||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop,false)
|
||||
end)
|
||||
else
|
||||
--,5随机道具,6符文
|
||||
self.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity))
|
||||
self.icon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID))
|
||||
Util.AddOnceClick(self.frameBtn, function()
|
||||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId, nil, self.isRewardItemPop)
|
||||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId, nil, self.isRewardItemPop,false)
|
||||
end)
|
||||
end
|
||||
if itemNum <= 0 then
|
||||
|
|
@ -665,7 +665,7 @@ function ItemView:OnBtnCkickEvent(itemSId)
|
|||
--道具自选箱
|
||||
UIManager.OpenPanel(UIName.RewardBoxPanel,nil,itemDataConFig.Id)
|
||||
else
|
||||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemDataConFig.Id,nil,self.isRewardItemPop)
|
||||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemDataConFig.Id,nil,self.isRewardItemPop,false)
|
||||
end
|
||||
end
|
||||
function ItemView:OnShowUIeffectItemViewSaoguang()
|
||||
|
|
|
|||
Loading…
Reference in New Issue