From eedeb8a020fce13e0e63ad7c57adfdff7578e875 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 14 三月 2019 21:05:23 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/BuffListWin.cs | 50 +++++---------------------------------------------
1 files changed, 5 insertions(+), 45 deletions(-)
diff --git a/System/MainInterfacePanel/BuffListWin.cs b/System/MainInterfacePanel/BuffListWin.cs
index f9bed9b..9f714a9 100644
--- a/System/MainInterfacePanel/BuffListWin.cs
+++ b/System/MainInterfacePanel/BuffListWin.cs
@@ -7,7 +7,6 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
-
using UnityEngine.UI;
//鍏充簬Buff闈㈡澘鐨勮缃�
namespace Snxxz.UI
@@ -23,14 +22,9 @@
private ScrollRect _ScrollRect;
private Dictionary<int, ObjBuff> objBuffic;
private List<int> _SortList = new List<int>();//鎺掑簭鍒楄〃
- BuffModel m_BuffModel;
- BuffModel Buffmodel
- {
- get
- {
- return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<BuffModel>());
- }
- }
+
+ BuffModel Buffmodel { get { return ModelCenter.Instance.GetModel<BuffModel>(); } }
+
#region Built-in
protected override void BindController()
{
@@ -67,7 +61,6 @@
BuffModel.Even_ObjDelBuff -= DelBuff;
}
#endregion
-
void UpdateControllerPosition()
@@ -189,35 +182,6 @@
{
int Type = 0;
return Type;
- int Use_TheSecond = Mathf.FloorToInt((float)(DateTime.Now - objBuffic[BuffID]._dattTime).TotalSeconds);
- if (objBuffic[BuffID].LastTime - Use_TheSecond > 0)
- {
- float time = objBuffic[BuffID].LastTime - Use_TheSecond;
- if (time >= 86400)//澶�
- {
- return 4;
- }
- else if (time < 86400 && time >= 3600)//鏃�
- {
- return 3;
- }
- else if (time < 3600 && time >= 60)//鍒�
- {
- return 2;
- }
- else if (time < 60 && time > 0)//绉�
- {
- return 1;
- }
- else
- {
- return 0;
- }
- }
- else
- {
- return 0;
- }
}
List<int> Priority()
@@ -232,25 +196,21 @@
return _List;
}
- void AddBuff()//buff鐨勫鍔�
+ void AddBuff()
{
-
objBuffic = Buffmodel._BuffDic;
BuffScheduling();
UpdateControllerPosition();
OnCreateGridLineCell(m_ScrollerController);
}
- void DelBuff()//buff鐨勫垹闄�
+ void DelBuff()
{
-
objBuffic = Buffmodel._BuffDic;
BuffScheduling();
UpdateControllerPosition();
OnCreateGridLineCell(m_ScrollerController);
}
-
-
}
--
Gitblit v1.8.0