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

client_Wu Xijin

2019-05-07 f8d7be58847ae24eb86717a37a4873f158cc9910

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

 System/HazyRegion/HazyDemonKingDungeonWin.cs

@@ -212,6 +212,14 @@
            {

                return -lhs_bossBelong.CompareTo(rhs_bossBelong);

            }



            bool lhs_isMySelf = lhs == PlayerDatas.Instance.PlayerId;

            bool rhs_isMySelf = rhs == PlayerDatas.Instance.PlayerId;

            if (lhs_isMySelf != rhs_isMySelf)

            {

                return lhs_isMySelf.CompareTo(rhs_isMySelf);

            }



            var playerId = PlayerDatas.Instance.baseData.PlayerID;

            var lhs_atkself = model.GetPlayerAtkTarget(lhs) == playerId;

            var rhs_atkself = model.GetPlayerAtkTarget(rhs) == playerId;


 System/HazyRegion/HazyDemonKingModel.cs

@@ -139,22 +139,6 @@
                    }

                }



                var playerId = PlayerDatas.Instance.PlayerId;

                if (IsExistBelongTo(playerId))

                {

                    if (!m_PlayerInfos.ContainsKey(playerId))

                    {

                        requireRefreshPlayer = true;

                    }

                }

                else

                {

                    if (m_PlayerInfos.ContainsKey(playerId))

                    {

                        requireRefreshPlayer = true;

                    }

                }



                if (requireRefreshPlayer)

                {

                    RefreshAroundPlayer();

@@ -185,26 +169,16 @@
            }



            var playerId = PlayerDatas.Instance.PlayerId;

            if (IsExistBelongTo(playerId))

            if (!m_PlayerInfos.ContainsKey(playerId))

            {

                if (!m_PlayerInfos.ContainsKey(playerId))

                var hero = PlayerDatas.Instance.hero;

                m_PlayerInfos.Add(playerId, new HazyDemonKingPlayerInfo()

                {

                    var hero = PlayerDatas.Instance.hero;

                    m_PlayerInfos.Add(playerId, new HazyDemonKingPlayerInfo()

                    {

                        job = PlayerDatas.Instance.baseData.Job,

                        hp = hero.ActorInfo.RealHp,

                        maxHp = hero.ActorInfo.RealMaxHp,

                        playerName = PlayerDatas.Instance.baseData.PlayerName,

                    });

                }

            }

            else

            {

                if (m_PlayerInfos.ContainsKey(playerId))

                {

                    m_PlayerInfos.Remove(playerId);

                }

                    job = PlayerDatas.Instance.baseData.Job,

                    hp = hero.ActorInfo.RealHp,

                    maxHp = hero.ActorInfo.RealMaxHp,

                    playerName = PlayerDatas.Instance.baseData.PlayerName,

                });

            }



            if (onPlayerInfoRefresh != null)