【问题提交】

dev_chengFeng
zhangqiang 2021-04-07 19:52:25 +08:00
parent 31d0a4ea93
commit 894a8bcfd4
19 changed files with 39 additions and 546 deletions

View File

@ -1,142 +0,0 @@
fileFormatVersion: 2
guid: 66d42c829c43f204588f3942da83a490
TextureImporter:
fileIDToRecycleName:
21300000: q_qinlongmibao_jiesuozhenbao198(2)_en
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
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 12
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 33
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: q_qinlongmibao_jiesuozhenbao198(2)_en
rect:
serializedVersion: 2
x: 0
y: 0
width: 155
height: 56
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 2469973e7637149409af5be502213489
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 2e6fb32f4ee1ac8479900f796746c6da
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/q_qinlongmibao_jiesuozhenbao198(2)_en
assetBundleVariant: unity3d

View File

@ -1,142 +0,0 @@
fileFormatVersion: 2
guid: 98dd7cd885431024d9871ba486fd0dfa
TextureImporter:
fileIDToRecycleName:
21300000: q_qinlongmibao_jiesuozhenbao198_en
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
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 12
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 33
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: q_qinlongmibao_jiesuozhenbao198_en
rect:
serializedVersion: 2
x: 0
y: 0
width: 123
height: 57
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 0b2572084bbf1524087cbc9aabe15de2
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 6f9465d999444444386474b3c509187c
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_en/q_qinlongmibao_jiesuozhenbao198_en
assetBundleVariant: unity3d

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

View File

@ -1,120 +0,0 @@
fileFormatVersion: 2
guid: f6b13eedec1dcb1448957a625e470189
TextureImporter:
fileIDToRecycleName:
21300000: q_qinlongmibao_jiesuozhenbao198(2)_vi
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: 2
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
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: q_qinlongmibao_jiesuozhenbao198(2)_vi
rect:
serializedVersion: 2
x: 0
y: 0
width: 155
height: 56
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: cc4a08d5ee5b5774282c3e6c4b8244c3
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 544eb6e3def49d5498d0c827c3eb6687
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_vi/q_qinlongmibao_jiesuozhenbao198(2)_vi
assetBundleVariant: unity3d

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

View File

@ -1,120 +0,0 @@
fileFormatVersion: 2
guid: cbe0d038884eda34fa34d776c88123f2
TextureImporter:
fileIDToRecycleName:
21300000: q_qinlongmibao_jiesuozhenbao198_vi
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: 2
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
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: q_qinlongmibao_jiesuozhenbao198_vi
rect:
serializedVersion: 2
x: 0
y: 0
width: 123
height: 57
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 74012aab491fe0446b47af83a0a22ce3
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 794bf45d7607fe24999c02f347190a8e
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_vi/q_qinlongmibao_jiesuozhenbao198_vi
assetBundleVariant: unity3d

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 631b3b0e41c68044bbc9e32776d5a4c8
guid: 8cc8ca3eb0da23c429e8c106b7d5ea0b
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -58,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
@ -86,7 +75,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID: 8228ae326e3f8c147bc854d8d8851d8a
spriteID: 4ef2e9a1fcb5886489715d770e319e12
vertices: []
indices:
edges: []
@ -95,5 +84,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: lz4/artfont_vi/w_wj_banner_vi
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

View File

@ -69,6 +69,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -69,6 +69,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []

View File

@ -2254,8 +2254,8 @@
[12253] = GetLanguageStrById("天罡"),
[12254] = GetLanguageStrById("当前已激活该坐骑,是否要重复使用?"),
[12255] = GetLanguageStrById("成功激活坐骑!"),
[12256] = GetLanguageStrById("原价:%s元"),
[12257] = GetLanguageStrById("现价:%s元"),
[12256] = GetLanguageStrById("原价:"),
[12257] = GetLanguageStrById("现价:"),
[12258] = GetLanguageStrById("轩辕宝境必备特权每天增加2次免费次数6次额外购买次数"),
[12259] = GetLanguageStrById("每日可额外增加3次免费的灵兽山招募机会同时灵兽山妖晶招募价格变为8折!"),
[12260] = GetLanguageStrById("分解的魂印中包含金色或金色以上魂印,确定进行分解?"),

View File

@ -127,7 +127,7 @@ function ShengYiTianJiang:OnShowData()
else
LogGreen("找不到数据了:"..rechargeConfigId)
end
this.buyBtnText = Language[12231]
this.buyBtnText.text = GetLanguageStrById(Language[12231])
end
function ShengYiTianJiang:SetTime()

View File

@ -20,6 +20,12 @@ local type = {
function this:InitComponent(gameObject)
this.btnBack = Util.GetGameObject(gameObject, "frame/bg/closeBtn")
this.dealBtn = Util.GetGameObject(gameObject, "frame/bg/dealBtn")
this.dealBtnIma = Util.GetGameObject(this.dealBtn, "Image"):GetComponent("Image")
if MoneyUtil.MT == MoneyType.RMB then
this.dealBtnIma.sprite = Util.LoadSprite("q_qinlongmibao_jiesuozhenbao198")
else
this.dealBtnIma.sprite = Util.LoadSprite("q_qinlongmibao_jiesuozhenbao198(2)")
end
this.Content = Util.GetGameObject(gameObject, "rewardPart/Viewport/Content")
this.box1 = Util.GetGameObject(this.Content, "scroll/box")
this.box2 = Util.GetGameObject(this.Content, "scroll2/box")

View File

@ -219,8 +219,8 @@ function EveryDayGift:RefreshOneKeyShow()
local now = 0
now = now + MoneyUtil.GetMoney(ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,1004).Price)
self.oriPrice.text = string.format(Language[12256],ori)
self.nowPrice.text = string.format(Language[12257],now)
self.oriPrice.text = Language[12256] .. string.format(MoneyUtil.GetMoneyUnitName(),ori)
self.nowPrice.text = Language[12257] .. string.format(MoneyUtil.GetMoneyUnitName(),now)
end

View File

@ -267,7 +267,7 @@ end
function GiftPre:SetType1(type1Text1,num,type1Text3)
self.type1.gameObject:SetActive(true)
CreatNumberPrefab(tostring(num),self.numList)
--CreatNumberPrefab(tostring(num),self.numList)
self.moneyNum:SetNum(num)
self.type1Text1.text = Language[11377]
self.type1Text3.text = type1Text3

View File

@ -2280,5 +2280,5 @@
12280,清除
12281,累充满%s
12282,每\n日\n仅\n需\n充\n值\n6\n元
12283,每\n日\n仅\n需\n充\n值\n$1
12283,每\n日\n仅\n需\n充\n值\n$0.99
12284,%m月%d日%H时

1 10001
2280 12280 清除
2281 12281 累充满%s
2282 12282 每\n日\n仅\n需\n充\n值\n6\n元
2283 12283 每\n日\n仅\n需\n充\n值\n$1 每\n日\n仅\n需\n充\n值\n$0.99
2284 12284 %m月%d日%H时