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

client_Hale

2018-08-15 f609082b62705e63a29cecea3a683798ef0f4e8c

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

 System/OpenServerActivity/ImpactRankCoolDown.cs

New file
@@ -0,0 +1,34 @@
using System;

using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;



namespace Snxxz.UI

{

    public class ImpactRankCoolDown : MonoBehaviour

    {

        [SerializeField] Text m_Time;

        private void OnEnable()

        {

            TimeUtility.OnServerOpenDayRefresh += OnServerOpenDayRefresh;

            DisplayTime();

        }



        private void OnDisable()

        {

            TimeUtility.OnServerOpenDayRefresh -= OnServerOpenDayRefresh;

        }



        private void OnServerOpenDayRefresh()

        {

            DisplayTime();

        }



        void DisplayTime()

        {

            m_Time.text = Language.Get("SignIn_4", TimeUtility.OpenDay + 1);

        }

    }

}


 System/OpenServerActivity/ImpactRankCoolDown.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: b25c6e7f45cded341b90f9381a0666df
timeCreated: 1534320807
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 System/OpenServerActivity/ImpactRankModel.cs

@@ -54,12 +54,20 @@
                {

                    onStateUpate(0);

                }

                if (inImpactRankUpdate != null)

                {

                    inImpactRankUpdate();

                }

            }

        }



        private void OnServerOpenDayRefresh()

        {

            UpdateRedpoint();

            if (inImpactRankUpdate != null)

            {

                inImpactRankUpdate();

            }

        }



        private void OnRefreshRank(int type)

@@ -86,6 +94,7 @@
        public Dictionary<int, OSCbillBoardCondition> impactRankTypeOpenDict { get; private set; }

        public Dictionary<int, List<OSCBillTagAwardConfig>> billTagSortCfgDict { get; private set; }

        public int openServerActivityDays { get; private set; }

        public int openServerRankDays { get; private set; }

        public int gotoImpactRankType { get; set; }

        private void ParseConfig()

        {

@@ -192,6 +201,7 @@
            _json = LitJson.JsonMapper.ToObject(_funcCfg.Numerical1);

            openServerActivityDays = int.Parse(_funcCfg.Numerical2);

            impactRankTypeOpenDict = new Dictionary<int, OSCbillBoardCondition>();

            openServerRankDays = 0;

            foreach (var _key in _json.Keys)

            {

                var _type = int.Parse(_key);

@@ -202,6 +212,10 @@
                    start = _array[1],

                    end = _array[2]

                };

                if (_condition.end > openServerRankDays)

                {

                    openServerRankDays = _condition.end;

                }

                impactRankTypeOpenDict.Add(_type, _condition);

                m_Redpoints.Add(_type, new Redpoint(Redpoint_Key_ImpactRank, Redpoint_Key_ImpactRank * 100 + _type));

            }

@@ -422,6 +436,7 @@
        #region 协议

        public event Action OnAwardGetEvent;

        public event Action<int> onStateUpate;

        public event Action inImpactRankUpdate;



        private Dictionary<int, OpenServerPlayerData> impactAwardGetDict = new Dictionary<int, OpenServerPlayerData>();

        public void UpdateGetState(HAB17_tagMCOpenServerCampaignAwardList _package)

@@ -644,6 +659,14 @@
                return state == RedPointState.Simple || state == RedPointState.GetReward;

            }

        }



        public bool IsInImpactRank

        {

            get

            {

                return TimeUtility.OpenDay < openServerRankDays && FuncOpen.Instance.IsFuncOpen(125);

            }

        }

        #endregion

    }