【鸿蒙阵修改】
parent
fddced81a3
commit
5a11596515
Binary file not shown.
After Width: | Height: | Size: 28 KiB |
|
@ -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:
|
Binary file not shown.
After Width: | Height: | Size: 30 KiB |
|
@ -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:
|
Binary file not shown.
After Width: | Height: | Size: 29 KiB |
|
@ -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:
|
|
@ -22,6 +22,7 @@ function this.HongMengGuideFun(OnOff)
|
||||||
print("鸿蒙碑开启引导")
|
print("鸿蒙碑开启引导")
|
||||||
if OnOff == 1 then
|
if OnOff == 1 then
|
||||||
-- body
|
-- body
|
||||||
|
UIManager.OpenPanel(UIName.MainPanel)
|
||||||
table.insert(_FuncGuideList, 101612)
|
table.insert(_FuncGuideList, 101612)
|
||||||
this.CheckFuncGuide()
|
this.CheckFuncGuide()
|
||||||
|
|
||||||
|
|
|
@ -104,17 +104,13 @@ function EnvoyItem:SetItem(go,data)
|
||||||
self.Empty:SetActive(false)
|
self.Empty:SetActive(false)
|
||||||
self.RedPoint:SetActive(false)
|
self.RedPoint:SetActive(false)
|
||||||
Util.GetGameObject(go.transform, "GameObject/frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroSingleData.heroConfig.Quality,heroSingleData.star))
|
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
|
-- body
|
||||||
Util.GetGameObject(go.transform, "GameObject/lv/Text"):GetComponent("Text").text = string.format("<color=#ffbe22>%d</color>",heroSingleData.lv)
|
Util.GetGameObject(go.transform, "GameObject/lv/Text"):GetComponent("Text").text = string.format("<color=#ffbe22>%d</color>",heroSingleData.lv)
|
||||||
else
|
else
|
||||||
Util.GetGameObject(go.transform, "GameObject/lv/Text"):GetComponent("Text").text = string.format("<color=red>%d</color>",heroSingleData.lv)
|
Util.GetGameObject(go.transform, "GameObject/lv/Text"):GetComponent("Text").text = string.format("<color=red>%d</color>",heroSingleData.lv)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
--Util.GetGameObject(go.transform, "GameObject/lv/Text"):GetComponent("Text").text = string.format("<color=#0f0>%d</color>",HarmonyManager.hongmengAdditions[1].value)
|
|
||||||
|
|
||||||
Util.GetGameObject(go.transform, "GameObject/icon"):GetComponent("Image").sprite = Util.LoadSprite(heroSingleData.icon)
|
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))
|
Util.GetGameObject(go.transform, "GameObject/proIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(heroSingleData.heroConfig.PropertyName))
|
||||||
|
|
|
@ -403,10 +403,7 @@ function this.GetSingleAdditions(type)
|
||||||
-- body
|
-- body
|
||||||
for i = 1, #this.hongmengAdditions do
|
for i = 1, #this.hongmengAdditions do
|
||||||
if this.hongmengAdditions[i].additionType == type then
|
if this.hongmengAdditions[i].additionType == type then
|
||||||
if type == 1 then
|
|
||||||
-- body
|
|
||||||
--print("!!!!!!!"..this.hongmengAdditions[i].value.."####"..type)
|
|
||||||
end
|
|
||||||
|
|
||||||
return this.hongmengAdditions[i].value
|
return this.hongmengAdditions[i].value
|
||||||
end
|
end
|
||||||
|
@ -415,25 +412,45 @@ function this.GetSingleAdditions(type)
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
end
|
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()
|
function this.GetHongMengUpData()
|
||||||
|
for i = 1, #this.hongmengAdditions do
|
||||||
if this.hongmengAdditions[1].value < 330 then
|
|
||||||
-- body
|
-- body
|
||||||
LogBlue("服务器数据为"..this.hongmengAdditions[1].value)
|
if this.hongmengAdditions[i].additionType == 1 then
|
||||||
|
-- body
|
||||||
|
if this.hongmengAdditions[i].value < 330 then
|
||||||
|
-- body
|
||||||
|
LogBlue("服务器数据为"..this.hongmengAdditions[i].value)
|
||||||
return nil
|
return nil
|
||||||
|
|
||||||
end
|
end
|
||||||
LogGreen("服务器数据为"..this.hongmengAdditions[1].value)
|
LogGreen("服务器数据为"..this.hongmengAdditions[i].value)
|
||||||
for key, value in ConfigPairs(HongmengUp) do
|
for key, value in ConfigPairs(HongmengUp) do
|
||||||
-- body
|
-- body
|
||||||
if value.HongmengLevel == this.hongmengAdditions[1].value + 1 then
|
if value.HongmengLevel == this.hongmengAdditions[i].value + 1 then
|
||||||
-- body
|
-- body
|
||||||
|
|
||||||
return ConfigManager.TryGetConfigData(ConfigName.HongmengUp,key)
|
return ConfigManager.TryGetConfigData(ConfigName.HongmengUp,key)
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -108,19 +108,37 @@ function GongMingResultTips:OnOpen(flag)
|
||||||
local dataRockOne = EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[2])
|
local dataRockOne = EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[2])
|
||||||
if dataRockOne then
|
if dataRockOne then
|
||||||
-- body
|
-- body
|
||||||
if dataRockOne.lv > 0 then
|
|
||||||
if dataRockOne.type == "魂宝" then
|
if dataRockOne.type == "魂宝" then
|
||||||
-- body
|
-- body
|
||||||
Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = string.format("%d",dataRockOne.lv)
|
-- Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = string.format("%d",dataRockOne.oriLv)
|
||||||
HunDegree = dataRockOne.lv
|
HunDegree = dataRockOne.oriLv
|
||||||
else
|
if HunDegree > 0 then
|
||||||
Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = string.format("%d",dataRockOne.lv)
|
Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = string.format("%d",HunDegree)
|
||||||
LingDegree = dataRockOne.lv
|
|
||||||
end
|
|
||||||
|
|
||||||
|
elseif HunDegree == 0 then
|
||||||
|
Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = "无"
|
||||||
else
|
else
|
||||||
|
-- body
|
||||||
Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = "无"
|
Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = "无"
|
||||||
end
|
end
|
||||||
|
else
|
||||||
|
--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
|
else
|
||||||
Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = "无"
|
Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = "无"
|
||||||
end
|
end
|
||||||
|
@ -128,20 +146,32 @@ function GongMingResultTips:OnOpen(flag)
|
||||||
local dataRockTwo = EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[1])
|
local dataRockTwo = EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[1])
|
||||||
if dataRockTwo then
|
if dataRockTwo then
|
||||||
-- body
|
-- body
|
||||||
if dataRockTwo.lv > 0 then
|
|
||||||
-- bodyLingDegree
|
|
||||||
if dataRockTwo.type == "灵宝" then
|
if dataRockTwo.type == "灵宝" then
|
||||||
-- body
|
-- body
|
||||||
Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = string.format("%d",dataRockTwo.lv)
|
LingDegree = dataRockTwo.oriLv
|
||||||
LingDegree = dataRockTwo.lv
|
if LingDegree > 0 then
|
||||||
else
|
-- body
|
||||||
Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = string.format("%d",dataRockTwo.lv)
|
Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = string.format("%d",LingDegree)
|
||||||
HunDegree = dataRockTwo.lv
|
elseif LingDegree == 0 then
|
||||||
end
|
Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = "无"
|
||||||
|
|
||||||
else
|
else
|
||||||
Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = "无"
|
Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = "无"
|
||||||
|
-- body
|
||||||
end
|
end
|
||||||
|
else
|
||||||
|
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
|
else
|
||||||
Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = "无"
|
Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = "无"
|
||||||
end
|
end
|
||||||
|
@ -185,6 +215,7 @@ function GongMingResultTips:OnOpen(flag)
|
||||||
end
|
end
|
||||||
-- body
|
-- body
|
||||||
elseif data[i].additionType == 3 then
|
elseif data[i].additionType == 3 then
|
||||||
|
print(HunDegree.." !!!!!!!!! "..data[i].value)
|
||||||
if HunDegree ~= -1 and data[i].value > 0 then
|
if HunDegree ~= -1 and data[i].value > 0 then
|
||||||
-- body
|
-- body
|
||||||
if HunDegree >data[i].value then
|
if HunDegree >data[i].value then
|
||||||
|
@ -205,6 +236,7 @@ function GongMingResultTips:OnOpen(flag)
|
||||||
|
|
||||||
-- body
|
-- body
|
||||||
elseif data[i].additionType == 4 then
|
elseif data[i].additionType == 4 then
|
||||||
|
print(HunDegree.." @@@@@@@@@@@@ "..data[i].value)
|
||||||
if LingDegree ~= -1 and data[i].value > 0 then
|
if LingDegree ~= -1 and data[i].value > 0 then
|
||||||
-- body
|
-- body
|
||||||
if LingDegree>data[i].value then
|
if LingDegree>data[i].value then
|
||||||
|
|
|
@ -111,7 +111,7 @@ function HongMengEnvoyPanel:BindEvent()
|
||||||
function()
|
function()
|
||||||
--二级共鸣弹窗
|
--二级共鸣弹窗
|
||||||
local sum = HarmonyManager:HongMengTowerUpLimit()
|
local sum = HarmonyManager:HongMengTowerUpLimit()
|
||||||
if HarmonyManager.hongmengAdditions[1].value >= sum then
|
if HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value >= sum then
|
||||||
-- body
|
-- body
|
||||||
PopupTipPanel.ShowTip("鸿蒙碑等级已达上限!")
|
PopupTipPanel.ShowTip("鸿蒙碑等级已达上限!")
|
||||||
else
|
else
|
||||||
|
@ -133,8 +133,8 @@ function HongMengEnvoyPanel:BindEvent()
|
||||||
function()
|
function()
|
||||||
-- body
|
-- body
|
||||||
LogGreen("回调函数")
|
LogGreen("回调函数")
|
||||||
HarmonyManager.hongmengAdditions[1].value = HarmonyManager.hongmengAdditions[1].value + 1
|
HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value = HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value + 1
|
||||||
if HarmonyManager.hongmengAdditions[1].value >= sum then
|
if HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value >= sum then
|
||||||
-- body
|
-- body
|
||||||
Util.SetGray(self.UpBtn, true)
|
Util.SetGray(self.UpBtn, true)
|
||||||
self.imageGame:SetActive(false)
|
self.imageGame:SetActive(false)
|
||||||
|
@ -164,7 +164,7 @@ function HongMengEnvoyPanel:BindEvent()
|
||||||
end
|
end
|
||||||
|
|
||||||
local sum = HarmonyManager:HongMengTowerUpLimit()
|
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
|
--检测红点 UpdateGongMingLv
|
||||||
|
|
||||||
for i = 1, #self.EnvoyItemList do
|
for i = 1, #self.EnvoyItemList do
|
||||||
|
@ -218,7 +218,7 @@ function HongMengEnvoyPanel:RunTimerFun()
|
||||||
end
|
end
|
||||||
function HongMengEnvoyPanel:IsUpBtnGray()
|
function HongMengEnvoyPanel:IsUpBtnGray()
|
||||||
local sum = HarmonyManager:HongMengTowerUpLimit()
|
local sum = HarmonyManager:HongMengTowerUpLimit()
|
||||||
if HarmonyManager.hongmengAdditions[1].value >= sum then
|
if HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value >= sum then
|
||||||
-- body
|
-- body
|
||||||
Util.SetGray(self.UpBtn, true)
|
Util.SetGray(self.UpBtn, true)
|
||||||
self.imageGame:SetActive(false)
|
self.imageGame:SetActive(false)
|
||||||
|
@ -348,7 +348,7 @@ function HongMengEnvoyPanel:OnOpen(equipSId)
|
||||||
|
|
||||||
|
|
||||||
local sum = HarmonyManager:HongMengTowerUpLimit()
|
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:IsUpBtnGray()
|
||||||
self:InitTextMum()
|
self:InitTextMum()
|
||||||
self:CheckEvoyEquip()
|
self:CheckEvoyEquip()
|
||||||
|
|
|
@ -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)
|
Util.GetGameObject(go.transform,"TextRank"):GetComponent("Text").text = string.format("%s%d星",GetQuantityStrByquality(equip.Quality),equip.Stars)
|
||||||
end
|
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
|
-- 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
|
else
|
||||||
Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("无")
|
Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("无")
|
||||||
end
|
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
|
-- 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
|
else
|
||||||
Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("无")
|
Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("无")
|
||||||
end
|
end
|
||||||
|
|
|
@ -24,12 +24,12 @@ HeroData.__get__.lv = function(self)
|
||||||
if HeroManager.IsTenTalent(self._id)and HarmonyManager:HongMengTowerUpLimit() ~= 0 then
|
if HeroManager.IsTenTalent(self._id)and HarmonyManager:HongMengTowerUpLimit() ~= 0 then
|
||||||
-- bodys
|
-- bodys
|
||||||
|
|
||||||
endLv = HarmonyManager.hongmengAdditions[1].value
|
endLv = HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value
|
||||||
--print(endLv," "..self.heroConfig.ReadingName.."!!!!!!!!"..HarmonyManager.hongmengAdditions[1].value)
|
--print(endLv," "..self.heroConfig.ReadingName.."!!!!!!!!"..HarmonyManager.hongmengAdditions[1].value)
|
||||||
else
|
else
|
||||||
if HeroManager.IsTenTalent(self._id) then
|
if HeroManager.IsTenTalent(self._id) then
|
||||||
-- body
|
-- body
|
||||||
endLv = HarmonyManager.hongmengAdditions[1].value
|
endLv = HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value
|
||||||
else
|
else
|
||||||
local curlvEen = HeroManager.heroLvEnd[self._id]
|
local curlvEen = HeroManager.heroLvEnd[self._id]
|
||||||
endLv = temp_lv > curlvEen and curlvEen or temp_lv
|
endLv = temp_lv > curlvEen and curlvEen or temp_lv
|
||||||
|
@ -41,14 +41,15 @@ HeroData.__get__.lv = function(self)
|
||||||
|
|
||||||
|
|
||||||
return endLv
|
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 )
|
--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
|
-- body
|
||||||
local temp_lv = 0
|
local temp_lv = 0
|
||||||
if HeroManager.IsTenTalent(self._id) then
|
if HeroManager.IsTenTalent(self._id) then
|
||||||
-- body
|
-- body
|
||||||
temp_lv = HarmonyManager.hongmengAdditions[1].value
|
temp_lv = data.value
|
||||||
else
|
else
|
||||||
temp_lv = HeroManager.heroLvEnd[self.id]
|
temp_lv = HeroManager.heroLvEnd[self.id]
|
||||||
end
|
end
|
||||||
|
@ -141,10 +142,10 @@ HeroData.__get__.breakId = function (self)
|
||||||
|
|
||||||
--LogGreen(tostring(HeroManager.IsElevenStar(self.star)))
|
--LogGreen(tostring(HeroManager.IsElevenStar(self.star)))
|
||||||
--print(self._id.." "..HarmonyManager.hongmengAdditions[1].heroTid..self.heroConfig.ReadingName)
|
--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
|
-- bodys
|
||||||
|
|
||||||
endLv = HarmonyManager.hongmengAdditions[1].value
|
endLv = HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).value
|
||||||
--print(endLv," "..self.heroConfig.ReadingName)
|
--print(endLv," "..self.heroConfig.ReadingName)
|
||||||
else
|
else
|
||||||
local curlvEen = HeroManager.heroLvEnd[self.id]
|
local curlvEen = HeroManager.heroLvEnd[self.id]
|
||||||
|
@ -154,14 +155,15 @@ HeroData.__get__.breakId = function (self)
|
||||||
endbreakIdLv = HeroManager.GetAllStarBreakIdData(self._id,endLv)
|
endbreakIdLv = HeroManager.GetAllStarBreakIdData(self._id,endLv)
|
||||||
--print(endbreakIdLv," 111 "..self.heroConfig.ReadingName.."等级"..endLv)
|
--print(endbreakIdLv," 111 "..self.heroConfig.ReadingName.."等级"..endLv)
|
||||||
return endbreakIdLv
|
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 )
|
--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
|
-- body
|
||||||
local temp_lv = 0
|
local temp_lv = 0
|
||||||
if HeroManager.IsTenTalent(self._id) then
|
if HeroManager.IsTenTalent(self._id) then
|
||||||
-- body
|
-- body
|
||||||
temp_lv = HarmonyManager.hongmengAdditions[1].value
|
temp_lv = data.value
|
||||||
else
|
else
|
||||||
temp_lv = HeroManager.heroLvEnd[self.id]
|
temp_lv = HeroManager.heroLvEnd[self.id]
|
||||||
end
|
end
|
||||||
|
|
|
@ -549,9 +549,9 @@ local jumpDic = {
|
||||||
end,
|
end,
|
||||||
[JumpType.HongMengZhen] = function ()
|
[JumpType.HongMengZhen] = function ()
|
||||||
-- body
|
-- body
|
||||||
if HarmonyManager.hongmengAdditions[1] then
|
if HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv) then
|
||||||
-- body
|
-- body
|
||||||
if HarmonyManager.hongmengAdditions[1].heroTid == 0 then
|
if HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).heroTid == 0 then
|
||||||
-- body
|
-- body
|
||||||
UIManager.OpenPanel(UIName.HongMengEnvoyPanel)
|
UIManager.OpenPanel(UIName.HongMengEnvoyPanel)
|
||||||
else
|
else
|
||||||
|
|
|
@ -128,7 +128,7 @@ function this.SingleHeroDataShow(go,_heroData)
|
||||||
GongMingMask:SetActive(true)
|
GongMingMask:SetActive(true)
|
||||||
|
|
||||||
elseif HarmonyManager:IsEnvoy(_heroData.dynamicId) and HarmonyManager:HongMengTowerUpLimit() ~= 0 then
|
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
|
-- body
|
||||||
Util.GetGameObject(_go.transform, "lv/Text"):GetComponent("Text").text = "<color=#ffbe22>"..heroData.lv.."</color>"
|
Util.GetGameObject(_go.transform, "lv/Text"):GetComponent("Text").text = "<color=#ffbe22>"..heroData.lv.."</color>"
|
||||||
GongMingMask:SetActive(true)
|
GongMingMask:SetActive(true)
|
||||||
|
|
|
@ -156,7 +156,7 @@ function this.SingleHeroDataShow(go,_heroData)
|
||||||
Util.GetGameObject(_go.transform, "lv/Text"):GetComponent("Text").text = "<color=#0f0>"..heroData.lv.."</color>"
|
Util.GetGameObject(_go.transform, "lv/Text"):GetComponent("Text").text = "<color=#0f0>"..heroData.lv.."</color>"
|
||||||
GongMingMask:SetActive(true)
|
GongMingMask:SetActive(true)
|
||||||
elseif HarmonyManager:IsEnvoy(_heroData.dynamicId) and HarmonyManager:HongMengTowerUpLimit() ~= 0 then
|
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
|
-- body
|
||||||
Util.GetGameObject(_go.transform, "lv/Text"):GetComponent("Text").text = "<color=#ffbe22>"..heroData.lv.."</color>"
|
Util.GetGameObject(_go.transform, "lv/Text"):GetComponent("Text").text = "<color=#ffbe22>"..heroData.lv.."</color>"
|
||||||
GongMingMask:SetActive(true)
|
GongMingMask:SetActive(true)
|
||||||
|
|
|
@ -47,6 +47,9 @@ EquipTreasureData.__set__.lv = function(self, value)
|
||||||
self._lv = value
|
self._lv = value
|
||||||
end
|
end
|
||||||
|
|
||||||
|
EquipTreasureData.__get__.oriLv= function (self)
|
||||||
|
-- body
|
||||||
|
return self._lv
|
||||||
|
end
|
||||||
|
|
||||||
return EquipTreasureData
|
return EquipTreasureData
|
|
@ -283,8 +283,9 @@ function this.SingleHeroDataShow(_go,_heroData)
|
||||||
if HarmonyManager.IsChangeColor(heroData.dynamicId) then
|
if HarmonyManager.IsChangeColor(heroData.dynamicId) then
|
||||||
-- body
|
-- body
|
||||||
Util.GetGameObject(_go.transform, "card/lv/Text"):GetComponent("Text").text = "<color=#0f0>"..heroData.lv.."</color>"
|
Util.GetGameObject(_go.transform, "card/lv/Text"):GetComponent("Text").text = "<color=#0f0>"..heroData.lv.."</color>"
|
||||||
elseif HarmonyManager:IsEnvoy(heroData.dynamicId) and HarmonyManager.hongmengAdditions[1] then
|
elseif HarmonyManager:IsEnvoy(heroData.dynamicId) and HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv) then
|
||||||
if HarmonyManager.hongmengAdditions[1].heroTid == 0 and HarmonyManager.hongmengAdditions[1].value > 0 then
|
local temp= HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv)
|
||||||
|
if temp.heroTid == 0 and temp.value > 0 then
|
||||||
-- body
|
-- body
|
||||||
Util.GetGameObject(_go.transform, "card/lv/Text"):GetComponent("Text").text = "<color=#ffbe22>"..heroData.lv.."</color>"
|
Util.GetGameObject(_go.transform, "card/lv/Text"):GetComponent("Text").text = "<color=#ffbe22>"..heroData.lv.."</color>"
|
||||||
|
|
||||||
|
|
|
@ -167,8 +167,8 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择
|
||||||
if HarmonyManager.IsChangeColor(heroData.dynamicId) then
|
if HarmonyManager.IsChangeColor(heroData.dynamicId) then
|
||||||
Util.GetGameObject(go.transform, "lv/Text"):GetComponent("Text").text = "<color=#0f0>"..heroData.lv.."</color>"
|
Util.GetGameObject(go.transform, "lv/Text"):GetComponent("Text").text = "<color=#0f0>"..heroData.lv.."</color>"
|
||||||
GongMingMask:SetActive(true)
|
GongMingMask:SetActive(true)
|
||||||
elseif HarmonyManager:IsEnvoy(heroData.dynamicId) and HarmonyManager.hongmengAdditions[1] then
|
elseif HarmonyManager:IsEnvoy(heroData.dynamicId) and HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv) then
|
||||||
if HarmonyManager.hongmengAdditions[1].heroTid == 0 then
|
if HarmonyManager.GetSingleAdditionsData(HarmonyAddType.AddLv).heroTid == 0 then
|
||||||
-- body
|
-- body
|
||||||
Util.GetGameObject(go.transform, "lv/Text"):GetComponent("Text").text = "<color=#ffbe22>"..heroData.lv.."</color>"
|
Util.GetGameObject(go.transform, "lv/Text"):GetComponent("Text").text = "<color=#ffbe22>"..heroData.lv.."</color>"
|
||||||
GongMingMask:SetActive(true)
|
GongMingMask:SetActive(true)
|
||||||
|
|
Loading…
Reference in New Issue