diff --git a/Assets/ManagedResources/Prefabs/Map/UI_MainPlayer.prefab b/Assets/ManagedResources/Prefabs/Map/UI_MainPlayer.prefab
index 42c4659669..0e04a312cc 100644
--- a/Assets/ManagedResources/Prefabs/Map/UI_MainPlayer.prefab
+++ b/Assets/ManagedResources/Prefabs/Map/UI_MainPlayer.prefab
@@ -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:
diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
index de6c37f5f8..6fde6a5bfb 100644
--- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
@@ -9624,8 +9624,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: 4.899994, y: -338}
- m_SizeDelta: {x: 600, y: 115.1}
+ m_AnchoredPosition: {x: -2.0000916, y: -338}
+ m_SizeDelta: {x: 632.8, y: 115.1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8029727511439798878
CanvasRenderer:
@@ -9659,14 +9659,14 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 35
m_FontStyle: 0
- m_BestFit: 1
+ m_BestFit: 0
m_MinSize: 3
m_MaxSize: 35
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
+ m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u89E3\u9501\u79D8\u5B9D\uFF0C\u53EF\u4EE5\u9886\u53D6\u989D\u5916\u4E13\u5C5E\u5956\u52B1\uFF0C\u5E76\u76F4\u63A5\u83B7\u5F97200\u79EF\u5206\uFF0C\u53EF\u83B7\u53D61980\u5996\u6676\uFF0C\u90AE\u4EF6\u9886\u53D6"
LanguageIndex: 0
@@ -11983,6 +11983,85 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u786E \u8BA4"
LanguageIndex: 10123
+--- !u!1 &2570075562108282243
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7858246822778438727}
+ - component: {fileID: 5413660572345632513}
+ - component: {fileID: 643456947987941065}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &7858246822778438727
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2570075562108282243}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 4002341678660140781}
+ m_RootOrder: 1
+ 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: 0, y: -0}
+ m_SizeDelta: {x: 167.6, y: 51.1}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5413660572345632513
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2570075562108282243}
+ m_CullTransparentMesh: 0
+--- !u!114 &643456947987941065
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2570075562108282243}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 0.8588236, b: 0.60784316, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
+ m_FontSize: 43
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 10
+ m_MaxSize: 51
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "98\u5143"
--- !u!1 &2608535148006920750
GameObject:
m_ObjectHideFlags: 0
@@ -14831,7 +14910,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &7801970642132342922
RectTransform:
m_ObjectHideFlags: 0
@@ -29573,6 +29652,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7801970642132342922}
+ - {fileID: 7858246822778438727}
m_Father: {fileID: 7846968063202130352}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/ManagedResources/Prefabs/UI/TreasureOfHeaven/EndLessTreasurePanel.prefab b/Assets/ManagedResources/Prefabs/UI/TreasureOfHeaven/EndLessTreasurePanel.prefab
index cc42449b73..ad8344adf0 100644
--- a/Assets/ManagedResources/Prefabs/UI/TreasureOfHeaven/EndLessTreasurePanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/TreasureOfHeaven/EndLessTreasurePanel.prefab
@@ -2896,7 +2896,7 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: 000
+ m_Text:
diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
index 455f2be3c4..63c0abd71e 100644
--- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
@@ -331,8 +331,9 @@ 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).." practiceLevel:"..tostring(NPCList[i].practiceLevel))
- if NPCList[i].lv and NPCList[i].lv >= GlobalSysConfig[108].OpenRules[2] then
+ -- 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)
PracticeManager.SetPracticeIcon(view.ImprintImg,NPCList[i].practiceLevel)
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua
index 98a8db15c7..e1cb8873b5 100644
--- a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua
@@ -707,6 +707,7 @@ function this.GetMainPlayerNPCData(fun)
for i = 1, #msg.Friends do
if msg.Friends[i].id ~= PlayerManager.uid then
--LogBlue("msg.Friends[i] "..msg.Friends[i].userSkin.." "..msg.Friends[i].userTitle.." "..msg.Friends[i].userMount.." "..msg.Friends[i].sex)
+ msg.Friends[i].name = PracticeManager.SetNameColor(msg.Friends[i].name,msg.Friends[i].practiceLevel)
table.insert(curfriendAllList,msg.Friends[i])
end
end
@@ -768,6 +769,7 @@ function this.GetPlayerViewDataByType(index,randomList,needNum,func)
for i = 1, #msg.Friends do
if msg.Friends[i].id ~= PlayerManager.uid then
--LogBlue("msg.Friends[i] "..msg.Friends[i].userSkin.." "..msg.Friends[i].userTitle.." "..msg.Friends[i].userMount.." "..msg.Friends[i].sex.." "..msg.Friends[i].userName)
+ msg.Friends[i].name = PracticeManager.SetNameColor(msg.Friends[i].name,msg.Friends[i].practiceLevel)
table.insert(friendNPCList1,msg.Friends[i])
end
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua
index c21bcc17ec..45ae8ea7bd 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua
@@ -24,6 +24,7 @@ function this:InitComponent(gameObject)
this.btnBack = Util.GetGameObject(gameObject, "frame/bg/closeBtn")
this.dealBtn = Util.GetGameObject(gameObject, "frame/bg/dealBtn")
this.dealBtnIma = Util.GetGameObject(this.dealBtn, "Image"):GetComponent("Image")
+ this.dealBtnText = Util.GetGameObject(this.dealBtn, "Text"):GetComponent("Text")
if MoneyUtil.MT == MoneyType.RMB then
this.dealBtnIma.sprite = this.spLoader:LoadSprite("q_qinlongmibao_jiesuozhenbao198")
else
@@ -63,14 +64,22 @@ function this:OnShow(_parent,...)
rewardData = TreasureOfHeavenManger.GetAllRewardData()
this:showRewardTianGong()
this.tip.text = Language[12286]
+ this.dealBtnIma.gameObject:SetActive(true)
+ this.dealBtnText.gameObject:SetActive(false)
elseif curType == 2 then
rewardData = QinglongSerectTreasureManager.GetAllRewardData()
this:showRewardQinglong()
this.tip.text = Language[12287]
+ this.dealBtnIma.gameObject:SetActive(true)
+ this.dealBtnText.gameObject:SetActive(false)
elseif curType == 3 then
rewardData,rewardData1 = EndLessMapManager.GetAllRewardData()
this:showRewardWuJin(rewardData,rewardData1)
- this.tip.text = Language[12287]
+ this.tip.text = "解锁秘宝,激活进阶专属奖励+2000积分,可获取980妖晶"
+ this.dealBtnIma.gameObject:SetActive(false)
+ this.dealBtnText.gameObject:SetActive(true)
+ local config = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,type[curType].id)
+ this.dealBtnText.text = MoneyUtil.GetMoneyUnitNameWithMoney(config.Price)
end
end
diff --git a/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua b/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua
index c3f4157339..4b91969f9d 100644
--- a/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua
+++ b/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua
@@ -183,7 +183,8 @@ function SingleFightPlayerView:SetData(u,v,isSelf,data)
end
self.name.text = data.userName or data.name
self.nameDi.gameObject:SetActive(true)
- if data.lv and data.lv >= GlobalSysConfig[108].OpenRules[2] then
+ local _lv = data.lv or data.level or data.userLevel
+ if _lv and _lv >= GlobalSysConfig[108].OpenRules[2] then
self.PracticeIcon:SetActive(true)
PracticeManager.SetPracticeIcon(self.PracticeIcon,data.practiceLevel)
end