Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
jiaoyangna 2021-05-29 20:05:14 +08:00
commit e0089a98da
2 changed files with 5 additions and 5 deletions

View File

@ -64,9 +64,9 @@ RectTransform:
m_Father: {fileID: 7615970307446995481}
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: 210, y: -35}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 210, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3096286307795013761
@ -161,7 +161,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 10, y: -32.5}
m_SizeDelta: {x: 59, y: 65}
m_SizeDelta: {x: 40, y: 45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9115302304514649136
CanvasRenderer:

View File

@ -331,7 +331,7 @@ function this:BindEvent()
for i = 1, #NPCList do
local view = MainPlayerView.New(false, this.btnClickMove, rect, Vector2.New(math.random(rect.xMin, rect.xMax), math.random(rect.yMin, rect.yMax)),NPCList[i],this.sortingOrder)
view.NameText.text = NPCList[i].userName or NPCList[i].name
LogYellow("username:"..tostring( NPCList[i].userName).." name:"..tostring(NPCList[i].name).." lv:"..tostring(NPCList[i].lv).." level:"..tostring(NPCList[i].level).." practiceLevel:"..tostring(NPCList[i].practiceLevel))
-- LogYellow("username:"..tostring( NPCList[i].userName).." name:"..tostring(NPCList[i].name).." lv:"..tostring(NPCList[i].lv).." level:"..tostring(NPCList[i].level).." practiceLevel:"..tostring(NPCList[i].practiceLevel))
local _lv = NPCList[i].lv or NPCList[i].level or NPCList[i].userLevel
if _lv and _lv >= GlobalSysConfig[108].OpenRules[2] then
view.ImprintImg:SetActive(true)