寻宝文字提示修改,特权界面资源替换

dev_chengFeng
2han9B1a0 2020-07-06 17:01:50 +08:00
parent 4b8bae38b3
commit e3c9fb459e
21 changed files with 11234 additions and 422 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 104 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 1a903967f63101545b805de279186ba5
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: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 118f0d94de109654db4029ed3fda5df6
vertices: []
indices:
edges: []
weights: []
spritePackingTag: VipAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 271 B

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 8238674838110a645b692984f383ccd1
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: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 86d112a798871024897ab5c2d41feabb
vertices: []
indices:
edges: []
weights: []
spritePackingTag: VipAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: bc47184e4544f0749863bbff4942235a
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: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: c06151fef9d3a1947aa88ff53089cc8c
vertices: []
indices:
edges: []
weights: []
spritePackingTag: VipAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 199ff682a0f867543b708efde132b51e
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: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: e802dd0e98306f040862ed5a76da875c
vertices: []
indices:
edges: []
weights: []
spritePackingTag: VipAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 669b1ae14e19a69458d57a2aa3670f5d
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: -1
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: 8e38069925332694b8c27184d2ad40ae
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 185 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 7330f298ca615e542844d2695e79c63f
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: -1
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: 0d16c0ba7d51dd346963ae0aba38ed89
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 9b41fbd33ddec744d89cd85d65ffdebd
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: -1
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: e8be6e4024fcd924eb24d02460a222f5
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 12eba88e23a8bf84cb1e32add8dda1fa
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: -1
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: 4ef7de300370e814c9a3ec6ed9c1f278
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -659,7 +659,7 @@
[10658] = "星神将",
[10659] = "阵营神将",
[10660] = "已达最大选择数量",
[10661] = "包含了传说级以上的任务,是否确认刷新?",
[10661] = "包含了史诗级以上的任务,是否确认刷新?",
[10662] = "暂无可领奖励",
[10663] = "已充值 %s 元",
[10664] = "同元素",

View File

@ -72,7 +72,7 @@ function FindTreasureMainPanel:BindEvent()
local isShowTwo = false
for i = 1, #missionInfo do
if missionInfo[i].state ~= 2 then
if ConfigManager.GetConfigData(ConfigName.MazeTreasure,math.floor(missionInfo[i].missionId%10000)).TaskType >= 5
if ConfigManager.GetConfigData(ConfigName.MazeTreasure,math.floor(missionInfo[i].missionId%10000)).TaskType >= 4
and #missionInfo[i].heroId <= 0 then
isShowTwo = true
end

View File

@ -5,7 +5,7 @@
* @Author MagicianJoker, fengliudianshao@outlook.com
* @Copyright Copyright (c) 2019, MagicianJoker
--]]
local VipTaskListItem = require("Modules/Vip/VipTaskListItem")
-- local VipTaskListItem = require("Modules/Vip/VipTaskListItem")
---@class VipPanelV2
local VipPanelV2 = quick_class("VipPanelV2", BasePanel)
@ -24,9 +24,20 @@ function VipPanelV2:InitComponent()
screenAdapte(self.bg)
end
self.BtnBack = Util.GetGameObject(self.transform, "btnBack")
this.helpBtn = Util.GetGameObject(self.gameObject, "helpBtn")
this.helpPosition=this.helpBtn:GetComponent("RectTransform").localPosition
this.BtView = SubUIManager.Open(SubUIConfig.BtView, self.transform)
this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.transform)
-- 嚣张的头像
this.level = Util.GetGameObject(self.gameObject, "LeftUp/headBox/lvFrame/lv"):GetComponent("Text")
this.playName = Util.GetGameObject(self.gameObject, "LeftUp/headBox/name"):GetComponent("Text")
this.expSliderValue = Util.GetGameObject(self.gameObject, "LeftUp/headBox/exp"):GetComponent("Slider")
this.headBox = Util.GetGameObject(self.gameObject, "LeftUp/headBox")
this.headPos = Util.GetGameObject(self.gameObject, "LeftUp/headBox/headpos")
this.headRedpot = Util.GetGameObject(self.gameObject, "LeftUp/headBox/redpot")
this.teamPower = Util.GetGameObject(self.gameObject, "LeftUp/powerBtn/value"):GetComponent("Text")
-- self.BtnBack = Util.GetGameObject(self.transform, "btnBack")
-- this.helpBtn = Util.GetGameObject(self.gameObject, "helpBtn")
-- this.helpPosition=this.helpBtn:GetComponent("RectTransform").localPosition
--topPart
self.topPart = Util.GetGameObject(self.transform, "frame/topPart")
self.BtnLeft = Util.GetGameObject(self.transform, "leftBtn")
@ -37,23 +48,14 @@ function VipPanelV2:InitComponent()
self.StateRoot = Util.GetGameObject(self.topPart, "stateRoot")
self.curStatePart = Util.GetGameObject(self.StateRoot, "curState")
-- self.currentLv = Util.GetGameObject(self.curStatePart, "level/Text"):GetComponent("Text")
self.currentLvNum=Util.GetGameObject(self.curStatePart,"title/num"):GetComponent("Text")
-- self.vipLevelIcon=Util.GetGameObject(self.curStatePart,"title"):GetComponent("Image")
self.progressBar = Util.GetGameObject(self.curStatePart, "progressBar"):GetComponent("Slider")
self.progressText = Util.GetGameObject(self.curStatePart, "progressBar/Text"):GetComponent("Text")
-- self.lvUpPart = Util.GetGameObject(self.StateRoot, "lvUp")
-- self.lvUpCurNum=Util.GetGameObject( self.lvUpPart,"curTitle/num"):GetComponent("Text")
-- self.lvUpNexNum=Util.GetGameObject( self.lvUpPart,"nextTitle/num"):GetComponent("Text")
-- self.btnLvUp = Util.GetGameObject(self.lvUpPart, "btnLvUp")
-- self.lvUpRedPoint = Util.GetGameObject(self.btnLvUp, "redPoint")
-- self.previewPart = Util.GetGameObject(self.StateRoot, "preview")
-- self.previewLevel = Util.GetGameObject(self.previewPart, "image/Text"):GetComponent("Text")
-- self.previewNum=Util.GetGameObject(self.previewPart,"nextTitle/num"):GetComponent("Text")
self.giftRoot = Util.GetGameObject(self.topPart, "giftRoot")
--midPart
self.midPart = Util.GetGameObject(self.transform, "midPart")
self.giftRoot = Util.GetGameObject(self.midPart, "giftRoot")
self.giftTypeIcon = Util.GetGameObject(self.giftRoot, "title"):GetComponent("Image")
self.giftItemContent = Util.GetGameObject(self.giftRoot, "grid")
self.giftItemList = {}
@ -68,9 +70,9 @@ function VipPanelV2:InitComponent()
self.BtnReceiveText = Util.GetGameObject(self.BtnReceive, "Text"):GetComponent("Text")
self.receiveRedPoint = Util.GetGameObject(self.BtnReceive,"redPoint")
--midPart
self.privilegeTitle = Util.GetGameObject(self.transform, "frame/midPart/privilegeRoot/title"):GetComponent("Text")
self.privilegeContent = Util.GetGameObject(self.transform, "frame/midPart/privilegeRoot/privilegeList/viewPort/content")
--privilege
self.privilegeTitle = Util.GetGameObject(self.transform, "frame/topPart/privilegeRoot/title"):GetComponent("Text")
self.privilegeContent = Util.GetGameObject(self.transform, "frame/topPart/privilegeRoot/privilegeList/viewPort/content")
self.privilegeItem = Util.GetGameObject(self.privilegeContent, "itemPro")
self.privilegeItem.gameObject:SetActive(false)
self.privilegeList = {}
@ -78,21 +80,36 @@ function VipPanelV2:InitComponent()
self.maxLv = Util.GetGameObject(self.transform, "bottomPart/maxLv")
self.btnLvUp = Util.GetGameObject(self.transform, "bottomPart/btnLvUp")
self.taskList = Util.GetGameObject(self.transform, "bottomPart/taskList")
self.taskContent = Util.GetGameObject(self.transform, "bottomPart/taskList/viewPort/content")
self.taskItemPro = Util.GetGameObject(self.taskContent, "itemPro")
self.taskItemPro.gameObject:SetActive(false)
self.taskItemList = {}
for i = 1, kMaxTaskCount do
self.taskItemList[i] = VipTaskListItem.create(self.taskItemPro, self.taskContent)
self.taskItemList[i].cloneObj.name = "itemPro" .. i
for i = 1, self.taskList.transform.childCount do
self.taskItemList[i] = self.taskList.transform:GetChild(i - 1)
end
end
-- 刷新玩家信息显示
function this.FreshPlayerInfo()
this.level.text = PlayerManager.level
this.expSliderValue.value = PlayerManager.exp / PlayerManager.userLevelData[PlayerManager.level].Exp
this.playName.text = PlayerManager.nickName
this.teamPower.text = FormationManager.GetFormationPower(FormationManager.curFormationIndex)
end
-- 设置头像
function this.SetPlayerHead()
if not this.playerHead then
this.playerHead = SubUIManager.Open(SubUIConfig.PlayerHeadView, this.headPos.transform)
end
this.playerHead:SetHead(PlayerManager.head)
this.playerHead:SetFrame(PlayerManager.frame)
this.playerHead:SetScale(Vector3.one * 0.9)
this.playerHead:SetPosition(Vector3.New(-5, 0, 0))
end
function VipPanelV2:BindEvent()
-- Util.AddClick(self.BtnTip, function()
-- UIManager.OpenPanel(UIName.VipTipPopup)
-- end)
--帮助按钮
Util.AddClick(this.helpBtn, function()
UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.VIP, this.helpPosition.x,this.helpPosition.y)
@ -142,7 +159,8 @@ end
--待功能扩展(试图打开某个状态)
function VipPanelV2:OnOpen()
this.UpView:OnOpen({ showType = UpViewOpenType.ShowRight, panelType = PanelType.Main })
this.BtView:OnOpen({ sortOrder = self.sortingOrder, panelType = PanelTypeView.TeQuan })
end
function VipPanelV2:OnSortingOrderChange()
@ -153,6 +171,8 @@ end
function VipPanelV2:OnShow()
self:InitVipContext()
self:SetPanelStatus()
this.FreshPlayerInfo()
this.SetPlayerHead()
end
function VipPanelV2:OnClose()
@ -168,18 +188,17 @@ function VipPanelV2:OnClose()
end
function VipPanelV2:OnDestroy()
SubUIManager.Close(this.UpView)
SubUIManager.Close(this.BtView)
end
function VipPanelV2:InitVipContext()
self.context = {}
self.context.UserMissionInfo = TaskManager.GetTypeTaskList(TaskTypeDef.VipTask)
self.context.vipLevel = VipManager.GetVipLevel()
-- self.context.hadTakeLevelBox = VipManager.GetTakeLevelBoxStatus()
-- self.context.hadTakeDailyBox = VipManager.GetTakeDailyBoxStatus()
end
function VipPanelV2:SetPanelStatus()
-- self:SwitchState(self:GetCurrentStatus(self.context.UserMissionInfo))
local maxLv = VipManager.GetMaxVipLevel()
self.curLevel.sprite = Util.LoadSprite("r_zjm_tequanpaizi_0" .. self.context.vipLevel)
-- 显示的
@ -213,22 +232,6 @@ function VipPanelV2:CheckTaskShow()
end
end
-- function VipPanelV2:GetCurrentStatus(taskListInfo)
-- local taskFinishNum = 0
-- for i = 1, #taskListInfo do
-- if taskListInfo[i].state == VipTaskStatusDef.Received then
-- taskFinishNum = taskFinishNum + 1
-- end
-- end
-- local maxLv = VipManager.GetMaxVipLevel()
-- self.progressBar.gameObject:SetActive(self.context.vipLevel ~= maxLv)
-- if self.context.vipLevel == maxLv then
-- return VipShowStatusDef.Current
-- else
-- self.progressBar.value = taskFinishNum / #taskListInfo
-- return taskFinishNum >= #taskListInfo and VipShowStatusDef.LevelUp or VipShowStatusDef.Current
-- end
-- end
function VipPanelV2:SetProgressShow(level)
local taskLevel = level - 1
@ -251,86 +254,6 @@ function VipPanelV2:SetProgressShow(level)
end
end
--特权界面
-- function VipPanelV2:SwitchState(type, isAnimation)
-- self.currentStatus = type
-- self.curStatePart:SetActive(type == VipShowStatusDef.Current)
-- -- self.lvUpPart:SetActive(type == VipShowStatusDef.LevelUp)
-- -- self.lvUpRedPoint:SetActive(type == VipShowStatusDef.LevelUp)
-- -- self.previewPart:SetActive(type == VipShowStatusDef.Preview)
-- if isAnimation then
-- -- if type == VipShowStatusDef.LevelUp then
-- -- PlayUIAnim(self.lvUpPart)
-- -- end
-- else
-- if type == VipShowStatusDef.Current then
-- PlayUIAnim(self.curStatePart)
-- -- elseif type == VipShowStatusDef.LevelUp then
-- -- PlayUIAnim(self.lvUpPart)
-- -- elseif type == VipShowStatusDef.Preview then
-- -- PlayUIAnim(self.previewPart)
-- end
-- end
-- self.BtnLeft:SetActive(type == VipShowStatusDef.Preview)
-- local maxLv = VipManager.GetMaxVipLevel()
-- if self.context.vipLevel < maxLv then
-- self.BtnLeft:SetActive(type == VipShowStatusDef.Preview)
-- self.BtnRight:SetActive(type == VipShowStatusDef.Current or type == VipShowStatusDef.LevelUp)
-- else
-- self.BtnRight:SetActive(false)
-- self.BtnLeft:SetActive(false)
-- end
-- self.BtnReceive:SetActive(type ~= VipShowStatusDef.Preview)
-- self:SetVipTitle(type)
-- end
-- function VipPanelV2:SetVipTitle(type)
-- if type == VipShowStatusDef.Current then
-- self.currentLv.text = self.context.vipLevel
-- this.CheckVipLvPos(self.currentLvNum,self.context.vipLevel)
-- self.currentLvNum.text= self.context.vipLevel
-- elseif type == VipShowStatusDef.LevelUp then
-- this.CheckVipLvPos(self.lvUpCurNum,self.context.vipLevel)
-- this.CheckVipLvPos(self.lvUpNexNum,self.context.vipLevel)
-- self.lvUpCurNum.text=self.context.vipLevel
-- self.lvUpNexNum.text=self.context.vipLevel + 1
-- else
-- self.previewLevel.text = self.context.vipLevel + 1
-- this.CheckVipLvPos(self.previewNum,self.context.vipLevel)
-- self.previewNum.text=self.context.vipLevel + 1
-- end
-- end
--特权相关礼包
function VipPanelV2:SetVipRewardStatus(configData)
-- self.BtnReceive:GetComponent("Button").enabled = true
-- Util.SetGray(self.BtnReceive, false)
-- self.receiveRedPoint:SetActive(false)
-- if self.currentStatus == VipShowStatusDef.Preview then
-- local VipLvConfig = ConfigManager.GetConfigData(ConfigName.VipLevelConfig, self.context.vipLevel + 1)
-- self.giftTypeIcon.sprite = Util.LoadSprite(ReceiveTypeIconDef[1])
-- self:SetRewardList(VipLvConfig.VipBoxReward)
-- self.BtnReceiveText.text = "领 取"
-- else
-- if self.context.hadTakeLevelBox == GiftReceivedStatus.NotReceive then
-- self.giftTypeIcon.sprite = Util.LoadSprite(ReceiveTypeIconDef[1])
-- self:SetRewardList(configData.VipBoxReward)
-- self.BtnReceiveText.text = "领 取"
-- self.receiveRedPoint:SetActive(true)
-- else
-- self.giftTypeIcon.sprite = Util.LoadSprite(ReceiveTypeIconDef[2])
-- self:SetRewardList(configData.VipBoxDailyReward)
-- if self.context.hadTakeDailyBox == -1 then
-- self.BtnReceiveText.text = "领 取"
-- self.receiveRedPoint:SetActive(true)
-- else
-- self.BtnReceiveText.text = "已领取"
-- Util.SetGray(self.BtnReceive, true)
-- self.BtnReceive:GetComponent("Button").enabled = false
-- end
-- end
-- end
-- self.giftTypeIcon:SetNativeSize()
end
function VipPanelV2:SetRewardList(level)
local VipLvConfig = ConfigManager.GetConfigData(ConfigName.VipLevelConfig, level)
local configData = VipLvConfig.Property
@ -354,31 +277,6 @@ function VipPanelV2:SetRewardList(level)
end
end
-- function VipPanelV2:OnReceiveBtnClicked()
-- if self.context.hadTakeLevelBox == GiftReceivedStatus.NotReceive then
-- NetManager.RequestReceiveVipRights(GiftReceivedType.LevelGift, function(respond)
-- UIManager.OpenPanel(UIName.RewardItemPopup, respond.drop, 1)
-- VipManager.SetTakeLevelBoxStatus(GiftReceivedStatus.Received)
-- self.context.hadTakeLevelBox = GiftReceivedStatus.Received
-- -- self:ChangeReceivedStatus()
-- TaskManager.ChangeVipRedPointState()
-- end)
-- else
-- NetManager.RequestReceiveVipRights(GiftReceivedType.DailyGift, function(respond)
-- UIManager.OpenPanel(UIName.RewardItemPopup, respond.drop, 1)
-- VipManager.SetTakeDailyBoxStatus(self.context.vipLevel)
-- self.context.hadTakeDailyBox = self.context.vipLevel
-- -- self:ChangeReceivedStatus()
-- TaskManager.ChangeVipRedPointState()
-- end)
-- end
-- end
--改变领取状态
-- function VipPanelV2:ChangeReceivedStatus()
-- local VipLvConfig = ConfigManager.GetConfigData(ConfigName.VipLevelConfig, self.context.vipLevel)
-- assert(VipLvConfig, string.format("ConfigName.VipLevelConfig not find VipLevel:%s", self.context.vipLevel))
-- self:SetVipRewardStatus(VipLvConfig)
-- end
--特权增益描述
function VipPanelV2:SetVipPrivileges(curVipLevel)
@ -404,9 +302,9 @@ function VipPanelV2:SetVipPrivileges(curVipLevel)
-- local str = "<size=45><color=#7bb15bFF> </color></size>"
-- str = string.format("<size=45><color=#7bb15bFF>%s</color></size>", privilegeInfo.value)
if privilegeInfo.IfFloat == 2 then --特权关卡挂机加成百分比
Util.GetGameObject(item, "title"):GetComponent("Text").text = string.format(privilegeInfo.content, "<color=#7AB159><size=50>"..(privilegeInfo.value*100-100).."%</size></color>")
Util.GetGameObject(item, "title"):GetComponent("Text").text = string.format(privilegeInfo.content, "<color=#7AB159><size=35>"..(privilegeInfo.value*100-100).."%</size></color>")
else
Util.GetGameObject(item, "title"):GetComponent("Text").text = string.format(privilegeInfo.content, "<color=#7AB159><size=50>" .. privilegeInfo.value .. "</size></color>")
Util.GetGameObject(item, "title"):GetComponent("Text").text = string.format(privilegeInfo.content, "<color=#7AB159><size=35>" .. privilegeInfo.value .. "</size></color>")
end
PlayUIAnim(Util.GetGameObject(item, "content"))
coroutine.wait(0.03)
@ -447,7 +345,7 @@ end
function VipPanelV2:SetVipTaskList(level)
local configData = ConfigManager.GetConfigData(ConfigName.VipLevelConfig, level)
table.walk(self.taskItemList, function(taskItem)
taskItem:SetVisible(false)
taskItem.gameObject:SetActive(false)
end)
if level < self.context.vipLevel then
@ -463,17 +361,69 @@ function VipPanelV2:SetVipTaskList(level)
self.taskItemList[i]:SetValue({state = VipTaskStatusDef.NotFinished, progress = 0})
end
self:SetTaskAnimation(#configData.OpenRules)
elseif level == self.context.vipLevel then
elseif level == self.context.vipLevel then--好像一定走这里
if #self.context.UserMissionInfo == 0 then
return
end
for i, taskInfo in ipairs(self.context.UserMissionInfo) do
self.taskItemList[i]:Init(taskInfo.missionId)
self.taskItemList[i]:SetValue(taskInfo)
-- self.taskItemList[i]:Init(taskInfo.missionId)
-- self.taskItemList[i]:SetValue(taskInfo)
self:showSingleTask(self.taskItemList[i],taskInfo)
end
self:SetTaskAnimation(#self.context.UserMissionInfo)
end
end
--单个初始化任务
function VipPanelV2:showSingleTask(item,taskInfo)
--creat
local itemPos = Util.GetGameObject(item, "content/itemPos")
local giftInfo = SubUIManager.Open(SubUIConfig.ItemView, itemPos.transform)
local desc = Util.GetGameObject(item, "content/desc"):GetComponent("Text")
local progressBar = Util.GetGameObject(item, "content/progressBar"):GetComponent("Slider")
local progressValue = Util.GetGameObject(item, "content/dealBtn/value"):GetComponent("Text")
local dealBtn = Util.GetGameObject(item, "content/dealBtn")
local finishFlag = Util.GetGameObject(item, "content/finished")
local redPoint = Util.GetGameObject(item,"content/redPoint")
--init
local data = nil
local taskConfigInfo = ConfigManager.GetConfigData(ConfigName.TaskConfig, taskInfo.missionId)
giftInfo:OnOpen(false, taskConfigInfo.Reward[1], 0.8)
desc.text = taskConfigInfo.Desc
progressBar.value = 0
progressValue.text = "0/" .. taskConfigInfo.TaskValue[2][1]
dealBtn:SetActive(false)
finishFlag:SetActive(false)
redPoint:SetActive(false)
--setvalue
data = taskInfo
progressBar.value = taskInfo.progress / taskConfigInfo.TaskValue[2][1]
progressValue.text = string.format("%s/%s", taskInfo.progress, taskConfigInfo.TaskValue[2][1])
dealBtn:SetActive(taskInfo.state == VipTaskStatusDef.NotFinished or taskInfo.state == VipTaskStatusDef.CanReceive)
if dealBtn.activeSelf then
dealBtn:GetComponent("Image").sprite = Util.LoadSprite(TaskGetBtnIconDef[taskInfo.state])
end
finishFlag:SetActive(taskInfo.state == VipTaskStatusDef.Received)
redPoint:SetActive(taskInfo.state == VipTaskStatusDef.CanReceive)
Util.AddOnceClick(dealBtn,function ()
if data.state == VipTaskStatusDef.NotFinished then
JumpManager.GoJump(taskConfigInfo.Jump[1])
else
NetManager.TakeMissionRewardRequest(TaskTypeDef.VipTask, taskConfigInfo.Id, function(respond)
UIManager.OpenPanel(UIName.RewardItemPopup, respond.drop, 1)
TaskManager.SetTypeTaskState(TaskTypeDef.VipTask, taskConfigInfo.Id, VipTaskStatusDef.Received)
Game.GlobalEvent:DispatchEvent(GameEvent.Vip.OnVipTaskStatusChanged, taskConfigInfo.Id)
self:SetPanelStatus()
end)
end
end)
end
function VipPanelV2:SetTaskAnimation(length)
if self.taskThread then
coroutine.stop(self.taskThread)
@ -481,10 +431,10 @@ function VipPanelV2:SetTaskAnimation(length)
end
self.taskThread = coroutine.start(function()
for i = 1, length do
self.taskItemList[i].cloneObj:SetActive(false)
PlayUIAnim(Util.GetGameObject(self.taskItemList[i].cloneObj, "content"))
self.taskItemList[i].gameObject:SetActive(false)
PlayUIAnim(Util.GetGameObject(self.taskItemList[i], "content"))
coroutine.wait(0.05)
self.taskItemList[i].cloneObj:SetActive(true)
self.taskItemList[i].gameObject:SetActive(true)
-- coroutine.wait(0.05)
end
end)
@ -516,28 +466,17 @@ function VipPanelV2:OnTurnRightBtnClicked()
end
function VipPanelV2:OnBtnLvUpClicked()
-- if self.context.hadTakeLevelBox == GiftReceivedStatus.NotReceive then
-- PopupTipPanel.ShowTip("请先领取特权等级礼包")
-- elseif self.context.hadTakeDailyBox == -1 then
-- PopupTipPanel.ShowTip("请先领取每日奖励")
-- else
NetManager.RequestVipLevelUp(function(respond)
self:OnShow()
SoundManager.PlaySound(SoundConfig.Sound_VipUpLevel)
end)
-- end
NetManager.RequestVipLevelUp(function(respond)
self:OnShow()
SoundManager.PlaySound(SoundConfig.Sound_VipUpLevel)
end)
end
--刷新界面
function VipPanelV2:RefreshPanelStatus(level)
-- self.privilegeTitle.text = string.format("特权%s增益描述", level)
-- local VipLvConfig = ConfigManager.GetConfigData(ConfigName.VipLevelConfig, level)
-- assert(VipLvConfig, string.format("ConfigName.VipLevelConfig not find VipLevel:%s", level))
-- self:SetVipRewardStatus(VipLvConfig)
self:SetProgressShow(level)
self.currentLvNum.text = level
self:SetVipPrivileges(level)
-- self:SetVipTaskList(level)
self:SetRewardList(level)
end
@ -556,9 +495,6 @@ function VipPanelV2:OnTaskStatusChanged(taskId)
self:SetProgressShow(self.curShowLevel)
end
--local VipLvConfig = ConfigManager.GetConfigData(ConfigName.VipLevelConfig, self.context.vipLevel)
--self:SetVipTaskList(VipLvConfig)
-- self:SwitchState(self:GetCurrentStatus(self.context.UserMissionInfo), true)
local isfinish = true
local taskListInfo = self.context.UserMissionInfo
for i = 1, #taskListInfo do

View File

@ -658,7 +658,7 @@
10658,星神将
10659,阵营神将
10660,已达最大选择数量
10661,包含了传说级以上的任务,是否确认刷新?
10661,包含了史诗级以上的任务,是否确认刷新?
10662,暂无可领奖励
10663,已充值 %s 元
10664,同元素

1 10001 没有ActivityTypeDef为%s任务Id为%s的数据
658 10658 星神将
659 10659 阵营神将
660 10660 已达最大选择数量
661 10661 包含了传说级以上的任务,是否确认刷新? 包含了史诗级以上的任务,是否确认刷新?
662 10662 暂无可领奖励
663 10663 已充值 %s 元
664 10664 同元素