Merge branch 'tcx_xiyou_yueNan' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_yueNan
commit
a53756f8af
Binary file not shown.
After Width: | Height: | Size: 962 B |
|
@ -0,0 +1,110 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: e9fde547af374c34fbafc92611a15bce
|
||||||
|
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
|
||||||
|
- 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: 69e35ccea6ab7a54ba497f32400dad40
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
Binary file not shown.
After Width: | Height: | Size: 1.2 KiB |
|
@ -0,0 +1,110 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f4bd859b1685fec459eb2ee3d45c09f2
|
||||||
|
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
|
||||||
|
- 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: 71271714780e6dd488b4c268077a901d
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
|
@ -1,5 +1,5 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: edcb694b0b09af246ab5576b6265566d
|
guid: 92063aac157e9124694cac8a8100b85c
|
||||||
TextureImporter:
|
TextureImporter:
|
||||||
fileIDToRecycleName: {}
|
fileIDToRecycleName: {}
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
|
@ -97,7 +97,7 @@ TextureImporter:
|
||||||
outline: []
|
outline: []
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
bones: []
|
bones: []
|
||||||
spriteID: d444aa903a2bd594d93e236d7dcd37ed
|
spriteID: 7be537f56c8440a43bc10d52202377c0
|
||||||
vertices: []
|
vertices: []
|
||||||
indices:
|
indices:
|
||||||
edges: []
|
edges: []
|
|
@ -1824,7 +1824,7 @@ MonoBehaviour:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_Sprite: {fileID: 21300000, guid: edcb694b0b09af246ab5576b6265566d, type: 3}
|
m_Sprite: {fileID: 21300000, guid: 92063aac157e9124694cac8a8100b85c, type: 3}
|
||||||
m_Type: 0
|
m_Type: 0
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
|
|
|
@ -2234,7 +2234,7 @@
|
||||||
[12233] = GetLanguageStrById("星解锁)"),
|
[12233] = GetLanguageStrById("星解锁)"),
|
||||||
[12234] = GetLanguageStrById(" (精炼"),
|
[12234] = GetLanguageStrById(" (精炼"),
|
||||||
[12235] = GetLanguageStrById("级解锁)"),
|
[12235] = GetLanguageStrById("级解锁)"),
|
||||||
[12236] = GetLanguageStrById(" <color=#1E9A44>潜能 +%s(%s%%)</color>"),
|
[12236] = GetLanguageStrById(" <color=#1E9A44>潜能 +%s(%s%%)</color>"),
|
||||||
[12237] = GetLanguageStrById("(四灵试炼%s层解锁)"),
|
[12237] = GetLanguageStrById("(四灵试炼%s层解锁)"),
|
||||||
[12238] = GetLanguageStrById("<color=#FE2F33>强化大师%s级</color>"),
|
[12238] = GetLanguageStrById("<color=#FE2F33>强化大师%s级</color>"),
|
||||||
[12239] = GetLanguageStrById("<color=#FE2F33>精炼大师%s级</color>"),
|
[12239] = GetLanguageStrById("<color=#FE2F33>精炼大师%s级</color>"),
|
||||||
|
|
|
@ -11,7 +11,7 @@ function this.Initialize()
|
||||||
if GetCurLanguage() == 0 then
|
if GetCurLanguage() == 0 then
|
||||||
this.MT = MoneyType.RMB
|
this.MT = MoneyType.RMB
|
||||||
elseif GetCurLanguage() == 1 then
|
elseif GetCurLanguage() == 1 then
|
||||||
this.MT = MoneyType.RMB
|
this.MT = MoneyType.USD
|
||||||
elseif GetCurLanguage() == 2 then
|
elseif GetCurLanguage() == 2 then
|
||||||
this.MT = MoneyType.MM
|
this.MT = MoneyType.MM
|
||||||
else
|
else
|
||||||
|
@ -76,7 +76,7 @@ function this.GetMoneyUnitName(mt)
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.GetMoneyUnitNameWithMoney(money)
|
function this.GetMoneyUnitNameWithMoney(money)
|
||||||
local formater = this.GetMoneyUnitName()
|
local formater = this.GetMoneyUnitName(this.Mt)
|
||||||
return string.format(formater, this.GetMoney(money))
|
return string.format(formater, this.GetMoney(money))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ function this.UpdateMialData(_mial,isAdd)
|
||||||
local title = string.split(_mial.head,"|")
|
local title = string.split(_mial.head,"|")
|
||||||
singleMail.head = title[GetCurLanguage()+1] or title[1]
|
singleMail.head = title[GetCurLanguage()+1] or title[1]
|
||||||
singleMail.head = this.GetStringByStringformat(singleMail.head)
|
singleMail.head = this.GetStringByStringformat(singleMail.head)
|
||||||
local content = string.split(_mial.content,"|")
|
local content = string.split(_mial.content,"|")
|
||||||
singleMail.content = content[GetCurLanguage()+1] or content[1]--详情
|
singleMail.content = content[GetCurLanguage()+1] or content[1]--详情
|
||||||
singleMail.content = this.GetStringByStringformat(singleMail.content)
|
singleMail.content = this.GetStringByStringformat(singleMail.content)
|
||||||
-- --LogGreen("singleMail.content:"..singleMail.content)
|
-- --LogGreen("singleMail.content:"..singleMail.content)
|
||||||
|
@ -85,11 +85,11 @@ function this.GetStringByStringformat(inputStr)
|
||||||
end
|
end
|
||||||
local returnStr = string.format(
|
local returnStr = string.format(
|
||||||
GetLanguageStrById(msgStr[1]),
|
GetLanguageStrById(msgStr[1]),
|
||||||
tostring(msgStr[2]),
|
GetLanguageStrById(tostring(msgStr[2])),
|
||||||
tostring(msgStr[3]),
|
GetLanguageStrById(tostring(msgStr[3])),
|
||||||
tostring(msgStr[4]),
|
GetLanguageStrById(tostring(msgStr[4])),
|
||||||
tostring(msgStr[5]),
|
GetLanguageStrById(tostring(msgStr[5])),
|
||||||
tostring(msgStr[6])
|
GetLanguageStrById(tostring(msgStr[6]))
|
||||||
)
|
)
|
||||||
-- LogPink("returnStr:"..returnStr)
|
-- LogPink("returnStr:"..returnStr)
|
||||||
return returnStr
|
return returnStr
|
||||||
|
|
|
@ -451,7 +451,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
|
||||||
end
|
end
|
||||||
elseif _itemData.itemType == 5 then
|
elseif _itemData.itemType == 5 then
|
||||||
self.num:SetActive(false)
|
self.num:SetActive(false)
|
||||||
self.name:GetComponent("Text").text = GetCutOutStr(_itemData.name, 5)
|
self.name:GetComponent("Text").text = GetCutOutStr(GetLanguageStrById(_itemData.name), 5)
|
||||||
--self.resetLv:GetComponent("Text").text = "+" .._itemData.lv.." ".._itemData.refineLv
|
--self.resetLv:GetComponent("Text").text = "+" .._itemData.lv.." ".._itemData.refineLv
|
||||||
self.resetLv:SetActive(false)
|
self.resetLv:SetActive(false)
|
||||||
self.fragmentIcon:SetActive(true)
|
self.fragmentIcon:SetActive(true)
|
||||||
|
@ -472,7 +472,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
|
||||||
elseif _itemData.configData then
|
elseif _itemData.configData then
|
||||||
str = _itemData.configData.Name
|
str = _itemData.configData.Name
|
||||||
end
|
end
|
||||||
self.name:GetComponent("Text").text = GetCutOutStr(str, 5)
|
self.name:GetComponent("Text").text = GetCutOutStr(GetLanguageStrById(str), 5)
|
||||||
-- self.resetLv:GetComponent("Text").text = "+" ..1
|
-- self.resetLv:GetComponent("Text").text = "+" ..1
|
||||||
self.resetLv:SetActive(false)
|
self.resetLv:SetActive(false)
|
||||||
self.fragmentIcon:SetActive(false)
|
self.fragmentIcon:SetActive(false)
|
||||||
|
@ -1186,7 +1186,7 @@ function ItemView:ResetNameSize(v2, v3)
|
||||||
end
|
end
|
||||||
|
|
||||||
function ItemView:ResetName(nameStr)
|
function ItemView:ResetName(nameStr)
|
||||||
self.name:GetComponent("Text").text = nameStr
|
self.name:GetComponent("Text").text = GetLanguageStrById(nameStr)
|
||||||
end
|
end
|
||||||
|
|
||||||
function ItemView:OnClose()
|
function ItemView:OnClose()
|
||||||
|
|
Loading…
Reference in New Issue