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

# Conflicts:
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/c_ccfy_banner01_zh.jpg.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/d_danxinbixue_banner2_zh.jpg.meta
dev_chengFeng
JieLing 2021-02-26 16:13:08 +08:00
commit b5cb873806
9 changed files with 284 additions and 9 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 266 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: e4e859b7b43ab7c44a2f8afec5f330ce
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: 191683ec514a1b54887fe636f92f656c
vertices: []
indices:
edges: []
weights: []
spritePackingTag: DynamicActivityAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 332 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 2eeff749bc0c9bc42a55d89c2e50d88b
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: c83f75ca8c44e3a468f8d46703ae9366
vertices: []
indices:
edges: []
weights: []
spritePackingTag: DynamicActivityAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 760 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 0ceeba0ad7a2fba48b36261139fe70fc
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: a9fb3e4ad213ef54fbe006f48d3048fe
vertices: []
indices:
edges: []
weights: []
spritePackingTag: DynamicActivityAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1771,6 +1771,17 @@ function GetCurLanguage()
return PlayerPrefs.GetInt("language")
end
-- 文字大小比例缩放
FontSizeScaleToZh = {
[0] = 1,
[1] = 0.9,
[2] = 0.8
}
function LanguageFontSizeFilter(text, size)
local l = GetCurLanguage()
text.fontSize = math.floor(size * FontSizeScaleToZh[l])
end
function SetHeroIcon(heroData,icon,heroConfig)
-- LogGreen("heroData.skinId:"..tostring(heroData.skinId))
if not heroData.skinId or heroData.skinId == 0 then

View File

@ -236,7 +236,7 @@ local activityType = {
[2]={name="Bg2/hero3",id=10019,hero="c_ygsj_kuang003"}, --巨灵神
[3]={name="Bg2/hero2",id=10024,hero="c_ygsj_kuang002"}, --姜子牙
},
title = "c_ydsj_slogan",
title = "c_ydsj_slogan_zh",
helptype = HELP_TYPE.TimeLimitedCall
},
--勇冠三军 限时召唤
@ -247,7 +247,7 @@ local activityType = {
[2]={name="Bg2/hero3",id=10024,hero="d_danxinbixue_shenjiang3"}, --姜子牙
[3]={name="Bg2/hero2",id=10026,hero="s_yongwangzhiqian_shenjiang2"}, ----东华帝君
},
title = "d_danxinbixue_zi",
title = "d_danxinbixue_zi_zh",
helptype = HELP_TYPE.TimeLimitedCall
},
--勇冠三军 限时召唤
@ -258,7 +258,7 @@ local activityType = {
[2]={name="Bg2/hero3",id=10024,hero="d_danxinbixue_shenjiang3"}, --姜子牙
[3]={name="Bg2/hero2",id=10026,hero="s_yongwangzhiqian_shenjiang2"}, ----东华帝君
},
title = "d_danxinbixue_zi",
title = "d_danxinbixue_zi_zh",
helptype = HELP_TYPE.TimeLimitedCall
},
--勇冠三军 限时召唤
@ -269,7 +269,7 @@ local activityType = {
[2]={name="Bg2/hero2",id=10041,hero="y_yunchouweiwo_shenjiang2"}, --通天教主
[3]={name="Bg2/hero3",id=10087,hero="s_shibukedang_shenjiang33"}, ----娥皇
},
title = "s_shibukedang_zi",
title = "s_shibukedang_zi_zh",
helptype = HELP_TYPE.TimeLimitedCall
},
--勇冠三军 限时召唤
@ -280,7 +280,7 @@ local activityType = {
[2]={name="Bg2/hero2",id=10033,hero="b_bianhuanmoce_shenjiang2"}, ---净光天女
[3]={name="Bg2/hero3",id=10091,hero="s_yongwangzhiqian_shenjiang33"}, ----白骨精
},
title = "s_yongwangzhiqian_zi",
title = "s_yongwangzhiqian_zi_zh",
helptype = HELP_TYPE.TimeLimitedCall
},
}

View File

@ -51,8 +51,8 @@ function MonthCardPage:RefreshStoneShow()
local curMonthCardOpenState = curAllMonthCardData[MONTH_CARD_TYPE.MONTHCARD] and curAllMonthCardData[MONTH_CARD_TYPE.MONTHCARD].endingTime ~= 0
self.smallDay1.text = Language[11377].. string.format(MoneyUtil.GetMoneyUnitName(),monthCardConFig[MONTH_CARD_TYPE.MONTHCARD].Price) ..Language[11378]--Language[11379]
self.smallDay2.text = Language[11380]..monthCardConFig[MONTH_CARD_TYPE.MONTHCARD].BaseReward[1][2] .."</color>"
self.smallDay1.fontSize = GetCurLanguage() ~= 2 and 28 or 22
self.smallDay2.fontSize = GetCurLanguage() ~= 2 and 28 or 22
self.smallDay1.fontSize = GetCurLanguage() == 0 and 28 or 22
self.smallDay2.fontSize = GetCurLanguage() == 0 and 28 or 22
self.smallDayIcon.sprite = Util.LoadSprite(GetResourcePath(ConfigManager.GetConfigData(ConfigName.ItemConfig,monthCardConFig[MONTH_CARD_TYPE.MONTHCARD].BaseReward[1][1]).ResourceID))
self.smallProgress:SetActive(not curMonthCardOpenState)
self.smallDayRightUpText = monthCardConFig[MONTH_CARD_TYPE.MONTHCARD].ContiueDays * monthCardConFig[MONTH_CARD_TYPE.MONTHCARD].BaseReward[1][2]
@ -107,8 +107,8 @@ function MonthCardPage:RefreshStoneShow()
self.bigDayRightUpIcon = SetIcon(monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].BaseReward[1][1])
self.bigDay1.text = Language[11377].. string.format(MoneyUtil.GetMoneyUnitName(),monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].Price) ..Language[11378]--Language[11379]
self.bigDay2.text = Language[11380]..monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].BaseReward[1][2] .."</color>"
self.bigDay1.fontSize = GetCurLanguage() ~= 2 and 28 or 22
self.bigDay2.fontSize = GetCurLanguage() ~= 2 and 28 or 22
self.bigDay1.fontSize = GetCurLanguage() == 0 and 28 or 22
self.bigDay2.fontSize = GetCurLanguage() == 0 and 28 or 22
self.bigDayIcon.sprite = Util.LoadSprite(GetResourcePath(ConfigManager.GetConfigData(ConfigName.ItemConfig,monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].BaseReward[1][1]).ResourceID))
self.bigMonthRedPot:SetActive(OperatingManager.RefreshMonthCardRedPoint(MONTH_CARD_TYPE.LUXURYMONTHCARD))
if not curLuxuryMonthCardOpenState then