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

# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua
dev_chengFeng
ZhangBiao 2020-08-27 22:11:02 +08:00
commit fbbe8db26f
43 changed files with 144 additions and 433 deletions

View File

@ -0,0 +1 @@
{"subChannel":"2000", "buglyId":"261348dcd3", "channel":"MHT", "resUrl":"http://jl.tyu89.wang/mht_hw_release/", "packageVersion":"0.1", "version":"0.1.1", "serverUrl":"http://119.28.117.110:8080/"}

View File

@ -1 +1 @@
{"subChannel":"1000", "buglyId":"261348dcd3", "channel":"MHT", "resUrl":"http://cdn-jl.lanjingshidai.com/mht_test/", "packageVersion":"0.4", "version":"0.1.0", "serverUrl":"http://119.28.117.110:8080/"}
{"subChannel":"1000", "buglyId":"261348dcd3", "channel":"MHT", "resUrl":"http://jl.tyu89.wang/mht_hw_test/", "packageVersion":"0.4", "version":"0.1.0", "serverUrl":"http://119.28.117.110:8080/"}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 71 KiB

After

Width:  |  Height:  |  Size: 64 KiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: a581a8769a5b8f5459dc9e8cb286f800
TextureImporter:
fileIDToRecycleName:
21300000: c_axl_00061_t9
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
@ -43,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
@ -94,31 +93,11 @@ TextureImporter:
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: c_axl_00061_t9
rect:
serializedVersion: 2
x: 0
y: 0
width: 327
height: 274
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: ecaaa1b63f3b1a74e991cfee28489d91
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: d7d3e6af1659c024689b55301c97e78f
spriteID: 24fec6472a903a748a5d618c6e0a1354
vertices: []
indices:
edges: []
@ -127,5 +106,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/dynamicatlas/skill/c_axl_00061_t9
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 68 KiB

After

Width:  |  Height:  |  Size: 75 KiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: a7e1df5e58735544dbdfd9b8fa2bfa8b
TextureImporter:
fileIDToRecycleName:
21300000: c_dz_00058_t9
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
@ -43,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
@ -94,31 +93,11 @@ TextureImporter:
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: c_dz_00058_t9
rect:
serializedVersion: 2
x: 0
y: 0
width: 319
height: 268
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 7a253139867cb934b9d7c1f877b54252
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 08373e62c6d0f3844b3d7f0cc4c634c8
spriteID: 0c2c7b372fc266941a83ee380cca09b6
vertices: []
indices:
edges: []
@ -127,5 +106,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/dynamicatlas/skill/c_dz_00058_t9
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 87 KiB

After

Width:  |  Height:  |  Size: 76 KiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 24d7d17d4a0cc524ab91c08070801bb7
TextureImporter:
fileIDToRecycleName:
21300000: c_gyps_00020_t9
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
@ -43,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
@ -59,17 +58,6 @@ TextureImporter:
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: Android
maxTextureSize: 2048
@ -105,31 +93,11 @@ TextureImporter:
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: c_gyps_00020_t9
rect:
serializedVersion: 2
x: 0
y: 0
width: 386
height: 249
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 53ab374c27b38cd4996c064fcfc73578
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 79f8f4d9747bc0b4aa2fc7e26d4a27a5
spriteID: 93bc3f056d1c21b438c0864b3ee4b411
vertices: []
indices:
edges: []
@ -138,5 +106,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/dynamicatlas/skill/c_gyps_00020_t9
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 70 KiB

After

Width:  |  Height:  |  Size: 74 KiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 23b71375c1a9359438d6e33ffc110eac
TextureImporter:
fileIDToRecycleName:
21300000: c_hdxj_00066_t9
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
@ -43,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
@ -94,31 +93,11 @@ TextureImporter:
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: c_hdxj_00066_t9
rect:
serializedVersion: 2
x: 0
y: 0
width: 329
height: 260
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 8f3d6f2a2be952e4db657a254c944d5d
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 0101312f72286bd478b93a5e01928b36
spriteID: 137f0a4421f236d4b9324ab80024acf8
vertices: []
indices:
edges: []
@ -127,5 +106,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/dynamicatlas/skill/c_hdxj_00066_t9
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 75 KiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 3a24bb11887b26542973b701c45d83fb
TextureImporter:
fileIDToRecycleName:
21300000: c_jhsn_00068_t9
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
@ -43,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
@ -94,31 +93,11 @@ TextureImporter:
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: c_jhsn_00068_t9
rect:
serializedVersion: 2
x: 0
y: 0
width: 333
height: 269
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 39067a4620a3d8c4f8f111410877ab50
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 6b89954df3abd59449e85627832631f4
spriteID: f037ba794de941b46b2b23e8a9212201
vertices: []
indices:
edges: []
@ -127,5 +106,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/dynamicatlas/skill/c_jhsn_00068_t9
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 77 KiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 33826b9c307fde44893e663ffbe17e3f
TextureImporter:
fileIDToRecycleName:
21300000: c_jll_00059_t9
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
@ -43,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
@ -94,31 +93,11 @@ TextureImporter:
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: c_jll_00059_t9
rect:
serializedVersion: 2
x: 0
y: 0
width: 331
height: 255
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 2d2dc513682bb1147a3ad0b8aea478ab
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: ea3b6a465fd74474199e17710c2d5ad1
spriteID: 1fc7fd5ffbc2a45489f03f00f0f1ab58
vertices: []
indices:
edges: []
@ -127,5 +106,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/dynamicatlas/skill/c_jll_00059_t9
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 71 KiB

After

Width:  |  Height:  |  Size: 82 KiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 2b69177e0af7ce944b79153ec3de01df
TextureImporter:
fileIDToRecycleName:
21300000: c_jlzz_00060_t9
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
@ -43,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
@ -94,31 +93,11 @@ TextureImporter:
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: c_jlzz_00060_t9
rect:
serializedVersion: 2
x: 0
y: 0
width: 324
height: 271
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: c94368a2765781f4f8c0145636bf2536
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 834b1baaf8e8e0944b5a323abaa88e05
spriteID: 1f25dc82610dbb34e91205483b08e6e5
vertices: []
indices:
edges: []
@ -127,5 +106,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/dynamicatlas/skill/c_jlzz_00060_t9
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 68 KiB

After

Width:  |  Height:  |  Size: 74 KiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 9b684a3f3e1f2b841813857be9a21fef
TextureImporter:
fileIDToRecycleName:
21300000: c_jy_00055_t9
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
@ -43,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
@ -94,31 +93,11 @@ TextureImporter:
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: c_jy_00055_t9
rect:
serializedVersion: 2
x: 0
y: 0
width: 324
height: 262
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 373395e5699e6924cb15a11b8189b470
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 8f61c90377d8c5f409869cff52969324
spriteID: 0f8d1d162e4c4774a8da2ed384b8d9d0
vertices: []
indices:
edges: []
@ -127,5 +106,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/dynamicatlas/skill/c_jy_00055_t9
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 72 KiB

After

Width:  |  Height:  |  Size: 79 KiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 85cc5db7a3a0ad44cbf832a90c9777e8
TextureImporter:
fileIDToRecycleName:
21300000: c_lsx_00069_t9
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
@ -43,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
@ -94,31 +93,11 @@ TextureImporter:
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: c_lsx_00069_t9
rect:
serializedVersion: 2
x: 0
y: 0
width: 319
height: 269
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 209ea0e9c84b7794bbe719c5e53f0860
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 0b3d92777e705894f9e4631769d46f79
spriteID: e39f62a4e86456e418e926486391e3a0
vertices: []
indices:
edges: []
@ -127,5 +106,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/dynamicatlas/skill/c_lsx_00069_t9
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 78 KiB

View File

