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

dev_chengFeng
ZhangBiao 2022-01-10 17:38:20 +08:00
commit 893a8dd10b
5 changed files with 200 additions and 0 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

View File

@ -0,0 +1,99 @@
fileFormatVersion: 2
guid: c7e588802d23c0747b74454c252172b0
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: 4b203e31b2390d249af50dfdec937948
vertices: []
indices:
edges: []
weights: []
spritePackingTag: ActivityAltas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

View File

@ -0,0 +1,99 @@
fileFormatVersion: 2
guid: 78603e64293598f4b94dc65ce4bc07af
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: 954d520df5d57ee44981395979e26281
vertices: []
indices:
edges: []
weights: []
spritePackingTag: ActivityAltas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -11,6 +11,7 @@ local missionIndex = {
[68] = {selectIma = "r_mrcz_68_zh",selectImaRMB = "r_mrcz_68_zh",defaultIma = "r_mrcz_6801_zh",defaultImaRMB = "r_mrcz_6801_zh"},
[98] = {selectIma = "r_mrcz_98_zh",selectImaRMB = "r_mrcz_98_zh",defaultIma = "r_mrcz_9801_zh",defaultImaRMB = "r_mrcz_9801_zh"},
[128] = {selectIma = "r_mrcz_128_zh",selectImaRMB = "r_mrcz_128_zh",defaultIma = "r_mrcz_12801_zh",defaultImaRMB = "r_mrcz_12801_zh"},
[198] = {selectIma = "r_mrcz_198_zh",selectImaRMB = "r_mrcz_198_zh",defaultIma = "r_mrcz_19801_zh",defaultImaRMB = "r_mrcz_19801_zh"},
[328] = {selectIma = "r_mrcz_328_zh",selectImaRMB = "r_mrcz_328_zh",defaultIma = "r_mrcz_32801_zh",defaultImaRMB = "r_mrcz_32801_zh"},
[648] = {selectIma = "r_mrcz_648_zh",selectImaRMB = "r_mrcz_648_zh",defaultIma = "r_mrcz_64801_zh",defaultImaRMB = "r_mrcz_64801_zh"},
}
@ -165,6 +166,7 @@ function DailyRechargePanel:SetGrid()
self.items[i].go.gameObject:SetActive(true)
local config = actRewardConfig[self.actInfo.mission[i].missionId]
if MoneyUtil.MT == MoneyType.RMB then
LogError(config.Values[1][1])
self.items[i].priceText.sprite = self.spLoader:LoadSprite(missionIndex[config.Values[1][1]].defaultImaRMB)
else
self.items[i].priceText.sprite = self.spLoader:LoadSprite(missionIndex[config.Values[1][1]].defaultIma)