From 3a080af005fa50c708d21b5daceb2c6a9655777e Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 18 九月 2018 15:35:45 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/FeatureNoticeWin.cs | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/System/MainInterfacePanel/FeatureNoticeWin.cs b/System/MainInterfacePanel/FeatureNoticeWin.cs
index 9b4def7..78f6adb 100644
--- a/System/MainInterfacePanel/FeatureNoticeWin.cs
+++ b/System/MainInterfacePanel/FeatureNoticeWin.cs
@@ -9,6 +9,8 @@
using UnityEngine;
using UnityEngine.UI;
using TableConfig;
+using EnhancedUI.EnhancedScroller;
+
namespace Snxxz.UI
{
//鍔熻兘棰勫憡闈㈡澘
@@ -39,6 +41,7 @@
[SerializeField] RawImage m_RawImage3;
[SerializeField] RawImage m_RawImage4;
[SerializeField] Text m_keyName;
+ public int Offset = 0;//鍋忕Щ
TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }
FeatureNoticeModel featureNoticeModel { get { return ModelCenter.Instance.GetModel<FeatureNoticeModel>(); } }
#region Built-in
@@ -61,9 +64,14 @@
m_ScrollerController.OnRefreshCell += OnRefreshGridCell;
OnCreateGridLineCell(m_ScrollerController);
ContentDisplay();
- m_ScrollerController.JumpIndex(JumpIndex());
+
+
}
-
+ protected override void OnActived()
+ {
+ m_ScrollerController.JumpIndex(JumpIndex());
+ m_ScrollerController.JumpIndex(Offset, 0, EnhancedScroller.TweenType.immediate);
+ }
protected override void OnAfterOpen()
{
FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
@@ -219,7 +227,7 @@
{
return;
}
- if (!FuncOpen.Instance.IsFuncOpen(ClickFuncID) && functionForecastConfig.OpenNumber > featureNoticeModel.FunctionForecastIndex)
+ if (!FuncOpen.Instance.IsFuncOpen(ClickFuncID) && functionForecastConfig.OpenNumber-1 > featureNoticeModel.FunctionForecastIndex)
{
m_Text_ShowA.gameObject.SetActive(false);
m_TextShowB.gameObject.SetActive(false);
@@ -268,7 +276,7 @@
UI3DModelExhibition.Instance.StopShowWing();
UI3DTreasureExhibition.Instance.StopShow();
var functionForecastConfig = Config.Instance.Get<FunctionForecastConfig>(ClickFuncID);
- if (!FuncOpen.Instance.IsFuncOpen(ClickFuncID) && functionForecastConfig.OpenNumber > featureNoticeModel.FunctionForecastIndex)
+ if (!FuncOpen.Instance.IsFuncOpen(ClickFuncID) && functionForecastConfig.OpenNumber-1 > featureNoticeModel.FunctionForecastIndex)
{
m_FeaturesImage.gameObject.SetActive(true);
m_FeaturesImage.SetSprite("YGWENHAO");
@@ -324,13 +332,13 @@
m_ButtonGoto.gameObject.SetActive(false);
FuncOpenLVConfig funcoPenConfig = Config.Instance.Get<FuncOpenLVConfig>(funcID);
var functionForecastConfig = Config.Instance.Get<FunctionForecastConfig>(ClickFuncID);
- if (!FuncOpen.Instance.IsFuncOpen(ClickFuncID) && functionForecastConfig.OpenNumber > featureNoticeModel.FunctionForecastIndex)
+ if (!FuncOpen.Instance.IsFuncOpen(ClickFuncID) && functionForecastConfig.OpenNumber-1 > featureNoticeModel.FunctionForecastIndex)
{
var functionForecastValue = Config.Instance.GetAllValues<FunctionForecastConfig>();
string StrNanme = string.Empty;
foreach (var value in functionForecastValue)
{
- if (value.OpenNumber == functionForecastConfig.OpenNumber - 1)
+ if (value.OpenNumber == functionForecastConfig.OpenNumber -2)
{
StrNanme = value.FuncName;
}
--
Gitblit v1.8.0