Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 32262b268de078948bfe9c18a2038da8
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 31 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 7fe892139775d3949890fa017e120fcb
|
||||
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: e2869a28a44019641b4f77868d76c58b
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 31 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 8dd559083ec3bee4ab268164975c924d
|
||||
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: 518c578a32ea87a4abdeb729ed8caf58
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 39 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 5907c3b8c1367d249888d785e61ab698
|
||||
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: 7f512656d97e689489610776517f121a
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 27 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 8847d7278fc298244905fffd574215ba
|
||||
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: 4edd8c8ac21aa034691a5b8ce1c73609
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 15 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 0f78a17e6d3802b408385d5a6194089e
|
||||
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: 52bc1499706cdd745bae8c4c27a71228
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 8.8 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 5685dfd23350f3743a93cf794fa31686
|
||||
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: b964dbf735ba2ad4f9076a01a8c27361
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 23 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 182a38f58338e0645867691a5a554916
|
||||
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: c5b7369d5f24757408031981a90e1f4d
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 28 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: c957c7bbd2cf65845af437c01e786ce1
|
||||
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: 19fc3b56c878c8d4f954ccc6433a6082
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 15 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 6888d2d40e707044cb15245f961cc502
|
||||
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: dbb10841d2f8d3b41a116eeb77fe3d71
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 8.8 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ab3718861b1750b43aecf2c69354ef13
|
||||
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: b609fb720a71e654388fa2e75c8ac769
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 23 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 6d4b066ad29a5de4db36da4c46a6c660
|
||||
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: f3f5c54eedfb4cf479df425e467a6050
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 49 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 5dc9a3f40e7d523428c54a365bd8dd81
|
||||
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: 765ba5ce15b87b7468b32625ad3c30e9
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
After Width: | Height: | Size: 73 KiB |
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 8151f25186539c04990aa73895435d29
|
||||
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: 7f1cb810527edf246b78a9daa0cab4b2
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -9831,9 +9831,9 @@ RectTransform:
|
|||
m_Father: {fileID: 3260027997770271091}
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 438, y: 597.4}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -102, y: -362.59998}
|
||||
m_SizeDelta: {x: 127, y: 126}
|
||||
m_Pivot: {x: 0.49999994, y: 0.5}
|
||||
--- !u!222 &603132567455178056
|
||||
|
@ -9948,9 +9948,9 @@ RectTransform:
|
|||
m_Father: {fileID: 3260027997770271091}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 438.5, y: 731.9}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -101.5, y: -228.09998}
|
||||
m_SizeDelta: {x: 126, y: 126}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8803097166006486372
|
||||
|
@ -11187,9 +11187,9 @@ RectTransform:
|
|||
m_Father: {fileID: 3260027997770271091}
|
||||
m_RootOrder: 7
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: -897}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 63}
|
||||
m_SizeDelta: {x: 1080, y: 126}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7158894886425800137
|
||||
|
@ -11307,10 +11307,10 @@ RectTransform:
|
|||
m_Father: {fileID: 1464501352932509924}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 92.34, y: -27.945}
|
||||
m_SizeDelta: {x: 184.68, y: 50}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2868803494069702802
|
||||
CanvasRenderer:
|
||||
|
@ -11867,9 +11867,9 @@ RectTransform:
|
|||
m_Father: {fileID: 3260027997770271091}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 438.5, y: 844.5}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -101.5, y: -115.5}
|
||||
m_SizeDelta: {x: 68, y: 68}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6579244722172438955
|
||||
|
|
|
@ -1129,7 +1129,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: -53.6, y: -213.8}
|
||||
m_AnchoredPosition: {x: -53.599854, y: -213.8003}
|
||||
m_SizeDelta: {x: 116, y: 252}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &109774924979790381
|
||||
|
@ -1230,6 +1230,143 @@ Animator:
|
|||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &5586254164085109951
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3189044688098617787}
|
||||
- component: {fileID: 2408119759968974775}
|
||||
- component: {fileID: 1690752028233714278}
|
||||
- component: {fileID: 384437230555690381}
|
||||
- component: {fileID: 5388448187256286407}
|
||||
m_Layer: 5
|
||||
m_Name: btnRank
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3189044688098617787
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5586254164085109951}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 5769538791216929783}
|
||||
m_RootOrder: 10
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -101.5, y: -228.1001}
|
||||
m_SizeDelta: {x: 126, y: 126}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2408119759968974775
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5586254164085109951}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1690752028233714278
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5586254164085109951}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 0ae4375e796ee934997142d1bb379d5d, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!114 &384437230555690381
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5586254164085109951}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 3
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 1690752028233714278}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!95 &5388448187256286407
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5586254164085109951}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &5769538791216929782
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1269,6 +1406,7 @@ RectTransform:
|
|||
- {fileID: 187402429441621089}
|
||||
- {fileID: 3453044243650348264}
|
||||
- {fileID: 1888552066746623679}
|
||||
- {fileID: 3189044688098617787}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
|
@ -1192,7 +1192,7 @@ ActivityTypeDef = {
|
|||
DynamicAct = 20000,--主题活动任务
|
||||
DynamicAct_TimeLimitShop = 20001,--主题活动限时商市
|
||||
DynamicAct_Treasure = 20002,--主题活动珍奇宝阁
|
||||
|
||||
LimitUpHero = 20003, --限时up活动 (祈愿)
|
||||
TreasureStore = 6000,--百宝商会
|
||||
YiJingBaoKu = 8000,--易经宝库
|
||||
|
||||
|
@ -1975,7 +1975,7 @@ RANK_TYPE = {
|
|||
CELEBRATION_GUILD = 27,--社稷大典工会排行
|
||||
FIGHTLEVEL_PROGRESS = 29,--山河社稷图进度
|
||||
FIGHTLEVEL_STAR = 30,--山河社稷图星数
|
||||
-- TASUILINGXIAO = 31,--踏碎凌霄伤害
|
||||
TASUILINGXIAO = 31,--踏碎凌霄伤害
|
||||
}
|
||||
|
||||
--东海寻仙弹窗类型
|
||||
|
@ -2322,7 +2322,7 @@ rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04_zh", name = Languag
|
|||
[14] = { bgImage = "r_zjm_paihangbang_banner01_zh", name = Language[11006] ,rankType = RANK_TYPE.CELEBRATION_GUILD,activiteId = ActivityTypeDef.Celebration,isRankingMainPanelShow = false},
|
||||
[15] = { bgImage = "r_zjm_paihangbang_banner01_zh", name = "排行榜" ,rankType = RANK_TYPE.FIGHTLEVEL_PROGRESS,activiteId = 0,isRankingMainPanelShow = false},
|
||||
[16] = { bgImage = "r_zjm_paihangbang_banner01_zh", name = "排行榜" ,rankType = RANK_TYPE.FIGHTLEVEL_STAR,activiteId = 0,isRankingMainPanelShow = false},
|
||||
-- [17] = { bgImage = "r_zjm_paihangbang_banner01_zh", name = "排行榜" ,rankType = RANK_TYPE.TASUILINGXIAO,activiteId = ActivityTypeDef.TaSuiLingXiao,isRankingMainPanelShow = false},
|
||||
[17] = { bgImage = "r_zjm_paihangbang_banner01_zh", name = "排行榜" ,rankType = RANK_TYPE.TASUILINGXIAO,activiteId = ActivityTypeDef.TaSuiLingXiao,isRankingMainPanelShow = false},
|
||||
}
|
||||
|
||||
SoulPrintSpriteByQuantity={
|
||||
|
|
|
@ -66,6 +66,4 @@ AppConst.UmengChannleId = "App Store"
|
|||
AppConst.Bugly_IosAppId = "c07e578650"
|
||||
AppConst.Bugly_AndroidAppId = "9b909facba"
|
||||
|
||||
AppConst.LaQi_JoinRoom_Url = "com.doudou.dwc://data/openwith?"
|
||||
|
||||
SpriteLoader = require("Modules.Common.SpriteLoader")
|
||||
AppConst.LaQi_JoinRoom_Url = "com.doudou.dwc://data/openwith?"
|
|
@ -438,6 +438,7 @@ SubUIConfig = {
|
|||
|
||||
[15] = {name = "page2",assetName = "page2",script = "Modules/DynamicActivity/SheJiDaDian"}, --社稷大典
|
||||
[16] = {name = "TimeLimitUpHero",assetName = "TimeLimitUpHero",script = "Modules/DynamicActivity/TimeLimitUpHero"}, --限时召唤
|
||||
--[16] = {name = "page3",assetName = "page3",script = "Modules/DynamicActivity/TimeLimitedCall"}, --限时召唤
|
||||
[17] = {name = "page4",assetName = "page4",script = "Modules/DynamicActivity/QianKunBox"},--乾坤宝盒
|
||||
[18] = {name = "page9",assetName = "page9",script = "Modules/DynamicActivity/YiJingBaoKu"},--易经宝库
|
||||
[19] = {name = "page10",assetName = "page10",script = "Modules/DynamicActivity/ShengYiTianJiang"},--神衣天降
|
||||
|
|
|
@ -12,6 +12,7 @@ ServerConfigManager.SettingConfig = {
|
|||
IS_SHOW_HEALTH_TIP = "IS_SHOW_HEALTH_TIP", -- 是否显示健康提示
|
||||
NOTICE_CHANNEL = "NOTICE_CHANNEL", -- 公告号
|
||||
PACKAGE_CC_CODE = "PACKAGE_CC_CODE", -- CC号
|
||||
SPRITE_LOADER = "SPRITE_LOADER", -- 资源加载器是否可以使用
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -228,6 +228,7 @@ GameEvent = {
|
|||
},
|
||||
Shop = {
|
||||
OnShopInfoChange = "Shop.OnShopInfoChange",
|
||||
RefreshItem = "Shop.RefreshItem",
|
||||
},
|
||||
Vip = {
|
||||
OnVipTaskStatusChanged = "Vip.OnVipTaskStatusChanged",
|
||||
|
@ -468,7 +469,8 @@ GameEvent = {
|
|||
EndLess ={
|
||||
MissonChange = "EndLess.MissonChange",
|
||||
RechargeQinglongSerectSuccess = "EndLess.RechargeQinglongSerectSuccess",
|
||||
RefreshHeroData = "EndLess.RefreshHeroData"
|
||||
RefreshHeroData = "EndLess.RefreshHeroData",
|
||||
GuidePanel = "EndLess.GuidePanel",
|
||||
},
|
||||
--山河社稷图
|
||||
FightLevel={
|
||||
|
|
|
@ -39,6 +39,26 @@ SENDCHATINFORESPONSE_CHATINFO_FIELD = protobuf.FieldDescriptor();
|
|||
SENDCHATINFOINDICATION = protobuf.Descriptor();
|
||||
SENDCHATINFOINDICATION_CHATINFO_FIELD = protobuf.FieldDescriptor();
|
||||
SENDCHATINFOINDICATION_TYPE_FIELD = protobuf.FieldDescriptor();
|
||||
CHATUSERV3 = protobuf.Descriptor();
|
||||
CHATUSERV3_PLAYERID_FIELD = protobuf.FieldDescriptor();
|
||||
CHATUSERV3_USERID_FIELD = protobuf.FieldDescriptor();
|
||||
CHATUSERV3_NICKNAME_FIELD = protobuf.FieldDescriptor();
|
||||
CHATUSERV3_LEVEL_FIELD = protobuf.FieldDescriptor();
|
||||
CHATUSERV3_VIPLEVEL_FIELD = protobuf.FieldDescriptor();
|
||||
CHATUSERV3_POWER_FIELD = protobuf.FieldDescriptor();
|
||||
CHATUSERV3_ZONEID_FIELD = protobuf.FieldDescriptor();
|
||||
CHATUSERV3_ZONENAME_FIELD = protobuf.FieldDescriptor();
|
||||
CHATUSERV3_EXTRA_FIELD = protobuf.FieldDescriptor();
|
||||
CHATUSERV3_SERVERID_FIELD = protobuf.FieldDescriptor();
|
||||
CHATV3 = protobuf.Descriptor();
|
||||
CHATV3_ID_FIELD = protobuf.FieldDescriptor();
|
||||
CHATV3_CHANNEL_FIELD = protobuf.FieldDescriptor();
|
||||
CHATV3_FROM_FIELD = protobuf.FieldDescriptor();
|
||||
CHATV3_TO_FIELD = protobuf.FieldDescriptor();
|
||||
CHATV3_CONTENT_FIELD = protobuf.FieldDescriptor();
|
||||
CHATV3_IP_FIELD = protobuf.FieldDescriptor();
|
||||
CHATV3_EXTRA_FIELD = protobuf.FieldDescriptor();
|
||||
CHATV3_STATUS_FIELD = protobuf.FieldDescriptor();
|
||||
|
||||
CHATINFO_SENDERID_FIELD.name = "senderId"
|
||||
CHATINFO_SENDERID_FIELD.full_name = ".rpc.protocols.ChatInfo.senderId"
|
||||
|
@ -385,8 +405,206 @@ SENDCHATINFOINDICATION.enum_types = {}
|
|||
SENDCHATINFOINDICATION.fields = {SENDCHATINFOINDICATION_CHATINFO_FIELD, SENDCHATINFOINDICATION_TYPE_FIELD}
|
||||
SENDCHATINFOINDICATION.is_extendable = false
|
||||
SENDCHATINFOINDICATION.extensions = {}
|
||||
CHATUSERV3_PLAYERID_FIELD.name = "playerId"
|
||||
CHATUSERV3_PLAYERID_FIELD.full_name = ".rpc.protocols.ChatUserV3.playerId"
|
||||
CHATUSERV3_PLAYERID_FIELD.number = 1
|
||||
CHATUSERV3_PLAYERID_FIELD.index = 0
|
||||
CHATUSERV3_PLAYERID_FIELD.label = 1
|
||||
CHATUSERV3_PLAYERID_FIELD.has_default_value = false
|
||||
CHATUSERV3_PLAYERID_FIELD.default_value = ""
|
||||
CHATUSERV3_PLAYERID_FIELD.type = 9
|
||||
CHATUSERV3_PLAYERID_FIELD.cpp_type = 9
|
||||
|
||||
CHATUSERV3_USERID_FIELD.name = "userId"
|
||||
CHATUSERV3_USERID_FIELD.full_name = ".rpc.protocols.ChatUserV3.userId"
|
||||
CHATUSERV3_USERID_FIELD.number = 2
|
||||
CHATUSERV3_USERID_FIELD.index = 1
|
||||
CHATUSERV3_USERID_FIELD.label = 1
|
||||
CHATUSERV3_USERID_FIELD.has_default_value = false
|
||||
CHATUSERV3_USERID_FIELD.default_value = ""
|
||||
CHATUSERV3_USERID_FIELD.type = 9
|
||||
CHATUSERV3_USERID_FIELD.cpp_type = 9
|
||||
|
||||
CHATUSERV3_NICKNAME_FIELD.name = "nickname"
|
||||
CHATUSERV3_NICKNAME_FIELD.full_name = ".rpc.protocols.ChatUserV3.nickname"
|
||||
CHATUSERV3_NICKNAME_FIELD.number = 3
|
||||
CHATUSERV3_NICKNAME_FIELD.index = 2
|
||||
CHATUSERV3_NICKNAME_FIELD.label = 1
|
||||
CHATUSERV3_NICKNAME_FIELD.has_default_value = false
|
||||
CHATUSERV3_NICKNAME_FIELD.default_value = ""
|
||||
CHATUSERV3_NICKNAME_FIELD.type = 9
|
||||
CHATUSERV3_NICKNAME_FIELD.cpp_type = 9
|
||||
|
||||
CHATUSERV3_LEVEL_FIELD.name = "level"
|
||||
CHATUSERV3_LEVEL_FIELD.full_name = ".rpc.protocols.ChatUserV3.level"
|
||||
CHATUSERV3_LEVEL_FIELD.number = 4
|
||||
CHATUSERV3_LEVEL_FIELD.index = 3
|
||||
CHATUSERV3_LEVEL_FIELD.label = 1
|
||||
CHATUSERV3_LEVEL_FIELD.has_default_value = false
|
||||
CHATUSERV3_LEVEL_FIELD.default_value = 0
|
||||
CHATUSERV3_LEVEL_FIELD.type = 5
|
||||
CHATUSERV3_LEVEL_FIELD.cpp_type = 1
|
||||
|
||||
CHATUSERV3_VIPLEVEL_FIELD.name = "vipLevel"
|
||||
CHATUSERV3_VIPLEVEL_FIELD.full_name = ".rpc.protocols.ChatUserV3.vipLevel"
|
||||
CHATUSERV3_VIPLEVEL_FIELD.number = 5
|
||||
CHATUSERV3_VIPLEVEL_FIELD.index = 4
|
||||
CHATUSERV3_VIPLEVEL_FIELD.label = 1
|
||||
CHATUSERV3_VIPLEVEL_FIELD.has_default_value = false
|
||||
CHATUSERV3_VIPLEVEL_FIELD.default_value = 0
|
||||
CHATUSERV3_VIPLEVEL_FIELD.type = 5
|
||||
CHATUSERV3_VIPLEVEL_FIELD.cpp_type = 1
|
||||
|
||||
CHATUSERV3_POWER_FIELD.name = "power"
|
||||
CHATUSERV3_POWER_FIELD.full_name = ".rpc.protocols.ChatUserV3.power"
|
||||
CHATUSERV3_POWER_FIELD.number = 6
|
||||
CHATUSERV3_POWER_FIELD.index = 5
|
||||
CHATUSERV3_POWER_FIELD.label = 1
|
||||
CHATUSERV3_POWER_FIELD.has_default_value = false
|
||||
CHATUSERV3_POWER_FIELD.default_value = 0
|
||||
CHATUSERV3_POWER_FIELD.type = 3
|
||||
CHATUSERV3_POWER_FIELD.cpp_type = 2
|
||||
|
||||
CHATUSERV3_ZONEID_FIELD.name = "zoneId"
|
||||
CHATUSERV3_ZONEID_FIELD.full_name = ".rpc.protocols.ChatUserV3.zoneId"
|
||||
CHATUSERV3_ZONEID_FIELD.number = 7
|
||||
CHATUSERV3_ZONEID_FIELD.index = 6
|
||||
CHATUSERV3_ZONEID_FIELD.label = 1
|
||||
CHATUSERV3_ZONEID_FIELD.has_default_value = false
|
||||
CHATUSERV3_ZONEID_FIELD.default_value = ""
|
||||
CHATUSERV3_ZONEID_FIELD.type = 9
|
||||
CHATUSERV3_ZONEID_FIELD.cpp_type = 9
|
||||
|
||||
CHATUSERV3_ZONENAME_FIELD.name = "zoneName"
|
||||
CHATUSERV3_ZONENAME_FIELD.full_name = ".rpc.protocols.ChatUserV3.zoneName"
|
||||
CHATUSERV3_ZONENAME_FIELD.number = 8
|
||||
CHATUSERV3_ZONENAME_FIELD.index = 7
|
||||
CHATUSERV3_ZONENAME_FIELD.label = 1
|
||||
CHATUSERV3_ZONENAME_FIELD.has_default_value = false
|
||||
CHATUSERV3_ZONENAME_FIELD.default_value = ""
|
||||
CHATUSERV3_ZONENAME_FIELD.type = 9
|
||||
CHATUSERV3_ZONENAME_FIELD.cpp_type = 9
|
||||
|
||||
CHATUSERV3_EXTRA_FIELD.name = "extra"
|
||||
CHATUSERV3_EXTRA_FIELD.full_name = ".rpc.protocols.ChatUserV3.extra"
|
||||
CHATUSERV3_EXTRA_FIELD.number = 10
|
||||
CHATUSERV3_EXTRA_FIELD.index = 8
|
||||
CHATUSERV3_EXTRA_FIELD.label = 1
|
||||
CHATUSERV3_EXTRA_FIELD.has_default_value = false
|
||||
CHATUSERV3_EXTRA_FIELD.default_value = ""
|
||||
CHATUSERV3_EXTRA_FIELD.type = 9
|
||||
CHATUSERV3_EXTRA_FIELD.cpp_type = 9
|
||||
|
||||
CHATUSERV3_SERVERID_FIELD.name = "serverId"
|
||||
CHATUSERV3_SERVERID_FIELD.full_name = ".rpc.protocols.ChatUserV3.serverId"
|
||||
CHATUSERV3_SERVERID_FIELD.number = 11
|
||||
CHATUSERV3_SERVERID_FIELD.index = 9
|
||||
CHATUSERV3_SERVERID_FIELD.label = 1
|
||||
CHATUSERV3_SERVERID_FIELD.has_default_value = false
|
||||
CHATUSERV3_SERVERID_FIELD.default_value = ""
|
||||
CHATUSERV3_SERVERID_FIELD.type = 9
|
||||
CHATUSERV3_SERVERID_FIELD.cpp_type = 9
|
||||
|
||||
CHATUSERV3.name = "ChatUserV3"
|
||||
CHATUSERV3.full_name = ".rpc.protocols.ChatUserV3"
|
||||
CHATUSERV3.nested_types = {}
|
||||
CHATUSERV3.enum_types = {}
|
||||
CHATUSERV3.fields = {CHATUSERV3_PLAYERID_FIELD, CHATUSERV3_USERID_FIELD, CHATUSERV3_NICKNAME_FIELD, CHATUSERV3_LEVEL_FIELD, CHATUSERV3_VIPLEVEL_FIELD, CHATUSERV3_POWER_FIELD, CHATUSERV3_ZONEID_FIELD, CHATUSERV3_ZONENAME_FIELD, CHATUSERV3_EXTRA_FIELD, CHATUSERV3_SERVERID_FIELD}
|
||||
CHATUSERV3.is_extendable = false
|
||||
CHATUSERV3.extensions = {}
|
||||
CHATV3_ID_FIELD.name = "id"
|
||||
CHATV3_ID_FIELD.full_name = ".rpc.protocols.ChatV3.id"
|
||||
CHATV3_ID_FIELD.number = 10
|
||||
CHATV3_ID_FIELD.index = 0
|
||||
CHATV3_ID_FIELD.label = 1
|
||||
CHATV3_ID_FIELD.has_default_value = false
|
||||
CHATV3_ID_FIELD.default_value = ""
|
||||
CHATV3_ID_FIELD.type = 9
|
||||
CHATV3_ID_FIELD.cpp_type = 9
|
||||
|
||||
CHATV3_CHANNEL_FIELD.name = "channel"
|
||||
CHATV3_CHANNEL_FIELD.full_name = ".rpc.protocols.ChatV3.channel"
|
||||
CHATV3_CHANNEL_FIELD.number = 1
|
||||
CHATV3_CHANNEL_FIELD.index = 1
|
||||
CHATV3_CHANNEL_FIELD.label = 1
|
||||
CHATV3_CHANNEL_FIELD.has_default_value = false
|
||||
CHATV3_CHANNEL_FIELD.default_value = ""
|
||||
CHATV3_CHANNEL_FIELD.type = 9
|
||||
CHATV3_CHANNEL_FIELD.cpp_type = 9
|
||||
|
||||
CHATV3_FROM_FIELD.name = "from"
|
||||
CHATV3_FROM_FIELD.full_name = ".rpc.protocols.ChatV3.from"
|
||||
CHATV3_FROM_FIELD.number = 2
|
||||
CHATV3_FROM_FIELD.index = 2
|
||||
CHATV3_FROM_FIELD.label = 1
|
||||
CHATV3_FROM_FIELD.has_default_value = false
|
||||
CHATV3_FROM_FIELD.default_value = nil
|
||||
CHATV3_FROM_FIELD.message_type = CHATUSERV3
|
||||
CHATV3_FROM_FIELD.type = 11
|
||||
CHATV3_FROM_FIELD.cpp_type = 10
|
||||
|
||||
CHATV3_TO_FIELD.name = "to"
|
||||
CHATV3_TO_FIELD.full_name = ".rpc.protocols.ChatV3.to"
|
||||
CHATV3_TO_FIELD.number = 3
|
||||
CHATV3_TO_FIELD.index = 3
|
||||
CHATV3_TO_FIELD.label = 1
|
||||
CHATV3_TO_FIELD.has_default_value = false
|
||||
CHATV3_TO_FIELD.default_value = nil
|
||||
CHATV3_TO_FIELD.message_type = CHATUSERV3
|
||||
CHATV3_TO_FIELD.type = 11
|
||||
CHATV3_TO_FIELD.cpp_type = 10
|
||||
|
||||
CHATV3_CONTENT_FIELD.name = "content"
|
||||
CHATV3_CONTENT_FIELD.full_name = ".rpc.protocols.ChatV3.content"
|
||||
CHATV3_CONTENT_FIELD.number = 4
|
||||
CHATV3_CONTENT_FIELD.index = 4
|
||||
CHATV3_CONTENT_FIELD.label = 1
|
||||
CHATV3_CONTENT_FIELD.has_default_value = false
|
||||
CHATV3_CONTENT_FIELD.default_value = ""
|
||||
CHATV3_CONTENT_FIELD.type = 9
|
||||
CHATV3_CONTENT_FIELD.cpp_type = 9
|
||||
|
||||
CHATV3_IP_FIELD.name = "ip"
|
||||
CHATV3_IP_FIELD.full_name = ".rpc.protocols.ChatV3.ip"
|
||||
CHATV3_IP_FIELD.number = 5
|
||||
CHATV3_IP_FIELD.index = 5
|
||||
CHATV3_IP_FIELD.label = 1
|
||||
CHATV3_IP_FIELD.has_default_value = false
|
||||
CHATV3_IP_FIELD.default_value = ""
|
||||
CHATV3_IP_FIELD.type = 9
|
||||
CHATV3_IP_FIELD.cpp_type = 9
|
||||
|
||||
CHATV3_EXTRA_FIELD.name = "extra"
|
||||
CHATV3_EXTRA_FIELD.full_name = ".rpc.protocols.ChatV3.extra"
|
||||
CHATV3_EXTRA_FIELD.number = 7
|
||||
CHATV3_EXTRA_FIELD.index = 6
|
||||
CHATV3_EXTRA_FIELD.label = 1
|
||||
CHATV3_EXTRA_FIELD.has_default_value = false
|
||||
CHATV3_EXTRA_FIELD.default_value = ""
|
||||
CHATV3_EXTRA_FIELD.type = 9
|
||||
CHATV3_EXTRA_FIELD.cpp_type = 9
|
||||
|
||||
CHATV3_STATUS_FIELD.name = "status"
|
||||
CHATV3_STATUS_FIELD.full_name = ".rpc.protocols.ChatV3.status"
|
||||
CHATV3_STATUS_FIELD.number = 8
|
||||
CHATV3_STATUS_FIELD.index = 7
|
||||
CHATV3_STATUS_FIELD.label = 1
|
||||
CHATV3_STATUS_FIELD.has_default_value = false
|
||||
CHATV3_STATUS_FIELD.default_value = 0
|
||||
CHATV3_STATUS_FIELD.type = 5
|
||||
CHATV3_STATUS_FIELD.cpp_type = 1
|
||||
|
||||
CHATV3.name = "ChatV3"
|
||||
CHATV3.full_name = ".rpc.protocols.ChatV3"
|
||||
CHATV3.nested_types = {}
|
||||
CHATV3.enum_types = {}
|
||||
CHATV3.fields = {CHATV3_ID_FIELD, CHATV3_CHANNEL_FIELD, CHATV3_FROM_FIELD, CHATV3_TO_FIELD, CHATV3_CONTENT_FIELD, CHATV3_IP_FIELD, CHATV3_EXTRA_FIELD, CHATV3_STATUS_FIELD}
|
||||
CHATV3.is_extendable = false
|
||||
CHATV3.extensions = {}
|
||||
|
||||
ChatInfo = protobuf.Message(CHATINFO)
|
||||
ChatUserV3 = protobuf.Message(CHATUSERV3)
|
||||
ChatV3 = protobuf.Message(CHATV3)
|
||||
GetChatMessageInfoRequest = protobuf.Message(GETCHATMESSAGEINFOREQUEST)
|
||||
GetChatMessageInfoResponse = protobuf.Message(GETCHATMESSAGEINFORESPONSE)
|
||||
SendChatInfoIndication = protobuf.Message(SENDCHATINFOINDICATION)
|
||||
|
|
|
@ -522,6 +522,7 @@ HARDSTAGEFIGHTRESPONSE = protobuf.Descriptor();
|
|||
HARDSTAGEFIGHTRESPONSE_FIGHTDATA_FIELD = protobuf.FieldDescriptor();
|
||||
HARDSTAGEFIGHTRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
|
||||
HARDSTAGEFIGHTRESPONSE_STARS_FIELD = protobuf.FieldDescriptor();
|
||||
HARDSTAGEFIGHTRESPONSE_CURRENTISHONOUR_FIELD = protobuf.FieldDescriptor();
|
||||
GETHARDSTAGECHAPTERREWARD = protobuf.Descriptor();
|
||||
GETHARDSTAGECHAPTERREWARD_CHAPTERID_FIELD = protobuf.FieldDescriptor();
|
||||
GETHARDSTAGECHAPTERREWARD_REWRADID_FIELD = protobuf.FieldDescriptor();
|
||||
|
@ -5295,11 +5296,21 @@ HARDSTAGEFIGHTRESPONSE_STARS_FIELD.default_value = 0
|
|||
HARDSTAGEFIGHTRESPONSE_STARS_FIELD.type = 5
|
||||
HARDSTAGEFIGHTRESPONSE_STARS_FIELD.cpp_type = 1
|
||||
|
||||
HARDSTAGEFIGHTRESPONSE_CURRENTISHONOUR_FIELD.name = "currentIsHonour"
|
||||
HARDSTAGEFIGHTRESPONSE_CURRENTISHONOUR_FIELD.full_name = ".rpc.protocols.HardStageFightResponse.currentIsHonour"
|
||||
HARDSTAGEFIGHTRESPONSE_CURRENTISHONOUR_FIELD.number = 4
|
||||
HARDSTAGEFIGHTRESPONSE_CURRENTISHONOUR_FIELD.index = 3
|
||||
HARDSTAGEFIGHTRESPONSE_CURRENTISHONOUR_FIELD.label = 1
|
||||
HARDSTAGEFIGHTRESPONSE_CURRENTISHONOUR_FIELD.has_default_value = false
|
||||
HARDSTAGEFIGHTRESPONSE_CURRENTISHONOUR_FIELD.default_value = false
|
||||
HARDSTAGEFIGHTRESPONSE_CURRENTISHONOUR_FIELD.type = 8
|
||||
HARDSTAGEFIGHTRESPONSE_CURRENTISHONOUR_FIELD.cpp_type = 7
|
||||
|
||||
HARDSTAGEFIGHTRESPONSE.name = "HardStageFightResponse"
|
||||
HARDSTAGEFIGHTRESPONSE.full_name = ".rpc.protocols.HardStageFightResponse"
|
||||
HARDSTAGEFIGHTRESPONSE.nested_types = {}
|
||||
HARDSTAGEFIGHTRESPONSE.enum_types = {}
|
||||
HARDSTAGEFIGHTRESPONSE.fields = {HARDSTAGEFIGHTRESPONSE_FIGHTDATA_FIELD, HARDSTAGEFIGHTRESPONSE_DROP_FIELD, HARDSTAGEFIGHTRESPONSE_STARS_FIELD}
|
||||
HARDSTAGEFIGHTRESPONSE.fields = {HARDSTAGEFIGHTRESPONSE_FIGHTDATA_FIELD, HARDSTAGEFIGHTRESPONSE_DROP_FIELD, HARDSTAGEFIGHTRESPONSE_STARS_FIELD, HARDSTAGEFIGHTRESPONSE_CURRENTISHONOUR_FIELD}
|
||||
HARDSTAGEFIGHTRESPONSE.is_extendable = false
|
||||
HARDSTAGEFIGHTRESPONSE.extensions = {}
|
||||
GETHARDSTAGECHAPTERREWARD_CHAPTERID_FIELD.name = "chapterId"
|
||||
|
|
|
@ -205,6 +205,9 @@ function this.ShowCountTime()
|
|||
-- 启动倒计时
|
||||
this.timer = Timer.New(function ()
|
||||
local leftTime = AutoRecoverManager.GetRecoverTime(1)
|
||||
if leftTime < 0 then
|
||||
leftTime = 0
|
||||
end
|
||||
this.actCountTime.text = GetTimeMaoHaoStrBySeconds(math.floor(leftTime)).."后恢复1点"
|
||||
end, 1, -1, true)
|
||||
this.timer:Start()
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
local SpriteLoaderPool = {}
|
||||
local SpriteLoader = {}
|
||||
local spLoaderIndex = 0
|
||||
local IsActive = ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.SPRITE_LOADER)
|
||||
|
||||
-- 调用此方法创建一个管理器
|
||||
function SpriteLoader.New()
|
||||
|
@ -19,6 +20,9 @@ function SpriteLoader.New()
|
|||
end
|
||||
|
||||
function SpriteLoader:LoadSprite(name)
|
||||
if not IsActive then
|
||||
return Util.LoadSprite(name)
|
||||
end
|
||||
local transName = GetTranslateSpriteName(name)
|
||||
local sp = resMgr:LoadSpriteAsset(transName)
|
||||
if sp then
|
||||
|
@ -54,6 +58,9 @@ end
|
|||
|
||||
-- 销毁loader
|
||||
function SpriteLoader:Destroy()
|
||||
if not IsActive then
|
||||
return
|
||||
end
|
||||
coroutine.start(function()
|
||||
coroutine.wait(2)
|
||||
self:UnLoadSprite()
|
||||
|
|
|
@ -80,22 +80,22 @@ end
|
|||
--绑定事件(用于子类重写)
|
||||
function TimeLimitUpHero:BindEvent()
|
||||
Util.AddOnceClick(self.helpBtn, function()
|
||||
UIManager.OpenPanel(UIName.HelpPopup,self.actConfig.HelpId,self.helpPosition.x,self.helpPosition.y)
|
||||
UIManager.OpenPanel(UIName.HelpPopup,Setting.QAId,self.helpPosition.x,self.helpPosition.y)
|
||||
end)
|
||||
|
||||
Util.AddOnceClick(self.btnActivity, function()
|
||||
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.RecrutDetail,self.actConfig.HelpId,self.actId,PRE_REWARD_POOL_TYPE.TIME_LIMITED_UP,PRE_REWARD_POOL_TYPE.TIME_LIMITED)
|
||||
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.RecrutDetail,Setting.QAId,20003,PRE_REWARD_POOL_TYPE.TIME_LIMITED_UP,PRE_REWARD_POOL_TYPE.TIME_LIMITED,curHeroId,self.actId)
|
||||
end)
|
||||
end
|
||||
|
||||
--添加事件监听(用于子类重写)
|
||||
function TimeLimitUpHero:AddListener()
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Activity.ContinueRechargeRefresh,self.OnUPHeroChange,self)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Activity.TimeLimitUpHeroChange,self.OnUPHeroChange,self)
|
||||
end
|
||||
|
||||
--移除事件监听(用于子类重写)
|
||||
function TimeLimitUpHero:RemoveListener()
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Activity.ContinueRechargeRefresh,self.OnUPHeroChange,self)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Activity.TimeLimitUpHeroChange,self.OnUPHeroChange,self)
|
||||
end
|
||||
|
||||
--up的英雄改变
|
||||
|
@ -173,9 +173,6 @@ function TimeLimitUpHero:RefreshGetHeroTimes()
|
|||
local curTimes = PrivilegeManager.GetPrivilegeUsedTimes(self.maxtimesId)
|
||||
self.upper.text= "今日召唤上限:"..curTimes.."/"..privilegeConfig[self.maxtimesId].Condition[1][2]--特权上限
|
||||
self.timeupdate.gameObject:SetActive(true)
|
||||
|
||||
|
||||
|
||||
if self.freeTimesId and self.freeTimesId > 0 then
|
||||
freeTime = PrivilegeManager.GetPrivilegeRemainValue(self.freeTimesId)
|
||||
LogError("self freetimes "..freeTime)
|
||||
|
@ -292,7 +289,7 @@ function TimeLimitUpHero:Recruit(actId,type)
|
|||
if not oneFunc then
|
||||
LogError(" one func ==nil")
|
||||
end
|
||||
-- UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero,actId,1,{RecruitType.TimeLimitSingle,RecruitType.TimeLimitTen},oneFunc2)
|
||||
UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],actId,1,{RecruitType.TimeLimitSingle,RecruitType.TimeLimitTen},oneFunc2)
|
||||
end
|
||||
CheckRedPointStatus(RedPointType.TimeLimited)
|
||||
end,self.freeTimesId)
|
||||
|
|
|
@ -25,6 +25,7 @@ local storeDataId = 0
|
|||
local roleConfig=ConfigManager.GetConfig(ConfigName.RoleConfig)
|
||||
local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig)
|
||||
function this:InitComponent(gameObject)
|
||||
this.spLoader = SpriteLoader.New()
|
||||
this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text")
|
||||
this.power = Util.GetGameObject(gameObject, "Power/Value"):GetComponent("Text")
|
||||
|
||||
|
@ -32,7 +33,7 @@ function this:InitComponent(gameObject)
|
|||
this.root = Util.GetGameObject(gameObject, "Root")
|
||||
for i = 1, 6 do
|
||||
heroListGo[i] = Util.GetGameObject(gameObject, "RoleGrid/Bg"..i.."/Hero"..i)
|
||||
Util.GetGameObject(gameObject, "RoleGrid/Bg"..i):GetComponent("Image").sprite = Util.LoadSprite(CardPosImageName[i])
|
||||
Util.GetGameObject(gameObject, "RoleGrid/Bg"..i):GetComponent("Image").sprite = this.spLoader:LoadSprite(CardPosImageName[i])
|
||||
end
|
||||
this.backBtn=Util.GetGameObject(gameObject,"BackBtn")
|
||||
this.sureBtn=Util.GetGameObject(gameObject,"sureBtn")
|
||||
|
@ -44,10 +45,10 @@ function this:InitComponent(gameObject)
|
|||
this.returnLook=Util.GetGameObject(gameObject,"returnLook")
|
||||
this.returnLook.gameObject:SetActive(false)
|
||||
this.tip = Util.GetGameObject(gameObject,"tip"):GetComponent("Text")
|
||||
Util.GetGameObject(gameObject, "RoleGrid/FrontImage"):GetComponent("Image").sprite = Util.LoadSprite("bd_xinqianpai_zh")
|
||||
Util.GetGameObject(gameObject, "RoleGrid/BehindImage"):GetComponent("Image").sprite = Util.LoadSprite("bd_xinhoupai_zh")
|
||||
this.returnLook:GetComponent("Image").sprite = Util.LoadSprite("s_silingshilian_huifanganniu_zh")
|
||||
Util.GetGameObject(gameObject, "Power"):GetComponent("Image").sprite = Util.LoadSprite("t_tongyong-zhanli_zh")
|
||||
Util.GetGameObject(gameObject, "RoleGrid/FrontImage"):GetComponent("Image").sprite = this.spLoader:LoadSprite("bd_xinqianpai_zh")
|
||||
Util.GetGameObject(gameObject, "RoleGrid/BehindImage"):GetComponent("Image").sprite = this.spLoader:LoadSprite("bd_xinhoupai_zh")
|
||||
this.returnLook:GetComponent("Image").sprite = this.spLoader:LoadSprite("s_silingshilian_huifanganniu_zh")
|
||||
Util.GetGameObject(gameObject, "Power"):GetComponent("Image").sprite = this.spLoader:LoadSprite("t_tongyong-zhanli_zh")
|
||||
end
|
||||
|
||||
function this:BindEvent()
|
||||
|
@ -128,7 +129,7 @@ function this:SetIcon()
|
|||
Util.SetGray(this.sureBtn,false)
|
||||
this.fightBtnIcon.gameObject:SetActive(false)
|
||||
this.fightBtnNum.gameObject:SetActive(false)
|
||||
this.sureBtn:GetComponent("Image").sprite = Util.LoadSprite("r_hero_button_002")
|
||||
this.sureBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite("r_hero_button_002")
|
||||
this.tip.text = "奖励"
|
||||
if waveId == MonsterCampManager.monsterWave - 1 then
|
||||
if freeTime > 0 then
|
||||
|
@ -136,7 +137,7 @@ function this:SetIcon()
|
|||
else
|
||||
this.fightBtnIcon.gameObject:SetActive(true)
|
||||
this.fightBtnNum.gameObject:SetActive(true)
|
||||
this.fightBtnIcon.sprite = Util.LoadSprite(GetResourcePath(itemConfig[itemId].ResourceID))
|
||||
this.fightBtnIcon.sprite = this.spLoader:LoadSprite(GetResourcePath(itemConfig[itemId].ResourceID))
|
||||
local color = 0
|
||||
if BagManager.GetItemCountById(itemId) < costNum then
|
||||
color = "E71515"
|
||||
|
@ -150,7 +151,7 @@ function this:SetIcon()
|
|||
end
|
||||
end
|
||||
elseif (waveId == MonsterCampManager.monsterWave) then
|
||||
this.sureBtn:GetComponent("Image").sprite = Util.LoadSprite("r_hero_button_001")
|
||||
this.sureBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite("r_hero_button_001")
|
||||
this.fightBtnText.text = string.format("<color=#%s>%s</color>","17232A","挑 战")
|
||||
else
|
||||
this.fightBtnText.text =string.format("<color=#%s>%s</color>","17232A","确定")
|
||||
|
@ -175,7 +176,7 @@ function this:FormationAdapter()
|
|||
local bossTeaminfo = ConfigManager.GetConfigData(ConfigName.MonsterGroup,configData.Monster).Contents[1]
|
||||
for i = 1, #heroListGo do
|
||||
if (bossTeaminfo[i]) and bossTeaminfo[i] > 0 then
|
||||
heroListGo[i].transform.parent:GetComponent("Image").sprite=Util.LoadSprite("t_chengyuankuang_kuang")
|
||||
heroListGo[i].transform.parent:GetComponent("Image").sprite= this.spLoader:LoadSprite("t_chengyuankuang_kuang")
|
||||
this.SetCardSingleData(heroListGo[i],bossTeaminfo[i],i)
|
||||
heroListGo[i]:SetActive(true)
|
||||
else
|
||||
|
@ -205,16 +206,16 @@ function this.SetCardSingleData(o,monsterId, _pos)
|
|||
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, monsterconfig.MonsterId)
|
||||
|
||||
local bg=Util.GetGameObject(o,"Bg1"):GetComponent("Image")
|
||||
bg.sprite = Util.LoadSprite(GetHeroCardStarBg[heroConfig.Star])
|
||||
bg.sprite = this.spLoader:LoadSprite(GetHeroCardStarBg[heroConfig.Star])
|
||||
local fg=Util.GetGameObject(o,"Bg2"):GetComponent("Image")
|
||||
fg.sprite = Util.LoadSprite(GetHeroCardStarFg[heroConfig.Star])
|
||||
fg.sprite = this.spLoader:LoadSprite(GetHeroCardStarFg[heroConfig.Star])
|
||||
|
||||
-- local live=Util.GetGameObject(o,"Mask/Live")
|
||||
local lv=Util.GetGameObject(o,"lv/Text"):GetComponent("Text")
|
||||
lv.text=monsterconfig.Level
|
||||
|
||||
local pro=Util.GetGameObject(o,"Pro/Image"):GetComponent("Image")
|
||||
pro.sprite=Util.LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
|
||||
pro.sprite= this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
|
||||
local starGrid=Util.GetGameObject(o,"StarGrid")
|
||||
SetCardStars(starGrid,heroConfig.Star)
|
||||
local name=Util.GetGameObject(o,"Name/Text"):GetComponent("Text")
|
||||
|
@ -235,7 +236,7 @@ function this.SetCardSingleData(o,monsterId, _pos)
|
|||
zs:SetActive(false)
|
||||
else
|
||||
zs:SetActive(true)
|
||||
zs:GetComponent("Image").sprite = Util.LoadSprite(zsName)
|
||||
zs:GetComponent("Image").sprite = this.spLoader:LoadSprite(zsName)
|
||||
end
|
||||
|
||||
if heroConfig.Star > 9 then
|
||||
|
@ -250,6 +251,8 @@ function this:OnClose()
|
|||
end
|
||||
|
||||
function this:OnDestroy()
|
||||
|
||||
this.spLoader:Destroy()
|
||||
end
|
||||
|
||||
return this
|
|
@ -147,6 +147,9 @@ function this.SetRoleWalk(middleFightId)
|
|||
-- this.liveNode = PlayerLiveView:New(Util.GetGameObject(rootParent, "mapParent/selectMap/Image (1)/roleRoot"),1)
|
||||
-- this.liveNode:OnOpen(GetPlayerRoleSingleConFig().Scale5,Vector3.New(0,40,0),WALK_DIR.IDLE_FRONT)
|
||||
-- end
|
||||
if not this.liveNode then
|
||||
return
|
||||
end
|
||||
this.liveNode.leader.transform:DOLocalMove(targetPos, speed / 5, false):OnStart(function ()
|
||||
this.SetRoleDirAction(targetPos.x, targetPos.y, pos.x, pos.y)
|
||||
end):OnUpdate(function() --TODO:测试速度
|
||||
|
@ -246,6 +249,7 @@ end
|
|||
function this:Dispose()
|
||||
if this.liveNode then
|
||||
this.liveNode:OnClose()
|
||||
this.liveNode = nil
|
||||
end
|
||||
UIManager.camera.clearFlags = CameraClearFlags.Skybox
|
||||
TileMapView.Exit()
|
||||
|
|
|
@ -72,17 +72,9 @@ function this.SetInfo(root,data,index)
|
|||
Util.GetGameObject(root,"name"):GetComponent("Text").text = PracticeManager.SetNameColor(data.userName,data.practiceLevel) --data.userName
|
||||
Util.GetGameObject(root,"warPower/Text"):GetComponent("Text").text = data.power
|
||||
if data.type == 1 then
|
||||
if fightLevelData.config.StageType == FIGHTLEVEL_STAGETYPE.MainLevel then
|
||||
Util.GetGameObject(root,"tip"):GetComponent("Text").text = "首次三星通关"
|
||||
elseif fightLevelData.config.StageType == 3 then
|
||||
Util.GetGameObject(root,"tip"):GetComponent("Text").text = "首次通关"
|
||||
end
|
||||
Util.GetGameObject(root,"tip"):GetComponent("Text").text = "首次通关"
|
||||
elseif data.type == 2 then
|
||||
if fightLevelData.config.StageType == FIGHTLEVEL_STAGETYPE.MainLevel then
|
||||
Util.GetGameObject(root,"tip"):GetComponent("Text").text = "最低战力三星通关"
|
||||
elseif fightLevelData.config.StageType == 3 then
|
||||
Util.GetGameObject(root,"tip"):GetComponent("Text").text = "最低战力通关"
|
||||
end
|
||||
Util.GetGameObject(root,"tip"):GetComponent("Text").text = "最低战力通关"
|
||||
end
|
||||
Util.AddOnceClick(Util.GetGameObject(root,"ClickBtn"), function()
|
||||
local _fightData = BattleManager.GetBattleServerData(data,0)
|
||||
|
|
|
@ -6,7 +6,10 @@ local parent
|
|||
local sortingOrder=0
|
||||
local activityId = 0
|
||||
local activityType = 0
|
||||
local heroID =0
|
||||
local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig)
|
||||
local artResourcesConfig=ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
|
||||
local pool=ConfigManager.GetConfig(ConfigName.WishActivityPool)
|
||||
function this:InitComponent(gameObject)
|
||||
this.title = Util.GetGameObject(gameObject,"title"):GetComponent("Text")
|
||||
this.tip = Util.GetGameObject(gameObject,"tip"):GetComponent("Text")
|
||||
|
@ -66,11 +69,21 @@ function this:OnShow(_parent,...)
|
|||
|
||||
local poolUpType = args[3] or 0
|
||||
local poolType = args[4] or 0
|
||||
heroID = args[5]
|
||||
local activityId = args[6]
|
||||
LogGreen("poolUpType:"..poolUpType.." poolType:"..poolType)
|
||||
local UpItemList=RecruitManager.GetRewardPreviewData(poolUpType)
|
||||
local itemList = RecruitManager.GetRewardPreviewData(poolType)
|
||||
local _upRateList,rateList = this:BuildRateData(activityType,itemList,UpItemList)
|
||||
this:ReFreshUpItem(UpItemList,_upRateList)
|
||||
if activityType == ActivityTypeDef.LimitUpHero and heroID then
|
||||
local heroConfig=ConfigManager.TryGetConfigData(ConfigName.HeroConfig,heroID)
|
||||
if heroConfig then
|
||||
this:ShowUpItem(heroConfig,activityId)
|
||||
end
|
||||
else
|
||||
local UpItemList=RecruitManager.GetRewardPreviewData(poolUpType)
|
||||
local itemList = RecruitManager.GetRewardPreviewData(poolType)
|
||||
local _upRateList,rateList = this:BuildRateData(activityType,itemList,UpItemList)
|
||||
this:ReFreshUpItem(UpItemList,_upRateList)
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
function this:ReFreshUpItem(UpItem,rateList)
|
||||
|
@ -96,6 +109,70 @@ function this:ReFreshUpItem(UpItem,rateList)
|
|||
end
|
||||
end
|
||||
|
||||
--限时up英雄
|
||||
function this:ShowUpItem(config,actId)
|
||||
local hero=SubUIManager.Open(SubUIConfig.ItemView,this.itemGrid.transform)
|
||||
local wishUpConfig=ConfigManager.TryGetConfigDataByKey(ConfigName.WishActivityUp,"ActivityId",actId)
|
||||
local num=0
|
||||
for i = 1, #wishUpConfig.UpList do
|
||||
if wishUpConfig.UpList[i][1]==heroID then
|
||||
num=wishUpConfig.UpList[i][3]
|
||||
end
|
||||
end
|
||||
hero:OnOpen(false,{config.Id,1},1.1,true)
|
||||
hero.name:GetComponent("Text").text="<color=#EDB64C>"..string.format("%.2f", (num/100000)*100) .."%</color>"
|
||||
hero.gameObject:SetActive(true)
|
||||
|
||||
for k,v in ipairs(this.ratePreList) do
|
||||
v.go.gameObject:SetActive(false)
|
||||
end
|
||||
|
||||
-- table.sort(pool,function(a,b)
|
||||
-- return a.GetRate>b.GetRate
|
||||
-- end)
|
||||
local rateList={}
|
||||
local hero={tag="5星神将UP",name=config.ReadingName,value=num,Color=1}
|
||||
|
||||
--local aaa=ConfigManager.GetConfigData(ConfigName.WishActivityPool,2)
|
||||
--LogError("aaa==="..aaa.GetRate)
|
||||
for key, value in ConfigPairs(pool) do
|
||||
local id=value.ItemId[1]
|
||||
local itemConfig=ConfigManager.TryGetConfigData(ConfigName.ItemConfig,id)
|
||||
local data={tag=itemConfig.Name,name=value.ItemId[2],value=value.GetRate,Color=0}
|
||||
table.insert(rateList,data)
|
||||
end
|
||||
table.sort(rateList,function(a,b)
|
||||
return a.value>b.value
|
||||
end)
|
||||
table.insert(rateList,1,hero)
|
||||
for n,m in ipairs(rateList) do
|
||||
if not this.ratePreList[n] then
|
||||
this.ratePreList[n] = {}
|
||||
this.ratePreList[n].go = newObjToParent(this.pre,this.grid)
|
||||
this.ratePreList[n].star = Util.GetGameObject(this.ratePreList[n].go,"star"):GetComponent("Text")
|
||||
this.ratePreList[n].name = Util.GetGameObject(this.ratePreList[n].go,"name"):GetComponent("Text")
|
||||
this.ratePreList[n].rate = Util.GetGameObject(this.ratePreList[n].go,"rate"):GetComponent("Text")
|
||||
end
|
||||
this.ratePreList[n].go.gameObject:SetActive(true)
|
||||
this.ratePreList[n].star.text=m.tag
|
||||
if m.Color==1 then
|
||||
this.ratePreList[n].star.color=Color.New(0.67, 0.25,0.32, 1)
|
||||
this.ratePreList[n].name.color=Color.New(0.67, 0.25,0.32, 1)
|
||||
this.ratePreList[n].rate.color=Color.New(0.67, 0.25,0.32, 1)
|
||||
else
|
||||
this.ratePreList[n].star.color=Color.New(0.66, 0.62,0.54, 1)
|
||||
this.ratePreList[n].name.color=Color.New(0.66, 0.62,0.54, 1)
|
||||
this.ratePreList[n].rate.color=Color.New(0.66, 0.62,0.54, 1)
|
||||
end
|
||||
this.ratePreList[n].name.text=m.name
|
||||
this.ratePreList[n].rate.text=string.format("%.2f",(m.value/100000)*100).."%"
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
|
||||
|
||||
|
||||
function this:BuildRateData(actType,UpItem,upItemList)
|
||||
local rateList = {}
|
||||
local _upRateList = {}
|
||||
|
|
|
@ -17,8 +17,15 @@ function this.Initialize()
|
|||
Game.GlobalEvent:AddEvent(GameEvent.Player.OnLevelChange, this.OnLevelChange)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.HongMeng.HongMengGuide,this.HongMengGuideFun)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Practice.PracticeGuide,this.PracticeGuideFun)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.EndLess.GuidePanel,this.EndlessGuideFun)
|
||||
end
|
||||
this.IsFirstOpenHarmonyBei = false
|
||||
|
||||
function this.EndlessGuideFun()
|
||||
table.insert(_FuncGuideList, 102600)
|
||||
this.CheckFuncGuide()
|
||||
end
|
||||
|
||||
function this.HongMengGuideFun(OnOff)
|
||||
--鸿蒙碑开启引导
|
||||
print(Language[12186])
|
||||
|
@ -701,6 +708,7 @@ function this.RefreshTriggerListen(id, openType, openArgs)
|
|||
Game.GlobalEvent:AddEvent(GameEvent.UI.OnOpen, trigger)
|
||||
end
|
||||
end
|
||||
|
||||
--gm 用
|
||||
function this.AddFuncGuide(funcId)
|
||||
if not funcId then return end
|
||||
|
|
|
@ -77,7 +77,7 @@ function this.InitView(redId,id)
|
|||
if index>3 then
|
||||
index=4
|
||||
end
|
||||
this.title.sprite=Util.LoadSprite(RedPacketName[index])
|
||||
this.title.sprite = this.spLoader:LoadSprite(RedPacketName[index])
|
||||
LogError("BaseType=="..config.BaseType)
|
||||
if config.BaseType==1 then
|
||||
this.titleTip.text=GetLanguageStrById(config.SendWord)
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
----- 公会红包-抢红包 -----
|
||||
this={}
|
||||
local this={}
|
||||
local sortingOrder=0
|
||||
--红包资源名
|
||||
local RedPacketName={"g_ghhb_ming_01_zh","g_ghhb_ming_02_zh","g_ghhb_ming_03_zh","g_ghhb_ming_04_zh"}
|
||||
|
@ -141,7 +141,8 @@ function this:SetView(root,data)
|
|||
getInfo.gameObject:SetActive(true)
|
||||
getInfo.text=config.RuleDes
|
||||
end
|
||||
nameImage.sprite=Util.LoadSprite(RedPacketName[redType])
|
||||
|
||||
nameImage.sprite = this.spLoader:LoadSprite(RedPacketName[redType])
|
||||
fromPlayer.text=Language[11042]..data.userName.."</color>"
|
||||
|
||||
getBtn:GetComponent("Button").interactable=(config.Num-data.getCount)~=0 and data.isGet==0 --抢红包按钮开关
|
||||
|
|
|
@ -50,6 +50,12 @@ function this.RefreshItemData()
|
|||
this.SetTreasureState()
|
||||
CheckRedPointStatus(RedPointType.wujinTreasure)
|
||||
end
|
||||
|
||||
local count = BagManager.GetItemCountById(this.shiQiValue)
|
||||
if count > 0 and (not PlayerPrefs.HasKey("shiqiGuide"..PlayerManager.uid) or PlayerPrefs.GetInt("shiqiGuide"..PlayerManager.uid) == 0) then
|
||||
PlayerPrefs.SetInt("shiqiGuide"..PlayerManager.uid,1)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.EndLess.GuidePanel)
|
||||
end
|
||||
end
|
||||
|
||||
-- 在地图中更换编队后,更新上阵编队的最大血量值
|
||||
|
|
|
@ -404,9 +404,9 @@ function EndLessMapView:ShowHeroData()
|
|||
this.heroList[i].go.gameObject:SetActive(true)
|
||||
this.heroList[i].heroId = v.heroId
|
||||
local heroData = HeroManager.GetSingleHeroData(v.heroId)
|
||||
this.heroList[i].frame.sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality, heroData.star))
|
||||
this.heroList[i].frame.sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality, heroData.star))
|
||||
SetHeroIcon(this.spLoader,heroData,this.heroList[i].icon,heroData.heroConfig)
|
||||
this.heroList[i].pro.sprite=Util.LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
|
||||
this.heroList[i].pro.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
|
||||
this.heroList[i].lv.text=heroData.lv
|
||||
--spLoader, starGrid, star, type,_starSize,_scale,_pivot,rotation
|
||||
SetHeroStars(this.spLoader,this.heroList[i].star, heroData.star)
|
||||
|
|
|
@ -24,6 +24,7 @@ local redTrailType = {
|
|||
}
|
||||
--初始化组件(用于子类重写)
|
||||
function FourElementMonsterCampPanel:InitComponent()
|
||||
this.spLoader = SpriteLoader.New()
|
||||
this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform)
|
||||
|
||||
this.btnBack = Util.GetGameObject(self.gameObject, "InfoRoot/btnBack")
|
||||
|
@ -45,7 +46,7 @@ function FourElementMonsterCampPanel:InitComponent()
|
|||
this.addBtn = Util.GetGameObject(self.gameObject, "InfoRoot/bottomLayout/addBtn")
|
||||
this.btnRank = Util.GetGameObject(self.gameObject, "InfoRoot/btnRank")
|
||||
this.btnHelpFight = Util.GetGameObject(self.gameObject, "InfoRoot/btnHelpFight")
|
||||
this.btnHelpFight:GetComponent("Image").sprite = Util.LoadSprite("s_silingshilian_zhuzhananniu_zh")
|
||||
this.btnHelpFight:GetComponent("Image").sprite = this.spLoader:LoadSprite("s_silingshilian_zhuzhananniu_zh")
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
|
@ -182,6 +183,7 @@ end
|
|||
|
||||
--界面销毁时调用(用于子类重写)
|
||||
function FourElementMonsterCampPanel:OnDestroy()
|
||||
this.spLoader:Destroy()
|
||||
for k,v in pairs(this.singledataList) do
|
||||
v:OnDestroy()
|
||||
end
|
||||
|
|
|
@ -16,6 +16,7 @@ local redTrailType = {
|
|||
--初始化组件(用于子类重写)
|
||||
function MonsterCampMainPanel:InitComponent()
|
||||
orginLayer = 0
|
||||
this.spLoader = SpriteLoader.New()
|
||||
this.btnBack = Util.GetGameObject(self.gameObject, "btnBack")
|
||||
this.waveNum = Util.GetGameObject(self.gameObject, "Bg/waveImg/wave"):GetComponent("Text")
|
||||
this.nextWave = Util.GetGameObject(self.gameObject, "Bg/btnWave")
|
||||
|
@ -25,7 +26,7 @@ function MonsterCampMainPanel:InitComponent()
|
|||
table.insert(trails,Util.GetGameObject(self.gameObject, "Bg/SiLingDi/trail"..i))
|
||||
end
|
||||
this.btnShenYing = Util.GetGameObject(self.gameObject, "Bg/SiLingDi/shenyingPro")
|
||||
this.btnShenYing:GetComponent("Image").sprite = Util.LoadSprite("j_jianmushenshu_anniu_02_zh")
|
||||
this.btnShenYing:GetComponent("Image").sprite = this.spLoader:LoadSprite("j_jianmushenshu_anniu_02_zh")
|
||||
this.btnShenYingText = Util.GetGameObject(this.btnShenYing, "Text"):GetComponent("Text")
|
||||
this.shenYingProgressText = Util.GetGameObject(self.gameObject, "Bg/SiLingDi/progress/Text"):GetComponent("Text")
|
||||
this.shenYingProgressIma = Util.GetGameObject(self.gameObject, "Bg/SiLingDi/progress/Image"):GetComponent("Image")
|
||||
|
@ -128,7 +129,7 @@ function MonsterCampMainPanel:SetSingleTrailData(go,data)
|
|||
local curwave = Util.GetGameObject(go, "curwave"):GetComponent("Text")
|
||||
local canFightWave = Util.GetGameObject(go, "canFightWave"):GetComponent("Text")
|
||||
local openTime = Util.GetGameObject(go, "openTime"):GetComponent("Text")
|
||||
title.sprite = Util.LoadSprite(FourElementNameImage[data.fourElementType])
|
||||
title.sprite = this.spLoader:LoadSprite(FourElementNameImage[data.fourElementType])
|
||||
curwave.text = (data.monsterWave + 1).."层"
|
||||
if data.canFightTime >= campTowerSetting.TimesStoreMax then
|
||||
canFightWave.text = string.format("可挑战层数:<color=#%s>%s</color>","FE9C00",data.canFightTime)
|
||||
|
@ -158,6 +159,7 @@ end
|
|||
|
||||
--界面销毁时调用(用于子类重写)
|
||||
function MonsterCampMainPanel:OnDestroy()
|
||||
this.spLoader:Destroy()
|
||||
SubUIManager.Close(this.UpView)
|
||||
trails = {}
|
||||
for i = 1 ,#trails do
|
||||
|
|
|
@ -22,6 +22,7 @@ local callBack
|
|||
-- }
|
||||
--初始化组件(用于子类重写)
|
||||
function MonsterCampNewPanel:InitComponent()
|
||||
this.spLoader = SpriteLoader.New()
|
||||
this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform)
|
||||
|
||||
this.btnBack = Util.GetGameObject(self.gameObject, "InfoRoot/btnBack")
|
||||
|
@ -45,7 +46,7 @@ function MonsterCampNewPanel:InitComponent()
|
|||
this.addBtn = Util.GetGameObject(self.gameObject, "InfoRoot/bottomLayout/addBtn")
|
||||
this.btnRank = Util.GetGameObject(self.gameObject, "InfoRoot/btnRank")
|
||||
this.btnHelpFight = Util.GetGameObject(self.gameObject, "InfoRoot/btnHelpFight")
|
||||
this.btnHelpFight:GetComponent("Image").sprite = Util.LoadSprite("g_guanka_tongguanjiangli_zh")
|
||||
this.btnHelpFight:GetComponent("Image").sprite = this.spLoader:LoadSprite("g_guanka_tongguanjiangli_zh")
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
|
@ -106,15 +107,25 @@ function MonsterCampNewPanel:BindEvent()
|
|||
if BagManager.GetItemCountById(_itemId) < _costNum then
|
||||
PopupTipPanel.ShowTip(string.format(Language[10298], itemConfig[itemId].Name))
|
||||
else
|
||||
ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,storeDataId,moppingUpNum,function()
|
||||
PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.MONSTERCAMP_BUY_BATTLENUM, moppingUpNum)
|
||||
if moppingUpNum > 0 then
|
||||
ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,storeDataId,moppingUpNum,function()
|
||||
PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.MONSTERCAMP_BUY_BATTLENUM, moppingUpNum)
|
||||
NetManager.SweepDemonRequest(MonsterCampManager.monsterWave - 1,true,function(msg)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,msg.Drop,1,function()
|
||||
PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.MONSTERCAMP_BATTLENUM, MonsterCampManager.GetCanBattleCount() )
|
||||
this.UpdatePrivilage()
|
||||
end)
|
||||
end)
|
||||
end)
|
||||
else
|
||||
NetManager.SweepDemonRequest(MonsterCampManager.monsterWave - 1,true,function(msg)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,msg.Drop,1,function()
|
||||
PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.MONSTERCAMP_BATTLENUM, MonsterCampManager.GetCanBattleCount() )
|
||||
this.UpdatePrivilage()
|
||||
end)
|
||||
end)
|
||||
end)
|
||||
end
|
||||
|
||||
end
|
||||
end,"取消","确定")
|
||||
end)
|
||||
|
@ -194,6 +205,8 @@ function MonsterCampNewPanel:OnDestroy()
|
|||
end
|
||||
this.singledataList = {}
|
||||
SubUIManager.Close(this.scrollView)
|
||||
|
||||
this.spLoader:Destroy()
|
||||
end
|
||||
|
||||
return MonsterCampNewPanel
|
|
@ -311,7 +311,7 @@ function this.ShowBattleResultByFightLevelType(drop)
|
|||
local HardStageFightResponseMsg = FightLevelManager.GetHardStageFightResponseMsg()
|
||||
local oldBattlefightLevelData = FightLevelManager.GetcurBattlefightLevelData()
|
||||
local curBattlefightLevelData = FightLevelManager.GetChapterLevelData(oldBattlefightLevelData.config.Chapter,oldBattlefightLevelData.nodeId)
|
||||
LogYellow("山河社稷图战斗获得星级 "..HardStageFightResponseMsg.stars.." curBattlefightLevelData.isFirst "..tostring(curBattlefightLevelData.isFirst))
|
||||
LogYellow("山河社稷图战斗获得星级 "..HardStageFightResponseMsg.stars.." curBattlefightLevelData.isFirst "..tostring(curBattlefightLevelData.isFirst).." HardStageFightResponseMsg.currentIsHonour "..tostring(HardStageFightResponseMsg.currentIsHonour))
|
||||
-- if curBattlefightLevelData.isFirst then
|
||||
-- PopupTipPanel.ShowTip("荣耀三星!")
|
||||
-- end
|
||||
|
|
|
@ -315,10 +315,11 @@ function this.FightLevelShow()
|
|||
-- getStarImage:SetActive(FightLevelManager.GetCurLevelStarState(GetHardStageFightResponseMsg.stars,i))
|
||||
-- Util.GetGameObject(this.FightLevelStarGos[i], "Text"):GetComponent("Text").text = i
|
||||
-- end
|
||||
local HardStageFightResponseMsg = FightLevelManager.GetHardStageFightResponseMsg()
|
||||
local oldBattlefightLevelData = FightLevelManager.GetcurBattlefightLevelData()
|
||||
local curBattlefightLevelData = FightLevelManager.GetChapterLevelData(oldBattlefightLevelData.config.Chapter,oldBattlefightLevelData.nodeId)
|
||||
local condition = curBattlefightLevelData.config.ConditionValue
|
||||
this.isFirstEffect:SetActive(curBattlefightLevelData.isFirst)
|
||||
this.isFirstEffect:SetActive(HardStageFightResponseMsg.currentIsHonour)
|
||||
if starListEffect and #starListEffect > 0 then
|
||||
for i=1,#starListEffect do
|
||||
-- Util.AddParticleSortLayer(starListEffect[i], this.sortingOrder - (sortingOrder - 1))
|
||||
|
|
|
@ -29,7 +29,7 @@ function this:BindEvent()
|
|||
end)
|
||||
Util.AddClick(this.confirmBtn,function()
|
||||
NetManager.ChoiceHeroRewardRequest(args[1],currHeroId,function()
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Activity.ContinueRechargeRefresh,currHeroId)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Activity.TimeLimitUpHeroChange,currHeroId)
|
||||
parent:ClosePanel()
|
||||
end)
|
||||
|
||||
|
|
|
@ -38,7 +38,7 @@ function this:OnShow(_parent,...)
|
|||
local _args = {...}
|
||||
local data = _args[1]
|
||||
fun = _args[2]
|
||||
this.shengxingIma = Util.LoadSprite(data.title)
|
||||
this.shengxingIma = this.spLoader:LoadSprite(data.title)
|
||||
--itemList
|
||||
if data then
|
||||
for i = 1, math.max(#itemList, #data.itemList) do
|
||||
|
|
|
@ -207,8 +207,8 @@ function this.SetRankingInfo(isTop, isAnim)
|
|||
elseif sData.rankType == RANK_TYPE.FIGHTLEVEL_STAR then--山河社稷图星星
|
||||
dData = {rankInfo = {param1 = myRankData.param1},force = myRankData.param1}
|
||||
|
||||
-- elseif sData.rankType == RANK_TYPE.TASUILINGXIAO then--踏碎凌霄
|
||||
-- dData = {rankInfo = {param1 = myRankData.param1},force = myRankData.param1}
|
||||
elseif sData.rankType == RANK_TYPE.TASUILINGXIAO then--踏碎凌霄
|
||||
dData = {rankInfo = {param1 = myRankData.param1},force = myRankData.param1}
|
||||
end
|
||||
this.SetInfoShow(this.infoGo,dData,sData.rankType)
|
||||
--数据拆分
|
||||
|
@ -503,14 +503,14 @@ function this.SetInfoShow(go,data,rankType,Value0)
|
|||
end
|
||||
Util.GetGameObject(FightLeveStar,"Text"):GetComponent("Text").text = data.rankInfo.param1
|
||||
end
|
||||
-- elseif rankType == RANK_TYPE.TASUILINGXIAO then--踏碎凌霄排行
|
||||
-- if data.rankInfo.param1 and data.rankInfo.param1 > 0 then
|
||||
-- FightLeveStar:SetActive(true)
|
||||
-- if Value0 then
|
||||
-- Value0:GetComponent("Text").text = "<size=40%>"..data.userName.."</size>"
|
||||
-- end
|
||||
-- Util.GetGameObject(FightLeveStar,"Text"):GetComponent("Text").text = data.rankInfo.param1
|
||||
-- end
|
||||
elseif rankType == RANK_TYPE.TASUILINGXIAO then--踏碎凌霄排行
|
||||
if data.rankInfo.param1 and data.rankInfo.param1 > 0 then
|
||||
FightLeveStar:SetActive(true)
|
||||
if Value0 then
|
||||
Value0:GetComponent("Text").text = "<size=40%>"..data.userName.."</size>"
|
||||
end
|
||||
Util.GetGameObject(FightLeveStar,"Text"):GetComponent("Text").text = data.rankInfo.param1
|
||||
end
|
||||
end
|
||||
end
|
||||
return RankingSingleListPanel
|
||||
|
|
|
@ -53,6 +53,7 @@ function ShopBuyPopup:BindEvent()
|
|||
end
|
||||
|
||||
ShopManager.RequestBuyShopItem(this.shopType, this.shopItemId, count, function()
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Shop.RefreshItem)
|
||||
self:ClosePanel()
|
||||
end)
|
||||
end)
|
||||
|
|
|
@ -12,6 +12,7 @@ function TaSuiLingXiao:InitComponent()
|
|||
self.btnReward = Util.GetGameObject(self.gameObject, "btnReward")
|
||||
self.btnBack = Util.GetGameObject(self.gameObject, "btnBack")
|
||||
self.btnHelp = Util.GetGameObject(self.gameObject, "btnHelp")
|
||||
self.btnRank = Util.GetGameObject(self.gameObject, "btnRank")
|
||||
self.btnBox = Util.GetGameObject(self.gameObject, "progress/box")
|
||||
self.mid = Util.GetGameObject(self.gameObject, "mid")
|
||||
self.finishedText = Util.GetGameObject(self.mid, "FinishedText")
|
||||
|
@ -58,6 +59,9 @@ function TaSuiLingXiao:BindEvent()
|
|||
Util.AddClick(self.btnBack, function()
|
||||
self:ClosePanel()
|
||||
end)
|
||||
Util.AddClick(self.btnRank, function()
|
||||
UIManager.OpenPanel(UIName.RankingSingleListPanel, rankKingList[17])
|
||||
end)
|
||||
end
|
||||
--添加事件监听(用于子类重写)
|
||||
function TaSuiLingXiao:AddListener()
|
||||
|
|
|
@ -22,3 +22,5 @@ U3d=UnityEngine
|
|||
WWW = UnityEngine.WWW;
|
||||
GameEventHandler=GameLogic.GameEventHandler
|
||||
UpdateManager=GameLogic.UpdateManager
|
||||
|
||||
SpriteLoader = require("Modules.Common.SpriteLoader")
|
|
@ -183,7 +183,7 @@ end
|
|||
|
||||
--设置每条英雄数据
|
||||
function MonsterCampSingleWave:SingleHeroDataShow(monConfig,heroData)
|
||||
self.frame.sprite=Util.LoadSprite(GetHeroCardStarBg[monConfig.Star])
|
||||
self.frame.sprite=self.spLoader:LoadSprite(GetHeroCardStarBg[monConfig.Star])
|
||||
local liveName = GetResourcePath(heroData.Live)
|
||||
local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, heroData.Id)
|
||||
local scale = roleConfig.play_liveScale
|
||||
|
@ -193,7 +193,7 @@ function MonsterCampSingleWave:SingleHeroDataShow(monConfig,heroData)
|
|||
self.icon.transform.localPosition = Vector3.zero
|
||||
self.lv.text = monConfig.Level
|
||||
self.pro.sprite= self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName))
|
||||
--self.icon.sprite = Util.LoadSprite(heroData.painting)
|
||||
--self.icon.sprite = self.spLoader:LoadSprite(heroData.painting)
|
||||
SetCardStars(self.starGrid,monConfig.Star)
|
||||
self.fg.sprite = self.spLoader:LoadSprite(GetHeroCardStarFg[monConfig.Star])
|
||||
self.name.text = heroData.ReadingName
|
||||
|
@ -226,7 +226,7 @@ function MonsterCampSingleWave:SetIcon()
|
|||
local color = BagManager.GetItemCountById(self.itemId) < self.costNum and "E71515" or "17232A"
|
||||
self.fightBtnNum.text =string.format("<color=#%s>%s</color>",color,self.costNum)
|
||||
self.fightBtnText.text = string.format("<color=#%s>%s</color>",color,"扫荡")
|
||||
self.fightBtnIcon.sprite = Util.LoadSprite(GetResourcePath(itemConfig[self.itemId].ResourceID))
|
||||
self.fightBtnIcon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[self.itemId].ResourceID))
|
||||
if self.buyTimes < 1 then
|
||||
Util.SetGray(self.fight,true)
|
||||
end
|
||||
|
|
|
@ -113,6 +113,22 @@ function ShopViewNew:BindEvent()
|
|||
end)
|
||||
end
|
||||
|
||||
local RefreshData = function(self)
|
||||
self:RefreshItemList(false)
|
||||
end
|
||||
|
||||
--添加事件监听(用于子类重写)
|
||||
function ShopViewNew:AddListener()
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Shop.RefreshItem,RefreshData,self)
|
||||
end
|
||||
|
||||
--移除事件监听(用于子类重写)
|
||||
function ShopViewNew:RemoveListener()
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Shop.RefreshItem,RefreshData,self)
|
||||
end
|
||||
|
||||
|
||||
|
||||
--界面打开时调用(用于子类重写)
|
||||
function ShopViewNew:OnOpen(_activityConfig,_index,parent)
|
||||
self.actConfig = _activityConfig
|
||||
|
|