Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Hale

2018-10-29 96a0616f9f837b0e1620b6f1ac5d743103e00d6f

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 Core/ResModule/AssetBundle/AssetBundleUtility.cs

@@ -72,6 +72,7 @@
            var item = keys[i];

            if (item.Contains("builtin"))

            {

                m_AssetBundleDict[item].Unload(false);

                m_AssetBundleDict.Remove(item);

            }

        }


 System/Dungeon/DungenWHYJ.cs

@@ -28,10 +28,8 @@
            for (int i = 0; i < congfig.Length; i++)

            {

                ListRating.Add(congfig[i]);

            }

            model.dungeonFightStageChangeEevent -= dungeonFightStageChangeEevent;

            model.dungeonFightStageChangeEevent += dungeonFightStageChangeEevent;

            model.updateMissionEvent -= updateMissionEvent;

            }           
            model.dungeonFightStageChangeEevent += dungeonFightStageChangeEevent;        
            model.updateMissionEvent += updateMissionEvent;

            if (model.dungeonFightStage == DungeonFightStage.Prepare)

            {

@@ -43,6 +41,12 @@
            }

            SetRatingImage();

            SetTranItemCell();

        }



        public void Unit()

        {

            model.dungeonFightStageChangeEevent -= dungeonFightStageChangeEevent;

            model.updateMissionEvent -= updateMissionEvent;

        }



        private void updateMissionEvent()

@@ -61,7 +65,7 @@
        }
        private void OnDisable()

        {

           
          
        }



        private void dungeonFightStageChangeEevent(DungeonFightStage obj)

