|
@@ -120,7 +120,7 @@ namespace GFGGame
|
|
|
/// <param name="viewData">要传递给视图的参数</param>
|
|
|
/// <param name="goBackParams">从该视图返回的视图信息</param>
|
|
|
/// <param name="hideOthers">是否关闭其他视图</param>
|
|
|
- public static bool Show(string fullViewName, object viewData = null, object[] goBackParams = null, bool hideOthers = false, bool resetGobackParams = false)
|
|
|
+ public static bool Show(string fullViewName, object viewData = null, bool hideOthers = false, bool resetGobackParams = false)
|
|
|
{
|
|
|
string name = GetName(fullViewName);
|
|
|
if (!GameGlobal.skipCheckOpen && !FunctionOpenDataManager.Instance.CheckIsFunOpenById(name))
|
|
@@ -204,12 +204,12 @@ namespace GFGGame
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
- public static bool Show<T>(object viewData = null, object[] goBackParams = null, bool hideOthers = false, bool resetGobackParams = false) where T : class, new()
|
|
|
+ public static bool Show<T>(object viewData = null, bool hideOthers = false, bool resetGobackParams = false) where T : class, new()
|
|
|
{
|
|
|
// string[] names = typeof(T).FullName.Split('.');
|
|
|
// string viewName = names[names.Length - 1];
|
|
|
//string name = GetName(typeof(T).FullName);
|
|
|
- return ViewManager.Show(typeof(T).FullName, viewData, null, hideOthers);
|
|
|
+ return ViewManager.Show(typeof(T).FullName, viewData, hideOthers);
|
|
|
}
|
|
|
|
|
|
public static void HideWin(string viewName)
|
|
@@ -287,7 +287,7 @@ namespace GFGGame
|
|
|
}
|
|
|
}
|
|
|
MainDataManager.Instance.ViewType = 0;
|
|
|
- ViewManager.Show<MainUIView>(null, null, true);
|
|
|
+ ViewManager.Show<MainUIView>(null, true);
|
|
|
}
|
|
|
|
|
|
public static object[] GetGoBackDatas(string fullViewName)
|
|
@@ -419,7 +419,7 @@ namespace GFGGame
|
|
|
/// 任务界面跳转
|
|
|
/// </summary>
|
|
|
/// <param name="jumpId"></param>
|
|
|
- public static void JumpToView(string jumpId, object[] param, object[] goBackDatas, bool hideOther = false, Action onSuccess = null)
|
|
|
+ public static void JumpToView(string jumpId, object[] param, bool hideOther = false, Action onSuccess = null)
|
|
|
{
|
|
|
switch (jumpId)
|
|
|
{
|
|
@@ -427,13 +427,13 @@ namespace GFGGame
|
|
|
|
|
|
if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)
|
|
|
{
|
|
|
- ViewManager.Show<LeagueView>(null, goBackDatas, hideOther);
|
|
|
+ ViewManager.Show<LeagueView>(null, hideOther);
|
|
|
ViewManager.Show($"GFGGame.{jumpId}");
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(nameof(LeagueView))) return;
|
|
|
- ViewManager.Show<LeagueJoinView>(null, goBackDatas, hideOther, true);
|
|
|
+ ViewManager.Show<LeagueJoinView>(null, hideOther, true);
|
|
|
}
|
|
|
|
|
|
break;
|
|
@@ -441,36 +441,36 @@ namespace GFGGame
|
|
|
if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(nameof(LeagueView))) return;
|
|
|
if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)
|
|
|
{
|
|
|
- ViewManager.Show<LeagueView>(null, goBackDatas, hideOther);
|
|
|
+ ViewManager.Show<LeagueView>(null, hideOther);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- ViewManager.Show<LeagueJoinView>(null, goBackDatas, hideOther, true);
|
|
|
+ ViewManager.Show<LeagueJoinView>(null, hideOther, true);
|
|
|
}
|
|
|
break;
|
|
|
case nameof(StoreView):
|
|
|
- ViewManager.Show<StoreView>(param, goBackDatas, hideOther);
|
|
|
+ ViewManager.Show<StoreView>(param, hideOther);
|
|
|
break;
|
|
|
case nameof(StoryChapterListView):
|
|
|
- ViewManager.Show($"GFGGame.{jumpId}", param, goBackDatas, hideOther, true);
|
|
|
+ ViewManager.Show($"GFGGame.{jumpId}", param, hideOther, true);
|
|
|
break;
|
|
|
case nameof(StoryChapterView):
|
|
|
- ViewManager.Show<StoryChapterView>(param[0], goBackDatas, hideOther);
|
|
|
+ ViewManager.Show<StoryChapterView>(param[0], hideOther);
|
|
|
break;
|
|
|
case nameof(FirstChargeBonusView):
|
|
|
- ViewManager.Show<FirstChargeBonusView>(param, goBackDatas, false);
|
|
|
+ ViewManager.Show<FirstChargeBonusView>(param, false);
|
|
|
break;
|
|
|
case nameof(ClothingSyntheticView):
|
|
|
- ViewManager.Show<ClothingSyntheticView>(param, goBackDatas, hideOther);
|
|
|
+ ViewManager.Show<ClothingSyntheticView>(param, hideOther);
|
|
|
break;
|
|
|
case nameof(LuckyBoxView):
|
|
|
if(param.Length > 0)
|
|
|
- ViewManager.Show<LuckyBoxView>(param[0], goBackDatas, hideOther);
|
|
|
+ ViewManager.Show<LuckyBoxView>(param[0], hideOther);
|
|
|
else
|
|
|
- ViewManager.Show<LuckyBoxView>(null, goBackDatas, hideOther);
|
|
|
+ ViewManager.Show<LuckyBoxView>(null, hideOther);
|
|
|
break;
|
|
|
default:
|
|
|
- ViewManager.Show($"GFGGame.{jumpId}", null, goBackDatas, hideOther, true);
|
|
|
+ ViewManager.Show($"GFGGame.{jumpId}", null, hideOther, true);
|
|
|
break;
|
|
|
}
|
|
|
onSuccess?.Invoke();
|