diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua
index a9ef936af3..7206a80e8c 100644
--- a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua
@@ -289,9 +289,6 @@ function this.RefreshShow(isForceBottom)
for key, value in pairs(meshs:ToTable()) do
-- value.material.shader=Shader.Find("Custom/S_03_UV_alpha_add_1")
--value.material= resMgr:LoadAsset("chenghao_mat2")
- if value.material.shader=="" then
- -- body
- end
value.material.shader=this.shader2
end
diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua
index b88524fac6..82528dc471 100644
--- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua
+++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua
@@ -123,7 +123,7 @@ function this:ShowUpItem(config,actId)
end
end
hero:OnOpen(false,{config.Id,1},1.1,true)
- hero.name:GetComponent("Text").text=""..string.format("%.2f", 5 ).."%"
+ hero.name:GetComponent("Text").text=""..string.format("%.2f", 1 ).."%"
hero.gameObject:SetActive(true)
for k,v in ipairs(this.ratePreList) do
@@ -134,7 +134,7 @@ function this:ShowUpItem(config,actId)
-- return a.GetRate>b.GetRate
-- end)
local rateList={}
- local hero={tag="5星神将UP",name=config.ReadingName,value=0.05,Color=1}
+ local hero={tag="5星神将UP",name=config.ReadingName,value=0.01,Color=1}
for key, value in ConfigPairs(pool) do
local id=value.ItemId[1]
local itemConfig=ConfigManager.TryGetConfigData(ConfigName.ItemConfig,id)
diff --git a/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua
index cfa66e9b51..6001bae3ac 100644
--- a/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua
@@ -61,7 +61,7 @@ function MainPlayerView.New(isSelf, root, rect, pos,_NpvData,sortingOrder)
instance.NpcGO = PlayerLiveView:New(instance.roleRootTran,2, PlayerLiveViewData,sortingOrder)
end
-- instance.NpcGO = PlayerLiveView:New(instance.roleRootTran,1, nil)
- instance.NpcGO:SetNameHeight(3)
+ --instance.NpcGO:SetNameHeight(3)
instance.NpcGO:OnOpen()
instance.NameText.text = PlayerManager.nickName
instance.rect = rect
diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
index 79ea3fdf18..99acae4c10 100644
--- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
@@ -283,6 +283,7 @@ function this.SetHeadsInfo(data,root,index,name,level)
designation = data.userTitle,
}
npc = PlayerLiveView:New(this.livePrefab.transform,2, curPlayerLiveViewData,this.sortingOrder)
+ npc:SetNameHeight(-2.5)
npc:OnOpen(GetPlayerRoleSingleConFig().Scale6,Vector3.New(0,-118.65,0),WALK_DIR.IDLE_LEFT)
Util.AddOnceClick(this.firstheadClick,function()
diff --git a/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua b/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua
index aae0804143..77c9596580 100644
--- a/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua
+++ b/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua
@@ -58,7 +58,6 @@ function PlayerLiveView:New(gameObject,_Type, PlayerLiveViewData,orginLayer,posT
instance.oldPlayerDiry = nil
instance.oldRideDirAnimation = nil
instance.oldRideDiry = nil
- nameHeight=0
setmetatable(instance, { __index = PlayerLiveView })
return instance
end
@@ -167,7 +166,7 @@ function PlayerLiveView:OnShowLive()
local curLocalScale = Vector3.New(curArtResourcesConfig.Scale,curArtResourcesConfig.Scale,curArtResourcesConfig.Scale)
local y=curArtResourcesConfig.Position[2]+curPlayerRole.Height
if isRide then
- y=y+3
+ y=y+3+self.nameHeight
end
local curLocalPosition = Vector3.New(curArtResourcesConfig.Position[1],y,0)
LogError("scale=="..curArtResourcesConfig.Scale.." transform scale=="..self.leader.transform.localScale.x)