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

dev_chengFeng
gaoxin 2021-02-25 21:51:14 +08:00
commit 395d776dec
6 changed files with 63 additions and 58 deletions

View File

@ -630,7 +630,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &565426657
RectTransform:
m_ObjectHideFlags: 0
@ -1716,7 +1716,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1808648954
RectTransform:
m_ObjectHideFlags: 0
@ -2430,7 +2430,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {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_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &7831156585591067873
@ -5914,7 +5914,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {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_Pivot: {x: 0, y: 0.5}
--- !u!222 &1254031054342702809
@ -7356,7 +7356,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {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_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7440753204596349393
@ -9009,7 +9009,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {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_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &953930339862039810
@ -9354,7 +9354,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {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_Pivot: {x: 0, y: 0.5}
--- !u!222 &7460730661891921754
@ -9666,8 +9666,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 263.2, y: -2.9}
m_SizeDelta: {x: 273.6, y: 50}
m_AnchoredPosition: {x: 257, y: -2.9}
m_SizeDelta: {x: 261.2, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6262845534552740248
CanvasRenderer:
@ -9704,7 +9704,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 4
m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
@ -9982,7 +9982,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {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_Pivot: {x: 0, y: 0.5}
--- !u!222 &928783852799262530

View File

@ -2875,10 +2875,10 @@ RectTransform:
m_Father: {fileID: 4090152033796247733}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 369.21997, y: -45.71}
m_SizeDelta: {x: 234.4, y: 82.4}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3275098193225773980
CanvasRenderer:
@ -3206,7 +3206,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &956434821998691110
RectTransform:
m_ObjectHideFlags: 0
@ -4287,7 +4287,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1918779212793027703
RectTransform:
m_ObjectHideFlags: 0
@ -4925,10 +4925,10 @@ RectTransform:
m_Father: {fileID: 7559358737188565728}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 120.88501, y: -44.525}
m_SizeDelta: {x: 168, y: 58}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1918779213686181055
CanvasRenderer:
@ -5372,7 +5372,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -248.69995, y: 41.399933}
m_SizeDelta: {x: 135, y: 100}
m_SizeDelta: {x: 0, y: 100}
m_Pivot: {x: 0, y: 1}
--- !u!114 &462056855713613971
MonoBehaviour:
@ -5523,7 +5523,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1852221678040442447
RectTransform:
m_ObjectHideFlags: 0
@ -7064,10 +7064,10 @@ RectTransform:
m_Father: {fileID: 7559358737188565728}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 358.285, y: -44.525}
m_SizeDelta: {x: 168, y: 58}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4580382491728856826
CanvasRenderer:
@ -7283,10 +7283,10 @@ RectTransform:
m_Father: {fileID: 4090152033796247733}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 132.37, y: -45.71}
m_SizeDelta: {x: 234.4, y: 82.4}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4885987568793261615
CanvasRenderer:
@ -8650,7 +8650,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &6644994250578170794
RectTransform:
m_ObjectHideFlags: 0
@ -9929,7 +9929,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 10, y: 41.399933}
m_SizeDelta: {x: 135, y: 100}
m_SizeDelta: {x: 0, y: 100}
m_Pivot: {x: 0, y: 1}
--- !u!114 &327137578093138444
MonoBehaviour:
@ -10255,7 +10255,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 291.99997, y: -42}
m_SizeDelta: {x: 325, y: 39.2}
m_SizeDelta: {x: 0, y: 39.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7701535949295788202
CanvasRenderer:

View File

@ -553,6 +553,7 @@ end
function this.LogItemAdapter(item, data)
local nameText = Util.GetGameObject(item, "name")
local statusText = Util.GetGameObject(item, "state")
LogGreen("data.info:"..data.info)
local logStr = string.split(data.info,"|")
nameText:GetComponent("Text").text = logStr[GetCurLanguage()+1] or logStr[1]
statusText:GetComponent("Text").text = GetDeltaTimeStr(data.time)

View File

@ -58,7 +58,6 @@ function GuildMemberInfoPopup:InitComponent()
this.memHead = Util.GetGameObject(self.transform, "tipImage/panel/info/head")
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.addFriendBtn = Util.GetGameObject(self.transform, "tipImage/panel/info/btnAdd")
this.addFriendBtnText = Util.GetGameObject(this.addFriendBtn, "text"):GetComponent("Text")
@ -192,8 +191,7 @@ end
-- 刷新基础信息显示
function this.RefreshPlayerInfo()
this.memName.text = this._MemData.userName
this.memProfessTip.text = Language[10935]
this.memProfess.text = GUILD_GRANT_STR[this._MemData.position]
this.memProfess.text = Language[10935]..GUILD_GRANT_STR[this._MemData.position]
-- 头像
if not _PlayerHead then
_PlayerHead = SubUIManager.Open(SubUIConfig.PlayerHeadView, this.memHead.transform)

View File

@ -68,8 +68,10 @@ function this.GetNotice(str)
--Log("data.parms.content:"..data.parms.content)
if data.parms then
this.TitleText.text=data.parms.title
this.ContentText.text=string.gsub(data.parms.content, "\\n", "\n")
local titleStr = string.split(data.parms.title,"|")
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
this.TitleText.text=Language[11147]
this.ContentText.text=Language[11148]

View File

@ -32,6 +32,7 @@ function this.UpdateMialData(_mial)
local content = string.split(_mial.content,"|")
singleMail.content = content[GetCurLanguage()+1] or content[1]--详情
singleMail.content = this.GetStringByStringformat(singleMail.content)
LogGreen("singleMail.content:"..singleMail.content)
singleMail.mailItem = _mial.mailItem--附件 奖励
singleMail.sendTime = _mial.sendTime--
singleMail.effectiveTime = _mial.effectiveTime--秒 0:永久有效
@ -44,26 +45,29 @@ end
function this.GetStringByStringformat(inputStr)
local msgStr = string.split(inputStr,"#")
LogGreen("inputStr:"..inputStr)
for i = 2, #msgStr do
--1 需要翻译
local oneStr = string.sub(msgStr[i],1,1)
if tonumber(oneStr) == 1 then
msgStr[i] = tostring(string.sub(msgStr[i],2))
msgStr[i] = GetLanguageStrById(msgStr[i])
else
msgStr[i] = tostring(string.sub(msgStr[i],2))
end
if #msgStr == 1 then
return GetLanguageStrById(msgStr[1])
end
for i = 2, #msgStr do
--1 需要翻译
local oneStr = string.sub(msgStr[i],1,1)
if tonumber(oneStr) == 1 then
msgStr[i] = tostring(string.sub(msgStr[i],2))
msgStr[i] = GetLanguageStrById(msgStr[i])
else
msgStr[i] = tostring(string.sub(msgStr[i],2))
end
local returnStr = string.format(
GetLanguageStrById(msgStr[1]),
tostring(msgStr[2]),
tostring(msgStr[3]),
tostring(msgStr[4]),
tostring(msgStr[5]),
tostring(msgStr[6])
)
LogPink("returnStr:"..returnStr)
return returnStr
end
local returnStr = string.format(
GetLanguageStrById(msgStr[1]),
tostring(msgStr[2]),
tostring(msgStr[3]),
tostring(msgStr[4]),
tostring(msgStr[5]),
tostring(msgStr[6])
)
LogPink("returnStr:"..returnStr)
return returnStr
end
--更新邮件状态