From 4e7dd603c96d5aedc1a0ca4c4c869c0c49b2af4e Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 18 九月 2018 17:57:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/FunctionForecastTip.cs | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/System/MainInterfacePanel/FunctionForecastTip.cs b/System/MainInterfacePanel/FunctionForecastTip.cs
index 676f411..1dacb9a 100644
--- a/System/MainInterfacePanel/FunctionForecastTip.cs
+++ b/System/MainInterfacePanel/FunctionForecastTip.cs
@@ -10,10 +10,12 @@
using System.Collections.Generic;
using DG.Tweening;
//涓荤晫闈㈠姛鑳介鍛�
-namespace Snxxz.UI {
+namespace Snxxz.UI
+{
- public class FunctionForecastTip : MonoBehaviour {
- public static int OpenTag = 0;
+ public class FunctionForecastTip : MonoBehaviour
+ {
+ public static int OpenTag = 0;
[SerializeField] Transform _FunctionForecastPanel;//鍒囨崲闈㈡澘
[SerializeField] Image _FunctionIcon;//鍥炬爣Icon
[SerializeField] Button _FunctionIconBtn;//闈㈡澘寮�鍏虫寜閽�
@@ -34,7 +36,7 @@
FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= OnPlayersUpLV;
}
-
+
private void Start()
{
@@ -52,7 +54,7 @@
private void OnPlayersUpLV(PlayerDataRefresh _type)
{
- if (_type==PlayerDataRefresh.LV)
+ if (_type == PlayerDataRefresh.LV)
{
DataAssignment();
}
@@ -69,7 +71,7 @@
foreach (var config in configs)
{
if (!FuncOpen.Instance.IsFuncOpen(config.FuncId)
- && PlayerDatas.Instance.baseData.LV >= config.OpenLevel && config.Display==1)
+ && PlayerDatas.Instance.baseData.LV >= config.OpenLevel && config.Display == 1)
{
OpenTag = config.FuncId;
if (FunctionOpenTagEvent != null)
@@ -90,7 +92,7 @@
_FunctionIcon.SetSprite(Config.Instance.Get<FunctionForecastConfig>(ID).FuncIconKey);
_NameText.text = Config.Instance.Get<FunctionForecastConfig>(ID).Describe;
FuncOpenLVConfig funcoPenConfig = Config.Instance.Get<FuncOpenLVConfig>(ID);
- if (funcoPenConfig.LimitMagicWeapon != 0 || funcoPenConfig.LimitMissionID!=0)
+ if (funcoPenConfig.LimitMagicWeapon != 0 || funcoPenConfig.LimitMissionID != 0)
{
if (funcoPenConfig.LimitMagicWeapon != 0)
{
@@ -109,14 +111,15 @@
{
_Information.text = string.Format(Language.Get("FuncLevelOpen"), funcoPenConfig.LimitLV);
}
-
+
}
-
+
void FunctionIconBtn()//闈㈡澘寮�鍚�
{
WindowCenter.Instance.Close<MainInterfaceWin>();
WindowCenter.Instance.Open<FeatureNoticeWin>();
+ // WindowCenter.Instance.Open<ZXWTestWin>();
}
}
--
Gitblit v1.8.0