称号bug修改

dev_chengFeng
wangzhenxing 2021-04-21 14:42:06 +08:00
parent 78220a5cf9
commit 8e24eea290
11 changed files with 2310 additions and 6944 deletions

View File

@ -5005,7 +5005,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &3285899723573369071
Transform:
m_ObjectHideFlags: 0
@ -9986,7 +9986,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &6519613582380486149
Transform:
m_ObjectHideFlags: 0
@ -19761,7 +19761,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4137110186237655729}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
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:
@ -20803,7 +20803,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []

View File

@ -10323,7 +10323,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@ -15194,7 +15194,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6156609951119148152}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.88533336, y: 0.96533334, z: 0.9200001}
m_Children:

View File

@ -15238,7 +15238,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4254478228208897077}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
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:
@ -15551,7 +15551,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []

File diff suppressed because it is too large Load Diff

View File

@ -791,6 +791,7 @@ RedPointType = {
Setting_Head = 2311,
Setting_Ride = 2312,
Setting_Title = 2313,
Setting_Skin = 2314,
--- 头像改变界面红点 ------
HeadChange_Frame = 23111,
HeadChange_Head = 23112,

View File

@ -69,11 +69,7 @@ function ExpeditionMainPanel:InitComponent()
-- SkeletonGraphic.AnimationState:SetAnimation(0, "move2", true)
-- SkeletonGraphic.transform.localEulerAngles = Vector3.New(0, 0, 0)
-- end
if self.liveNode then
self.liveNode:OnClose()
end
self.liveNode = PlayerLiveView:New(Util.GetTransform(self.parent, "playerLive"),1)
self.liveNode:OnOpen(GetPlayerRoleSingleConFig().Scale10,nil,WALK_DIR.IDLE_FRONT)
self.singlePre = Util.GetGameObject(self.transform, "singlePre")
self.grid = Util.GetGameObject(self.transform, "rect/grid")
@ -163,6 +159,11 @@ end
function ExpeditionMainPanel:OnOpen()
ExpeditionManager.SetExpeditionPanelIsOpen(1)
--LogRed("ExpeditionManager.ExpeditionPanelIsOpen "..ExpeditionManager.ExpeditionPanelIsOpen)
if self.liveNode then
self.liveNode:OnClose()
end
self.liveNode = PlayerLiveView:New(Util.GetTransform(self.parent, "playerLive"),1,nil,self.sortingOrder)
self.liveNode:OnOpen(GetPlayerRoleSingleConFig().Scale10,nil,WALK_DIR.IDLE_FRONT)
if ExpeditionManager.ExpeditionState == 3 then
ExpeditionManager.SetExpeditionState(1)
end

View File

@ -23,7 +23,7 @@ function MainPlayerView.New(isSelf, root, rect, pos,_NpvData,sortingOrder)
Util.GetGameObject(instance.leader, "name/text"):SetActive(true)
Util.GetGameObject(instance.leader, "name/text2"):SetActive(false)
_sex = NameManager.roleSex
instance.NpcGO = PlayerLiveView:New(instance.roleRootTran,1, nil)
instance.NpcGO = PlayerLiveView:New(instance.roleRootTran,1, nil,sortingOrder)
if PlayerManager.GetPlayerRide() > 0 then
Util.GetGameObject(instance.leader, "name").transform.localPosition = Vector3.New(0,239.9,0)

View File

@ -208,6 +208,7 @@ function this.InitRedPointAllRelate()
-- 设置界面红点
RPData:SetParent(RedPointType.Setting_Head, RedPointType.Setting)
RPData:SetParent(RedPointType.Setting_Ride, RedPointType.Setting)
RPData:SetParent(RedPointType.Setting_Title, RedPointType.Setting)
-- 头像界面红点
RPData:SetParent(RedPointType.HeadChange_Frame, RedPointType.Setting_Head)
RPData:SetParent(RedPointType.HeadChange_Head, RedPointType.Setting_Head)

View File

@ -6,9 +6,9 @@ local funIndex = 1
local TabBox = require("Modules/Common/TabBox")
local _TabData={
[1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[12266] , rpType = RedPointType.Setting_Head},
-- [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "称号" },
[2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = Language[12267] , rpType = RedPointType.Setting_Ride},
-- [3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "称号",rpType = RedPointType.Setting_Title },
[3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "称号",rpType = RedPointType.Setting_Title },
-- [4] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "时装",rpType = RedPointType.Setting_Skin },
}
local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1),
select = Color.New(243 / 255, 235 / 255, 202 / 255, 1)}
@ -21,8 +21,8 @@ this.contents = {
--时装
[2] = {view = require("Modules/Setting/SettingPlayerRide"), panelName = "settingPlayerRide"},
--坐骑
-- [4] = {view = require("Modules/Setting/SettingPlayerSkin"), panelName = "settingPlayerSkin"},
-- [3] = {view = require("Modules/Setting/SettingPlayerTitle"), panelName = "settingPlayerTitle"},
[3] = {view = require("Modules/Setting/SettingPlayerTitle"), panelName = "settingPlayerTitle"},
--[4] = {view = require("Modules/Setting/SettingPlayerSkin"), panelName = "settingPlayerSkin"},
}
--子模块预设
this.prefabs={}

View File

@ -99,10 +99,10 @@ function this.ShowPanelData()
end
end
table.sort(two,function(a,b)
return a.Id>b.Id
return a.Id<b.Id
end)
table.sort(three,function(a,b)
return a.Id>b.Id
return a.Id<b.Id
end)
local list={}
for key, value in pairs(one) do

View File

@ -96,7 +96,7 @@ function PlayerLiveView:OnOpen(scale,pos,dir)
self:SetWalkDir(dir)
end
end
local sortingorder=0
--加载三个立绘(称号 坐骑 皮肤)
function PlayerLiveView:OnShowLive()
-- LogBlue("self.rideLiveGo "..self.rideLiveGo.name)
@ -150,7 +150,7 @@ function PlayerLiveView:OnShowLive()
self.rideLivSkeletonGraphic.AnimationState:SetAnimation(0, RIDE_WALK_DIR.IDLE_FRONT.animation, true)
end
end
local sortingorder=0
--称号
if self.PlayerLiveViewData.designation and self.PlayerLiveViewData.designation > 0 then
self.titleLiveGo:SetActive(true)
@ -168,8 +168,9 @@ function PlayerLiveView:OnShowLive()
self.titleLive.transform.localPosition = curLocalPosition
self.titleLive.transform.localScale = curLocalScale
if self.orginLayer then
Util.AddParticleSortLayer(self.titleLive,self.orginLayer - sortingorder)
sortingorder = self.orginLayer
LogError("self.orginlayer "..self.orginLayer.."sortingOrder "..sortingorder)
Util.SetParticleSortLayer(self.titleLive,self.orginLayer)
--sortingorder = self.orginLayer
end
end
@ -305,6 +306,7 @@ function PlayerLiveView:OnClose()
if self.rideLive then
poolManager:UnLoadLive(self.rideLiveStr, self.rideLive, PoolManager.AssetType.GameObject)
self.rideLive = nil
sortingorder=0
end
if self.playerLive then
poolManager:UnLoadLive(self.playerLiveStr, self.playerLive, PoolManager.AssetType.GameObject)
@ -318,6 +320,7 @@ function PlayerLiveView:OnClose()
poolManager:UnLoadAsset("PlayerLiveView",self.leader, PoolManager.AssetType.GameObject)
self.leader = nil
end
end
--判断动画是否存在