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

jiaoyangna 2020-09-11 11:10:02 +08:00
commit 8454ba4015
142 changed files with 216 additions and 335531 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

View File

@ -1,110 +0,0 @@
fileFormatVersion: 2
guid: 1b77b4f810d4ced439ff767d98fb67a3
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: 0
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: 65
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: 4e79f808c34810f4b96c9c69e9377039
vertices: []
indices:
edges: []
weights: []
spritePackingTag: BattleAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 63d50a1409a2a4143be50806c3dd37a6
guid: 68fb55bf803e669418eff563cab90f9b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName: lz4/atlas/cardatlas
assetBundleName: lz4/atlas/commonatlas
assetBundleVariant: unity3d

View File

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: FormationAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: FormationAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: FormationAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: FormationAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: FormationAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: FormationAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: FormationAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

@ -113,7 +113,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: FormationAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: FormationAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: ActivityAltas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: ActivityAltas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 9.2 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: ActivityAltas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: ActivityAltas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: ActivityAltas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 9.3 KiB

After

Width:  |  Height:  |  Size: 9.3 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: ActivityAltas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 9.9 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

View File

@ -113,7 +113,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: ActivityAltas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: ActivityAltas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: ActivityAltas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: ActivityAltas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: RoleInfoAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 229 B

After

Width:  |  Height:  |  Size: 229 B

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: VipAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: FormationAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: FormationAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: FormationAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: FormationAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: FormationAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: FormationAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: FormationAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: MainAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

@ -113,7 +113,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: MainAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: MainAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: MainAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

@ -113,7 +113,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: MainAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 8.0 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: MainAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

View File

@ -134,7 +134,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: ShopAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 579 B

After

Width:  |  Height:  |  Size: 579 B

View File

@ -113,7 +113,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: ShopAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

View File

@ -113,7 +113,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: ShopAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 56 KiB

View File

@ -113,7 +113,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: ShopAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 57 KiB

After

Width:  |  Height:  |  Size: 57 KiB

View File

@ -113,7 +113,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: ShopAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 66 KiB

View File

@ -113,7 +113,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: ShopAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 85 KiB

View File

@ -113,7 +113,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: ShopAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 83 KiB

After

Width:  |  Height:  |  Size: 83 KiB

View File

@ -113,7 +113,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: ShopAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

@ -113,7 +113,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: ShopAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

View File

@ -113,7 +113,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: ShopAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 41 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: ShopAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 62 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: ShopAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: ShopAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

View File

@ -102,7 +102,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag: ShopAtlas
spritePackingTag: CommonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Some files were not shown because too many files have changed in this diff Show More