@ -42,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
@ -97,7 +97,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID: 68df6c1b1a7611d43b8cda3200bbae16
spriteID: e9bb1edd93afc75489b2f556cf38988e
vertices: []
indices:
edges: []
@ -106,5 +106,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/dynamicatlas/skill/c_md_00064_t9
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 79 KiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 3801b7b5227a51d4f8df6fdcf829eb1a
TextureImporter:
fileIDToRecycleName:
21300000: c_mjn_00063_t9
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
@ -43,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
@ -94,31 +93,11 @@ TextureImporter:
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: c_mjn_00063_t9
rect:
serializedVersion: 2
x: 0
y: 0
width: 320
height: 267
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 3b513c321514d5d48b8c594bef38161a
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: a506369c8e7cd9e4da4348be36b78679
spriteID: d9a4a795ffb7c2040bd730a60e80cedc
vertices: []
indices:
edges: []
@ -127,5 +106,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/dynamicatlas/skill/c_mjn_00063_t9
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 78 KiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 568f6c27c07701d4499f499cbcf89a32
TextureImporter:
fileIDToRecycleName:
21300000: c_mz_00062_t9
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
@ -43,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
@ -94,31 +93,11 @@ TextureImporter:
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: c_mz_00062_t9
rect:
serializedVersion: 2
x: 0
y: 0
width: 329
height: 268
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: e7624294b5d279142941b44d83af002c
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 6b0ad1018adc5f244967009d3831412d
spriteID: 20d0dbb21dfe7444693fd30082b9fcc3
vertices: []
indices:
edges: []
@ -127,5 +106,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/dynamicatlas/skill/c_mz_00062_t9
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 72 KiB

After

Width:  |  Height:  |  Size: 75 KiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 41590fdc913fdc04ebd429ceacb15941
TextureImporter:
fileIDToRecycleName:
21300000: c_nxq_00054_t9
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
@ -43,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
@ -94,31 +93,11 @@ TextureImporter:
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: c_nxq_00054_t9
rect:
serializedVersion: 2
x: 0
y: 0
width: 323
height: 280
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 00966c79aff132a43a980ed4242ecff7
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: a42c2202929ff334fa491bf3cfc6f97b
spriteID: 7316a06d29a440e4c8e76592c7962a9e
vertices: []
indices:
edges: []
@ -127,5 +106,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/dynamicatlas/skill/c_nxq_00054_t9
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 70 KiB

After

Width:  |  Height:  |  Size: 75 KiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: decf1af7d0977a348a57232f235053b2
TextureImporter:
fileIDToRecycleName:
21300000: c_sdxj_00067_t9
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
@ -43,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
@ -94,31 +93,11 @@ TextureImporter:
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: c_sdxj_00067_t9
rect:
serializedVersion: 2
x: 0
y: 0
width: 325
height: 258
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 4a578531805c554408ec7d25c5d2f8f4
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: ed718174104795b489ee2ed94a1e2671
spriteID: e744b90a0f4d5e14795848342611e72a
vertices: []
indices:
edges: []
@ -127,5 +106,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/dynamicatlas/skill/c_sdxj_00067_t9
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 76 KiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 3b58301b9b85ac74ea5888e48b515a09
TextureImporter:
fileIDToRecycleName:
21300000: c_ygl_00056_t9
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
@ -43,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
@ -94,31 +93,11 @@ TextureImporter:
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: c_ygl_00056_t9
rect:
serializedVersion: 2
x: 0
y: 0
width: 323
height: 266
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 26a8848cc6c408d40980221a9158ead1
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: fb475a6f0326a634c8e84ec7d8b70dce
spriteID: 35dae6e8d335d84409e54f000f525066
vertices: []
indices:
edges: []
@ -127,5 +106,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/dynamicatlas/skill/c_ygl_00056_t9
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 77 KiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 2ad3248f7d7bb3546bccaa9ef88952c4
TextureImporter:
fileIDToRecycleName:
21300000: c_yhj_00057_t9
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
@ -43,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
@ -94,31 +93,11 @@ TextureImporter:
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: c_yhj_00057_t9
rect:
serializedVersion: 2
x: 0
y: 0
width: 324
height: 267
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 1f591ce76dd1c834cbf733ef4d22ac18
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 6074c6ccfe30ef9408022a96a5ed027c
spriteID: a1d4bd9cdeee99a40aa16aca4d463c96
vertices: []
indices:
edges: []
@ -127,5 +106,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/dynamicatlas/skill/c_yhj_00057_t9
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -261,6 +261,7 @@ BLESSRESPONSE_SUPREMEREWARD_FIELD = protobuf.FieldDescriptor();
BLESSRESPONSE_COUNTREWARD_FIELD = protobuf.FieldDescriptor();
BLESSRESPONSE_REWARDVIEW_FIELD = protobuf.FieldDescriptor();
BLESSRESPONSE_LASTREFRESHTIME_FIELD = protobuf.FieldDescriptor();
BLESSRESPONSE_COUNT_FIELD = protobuf.FieldDescriptor();
BLESSSAVEREQUEST = protobuf.Descriptor();
BLESSSAVEREQUEST_REWARDIDS_FIELD = protobuf.FieldDescriptor();
BLESSCHOOSEREQUEST = protobuf.Descriptor();
@ -2850,11 +2851,21 @@ BLESSRESPONSE_LASTREFRESHTIME_FIELD.default_value = 0
BLESSRESPONSE_LASTREFRESHTIME_FIELD.type = 5
BLESSRESPONSE_LASTREFRESHTIME_FIELD.cpp_type = 1
BLESSRESPONSE_COUNT_FIELD.name = "count"
BLESSRESPONSE_COUNT_FIELD.full_name = ".com.ljsd.jieling.protocols.blessResponse.count"
BLESSRESPONSE_COUNT_FIELD.number = 7
BLESSRESPONSE_COUNT_FIELD.index = 6
BLESSRESPONSE_COUNT_FIELD.label = 1
BLESSRESPONSE_COUNT_FIELD.has_default_value = false
BLESSRESPONSE_COUNT_FIELD.default_value = 0
BLESSRESPONSE_COUNT_FIELD.type = 5
BLESSRESPONSE_COUNT_FIELD.cpp_type = 1
BLESSRESPONSE.name = "blessResponse"
BLESSRESPONSE.full_name = ".com.ljsd.jieling.protocols.blessResponse"
BLESSRESPONSE.nested_types = {}
BLESSRESPONSE.enum_types = {}
BLESSRESPONSE.fields = {BLESSRESPONSE_FIXREWARD_FIELD, BLESSRESPONSE_LEGENDREWARD_FIELD, BLESSRESPONSE_SUPREMEREWARD_FIELD, BLESSRESPONSE_COUNTREWARD_FIELD, BLESSRESPONSE_REWARDVIEW_FIELD, BLESSRESPONSE_LASTREFRESHTIME_FIELD}
BLESSRESPONSE.fields = {BLESSRESPONSE_FIXREWARD_FIELD, BLESSRESPONSE_LEGENDREWARD_FIELD, BLESSRESPONSE_SUPREMEREWARD_FIELD, BLESSRESPONSE_COUNTREWARD_FIELD, BLESSRESPONSE_REWARDVIEW_FIELD, BLESSRESPONSE_LASTREFRESHTIME_FIELD, BLESSRESPONSE_COUNT_FIELD}
BLESSRESPONSE.is_extendable = false
BLESSRESPONSE.extensions = {}
BLESSSAVEREQUEST_REWARDIDS_FIELD.name = "rewardIds"

View File

@ -202,6 +202,7 @@ function this.GetHeroDataByPosition(_position)
end
return heros
end
local oldChoose
--数据显示
function this.SingleHeroDataShow(_go,_heroData)
@ -216,7 +217,8 @@ function this.SingleHeroDataShow(_go,_heroData)
local formationMask = Util.GetGameObject(go.transform, "formationMask")
local formationImage = Util.GetGameObject(go.transform, "formationMask/formationImage/upImage"):GetComponent("Image")
if LengthOfTable(heroData.formationList) ~= 0 then
if LengthOfTable(heroData.isFormations) ~= 0 then
--if LengthOfTable(heroData.formationList) ~= 0 then
formationMask:SetActive(true)
formationImage.sprite = Util.LoadSprite("t_tongyong-yishangzheng")
elseif heroData.lockState == 1 then
@ -324,9 +326,9 @@ function this.SingleHeroDataShow(_go,_heroData)
end)
Util.AddOnceClick(formationMask, function()
if LengthOfTable(heroData.formationList) ~= 0 then
if LengthOfTable(heroData.isFormations) ~= 0 then
local text = ""
for key, value in pairs(heroData.formationList) do
for key, value in pairs(heroData.isFormations) do
text = Language[12317]..HeroManager.GetHeroFormationStr2(key)..Language[12318]
end
PopupTipPanel.ShowTip(text)

View File

@ -96,9 +96,9 @@ function DailyRechargePanel:RefreshPanel()
else
self.extraIcon.sprite = Util.LoadSprite(rechargeBgDef[4])
self.dollar:SetActive(true)
local remainValue = actRewardConfig.Values[1][1] - DailyRechargeManager.GetRechargeValue()
remainValue = remainValue < 0 and 0 or remainValue
self.desc.text = remainValue
-- local remainValue = actRewardConfig.Values[1][1] - DailyRechargeManager.GetRechargeValue()
-- remainValue = remainValue < 0 and 0 or remainValue
self.desc.text = actRewardConfig.Values[1][1]--remainValue
self.dealText.text = Language[10436]
end
end

View File

@ -187,6 +187,7 @@ function this.SingleDataShow(pre,value)
NetManager.TakeMissionRewardRequest(TaskTypeDef.PoZhenZhuXianTask,sConFigData.id, function(respond)
UIManager.OpenPanel(UIName.RewardItemPopup, respond.drop, 1,function ()
this.Refresh()
CheckRedPointStatus(RedPointType.PoZhenZhuXianTask)
end)
end)
elseif state == 0 then

View File

@ -2959,6 +2959,18 @@ function this.ByReplaceHeroGetAllHeros()
table.insert(sortHeroList,v)
end
end
for k,v in ipairs(sortHeroList) do
local isFormations = {}
for n, w in ipairs(v.formationList) do
local isFormationStr = HeroManager.GetHeroFormationStr(w)
if isFormationStr and isFormationStr ~= "" then
table.insert(isFormations, w)
end
end
v.isFormations = isFormations
end
table.sort(sortHeroList, function(a,b)
if a.star == b.star then
if a.lv == b.lv then

View File

@ -101,7 +101,7 @@ end
-- 判断相应显示类型的礼包是否存在用于判断是否开启了相应的充值活动
function this.HasGoodsByShowType(showType)
local list = ConfigManager.GetConfigDataByKey(ConfigName.RechargeCommodityConfig, "ShowType", showType)
local list = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig, "ShowType", showType)
if not list then return false end
for _, goods in ipairs(list) do
if this.GetGiftGoodsInfo(goods.Type, goods.Id) then

View File

@ -327,12 +327,12 @@ end
--展示额外奖励
function PrayMainPanel:OnShowExtraRewar()
--额外奖励赋值
allGetFinishRewardNum = 0
allGetFinishRewardNum = PrayManager.GetCount()
allGetRewardNum = 0
for i = 1, #PrayManager.patyRewardData do
if PrayManager.patyRewardData[i].state >= 3 then
allGetFinishRewardNum = allGetFinishRewardNum + 1
end
-- if PrayManager.patyRewardData[i].state >= 3 then
-- allGetFinishRewardNum = allGetFinishRewardNum + 1
-- end
if PrayManager.patyRewardData[i].state >= 2 then
allGetRewardNum = allGetRewardNum + 1
end

View File

@ -9,9 +9,11 @@ this.supremeReward = {}--至尊奖励
this.extraRewardData = {}--额外奖励 抽到一定次数会有额外奖励 3#5#7#10#13#16
this.lastRefreshTime = 0
local count = 0--抽取过的总次数
function this.Initialize(_msg)
end
function this.InitializeData(_msg)
this.SetCount(_msg.count)
this.patyRewardData = {}
this.patyPreviewRewardData = {}
this.legendReward = {}
@ -185,9 +187,17 @@ function this.SetPatySingleRewardData(rewardId,chooseRewardId)
this.patyPreviewRewardData[i].state = 3
end
end
this.SetCount(this.GetCount() + 1)
end
--重置云梦祈祷
function this.ResetPatyRewardData(_msg)
this.InitializeData(_msg)
end
function this.GetCount()
return count
end
function this.SetCount(_count)
count = _count
end
return this