Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
jiaoyangna 2020-08-25 11:22:05 +08:00
commit 8fb4e8cf13
30 changed files with 9667 additions and 8717 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 9ce6d53162abd5645ac7a2d1eba5815f
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: ade6812b04d5db74cbd81890bb47e418
vertices: []
indices:
edges: []
weights: []
spritePackingTag: PublicAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 292 KiB

After

Width:  |  Height:  |  Size: 348 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 677 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 278 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 252 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 68 KiB

View File

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

View File

@ -4812,7 +4812,7 @@ MonoBehaviour:
m_Interactable: 1
m_TargetGraphic: {fileID: 1288297354386789918}
m_TextComponent: {fileID: 1288297354386789918}
m_Placeholder: {fileID: 0}
m_Placeholder: {fileID: 3293787382343120790}
m_ContentType: 0
m_InputType: 0
m_AsteriskChar: 42

View File

@ -4931,7 +4931,7 @@ RectTransform:
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: 20, y: -123}
m_AnchoredPosition: {x: 18.5, y: -114}
m_SizeDelta: {x: 243.6, y: 108.1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6453296698771621430
@ -5179,7 +5179,7 @@ RectTransform:
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: 20, y: 23}
m_AnchoredPosition: {x: 14.5, y: 32}
m_SizeDelta: {x: 236.4, y: 104.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5647365335010519741

View File

@ -9024,7 +9024,7 @@ ParticleSystem:
--- !u!199 &3612650515471756776
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -15958,7 +15958,7 @@ ParticleSystem:
--- !u!199 &2077135144819501974
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -21521,7 +21521,7 @@ ParticleSystem:
--- !u!199 &5382233283546536858
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -29548,7 +29548,7 @@ ParticleSystem:
--- !u!199 &7853653569377049714
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -35524,7 +35524,7 @@ ParticleSystem:
--- !u!199 &4678487443364567018
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -41036,7 +41036,7 @@ ParticleSystem:
--- !u!199 &3301434479282110283
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -47077,7 +47077,7 @@ ParticleSystem:
--- !u!199 &8426323061574149814
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -52296,7 +52296,7 @@ ParticleSystem:
--- !u!199 &3988090302360095373
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -57881,7 +57881,7 @@ ParticleSystem:
--- !u!199 &5461926455895321923
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -63005,7 +63005,7 @@ ParticleSystem:
--- !u!199 &6960492284779320589
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -69400,7 +69400,7 @@ ParticleSystem:
--- !u!199 &4261467272199160834
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -73974,7 +73974,7 @@ RectTransform:
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: -300, y: -507}
m_AnchoredPosition: {x: -296.8, y: -508.8}
m_SizeDelta: {x: 1765, y: 924}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5804918802543886501
@ -78914,7 +78914,7 @@ ParticleSystem:
--- !u!199 &6383407699291000078
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -85056,7 +85056,7 @@ ParticleSystem:
--- !u!199 &1706209193022837301
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -91703,7 +91703,7 @@ ParticleSystem:
--- !u!199 &8234207848460451360
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -96615,7 +96615,7 @@ ParticleSystem:
--- !u!199 &3615746855071839570
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

View File

@ -1540,7 +1540,7 @@ RectTransform:
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: 1.9998016, y: 22.000002}
m_AnchoredPosition: {x: 1.9998016, y: 11.999023}
m_SizeDelta: {x: 265.87, y: 128.64}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222127981596146426
@ -1679,7 +1679,7 @@ RectTransform:
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: -194, y: 22.00097}
m_AnchoredPosition: {x: -194, y: 12}
m_SizeDelta: {x: 265.87, y: 128.64}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222489949350275454
@ -2268,7 +2268,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 796, y: 97.725}
m_SizeDelta: {x: 796, y: 127}
m_Pivot: {x: 0.4225862, y: 0.17486048}
--- !u!1 &1332321718721906
GameObject:
@ -3807,7 +3807,7 @@ RectTransform:
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: 6, y: 22.000002}
m_AnchoredPosition: {x: 6, y: 8.999001}
m_SizeDelta: {x: 265.87, y: 128.64}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222639004779027372
@ -4023,7 +4023,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 398, y: -35.249027}
m_AnchoredPosition: {x: 398, y: -45.250008}
m_SizeDelta: {x: 160, y: 35.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222583352632964838
@ -4316,7 +4316,7 @@ RectTransform:
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: 2, y: 22.000002}
m_AnchoredPosition: {x: 2, y: 11.999023}
m_SizeDelta: {x: 265.87, y: 128.64}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222722682876742258
@ -6133,7 +6133,7 @@ RectTransform:
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: -194, y: 22.00097}
m_AnchoredPosition: {x: -194, y: 9}
m_SizeDelta: {x: 265.87, y: 128.64}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5280409515082408684
@ -7031,7 +7031,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 257.28998, y: -22.253325}
m_AnchoredPosition: {x: 257.28998, y: -22.253326}
m_SizeDelta: {x: 540, y: 30}
m_Pivot: {x: 0.44683328, y: 0.35822254}
--- !u!222 &5279464545680109242
@ -10821,7 +10821,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 796, y: 97.725}
m_SizeDelta: {x: 796, y: 127}
m_Pivot: {x: 0.4225862, y: 0.17486048}
--- !u!1 &5356915432497729598
GameObject:

View File

@ -446,6 +446,7 @@ function this.ShowBattleResult(result, msg)
end
this:ClosePanel()
Game.GlobalEvent:DispatchEvent(GameEvent.Guild.RefreshGuildTranscripQuickBtn)
Game.GlobalEvent:DispatchEvent(GameEvent.Guild.RefreshGuildTranscript)
GuildTranscriptManager.IsKillShowTip()
end, 6,true,true)
end)

View File

@ -7,6 +7,9 @@ local curSelectHero = {}
local curSelectHeroConfig = {}
local heroSelectBtn = {}
local heroDatas
local t
local replaceItemIdConfig = ConfigManager.GetConfigData(ConfigName.SpecialConfig,68)
local replaceCostConfig = ConfigManager.GetConfigData(ConfigName.SpecialConfig,69)
local HeroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig)
@ -45,7 +48,12 @@ end
function this:BindEvent()
--置换
Util.AddClick(this.replaceBtn,function()
if not not curSelectHero.id then
if not curSelectHero.id then
PopupTipPanel.ShowTip("请选择想要置换的神将!")
elseif curSelectHero.id and (t>BagManager.GetTotalItemNum(tonumber(replaceItemIdConfig.Value))) then
PopupTipPanel.ShowTip("置换玉不足!")
else
NetManager.SaveHeroChangeRequest(curSelectHero.dynamicId,function (msg)
HeroManager.ResetHeroChangeId(curSelectHero.dynamicId,msg.heroTempId)--改变英雄changeId
@ -63,8 +71,6 @@ function this:BindEvent()
local value = this.RebuildData(msg.heroTempId,curSelectHero)
this.SetHero(this.replaceHero,value)
end)
else
PopupTipPanel.ShowTip("请选择想要置换的神将!")
end
end)
--取消
@ -403,14 +409,11 @@ function this.SetBtnSelect(_parObj)
end
function this.ShowCostInfo()
local replaceItemIdConfig = ConfigManager.GetConfigData(ConfigName.SpecialConfig,68)
local replaceCostConfig = ConfigManager.GetConfigData(ConfigName.SpecialConfig,69)
if replaceItemIdConfig then
this.costImage:GetComponent("Image").sprite = SetIcon(tonumber(replaceItemIdConfig.Value))
end
if curSelectHero and replaceCostConfig then
local t
local getCostByStar = string.split(replaceCostConfig.Value,"|")
if curSelectHero.star == 4 then
t = tonumber(string.split(getCostByStar[1],"#")[2])

View File

@ -144,6 +144,8 @@ function GuildMainCityPanel:InitComponent()
end
end
end
--副本立绘
this.btntranscriptLive = Util.GetGameObject(self.gameObject, "Bg/btntranscript/live2d")
end
--绑定事件(用于子类重写)
@ -302,7 +304,9 @@ function GuildMainCityPanel:OnShow()
if not RECHARGEABLE then--(是否开启充值)
this.btnRedPacket:SetActive(false)
end
this.LiveName = "live2d_huyao"
this.LiveGO = poolManager:LoadLive(this.LiveName, this.btntranscriptLive.transform,
Vector3.one * 0.15, Vector3.New(0,0,0))
end
@ -581,6 +585,9 @@ function GuildMainCityPanel:OnDestroy()
ClearRedPointObject(RedPointType.VipPrivilege, this.vipRedPoint)
this.playerHead = nil
poolManager:UnLoadLive(this.LiveName,this.LiveGO )
this.LiveName= nil
end
return GuildMainCityPanel

View File

