日志,本地化修改
parent
e46d735134
commit
bacf88be86
|
@ -630,7 +630,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!224 &565426657
|
--- !u!224 &565426657
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -1716,7 +1716,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 0
|
m_IsActive: 1
|
||||||
--- !u!224 &1808648954
|
--- !u!224 &1808648954
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -2430,7 +2430,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 220, y: -30}
|
m_AnchoredPosition: {x: 489, y: -30}
|
||||||
m_SizeDelta: {x: 360, y: 30}
|
m_SizeDelta: {x: 360, y: 30}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &7831156585591067873
|
--- !u!114 &7831156585591067873
|
||||||
|
@ -5914,7 +5914,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 86, y: -30}
|
m_AnchoredPosition: {x: 296, y: -30}
|
||||||
m_SizeDelta: {x: 0, y: 60}
|
m_SizeDelta: {x: 0, y: 60}
|
||||||
m_Pivot: {x: 0, y: 0.5}
|
m_Pivot: {x: 0, y: 0.5}
|
||||||
--- !u!222 &1254031054342702809
|
--- !u!222 &1254031054342702809
|
||||||
|
@ -7356,7 +7356,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 43, y: -30}
|
m_AnchoredPosition: {x: 253, y: -30}
|
||||||
m_SizeDelta: {x: 46, y: 50}
|
m_SizeDelta: {x: 46, y: 50}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &7440753204596349393
|
--- !u!222 &7440753204596349393
|
||||||
|
@ -9009,7 +9009,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 186.9, y: -30}
|
m_AnchoredPosition: {x: 396.9, y: -30}
|
||||||
m_SizeDelta: {x: 333.8, y: 60}
|
m_SizeDelta: {x: 333.8, y: 60}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &953930339862039810
|
--- !u!222 &953930339862039810
|
||||||
|
@ -9354,7 +9354,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 20, y: -30}
|
m_AnchoredPosition: {x: 230, y: -30}
|
||||||
m_SizeDelta: {x: 59, y: 60}
|
m_SizeDelta: {x: 59, y: 60}
|
||||||
m_Pivot: {x: 0, y: 0.5}
|
m_Pivot: {x: 0, y: 0.5}
|
||||||
--- !u!222 &7460730661891921754
|
--- !u!222 &7460730661891921754
|
||||||
|
@ -9666,8 +9666,8 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 263.2, y: -2.9}
|
m_AnchoredPosition: {x: 257, y: -2.9}
|
||||||
m_SizeDelta: {x: 273.6, y: 50}
|
m_SizeDelta: {x: 261.2, y: 50}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &6262845534552740248
|
--- !u!222 &6262845534552740248
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -9704,7 +9704,7 @@ MonoBehaviour:
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 2
|
m_MinSize: 2
|
||||||
m_MaxSize: 40
|
m_MaxSize: 40
|
||||||
m_Alignment: 4
|
m_Alignment: 5
|
||||||
m_AlignByGeometry: 0
|
m_AlignByGeometry: 0
|
||||||
m_RichText: 1
|
m_RichText: 1
|
||||||
m_HorizontalOverflow: 1
|
m_HorizontalOverflow: 1
|
||||||
|
@ -9982,7 +9982,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 20, y: -30}
|
m_AnchoredPosition: {x: 230, y: -30}
|
||||||
m_SizeDelta: {x: 0, y: 60}
|
m_SizeDelta: {x: 0, y: 60}
|
||||||
m_Pivot: {x: 0, y: 0.5}
|
m_Pivot: {x: 0, y: 0.5}
|
||||||
--- !u!222 &928783852799262530
|
--- !u!222 &928783852799262530
|
||||||
|
|
|
@ -553,6 +553,7 @@ end
|
||||||
function this.LogItemAdapter(item, data)
|
function this.LogItemAdapter(item, data)
|
||||||
local nameText = Util.GetGameObject(item, "name")
|
local nameText = Util.GetGameObject(item, "name")
|
||||||
local statusText = Util.GetGameObject(item, "state")
|
local statusText = Util.GetGameObject(item, "state")
|
||||||
|
LogGreen("data.info:"..data.info)
|
||||||
local logStr = string.split(data.info,"|")
|
local logStr = string.split(data.info,"|")
|
||||||
nameText:GetComponent("Text").text = logStr[GetCurLanguage()+1] or logStr[1]
|
nameText:GetComponent("Text").text = logStr[GetCurLanguage()+1] or logStr[1]
|
||||||
statusText:GetComponent("Text").text = GetDeltaTimeStr(data.time)
|
statusText:GetComponent("Text").text = GetDeltaTimeStr(data.time)
|
||||||
|
|
|
@ -58,7 +58,6 @@ function GuildMemberInfoPopup:InitComponent()
|
||||||
|
|
||||||
this.memHead = Util.GetGameObject(self.transform, "tipImage/panel/info/head")
|
this.memHead = Util.GetGameObject(self.transform, "tipImage/panel/info/head")
|
||||||
this.memName = Util.GetGameObject(self.transform, "tipImage/panel/info/name"):GetComponent("Text")
|
this.memName = Util.GetGameObject(self.transform, "tipImage/panel/info/name"):GetComponent("Text")
|
||||||
this.memProfessTip = Util.GetGameObject(self.transform, "tipImage/panel/info/professName"):GetComponent("Text")
|
|
||||||
this.memProfess = Util.GetGameObject(self.transform, "tipImage/panel/info/profess"):GetComponent("Text")
|
this.memProfess = Util.GetGameObject(self.transform, "tipImage/panel/info/profess"):GetComponent("Text")
|
||||||
this.addFriendBtn = Util.GetGameObject(self.transform, "tipImage/panel/info/btnAdd")
|
this.addFriendBtn = Util.GetGameObject(self.transform, "tipImage/panel/info/btnAdd")
|
||||||
this.addFriendBtnText = Util.GetGameObject(this.addFriendBtn, "text"):GetComponent("Text")
|
this.addFriendBtnText = Util.GetGameObject(this.addFriendBtn, "text"):GetComponent("Text")
|
||||||
|
@ -192,8 +191,7 @@ end
|
||||||
-- 刷新基础信息显示
|
-- 刷新基础信息显示
|
||||||
function this.RefreshPlayerInfo()
|
function this.RefreshPlayerInfo()
|
||||||
this.memName.text = this._MemData.userName
|
this.memName.text = this._MemData.userName
|
||||||
this.memProfessTip.text = Language[10935]
|
this.memProfess.text = Language[10935]..GUILD_GRANT_STR[this._MemData.position]
|
||||||
this.memProfess.text = GUILD_GRANT_STR[this._MemData.position]
|
|
||||||
-- 头像
|
-- 头像
|
||||||
if not _PlayerHead then
|
if not _PlayerHead then
|
||||||
_PlayerHead = SubUIManager.Open(SubUIConfig.PlayerHeadView, this.memHead.transform)
|
_PlayerHead = SubUIManager.Open(SubUIConfig.PlayerHeadView, this.memHead.transform)
|
||||||
|
|
|
@ -68,8 +68,10 @@ function this.GetNotice(str)
|
||||||
--Log("data.parms.content:"..data.parms.content)
|
--Log("data.parms.content:"..data.parms.content)
|
||||||
|
|
||||||
if data.parms then
|
if data.parms then
|
||||||
this.TitleText.text=data.parms.title
|
local titleStr = string.split(data.parms.title,"|")
|
||||||
this.ContentText.text=string.gsub(data.parms.content, "\\n", "\n")
|
this.TitleText.text =titleStr[GetCurLanguage()+1] or titleStr[1]
|
||||||
|
local contentStr = string.split(string.gsub(data.parms.content, "\\n", "\n"),"|")
|
||||||
|
this.ContentText.text = contentStr[GetCurLanguage()+1] or contentStr[1]
|
||||||
else
|
else
|
||||||
this.TitleText.text=Language[11147]
|
this.TitleText.text=Language[11147]
|
||||||
this.ContentText.text=Language[11148]
|
this.ContentText.text=Language[11148]
|
||||||
|
|
|
@ -32,6 +32,7 @@ function this.UpdateMialData(_mial)
|
||||||
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:永久有效
|
||||||
|
@ -44,6 +45,9 @@ end
|
||||||
function this.GetStringByStringformat(inputStr)
|
function this.GetStringByStringformat(inputStr)
|
||||||
local msgStr = string.split(inputStr,"#")
|
local msgStr = string.split(inputStr,"#")
|
||||||
LogGreen("inputStr:"..inputStr)
|
LogGreen("inputStr:"..inputStr)
|
||||||
|
if #msgStr == 1 then
|
||||||
|
return GetLanguageStrById(msgStr[1])
|
||||||
|
end
|
||||||
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)
|
||||||
|
|
Loading…
Reference in New Issue