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

client_Wu Xijin

2018-11-24 abc02e1e45b41dc2630e4b3d3137ac12b766e18f

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

 System/Dungeon/IceCrystalVeinModel.cs

@@ -26,6 +26,7 @@
{

    public Dictionary<int, IceLodeStarAwardClass> DicIceLodeStarAward = new Dictionary<int, IceLodeStarAwardClass>();

    public List<int> LineList = new List<int>();//玩法列表

    private List<IceLodeStarAwardClass> IceLodeStarAwardList = new List<IceLodeStarAwardClass>();

    public Dictionary<int, string> IconKeyDic = new Dictionary<int, string>();

    public int AwardRecord = 0;//领奖记录

    public int HasSweep = 0;//是否已扫荡

@@ -37,6 +38,8 @@
    DungeonModel m_Model;

    DungeonModel model { get { return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<DungeonModel>()); } }

    public const int ICECRYSTALVEIN_MAPID = 31140;

    public const int ICECRYSTALVEIN_REDPOINT = 78102;

    public Redpoint Redpoint = new Redpoint(78001, ICECRYSTALVEIN_REDPOINT);

    public override void Init()

    {

        var IceLodeCfg = Config.Instance.Get<FuncConfigConfig>("IceLodeCfg");

@@ -49,15 +52,26 @@
    }

    public void OnBeforePlayerDataInitialize()

    {



        model.dungeonRecordChangeEvent -= dungeonRecordChangeEvent;

    }



    private void dungeonRecordChangeEvent(int fbId)

    {

        if (fbId == ICECRYSTALVEIN_MAPID)

        {

            IsShowRedPoint();

        }

    }



    public override void UnInit()

    {



    }

    public void OnPlayerLoginOk()

    {



        model.dungeonRecordChangeEvent += dungeonRecordChangeEvent;

        AddIceLodeStarAwardList();

        IsShowRedPoint();

    }



    private void Assignment()

@@ -107,6 +121,8 @@
        AwardRecord = (int)info.AwardRecord;

        HasSweep = (int)info.HasSweep;

        DayLv = (int)info.DayLV;

        AddIceLodeStarAwardList();

        IsShowRedPoint();

        if (UpdateIceLodeInf != null)

        {

            UpdateIceLodeInf();

@@ -163,6 +179,42 @@
        }

        return true;

    }



    private void AddIceLodeStarAwardList()

    {

        IceLodeStarAwardList.Clear();

        foreach (var key in DicIceLodeStarAward.Keys)

        {

            var Dic = DicIceLodeStarAward[key];

            int Lv = DayLv;

            if (Lv >= Dic.MinLv && Lv <= Dic.MaxLv)

            {

                IceLodeStarAwardList.Add(Dic);

            }

        }

    }

    private void  IsShowRedPoint()//是否显示红点

    {

        bool Isbool = false;

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

        {

            IceLodeStarAwardClass IceLode = IceLodeStarAwardList[i];

            int All_star = GetAllStar();

            bool _bool = MathUtility.GetBitValue((uint)AwardRecord, (ushort)IceLode.Index);

            if (All_star >= IceLode.Star && !_bool)

            {

                Isbool = true;

            }

        }

        if (Isbool)

        {

            Redpoint.state = RedPointState.Simple;

        }

        else

        {

            Redpoint.state = RedPointState.None;

        }

    }

}



 System/Dungeon/IceCrystalVeinWin.cs

@@ -109,7 +109,7 @@


        private void dungeonRecordChangeEvent(int fbId)

        {

            if (fbId == 31140)

            if (fbId == IceCrystalVeinModel.ICECRYSTALVEIN_MAPID)

            {

                StarAll = iceCrystalVeinModel.GetAllStar();

                SetGridBotton();


 System/Dungeon/TreasureDungeonMissionHintWin.cs

@@ -179,7 +179,7 @@
                    if (index < m_DemonPropertys.Length)

                    {

                        m_DemonPropertys[index].gameObject.SetActive(true);

                        m_DemonPropertys[index].Display(key, propertyDict[key]);

                        m_DemonPropertys[index].DisplayUpper(key, propertyDict[key]);

                        index++;

                    }

                }


 System/Message/BattleHintWin.cs

@@ -23,6 +23,8 @@
        [SerializeField, Header("保留时间")] float m_KeepTime = 2f;



        [SerializeField] RectTransform m_ContainerEvenKill;

        [SerializeField] Image m_EvenKillSign;

        [SerializeField] Image m_KillSign;

        [SerializeField] ScaleTween m_EvenKillTween;

        [SerializeField] Text m_EvenKill;

        [SerializeField, Header("保留时间")] float m_EvenKillTime = 2f;

@@ -141,7 +143,10 @@
            if (BattleHint.Instance.TryGetEvenKill(out evenKill))

            {

                isEvenKill = true;

                m_EvenKill.text= evenKill;

                m_EvenKill.text = evenKill;

                bool firstKill = evenKill.Equals("1");

                m_KillSign.gameObject.SetActive(firstKill);

                m_EvenKillSign.gameObject.SetActive(!firstKill);

                m_ContainerEvenKill.gameObject.SetActive(true);

                m_EvenKillTween.SetStartState();

                m_EvenKillTween.Play(OnEvenKillComplete);


 System/Realm/ActivateShow.cs

@@ -133,6 +133,15 @@


            titleIconKey = _beforeLv == 0 ? "UI_JH_12" : "UI_JH_6";



            if (_beforeLv == 0)

            {

                var exteriorPower = 0;

                if (_model.TryGetExteriorPower(_type, out exteriorPower))

                {

                    fightPower += exteriorPower;

                }

            }



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

            {

                WindowCenter.Instance.Open<RealmPropertyUpWin>();


 System/Role/MagicianModel.cs

@@ -73,6 +73,7 @@
        public List<int> godWeaponSorts = new List<int>();

        Dictionary<int, AutoHammerCost> autoHammerCostDict = new Dictionary<int, AutoHammerCost>();

        Dictionary<int, List<int>> godWeaponStageDict = new Dictionary<int, List<int>>();

        Dictionary<int, int> exteriorPowerDict = new Dictionary<int, int>();

        int[] autoHammerExpArea { get; set; }

        int[] autoHammerCount { get; set; }



@@ -206,6 +207,15 @@
                    godWeaponStageDict.Add(config.type, stages);

                }

                stages.Add(config.level);

            }



            funcConfig = Config.Instance.Get<FuncConfigConfig>("MagicExterior");

            json = LitJson.JsonMapper.ToObject(funcConfig.Numerical1);

            foreach (var key in json.Keys)

            {

                var type = int.Parse(key);

                var power = int.Parse(json[key].ToString());

                exteriorPowerDict.Add(type, power);

            }

        }



@@ -535,6 +545,11 @@
            return autoHammerCostDict.TryGetValue(type, out autoHammerCost);

        }



        public bool TryGetExteriorPower(int type, out int power)

        {

            return exteriorPowerDict.TryGetValue(type, out power);

        }



    }



    public class GodWeaponInfo