合并的代码

Assets/Scripts/Controllers/GameController.cs

@@ -25,37 +25,4 @@ public class GameController : MonoBehaviour
     //红线高度
     public float RedLinePosY => ColliderAdapter.Instance.RedLinePosY;
 
-
-<<<<<<< HEAD
-
-    /// <summary>
-    /// 获取接下来将要掉落的音符组及所属歌曲
-    /// </summary>
-    public void GetNextNoteList(int song_id)
-    {
-        Dictionary<string, object> paras = new Dictionary<string, object>();
-        paras.Add("song_id", song_id);
-        HttpTool.Instance._Get("app/v1/watermelon/notes", paras, new Action<List<string>>((result) =>
-        {
-            Debug.unityLogger.Log("");
-        }), new Action<string, string>((code, msg) =>
-        {
-            Debug.unityLogger.Log("获取下一组生成的球 " + code + " msg " + msg);
-        }));
-    }
-
-=======
-    /// <summary>
-    /// 获取提现列表
-    /// 类型（1 合成提现，3大额提现）
-    /// </summary>
-    public void GetWithdrawList(int type)
-    {
-        Dictionary<string, object> paras = new Dictionary<string, object>();
-        paras.Add("type", type);
-        HttpTool.Instance._Get("app/v1/watermelon/list_wd", paras, new Action<WithDrawBean>((result) =>
-        {
->>>>>>> 71cb07ae8564a188b735be49fa9ff46c44542906
-
-
 }

Assets/Scripts/Main/HomeInfoControl.cs

@@ -27,14 +27,6 @@ public class HomeInfoControl : MonoBehaviour
 #endif
         EventCenter.Getinstance().EventTrigger("RegisterPanel");
 
-<<<<<<< HEAD
-        //GameController.GetInstance().GetWithdrawList(1);
-        GameController.GetInstance().GetReward();
-=======
-        GameController.GetInstance().GetWithdrawList(1);
->>>>>>> 71cb07ae8564a188b735be49fa9ff46c44542906
-
-
     }