Merge remote-tracking branch 'origin/master' into 5725【1.5】跨服聊天

client_linchunjie

2019-01-15 38a70bd799ca8bd62ba0b49995a0e9234c3cf77c

Merge remote-tracking branch 'origin/master' into 5725【1.5】跨服聊天

 Core/GameEngine/DataToCtl/PackageRegedit.cs

@@ -471,7 +471,7 @@
        }

        catch (Exception ex)

        {

            DebugEx.LogError(ex);

            DebugEx.LogError(ex.StackTrace);

        }

    }




 Core/GameEngine/Model/Player/Character/PlayerBaseData.cs

@@ -64,8 +64,10 @@
    public int BasicsScoreAHit;//基础命中

    public int BasicsDodge;//基础闪避

    public uint equipShowSwitch;//装备显隐开关

    public long treasurePotentialSp {

        get {

    public long treasurePotentialSp

    {

        get

        {

            return ExAttr8 * (long)100000000 + ExAttr7;

        }

    }

@@ -111,7 +113,6 @@
            PHY = _serverInfo.PHY;

            CON = _serverInfo.CON;

            Setting = _serverInfo.Setting;

            AttackMode = _serverInfo.AttackMode;

            FBID = _serverInfo.FBID;

            ExAttr1 = _serverInfo.ExAttr1;

            ExAttr2 = _serverInfo.ExAttr2;

@@ -153,11 +154,13 @@
            if (_serverInfo.socketType == GameNetSystem.SocketType.CrossSever)

            {

                HP = _serverInfo.HP;

                AttackMode = _serverInfo.AttackMode;

            }

        }

        else

        {

            HP = _serverInfo.HP;

            AttackMode = _serverInfo.AttackMode;

        }



        if (PlayerDatas.Instance.hero != null)


 Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0408_tagPlayerSummonNPCAppear.cs

@@ -10,7 +10,7 @@
    {
        base.Done(vNetPack);

        if (GameNetSystem.Instance.crossServerSocketConnected)
        if (CrossServerUtility.IsCrossServer())
        {
            if (vNetPack.socketType == GameNetSystem.SocketType.Main)
            {

 Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0434_tagAreaPlayerAppearEx.cs

@@ -12,7 +12,7 @@
    {

        base.Done(vNetPack);



        if (GameNetSystem.Instance.crossServerSocketConnected)

        if (CrossServerUtility.IsCrossServer())

        {

            if (vNetPack.socketType == GameNetSystem.SocketType.Main)

            {


 Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0435_tagPetAppear.cs

@@ -12,7 +12,7 @@
    {
        base.Done(vNetPack);

        if (GameNetSystem.Instance.crossServerSocketConnected)
        if (CrossServerUtility.IsCrossServer())
        {
            if (vNetPack.socketType == GameNetSystem.SocketType.Main)
            {

 Core/NetworkPackage/DTCFile/ServerPack/HA2_Package/DTCA202_tagMCAttackMode.cs

@@ -20,6 +20,14 @@
            return;
        }

        if (CrossServerUtility.IsCrossServer())
        {
            if (vNetData.socketType == GameNetSystem.SocketType.Main)
            {
                return;
            }
        }

        PlayerDatas.Instance.OnRecv_SwitchAttackMode(vNetData.Mode);
    }
}

 Fight/Actor/HeroBehaviour.cs

@@ -821,7 +821,7 @@
                    };

                }



                if (!GameNetSystem.Instance.crossServerSocketConnected)

                if (!CrossServerUtility.IsCrossServer())

                {

                    GameNetSystem.Instance.SendInfo(_b405);

                }


 Fight/Actor/State/SMB/SMB_Base.cs

@@ -157,7 +157,7 @@
                        _beatBack.NPCPosList[0].PosX = (ushort)(_checkPos.x * 2f + GA_Hero.MapOffset.x);

                        _beatBack.NPCPosList[0].PosY = (ushort)(_checkPos.z * 2f + GA_Hero.MapOffset.z);



                        if (!GameNetSystem.Instance.crossServerSocketConnected)

                        if (!CrossServerUtility.IsCrossServer())

                        {

                            GameNetSystem.Instance.SendInfo(_beatBack);

                        }


 Fight/Actor/State/SMB/STM_BaseAttack.cs

@@ -135,7 +135,7 @@
                    _0502.PosY = (ushort)(owner.Pos.z * 2);

                    _0502.WorldTick = 0;



                    if (!GameNetSystem.Instance.crossServerSocketConnected)

                    if (!CrossServerUtility.IsCrossServer())

                    {

                        GameNetSystem.Instance.SendInfo(_0502);

                    }

@@ -725,7 +725,7 @@
                };

            }



            if (!GameNetSystem.Instance.crossServerSocketConnected)

            if (!CrossServerUtility.IsCrossServer())

            {

                GameNetSystem.Instance.SendInfo(_beatBack);

            }

@@ -1045,7 +1045,7 @@
                            WorldTick = PlayerDatas.Instance.GetWorldTick()

                        };



                        if (!GameNetSystem.Instance.crossServerSocketConnected)

                        if (!CrossServerUtility.IsCrossServer())

                        {

                            GameNetSystem.Instance.SendInfo(_proto);

                        }


 Fight/GameActor/GA_Player.cs

@@ -646,7 +646,7 @@
    {

        // Debug.LogFormat("{0} 血量改变: {1}", ServerInstID, value);

        GA_Hero _hero = PlayerDatas.Instance.hero;

        if (_hero != null && (_hero.SelectTarget == this || GameNetSystem.Instance.crossServerSocketConnected))

        if (_hero != null && (_hero.SelectTarget == this || CrossServerUtility.IsCrossServer()))

        {

            if (s_OnRefreshLife != null)

            {


 Fight/GameActor/GActorPlayerBase.cs

@@ -2677,7 +2677,7 @@
                _b404.PosY = (ushort)(Pos.z * 2 + GA_Hero.MapOffset.z);





                if (!GameNetSystem.Instance.crossServerSocketConnected)

                if (!CrossServerUtility.IsCrossServer())

                {

                    GameNetSystem.Instance.SendInfo(_b404);

                }


 Fight/MapTransferUtility.cs

@@ -845,7 +845,7 @@
            ExData1 = (uint)_npcId

        };



        if (GameNetSystem.Instance.crossServerSocketConnected)

        if (CrossServerUtility.IsCrossServer())

        {

            GameNetSystem.Instance.SendToCrossServer(_transfer);

        }


 System/FindPrecious/DemonJarAutoChallenge.cs

@@ -10,6 +10,7 @@
    DemonJarModel model { get { return ModelCenter.Instance.GetModel<DemonJarModel>(); } }
    FindPreciousModel findPreciousModel { get { return ModelCenter.Instance.GetModel<FindPreciousModel>(); } }
    DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
    CrossServerOneVsOneModel crossServerOneVsOneModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>();  } }

    float timer = 0f;
    float lastTouchTime = 0f;
@@ -59,6 +60,21 @@

        timer = 0f;

        if (crossServerOneVsOneModel.IsMatching)
        {
            return;
        }

        if (CrossServerLogin.Instance.IsEnterCrossServerPreparing())
        {
            return;
        }

        if (CrossServerUtility.IsCrossServer())
        {
            return;
        }

        var bossIds = findPreciousModel.GetBossSubscribes();
        var maxLevelBoss = 0;
        var maxLevel = 0;

 System/FindPrecious/FindPreciousModel.cs

@@ -551,6 +551,11 @@


        public bool AutoGotoSkillDemonJarBoss(BossNotify notify)

        {

            if (CrossServerUtility.IsCrossServer())

            {

                return false;

            }



            if (!demonJarModel.autoChallenge)

            {

                return false;


 System/Mount/PlayerMountDatas.cs

@@ -224,7 +224,7 @@
            }

        }

    }

    private const int Redpoint_key1 = 1010301;

    private const int Redpoint_key1 = 1050101;

    public Redpoint redPointStre1 = new Redpoint(MainRedDot.RedPoint_MountPackKey, Redpoint_key1);//坐骑外观

    private const int Redpoint_key2 = 1050102;

    public Redpoint redPointStre2 = new Redpoint(MainRedDot.RedPoint_MountPackKey, Redpoint_key2);//坐骑兽魂


 System/OpenServerActivity/FlashRushToBuyModel.cs

@@ -163,7 +163,9 @@
            for (int i = 0; i < appointmentInfo.GoodsCount; i++)

            {

                var saleItemInfo = appointmentInfo.GoodsList[i];

                if (appointmentInfo.GoodsCount < 2 && saleItemInfo.State == 1)

                if (appointmentInfo.GoodsCount < 2 
                    && saleItemInfo.State == 1

                    && appointmentInfo.IsAll != 1)

                {

                    SysNotifyMgr.Instance.ShowTip("FlashRushToBuy1");

                }


 System/OpenServerActivity/FlashSaleItemCell.cs

@@ -189,8 +189,8 @@
            int fullSeverRemain = 0;

            int personalRemain = 0;

            int sellState = GetSellSate(out fullSeverRemain,out personalRemain);

            string fullSeverRemainStr = fullSeverRemain > 0 ? fullSeverRemain.ToString() : UIHelper.AppendStringColor(TextColType.Red, fullSeverRemain.ToString());

            string personalRemainStr = personalRemain > 0 ? personalRemain.ToString() : UIHelper.AppendStringColor(TextColType.Red, personalRemain.ToString());

            string fullSeverRemainStr = fullSeverRemain > 0 ? UIHelper.AppendStringColor(TextColType.Green, fullSeverRemain.ToString(),true) : UIHelper.AppendStringColor(TextColType.Red, fullSeverRemain.ToString());

            string personalRemainStr = personalRemain > 0 ? UIHelper.AppendStringColor(TextColType.Green, personalRemain.ToString(),true) : UIHelper.AppendStringColor(TextColType.Red, personalRemain.ToString());

            fullServerRemainNum.text = fullSeverRemainStr;

            personalRemainNum.text = personalRemainStr;

            switch (sellState)