diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/hongmengzhen.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/hongmengzhen.png
new file mode 100644
index 0000000000..abefd5c235
Binary files /dev/null and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/hongmengzhen.png differ
diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/hongmengzhen.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/hongmengzhen.png.meta
new file mode 100644
index 0000000000..fa7733ad52
--- /dev/null
+++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/hongmengzhen.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 5192cab244bedbf419c1e9150103fc8d
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 9
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - serializedVersion: 2
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 504e8dd4a94fa8643ae41e735b0a47c0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag: MainAtlas
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/jianmushenshu.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/jianmushenshu.png
new file mode 100644
index 0000000000..825de4d36f
Binary files /dev/null and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/jianmushenshu.png differ
diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/jianmushenshu.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/jianmushenshu.png.meta
new file mode 100644
index 0000000000..1e875517b0
--- /dev/null
+++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/jianmushenshu.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: aacb114246db66043b837d1edb0a9b6c
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 9
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - serializedVersion: 2
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 41d7a5fb94c297b47b17a8c2b3b66ff3
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag: MainAtlas
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/silingshilian.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/silingshilian.png
new file mode 100644
index 0000000000..4887780f47
Binary files /dev/null and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/silingshilian.png differ
diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/silingshilian.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/silingshilian.png.meta
new file mode 100644
index 0000000000..2290f30310
--- /dev/null
+++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/silingshilian.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 988ec86d08a4e6f45b5e816f1cb7c097
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 9
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - serializedVersion: 2
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 6fa2f7d54fe992447abed21f332f5166
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag: MainAtlas
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
index 2f74fa8757..52a3ab4b0b 100644
--- a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
@@ -22,6 +22,7 @@ function this.HongMengGuideFun(OnOff)
print("鸿蒙碑开启引导")
if OnOff == 1 then
-- body
+ UIManager.OpenPanel(UIName.MainPanel)
table.insert(_FuncGuideList, 101612)
this.CheckFuncGuide()
diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua
index c5fc547b75..941cd469a8 100644
--- a/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua
@@ -104,17 +104,13 @@ function EnvoyItem:SetItem(go,data)
self.Empty:SetActive(false)
self.RedPoint:SetActive(false)
Util.GetGameObject(go.transform, "GameObject/frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroSingleData.heroConfig.Quality,heroSingleData.star))
- if heroSingleData.lv == HarmonyManager.hongmengAdditions[1].value then
+ local data = HarmonyManager.GetSingleAdditions(HarmonyAddType.AddLv)
+ if heroSingleData.lv == data then
-- body
Util.GetGameObject(go.transform, "GameObject/lv/Text"):GetComponent("Text").text = string.format("%d",heroSingleData.lv)
else
Util.GetGameObject(go.transform, "GameObject/lv/Text"):GetComponent("Text").text = string.format("%d",heroSingleData.lv)
end
-
-
-
- --Util.GetGameObject(go.transform, "GameObject/lv/Text"):GetComponent("Text").text = string.format("%d",HarmonyManager.hongmengAdditions[1].value)
-
Util.GetGameObject(go.transform, "GameObject/icon"):GetComponent("Image").sprite = Util.LoadSprite(heroSingleData.icon)
Util.GetGameObject(go.transform, "GameObject/proIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(heroSingleData.heroConfig.PropertyName))
diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua
index 469f0d60ac..cb73758fd6 100644
--- a/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua
@@ -403,10 +403,7 @@ function this.GetSingleAdditions(type)
-- body
for i = 1, #this.hongmengAdditions do
if this.hongmengAdditions[i].additionType == type then
- if type == 1 then
- -- body
- --print("!!!!!!!"..this.hongmengAdditions[i].value.."####"..type)
- end
+
return this.hongmengAdditions[i].value
end
@@ -415,25 +412,45 @@ function this.GetSingleAdditions(type)
return 0
end
+function this.GetSingleAdditionsData(type)
+ if this.hongmengAdditions then
+ -- body
+ for i = 1, #this.hongmengAdditions do
+ if this.hongmengAdditions[i].additionType == type then
+
+
+ return this.hongmengAdditions[i]
+ end
+ end
+ end
+
+ return nil
+end
+
function this.GetHongMengUpData()
-
- if this.hongmengAdditions[1].value < 330 then
+ for i = 1, #this.hongmengAdditions do
-- body
- LogBlue("服务器数据为"..this.hongmengAdditions[1].value)
- return nil
-
- end
- LogGreen("服务器数据为"..this.hongmengAdditions[1].value)
- for key, value in ConfigPairs(HongmengUp) do
- -- body
- if value.HongmengLevel == this.hongmengAdditions[1].value + 1 then
+ if this.hongmengAdditions[i].additionType == 1 then
-- body
-
- return ConfigManager.TryGetConfigData(ConfigName.HongmengUp,key)
- end
+ if this.hongmengAdditions[i].value < 330 then
+ -- body
+ LogBlue("服务器数据为"..this.hongmengAdditions[i].value)
+ return nil
+ end
+ LogGreen("服务器数据为"..this.hongmengAdditions[i].value)
+ for key, value in ConfigPairs(HongmengUp) do
+ -- body
+ if value.HongmengLevel == this.hongmengAdditions[i].value + 1 then
+ -- body
+ return ConfigManager.TryGetConfigData(ConfigName.HongmengUp,key)
+ end
+
+ end
+ end
end
+
return nil
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultPanel.lua
index d9b772b688..368043c252 100644
--- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultPanel.lua
@@ -108,19 +108,37 @@ function GongMingResultTips:OnOpen(flag)
local dataRockOne = EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[2])
if dataRockOne then
-- body
- if dataRockOne.lv > 0 then
- if dataRockOne.type == "魂宝" then
- -- body
- Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = string.format("%d",dataRockOne.lv)
- HunDegree = dataRockOne.lv
+ if dataRockOne.type == "魂宝" then
+ -- body
+ -- Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = string.format("%d",dataRockOne.oriLv)
+ HunDegree = dataRockOne.oriLv
+ if HunDegree > 0 then
+ Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = string.format("%d",HunDegree)
+
+ elseif HunDegree == 0 then
+ Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = "无"
else
- Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = string.format("%d",dataRockOne.lv)
- LingDegree = dataRockOne.lv
+ -- body
+ Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = "无"
end
-
else
- Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = "无"
+ --Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = string.format("%d",dataRockOne.oriLv)
+ LingDegree = dataRockOne.oriLv
+ if LingDegree > 0 then
+ Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = string.format("%d",LingDegree)
+ elseif LingDegree == 0 then
+ Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = "无"
+ else
+ -- body
+ Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = "无"
+ end
end
+ -- if dataRockOne.oriLv >= 0 then
+
+
+ -- else
+ -- Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = "无"
+ -- end
else
Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = "无"
end
@@ -128,20 +146,32 @@ function GongMingResultTips:OnOpen(flag)
local dataRockTwo = EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[1])
if dataRockTwo then
-- body
- if dataRockTwo.lv > 0 then
- -- bodyLingDegree
- if dataRockTwo.type == "灵宝" then
+ if dataRockTwo.type == "灵宝" then
+ -- body
+ LingDegree = dataRockTwo.oriLv
+ if LingDegree > 0 then
-- body
- Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = string.format("%d",dataRockTwo.lv)
- LingDegree = dataRockTwo.lv
+ Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = string.format("%d",LingDegree)
+ elseif LingDegree == 0 then
+ Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = "无"
else
- Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = string.format("%d",dataRockTwo.lv)
- HunDegree = dataRockTwo.lv
- end
-
+ Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = "无"
+ -- body
+ end
else
- Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = "无"
+ HunDegree = dataRockTwo.oriLv
+ if HunDegree > 0 then
+ -- body
+ Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = string.format("%d",HunDegree)
+ elseif HunDegree == 0 then
+ -- body
+ Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = "无"
+ else
+ Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = "无"
+ end
+
end
+
else
Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = "无"
end
@@ -185,6 +215,7 @@ function GongMingResultTips:OnOpen(flag)
end
-- body
elseif data[i].additionType == 3 then
+ print(HunDegree.." !!!!!!!!! "..data[i].value)
if HunDegree ~= -1 and data[i].value > 0 then
-- body
if HunDegree >data[i].value then
@@ -205,6 +236,7 @@ function GongMingResultTips:OnOpen(flag)
-- body
elseif data[i].additionType == 4 then
+ print(HunDegree.." @@@@@@@@@@@@ "..data[i].value)
if LingDegree ~= -1 and data[i].value > 0 then
-- body
if LingDegree>data[i].value then
diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua
index ecf8765e09..fab726585e 100644
--- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua
@@ -111,7 +111,7 @@ function HongMengEnvoyPanel:BindEvent()
function()
--二级共鸣弹窗
local sum = HarmonyManager:HongMengTowerUpLimit()
- if HarmonyManager.hongmengAdditions[1].value >= sum then
+ if HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value >= sum then
-- body
PopupTipPanel.ShowTip("鸿蒙碑等级已达上限!")
else
@@ -133,8 +133,8 @@ function HongMengEnvoyPanel:BindEvent()
function()
-- body
LogGreen("回调函数")
- HarmonyManager.hongmengAdditions[1].value = HarmonyManager.hongmengAdditions[1].value + 1
- if HarmonyManager.hongmengAdditions[1].value >= sum then
+ HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value = HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value + 1
+ if HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value >= sum then
-- body
Util.SetGray(self.UpBtn, true)
self.imageGame:SetActive(false)
@@ -164,7 +164,7 @@ function HongMengEnvoyPanel:BindEvent()
end
local sum = HarmonyManager:HongMengTowerUpLimit()
- self.GradeText.text = string.format("%d/%d", HarmonyManager.hongmengAdditions[1].value, sum)
+ self.GradeText.text = string.format("%d/%d", HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value, sum)
--检测红点 UpdateGongMingLv
for i = 1, #self.EnvoyItemList do
@@ -218,7 +218,7 @@ function HongMengEnvoyPanel:RunTimerFun()
end
function HongMengEnvoyPanel:IsUpBtnGray()
local sum = HarmonyManager:HongMengTowerUpLimit()
- if HarmonyManager.hongmengAdditions[1].value >= sum then
+ if HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value >= sum then
-- body
Util.SetGray(self.UpBtn, true)
self.imageGame:SetActive(false)
@@ -348,7 +348,7 @@ function HongMengEnvoyPanel:OnOpen(equipSId)
local sum = HarmonyManager:HongMengTowerUpLimit()
- self.GradeText.text = string.format("%d/%d", HarmonyManager.hongmengAdditions[1].value, sum)
+ self.GradeText.text = string.format("%d/%d", HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value, sum)
self:IsUpBtnGray()
self:InitTextMum()
self:CheckEvoyEquip()
diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua
index 3eeef01253..6d4f679c75 100644
--- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua
@@ -110,16 +110,16 @@ function HongMengUnLoadPanel:SetTextTwo(go,data)
Util.GetGameObject(go.transform,"TextRank"):GetComponent("Text").text = string.format("%s%d星",GetQuantityStrByquality(equip.Quality),equip.Stars)
end
- if EquipTreasureManager.GetSingleTreasureByIdDyn(data.jewels[2]) and EquipTreasureManager.GetSingleTreasureByIdDyn(data.jewels[2]).lv > 0 then
+ if EquipTreasureManager.GetSingleTreasureByIdDyn(data.jewels[2]) and EquipTreasureManager.GetSingleTreasureByIdDyn(data.jewels[2]).oriLv > 0 then
-- body
- Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("%d",EquipTreasureManager.GetSingleTreasureByIdDyn(data.jewels[2]).lv)
+ Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("%d",EquipTreasureManager.GetSingleTreasureByIdDyn(data.jewels[2]).oriLv)
else
Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("无")
end
- if EquipTreasureManager.GetSingleTreasureByIdDyn(data.jewels[1]) and EquipTreasureManager.GetSingleTreasureByIdDyn(data.jewels[1]).lv > 0 then
+ if EquipTreasureManager.GetSingleTreasureByIdDyn(data.jewels[1]) and EquipTreasureManager.GetSingleTreasureByIdDyn(data.jewels[1]).oriLv > 0 then
-- body
- Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("%d",EquipTreasureManager.GetSingleTreasureByIdDyn(data.jewels[1]).lv)
+ Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("%d",EquipTreasureManager.GetSingleTreasureByIdDyn(data.jewels[1]).oriLv)
else
Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("无")
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroData.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroData.lua
index 602521d507..54c120c5dc 100644
--- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroData.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroData.lua
@@ -24,12 +24,12 @@ HeroData.__get__.lv = function(self)
if HeroManager.IsTenTalent(self._id)and HarmonyManager:HongMengTowerUpLimit() ~= 0 then
-- bodys
- endLv = HarmonyManager.hongmengAdditions[1].value
+ endLv = HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value
--print(endLv," "..self.heroConfig.ReadingName.."!!!!!!!!"..HarmonyManager.hongmengAdditions[1].value)
else
if HeroManager.IsTenTalent(self._id) then
-- body
- endLv = HarmonyManager.hongmengAdditions[1].value
+ endLv = HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value
else
local curlvEen = HeroManager.heroLvEnd[self._id]
endLv = temp_lv > curlvEen and curlvEen or temp_lv
@@ -41,14 +41,15 @@ HeroData.__get__.lv = function(self)
return endLv
- elseif HarmonyManager.hongmengAdditions[1] and HarmonyManager:IsEnvoy(self.dynamicId) then
+ elseif HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv) and HarmonyManager:IsEnvoy(self.dynamicId) then
--print("self._id @@@"..HarmonyManager.hongmengAdditions[1].heroTid.."#####"..HarmonyManager.hongmengAdditions[1].value )
- if HarmonyManager.hongmengAdditions[1].heroTid >= 0 and HarmonyManager.hongmengAdditions[1].value >= 330 then
+ local data = HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv)
+ if data.heroTid >= 0 and data.value >= 330 then
-- body
local temp_lv = 0
if HeroManager.IsTenTalent(self._id) then
-- body
- temp_lv = HarmonyManager.hongmengAdditions[1].value
+ temp_lv = data.value
else
temp_lv = HeroManager.heroLvEnd[self.id]
end
@@ -141,10 +142,10 @@ HeroData.__get__.breakId = function (self)
--LogGreen(tostring(HeroManager.IsElevenStar(self.star)))
--print(self._id.." "..HarmonyManager.hongmengAdditions[1].heroTid..self.heroConfig.ReadingName)
- if HeroManager.IsTenTalent(self._id) and HarmonyManager.hongmengAdditions[1].heroTid == 0 then
+ if HeroManager.IsTenTalent(self._id) and HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).heroTid == 0 then
-- bodys
- endLv = HarmonyManager.hongmengAdditions[1].value
+ endLv = HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value
--print(endLv," "..self.heroConfig.ReadingName)
else
local curlvEen = HeroManager.heroLvEnd[self.id]
@@ -154,14 +155,15 @@ HeroData.__get__.breakId = function (self)
endbreakIdLv = HeroManager.GetAllStarBreakIdData(self._id,endLv)
--print(endbreakIdLv," 111 "..self.heroConfig.ReadingName.."等级"..endLv)
return endbreakIdLv
- elseif HarmonyManager.hongmengAdditions[1] and HarmonyManager:IsEnvoy(self.dynamicId) then
+ elseif HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv) and HarmonyManager:IsEnvoy(self.dynamicId) then
+ local data = HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv)
--print("self._id @@@"..HarmonyManager.hongmengAdditions[1].heroTid.."#####"..HarmonyManager.hongmengAdditions[1].value )
- if HarmonyManager.hongmengAdditions[1].heroTid >= 0 and HarmonyManager.hongmengAdditions[1].value >= 330 then
+ if data.heroTid >= 0 and data.value >= 330 then
-- body
local temp_lv = 0
if HeroManager.IsTenTalent(self._id) then
-- body
- temp_lv = HarmonyManager.hongmengAdditions[1].value
+ temp_lv = data.value
else
temp_lv = HeroManager.heroLvEnd[self.id]
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
index 83f6caa2d7..7eefee607e 100644
--- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
@@ -549,9 +549,9 @@ local jumpDic = {
end,
[JumpType.HongMengZhen] = function ()
-- body
- if HarmonyManager.hongmengAdditions[1] then
+ if HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv) then
-- body
- if HarmonyManager.hongmengAdditions[1].heroTid == 0 then
+ if HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).heroTid == 0 then
-- body
UIManager.OpenPanel(UIName.HongMengEnvoyPanel)
else
diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua
index e9eec228c5..ee0f1ff16b 100644
--- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua
@@ -128,7 +128,7 @@ function this.SingleHeroDataShow(go,_heroData)
GongMingMask:SetActive(true)
elseif HarmonyManager:IsEnvoy(_heroData.dynamicId) and HarmonyManager:HongMengTowerUpLimit() ~= 0 then
- if HarmonyManager.hongmengAdditions[1].heroTid == 0 then
+ if HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).heroTid == 0 then
-- body
Util.GetGameObject(_go.transform, "lv/Text"):GetComponent("Text").text = ""..heroData.lv..""
GongMingMask:SetActive(true)
diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua
index cb1d8069e4..bb311f880c 100644
--- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua
@@ -156,7 +156,7 @@ function this.SingleHeroDataShow(go,_heroData)
Util.GetGameObject(_go.transform, "lv/Text"):GetComponent("Text").text = ""..heroData.lv..""
GongMingMask:SetActive(true)
elseif HarmonyManager:IsEnvoy(_heroData.dynamicId) and HarmonyManager:HongMengTowerUpLimit() ~= 0 then
- if HarmonyManager.hongmengAdditions[1].heroTid == 0 then
+ if HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).heroTid == 0 then
-- body
Util.GetGameObject(_go.transform, "lv/Text"):GetComponent("Text").text = ""..heroData.lv..""
GongMingMask:SetActive(true)
diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureData.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureData.lua
index a247368c1f..566ccf00f5 100644
--- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureData.lua
+++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureData.lua
@@ -47,6 +47,9 @@ EquipTreasureData.__set__.lv = function(self, value)
self._lv = value
end
-
+EquipTreasureData.__get__.oriLv= function (self)
+ -- body
+ return self._lv
+end
return EquipTreasureData
\ No newline at end of file
diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
index 17e6c9729d..d211eff4c7 100644
--- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
@@ -283,8 +283,9 @@ 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) and HarmonyManager.hongmengAdditions[1] then
- if HarmonyManager.hongmengAdditions[1].heroTid == 0 and HarmonyManager.hongmengAdditions[1].value > 0 then
+ elseif HarmonyManager:IsEnvoy(heroData.dynamicId) and HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv) then
+ local temp= HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv)
+ if temp.heroTid == 0 and temp.value > 0 then
-- body
Util.GetGameObject(_go.transform, "card/lv/Text"):GetComponent("Text").text = ""..heroData.lv..""
diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
index 49666b81b6..707f785b95 100644
--- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
@@ -167,8 +167,8 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择
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) and HarmonyManager.hongmengAdditions[1] then
- if HarmonyManager.hongmengAdditions[1].heroTid == 0 then
+ elseif HarmonyManager:IsEnvoy(heroData.dynamicId) and HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv) then
+ if HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).heroTid == 0 then
-- body
Util.GetGameObject(go.transform, "lv/Text"):GetComponent("Text").text = ""..heroData.lv..""
GongMingMask:SetActive(true)