chenbin/tianrunCRM
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

upgrade

Browse Source
This commit is contained in:
陈彬
2020-07-05 15:44:30 +08:00
parent a8f02e4da5
commit e344c54d82
32 changed files with 647 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/CoolapeFrame/3rd/NGUI_Enhance/Scripts/Interaction/UIDragScrollView.cs
View File

@@ -109,7 +109,7 @@ public class UIDragScrollView : MonoBehaviour
public void OnDrag (Vector2 delta) // modify by chenbin
{
if (scrollView && NGUITools.GetActive(this))
scrollView.Drag();
scrollView.Drag(delta);
}
/// <summary>

8
Assets/CoolapeFrame/3rd/NGUI_Enhance/Scripts/Interaction/UIScrollView.cs
View File

@@ -155,7 +155,7 @@ public class UIScrollView : MonoBehaviour
public OnDragNotification onStartCenterOnChild; // add by chenbin
// Deprecated functionality. Use 'movement' instead.
[HideInInspector][SerializeField] Vector3 scale = new Vector3(1f, 0f, 0f);
[HideInInspector][SerializeField] Vector3 scale = new Vector3(0f, 0f, 0f);
// Deprecated functionality. Use 'contentPivot' instead.
[SerializeField][HideInInspector] Vector2 relativePositionOnReset = Vector2.zero;
@@ -368,7 +368,7 @@ public class UIScrollView : MonoBehaviour
if (mStarted && Application.isPlaying) CheckScrollbars();
}
void Start ()
public virtual void Start ()
{
mStarted = true;
if (Application.isPlaying) CheckScrollbars();
@@ -721,7 +721,7 @@ public class UIScrollView : MonoBehaviour
/// Create a plane on which we will be performing the dragging.
/// </summary>
public void Press (bool pressed)
public virtual void Press (bool pressed)
{
if (UICamera.currentScheme == UICamera.ControlScheme.Controller) return;
@@ -794,7 +794,7 @@ public class UIScrollView : MonoBehaviour
/// Drag the object along the plane.
/// </summary>
public void Drag ()
public virtual void Drag (Vector2 delta)
{
if (UICamera.currentScheme == UICamera.ControlScheme.Controller) return;