From c93e2ca727e8c0a5b4c2b6d38701585371a4c3c2 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 09 一月 2019 15:23:27 +0800
Subject: [PATCH] 5767 【前端】【1.5】新增8-14天活动功能（制作成7日运营活动的模板）
---
System/OpenServerActivity/OpenServiceAchievementWin.cs | 60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/System/OpenServerActivity/OpenServiceAchievementWin.cs b/System/OpenServerActivity/OpenServiceAchievementWin.cs
index bc08155..3986243 100644
--- a/System/OpenServerActivity/OpenServiceAchievementWin.cs
+++ b/System/OpenServerActivity/OpenServiceAchievementWin.cs
@@ -11,7 +11,8 @@
using TableConfig;
using EnhancedUI.EnhancedScroller;
-namespace Snxxz.UI {
+namespace Snxxz.UI
+{
//寮�鏈嶆垚灏�
[XLua.Hotfix]
public class OpenServiceAchievementWin : Window
@@ -20,19 +21,27 @@
[SerializeField] ScrollerController m_ScrollerController2;//鍒楄〃
[SerializeField] Button m_CloseBtn;
[SerializeField] Text m_TextIntegral;//褰撳墠绉垎
+ [SerializeField] GameObject m_One;
+ [SerializeField] GameObject m_Two;
+
+ [SerializeField] OpenServiceItem m_OpenServiceItemA;
+ [SerializeField] OpenServiceItem m_OpenServiceItemA1;
+ [SerializeField] OpenServiceItem m_OpenServiceItemB1;
+
#region Built-in
OpenServiceAchievementModel model { get { return ModelCenter.Instance.GetModel<OpenServiceAchievementModel>(); } }
List<int> SortList = new List<int>();
+ List<WeekPartyItemClass> ItemDayList = new List<WeekPartyItemClass>();
protected override void BindController()
{
m_ScrollerController1.OnRefreshCell += OnRefreshGridCell_1;
m_ScrollerController2.OnRefreshCell += OnRefreshGridCell_2;
}
-
+
protected override void AddListeners()
{
- m_CloseBtn.AddListener(()=> { Close(); });
+ m_CloseBtn.AddListener(() => { Close(); });
}
protected override void OnPreOpen()
@@ -53,7 +62,7 @@
model.WeekPartyDayInfoUpdate -= WeekPartyDayInfoUpdate;
}
-
+
protected override void OnAfterClose()
{
@@ -90,7 +99,7 @@
Unselected.SetActive(true);
}
DayText.text = InDayStr(Index);
- Btn.SetListener(()=>
+ Btn.SetListener(() =>
{
if (Index != model.SelectedNow)
{
@@ -105,13 +114,14 @@
private string InDayStr(int Day)
{
string DaySte = string.Empty;
- DaySte = Language.Get("SignIn_4",Day);
+ DaySte = Language.Get("SignIn_4", Day);
return DaySte;
}
//-------------------------------
void OnCreateGridLineCell2(ScrollerController gridCtrl)
{
ToAddSorting();//鎺掑簭
+ GetPointRewardObj();//鑾峰彇绉垎棰嗗淇℃伅
gridCtrl.Refresh();
for (int i = 0; i < SortList.Count; i++)
{
@@ -121,7 +131,7 @@
}
private void OnRefreshGridCell_2(ScrollerDataType type, CellView cell)
{
-
+
}
private void ToAddSorting()
@@ -181,11 +191,11 @@
{
TaypeNumber = (carryOutNum - rewardNum) / WeekPartyAction.SingleTimes;
}
- if (TaypeNumber>0)
+ if (TaypeNumber > 0)
{
Bool = true;
}
- }
+ }
return Bool;
}
private bool Undone(int ID)//鏈畬鎴�
@@ -202,7 +212,7 @@
{
TaypeNumber = (carryOutNum - rewardNum) / WeekPartyAction.SingleTimes;
}
- if (TaypeNumber<=0)
+ if (TaypeNumber <= 0)
{
Bool = true;
}
@@ -218,7 +228,7 @@
int number = WeekPartyAction.TotalTimes / WeekPartyAction.SingleTimes;
int rewardNum = model.GetRewardNumber(model.SelectedNow, ID);//宸查濂栨鏁�
int carryOutNum = model.GetCarryOutNum(model.SelectedNow, ID);//宸插畬鎴愭鏁�
- if (rewardNum> number)
+ if (rewardNum > number)
{
Bool = true;
}
@@ -241,6 +251,34 @@
int Point = model.GetPoint(model.SelectedNow);
m_TextIntegral.text = Point.ToString();
}
+
+ private void GetPointRewardObj()
+ {
+ ItemDayList.Clear();
+ foreach (var key in model.WeekPartyDayDic.Keys)
+ {
+ if (key == model.SelectedNow)
+ {
+ for (int i = 0; i < model.WeekPartyDayDic[key].WeekPartyItem.Length; i++)
+ {
+ ItemDayList.Add(model.WeekPartyDayDic[key].WeekPartyItem[i]);
+ }
+ }
+ }
+ if (ItemDayList.Count > 1)
+ {
+ m_One.SetActive(false);
+ m_Two.SetActive(true);
+ m_OpenServiceItemA1.SetReward(model.SelectedNow, ItemDayList[0],0);
+ m_OpenServiceItemB1.SetReward(model.SelectedNow, ItemDayList[1],1);
+ }
+ else
+ {
+ m_One.SetActive(true);
+ m_Two.SetActive(false);
+ m_OpenServiceItemA.SetReward(model.SelectedNow, ItemDayList[0], 0);
+ }
+ }
}
}
--
Gitblit v1.8.0