Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
2164685f0c
|
|
@ -33208,6 +33208,124 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: 64, y: -64}
|
||||
m_SizeDelta: {x: 128, y: 128}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &3603616992593025419
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8711988954666217240}
|
||||
- component: {fileID: 8417690811195369441}
|
||||
- component: {fileID: 7450820248560773905}
|
||||
- component: {fileID: 4274006235232953057}
|
||||
m_Layer: 5
|
||||
m_Name: fifteenTip
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8711988954666217240
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3603616992593025419}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 4668867525041096045}
|
||||
m_Father: {fileID: 986452627335843391}
|
||||
m_RootOrder: 10
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 165, y: 472}
|
||||
m_SizeDelta: {x: 325.5, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8417690811195369441
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3603616992593025419}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &7450820248560773905
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3603616992593025419}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!114 &4274006235232953057
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3603616992593025419}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 7450820248560773905}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!1 &3609404473290929707
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -49261,7 +49379,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 34.8, y: -46.8}
|
||||
m_AnchoredPosition: {x: 34.800003, y: -46.8}
|
||||
m_SizeDelta: {x: 26, y: 26}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3975621365474609331
|
||||
|
|
@ -49342,7 +49460,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: -124.00004, y: -77.999954}
|
||||
m_AnchoredPosition: {x: -124.00003, y: -77.999954}
|
||||
m_SizeDelta: {x: 148, y: 126}
|
||||
m_Pivot: {x: 0.49999973, y: 0.50000036}
|
||||
--- !u!222 &4883613866719607552
|
||||
|
|
@ -55333,6 +55451,85 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "\u5143\u7D20\u62DB\u52DF"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &4702172617362358131
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4668867525041096045}
|
||||
- component: {fileID: 4012076166443334565}
|
||||
- component: {fileID: 2434921139500625753}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4668867525041096045
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4702172617362358131}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 8711988954666217240}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4012076166443334565
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4702172617362358131}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2434921139500625753
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4702172617362358131}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 30
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 0
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "2\u5929\u540E\u501F\u5BBF"
|
||||
--- !u!1 &4704518155788007146
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -64781,7 +64978,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: 3.9, y: 64.5}
|
||||
m_AnchoredPosition: {x: 3.9000015, y: 64.5}
|
||||
m_SizeDelta: {x: 100, y: 80}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3224084130185534030
|
||||
|
|
@ -67973,6 +68170,7 @@ RectTransform:
|
|||
- {fileID: 8831099743542526053}
|
||||
- {fileID: 7019400324678272696}
|
||||
- {fileID: 19914098443950123}
|
||||
- {fileID: 8711988954666217240}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -84926,7 +85124,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: -15.1, y: -147}
|
||||
m_AnchoredPosition: {x: -15.099998, y: -147}
|
||||
m_SizeDelta: {x: 160, y: 53.26}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &8677907642781959488
|
||||
|
|
|
|||
|
|
@ -1236,6 +1236,7 @@ ActivityTypeDef = {
|
|||
lingLongBaoJing = 67,
|
||||
ChaoFanRuSheng = 500, --超凡入圣
|
||||
JourneyWithWind = 72, --缥缈之旅
|
||||
FifteenDayGiftNotice = 80,--15日登陆预告
|
||||
}
|
||||
--活动结束需要处理面板关闭类型
|
||||
ActivityTypePanel = {
|
||||
|
|
|
|||
|
|
@ -8,6 +8,21 @@ end
|
|||
|
||||
function this.InitRewardData()
|
||||
local ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FifteenDayGift)
|
||||
--活动没有开始,数据为预览数据
|
||||
if not ActData then
|
||||
ActData={}
|
||||
ActData.activityId=6401
|
||||
ActData.ActState=1
|
||||
ActData.isPreview=1
|
||||
local data=ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",6401)
|
||||
local missList={}
|
||||
for key, value in pairs(data) do
|
||||
-- table.insert(missList,{missionId=key,State=0,Progress=1})
|
||||
missList[key]={missionId=key,state=3,progress=10000}
|
||||
end
|
||||
ActData.Progress=0
|
||||
ActData.mission=missList
|
||||
end
|
||||
if not ActData then return end
|
||||
if #this.configData == 0 then
|
||||
-- LogPink("把奖励表信息存入this.configData")
|
||||
|
|
@ -18,6 +33,9 @@ function this.InitRewardData()
|
|||
Data.activityId = ActData.activityId
|
||||
Data.ActState = ActData.value
|
||||
Data.startTime = ActData.startTime
|
||||
if ActData.isPreview then
|
||||
Data.isPreview=1
|
||||
end
|
||||
if not Data.rewards then
|
||||
Data.rewards = {}
|
||||
for key, value in pairs(this.configData) do
|
||||
|
|
|
|||
|
|
@ -12,6 +12,8 @@ local backList = {}
|
|||
local angle = {
|
||||
[1] = Quaternion.Euler(Vector3.New(0, 0, 0)),
|
||||
[2] = Quaternion.Euler(Vector3.New(0, 90, 0)),
|
||||
--3是预览状态
|
||||
[3] = Quaternion.Euler(Vector3.New(0, 0, 0)),
|
||||
}
|
||||
|
||||
--初始化组件(用于子类重写)
|
||||
|
|
@ -127,6 +129,12 @@ function FifteenDayGift:Refresh()
|
|||
UIManager.ClosePanel(UIName.FightAreaRewardFullPopup)
|
||||
end
|
||||
Data = FifteenDayGiftManager.GetData()
|
||||
if Data.isPreview then
|
||||
self.btnGet.gameObject:SetActive(false)
|
||||
else
|
||||
self.btnGet.gameObject:SetActive(true)
|
||||
end
|
||||
--LogError("len=="..#Data)
|
||||
CheckRedPointStatus(RedPointType.FifteenDayGift_1)
|
||||
if self.timer then
|
||||
self.timer:Stop()
|
||||
|
|
@ -167,6 +175,9 @@ function FifteenDayGift:SetSingleReward(sData,go,index)
|
|||
|
||||
--设置图片初始角度
|
||||
front:GetComponent("RectTransform").rotation = sData.State == 0 and angle[1] or angle[2]
|
||||
if sData.State==3 then
|
||||
front:GetComponent("RectTransform").rotation=angle[3]
|
||||
end
|
||||
back:GetComponent("RectTransform").rotation = sData.State == 1 and angle[1] or angle[2]
|
||||
--判断哪些可领取,插入表
|
||||
-- LogPurple("sData.missionId:"..tostring(sData.missionId).." sData.Progress:"..tostring(sData.Progress).." sData.State:"..tostring(sData.State))
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
|
||||
require("Base/BasePanel")
|
||||
require("Modules/Main/View/MainPlayerView")
|
||||
local floor = math.floor
|
||||
MainPanel = Inherit(BasePanel)
|
||||
local this = MainPanel
|
||||
local endTime = 0
|
||||
|
|
@ -124,7 +125,9 @@ function this:InitComponent()
|
|||
|
||||
--六星前往
|
||||
this.btnSixStarGo=Util.GetGameObject(self.gameObject,"LeftUp/GameObject/GameObject/sixStarHero")
|
||||
|
||||
--15日登陆活动预告
|
||||
this.fifteenTip=Util.GetGameObject(self.gameObject,"fifteenTip")
|
||||
this.fifteenTipTxt=Util.GetGameObject(self.gameObject,"fifteenTip/Text"):GetComponent("Text")
|
||||
-------------------场景中的按钮------------------------
|
||||
-- 按钮
|
||||
this.btnMonster = Util.GetGameObject(this.gameObject, "scene/layer2/btnShouchaolaixi")
|
||||
|
|
@ -384,6 +387,11 @@ function this:BindEvent()
|
|||
JumpManager.GoJump(36011)
|
||||
end)
|
||||
|
||||
--逐胜之巅
|
||||
Util.AddClick(this.fifteenTip,function ()
|
||||
UIManager.OpenPanel(UIName.FifteenDayGiftPanel)
|
||||
end)
|
||||
|
||||
--日常任务
|
||||
Util.AddClick(this.btnDailyMission, function()
|
||||
UIManager.OpenPanel(UIName.MissionDailyPanel)
|
||||
|
|
@ -744,6 +752,28 @@ function this.CheckSixStarGoShow()
|
|||
end
|
||||
end
|
||||
|
||||
--检测15日登陆活动预告是否显示
|
||||
function this.FifteenNoticeShow()
|
||||
if not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FifteenDayGiftNotice) then
|
||||
this.fifteenTip.gameObject:SetActive(true)
|
||||
local activityData=ActivityGiftManager.GetActivityInfoByType(6402)
|
||||
if activityData then
|
||||
--local day=()/86400
|
||||
local day=floor((activityData.endTime - GetTimeStamp())/86400)
|
||||
day=day+1
|
||||
this.fifteenTipTxt.text=day.."天后开启"
|
||||
end
|
||||
else
|
||||
this.fifteenTip.gameObject:SetActive(false)
|
||||
end
|
||||
|
||||
|
||||
end
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
function this.CreatActivity()
|
||||
for k,v in ipairs(activitys) do
|
||||
if not activityTabs[k] then
|
||||
|
|
@ -983,6 +1013,7 @@ function this:OnShow()
|
|||
this:OnChangeTitleOrRideOrSkin()
|
||||
--检测主城六星入口是否显示
|
||||
this.CheckSixStarGoShow()
|
||||
this.FifteenNoticeShow()
|
||||
this.UpView:OnOpen({ showType = UpViewOpenType.ShowRight, panelType = PanelType.Main })
|
||||
this.BtView:OnOpen(self, { sortOrder = self.sortingOrder, panelType = PanelTypeView.MainCity })
|
||||
|
||||
|
|
|
|||
|
|
@ -60,19 +60,8 @@ function this.SingleHeroDataShow(go,_heroData)
|
|||
Util.GetGameObject(_go.transform, "posIcon"):SetActive(false)
|
||||
Util.GetGameObject(_go.transform, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName))
|
||||
local starGrid = Util.GetGameObject(_go.transform, "star")
|
||||
if _heroData.Id==currHeroId then
|
||||
this.selectObj.transform:SetParent(_go.transform)
|
||||
this.selectObj.transform.localScale=Vector3.one
|
||||
this.selectObj.transform.localPosition=Vector3.New(0,30,0)
|
||||
end
|
||||
SetHeroStars(this.spLoader, starGrid, heroData.Star,1,nil,-15)
|
||||
local cardclickBtn = Util.GetGameObject(_go.transform, "icon")
|
||||
Util.AddOnceClick(cardclickBtn, function()
|
||||
this.selectObj.transform:SetParent(_go.transform)
|
||||
this.selectObj.transform.localScale=Vector3.one
|
||||
this.selectObj.transform.localPosition=Vector3.New(0,30,0)
|
||||
currHeroId=_heroData.Id
|
||||
end)
|
||||
Util.AddLongPressClick(cardclickBtn, function()
|
||||
UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, heroData.Id, heroData.Star)
|
||||
end, 0.5)
|
||||
|
|
|
|||
|
|
@ -40,11 +40,15 @@ function this:OnOpen(_type,_data)
|
|||
this.grid:SetActive(true)
|
||||
this.xianyuan:SetActive(false)
|
||||
local showItemdata=this.GetDropReward(_data)
|
||||
Log("终极大奖:"..#_data.itemlist)
|
||||
Log("终极大奖:"..#showItemdata)
|
||||
local starItemDataList=BagManager.GetItemListFromTempBag(_data)
|
||||
for i = 1, #starItemDataList do
|
||||
this.SetItemData2(starItemDataList[i])
|
||||
end
|
||||
-- Log("终极大奖:"..#_data.itemlist)
|
||||
-- Log("终极大奖:"..#showItemdata)
|
||||
if showItemdata and #showItemdata>0 then
|
||||
for i = 1, #showItemdata do
|
||||
Log("终极大奖:"..showItemdata[i][1])
|
||||
-- Log("终极大奖:"..showItemdata[i][1])
|
||||
local _rewardObj= SubUIManager.Open(SubUIConfig.ItemView, this.grid.transform)
|
||||
_rewardObj:OnOpen(false,showItemdata[i],1)
|
||||
end
|
||||
|
|
@ -52,7 +56,22 @@ function this:OnOpen(_type,_data)
|
|||
|
||||
end
|
||||
end
|
||||
|
||||
--存储本地
|
||||
function this.SetItemData2(itemdata)
|
||||
if itemdata.itemType==1 then
|
||||
--后端更新
|
||||
elseif itemdata.itemType==2 then
|
||||
EquipManager.UpdateEquipData(itemdata.backData)
|
||||
elseif itemdata.itemType==3 then
|
||||
HeroManager.UpdateHeroDatas(itemdata.backData)
|
||||
elseif itemdata.itemType==4 then
|
||||
TalismanManager.InitUpdateSingleTalismanData(itemdata.backData)
|
||||
elseif itemdata.itemType==5 then
|
||||
EquipTreasureManager.InitSingleTreasureData(itemdata.backData)
|
||||
elseif itemdata.itemType==6 then
|
||||
PokemonManager.UpdatePokemonDatas(itemdata.backData,true)
|
||||
end
|
||||
end
|
||||
function this.GetDropReward(_drop)
|
||||
local _rewardList={}
|
||||
if _drop.itemlist then
|
||||
|
|
@ -64,26 +83,26 @@ function this.GetDropReward(_drop)
|
|||
table.insert(_rewardList,_rewardData)
|
||||
end
|
||||
end
|
||||
if not _drop.equipId then
|
||||
if _drop.equipId then
|
||||
for i = 1, #_drop.equipId do
|
||||
local _rewardData={}
|
||||
_rewardData[1]=_drop.equipId[i].id
|
||||
_rewardData[1]=_drop.equipId[i].equipId--id
|
||||
_rewardData[2]=1
|
||||
table.insert(_rewardList,_rewardData)
|
||||
end
|
||||
end
|
||||
if not _drop.Hero then
|
||||
if _drop.Hero then
|
||||
for i = 1, #_drop.Hero do
|
||||
local _rewardData={}
|
||||
_rewardData[1]=_drop.Hero[i].id
|
||||
_rewardData[1]=_drop.Hero[i].heroId--id
|
||||
_rewardData[2]=1
|
||||
table.insert(_rewardList,_rewardData)
|
||||
end
|
||||
end
|
||||
if not _drop.soulEquip then
|
||||
if _drop.soulEquip then
|
||||
for i = 1, #_drop.soulEquip do
|
||||
local _rewardData={}
|
||||
_rewardData[1]=_drop.soulEquip[i].id
|
||||
_rewardData[1]=_drop.soulEquip[i].equipId--id
|
||||
_rewardData[2]=1
|
||||
table.insert(_rewardList,_rewardData)
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue