添加拍脸提交
parent
e9a7188d7d
commit
89fdc69afd
Binary file not shown.
|
After Width: | Height: | Size: 136 KiB |
|
|
@ -0,0 +1,110 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5b8ba96f23e958147a367d6003140d48
|
||||||
|
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: 56
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 1
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
- 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: 31c4d80cd8354c9419b2896b59bcc045
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
spritePackingTag: JingJiShiLianAtlas
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 466 KiB |
|
|
@ -0,0 +1,110 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 6e2a5f311257d1e4c84545099bf44986
|
||||||
|
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: 56
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 1
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
- 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: 1b0d313737e7d544586c663c8f8a11ca
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
spritePackingTag: JingJiShiLianAtlas
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 188 KiB |
|
|
@ -0,0 +1,110 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 6177b49f3b17da84f93658673edd7548
|
||||||
|
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: 56
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 1
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
- 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: 403053462ba4cef4b9cfc606b7cdd5a6
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
spritePackingTag: JingJiShiLianAtlas
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -0,0 +1,110 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 9c6860d55d03ef142851b7a0b52c9703
|
||||||
|
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: 56
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 1
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
- 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: 546d9d4e28db4f241b5f0af76a2234de
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
spritePackingTag: TagButtonAtlas
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 8a69a0f7d2e606141a48f89076d845f0
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -2441,6 +2441,7 @@ FacePanelType = {
|
||||||
jianmushenshu = 17, --建木神树
|
jianmushenshu = 17, --建木神树
|
||||||
silnigshilian = 18, --四灵试炼
|
silnigshilian = 18, --四灵试炼
|
||||||
redTreasure = 19, --红色品质宝物推送礼包
|
redTreasure = 19, --红色品质宝物推送礼包
|
||||||
|
jingjishilian = 20
|
||||||
}
|
}
|
||||||
--迷宫寻宝条件类型
|
--迷宫寻宝条件类型
|
||||||
FindTreasureNeedType = {
|
FindTreasureNeedType = {
|
||||||
|
|
|
||||||
|
|
@ -437,6 +437,7 @@ UIName = {
|
||||||
ArenaTrialPanel = 445,
|
ArenaTrialPanel = 445,
|
||||||
SupremeHeroPopupNew = 448,
|
SupremeHeroPopupNew = 448,
|
||||||
PremiumRebatePanel = 449,
|
PremiumRebatePanel = 449,
|
||||||
|
JingjishiLianPatface = 452,
|
||||||
}
|
}
|
||||||
|
|
||||||
SubUIConfig = {
|
SubUIConfig = {
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,76 @@
|
||||||
|
require("Base/BasePanel")
|
||||||
|
JingjishiLianPatface = Inherit(BasePanel)
|
||||||
|
|
||||||
|
--初始化组件(用于子类重写)
|
||||||
|
function JingjishiLianPatface:InitComponent()
|
||||||
|
self.spLoader = SpriteLoader.New()
|
||||||
|
self.liveRoot = Util.GetGameObject(self.gameObject,"bg/ren")
|
||||||
|
self.BackBtn = Util.GetGameObject(self.gameObject,"BackBtn")
|
||||||
|
self.maskBtn = Util.GetGameObject(self.gameObject,"bg")
|
||||||
|
self.jumpBtn = Util.GetGameObject(self.gameObject,"bg/jumpBtn")
|
||||||
|
end
|
||||||
|
|
||||||
|
--绑定事件(用于子类重写)
|
||||||
|
function JingjishiLianPatface:BindEvent()
|
||||||
|
Util.AddClick(self.BackBtn, function()
|
||||||
|
self:ClosePanel()
|
||||||
|
end)
|
||||||
|
Util.AddClick(self.maskBtn, function()
|
||||||
|
self:ClosePanel()
|
||||||
|
end)
|
||||||
|
Util.AddClick(self.jumpBtn, function()
|
||||||
|
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.jingjishilian) and ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.jingjishilian)> 0 then
|
||||||
|
UIManager.OpenPanel(UIName.ArenaTrialPanel)
|
||||||
|
self:ClosePanel()
|
||||||
|
else
|
||||||
|
self:ClosePanel()
|
||||||
|
end
|
||||||
|
end)
|
||||||
|
end
|
||||||
|
|
||||||
|
--添加事件监听(用于子类重写)
|
||||||
|
function JingjishiLianPatface:AddListener()
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
|
--移除事件监听(用于子类重写)
|
||||||
|
function JingjishiLianPatface:RemoveListener()
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
|
--界面打开时调用(用于子类重写)
|
||||||
|
function JingjishiLianPatface:OnOpen(fun)
|
||||||
|
PlayerPrefs.SetInt(PlayerManager.uid.."JingjishiLianPatface",1)
|
||||||
|
self.fun = fun
|
||||||
|
end
|
||||||
|
|
||||||
|
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
||||||
|
function JingjishiLianPatface:OnShow()
|
||||||
|
if self.live then
|
||||||
|
poolManager:UnLoadLive(self.live.gameObject.name, self.live)
|
||||||
|
self.live = nil
|
||||||
|
end
|
||||||
|
local data = ConfigManager.GetConfigDataByKey(ConfigName.HeroConfig,"ReadingName","敖丙")
|
||||||
|
self.live = poolManager:LoadLive(GetResourcePath(data.Live), self.liveRoot.transform,
|
||||||
|
Vector3.one * data.Scale, Vector3.New(data.Position[1], data.Position[2], 0))
|
||||||
|
local SkeletonGraphic = self.live:GetComponent("SkeletonGraphic")
|
||||||
|
SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true)
|
||||||
|
end
|
||||||
|
|
||||||
|
--界面关闭时调用(用于子类重写)
|
||||||
|
function JingjishiLianPatface:OnClose()
|
||||||
|
if self.fun then
|
||||||
|
self.fun()
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
--界面销毁时调用(用于子类重写)
|
||||||
|
function JingjishiLianPatface:OnDestroy()
|
||||||
|
self.spLoader:Destroy()
|
||||||
|
if self.live then
|
||||||
|
poolManager:UnLoadLive(self.live.gameObject.name, self.live)
|
||||||
|
self.live = nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
return JingjishiLianPatface
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ee8edf7ffe9e3f14493d7e9809ee71f5
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -254,6 +254,12 @@ function this.PatFaceSpecialMonitor(v,patFaceAllData,type,starUpGiftNum)
|
||||||
if ActData and PlayerPrefs.GetInt(PlayerManager.uid.."TeHuiShenZhuang"..ActData.activityId) == 0 then
|
if ActData and PlayerPrefs.GetInt(PlayerManager.uid.."TeHuiShenZhuang"..ActData.activityId) == 0 then
|
||||||
table.insert(patFaceAllData,v)
|
table.insert(patFaceAllData,v)
|
||||||
end
|
end
|
||||||
|
elseif v.Type == 20 then--竞技试炼拍脸
|
||||||
|
if PlayerPrefs.GetInt(PlayerManager.uid.."JingjishiLianPatface") == 0 then
|
||||||
|
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.jingjishilian) and ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.jingjishilian)> 0 then
|
||||||
|
table.insert(patFaceAllData,v)
|
||||||
|
end
|
||||||
|
end
|
||||||
else
|
else
|
||||||
if RedPointManager.PlayerPrefsGetStr(v.Id.."PatFace") == "0" then
|
if RedPointManager.PlayerPrefsGetStr(v.Id.."PatFace") == "0" then
|
||||||
table.insert(patFaceAllData,v)
|
table.insert(patFaceAllData,v)
|
||||||
|
|
|
||||||
|
|
@ -171,6 +171,8 @@ function PatFacePanel:OnShowPatFaceData()
|
||||||
self:OnShowOb9Data()
|
self:OnShowOb9Data()
|
||||||
elseif patFaceSingleData.Type == FacePanelType.TeHuiShenZhuang then
|
elseif patFaceSingleData.Type == FacePanelType.TeHuiShenZhuang then
|
||||||
self:OnShowOb10Data()
|
self:OnShowOb10Data()
|
||||||
|
elseif patFaceSingleData.Type == FacePanelType.jingjishilian then
|
||||||
|
UIManager.OpenPanel(UIName.JingjishiLianPatface,function() self:ClosePanel() end)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
@ -181,6 +183,7 @@ function PatFacePanel:OnSortingOrderChange()
|
||||||
Util.AddParticleSortLayer( self.effext4, self.sortingOrder - cursortingOrder)
|
Util.AddParticleSortLayer( self.effext4, self.sortingOrder - cursortingOrder)
|
||||||
cursortingOrder = self.sortingOrder
|
cursortingOrder = self.sortingOrder
|
||||||
end
|
end
|
||||||
|
|
||||||
--第一种显示 神兵天降
|
--第一种显示 神兵天降
|
||||||
function PatFacePanel:OnShowOb1Data()
|
function PatFacePanel:OnShowOb1Data()
|
||||||
self.activity1Icon.sprite = self.spLoader:LoadSprite(GetResourcePath(patFaceSingleData.Background))
|
self.activity1Icon.sprite = self.spLoader:LoadSprite(GetResourcePath(patFaceSingleData.Background))
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,8 @@ function ArenaTrialPanel:RemoveListener()
|
||||||
end
|
end
|
||||||
|
|
||||||
--界面打开时调用(用于子类重写)
|
--界面打开时调用(用于子类重写)
|
||||||
function ArenaTrialPanel:OnOpen()
|
function ArenaTrialPanel:OnOpen(fun)
|
||||||
|
self.fun = fun
|
||||||
end
|
end
|
||||||
|
|
||||||
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
||||||
|
|
@ -181,6 +182,9 @@ function ArenaTrialPanel:OnClose()
|
||||||
poolManager:UnLoadLive(self.live.gameObject.name, self.live)
|
poolManager:UnLoadLive(self.live.gameObject.name, self.live)
|
||||||
self.live = nil
|
self.live = nil
|
||||||
end
|
end
|
||||||
|
if self.fun then
|
||||||
|
self.fun()
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
--界面销毁时调用(用于子类重写)
|
--界面销毁时调用(用于子类重写)
|
||||||
|
|
|
||||||
|
|
@ -1192,12 +1192,12 @@ function this:OnShow()
|
||||||
end
|
end
|
||||||
YuJianXingManager.MakeRequest()
|
YuJianXingManager.MakeRequest()
|
||||||
|
|
||||||
Timer.New(function()
|
-- Timer.New(function()
|
||||||
if DynamicActivityManager.isopenJingjishilian and ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.jingjishilian) and ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.jingjishilian)> 0 then
|
-- if DynamicActivityManager.isopenJingjishilian and ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.jingjishilian) and ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.jingjishilian)> 0 then
|
||||||
UIManager.OpenPanel(UIName.ArenaTrialPanel)
|
-- UIManager.OpenPanel(UIName.JingjishiLianPatface)
|
||||||
DynamicActivityManager.isopenJingjishilian = false
|
-- DynamicActivityManager.isopenJingjishilian = false
|
||||||
end
|
-- end
|
||||||
end,0.5):Start()
|
-- end,0.5):Start()
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue