Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
ZhangBiao 2021-06-21 11:45:13 +08:00
commit ba5bc832d9
3 changed files with 129 additions and 19 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 666 KiB

View File

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

View File

@ -4644,7 +4644,7 @@ ParticleSystem:
--- !u!199 &1481527221194107646
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -4812,8 +4812,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 14}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 3.3000083, y: 0.7}
m_SizeDelta: {x: 160, y: 42}
m_AnchoredPosition: {x: -0.0000076293945, y: 0.7}
m_SizeDelta: {x: 124, y: 42}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1481527221224638891
CanvasRenderer:
@ -4860,9 +4860,9 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 38
m_FontStyle: 0
m_BestFit: 0
m_BestFit: 1
m_MinSize: 3
m_MaxSize: 40
m_MaxSize: 38
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@ -10638,7 +10638,7 @@ ParticleSystem:
--- !u!199 &1481527221797319403
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -15867,7 +15867,7 @@ ParticleSystem:
--- !u!199 &1481527222190047225
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -20644,7 +20644,7 @@ ParticleSystem:
--- !u!199 &1481527222294757571
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -25630,7 +25630,7 @@ ParticleSystem:
--- !u!199 &1481527222605618109
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -30319,7 +30319,7 @@ ParticleSystem:
--- !u!199 &1481527222633079609
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -35352,7 +35352,7 @@ ParticleSystem:
--- !u!199 &1481527223089183893
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -35915,8 +35915,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 14}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 3.3, y: 0.7}
m_SizeDelta: {x: 160, y: 42}
m_AnchoredPosition: {x: -0.000035286, y: 0.7}
m_SizeDelta: {x: 124, y: 42}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8666283234259745668
CanvasRenderer:
@ -35963,9 +35963,9 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 38
m_FontStyle: 0
m_BestFit: 0
m_BestFit: 1
m_MinSize: 3
m_MaxSize: 40
m_MaxSize: 38
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@ -36009,8 +36009,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 14}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 3.3, y: 0.7}
m_SizeDelta: {x: 160, y: 42}
m_AnchoredPosition: {x: 0.000020503998, y: 0.7}
m_SizeDelta: {x: 124, y: 42}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7229865422772331511
CanvasRenderer:
@ -36057,9 +36057,9 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 38
m_FontStyle: 0
m_BestFit: 0
m_BestFit: 1
m_MinSize: 3
m_MaxSize: 40
m_MaxSize: 38
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1