少年修仙传客户端代码仓库
client_Zxw
2018-10-29 a346604aa98af9f2ed0a8fb5857bdd875b860e07
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
4个文件已修改
23 ■■■■ 已修改文件
System/OpenServerActivity/WishingPoolModel.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/OpenServerActivity/WishingPoolWin.cs 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Treasure/TreasureComponent.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Welfare/OperationTimeHepler.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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)
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();
            }
System/Treasure/TreasureComponent.cs
@@ -720,7 +720,7 @@
            Treasure _treasure;
            if (category == TreasureCategory.Human &&
                model.TryGetTreasure(treasureId, out _treasure) && _treasure.IsHighestStage
                && !model.GetTreasureFinishAnim(treasureId))
                && !model.GetTreasureFinishAnim(treasureId) && model.GetTreasureUnlockShow(TreasureCategory.Human) != treasureId)
            {
                highestSfx = SFXPlayUtility.Instance.Play(5197, root);
                if (highestSfx != null)
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)
                {