Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/PlayerDead/PlayerDeadModel.cs

@@ -26,7 +26,7 @@
        IsCanReborn = false;

        isOpenPrompting = true;

        this.deadCD = 0;

        localBossState = 0;

        localBossState = false;

        playerIsDie = false;

    }



@@ -81,13 +81,14 @@
    private DungeonOpenTimeConfig _dungeonOpenTimeModel;



    public bool IsCanReborn { get; private set; }

    public int localBossState { get; private set;}

    public bool localBossState { get; private set;}

    public string killerName { get; private set; }

    public bool isKillByPlayer { get; private set; }

    public int npcRealmLv { get; private set; }

    private void RefreshPlayerDieInfo(string key, ArrayList infolist)

    {

        npcRealmLv = 0;

        localBossState = false;

        switch (key)

        {

            case "PK_lhs_318691":

@@ -100,11 +101,16 @@
            case "GeRen_chenxin_279029":

                if(infolist.Count > 0)

                {

                    WorldBossConfig bossConfig = Config.Instance.Get<WorldBossConfig>(int.Parse(infolist[0].ToString()));

                    NPCConfig nPCConfig = Config.Instance.Get<NPCConfig>(int.Parse(infolist[0].ToString()));

                    if(nPCConfig != null)

                    {

                        killerName = nPCConfig.charName;

                        npcRealmLv = nPCConfig.Realm;

                    }

                    if(bossConfig != null)

                    {

                        localBossState = true;

                    }

                    isKillByPlayer = false;

                }

@@ -141,8 +147,6 @@
        {

            return;

        }



        localBossState = PlayerDatas.Instance.extersion.bossState;

        playerIsDie = true;

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

        if (_tagMapModel.MapFBType == 0)

@@ -151,7 +155,7 @@
            rebornTiredNum = RebornConditions[0];

            rebornPrice = RebornConditions[2];

            //isBossKill = StatusManager.Instance.IsExist((int)playerId,20022);

            if (!isKillByPlayer && localBossState == 1)

            if (!isKillByPlayer && localBossState)

            {

                autoRebornTime = RebornConditions[3];

            }

@@ -253,7 +257,7 @@
        if (PlayerDatas.Instance.baseData.PlayerID != data.PlayerID)

            return;



        localBossState = 0;

        localBossState = false;

        this.deadCD = 0;

        isKillByPlayer = false;

        playerIsDie = false;