diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/HarmonyPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/HarmonyPanel.lua
index 9f72d09ba4..332a3746ee 100644
--- a/Assets/ManagedResources/~Lua/Modules/Harmony/HarmonyPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Harmony/HarmonyPanel.lua
@@ -27,7 +27,7 @@ function HarmonyPanel:InitComponent()
for i = 1, #self.contents do
self.prefab[i]=Util.GetGameObject(self.panel,self.contents[i].panelName);
- self.contents[i].view:InitComponent(self.panel, BagManager.GetTotalItemNum(UpViewRechargeType.Gold),BagManager.GetTotalItemNum(UpViewRechargeType.DemonCrystal),1)
+ self.contents[i].view:InitComponent(self.panel, BagManager.GetTotalItemNum(UpViewRechargeType.XuanHuangZhiQi),BagManager.GetTotalItemNum(UpViewRechargeType.DemonCrystal),1)
end
@@ -106,7 +106,7 @@ end
--界面打开时调用(用于子类重写)
function HarmonyPanel:OnOpen()
- NetManager.PlayerInfoRequest(LoadingPanel.OnStep)
+ -- NetManager.PlayerInfoRequest(LoadingPanel.OnStep)
--格子
@@ -126,7 +126,7 @@ end
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
function HarmonyPanel:OnShow()
- self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Talisman})
+ self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.HongMengProp})
end
--界面关闭时调用(用于子类重写)
diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua
index dc1dd3e578..7d4cbee928 100644
--- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua
@@ -73,6 +73,7 @@ function GongMingResultTips:OnOpen(skinId)
Util.GetGameObject(this.TextAll,"textHun"):GetComponent("Text").text = string.format("%d(%s)",data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName)
else
+ print(" textHun ",data[i].value)
Util.GetGameObject(this.TextAll,"textHun"):GetComponent("Text").text = string.format("%d",data[i].value)
end
@@ -86,7 +87,8 @@ function GongMingResultTips:OnOpen(skinId)
else
- Util.GetGameObject(this.TextAll,"textHun"):GetComponent("Text").text = string.format("%d",data[i].value)
+ print(" textLing ",data[i].value)
+ Util.GetGameObject(this.TextAll,"textLing"):GetComponent("Text").text = string.format("%d",data[i].value)
end
-- body
@@ -115,7 +117,8 @@ function GongMingResultTips:OnOpen(skinId)
-- body
Util.GetGameObject(this.TextAll,"textHun"):GetComponent("Text").text = string.format("%d(%s)",data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName)
else
- Util.GetGameObject(this.TextAll,"textHun"):GetComponent("Text").text = string.format("%d",data[i].value)
+ -- Util.GetGameObject(this.TextAll,"textHun"):GetComponent("Text").text = string.format("%d",data[i].value)
+ Util.GetGameObject(this.TextAll,"textHun"):GetComponent("Text").text = string.format("无")
end
-- body
@@ -128,7 +131,8 @@ function GongMingResultTips:OnOpen(skinId)
else
- Util.GetGameObject(this.TextAll,"textHun"):GetComponent("Text").text = string.format("%d",data[i].value)
+ -- Util.GetGameObject(this.TextAll,"textLing"):GetComponent("Text").text = string.format("%d",data[i].value)
+ Util.GetGameObject(this.TextAll,"textLing"):GetComponent("Text").text = string.format("无")
end
-- body
diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua
index 216673999c..7d1a8f8d5c 100644
--- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua
@@ -330,7 +330,7 @@ end
--界面打开时调用(用于子类重写)
function HongMengEnvoyPanel:OnOpen(equipSId)
- NetManager.PlayerInfoRequest(LoadingPanel.OnStep)
+ --NetManager.PlayerInfoRequest(LoadingPanel.OnStep)
self.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, {showType = UpViewOpenType.ShowLeft})
for i = 1, #self.EnvoyItemList do
diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua
index 0a63ebe6b2..6bc88dd443 100644
--- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua
@@ -100,14 +100,14 @@ function HongMengUnLoadPanel:SetTextTwo(go,data)
-- body
Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("%d",EquipTreasureManager.GetSingleTreasureByIdDyn(data.jewels[2]).lv)
else
- Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("%d",0)
+ Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("无")
end
if EquipTreasureManager.GetSingleTreasureByIdDyn(data.jewels[1]) then
-- body
Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("%d",EquipTreasureManager.GetSingleTreasureByIdDyn(data.jewels[1]).lv)
else
- Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("%d",0)
+ Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("无")
end
@@ -136,10 +136,49 @@ function HongMengUnLoadPanel:SetText(go,_data)
-- body
elseif data[i].additionType == 3 then
- Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("%d",data[i].value)
+ if data[i].value ~= 0 then
+ -- body
+ if EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[2]) then
+ -- body
+ local grade = data[i].value > EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[2]).lv and data[i].value or EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[2]).lv
+ Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("%d",grade)
+ else
+ Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("无")
+ end
+
+ else
+ if EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[2]) then
+ -- body
+ local grade = data[i].value > EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[2]).lv and data[i].value or EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[2]).lv
+ Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("%d",grade)
+ else
+ Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("无")
+ end
+ -- Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("无")
+ end
+ -- Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("%d",data[i].value)
-- body
elseif data[i].additionType == 4 then
- Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("%d",data[i].value)
+ if data[i].value ~= 0 then
+ if EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[1]) then
+ -- body
+ local grade = data[i].value > EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[1]).lv and data[i].value or EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[1]).lv
+ Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("%d",grade)
+ else
+ Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("无")
+ end
+ -- Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("%d",data[i].value)
+ else
+ if EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[2]) then
+ -- body
+ local grade = data[i].value > EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[2]).lv and data[i].value or EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[2]).lv
+ Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("%d",grade)
+ else
+ Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("无")
+ end
+ -- Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("无")
+ end
+
-- body
else
Util.GetGameObject(go.transform,"TextFa"):GetComponent("Text").text = string.format("%d",data[i].value)