ALIENJACK\alien 7f78240304 Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline ... # Conflicts: # AxibugEmuOnline.Client/Assets/Script/AppMain/UI/OverlayUI/OverlayManager.cs		2024-12-25 18:23:48 +08:00
..
ControllerInfo.cs	Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline	2024-12-25 18:23:48 +08:00
ControllerInfo.cs.meta	Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline	2024-12-25 18:23:48 +08:00
ControllerInfoPanel.cs	Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline	2024-12-25 18:23:48 +08:00
ControllerInfoPanel.cs.meta	Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline	2024-12-25 18:23:48 +08:00
XMBInfoBar.cs	Merge branch 'master' of http://git.axibug.com/sin365/AxibugEmuOnline	2024-12-25 18:23:48 +08:00
XMBInfoBar.cs.meta	XMBTopGroup重命名为XMBInfoBar,不再局限于右上角UI管理	2024-12-20 11:06:08 +08:00