【新·魂灵宝】提交

dev_chengFeng
ZhangBiao 2021-11-09 17:06:47 +08:00
parent 79f6f739ad
commit f18880622e
6 changed files with 319 additions and 46 deletions

View File

@ -224,7 +224,7 @@ MonoBehaviour:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 20
m_Bottom: 0
m_ChildAlignment: 4
m_StartCorner: 0
m_StartAxis: 0
@ -639,7 +639,7 @@ MonoBehaviour:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_Bottom: 30
m_ChildAlignment: 1
m_Spacing: 0
m_ChildForceExpandWidth: 0
@ -2697,8 +2697,8 @@ RectTransform:
m_Father: {fileID: 6594472603124481167}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 442.9, y: 0}
m_SizeDelta: {x: 825.8, y: 0}
m_Pivot: {x: 0.5, y: 1}
@ -3012,9 +3012,9 @@ RectTransform:
m_Father: {fileID: 5981932543035177726}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 460, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 460, y: -385}
m_SizeDelta: {x: 905, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5201084322800259043

View File

@ -32,6 +32,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6309988179621275829}
- {fileID: 2943323019176369767}
m_Father: {fileID: 1010245359547345673}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -847,7 +848,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 925, y: 200}
m_SizeDelta: {x: 925, y: 600}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &947196721163537717
MonoBehaviour:
@ -864,7 +865,7 @@ MonoBehaviour:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Top: 70
m_Bottom: 0
m_ChildAlignment: 1
m_Spacing: 0
@ -1613,7 +1614,7 @@ MonoBehaviour:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_Bottom: 30
m_ChildAlignment: 1
m_Spacing: 0
m_ChildForceExpandWidth: 0
@ -1789,7 +1790,7 @@ MonoBehaviour:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 20
m_Bottom: 0
m_ChildAlignment: 4
m_StartCorner: 0
m_StartAxis: 0
@ -1797,6 +1798,80 @@ MonoBehaviour:
m_Spacing: {x: 40, y: 0}
m_Constraint: 0
m_ConstraintCount: 1
--- !u!1 &3144276962258623337
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2943323019176369767}
- component: {fileID: 4006395159395324770}
- component: {fileID: 6911222919104936668}
m_Layer: 5
m_Name: red
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2943323019176369767
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3144276962258623337}
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: 1599797043945116798}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -15, y: -15}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4006395159395324770
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3144276962258623337}
m_CullTransparentMesh: 0
--- !u!114 &6911222919104936668
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3144276962258623337}
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: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3}
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!1 &3403868580219706264
GameObject:
m_ObjectHideFlags: 0
@ -2327,6 +2402,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7159385356827199391}
- {fileID: 2906090485422011319}
m_Father: {fileID: 1010245359547345673}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -2469,8 +2545,8 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 912.8, y: 130}
m_Pivot: {x: 0.5, y: 1}
m_SizeDelta: {x: 924, y: 530}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7362701906403983055
CanvasRenderer:
m_ObjectHideFlags: 0
@ -4050,6 +4126,7 @@ GameObject:
- component: {fileID: 3818926394599610717}
- component: {fileID: 7538924608705574010}
- component: {fileID: 5910199899076126610}
- component: {fileID: 3835266503832035902}
m_Layer: 5
m_Name: way
m_TagString: Untagged
@ -4072,9 +4149,9 @@ RectTransform:
m_Father: {fileID: 536955465069247768}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 462.5, y: -35}
m_SizeDelta: {x: 911.109, y: 70}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7538924608705574010
@ -4114,6 +4191,26 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &3835266503832035902
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6595189249871214395}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 1
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &6882669673046456913
GameObject:
m_ObjectHideFlags: 0
@ -4172,7 +4269,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1}
m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -4251,7 +4348,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.7254902, g: 0.68235296, b: 0.5921569, a: 1}
m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -4410,7 +4507,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1}
m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -4470,7 +4567,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -0.00005393355}
m_AnchoredPosition: {x: 0, y: -0.000013638759}
m_SizeDelta: {x: 905, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &22196219189311584
@ -4510,6 +4607,80 @@ MonoBehaviour:
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 1
--- !u!1 &7128502974740987248
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2906090485422011319}
- component: {fileID: 3631761058427521969}
- component: {fileID: 6376177277757071040}
m_Layer: 5
m_Name: red
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2906090485422011319
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7128502974740987248}
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: 8824000577553895258}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -15, y: -15}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3631761058427521969
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7128502974740987248}
m_CullTransparentMesh: 0
--- !u!114 &6376177277757071040
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7128502974740987248}
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: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3}
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!1 &7140120539858836794
GameObject:
m_ObjectHideFlags: 0
@ -5158,7 +5329,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 30, y: 0}
m_AnchoredPosition: {x: 55, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &716734368547964724
@ -5188,7 +5359,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Left: 50
m_Right: 0
m_Top: 0
m_Bottom: 0
@ -5566,7 +5737,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.6784314, g: 0.654902, b: 0.6, a: 1}
m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:

View File

@ -495,7 +495,10 @@ function this.SingleItemDataShow(_go, _itemData)
end
elseif _itemData.itemConfig.ItemBaseType == ItemBaseType.EquipTreasure then
--宝器
UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup, 0, _itemData.idDyn,_itemData.id, _itemData.lv,_itemData.refineLv, function()
-- UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup, 0, _itemData.idDyn,_itemData.id, _itemData.lv,_itemData.refineLv, function()
-- this.OnClickTabBtn(sortIndex, sortIndexBtnGo,false,true)
-- end)
UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup2,this,_itemData,1,true,true,nil,nil,nil,function()
this.OnClickTabBtn(sortIndex, sortIndexBtnGo,false,true)
end)
elseif _itemData.itemConfig.ItemBaseType == ItemBaseType.SoulPrint then

View File

@ -2,8 +2,11 @@ require("Base/BasePanel")
local RewardTalismanSingleShowPopup2 = Inherit(BasePanel)
local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig)
local propertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig)
local spcialConfig = ConfigManager.GetConfig(ConfigName.SpecialConfig)
local passiveSkillConfig = ConfigManager.GetConfig(ConfigName.PassiveSkillConfig)
local isGongMing = false
local typeToUpdate = {
-- [1] = 3,--已穿戴->卸载单件
[2] = 2,--已穿戴->卸载单件
[3] = 1,--未穿戴->穿单件
[4] = 3,--未穿戴->替换单件
@ -26,6 +29,7 @@ function RewardTalismanSingleShowPopup2:InitComponent()
self.powerNum=Util.GetGameObject(self.topBar, "powerNum"):GetComponent("Text")
--装备属性--midBar
self.mid = Util.GetGameObject(self.transform, "Content/midBar")
self.midBar = Util.GetGameObject(self.transform, "Content/midBar/Grid")
--baseAttri
self.baseAttri = Util.GetGameObject(self.midBar, "baseAttri")
@ -40,8 +44,9 @@ function RewardTalismanSingleShowPopup2:InitComponent()
self.refineName = Util.GetGameObject(self.refineAttri, "refineName/attriName"):GetComponent("Text")
self.refineLevel = Util.GetGameObject(self.refineAttri, "refineName/attriNum"):GetComponent("Text")
self.refineGrid = Util.GetGameObject(self.refineAttri, "grid")
self.refineMasterName = Util.GetGameObject(self.refineAttri, "refineMaster/attriName"):GetComponent("Text")
self.refineMasterGrid = Util.GetGameObject(self.refineAttri, "gridMaster")
self.refineMaster = Util.GetGameObject(self.midBar, "refineMasterAttri")
self.refineMasterName = Util.GetGameObject(self.refineMaster, "refineMaster/attriName"):GetComponent("Text")
self.refineMasterGrid = Util.GetGameObject(self.refineMaster, "gridMaster")
--treeAttri
self.treeAttri = Util.GetGameObject(self.midBar, "treeAttri")
self.treeName = Util.GetGameObject(self.treeAttri, "treeName/attriName"):GetComponent("Text")
@ -59,6 +64,8 @@ function RewardTalismanSingleShowPopup2:InitComponent()
self.btnSwitch = Util.GetGameObject(self.btnGrid, "btnSwitch")
self.btnUpgrade = Util.GetGameObject(self.btnGrid, "btnUpgrade")
self.btnUpstar = Util.GetGameObject(self.btnGrid, "btnUpstar")
self.upgradeRed = Util.GetGameObject(self.btnUpgrade, "red")
self.upstarRed = Util.GetGameObject(self.btnUpstar, "red")
--装备获取途径--btmBar
self.canGetPre = Util.GetGameObject(self.btmBar, "scroll/canGetPre")
self.canGetGrid = Util.GetGameObject(self.btmBar, "scroll")
@ -74,8 +81,10 @@ function RewardTalismanSingleShowPopup2:InitComponent()
self.BaseAttriList = {}--基础属性对象
self.RefineAttriList = {}--精炼属性对象
self.treeAttriList = {}--神应属性对象
self.treeAttriList2 = {}--神应属性对象2
self.TreeAttriList = {}--神应属性对象
self.TreeAttriList2 = {}--神应属性对象2
self.BaseMasterList = {}--强化大师
self.RefineMasterList = {}--精炼大师
end
--绑定事件(用于子类重写)
@ -95,23 +104,78 @@ function RewardTalismanSingleShowPopup2:BindEvent()
end)
--穿戴
Util.AddClick(self.btnWear, function()
local config=spcialConfig[40]
if config then
local limits = string.split(config.Value, "|")
if limits then
local heroConfig=ConfigManager.GetConfigData(ConfigName.HeroConfig,self.curHeroData.id)
local lvs=string.split(limits[1],"#")
local stars=string.split(limits[2],"#")
local lv=tonumber(lvs[2])
if PlayerManager.level<lv then
PopupTipPanel.ShowTip(string.format(Language[11801],lv))
return
else
local star=tonumber(stars[2])
if heroConfig~=nil and self.curHeroData.star< star then
PopupTipPanel.ShowTip(string.format(Language[11802],star))
return
end
end
end
end
local equipIdList={}
local equipDataList={}
table.insert(equipIdList,self.equipData.idDyn)
table.insert(equipDataList,self.equipData)
NetManager.EquipWearRequest(self.curHeroData.dynamicId,equipIdList,2,function ()
self:ClosePanel()
self.parent.UpdateEquipPosHeroData(2,typeToUpdate[self.openType],equipDataList,0,self.position)
end)
end)
--卸下
Util.AddClick(self.btnDown, function()
local equipIdList={}
local equipDataList={}
table.insert(equipIdList,self.equipData.idDyn)
table.insert(equipDataList,self.equipData)
NetManager.EquipUnLoadOptRequest(self.curHeroData.dynamicId,equipIdList ,2,function ()
self:ClosePanel()
self.parent.UpdateEquipPosHeroData(2,typeToUpdate[self.openType],equipDataList)
end)
end)
--替换
Util.AddClick(self.btnSwitch, function()
local equipIdList={}
local equipDataList={}
table.insert(equipIdList,self.equipData.idDyn)
table.insert(equipDataList,self.equipData)
NetManager.EquipWearRequest(self.curHeroData.dynamicId,equipIdList,2,function ()
self:ClosePanel()
self.parent.UpdateEquipPosHeroData(2,typeToUpdate[self.openType],equipDataList,self.nextEquip,self.position)
end)
end)
Util.AddClick(self.btnUpgrade, function()
if isGongMing then
PopupTipPanel.ShowTip(Language[12184])
else
UIManager.OpenPanel(UIName.EquipTreasureStrongPopup,self.equipData,1)
self:ClosePanel()
end
end)
Util.AddClick(self.btnUpstar, function()
UIManager.OpenPanel(UIName.EquipTreasureStrongPopup,self.equipData,2)
self:ClosePanel()
end)
end
--添加事件监听(用于子类重写)
function RewardTalismanSingleShowPopup2:AddListener()
end
--移除事件监听(用于子类重写)
function RewardTalismanSingleShowPopup2:RemoveListener()
end
--界面打开时调用(用于子类重写)
@ -122,9 +186,11 @@ function RewardTalismanSingleShowPopup2:OnOpen(_parent,_equipData,_openType,_isS
self.parent = _parent --父界面
self.equipData = _equipData --当前装备数据
self.openType = _openType --0不显示按钮、1背包、2已穿戴显示卸下、3未穿戴显示穿戴、4未穿戴显示替换
self.isShowGet = _isShowGet
self.howGet:SetActive(_isShowGet and true or false)--是否显示获取途径
self.btnGrid:SetActive(self.openType ~= 0)
self.curHeroData = _curHeroData --装备了该装备的英雄数据
self.position = _position
self.nextEquip = _targetEquipData--要替换的目标装备
self.isShowGo = _isShowGo and _isShowGo or false--是否显示跳转按钮
self.func = _func
@ -132,13 +198,19 @@ end
function RewardTalismanSingleShowPopup2:SetBtns()
local itemConfigData=ConfigManager.GetConfigData(ConfigName.ItemConfig, tonumber(self.equipData.id))
self.btnSure:SetActive(itemConfigData.IfResolve==1)
self.btnSure:SetActive(itemConfigData.IfResolve==1 and BagManager.isBagPanel)
self.btnJump:SetActive(BagManager.isBagPanel)
self.btnWear:SetActive(self.openType == 3)
self.btnDown:SetActive(self.openType == 2)
self.btnSwitch:SetActive(self.openType == 4)
self.btnUpgrade:SetActive(self.openType == 2)
self.btnUpstar:SetActive(self.openType == 2)
self.mid:GetComponent("LayoutElement").minHeight = not self.isShowGet and 850 or 250
if self.equipData and self.equipData ~= 0 then
isGongMing = HarmonyManager.IsInfo(self.equipData.upHeroDid)
Util.SetGray(self.btnUpgrade, isGongMing)
end
end
function RewardTalismanSingleShowPopup2:OnShow()
@ -171,10 +243,7 @@ function RewardTalismanSingleShowPopup2:OnShow()
self.powerNum.text = Power
--=============================中部========================================
-- if self.equipData.upHeroDid == "" or self.equipData.upHeroDid == "0" then
-- this.treasurePanel[i].strongAttri.gameObject:SetActive(false)
-- this.treasurePanel[i].refineMasterAttri:SetActive(false)
-- end
--(基础属性)
local baseInfo = EquipTreasureManager.GetCurLvPropertyValue(1,self.equipData.levelPool,self.equipData.lv)
self.baseLevel.text = string.format("[强化等级:%s/%s]",self.equipData.lv,self.equipData.maxLv)
@ -191,11 +260,32 @@ function RewardTalismanSingleShowPopup2:OnShow()
--(神应属性)
local treeInfo=SacredTreeManager.GetCurLvPropertyValue(3,self.equipData.treePool,self.equipData.treeLv or 0)
self.treeLevel.text = string.format("[神应等级:%s/%s]",self.equipData.treeLv,self.equipData.maxTreeLv)
if (self.equipData.treeLv < 1 and SacredTreeManager.CulAttri(self.equipData) < 1) or self.openType == 1 or self.openType ~= 0 then
if (self.equipData.treeLv < 1 and SacredTreeManager.CulAttri(self.equipData) < 1) or self.openType == 1 then
self.treeAttri:SetActive(false)
if not self.isShowGet then
self.mid:GetComponent("LayoutElement").minHeight = 450
end
else
self.treeAttri:SetActive(true)
self:SetPropertyShow2(treeInfo,self.treeAttriList,self.treeGrid,self.treeAttriList2)
self:SetPropertyShow2(treeInfo,self.TreeAttriList,self.treeGrid,self.TreeAttriList2)
end
--大师属性
if self.equipData.upHeroDid == "" or self.equipData.upHeroDid == "0" then
self.baseMaster:SetActive(false)
self.refineMaster:SetActive(false)
if not self.isShowGet then
self.mid:GetComponent("LayoutElement").minHeight = 250
end
else
--强化共鸣
self:GongMingSetData(1,self.BaseMasterList,self.baseMasterGrid,self.baseMasterName,self.baseMaster)
--精炼共鸣
self:GongMingSetData(2,self.RefineMasterList,self.refineMasterGrid,self.refineMasterName,self.refineMaster)
end
if self.openType == 2 then
self.upgradeRed:SetActive(HeroManager.CheckIsUpTreasure(self.equipData.idDyn,1))
self.upstarRed:SetActive(HeroManager.CheckIsUpTreasure(self.equipData.idDyn,2))
end
--=============================下部=========================================
@ -324,13 +414,13 @@ function RewardTalismanSingleShowPopup2:GongMingSetData(curTabIndex,proPreList,g
--获取穿戴宝物强化/精炼的最小等级
local minLv--最小等级
local maxlv --最大等级
if #self.equipData.jewels < 2 then
if #self.curHeroData.jewels < 2 then
go.gameObject:SetActive(false)
return
end
go.gameObject:SetActive(true)
for i = 1, #self.equipData.jewels do
local curEquipTreasureData = EquipTreasureManager.GetTreasureData(self.equipData.jewels[i])
for i = 1, #self.curHeroData.jewels do
local curEquipTreasureData = EquipTreasureManager.GetTreasureData(self.curHeroData.jewels[i])
if curTabIndex == 1 then
if minLv then
if curEquipTreasureData.lv < minLv then
@ -382,6 +472,9 @@ function RewardTalismanSingleShowPopup2:GongMingSetData(curTabIndex,proPreList,g
end
if curJewelResonanceConfig.SortId < 1 then
go.gameObject:SetActive(false)
if not self.isShowGet then
self.mid:GetComponent("LayoutElement").minHeight = self.mid:GetComponent("LayoutElement").minHeight - 100
end
return
end
go.gameObject:SetActive(true)
@ -419,8 +512,10 @@ function RewardTalismanSingleShowPopup2:OnDestroy()
self.spLoader:Destroy()
self.BaseAttriList = {}--基础属性对象
self.RefineAttriList = {}--精炼属性对象
self.treeAttriList = {}--神应属性对象
self.treeAttriList2 = {}--神应属性对象2
self.TreeAttriList = {}--神应属性对象
self.TreeAttriList2 = {}--神应属性对象2
self.BaseMasterList = {}--强化大师
self.RefineMasterList = {}--精炼大师
self.jumpViewList = {}
self.itemPre = nil
end

View File

@ -449,7 +449,8 @@ function this.EquipInfo()
this.treasureDatas[pos]:OnOpen(false, {data.id,0}, 0.8, false, false, false, 0,did)
Util.AddOnceClick(btn,function()
if did and data then
UIManager.OpenPanel(UIName.RoleEquipTreasureChangePopup,this,2,curHeroData,data,nil,pos,0)
-- UIManager.OpenPanel(UIName.RoleEquipTreasureChangePopup,this,2,curHeroData,data,nil,pos,0)
UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup2,this,data,0,false,nil,curHeroData,pos)
end
end)
end

View File

@ -676,7 +676,8 @@ function this:SingleDataShow(go,index)
elseif jewerConfig.Location == 2 then
pos = 6
end
UIManager.OpenPanel(UIName.RoleEquipTreasureChangePopup,this,2,curHeroData,curEquipTreasureDatas[index],nil,pos)
-- UIManager.OpenPanel(UIName.RoleEquipTreasureChangePopup,this,2,curHeroData,curEquipTreasureDatas[index],nil,pos)
UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup2,this,curEquipTreasureDatas[index],2,false,nil,curHeroData,pos)
end
end
end
@ -814,9 +815,11 @@ function this.SingleItemDataShow(_go, _itemData)
--宝物界面
Util.AddOnceClick(Util.GetGameObject(_go.transform, "mask"),function()
if curEquipTreasureDatas[jewerConfigs[_itemData.id].Location + 4] then
UIManager.OpenPanel(UIName.RoleEquipTreasureChangePopup,this,3,curHeroData,curEquipTreasureDatas[jewerConfigs[_itemData.id].Location + 4],_itemData,jewerConfigs[_itemData.id].Location + 4)
-- UIManager.OpenPanel(UIName.RoleEquipTreasureChangePopup,this,3,curHeroData,curEquipTreasureDatas[jewerConfigs[_itemData.id].Location + 4],_itemData,jewerConfigs[_itemData.id].Location + 4)
UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup2,this,_itemData,4,false,nil,curHeroData,jewerConfigs[_itemData.id].Location + 4,curEquipTreasureDatas[jewerConfigs[_itemData.id].Location + 4])
else
UIManager.OpenPanel(UIName.RoleEquipTreasureChangePopup, this, 1, curHeroData, _itemData, nil, jewerConfigs[_itemData.id].Location + 4)
-- UIManager.OpenPanel(UIName.RoleEquipTreasureChangePopup, this, 1, curHeroData, _itemData, nil, jewerConfigs[_itemData.id].Location + 4)
UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup2,this,_itemData,3,false,nil,curHeroData,jewerConfigs[_itemData.id].Location + 4)
end
end
)