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

client_Hale

2018-11-19 19233a1d495bad7dabcf0301ffad450ef2ff8c5b

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

 System/PlayerDead/PlayerDeadModel.cs

@@ -10,6 +10,8 @@
    public class PlayerDeadModel : Model, IBeforePlayerDataInitialize,IPlayerLoginOk

{

    public int[]dungeonKillArray { get; private set; }

    public int deadBuffId { get; private set;}



    public override void Init()

    {

        isKillByPlayer = false;

@@ -18,6 +20,8 @@
        RebornConditions = ConfigParse.GetMultipleStr<int>(funcConfig.Numerical1);

        FuncConfigConfig RebornTime = Config.Instance.Get<FuncConfigConfig>("DuplicatesRebornTime");

        duplicatesRebornDict = ConfigParse.GetDic<int, int>(RebornTime.Numerical1);

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

        deadBuffId = int.Parse(ElderBattlefieldRobot.Numerical3);

        SysNotifyMgr.Instance.sysNotifyEvent += RefreshPlayerDieInfo;

    }




 System/PlayerDead/ReliveWin.cs

@@ -1,5 +1,6 @@
using System;

using System.Collections;

using System.Collections.Generic;

using TableConfig;

using UnityEngine;

using UnityEngine.UI;

@@ -14,6 +15,7 @@
        private Image _ringImage;



        [SerializeField] Text dieDesText;

        [SerializeField] Text buffText;



        PlayerDeadModel _deadModel;

        PlayerDeadModel DeadModel

@@ -21,6 +23,7 @@
            get { return _deadModel ?? (_deadModel = ModelCenter.Instance.GetModel<PlayerDeadModel>()); }

        }



        public const int ElderBattleMapID = 31160; //上古战场地图Id

        int questTimes = 0;

        #region Built-in

        protected override void BindController()

@@ -38,11 +41,44 @@
            TimeDownMgr.Instance.Get(TimeDownMgr.CoolTimeType.DuplicatesReborn, out coolDown);

            RefreshTime(Mathf.RoundToInt(coolDown.duration - coolDown.time));

            DeadModel.RefreshDuplicatesRebornCDEvent = RefreshTime;

            MapConfig mapConfig = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);

            int curMapId = PlayerDatas.Instance.baseData.MapID;

            MapConfig mapConfig = Config.Instance.Get<MapConfig>(curMapId);

            dieDesText.gameObject.SetActive(false);

            buffText.gameObject.SetActive(curMapId == ElderBattleMapID);

            if (curMapId == ElderBattleMapID)

            {

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

                StatusMgr.Instance.GetBuffIds(PlayerDatas.Instance.PlayerId, ref buffIds);

                var skillConfigs = SkillConfig.GetSkillActConfigs(0,0,DeadModel.deadBuffId);

                string skillName = string.Empty;

                int buffLv = 0;

                if(buffIds.Count > 0)

                {

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

                    {

                        int buffId = buffIds[i];

                        SkillConfig skillConfig = Config.Instance.Get<SkillConfig>(buffId);

                        if(skillConfig.SkillTypeID == DeadModel.deadBuffId)

                        {

                            skillName = skillConfig.SkillName;

                            buffLv = skillConfig.SkillLV + 1;

                            break;

                        }

                    }

                }

    
                if(skillConfigs != null && skillConfigs.Count > 0 && buffLv == 0)

                {

                    SkillConfig skillConfig = skillConfigs[0];

                    skillName = skillConfig.SkillName;

                    buffLv = 1;

                }



                buffText.text = Language.Get("AncientBattlefield_Text_2",buffLv,skillName);

            }

            for (int i = 0; i < DeadModel.dungeonKillArray.Length; i++)

            {

                if(DeadModel.dungeonKillArray[i] == PlayerDatas.Instance.baseData.MapID)

                if(DeadModel.dungeonKillArray[i] == curMapId)

                {

                    dieDesText.gameObject.SetActive(true);

                    string msg = StringUtility.Contact(Language.Get("AncientBattlefield_Text_1", mapConfig.Name, UIHelper.ServerStringTrim(DeadModel.killerName)));