Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
After Width: | Height: | Size: 16 KiB |
|
|
@ -0,0 +1,99 @@
|
|||
fileFormatVersion: 2
|
||||
guid: a5bc6f9d00ea5f04b99c0c1f0a4cacdc
|
||||
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
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 42e42e2589898a64ab3cd53c8ae79aa0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: ActivityAltas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
|||
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: []
|
||||
|
|
|
|||
|
After Width: | Height: | Size: 28 KiB |
|
|
@ -0,0 +1,99 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 8d9c0742b222b5449a67df2db8c601fe
|
||||
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
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 2930b2f1df34c054d8d17e469cb84984
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: MainAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
|||
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: []
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
|
|
@ -57,3 +57,5 @@ MonoBehaviour:
|
|||
compressType: 1
|
||||
- asset: {fileID: 102900000, guid: ddfa1c1ffb0ca1e4db51985fcba257e4, type: 3}
|
||||
compressType: 1
|
||||
- asset: {fileID: 102900000, guid: 3b6575c2eea8cfe418e6ba16cddf2d9f, type: 3}
|
||||
compressType: 1
|
||||
|
|
|
|||
|
After Width: | Height: | Size: 110 KiB |
|
|
@ -0,0 +1,121 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e60b5434c52b39a44b87d8380db4e99a
|
||||
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
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 51eb9917bc062c048af5fe0f32f1c384
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
After Width: | Height: | Size: 109 KiB |
|
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 2089feb0ed3ce114d8f15d8e8f571d58
|
||||
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: ea59f6e5a77af844485f8c4679a081c7
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 48 KiB |
|
Before Width: | Height: | Size: 155 KiB After Width: | Height: | Size: 162 KiB |
|
After Width: | Height: | Size: 64 KiB |
|
|
@ -0,0 +1,121 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 1060f87894956ed4f94d2cfcc3f673e8
|
||||
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
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: bafc6ab543a5d1f4db8c49cdc7b76876
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 900 KiB |
|
|
@ -60,6 +60,8 @@ function PackageManager.SetVideo(obj,Image)
|
|||
end
|
||||
|
||||
function PackageManager.UnloadVideo()
|
||||
Log("卸载视频:"..tostring(this.config.VideoName))
|
||||
resMgr:UnLoadAsset(this.config.VideoName)
|
||||
if this.config.VideoName then
|
||||
Log("卸载视频:"..tostring(this.config.VideoName))
|
||||
resMgr:UnLoadAsset(this.config.VideoName)
|
||||
end
|
||||
end
|
||||
|
|
@ -370,6 +370,7 @@ function this.FriendItemAdapter(node, data)
|
|||
titlePar:SetActive(true)
|
||||
if not titleList[node] then
|
||||
titleList[node] = SubUIManager.Open(SubUIConfig.PlayerTitle, titlePar.transform)
|
||||
titleList[node]:RemoveCanvas()
|
||||
end
|
||||
titleList[node]:SetShow(title, Vector3.zero, 0.4, 0.4, this.sortingOrder)
|
||||
else
|
||||
|
|
@ -541,6 +542,7 @@ function this.ChatItemAdapter(node, data, isShowTime)
|
|||
titlePar:SetActive(true)
|
||||
if not titleList[node] then
|
||||
titleList[node] = SubUIManager.Open(SubUIConfig.PlayerTitle, titlePar.transform)
|
||||
titleList[node]:RemoveCanvas()
|
||||
end
|
||||
titleList[node]:SetShow(title, Vector3.zero, 0.4, 0.4, this.sortingOrder)
|
||||
else
|
||||
|
|
|
|||
|
|
@ -52,9 +52,11 @@ end
|
|||
|
||||
function this.CheckRedPoint()
|
||||
local dailyActInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.DailyRecharge)
|
||||
for i = 1, #dailyActInfo.mission do
|
||||
if this.ReceivedEnabled(dailyActInfo.mission[i].missionId) and dailyActInfo.mission[i].state == 0 then
|
||||
return true
|
||||
if dailyActInfo then
|
||||
for i = 1, #dailyActInfo.mission do
|
||||
if this.ReceivedEnabled(dailyActInfo.mission[i].missionId) and dailyActInfo.mission[i].state == 0 then
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
return false
|
||||
|
|
|
|||
|
|
@ -160,7 +160,7 @@ function DailyRechargePanel:OnDestroy()
|
|||
end
|
||||
|
||||
local icon = {
|
||||
[0] = "r_mrcz_zi_11",
|
||||
[0] = "r_mrcz_zi_111_zh",
|
||||
[1] = "r_mrcz_zi_33_zh",
|
||||
}
|
||||
|
||||
|
|
@ -191,15 +191,14 @@ function DailyRechargePanel:RefreshPanel()
|
|||
self.extraTip.text = missionIndex[index].tipText
|
||||
self.dealText.text = Language[10420]
|
||||
self.moneyNum.gameObject:SetActive(true)
|
||||
self.moneyNum:SetNumShow(1,actRewardConfig1.Values[1][1])
|
||||
local dailyActInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.DailyRecharge)
|
||||
self.moneyNum:SetNumShow(1,(actRewardConfig1.Values[1][1] - dailyActInfo.value))
|
||||
end
|
||||
else
|
||||
self.extraIcon.sprite = self.spLoader:LoadSprite(icon[0])
|
||||
self.extraTip.gameObject:SetActive(true)
|
||||
self.extraTip.text = missionIndex[index].tipText
|
||||
self.extraIcon.sprite = self.spLoader:LoadSprite(icon[1])
|
||||
self.extraTip.gameObject:SetActive(false)
|
||||
self.dealText.text = Language[10101]
|
||||
self.moneyNum.gameObject:SetActive(true)
|
||||
self.moneyNum:SetNumShow(1,actRewardConfig1.Values[1][1])
|
||||
self.moneyNum.gameObject:SetActive(false)
|
||||
end
|
||||
self.extraIcon:SetNativeSize()
|
||||
table.walk(self.rewardList, function(rewardPosItem)
|
||||
|
|
|
|||
|
|
@ -102,7 +102,6 @@ end
|
|||
|
||||
-- 登录初始化地图数据
|
||||
function this.InitMapInfoData(mapId)
|
||||
-- --LogGreen("mapId:"..mapId)
|
||||
this.openMapId = mapId > 1 and mapId or 4001-- 开放的地图ID
|
||||
end
|
||||
-- ================================== 妖灵师状态刷新 ========================================
|
||||
|
|
@ -261,9 +260,7 @@ function this.InitAllEndlessHero(heroList,isClear)
|
|||
this.InitSingleEndlessHero(heroList[i])
|
||||
end
|
||||
local id ,lv = this.GetShiQiValue()
|
||||
-- --LogGreen("lv:"..lv)
|
||||
this.moraleLv = lv
|
||||
-- --LogGreen("this.moraleLv:"..this.moraleLv)
|
||||
this.moraleId = id
|
||||
end
|
||||
|
||||
|
|
@ -481,7 +478,7 @@ function this.SetHeroFormationList(heroDid,teamId,isAddOrDel)
|
|||
end
|
||||
|
||||
function this.GetSingleCanUseHeroData(heroDid)
|
||||
if not this.canUseHeroDatas then
|
||||
if not this.canUseHeroDatas or LengthOfTable(this.canUseHeroDatas) < 1 then
|
||||
this.GetCanUseHeroDatas()
|
||||
end
|
||||
if this.canUseHeroDatas[heroDid] then
|
||||
|
|
@ -515,15 +512,12 @@ function this.GetCanUseHeroDatas()
|
|||
end
|
||||
|
||||
function this.SetCanUseHeroNew()
|
||||
LogGreen("111:")
|
||||
if not this.canUseHeroDatas then
|
||||
if not this.canUseHeroDatas or LengthOfTable(this.canUseHeroDatas) < 1 then
|
||||
this.GetCanUseHeroDatas()
|
||||
end
|
||||
LogGreen("222:")
|
||||
for k,v in pairs(this.canUseHeroDatas) do
|
||||
PlayerPrefs.SetInt("endlessCanUseHero"..PlayerManager.uid..v.dynamicId,0)
|
||||
v.isNew = 0
|
||||
LogGreen("v.isNew:"..v.isNew)
|
||||
end
|
||||
CheckRedPointStatus(RedPointType.wujinBianDui)
|
||||
CheckRedPointStatus(RedPointType.EndlessPanel)
|
||||
|
|
@ -610,7 +604,6 @@ function this.GetHeroLeftBlood(heroId)
|
|||
if this.allHeroBlood[heroId] then
|
||||
return this.allHeroBlood[heroId].curHp
|
||||
else
|
||||
Log("神将血量值不存在,默认是满血")
|
||||
local allProp = HeroManager.CalculateWarAllProVal(heroId)
|
||||
return allProp[3]
|
||||
end
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@ function this:InitComponent()
|
|||
this.leftUp = Util.GetGameObject(self.gameObject, "leftUp")
|
||||
this.leftDown = Util.GetGameObject(self.gameObject, "leftDown")
|
||||
this.fireRoot = Util.GetGameObject(self.gameObject, "fireRoot")
|
||||
this.helpBtn = Util.GetGameObject(self.gameObject, "helpBtn")
|
||||
|
||||
this.leftCenter = Util.GetGameObject(self.gameObject, "leftCenter")
|
||||
this.btnRank = Util.GetGameObject(this.leftCenter,"btnRank")
|
||||
|
|
@ -37,6 +36,9 @@ function this:InitComponent()
|
|||
this.rightUp = Util.GetGameObject(self.gameObject, "rightUp")
|
||||
this.btnSetting = Util.GetGameObject(this.rightUp,"btnSetting")
|
||||
this.btnSetting.gameObject:SetActive(true)
|
||||
this.btnRightUpShop = Util.GetGameObject(this.leftCenter,"btnShop")
|
||||
this.helpBtn = Util.GetGameObject(self.gameObject, "helpBtn")
|
||||
this.helpPos = this.helpBtn:GetComponent("RectTransform").localPosition
|
||||
|
||||
this.rightDown = Util.GetGameObject(self.gameObject, "rightDown")
|
||||
this.btnAchive = Util.GetGameObject(this.rightDown,"btnAchive")
|
||||
|
|
@ -156,6 +158,20 @@ function this:BindEvent()
|
|||
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.WuJinSetting)
|
||||
end
|
||||
end)
|
||||
Util.AddClick(this.btnRightUpShop,function()
|
||||
JumpManager.GoJump(760001)
|
||||
end)
|
||||
Util.AddClick(this.helpBtn, function()
|
||||
if ctrlView.GetCallListCount() > 1 then
|
||||
PopupTipPanel.ShowTip(Language[11259])
|
||||
return
|
||||
end
|
||||
if CarbonManager.carbonType == CARBON_TYPE.TRIAL then
|
||||
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.Sunro,this.helpPos.x,this.helpPos.y)
|
||||
else
|
||||
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.EndLessMap,this.helpPos.x,this.helpPos.y)
|
||||
end
|
||||
end)
|
||||
--missionView.BindEvent()
|
||||
trialPanel:BindEvent()
|
||||
endLessMapView:BindEvent()
|
||||
|
|
@ -247,8 +263,9 @@ end
|
|||
function this:SetActiveGameObj()
|
||||
local isShow = MapManager.curCarbonType == CarBonTypeId.TRIAL
|
||||
LogGreen("MapManager.curCarbonType:"..MapManager.curCarbonType)
|
||||
this.helpBtn.gameObject:SetActive(isShow)
|
||||
this.helpBtn.gameObject:SetActive(true)
|
||||
this.leftUp.gameObject:SetActive(isShow)
|
||||
this.btnRightUpShop.gameObject:SetActive(not isShow)
|
||||
this.btnRank.gameObject:SetActive(isShow)
|
||||
this.btnReward.gameObject:SetActive(isShow)
|
||||
this.shiQi.gameObject:SetActive(not isShow)
|
||||
|
|
|
|||
|
|
@ -62,8 +62,8 @@ function TrialMapPanel:InitComponent(root, mapPanel)
|
|||
this.s_pre=Util.GetGameObject(this.selectHero,"pre")
|
||||
|
||||
this.upView = SubUIManager.Open(SubUIConfig.UpView, root.transform, { showType = UpViewOpenType.ShowLeft })
|
||||
this.helpBtn=Util.GetGameObject(root,"helpBtn")
|
||||
this.helpPos=this.helpBtn:GetComponent("RectTransform").localPosition
|
||||
-- this.helpBtn=Util.GetGameObject(root,"helpBtn")
|
||||
-- this.helpPos=this.helpBtn:GetComponent("RectTransform").localPosition
|
||||
--boss召唤特效
|
||||
this.bossEffect = Util.GetGameObject(root, "UI_effect_shilian_tab")
|
||||
this.energyRoot = Util.GetGameObject(root, "stepROot")
|
||||
|
|
@ -121,13 +121,13 @@ function TrialMapPanel:BindEvent()
|
|||
end)
|
||||
|
||||
--帮助按钮
|
||||
Util.AddClick(this.helpBtn,function()
|
||||
if ctrlView.GetCallListCount() > 1 then
|
||||
PopupTipPanel.ShowTip(Language[11259])
|
||||
return
|
||||
end
|
||||
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.Sunro,this.helpPos.x,this.helpPos.y)
|
||||
end)
|
||||
-- Util.AddClick(this.helpBtn,function()
|
||||
-- if ctrlView.GetCallListCount() > 1 then
|
||||
-- PopupTipPanel.ShowTip(Language[11259])
|
||||
-- return
|
||||
-- end
|
||||
-- UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.Sunro,this.helpPos.x,this.helpPos.y)
|
||||
-- end)
|
||||
end
|
||||
|
||||
--添加事件监听(用于子类重写)
|
||||
|
|
|
|||
|
|
@ -318,12 +318,12 @@ end
|
|||
|
||||
|
||||
function EndLessMapView:OnOpen()
|
||||
LogError("EndLessMapView:OnOpen")
|
||||
-- 初始化组件显示
|
||||
this:InitCompShow(CarbonManager.difficulty)
|
||||
if not this:IsEndLessMap() then return end
|
||||
local serData = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.ENDLESS)
|
||||
PlayerPrefs.SetInt("WuJin"..PlayerManager.uid,serData.endTime)
|
||||
CheckRedPointStatus(RedPointType.EndlessPanel)
|
||||
-- 初始化各种标志的状态
|
||||
this:InitBoolState()
|
||||
-- 开始探索请求
|
||||
|
|
@ -335,8 +335,6 @@ function EndLessMapView:OnOpen()
|
|||
this:InitCostValue()
|
||||
this:RefreshEnergyValue(true, 0)
|
||||
this:RefreshEnergyShow()
|
||||
Util.GetGameObject(MapPanel.gameObject, "centerDown/selectHero"):SetActive(false)
|
||||
this.helpBtn:SetActive(false)
|
||||
-- 检测引导
|
||||
GuideManager.CheckCarbonGuild(CARBON_TYPE.ENDLESS)
|
||||
|
||||
|
|
|
|||
|
|
@ -56,8 +56,10 @@ end
|
|||
function StoryMapPanel:BindEvent()
|
||||
Util.AddClick(this.btnSkip, function ()
|
||||
--StoryMapManager.GetSingleStoryConfig()
|
||||
isSkip = true
|
||||
this:StackPop()
|
||||
MsgPanel.ShowTwo("是否跳过这段剧情?",function() end,function()
|
||||
isSkip = true
|
||||
this:StackPop()
|
||||
end,"取消","确认")
|
||||
end)
|
||||
Util.AddClick(this.btnGoOn, function ()
|
||||
this:ShowDialog()
|
||||
|
|
@ -155,6 +157,7 @@ function StoryMapPanel:OnShow()
|
|||
end
|
||||
table.insert(this.triggerEvent,event)
|
||||
end
|
||||
isSkip = false
|
||||
this.callList:Clear()
|
||||
for i = #this.triggerEvent,1,-1 do
|
||||
this.callList:Push(function()
|
||||
|
|
@ -185,22 +188,32 @@ local pos = {
|
|||
|
||||
function this:CheckTrigger(data,go)
|
||||
if isSkip then
|
||||
--LogGreen("data.eventType:"..tostring(data.eventType).." this.curEvent.eventType:"..tostring(this.curEvent.eventType))
|
||||
if (data.eventType == this.curEvent.eventType) then--(data.eventType ~= 3 and data.eventType ~= 1 and data.eventType ~= 2 and data.eventType ~= 10) or (data.eventType == this.curEvent.eventType) then
|
||||
this:CloseDiaLog()
|
||||
-- --LogGreen("data.eventType:"..tostring(data.eventType).." this.curEvent.eventType:"..tostring(this.curEvent.eventType))
|
||||
-- if (data.eventType == this.curEvent.eventType) then--(data.eventType ~= 3 and data.eventType ~= 1 and data.eventType ~= 2 and data.eventType ~= 10) or (data.eventType == this.curEvent.eventType) then
|
||||
-- this:CloseDiaLog()
|
||||
-- this:StackPop()
|
||||
-- return
|
||||
-- end
|
||||
-- if this.curEvent.eventType == 2 then
|
||||
-- for k,v in pairs(this.PlayerGrouops) do
|
||||
-- v:StopAction()
|
||||
-- end
|
||||
-- end
|
||||
if data.eventType ~= 3 then
|
||||
this:StackPop()
|
||||
return
|
||||
end
|
||||
if this.curEvent.eventType == 2 then
|
||||
for k,v in pairs(this.PlayerGrouops) do
|
||||
v:StopAction()
|
||||
end
|
||||
end
|
||||
if this.curEvent.eventType == 1 then
|
||||
this:CloseDiaLog()
|
||||
end
|
||||
isSkip = false
|
||||
-- MsgPanel.ShowTwo("是否跳过这段剧情?",function() end,function()
|
||||
-- if this.callList:Count() > 0 then
|
||||
-- this.callList:Clear()
|
||||
-- end
|
||||
-- StoryMapManager.GetSingleStoryConfig()
|
||||
-- return
|
||||
-- end,"取消","确认")
|
||||
-- MsgPanel.ShowTwo("是否跳过整段剧情?",function() end,function()
|
||||
-- this:ClosePanel()
|
||||
-- end,"取消","确认")
|
||||
end
|
||||
isSkip = false
|
||||
this.go = go
|
||||
this.curEvent = data
|
||||
if data.eventType == 1 then -- 1 对话 2跑图 3假战斗
|
||||
|
|
|
|||
|
|
@ -160,6 +160,7 @@ function SingleFightPlayerView:SetData(u,v,isSelf,data)
|
|||
scale = NameManager.roleSex == ROLE_SEX.BOY and 1 or 0.5
|
||||
self.userId = PlayerManager.uid
|
||||
self.playerLiveView = PlayerLiveView:New(self.roleRoot,1,nil)
|
||||
self.playerLiveView:RemoveTitleCanvas()
|
||||
self.nameDi.gameObject:SetActive(false)
|
||||
--如果修行开启设置修行标识
|
||||
if ActTimeCtrlManager.SingleFuncState(108) then
|
||||
|
|
@ -176,6 +177,7 @@ function SingleFightPlayerView:SetData(u,v,isSelf,data)
|
|||
ride = data.userMount,
|
||||
designation = data.userTitle,
|
||||
})
|
||||
self.playerLiveView:RemoveTitleCanvas()
|
||||
if data.userMount == 0 then
|
||||
self.nameDi.transform.localPosition = namePos[1].pos
|
||||
else
|
||||
|
|
|
|||