宝物可强化时,TIPS上的【强化】按钮未显示红点,精炼功能有相同问题
parent
94c92a7f22
commit
d1845618d1
|
@ -2913,6 +2913,80 @@ MonoBehaviour:
|
||||||
m_FillClockwise: 1
|
m_FillClockwise: 1
|
||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
|
--- !u!1 &2552297680180931692
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 6778977093533430719}
|
||||||
|
- component: {fileID: 9163730914972844210}
|
||||||
|
- component: {fileID: 8427651307786342684}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: red
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &6778977093533430719
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2552297680180931692}
|
||||||
|
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: 5062617598094578346}
|
||||||
|
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: -14.200012, y: -38.5}
|
||||||
|
m_SizeDelta: {x: 20, y: 20}
|
||||||
|
m_Pivot: {x: 1, y: 1}
|
||||||
|
--- !u!222 &9163730914972844210
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2552297680180931692}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &8427651307786342684
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2552297680180931692}
|
||||||
|
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 &2696884493071290815
|
--- !u!1 &2696884493071290815
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -3667,6 +3741,80 @@ Animator:
|
||||||
m_HasTransformHierarchy: 1
|
m_HasTransformHierarchy: 1
|
||||||
m_AllowConstantClipSamplingOptimization: 1
|
m_AllowConstantClipSamplingOptimization: 1
|
||||||
m_KeepAnimatorControllerStateOnDisable: 0
|
m_KeepAnimatorControllerStateOnDisable: 0
|
||||||
|
--- !u!1 &4140955800689676386
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 8148735974299120099}
|
||||||
|
- component: {fileID: 6409350623962348947}
|
||||||
|
- component: {fileID: 7990379475997439834}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: red
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &8148735974299120099
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 4140955800689676386}
|
||||||
|
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: 5440068102348137245}
|
||||||
|
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: -14.2, y: -38.5}
|
||||||
|
m_SizeDelta: {x: 20, y: 20}
|
||||||
|
m_Pivot: {x: 1, y: 1}
|
||||||
|
--- !u!222 &6409350623962348947
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 4140955800689676386}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &7990379475997439834
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 4140955800689676386}
|
||||||
|
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 &4214254282443111832
|
--- !u!1 &4214254282443111832
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -4182,6 +4330,7 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 4277464269594743757}
|
- {fileID: 4277464269594743757}
|
||||||
|
- {fileID: 8148735974299120099}
|
||||||
m_Father: {fileID: 8822063831458261844}
|
m_Father: {fileID: 8822063831458261844}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
@ -4540,6 +4689,7 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 7121130290947278988}
|
- {fileID: 7121130290947278988}
|
||||||
|
- {fileID: 6778977093533430719}
|
||||||
m_Father: {fileID: 8822063831458261844}
|
m_Father: {fileID: 8822063831458261844}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
|
|
@ -76,7 +76,7 @@ end
|
||||||
function this.GetAllHeroEquipedTreasureData()
|
function this.GetAllHeroEquipedTreasureData()
|
||||||
local equips = {}
|
local equips = {}
|
||||||
for i, v in pairs(allTreasures) do
|
for i, v in pairs(allTreasures) do
|
||||||
if (v.upHeroDid == "" or v.upHeroDid == 0) then
|
if (not v.upHeroDid or v.upHeroDid == "" or v.upHeroDid == 0 or v.upHeroDid == "0") then
|
||||||
else
|
else
|
||||||
table.insert(equips, v)
|
table.insert(equips, v)
|
||||||
end
|
end
|
||||||
|
|
|
@ -31,7 +31,9 @@ function RoleEquipTreasureChangePopup:InitComponent()
|
||||||
this.curRefinePropertyTxt=Util.GetGameObject(self.transform, "GameObject/bg1/mainPro/Text2")
|
this.curRefinePropertyTxt=Util.GetGameObject(self.transform, "GameObject/bg1/mainPro/Text2")
|
||||||
this.curEquipBtns=Util.GetGameObject(self.transform, "GameObject/bg1/btns")
|
this.curEquipBtns=Util.GetGameObject(self.transform, "GameObject/bg1/btns")
|
||||||
this.curEquipBtnStrong=Util.GetGameObject(self.transform, "GameObject/bg1/btns/btnStrong")
|
this.curEquipBtnStrong=Util.GetGameObject(self.transform, "GameObject/bg1/btns/btnStrong")
|
||||||
|
this.curEquipBtnStrongRed = Util.GetGameObject( this.curEquipBtnStrong, "red")
|
||||||
this.curEquipBtnRefine=Util.GetGameObject(self.transform, "GameObject/bg1/btns/btnRefine")
|
this.curEquipBtnRefine=Util.GetGameObject(self.transform, "GameObject/bg1/btns/btnRefine")
|
||||||
|
this.curEquipBtnRefineRed=Util.GetGameObject(this.curEquipBtnRefine, "red")
|
||||||
this.curEquipBtnRemove=Util.GetGameObject(self.transform, "GameObject/bg1/btns/btnRemove")
|
this.curEquipBtnRemove=Util.GetGameObject(self.transform, "GameObject/bg1/btns/btnRemove")
|
||||||
this.curEquipBtnAdd=Util.GetGameObject(self.transform, "GameObject/bg1/btns/btnAdd")
|
this.curEquipBtnAdd=Util.GetGameObject(self.transform, "GameObject/bg1/btns/btnAdd")
|
||||||
this.curEquipBtnChange=Util.GetGameObject(self.transform, "GameObject/bg1/btns/btnChange")
|
this.curEquipBtnChange=Util.GetGameObject(self.transform, "GameObject/bg1/btns/btnChange")
|
||||||
|
@ -130,6 +132,7 @@ function RoleEquipTreasureChangePopup:BindEvent()
|
||||||
|
|
||||||
Util.AddClick(this.nextEquipBtnStrong, function()
|
Util.AddClick(this.nextEquipBtnStrong, function()
|
||||||
UIManager.OpenPanel(UIName.EquipTreasureStrongPopup,nextEquipData,1)
|
UIManager.OpenPanel(UIName.EquipTreasureStrongPopup,nextEquipData,1)
|
||||||
|
self:ClosePanel()
|
||||||
end)
|
end)
|
||||||
Util.AddClick(this.curEquipBtnStrong, function()
|
Util.AddClick(this.curEquipBtnStrong, function()
|
||||||
if isGongMing then
|
if isGongMing then
|
||||||
|
@ -137,15 +140,18 @@ function RoleEquipTreasureChangePopup:BindEvent()
|
||||||
PopupTipPanel.ShowTip(Language[12184])
|
PopupTipPanel.ShowTip(Language[12184])
|
||||||
else
|
else
|
||||||
UIManager.OpenPanel(UIName.EquipTreasureStrongPopup,curEquipData,1)
|
UIManager.OpenPanel(UIName.EquipTreasureStrongPopup,curEquipData,1)
|
||||||
|
self:ClosePanel()
|
||||||
end
|
end
|
||||||
|
|
||||||
end)
|
end)
|
||||||
|
|
||||||
Util.AddClick(this.nextEquipBtnRefine, function()
|
Util.AddClick(this.nextEquipBtnRefine, function()
|
||||||
UIManager.OpenPanel(UIName.EquipTreasureStrongPopup,nextEquipData,2)
|
UIManager.OpenPanel(UIName.EquipTreasureStrongPopup,nextEquipData,2)
|
||||||
|
self:ClosePanel()
|
||||||
end)
|
end)
|
||||||
Util.AddClick(this.curEquipBtnRefine, function()
|
Util.AddClick(this.curEquipBtnRefine, function()
|
||||||
UIManager.OpenPanel(UIName.EquipTreasureStrongPopup,curEquipData,2)
|
UIManager.OpenPanel(UIName.EquipTreasureStrongPopup,curEquipData,2)
|
||||||
|
self:ClosePanel()
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -248,6 +254,8 @@ end
|
||||||
function this.ShowCurEquipData()
|
function this.ShowCurEquipData()
|
||||||
local equipConfigData=ConfigManager.GetConfigData(ConfigName.JewelConfig, curEquipData.id)
|
local equipConfigData=ConfigManager.GetConfigData(ConfigName.JewelConfig, curEquipData.id)
|
||||||
local itemConfigData=ConfigManager.GetConfigData(ConfigName.ItemConfig, curEquipData.id)
|
local itemConfigData=ConfigManager.GetConfigData(ConfigName.ItemConfig, curEquipData.id)
|
||||||
|
this.curEquipBtnStrongRed.gameObject:SetActive(HeroManager.CheckIsUpTreasure(curEquipData.idDyn,1))
|
||||||
|
this.curEquipBtnRefineRed.gameObject:SetActive(HeroManager.CheckIsUpTreasure(curEquipData.idDyn,2))
|
||||||
local curPower=EquipTreasureManager.CalculateWarForce(curEquipData.idDyn)
|
local curPower=EquipTreasureManager.CalculateWarForce(curEquipData.idDyn)
|
||||||
this.powerNum1.text=curPower
|
this.powerNum1.text=curPower
|
||||||
this.desc1.text=GetLanguageStrById(itemConfigData.ItemDescribe)
|
this.desc1.text=GetLanguageStrById(itemConfigData.ItemDescribe)
|
||||||
|
|
Loading…
Reference in New Issue