From aef34f31e72e88ba096c2d2bbc6d9beecfab67da Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期五, 11 一月 2019 14:50:05 +0800
Subject: [PATCH] 5767 【前端】【1.5】新增8-14天活动功能（制作成7日运营活动的模板）
---
System/OpenServerActivity/OpenServiceAchievementWin.cs | 41 +++++++++++++++-----
System/OpenServerActivity/OpenServiceAchievementModel.cs | 30 +++++++++++++++
2 files changed, 60 insertions(+), 11 deletions(-)
diff --git a/System/OpenServerActivity/OpenServiceAchievementModel.cs b/System/OpenServerActivity/OpenServiceAchievementModel.cs
index aca098a..e74e491 100644
--- a/System/OpenServerActivity/OpenServiceAchievementModel.cs
+++ b/System/OpenServerActivity/OpenServiceAchievementModel.cs
@@ -71,6 +71,14 @@
private int _SelectedNow = 0;
private int ResetType = 0;// 閲嶇疆绫诲瀷锛�0-0鐐归噸缃紱1-5鐐归噸缃�
public event Action IsOpenEvent;
+ private int _JumpIndex = -1;//璺宠浆閫変腑鍊�
+ public int JumpIndex
+ {
+ get { return _JumpIndex; }
+ set { _JumpIndex = value; }
+ }
+
+
public int SelectedNow//閫変腑澶�
{
get { return _SelectedNow; }
@@ -507,6 +515,28 @@
}
}
+ public bool IsJumpOpen()
+ {
+ bool Isbool = false;
+ if (LimitLV == 0)//娲诲姩鏈紑鍚�
+ {
+ SysNotifyMgr.Instance.ShowTip("OutofActivityTime");
+ return false;
+ }
+ else
+ {
+ if (PlayerDatas.Instance.baseData.LV < LimitLV)//绛夌骇鏈埌杈�
+ {
+ SysNotifyMgr.Instance.ShowTip("NotEenoughGrade");
+ return Isbool;
+ }
+ }
+ if (_IsOpen)
+ {
+ Isbool = true;
+ }
+ return Isbool;
+ }
}
diff --git a/System/OpenServerActivity/OpenServiceAchievementWin.cs b/System/OpenServerActivity/OpenServiceAchievementWin.cs
index 6e1792c..a39557a 100644
--- a/System/OpenServerActivity/OpenServiceAchievementWin.cs
+++ b/System/OpenServerActivity/OpenServiceAchievementWin.cs
@@ -13,7 +13,7 @@
namespace Snxxz.UI
{
- //寮�鏈嶆垚灏�
+ //寮�鏈嶆垚灏�(8-14澶�)
[XLua.Hotfix]
public class OpenServiceAchievementWin : Window
{
@@ -47,7 +47,7 @@
protected override void OnPreOpen()
{
- model.SelectedNow = model.DayNow;
+ ChooseDay();
SetTextIntegral();
OnCreateGridLineCell1(m_ScrollerController1);
OnCreateGridLineCell2(m_ScrollerController2);
@@ -60,6 +60,7 @@
protected override void OnPreClose()
{
+ model.JumpIndex = -1;
model.WeekPartyDayInfoUpdate -= WeekPartyDayInfoUpdate;
}
@@ -98,7 +99,7 @@
GameObject IsNotGary = cell.transform.Find("Obj1").gameObject;
Text IsNotGary_text = IsNotGary.transform.Find("DayText").GetComponent<Text>();
- GameObject Gary= cell.transform.Find("Obj2").gameObject;
+ GameObject Gary = cell.transform.Find("Obj2").gameObject;
Text Gary_text = Gary.transform.Find("DayText").GetComponent<Text>();
RedpointBehaviour redPoint = cell.transform.Find("RedPoint").GetComponent<RedpointBehaviour>();//绾㈢偣
@@ -149,7 +150,7 @@
SelectedObj.SetActive(true);
SelectedObj1.SetActive(true);
Unselected.SetActive(false);
-
+
IsNotGary_text.text = (Index + 1).ToString();
}
Btn.SetListener(() =>
@@ -201,7 +202,7 @@
dailyIdlist.Add(_list[i]);
}
}
-
+
foreach (var key in model.WeekPartyDayDic.Keys)
{
if (key == model.SelectedNow)
@@ -220,15 +221,15 @@
{
SortList.Add(TemplateId);
}
- // var Dailyquse = Config.Instance.Get<DailyQuestConfig>(TemplateId);
+ // var Dailyquse = Config.Instance.Get<DailyQuestConfig>(TemplateId);
}
else
{
SortList.Add(TemplateId);
}
-
-
+
+
}
}
}
@@ -354,16 +355,34 @@
{
m_One.SetActive(false);
m_Two.SetActive(true);
- m_OpenServiceItemA1.SetReward(model.SelectedNow, ItemDayList[0],0,2);
- m_OpenServiceItemB1.SetReward(model.SelectedNow, ItemDayList[1],1,2);
+ m_OpenServiceItemA1.SetReward(model.SelectedNow, ItemDayList[0], 0, 2);
+ m_OpenServiceItemB1.SetReward(model.SelectedNow, ItemDayList[1], 1, 2);
}
else
{
m_One.SetActive(true);
m_Two.SetActive(false);
- m_OpenServiceItemA.SetReward(model.SelectedNow, ItemDayList[0], 0,2);
+ m_OpenServiceItemA.SetReward(model.SelectedNow, ItemDayList[0], 0, 2);
}
}
+
+ private void ChooseDay()//閫夋嫨澶�
+ {
+ if (model.JumpIndex != -1)//璺宠浆閫夋嫨鐨勫ぉ
+ {
+ model.SelectedNow = model.JumpIndex;
+ return;
+ }
+ foreach (var key in model.RedPointDic.Keys)//绾㈢偣閫夋嫨鍙鍙栫殑澶�
+ {
+ if (model.RedPointDic[key].state == RedPointState.Simple)
+ {
+ model.SelectedNow = key;
+ return;
+ }
+ }
+ model.SelectedNow = model.DayNow;
+ }
}
}
--
Gitblit v1.8.0