diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua index 13cab0e181..6048931fc6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua @@ -161,7 +161,7 @@ function this.RequestArenaChallenge(index, isSkip, func) arg.blue.uid = PlayerManager.uid arg.blue.name = PlayerManager.nickName arg.blue.head = PlayerManager.head - arg.blue.frame = PlayerManager.frame + arg.blue.frame = HeadManager.GetCurFrameId() arg.blue.deltaScore = msg.myScoreChange arg.red= {} arg.red.uid = enemy.personInfo.uid diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaRecordPopup.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaRecordPopup.lua index d40025f623..235fb58b41 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaRecordPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaRecordPopup.lua @@ -126,7 +126,7 @@ function this.RankNodeAdapter(node, data) arg.red.uid = PlayerManager.uid arg.red.name = PlayerManager.nickName arg.red.head = PlayerManager.head - arg.red.frame = PlayerManager.frame + arg.red.frame = HeadManager.GetCurFrameId() arg.red.deltaScore = data.myScoreChange UIManager.OpenPanel(UIName.ArenaResultPopup, arg) end) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/MinMapPopup.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/MinMapPopup.lua index e805bae5c4..88f604fec9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/MinMapPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/MinMapPopup.lua @@ -150,7 +150,7 @@ function this.SetRoleInfo(pos) this.role:SetActive(true) this.SetIconPos(x, y, this.role, true) - this.roleFrame.sprite = GetPlayerHeadFrameSprite(PlayerManager.frame) + this.roleFrame.sprite = GetPlayerHeadFrameSprite(HeadManager.GetCurFrameId()) this.roleIcon.sprite = GetPlayerHeadSprite(PlayerManager.head) this.roleLv = PlayerManager.level diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua index a3f122b9b9..f2f3318d8b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua @@ -463,7 +463,7 @@ function this.ChatItemAdapter(node, data, isShowTime) lv.text = PlayerManager.level name.text = PlayerManager.nickName head.sprite = GetPlayerHeadSprite(PlayerManager.head) - headKuang.sprite = GetPlayerHeadFrameSprite(PlayerManager.frame) + headKuang.sprite = GetPlayerHeadFrameSprite(HeadManager.GetCurFrameId()) else lv.text = data.senderlevel name.text = data.senderName diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua b/Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua index 6dbc352369..cd623ecd3c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua @@ -144,7 +144,7 @@ function this.ChatItemAdapter(node, data, isShowTime) lv.text = PlayerManager.level name.text = PlayerManager.nickName head.sprite = GetPlayerHeadSprite(PlayerManager.head) - headKuang.sprite = GetPlayerHeadFrameSprite(PlayerManager.frame) + headKuang.sprite = GetPlayerHeadFrameSprite(HeadManager.GetCurFrameId()) else lv.text = this.friendData.lv name.text = this.friendData.name diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/PlayWithSBFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/PlayWithSBFormation.lua index a9250ee416..03d31e7c54 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/PlayWithSBFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/PlayWithSBFormation.lua @@ -46,7 +46,7 @@ function this.On_Btn2_Click() arg.blue.uid = PlayerManager.uid arg.blue.name = PlayerManager.nickName arg.blue.head = PlayerManager.head - arg.blue.frame = PlayerManager.frame + arg.blue.frame = HeadManager.GetCurFrameId() arg.red= {} arg.red.uid = this.pData.uid arg.red.name = this.pData.name diff --git a/Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua index 21f9d18f93..09b38635eb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua @@ -207,6 +207,9 @@ function HeadManager.GetSingleFrame(Did) return nil end end +function HeadManager.SetCurFrameId(frame) + PlayerManager.frame= frame +end function HeadManager.GetCurFrameId() local freameData = this.headFrameData[PlayerManager.frame] @@ -217,7 +220,7 @@ function HeadManager.GetCurFrameId() this.headFrameData[PlayerManager.frame] = nil end end - PlayerManager.frame = 80000 - return 80000 + HeadManager.SetCurFrameId(80000) + return PlayerManager.frame end return HeadManager \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/HeadChangePopup.lua b/Assets/ManagedResources/~Lua/Modules/Setting/HeadChangePopup.lua index a58cfa2a3a..1c54d8f209 100644 --- a/Assets/ManagedResources/~Lua/Modules/Setting/HeadChangePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Setting/HeadChangePopup.lua @@ -98,7 +98,7 @@ function HeadChangePopup:BindEvent() end NetManager.RequestChangeModifyDecoration(0, frameId, function () PopupTipPanel.ShowTip(Language[11891]) - PlayerManager.frame = frameId + HeadManager.SetCurFrameId(frameId) Game.GlobalEvent:DispatchEvent(GameEvent.Player.OnHeadFrameChange) this.RefreshCurShow() end) @@ -181,7 +181,7 @@ function this.OnTabChange(index, lastIndex) if index == SELECT_TYPE.FRAME then datalist = _HeadFrameList --print(#datalist.." 77777") - curId = PlayerManager.frame + curId = HeadManager.GetCurFrameId() this.title.text = Language[11893] elseif index == SELECT_TYPE.HEAD then datalist = _HeadList @@ -242,7 +242,7 @@ function this.HeadFrameItemAdapter(item, data, index) _PlayerHeadList[item]:SetHead(PlayerManager.head) _PlayerHeadList[item]:SetLayer(this.sortingOrder) _PlayerHeadList[item]:SetEffectScale(1.1) - if frameId == PlayerManager.frame then + if frameId == HeadManager.GetCurFrameId() then this:SetUsing(_PlayerHeadList[item].gameObject) else this:RecycleUsing(_PlayerHeadList[item].gameObject) @@ -261,7 +261,7 @@ function this.HeadFrameItemAdapter(item, data, index) local headId = data.Id name:GetComponent("Text").text = data.Name _PlayerHeadList[item]:SetHead(headId) - _PlayerHeadList[item]:SetFrame(PlayerManager.frame) + _PlayerHeadList[item]:SetFrame(HeadManager.GetCurFrameId()) _PlayerHeadList[item]:SetLayer(this.sortingOrder) _PlayerHeadList[item]:SetEffectScale(1.1) if headId == PlayerManager.head then