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

client_linchunjie

2019-04-28 d23ff4248abb86f79e5015b39e96ab0930a6c924

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

 System/ItemTip/ItemTipUtility.cs

@@ -137,7 +137,7 @@
            public int level;

        }

        public struct OtherPlayerEquipInfo

        public struct CustomEquipInfo

        {

            public int job;

            public int itemId;

@@ -344,10 +344,10 @@
            }
        }



        public static void ShowOtherPlayerEquip(OtherPlayerEquipInfo info)

        public static void ShowCustomEquip(CustomEquipInfo info)

        {

            secondaryData = null;

            mainTipData = CreateOtherPlayerEquipData(info);

            mainTipData = CreateCustomEquipData(info);

            WindowCenter.Instance.Open<EquipTipWin>();

        }



@@ -453,7 +453,7 @@
            };
        }

        static TipData CreateOtherPlayerEquipData(OtherPlayerEquipInfo info)

        static TipData CreateCustomEquipData(CustomEquipInfo info)

        {

            var config = ItemConfig.Get(info.itemId);

            var baseInfo = new BaseInfo()


 System/RoleParticulars/OtherPlayerEquipModel.cs

@@ -27,6 +27,7 @@
            }
        }

        public int viewPlayerType { get; private set; }
        public int playerId { get; private set; }
        public int playerJob { get; private set; }
        public int playerRealm { get; private set; }
@@ -35,8 +36,6 @@

        public event Action selectedLevelChangeEvent;
        Dictionary<int, EquipDetailsGroup> equipDetailsGroups = new Dictionary<int, EquipDetailsGroup>();

        RoleParticularModel roleParticularModel { get { return ModelCenter.Instance.GetModel<RoleParticularModel>(); } }

        public override void Init()
        {
@@ -49,6 +48,7 @@

        public void ViewPlayerEquip(PlayerBriefInfo info)
        {
            this.viewPlayerType = info.viewType;
            this.playerId = info.id;
            this.playerJob = info.job;
            this.playerRealm = info.realm;
@@ -67,13 +67,13 @@
            }
            else
            {
                switch (roleParticularModel.viewPlayerType)
                switch (viewPlayerType)
                {
                    case 4:
                    case 7:
                        {
                            var sendInfo = new CC002_tagCGViewCrossPlayerInfo();
                            sendInfo.PlayerID = (uint)roleParticularModel.viewPlayer;
                            sendInfo.PlayerID = (uint)playerId;
                            GameNetSystem.Instance.SendInfo(sendInfo);
                        }
                        break;
@@ -81,7 +81,7 @@
                    case 6:
                        {
                            var sendInfo = new CA212_tagCMViewPlayerInfo();
                            sendInfo.PlayerID = (uint)roleParticularModel.viewPlayer;
                            sendInfo.PlayerID = (uint)playerId;
                            sendInfo.EquipClassLV = (byte)level;
                            GameNetSystem.Instance.SendToCrossServer(sendInfo);
                        }
@@ -89,7 +89,7 @@
                    default:
                        {
                            var sendInfo = new CA212_tagCMViewPlayerInfo();
                            sendInfo.PlayerID = (uint)roleParticularModel.viewPlayer;
                            sendInfo.PlayerID = (uint)playerId;
                            sendInfo.EquipClassLV = (byte)level;
                            GameNetSystem.Instance.SendInfo(sendInfo);
                        }
@@ -165,21 +165,21 @@
            }
        }

        public ItemTipUtility.OtherPlayerEquipInfo GetEquipInfo(int level, int place)
        public ItemTipUtility.CustomEquipInfo GetEquipInfo(int level, int place)
        {
            if (!equipDetailsGroups.ContainsKey(level))
            {
                return default(ItemTipUtility.OtherPlayerEquipInfo);
                return default(ItemTipUtility.CustomEquipInfo);
            }

            if (!equipDetailsGroups[level].equips.ContainsKey(place))
            {
                return default(ItemTipUtility.OtherPlayerEquipInfo);
                return default(ItemTipUtility.CustomEquipInfo);
            }

            var details = equipDetailsGroups[level].equips[place];

            var equipInfo = new ItemTipUtility.OtherPlayerEquipInfo();
            var equipInfo = new ItemTipUtility.CustomEquipInfo();
            equipInfo.job = playerJob;
            equipInfo.itemId = details.itemId;

@@ -403,6 +403,7 @@

        public struct PlayerBriefInfo
        {
            public int viewType;
            public int id;
            public int job;
            public int realm;

 System/RoleParticulars/OtherPlayerEquipSlotBehaviour.cs

@@ -71,7 +71,7 @@

        private void ViewEquipDetails()
        {
            ItemTipUtility.ShowOtherPlayerEquip(model.GetEquipInfo(model.selectedLevel, this.place));
            ItemTipUtility.ShowCustomEquip(model.GetEquipInfo(model.selectedLevel, this.place));
        }

    }

 System/RoleParticulars/RoleParticularsWin.cs

@@ -115,6 +115,7 @@


            otherPlayerEquipModel.ViewPlayerEquip(new OtherPlayerEquipModel.PlayerBriefInfo()

            {

                viewType=model.viewPlayerType,

                id = model.viewPlayer,

                realm = viewPlayerData.rolePropData.RealmLV,

                job = viewPlayerData.rolePropData.Job,


 System/WindowBase/ModelCenter.cs

@@ -233,6 +233,7 @@
            RegisterModel<HazyGrassModel>();

            RegisterModel<DungeonUseBuffModel>();

            RegisterModel<AlchemyModel>();

            RegisterModel<OtherPlayerEquipModel>();

            inited = true;

        }