Merge remote-tracking branch 'origin/master' into Cross_Server

client_Wu Xijin

2018-12-24 769eca1d9e5d4c7a0d1875a71ddb63d0aebc404f

 System/RoleParticulars/RoleParticularModel.cs

@@ -27,7 +27,7 @@


        public int viewPlayer { get; private set; }



        public int viewPlayerType { get; private set; }  //0-查看装备 1-查看战力

        public int viewPlayerType { get; private set; }  //0-查看装备 1-查看战力 2-王者仙盟 3-仙盟宴会传功



        private Dictionary<int, ViewPlayerData> viewPlayerDataDic = new Dictionary<int, ViewPlayerData>();

        private Dictionary<int, ulong> funcFightPowerDict = new Dictionary<int, ulong>();

@@ -64,6 +64,12 @@
        public void ViewKingFairyLeader(int _playerId)

        {

            viewPlayerType = 2;

            ViewRoleParticulars(_playerId);

        }



        public void ViewFairyFeastTransmit(int _playerId)

        {

            viewPlayerType = 3;

            ViewRoleParticulars(_playerId);

        }



@@ -585,6 +591,7 @@
        #endregion



        public event Action<ViewPlayerData> UpdatePlayerParticularEvent;

        public event Action<int, ViewPlayerData> viewPlayerUpdate;

        private void ShowRoleParticulars(ViewPlayerData _viewPlayerData)

        {

            switch (viewPlayerType)

@@ -607,6 +614,12 @@
                        UpdatePlayerParticularEvent(_viewPlayerData);

                    }

                    break;

                case 3:

                    if (viewPlayerUpdate != null)

                    {

                        viewPlayerUpdate(3, _viewPlayerData);

                    }

                    break;

            }

            viewPlayerType = -1;

        }