Merge branch 'tcx_xiyou_yueNan' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_yueNan
commit
4d7f015314
|
|
@ -34,7 +34,6 @@ function this.UpdateMialData(_mial,isAdd)
|
||||||
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)
|
|
||||||
singleMail.mailItem = _mial.mailItem--附件 奖励
|
singleMail.mailItem = _mial.mailItem--附件 奖励
|
||||||
singleMail.sendTime = _mial.sendTime--
|
singleMail.sendTime = _mial.sendTime--
|
||||||
singleMail.effectiveTime = _mial.effectiveTime--秒 0:永久有效
|
singleMail.effectiveTime = _mial.effectiveTime--秒 0:永久有效
|
||||||
|
|
@ -65,11 +64,11 @@ function this.GetSingleMail(mailId)
|
||||||
end
|
end
|
||||||
function this.GetStringByStringformat(inputStr)
|
function this.GetStringByStringformat(inputStr)
|
||||||
local msgStr = string.split(inputStr,"#")
|
local msgStr = string.split(inputStr,"#")
|
||||||
--LogGreen("inputStr:"..inputStr)
|
LogWarn("inputStr:"..msgStr[1])
|
||||||
if #msgStr == 1 then
|
if #msgStr == 1 then
|
||||||
return GetLanguageStrById(msgStr[1])
|
return GetLanguageStrById(msgStr[1])
|
||||||
end
|
end
|
||||||
LogGreen("inputStr1:"..msgStr[1])
|
LogWarn("inputStr1:"..msgStr[1])
|
||||||
for i = 2, #msgStr do
|
for i = 2, #msgStr do
|
||||||
--1 需要翻译
|
--1 需要翻译
|
||||||
local oneStr = string.sub(msgStr[i],1,1)
|
local oneStr = string.sub(msgStr[i],1,1)
|
||||||
|
|
@ -83,6 +82,7 @@ function this.GetStringByStringformat(inputStr)
|
||||||
LogGreen("inputStr3:"..msgStr[i])
|
LogGreen("inputStr3:"..msgStr[i])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
LogWarn("inputStr2:"..inputStr)
|
||||||
local returnStr = string.format(
|
local returnStr = string.format(
|
||||||
GetLanguageStrById(msgStr[1]),
|
GetLanguageStrById(msgStr[1]),
|
||||||
GetLanguageStrById(tostring(msgStr[2])),
|
GetLanguageStrById(tostring(msgStr[2])),
|
||||||
|
|
@ -91,6 +91,7 @@ function this.GetStringByStringformat(inputStr)
|
||||||
GetLanguageStrById(tostring(msgStr[5])),
|
GetLanguageStrById(tostring(msgStr[5])),
|
||||||
GetLanguageStrById(tostring(msgStr[6]))
|
GetLanguageStrById(tostring(msgStr[6]))
|
||||||
)
|
)
|
||||||
|
LogWarn("inputStr3:"..msgStr[2])
|
||||||
-- LogPink("returnStr:"..returnStr)
|
-- LogPink("returnStr:"..returnStr)
|
||||||
return returnStr
|
return returnStr
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -113,6 +113,7 @@ function MainSingleInfoPanel:OnShowMailData(mailData)
|
||||||
self.mialHead.text = mailData.head
|
self.mialHead.text = mailData.head
|
||||||
self.mialTimeText.text = GetTimeStrBySeconds(mailData.effectiveTime + mailData.sendTime) .. Language[11751]
|
self.mialTimeText.text = GetTimeStrBySeconds(mailData.effectiveTime + mailData.sendTime) .. Language[11751]
|
||||||
self.mialInfo.text = string.gsub(mailData.content, "\\n", "\n")
|
self.mialInfo.text = string.gsub(mailData.content, "\\n", "\n")
|
||||||
|
LogWarn("str3="..mailData.content)
|
||||||
Log("mailData.state " .. mailData.state)
|
Log("mailData.state " .. mailData.state)
|
||||||
self.btnDel:SetActive(false)
|
self.btnDel:SetActive(false)
|
||||||
if mailData.state == 3 then
|
if mailData.state == 3 then
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue