Merge remote-tracking branch 'origin/master' into leonard

client_Wu Xijin

2018-10-29 d82561629d51d3863002a3f1bbb32ef6b1b429bb

 System/OpenServerActivity/WishingPoolWin.cs

@@ -27,6 +27,8 @@
        [SerializeField] UIAlphaTween alphaTween;

        [SerializeField] List<Vector2> startPos = new List<Vector2>();

        [SerializeField] List<Vector2> endPos = new List<Vector2>();

        [Header("最小时间间隔")] [SerializeField] int minDuration = 3;

        [Header("最大时间间隔")] [SerializeField] int maxDuration = 6;



        ItemTipsModel tipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }

        WishingPoolModel wishingModel { get { return ModelCenter.Instance.GetModel<WishingPoolModel>(); } }

@@ -105,8 +107,16 @@
            alphaTween.to = 1;

            alphaTween.SetStartState();

            handImg.gameObject.SetActive(true);

            int offset = wishingModel.handStartIndex % 4 - wishingModel.handEndIndex;

            positionTween.duration = Mathf.Max(2, Mathf.Abs(offset));

            int offset = Mathf.Abs(wishingModel.handStartIndex % 4 - wishingModel.handEndIndex);

            if(offset < minDuration)

            {

                offset = minDuration;

            }

            else if(offset > maxDuration)

            {

                offset = maxDuration;

            }

            positionTween.duration = offset;

            alphaTween.Play();

            positionTween.Play(() =>

            {

@@ -235,7 +245,7 @@
        #region 活动逻辑

        private void OperationEndEvent(Operation type, int state)

        {

            if(type == Operation.WishingWellInfo && state == 1)

            if(type == Operation.WishingWellInfo && state == 0)

            {

                UpdateActivityState();

            }