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

client_Hale

2019-01-11 017a5003e87589b6fc277feb6427f6039a98f8fd

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

 System/CrossServerBoss/CrossServerBossModel.cs

@@ -253,7 +253,14 @@

            sendInfo.NPCIDList = string.Format("[{0}]", string.Join(",", stringArray));
            sendInfo.NPCIDListLen = (byte)sendInfo.NPCIDList.Length;
            GameNetSystem.Instance.SendToCrossServer(sendInfo);
            if (CrossServerUtility.IsCrossServerBoss())
            {
                GameNetSystem.Instance.SendToCrossServer(sendInfo);
            }
            else
            {
                GameNetSystem.Instance.SendInfo(sendInfo);
            }
        }

        public void RequestBoxSurplusInfo()
@@ -263,7 +270,14 @@
            sendInfo.LineID = (ushort)PlayerDatas.Instance.baseData.dungeonLineId;
            sendInfo.NPCIDList = string.Format("[{0},{1}]", bigBoxNpcId, smallBoxNpcId);
            sendInfo.NPCIDListLen = (byte)sendInfo.NPCIDList.Length;
            GameNetSystem.Instance.SendToCrossServer(sendInfo);
            if (CrossServerUtility.IsCrossServerBoss())
            {
                GameNetSystem.Instance.SendToCrossServer(sendInfo);
            }
            else
            {
                GameNetSystem.Instance.SendInfo(sendInfo);
            }
        }

        public void RequestEliteSurplusInfo()
@@ -279,7 +293,15 @@

            sendInfo.NPCIDList = string.Format("[{0}]", string.Join(",", stringArray));
            sendInfo.NPCIDListLen = (byte)sendInfo.NPCIDList.Length;
            GameNetSystem.Instance.SendToCrossServer(sendInfo);

            if (CrossServerUtility.IsCrossServerBoss())
            {
                GameNetSystem.Instance.SendToCrossServer(sendInfo);
            }
            else
            {
                GameNetSystem.Instance.SendInfo(sendInfo);
            }
        }

        public void UpdateMonsterSurplusInfo(HA714_tagMCNPCCntList _npcInfoes)

 System/WindowJump/WindowJumpMgr.cs

@@ -508,6 +508,14 @@
                }

                SetJumpLogic<BlastFurnaceWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.SevenDaysTour281:

            case JumpUIType.SevenDaysTour282:

                var sevenDaysModel = ModelCenter.Instance.GetModel<OpenServiceAchievementModel>();

                int jumpIndex = 0;

                int.TryParse(_tagWinSearchModel.SelectActive,out jumpIndex);

                sevenDaysModel.JumpIndex = jumpIndex;

                SetJumpLogic<AchievementActivityWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.TreasureFindHostFunc1:

            case JumpUIType.TreasureFindHostFunc2:

            case JumpUIType.TreasureFindHostFunc3:

@@ -1017,6 +1025,14 @@
            case JumpUIType.CrossServerOneVsOne278:

            case JumpUIType.CrossServerOneVsOne279:

                if(!CrossServerOneVsOnePKSeason.Instance.IsEnterCrossServer(true))

                {

                    return false;

                }

                break;

            case JumpUIType.SevenDaysTour281:

            case JumpUIType.SevenDaysTour282:

                var sevenDaysModel = ModelCenter.Instance.GetModel<OpenServiceAchievementModel>();

                if(!sevenDaysModel.IsJumpOpen())

                {

                    return false;

                }

@@ -1560,6 +1576,8 @@
    CrossServerOneVsOne278 = 278, //跨服赛季赛季奖励界面

    CrossServerOneVsOne279 = 279, //跨服赛季荣誉商店界面

    FashionDress280 = 280, //时装功能界面

    SevenDaysTour281 = 281, //七日巡礼

    SevenDaysTour282 = 282, //七日巡礼

    DhszTs = 1001,//定海神针功法提升界面

    HyqTs = 1002,//皓月枪功法提升界面

    GyzTs = 1003,//鬼牙刃功法提升界面


 UI/Common/UI3DShowHero.cs

@@ -587,15 +587,15 @@
                switch (key)

                {

                    case 1:

                        if (secondaryModel != null)

                        if (clothesModel != null)

                        {

                            bone = secondaryModel.transform;

                            bone = clothesModel.transform.GetChildTransformDeeply(GAStaticDefine.SecondaryBindBoneName[job - 1]);

                        }

                        break;

                    case 2:

                        if (weaponModel != null)

                        if (clothesModel != null)

                        {

                            bone = weaponModel.transform;

                            bone = clothesModel.transform.GetChildTransformDeeply(GAStaticDefine.WeaponBindBoneName);

                        }

                        break;

                    case 4: