|
@@ -31,6 +31,8 @@ namespace GFGGame
|
|
private string[] effArray = new string[2] { "ZJ_JuQing", "ZJ_ZD" };
|
|
private string[] effArray = new string[2] { "ZJ_JuQing", "ZJ_ZD" };
|
|
|
|
|
|
private int currentDifficulty;
|
|
private int currentDifficulty;
|
|
|
|
+
|
|
|
|
+ private int activityID;
|
|
public override void Dispose()
|
|
public override void Dispose()
|
|
{
|
|
{
|
|
EffectUIPool.Recycle(_effectUI1);
|
|
EffectUIPool.Recycle(_effectUI1);
|
|
@@ -112,7 +114,7 @@ namespace GFGGame
|
|
_chapterID = (int)this.viewData;
|
|
_chapterID = (int)this.viewData;
|
|
}
|
|
}
|
|
MainStoryDataManager.currentChapterCfgId = _chapterID;
|
|
MainStoryDataManager.currentChapterCfgId = _chapterID;
|
|
-
|
|
|
|
|
|
+ activityID = ActivityDataManager.Instance.GetCurOpenActiveByType(17);
|
|
//由于这里会切换特效,所以切换界面时进行清空
|
|
//由于这里会切换特效,所以切换界面时进行清空
|
|
EffectUIPool.Recycle(_effectUI2);
|
|
EffectUIPool.Recycle(_effectUI2);
|
|
_effectUI2 = null;
|
|
_effectUI2 = null;
|
|
@@ -143,7 +145,7 @@ namespace GFGGame
|
|
_ui.m_switchChapter.target.visible = false;
|
|
_ui.m_switchChapter.target.visible = false;
|
|
_ui.m_bonusBox.visible = false;
|
|
_ui.m_bonusBox.visible = false;
|
|
_ui.m_ActivityZCJB.visible = true;
|
|
_ui.m_ActivityZCJB.visible = true;
|
|
- ActivityOpenCfg _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(5006);
|
|
|
|
|
|
+ ActivityOpenCfg _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(activityID);
|
|
long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
|
|
long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
|
|
long curTime = TimeHelper.ServerNow();
|
|
long curTime = TimeHelper.ServerNow();
|
|
TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
|
|
TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
|
|
@@ -376,7 +378,7 @@ namespace GFGGame
|
|
|
|
|
|
private void UpdateActivityTime(object param = null)
|
|
private void UpdateActivityTime(object param = null)
|
|
{
|
|
{
|
|
- ActivityOpenCfg _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(5006);
|
|
|
|
|
|
+ ActivityOpenCfg _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(activityID);
|
|
long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
|
|
long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
|
|
long curTime = TimeHelper.ServerNow();
|
|
long curTime = TimeHelper.ServerNow();
|
|
if (endTime < curTime)
|
|
if (endTime < curTime)
|