From 259af9624cb7f4735e0efbc85f78d7ddffec6b36 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 12 九月 2018 17:50:30 +0800
Subject: [PATCH] 3488 【前端】【1.0.15】【1.1.0】功能预告优化
---
System/MainInterfacePanel/FeatureNoticeWin.cs | 103 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 89 insertions(+), 14 deletions(-)
diff --git a/System/MainInterfacePanel/FeatureNoticeWin.cs b/System/MainInterfacePanel/FeatureNoticeWin.cs
index 383f6e7..586c5b9 100644
--- a/System/MainInterfacePanel/FeatureNoticeWin.cs
+++ b/System/MainInterfacePanel/FeatureNoticeWin.cs
@@ -12,6 +12,14 @@
namespace Snxxz.UI
{
//鍔熻兘棰勫憡闈㈡澘
+ public enum FeatureNoticeEnum
+ {
+ Pet=6,//鐏靛疇
+ Horse=8,//鍧愰獞
+ Wing=97,//缈呰唨
+ GossipFurnace=87,//鍏崷鐐�
+ }
+
public class FeatureNoticeWin : Window
{
[SerializeField] Text m_TextAdvanceName;//鍔熻兘鍚�
@@ -26,6 +34,10 @@
[SerializeField] Text m_TextUnopened;//鏈紑鍚�
[SerializeField] Text m_Textschedule;//杩涘害
[SerializeField] Button m_ButtonGoto;
+ [SerializeField] RawImage m_RawImage1;
+ [SerializeField] RawImage m_RawImage2;
+ [SerializeField] RawImage m_RawImage3;
+ [SerializeField] RawImage m_RawImage4;
TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }
FeatureNoticeModel featureNoticeModel { get { return ModelCenter.Instance.GetModel<FeatureNoticeModel>(); } }
#region Built-in
@@ -57,6 +69,13 @@
}
protected override void OnPreClose()
{
+ UI3DModelExhibition.Instance.StopShowNPC();
+ UI3DModelExhibition.Instance.StopShowHourse();
+ UI3DModelExhibition.Instance.StopShowWing();
+ UI3DTreasureExhibition.Instance.StopShow();
+ }
+ protected override void OnAfterClose()
+ {
PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= OnPlayersUpLV;
FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
m_ScrollerController.OnRefreshCell -= OnRefreshGridCell;
@@ -65,9 +84,9 @@
if (featureNoticeModel.redPointStre1.state == RedPointState.Simple)
{
featureNoticeModel.redPointStre1.state = RedPointState.None;
- }
+ }
+
}
-
private void treasureStageUpEvent(int obj)
{
ContentDisplay();
@@ -158,9 +177,7 @@
}
}
- protected override void OnAfterClose()
- {
- }
+
#endregion
private void DefaultSelection()//鑾峰彇榛樿閫夋嫨
{
@@ -198,7 +215,7 @@
return;
}
m_TextAdvanceName.text = functionForecastConfig.FuncName;
- m_FeaturesImage.SetSprite(functionForecastConfig.Icon);
+ DisplayIcon(ClickFuncID);
string[] StrList = ConfigParse.GetMultipleStr(functionForecastConfig.Content);
if (StrList.Length > 0)
{
@@ -218,9 +235,68 @@
{
TrailerClassification(ClickFuncID);
}
-
}
+ private void DisplayIcon(int funcID)//鏄剧ず鍥炬爣鎴栬�呮ā鍨�
+ {
+ m_RawImage1.gameObject.SetActive(false);
+ m_RawImage2.gameObject.SetActive(false);
+ m_RawImage3.gameObject.SetActive(false);
+ m_RawImage4.gameObject.SetActive(false);
+ m_FeaturesImage.gameObject.SetActive(false);
+ var functionForecastConfig = Config.Instance.Get<FunctionForecastConfig>(ClickFuncID);
+ switch (funcID)
+ {
+ case (int)FeatureNoticeEnum.Pet:
+ UI3DModelExhibition.Instance.StopShowHourse();
+ UI3DModelExhibition.Instance.StopShowWing();
+ UI3DTreasureExhibition.Instance.StopShow();
+ m_RawImage1.gameObject.SetActive(true);
+ var npcConfig = Config.Instance.Get<NPCConfig>(50106001);
+ UI3DModelExhibition.Instance.BeginShowNPC(50106001, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_RawImage1);
+ break;
+ case (int)FeatureNoticeEnum.Horse:
+ UI3DModelExhibition.Instance.StopShowNPC();
+ UI3DModelExhibition.Instance.StopShowWing();
+ UI3DTreasureExhibition.Instance.StopShow();
+ m_RawImage2.gameObject.SetActive(true);
+ HorseConfig _model = Config.Instance.Get<HorseConfig>(100);
+ UI3DModelExhibition.Instance.BeginShowHourse(_model.Model, m_RawImage2);
+ break;
+ case (int)FeatureNoticeEnum.Wing:
+ UI3DModelExhibition.Instance.StopShowNPC();
+ UI3DModelExhibition.Instance.StopShowHourse();
+ UI3DTreasureExhibition.Instance.StopShow();
+ m_RawImage3.gameObject.SetActive(true);
+ var vec3 = new Vector3(0,90,-90);
+ int job = PlayerDatas.Instance.baseData.Job;
+ if (job == 1)
+ {
+ var config = Config.Instance.Get<WingRefineExpConfig>(3711);
+ int _modelID = config.Model;
+ UI3DModelExhibition.Instance.BeginShowWing(_modelID, vec3, m_RawImage3);
+ }
+ else if (job == 1)
+ {
+ var config = Config.Instance.Get<WingRefineExpConfig>(3721);
+ int _modelID = config.Model;
+ UI3DModelExhibition.Instance.BeginShowWing(_modelID, vec3, m_RawImage3);
+ }
+ break;
+ case (int)FeatureNoticeEnum.GossipFurnace:
+ UI3DModelExhibition.Instance.StopShowNPC();
+ UI3DModelExhibition.Instance.StopShowHourse();
+ UI3DModelExhibition.Instance.StopShowWing();
+ m_RawImage4.gameObject.SetActive(true);
+ UI3DTreasureExhibition.Instance.BeginShowTreasure(301, m_RawImage4);
+ break;
+ default:
+ m_FeaturesImage.gameObject.SetActive(true);
+ m_FeaturesImage.SetSprite(functionForecastConfig.Icon);
+ break;
+
+ }
+ }
void TrailerClassification(int funcID)//棰勫憡鍒嗙被
{
m_TextTurnedOn.gameObject.SetActive(false);
@@ -253,6 +329,7 @@
private void MagicWeapon(int fabaoID)
{
+ m_Textschedule.gameObject.SetActive(true);
m_ButtonGoto.gameObject.SetActive(true);
Treasure treasure;
TreasureConfig _treasure = Config.Instance.Get<TreasureConfig>(fabaoID);
@@ -265,8 +342,7 @@
});
if (treasureModel.TryGetTreasure(fabaoID, out treasure)
&& treasure.state == TreasureState.Collected)
- {
- m_Textschedule.gameObject.SetActive(true);
+ {
var list = treasure.treasureStages;
var funcStage = 0;
for (int i = 0; i < list.Count; i++)
@@ -288,9 +364,9 @@
}
else
{
- m_Textschedule.text = (float)treasure.exp / treasure.treasureStages[funcStage].exp + "%";
- }
-
+ string str = ((float)treasure.exp / treasure.treasureStages[funcStage].exp) * 100 + "%";
+ m_Textschedule.text = string.Format(Language.Get("YGYouFB"), str);
+ }
}
else
{
@@ -300,8 +376,7 @@
}
else
{
- m_TextUnopened.gameObject.SetActive(true);
- m_TextUnopened.text = string.Format(Language.Get("FuncFBOpen"), _treasure.Name);
+ m_Textschedule.text = string.Format(Language.Get("YGNoFB"), _treasure.Name);
}
}
}
--
Gitblit v1.8.0