diff --git a/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengPanel.prefab
index a150538cd2..91c01a0ccd 100644
--- a/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengPanel.prefab
@@ -2524,7 +2524,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &4820278137459727294
RectTransform:
m_ObjectHideFlags: 0
diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
index 26a3c2dc52..417f39b654 100644
--- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
@@ -399,6 +399,7 @@ end
--设置单个上阵英雄信息
function this.SetCardSingleData(o, heroId, _pos, _heroData)
local bg=Util.GetGameObject(o,"Bg1"):GetComponent("Image")
+
local lv=Util.GetGameObject(o,"lv/Text"):GetComponent("Text")
local hp = Util.GetGameObject(o,"hpProgress/hp"):GetComponent("Image")
local hpPass = Util.GetGameObject(o,"hpProgress/hpPass"):GetComponent("Image")
@@ -451,7 +452,16 @@ function this.SetCardSingleData(o, heroId, _pos, _heroData)
end
yuanImage:SetActive(heroData.createtype == 1)
- lv.text=heroData.lv
+ if HarmonyManager.IsChangeColor(heroData.dynamicId) then
+ -- body
+ lv.text=""..heroData.lv..""
+ elseif HarmonyManager.IsGongMing(heroData.dynamicId) and HarmonyManager.hongmengTablet >= 330 then
+ -- bod
+ lv.text=""..heroData.lv..""
+ else
+ lv.text=heroData.lv
+ end
+
fg.sprite = Util.LoadSprite(GetHeroCardStarFg[heroData.star])
@@ -614,9 +624,20 @@ function this.SingleHeroDataShow(_go, _heroData)
local yuanImage = Util.GetGameObject(go, "yuanImage")
local choosedObj = Util.GetGameObject(go, "choosed")
local hpExp = Util.GetGameObject(go, "hpExp")
+
+
frame.sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality,heroData.star))
icon.sprite=Util.LoadSprite(heroData.icon)
- lv.text=heroData.lv
+ if HarmonyManager.IsChangeColor(heroData.dynamicId) then
+ -- body
+ lv.text=""..heroData.lv..""
+ elseif HarmonyManager.IsGongMing(heroData.dynamicId) and HarmonyManager.hongmengTablet >= 330 then
+ -- bod
+ lv.text=""..heroData.lv..""
+ else
+ lv.text=heroData.lv
+ end
+
pro.sprite= Util.LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
SetHeroStars(starGrid, heroData.star,1,Vector2.New(30,30),-8)
--血量显示
diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultPanel.lua
index 9b1bf06438..64590213c9 100644
--- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultPanel.lua
@@ -165,7 +165,7 @@ function GongMingResultTips:OnOpen(flag)
-- body
Util.GetGameObject(this.TextTwoAll,"textDegree"):GetComponent("Text").text = string.format("%d",herodata.lv)
else
- Util.GetGameObject(this.TextTwoAll,"textDegree"):GetComponent("Text").text = string.format("%d",data[i].value)
+ Util.GetGameObject(this.TextTwoAll,"textDegree"):GetComponent("Text").text = string.format("%d",herodata.lv)
end
elseif data[i].additionType == 2 then
diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua
index 1e2996cdb1..0a63ebe6b2 100644
--- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua
@@ -80,7 +80,7 @@ function HongMengUnLoadPanel:SetItem(go,data,index)
-- body
Util.GetGameObject(go.transform, "lv/Text"):GetComponent("Text").text = string.format("%d",data.lv)
else
- Util.GetGameObject(go.transform, "lv/Text"):GetComponent("Text").text = string.format("%d",HarmonyManager.hongmengAdditions[1].value)
+ Util.GetGameObject(go.transform, "lv/Text"):GetComponent("Text").text = string.format("%d",data.lv)
end
else
@@ -122,7 +122,7 @@ function HongMengUnLoadPanel:SetText(go,_data)
if HarmonyManager.hongmengTablet>=330 then
Util.GetGameObject(go.transform,"Textdrgee"):GetComponent("Text").text = string.format("%d",_data.lv)
else
- Util.GetGameObject(go.transform,"Textdrgee"):GetComponent("Text").text = string.format("%d",data[i].value)
+ Util.GetGameObject(go.transform,"Textdrgee"):GetComponent("Text").text = string.format("%d",_data.lv)
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua
index f180aaf61e..2e072f0ba3 100644
--- a/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua
@@ -14,9 +14,10 @@ local TempItem = nil
local ItemList = {}
local Box = 0
local OpenBox = 0
-local HeroCount = 0
+local HeroCount
function this:AwakeLength()
+ HeroCount = 0
Box = #HarmonyManager.hongmengHeroInfos;
OpenBox = #HarmonyManager.hongmengHeroInfos+2
for i = 1, #HarmonyManager.hongmengHeroInfos do
@@ -307,7 +308,8 @@ function this:Refesh(id)
OpenBox = OpenBox + 1
if self.stage == 1 then
-- body
- Game.GlobalEvent:DispatchEvent(GameEvent.HongMeng.OnlyRefeshText,{HeroCount,Box, 1})
+
+ Game.GlobalEvent:DispatchEvent(GameEvent.HongMeng.OnlyRefeshText,{HeroCount,Box})
else
local count = 0
for i = 1, #HarmonyManager.hongmengGuards do
@@ -317,7 +319,7 @@ function this:Refesh(id)
-- body
end
end
- Game.GlobalEvent:DispatchEvent(GameEvent.HongMeng.OnlyRefeshText,{HeroCount + count,Box + #HarmonyManager.hongmengGuards, 1})
+ Game.GlobalEvent:DispatchEvent(GameEvent.HongMeng.OnlyRefeshText,{HeroCount + count,Box + #HarmonyManager.hongmengGuards})
end
LogGreen(Box)
local data = {}
diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua
index 6a4b974c75..8ff3670439 100644
--- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua
@@ -124,7 +124,7 @@ function this.SingleHeroDataShow(go,_heroData)
if HarmonyManager.IsChangeColor(_heroData.dynamicId) then
Util.GetGameObject(_go.transform, "lv/Text"):GetComponent("Text").text = ""..heroData.lv..""
GongMingMask:SetActive(true)
- elseif HarmonyManager:IsEnvoy(_heroData.dynamicId) then
+ elseif HarmonyManager:IsEnvoy(_heroData.dynamicId) then
Util.GetGameObject(_go.transform, "lv/Text"):GetComponent("Text").text = ""..heroData.lv..""
GongMingMask:SetActive(true)
end
diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
index 7e2c6a1462..6970478088 100644
--- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
@@ -266,7 +266,7 @@ function this.SingleHeroDataShow(_go,_heroData)
if HarmonyManager.IsChangeColor(heroData.dynamicId) then
-- body
Util.GetGameObject(_go.transform, "card/lv/Text"):GetComponent("Text").text = ""..heroData.lv..""
- elseif HarmonyManager:IsEnvoy(heroData.dynamicId) then
+ elseif HarmonyManager:IsEnvoy(heroData.dynamicId) and HarmonyManager.hongmengTablet >= 330 then
Util.GetGameObject(_go.transform, "card/lv/Text"):GetComponent("Text").text = ""..heroData.lv..""
else
diff --git a/Assets/ManagedResources/~Lua/View/HarmonyView.lua b/Assets/ManagedResources/~Lua/View/HarmonyView.lua
index acaa069c8f..36640ffcf5 100644
--- a/Assets/ManagedResources/~Lua/View/HarmonyView.lua
+++ b/Assets/ManagedResources/~Lua/View/HarmonyView.lua
@@ -71,9 +71,13 @@ function HarmonyView:OnOpen()
for i = 1, #self.HongMengData do
if self.HongMengData[i] then
-- body
- for i = 1, #self.HongMengData[i].equipIdList do
- HarmonyManager.equipCount= HarmonyManager.equipCount+1
+ if self.HongMengData[i].equipIdList then
+ -- body
+ for i = 1, #self.HongMengData[i].equipIdList do
+ HarmonyManager.equipCount= HarmonyManager.equipCount+1
+ end
end
+
end
end