@ -167,7 +167,7 @@ function GuildTranscriptMainPopup:BindEvent()
local minute = math.floor(second / 60) % 60
local sec = math.floor(second % 60)
local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600)
local timeStr = string.format("%s时%s分%s秒", hour, minute, sec)
local timeStr = string.format("%s分%s秒", minute, sec)
PopupTipPanel.ShowTip(string.format("%s后才可再次使用此功能",timeStr))
end
end)
@ -502,7 +502,7 @@ function this.TimeStampToDateString(second)
local minute = math.floor(second / 60) % 60
local sec = math.floor( second % 60)
local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600)
return string.format("(%s:%s:后失效)", minute, sec)
return string.format("(%s:%s:%s:后失效)",hour, minute, sec)
end
function this.SetSelectImagePos(parent)

View File

@ -39,11 +39,11 @@ local attackTypeShotTime
function this.GuildChallengeRequest(attackType,callBack)
attackTypeShotTime = attackType
if attackType == 0 then
canSweep = 1
NetManager.GuildChallengeRequest(this.GetCurBoss(),attackType,function (msg)
local fightData = BattleManager.GetBattleServerData(msg)
this.damage = msg.damage
this.drop = msg.drop
canSweep = 1
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.GuildTranscript, callBack)
CheckRedPointStatus(RedPointType.Guild_Transcript)
end)
@ -65,7 +65,6 @@ function this.RefreshGuildTranscriptInfo(msg)
-- LogGreen("msg.curBoss "..msg.curBoss.." msg.blood "..msg.blood.." msg.isKill "..msg.isKill)
curBoss = msg.curBoss--当前bossId
blood = msg.blood--剩余血量万分比
-- canSweep = msg.canSweep--是否能扫荡今天是否挑战过这个boss
isKill = msg.isKill--是否击杀
isKillShowTip = false
if msg.isKill == 1 then

View File

@ -8,7 +8,7 @@ this.LoginWay = { Account = 0, WeChat = 1 }
local ServerVersion = 1
local IsSDKLogin = AppConst.isSDK and AppConst.isSDKLogin
local IsDevelopLogin = true
local IsDevelopLogin = false
local openIdkey = "openIdkey"
local openIdPw = "openIdPw"

View File

@ -31,11 +31,7 @@ function MissionDailyTipPanel:BindEvent()
PopupTipPanel.ShowTip(Language[11347])
return
end
if showType == 4 then
UIManager.OpenPanel(UIName.MissionDailyPanel,2)
else
UIManager.OpenPanel(UIName.MissionDailyPanel,showType)
end
UIManager.OpenPanel(UIName.MissionDailyPanel,showType == 1 and 1 or 4)
self:ClosePanel()
end)
end

View File

@ -89,6 +89,7 @@ end
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
function MissionDailyPanel:OnShow()
this.TabCtrl:SetTabAdapter(this.TabAdapter)
if (not ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody)) and index ~=1 then index = 2 end
this.TabCtrl:SetChangeTabCallBack(this.SwitchView)
this.TabCtrl:Init(this.tabBox, _TabData, index)
redPointList = {}

View File

@ -323,7 +323,7 @@ function this.RegisterRedCheckFunc()
RPData:AddCheckFunc(RedPointType.CumulativeSignIn,OperatingManager.GetSignInRedPointStatus)
--月卡
--24暂时关闭放开这里就行
-- RPData:AddCheckFunc(RedPointType.MonthCard,OperatingManager.AllRefreshMonthCardRedPoint)
RPData:AddCheckFunc(RedPointType.MonthCard,OperatingManager.AllRefreshMonthCardRedPoint)
--连续充值
RPData:AddCheckFunc(RedPointType.ContinuityRecharge,ActivityGiftManager.GetContinuityRechargeRedPoint)
-- 头像红点

View File

@ -57,11 +57,12 @@ function this:OnShow(_parent,...)
rewardStateData = TreasureOfHeavenManger.GetState()
rewardData = TreasureOfHeavenManger.GetAllRewardData()
this:showRewardTianGong()
this.tip.text = "<color=#95523B>解锁秘宝可以领取额外专属奖励并直接获得200积分</color>"
elseif curType == 2 then
rewardData = QinglongSerectTreasureManager.GetAllRewardData()
this:showRewardQinglong()
this.tip.text = "<color=#60A22C>解锁高阶战令,激活进阶</color><color=#95523B>专属奖励+直升15级</color>"
end
this.tip.text = "<color=#60A22C>解锁高阶战令,激活进阶</color><color=#95523B>专属奖励+直升15级</color>"
end
--充值成功
@ -86,7 +87,6 @@ function this:showRewardTianGong()
local curScore = TreasureOfHeavenManger.GetScore()--当前分数
for i = 1, #rewardData do
LogRed("state:"..rewardStateData[rewardData[i].Id].state)
if curScore >= rewardData[i].Integral then
if rewardStateData[i].state == 1 or rewardStateData[i].state == 0 then--已达成但不能领取的
-- body
@ -108,7 +108,6 @@ function this:showRewardTianGong()
direct[k2] = direct[k2] + v2
end
else
-- elseif rewardStateData[i].state == 0 then--未达成且不能领取的
local reward = rewardData[i]
local k1 = reward.TreasureReward[1][1]
local v1 = reward.TreasureReward[1][2]
@ -166,13 +165,13 @@ function this:showRewardQinglong()
local direct = {}
local indirect ={}
for i = 1, #rewardData do
for i = 1, #rewardData do
-- body
local reward = rewardData[i]
for j=1,#reward.Reward do
local id = reward.Reward[j].item[1]
local num = reward.Reward[j].item[2]
if reward.Reward[j].type == 2 then
if reward.Reward[j].type == 2 then
if reward.state == 1 or reward.state == 0 then
if not direct[id] then
direct[id] = 0
@ -185,7 +184,7 @@ function this:showRewardQinglong()
indirect[id] = indirect[id] + num
end
end
end
end
end
for i = 1,#this.taskList do
this.taskList[i].gameObject:SetActive(false)

View File

@ -241,10 +241,10 @@ function RoleInfoPanel:BindEvent()
end)
--升级
Util.AddClick(this.upLvBtn, function()
-- if Time.realtimeSinceStartup - RoleInfoPanel.timePressStarted <= 0.4 then
LogGreen("upLvBtn ")
if Time.realtimeSinceStartup - RoleInfoPanel.timePressStarted <= 0.4 then
-- LogGreen("upLvBtn ")
self:LvUpClick(true)
-- end
end
end)
--长按升级按下状态
this._onPointerDown = function(Pointgo, data)
@ -932,10 +932,10 @@ function RoleInfoPanel:AutoSelectUpStarHeroList(_curUpStarData)
local upStarHeroListData=HeroManager.GetUpStarHeroListData(curUpStarData[i].upStarMaterialsData.Id,curHeroData)
local curSelectHeroList = {}
if curUpStarData[i].upStarMaterialsData.Issame ==1
or curUpStarData[i].upStarMaterialsData.IsId > 0 then
-- or (curUpStarData[i].upStarMaterialsData.IsSameClan == 1
-- and curUpStarData[i].upStarMaterialsData.StarLimit == 3
-- and curHeroData.heroConfig.Qualiy ~= 3) then
or curUpStarData[i].upStarMaterialsData.IsId > 0
or (curUpStarData[i].upStarMaterialsData.IsSameClan == 1
and curUpStarData[i].upStarMaterialsData.StarLimit == 3
and curHeroData.heroConfig.Qualiy ~= 3) then
if LengthOfTable(upStarHeroListData.heroList) >= curUpStarData[i].upStarData[4] then
for i = 1, curUpStarData[i].upStarData[4] do
if upStarHeroListData.heroList[i].lockState == 0 and upStarHeroListData.heroList[i].isFormation == "" then
@ -1191,7 +1191,7 @@ end
--升级按钮点击事件处理
function RoleInfoPanel:LvUpClick(isSingleLvUp)
--是否为最大等级
LogGreen("isSingleLvUp "..tostring(isSingleLvUp))
-- LogGreen("isSingleLvUp "..tostring(isSingleLvUp))
if curHeroData.lv>=HeroManager.heroLvEnd[curHeroData.heroConfig.Id] then
PopupTipPanel.ShowTip(Language[11846])
_isClicked = false
@ -1243,7 +1243,7 @@ function RoleInfoPanel:LvUpClick(isSingleLvUp)
else
curUpLv = curHeroData.lv + 1
end
LogGreen("isSingleLvUp "..tostring(isSingleLvUp))
-- LogGreen("isSingleLvUp "..tostring(isSingleLvUp))
NetManager.HeroLvUpEvent(curHeroData.dynamicId,curUpLv,curHeroData.lv,function (msg)
self:DeleteLvUpMaterials(isSingleLvUp,msg)
end)