From dcf6a47f1f72fce515fe6689d15f5e2c21b10911 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 14 八月 2018 15:04:46 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
UI/Common/CyclicScroll.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/UI/Common/CyclicScroll.cs b/UI/Common/CyclicScroll.cs
index cc1ec88..1958fab 100644
--- a/UI/Common/CyclicScroll.cs
+++ b/UI/Common/CyclicScroll.cs
@@ -12,13 +12,13 @@
get { return m_Content; }
}
- [SerializeField] BoundOffset m_BoundOffset;
- [SerializeField] Vector2 m_CellSize = new Vector2(100, 100);
+ [SerializeField] protected BoundOffset m_BoundOffset;
+ [SerializeField] protected Vector2 m_CellSize = new Vector2(100, 100);
public Vector2 cellSize {
get { return m_CellSize; }
}
- [SerializeField] Vector2 m_Spacing;
+ [SerializeField] protected Vector2 m_Spacing;
public Vector2 spacing {
get { return m_Spacing; }
}
@@ -157,7 +157,7 @@
get; set;
}
- public virtual void Init<T>(List<T> _datas, bool _stepByStep = false)
+ public virtual void Init<T>( List<T> _datas, bool _stepByStep = false)
{
if (_datas == null)
{
--
Gitblit v1.8.0