From cd4790cf2bc76ee632dabbea424ba61d8dafab8a Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期六, 22 十二月 2018 15:37:28 +0800
Subject: [PATCH] 5367 【前端】【1.4】聚魂功能开发
---
System/MainInterfacePanel/HeadPortraitTip.cs | 4 +---
System/MainInterfacePanel/LowSettingTip.cs | 7 +++----
System/Message/MessageWin.cs | 3 +++
System/Role/RoleModel.cs | 21 +++++++++++++++++++++
4 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/System/MainInterfacePanel/HeadPortraitTip.cs b/System/MainInterfacePanel/HeadPortraitTip.cs
index 1e59136..cfb1a3b 100644
--- a/System/MainInterfacePanel/HeadPortraitTip.cs
+++ b/System/MainInterfacePanel/HeadPortraitTip.cs
@@ -319,9 +319,7 @@
void HeadButton()
{
- // DesignDebug.Log("澶村儚鐐瑰嚮妗�");
- WindowCenter.Instance.Close<MainInterfaceWin>();
- WindowCenter.Instance.Open<RolePanel>();
+ ModelCenter.Instance.GetModel<RoleModel>().OpenRolePanel();
}
void OnPromoteBtn()
diff --git a/System/MainInterfacePanel/LowSettingTip.cs b/System/MainInterfacePanel/LowSettingTip.cs
index b4df4d1..aaffa59 100644
--- a/System/MainInterfacePanel/LowSettingTip.cs
+++ b/System/MainInterfacePanel/LowSettingTip.cs
@@ -63,10 +63,9 @@
void Role1Button()
{
-
- WindowCenter.Instance.Close<MainInterfaceWin>();
- WindowCenter.Instance.Open<RolePanel>();
- /* DesignDebug.Log("瑙掕壊鎸夐挳")*/;
+
+ ModelCenter.Instance.GetModel<RoleModel>().OpenRolePanel();
+
}
void OnClickBagualuBtn()
{
diff --git a/System/Message/MessageWin.cs b/System/Message/MessageWin.cs
index 42747e5..286e4ee 100644
--- a/System/Message/MessageWin.cs
+++ b/System/Message/MessageWin.cs
@@ -40,6 +40,7 @@
public void ShowFixedTip(string tip, ArrayList infoList = null)
{
+ transform.SetAsLastSibling();
m_FixedTip0.SetExtenalData(infoList);
m_FixedTip0.text = tip;
if (!m_ContianerFixedTip0.gameObject.activeInHierarchy)
@@ -51,6 +52,7 @@
public void ShowFixedTips(string tip, ArrayList infoList = null)
{
+ transform.SetAsLastSibling();
var _index = m_FixedTipDisplays.FindIndex((x) =>
{
return !x;
@@ -94,6 +96,7 @@
{
return;
}
+ transform.SetAsLastSibling();
var _hint = ServerTipDetails.RequireServerTip();
if (_hint != null)
{
diff --git a/System/Role/RoleModel.cs b/System/Role/RoleModel.cs
index 5340b68..3b79528 100644
--- a/System/Role/RoleModel.cs
+++ b/System/Role/RoleModel.cs
@@ -84,6 +84,27 @@
}
}
}
+
+ public void OpenRolePanel()
+ {
+ var functionOrder = 0;
+ var godWeaponModel = ModelCenter.Instance.GetModel<MagicianModel>();
+ var gatherSoulModel = ModelCenter.Instance.GetModel<GatheringSoulModel>();
+ if (MainRedDot.Instance.roleRedpoint.state != RedPointState.None)
+ {
+ functionOrder = 0;
+ }
+ else if (godWeaponModel.magicianRedpoint.state != RedPointState.None)
+ {
+ functionOrder = 3;
+ }
+ else if (gatherSoulModel.redpoint.state != RedPointState.None)
+ {
+ functionOrder = 4;
+ }
+ WindowCenter.Instance.Close<MainInterfaceWin>();
+ WindowCenter.Instance.Open<RolePanel>(false, functionOrder);
+ }
}
}
--
Gitblit v1.8.0