少年修仙传客户端代码仓库
client_Wu Xijin
2019-01-15 0cbe933d37a10dffbf3166a17e347df30b9da8c5
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
11个文件已修改
39 ■■■■■ 已修改文件
Core/GameEngine/Model/Player/Character/PlayerBaseData.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0408_tagPlayerSummonNPCAppear.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0434_tagAreaPlayerAppearEx.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0435_tagPetAppear.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/NetworkPackage/DTCFile/ServerPack/HA2_Package/DTCA202_tagMCAttackMode.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/Actor/HeroBehaviour.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/Actor/State/SMB/SMB_Base.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/Actor/State/SMB/STM_BaseAttack.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/GameActor/GA_Player.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/GameActor/GActorPlayerBase.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/MapTransferUtility.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
        }