From b0a2949af127986559cf510d7193e1bb06ff37d4 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 31 十月 2018 16:42:55 +0800
Subject: [PATCH] 4435 子 【开发】【1.2.0】功能预告界面修改，新增可领取奖励 / 【前端】【1.2.0】功能预告界面修改，新增可领取奖励
---
System/MainInterfacePanel/FeaturesType3.cs | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 8 deletions(-)
diff --git a/System/MainInterfacePanel/FeaturesType3.cs b/System/MainInterfacePanel/FeaturesType3.cs
index 2e45137..8c347a2 100644
--- a/System/MainInterfacePanel/FeaturesType3.cs
+++ b/System/MainInterfacePanel/FeaturesType3.cs
@@ -27,12 +27,18 @@
[SerializeField] Button m_IconBtn1;
[SerializeField] Text m_Number1;
[SerializeField] ImageEx m_Lock1;
+ [SerializeField] UIEffect m_UIEffect1;
+ [SerializeField] GameObject m_HasReceived1;
[SerializeField] ImageEx m_ItemBG2;
[SerializeField] ImageEx m_Icon2;
[SerializeField] Button m_IconBtn2;
[SerializeField] Text m_Number2;
[SerializeField] ImageEx m_Lock2;
+ [SerializeField] UIEffect m_UIEffect2;
+ [SerializeField] GameObject m_HasReceived2;
+
+ [SerializeField] RedpointBehaviour m_RedPoint;
FeatureNoticeModel featureNoticeModel { get { return ModelCenter.Instance.GetModel<FeatureNoticeModel>(); } }
ItemTipsModel _itemTipsModel;
ItemTipsModel itemTipsModel { get { return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } }
@@ -100,6 +106,11 @@
m_Img_Circle.gray = true;
m_FeaturesTypeIcon.gray = true;
}
+
+ if (featureNoticeModel.DicRedPoint.ContainsKey(funcId))
+ {
+ m_RedPoint.redpointId = featureNoticeModel.DicRedPoint[funcId].id;
+ }
}
private void SetRankAwardItem(int funcID)
@@ -133,13 +144,14 @@
if (featureNoticeModel.DicOpenFuncState.ContainsKey(funcID) && featureNoticeModel.DicOpenFuncState[funcID].State == 1 &&
featureNoticeModel.DicOpenFuncState[funcID].AwardState == 0)
{
- DebugEx.LogError("鍙互棰嗗彇");
+ featureNoticeModel.SendGetAward(funcID);
+ // DebugEx.LogError("鍙互棰嗗彇");
}
else
{
ItemAttrData attrData = new ItemAttrData(List[0].item.id, false, (ulong)List[0].item.count, -1, List[0].isBind);
itemTipsModel.SetItemTipsModel(attrData);
- DebugEx.LogError("寮规");
+ // DebugEx.LogError("寮规");
}
});
@@ -172,6 +184,23 @@
m_Icon1.gray = true;
m_Lock1.gray = true;
}
+ if (featureNoticeModel.DicOpenFuncState.ContainsKey(funcID) && featureNoticeModel.DicOpenFuncState[funcID].State == 1 &&
+ featureNoticeModel.DicOpenFuncState[funcID].AwardState == 0)
+ {
+ m_UIEffect1.Play();
+ }
+ else
+ {
+ m_UIEffect1.Stop();
+ }
+ if (featureNoticeModel.DicOpenFuncState.ContainsKey(funcID) && featureNoticeModel.DicOpenFuncState[funcID].State == 1 && featureNoticeModel.DicOpenFuncState[funcID].AwardState == 1)
+ {
+ m_HasReceived1.SetActive(true);
+ }
+ else
+ {
+ m_HasReceived1.SetActive(false);
+ }
}
private void SetItem2(List<AwardItem> List, int funcID)
{
@@ -183,13 +212,14 @@
if (featureNoticeModel.DicOpenFuncState.ContainsKey(funcID) && featureNoticeModel.DicOpenFuncState[funcID].State == 1 &&
featureNoticeModel.DicOpenFuncState[funcID].AwardState == 0)
{
- DebugEx.LogError("鍙互棰嗗彇");
+ featureNoticeModel.SendGetAward(funcID);
+ // DebugEx.LogError("鍙互棰嗗彇");
}
else
{
ItemAttrData attrData = new ItemAttrData(List[1].item.id, false, (ulong)List[1].item.count, -1, List[1].isBind);
itemTipsModel.SetItemTipsModel(attrData);
- DebugEx.LogError("寮规");
+ //DebugEx.LogError("寮规");
}
});
if (List[1].item.count > 1)
@@ -221,10 +251,24 @@
m_Icon2.gray = true;
m_Lock2.gray = true;
}
+ if (featureNoticeModel.DicOpenFuncState.ContainsKey(funcID) && featureNoticeModel.DicOpenFuncState[funcID].State == 1 &&
+ featureNoticeModel.DicOpenFuncState[funcID].AwardState == 0)
+ {
+ m_UIEffect2.Play();
+ }
+ else
+ {
+ m_UIEffect2.Stop();
+ }
+ if (featureNoticeModel.DicOpenFuncState.ContainsKey(funcID) && featureNoticeModel.DicOpenFuncState[funcID].State == 1 && featureNoticeModel.DicOpenFuncState[funcID].AwardState == 1)
+ {
+ m_HasReceived2.SetActive(true);
+ }
+ else
+ {
+ m_HasReceived2.SetActive(false);
+ }
}
}
-}
-
-
-
+}
\ No newline at end of file
--
Gitblit v1.8.0