Skip to content

M
MusicBigWatermelon
Commit bc12ccce authored by LiLiuZhou's avatar LiLiuZhou
Browse files
Options

1

parent 0e676516
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 7 deletions
Assets/Scripts/Panel/MainPanel.cs
View file @ bc12ccce
...@@ -6,18 +6,16 @@ using UnityEngine.UI; ...@@ -6,18 +6,16 @@ using UnityEngine.UI;
public class MainPanel : BasePanel public class MainPanel : BasePanel
{ {
<<<<<<< HEAD private int nextSongId = 0;
private List<string> notesList = null;
private int playNoteIndex = 0;
private bool IsSuccess = false;
protected override void Awake() protected override void Awake()
{ {
base.Awake(); base.Awake();
EventCenter.Getinstance().AddUpdateListener("RegisterPanel",()=> { UIMgr.Getinstance().RegisterPanel<MainPanel>(this); }); EventCenter.Getinstance().AddUpdateListener("RegisterPanel",()=> { UIMgr.Getinstance().RegisterPanel<MainPanel>(this); });
} }
=======
private int nextSongId = 0;
private List<string> notesList = null;
private int playNoteIndex = 0;
private bool IsSuccess = false;
>>>>>>> 0fa10fd520ad3cd02f948768758850a333bc8c2c
public override void OnHide(object data = null) public override void OnHide(object data = null)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment