From 759a3fadfd23a0ea382af48f07e0dc50c81f2491 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 31 十月 2018 12:01:29 +0800
Subject: [PATCH] 4435 子 【开发】【1.2.0】功能预告界面修改，新增可领取奖励 / 【前端】【1.2.0】功能预告界面修改，新增可领取奖励
---
System/MainInterfacePanel/FeaturesType3.cs | 167 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 161 insertions(+), 6 deletions(-)
diff --git a/System/MainInterfacePanel/FeaturesType3.cs b/System/MainInterfacePanel/FeaturesType3.cs
index 46a37a2..2e45137 100644
--- a/System/MainInterfacePanel/FeaturesType3.cs
+++ b/System/MainInterfacePanel/FeaturesType3.cs
@@ -6,18 +6,36 @@
using System.Collections;
using UnityEngine.UI;
using TableConfig;
-
-namespace Snxxz.UI {
+using System.Collections.Generic;
+
+namespace Snxxz.UI
+{
//鍔熻兘棰勫憡绗笁閮�
- public class FeaturesType3:MonoBehaviour {
+ public class FeaturesType3 : MonoBehaviour
+ {
[SerializeField] ImageEx m_Image_Selected;//搴曟澘
[SerializeField] ImageEx m_Img_Circle;//Icon妗�
[SerializeField] ImageEx m_FeaturesTypeIcon;//Icon
[SerializeField] Text m_FunctionName;//鍔熻兘鍚�
[SerializeField] Text m_FunctionalLevel;//鍔熻兘绛夌骇
[SerializeField] Text m_Content;//鍐呭
- FeatureNoticeModel featureNoticeModel { get { return ModelCenter.Instance.GetModel<FeatureNoticeModel>(); } }
+ [SerializeField] GameObject m_Award;
+
+ [SerializeField] ImageEx m_ItemBG1;
+ [SerializeField] ImageEx m_Icon1;
+ [SerializeField] Button m_IconBtn1;
+ [SerializeField] Text m_Number1;
+ [SerializeField] ImageEx m_Lock1;
+
+ [SerializeField] ImageEx m_ItemBG2;
+ [SerializeField] ImageEx m_Icon2;
+ [SerializeField] Button m_IconBtn2;
+ [SerializeField] Text m_Number2;
+ [SerializeField] ImageEx m_Lock2;
+ FeatureNoticeModel featureNoticeModel { get { return ModelCenter.Instance.GetModel<FeatureNoticeModel>(); } }
+ ItemTipsModel _itemTipsModel;
+ ItemTipsModel itemTipsModel { get { return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } }
public void GetTheFeatureID(int funcId)
{
var functionForecastConfig = Config.Instance.Get<FunctionForecastConfig>(funcId);
@@ -38,13 +56,29 @@
{
m_FunctionName.text = "?";
m_FeaturesTypeIcon.SetSprite("UnKnowIcon");
- m_Content.text= string.Format(Language.Get("YGFuncLevel"), NeedLv, PlayerDatas.Instance.baseData.LV, NeedLv);
+ m_Award.SetActive(false);
+ m_Content.gameObject.SetActive(true);
+ m_Content.text = string.Format(Language.Get("YGFuncLevel"), NeedLv, PlayerDatas.Instance.baseData.LV, NeedLv);
}
else
{
m_FunctionName.text = functionForecastConfig.FuncName;
m_FeaturesTypeIcon.SetSprite(functionForecastConfig.FuncIconKey);
- m_Content.text = functionForecastConfig.Content;
+ if (featureNoticeModel.DicAwardItem.ContainsKey(funcId))
+ {
+ m_Award.SetActive(true);
+ m_Content.gameObject.SetActive(false);
+
+ SetRankAwardItem(funcId);
+ //-------------------
+ }
+ else
+ {
+ m_Award.SetActive(false);
+ m_Content.gameObject.SetActive(true);
+ m_Content.text = functionForecastConfig.Content;
+ }
+
}
if (PlayerDatas.Instance.baseData.LV >= functionForecastConfig.DisplayLevel)
{
@@ -67,6 +101,127 @@
m_FeaturesTypeIcon.gray = true;
}
}
+
+ private void SetRankAwardItem(int funcID)
+ {
+ ImpactRankModel.RankAwardItem rankAward = featureNoticeModel.DicAwardItem[funcID];
+ List<AwardItem> List = rankAward.GetAwardItem(PlayerDatas.Instance.baseData.Job);
+
+ if (List.Count <= 1)
+ {
+ m_ItemBG1.gameObject.SetActive(true);
+ m_ItemBG2.gameObject.SetActive(false);
+ SetItem1(List, funcID);
+ }
+ else
+ {
+ m_ItemBG1.gameObject.SetActive(true);
+ m_ItemBG2.gameObject.SetActive(true);
+ SetItem1(List, funcID);
+ SetItem2(List, funcID);
+
+ }
+
+ }
+ private void SetItem1(List<AwardItem> List,int funcID)
+ {
+ var itemConfig = Config.Instance.Get<ItemConfig>(List[0].item.id);
+ UIHelper.SetItemBackGround(m_ItemBG1, itemConfig.ItemColor);
+ m_Icon1.SetSprite(itemConfig.IconKey);
+ m_IconBtn1.SetListener(() =>
+ {
+ if (featureNoticeModel.DicOpenFuncState.ContainsKey(funcID) && featureNoticeModel.DicOpenFuncState[funcID].State == 1 &&
+ featureNoticeModel.DicOpenFuncState[funcID].AwardState == 0)
+ {
+ 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("寮规");
+ }
+
+ });
+ if (List[0].item.count > 1)
+ {
+ m_Number1.gameObject.SetActive(true);
+ m_Number1.text = List[0].item.count.ToString();
+ }
+ else
+ {
+ m_Number1.gameObject.SetActive(false);
+ }
+ if (List[0].isBind==1)
+ {
+ m_Lock1.gameObject.SetActive(true);
+ }
+ else
+ {
+ m_Lock1.gameObject.SetActive(false);
+ }
+ if (FuncOpen.Instance.IsFuncOpen(funcID))
+ {
+ m_ItemBG1.gray = false;
+ m_Icon1.gray = false;
+ m_Lock1.gray = false;
+ }
+ else
+ {
+ m_ItemBG1.gray = true;
+ m_Icon1.gray = true;
+ m_Lock1.gray = true;
+ }
+ }
+ private void SetItem2(List<AwardItem> List, int funcID)
+ {
+ var itemConfig = Config.Instance.Get<ItemConfig>(List[1].item.id);
+ UIHelper.SetItemBackGround(m_ItemBG2, itemConfig.ItemColor);
+ m_Icon2.SetSprite(itemConfig.IconKey);
+ m_IconBtn2.SetListener(() =>
+ {
+ if (featureNoticeModel.DicOpenFuncState.ContainsKey(funcID) && featureNoticeModel.DicOpenFuncState[funcID].State == 1 &&
+ featureNoticeModel.DicOpenFuncState[funcID].AwardState == 0)
+ {
+ 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("寮规");
+ }
+ });
+ if (List[1].item.count > 1)
+ {
+ m_Number2.gameObject.SetActive(true);
+ m_Number2.text = List[1].item.count.ToString();
+ }
+ else
+ {
+ m_Number2.gameObject.SetActive(false);
+ }
+ if (List[1].isBind==1)
+ {
+ m_Lock2.gameObject.SetActive(true);
+ }
+ else
+ {
+ m_Lock2.gameObject.SetActive(false);
+ }
+ if (FuncOpen.Instance.IsFuncOpen(funcID))
+ {
+ m_ItemBG2.gray = false;
+ m_Icon2.gray = false;
+ m_Lock2.gray = false;
+ }
+ else
+ {
+ m_ItemBG2.gray = true;
+ m_Icon2.gray = true;
+ m_Lock2.gray = true;
+ }
+ }
}
}
--
Gitblit v1.8.0