|
@@ -11,7 +11,7 @@ namespace GFGGame
|
|
|
private object[] _viewData;
|
|
|
|
|
|
private int _itemId;
|
|
|
- private object[] _fromeViewDatas;
|
|
|
+ private object[] _fromViewDatas;
|
|
|
private int _needCount;//需求总量
|
|
|
private List<string[]> _approachDatas = new List<string[]>();
|
|
|
|
|
@@ -33,7 +33,7 @@ namespace GFGGame
|
|
|
_ui.m_list.numItems = 0;
|
|
|
}
|
|
|
_approachDatas.Clear();
|
|
|
- _fromeViewDatas = null;
|
|
|
+ _fromViewDatas = null;
|
|
|
}
|
|
|
public void OnInit(GComponent component)
|
|
|
{
|
|
@@ -45,7 +45,7 @@ namespace GFGGame
|
|
|
{
|
|
|
_viewData = viewData;
|
|
|
_itemId = (int)viewData[0];
|
|
|
- _fromeViewDatas = viewData[1] as object[];
|
|
|
+ _fromViewDatas = viewData[1] as object[];
|
|
|
// _needCount = viewData.Length > 2 ? (int)viewData[2] : 0;
|
|
|
int needCount = viewData.Length > 2 ? (int)viewData[2] : 0;
|
|
|
_needCount = (int)needCount;
|
|
@@ -167,11 +167,11 @@ namespace GFGGame
|
|
|
// isJump = false;
|
|
|
// break;
|
|
|
// }
|
|
|
- isJump = ViewManager.Show<ClothingShopView>(new object[] { shopId, null, _itemId, needCount }, _fromeViewDatas, true, true);
|
|
|
+ isJump = ViewManager.Show<ClothingShopView>(new object[] { shopId, null, _itemId, needCount }, _fromViewDatas, true, true);
|
|
|
break;
|
|
|
case ConstFunctionId.FU_ZHUANG_DECOMPOSE:
|
|
|
// this.Hide();
|
|
|
- isJump = ViewManager.Show<ClothingDecomposeView>(null, _fromeViewDatas);
|
|
|
+ isJump = ViewManager.Show<ClothingDecomposeView>(null, _fromViewDatas);
|
|
|
break;
|
|
|
case ConstFunctionId.STORE:
|
|
|
|
|
@@ -226,7 +226,7 @@ namespace GFGGame
|
|
|
if (studioCfg.funId == typeof(StudioFilingView).Name)
|
|
|
{
|
|
|
StudioDataManager.Instance.filingChapterId = studioCfg.id;
|
|
|
- ViewManager.Show<StudioFilingView>(null, _fromeViewDatas);
|
|
|
+ ViewManager.Show<StudioFilingView>(null, _fromViewDatas);
|
|
|
MainStoryDataManager.currentLevelCfgId = levelCfg.id;
|
|
|
InstanceZonesController.ShowLevelView(levelCfg.id, StudioDataManager.Instance.OnFinishFilingStoryLevel, _itemId, _needCount);
|
|
|
isJump = true;
|
|
@@ -248,7 +248,7 @@ namespace GFGGame
|
|
|
}
|
|
|
string viewName = "GFGGame." + studioCfg.funId;
|
|
|
|
|
|
- ViewManager.Show(viewName, StudioDataManager.Instance.PROPERTY_SELECT_INDEX, _fromeViewDatas);
|
|
|
+ ViewManager.Show(viewName, StudioDataManager.Instance.PROPERTY_SELECT_INDEX, _fromViewDatas);
|
|
|
StudioDataManager.Instance.VIEW_NAME = viewName;
|
|
|
InstanceZonesController.ShowLevelView(levelCfgId, StudioDataManager.Instance.OnFinishStudioStoryLevel, _itemId, _needCount);
|
|
|
isJump = true;
|
|
@@ -269,12 +269,12 @@ namespace GFGGame
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- if ((string)_fromeViewDatas[0] == ViewName.DRESS_UP_FIGHT_VIEW)
|
|
|
+ if ((string)_fromViewDatas[0] == ViewName.DRESS_UP_FIGHT_VIEW)
|
|
|
{
|
|
|
//从战斗换装必需品来源跳转到剧情界面,在剧情界面点返回后直接返回章节界面,无需返回换装界面
|
|
|
- _fromeViewDatas = null;
|
|
|
+ _fromViewDatas = null;
|
|
|
}
|
|
|
- isJump = ViewManager.Show<StoryChapterView>(levelCfg.chapterId, _fromeViewDatas, true);
|
|
|
+ isJump = ViewManager.Show<StoryChapterView>(levelCfg.chapterId, _fromViewDatas, true);
|
|
|
StoryController.ShowLevelView(levelCfgId, _itemId, _needCount);
|
|
|
break;
|
|
|
}
|
|
@@ -288,17 +288,17 @@ namespace GFGGame
|
|
|
bool isPass = InstanceZonesDataManager.CheckLevelPass(suitCfg.syntheticStoryLevelId);
|
|
|
if (suitCfg.syntheticStoryLevelId > 0 && !isPass)
|
|
|
{
|
|
|
- isJump = ViewManager.Show<SuitSyntheticView>(suitId, _fromeViewDatas);
|
|
|
+ isJump = ViewManager.Show<SuitSyntheticView>(suitId, _fromViewDatas);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- isJump = ViewManager.Show<ClothingSyntheticView>(new object[] { suitId, _itemId }, _fromeViewDatas);
|
|
|
+ isJump = ViewManager.Show<ClothingSyntheticView>(new object[] { suitId, _itemId }, _fromViewDatas);
|
|
|
}
|
|
|
}
|
|
|
break;
|
|
|
case ConstFunctionId.ZHAI_XING:
|
|
|
// this.Hide();
|
|
|
- isJump = ViewManager.Show<LuckyBoxView>(null, _fromeViewDatas, true);
|
|
|
+ isJump = ViewManager.Show<LuckyBoxView>(null, _fromViewDatas, true);
|
|
|
break;
|
|
|
case ConstFunctionId.TAO_ZHUANG_TU_JIAN:
|
|
|
isJump = false;
|
|
@@ -306,28 +306,28 @@ namespace GFGGame
|
|
|
{
|
|
|
return;
|
|
|
}
|
|
|
- isJump = ViewManager.Show<SuitGuideView>(null, _fromeViewDatas);
|
|
|
+ isJump = ViewManager.Show<SuitGuideView>(null, _fromViewDatas);
|
|
|
|
|
|
break;
|
|
|
case ConstFunctionId.TAO_ZHUANG_HE_CHENG:
|
|
|
isJump = ViewManager.Show<SuitSyntheticView>();
|
|
|
break;
|
|
|
case ConstFunctionId.SUIT_FOSTER:
|
|
|
- isJump = ViewManager.Show<ClothingListView>(null, _fromeViewDatas);
|
|
|
+ isJump = ViewManager.Show<ClothingListView>(null, _fromViewDatas);
|
|
|
break;
|
|
|
case ConstFunctionId.DAILY_TASK:
|
|
|
- isJump = ViewManager.Show<TaskView>(null, _fromeViewDatas);
|
|
|
+ isJump = ViewManager.Show<TaskView>(null, _fromViewDatas);
|
|
|
break;
|
|
|
case ConstFunctionId.WEEKLY_TASK:
|
|
|
- isJump = ViewManager.Show<TaskView>(new object[] { 1 }, _fromeViewDatas);
|
|
|
+ isJump = ViewManager.Show<TaskView>(new object[] { 1 }, _fromViewDatas);
|
|
|
break;
|
|
|
case ConstFunctionId.LEAGUE_PRAY:
|
|
|
- isJump = ViewManager.Show<LeaguePrayView>(null, _fromeViewDatas);
|
|
|
+ isJump = ViewManager.Show<LeaguePrayView>(null, _fromViewDatas);
|
|
|
break;
|
|
|
case ConstFunctionId.LEAGUE_ANSWER:
|
|
|
if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)
|
|
|
{
|
|
|
- ViewManager.Show<LeagueView>(null, _fromeViewDatas);
|
|
|
+ ViewManager.Show<LeagueView>(null, _fromViewDatas);
|
|
|
isJump = ViewManager.Show<LeagueAnswerView>();
|
|
|
}
|
|
|
else
|