@@ -140,6 +144,10 @@
        }
        private void SetRatingImage()

        {

            if (model.mission.Equals(default(DungeonMissionData)))

            {

                return;

            }

            switch (model.mission.grade)

            {

                case 1:


 System/Dungeon/DungeonFightWin.cs

@@ -154,6 +154,7 @@


        protected override void OnAfterClose()

        {

            m_DungenWHYJ.Unit();

        }



        protected override void LateUpdate()


 System/Message/BattleHint.cs

@@ -30,7 +30,7 @@
        public event Action battleHintUpdate;

        public event Action evenKillUpdate;



        Queue<int> battleHints = new Queue<int>();

        List<int> battleHints = new List<int>();

        Queue<string> evenKills = new Queue<string>();



        int ancientKing = 0;

@@ -77,7 +77,11 @@


        public void Receive(int ancientType)

        {

            battleHints.Enqueue(ancientType);

            if (battleHints.Contains(ancientType))

            {

                return;

            }

            battleHints.Add(ancientType);

            if (!WindowCenter.Instance.IsOpen<BattleHintWin>())

            {

                WindowCenter.Instance.Open<BattleHintWin>();

@@ -128,7 +132,8 @@
            ancientType = 0;

            if (battleHints.Count > 0)

            {

                ancientType = battleHints.Dequeue();

                ancientType = battleHints[0];

                battleHints.RemoveAt(0);

                return true;

            }

            return false;


 System/Message/BattleHintWin.cs

@@ -88,21 +88,25 @@
                m_ContainerKing.gameObject.SetActive(false);

                m_ContainerEnemy.gameObject.SetActive(false);

                m_ContainerAncientRemind.gameObject.SetActive(false);

                m_ContainerBattleHint.gameObject.SetActive(true);

                switch (ancientType)

                {

                    case 1:

                        m_ContainerKing.gameObject.SetActive(true);

                        m_BattleHintTween.SetEndState();

                        OnBattleHintTweenComplete();

                        break;

                    case 2:

                        m_ContainerEnemy.gameObject.SetActive(true);

                        m_BattleHintTween.SetEndState();

                        OnBattleHintTweenComplete();

                        break;

                    case 3:

                        m_ContainerAncientRemind.gameObject.SetActive(true);

                        m_BattleHintTween.SetStartState();

                        m_BattleHintTween.Play(OnBattleHintTweenComplete);

                        break;

                }

                m_ContainerBattleHint.gameObject.SetActive(true);

                m_BattleHintTween.SetStartState();

                m_BattleHintTween.Play(OnBattleHintTweenComplete);

            }

        }




 System/OpenServerActivity/WishingPoolModel.cs

@@ -65,7 +65,7 @@


        private void OperationEndEvent(Operation type, int state)

        {

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

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

            {

                UpdateRedpoint();

                if (onStateUpate != null)

@@ -88,7 +88,7 @@


        private void OperationStartEvent(Operation type, int state)

        {

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

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

            {

                UpdateRedpoint();

                if (onStateUpate != null)

@@ -137,8 +137,11 @@
        public int handStartIndex { get; private set; }

        public int handEndIndex { get; private set;}

        public event Action UpdateHandMoveEvent;

        public bool isClick { get; set; }

        public void SetHandMovePos(int wishIndex)

        {

            if (!isClick) return;



            foreach(var key in poolDataDict.Keys)

            {

                if(poolDataDict[key].itemId != 0)

@@ -150,6 +153,7 @@
            handEndIndex = wishIndex;

            if(UpdateHandMoveEvent != null)

            {

                isClick = false;

                UpdateHandMoveEvent();

            }

        }


 System/OpenServerActivity/WishingPoolWin.cs

@@ -23,14 +23,17 @@
        [SerializeField] GameObject activityCloseObj;

        [Header("动画控制")]

        [SerializeField] RectTransform handImg;

        [SerializeField] PositionTween positionTween;

        [SerializeField] UIAlphaTween alphaTween;

        [SerializeField] CanvasGroup handAlpha;

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

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

        [Header("最小时间间隔")] [SerializeField] float minDuration = 1.5f;

        [Header("最大时间间隔")] [SerializeField] float maxDuration = 2.5f;

        [Header("渐隐渐显时间")] [SerializeField] float alphaDuration = 0.5f;



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

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

        OperationWishingWellInfo operation = null;

        int playTimes = 0;

        #region Built-in

        protected override void BindController()

        {

@@ -56,7 +59,7 @@


        protected override void OnAfterOpen()

        {

           


        }

        protected override void OnPreClose()

        {

@@ -78,7 +81,7 @@
            if (operation == null) return;



            UpdatePoolItem();

            for(int i = 0; i < wishingCells.Count; i++)

            for (int i = 0; i < wishingCells.Count; i++)

            {

                UpdateWishItemByIndex(i);

            }

@@ -89,6 +92,10 @@
            activityDayText.text = Language.Get("WishingPool103", operation.GetActivityDay());

            totalDayText.text = Language.Get("WishingPool101", Language.Get(StringUtility.Contact("Num_CHS_", operation.totalDays + 1)));

            handImg.gameObject.SetActive(false);

            playTimes = 0;

            handAlpha.DOKill();

            handImg.DOKill();

            wishingModel.isClick = true;

        }



        private void UpdateHandMove()

@@ -98,21 +105,56 @@


        private void PlayHandMovePos()

        {

            positionTween.from = startPos[wishingModel.handStartIndex];

            positionTween.to = endPos[wishingModel.handEndIndex];

            positionTween.SetStartState();

            alphaTween.from = 0;

            alphaTween.to = 1;

            alphaTween.SetStartState();

            handImg.gameObject.SetActive(true);

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

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

            alphaTween.Play();

            positionTween.Play(() =>

            {

                handImg.gameObject.SetActive(false);

            });

            playTimes = 0;

            handAlpha.DORestart();

            handImg.DORestart();

            PlayAlphaTween(true);

        }



        private void PlayPosTween()

        {

            playTimes += 1;

            Vector2 pos = endPos[wishingModel.handEndIndex];

            float offset = (float)Mathf.Abs(wishingModel.handStartIndex % 4 - wishingModel.handEndIndex) / 2;

            if (offset < minDuration)

            {

                offset = minDuration;

            }

            else if (offset > maxDuration)

            {

                offset = maxDuration;

            }

            handImg.DOAnchorPos(pos, offset).OnComplete(()=> { PlayAlphaTween(false); });

        }



        private void PlayAlphaTween(bool isStart)

        {

            if (isStart)

            {

                handImg.anchoredPosition = startPos[wishingModel.handStartIndex];

                handImg.gameObject.SetActive(true);

                handAlpha.alpha = 0;

                handAlpha.DOFade(1, alphaDuration).OnComplete(() =>

                {

                    PlayPosTween();

                });

            }

            else

            {

                handAlpha.alpha = 1;

                handAlpha.DOFade(0, alphaDuration).OnComplete(() =>

                {

                    if (playTimes < 2)

                    {

                        PlayAlphaTween(true);

                    }

                    else

                    {

                        handImg.gameObject.SetActive(false);

                        wishingModel.isClick = true;

                    }

                });

            }

        }



        #region 许愿逻辑

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

        private void OperationEndEvent(Operation type, int state)

        {

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

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

            {

                UpdateActivityState();

            }


 System/Welfare/OperationTimeHepler.cs

@@ -286,6 +286,7 @@
                operation.startDate = ParseOperationDate(package.StartDate);

                operation.endDate = ParseOperationDate(package.EndtDate);

                operation.dayReset = package.IsDayReset == 1;

                operation.resetType = package.ResetType;

                operation.ParsePackage(package);

                if (operationTimeUpdateEvent != null)

                {