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

client_Wu Xijin

2019-01-16 cf68d0b9ba9848711a8ade63e5139ee02449e1ff

 Core/GameEngine/Model/Player/PlayerDatas.cs

@@ -43,7 +43,7 @@
    public uint worldExpRate { get; private set; }

    public List<uint> maliciousAtkPlayer = new List<uint>();// 发动恶意攻击的玩家列表

    private int m_Tick;

    private uint m_CrossServerTick;

    public uint crossServerTick;



    public event Action OnRoleAttrRefresh;

    public event Action<E_AttackMode> OnSwitchAttackMode;

@@ -479,7 +479,7 @@
                }

                else

                {

                    if (m_CrossServerTick != 0)

                    if (crossServerTick != 0)

                    {

                        uint _curWorldTick = GetWorldTick();

                        uint _diffValue = value > _curWorldTick ? value - _curWorldTick : _curWorldTick - value;

@@ -497,7 +497,7 @@
                }

                else

                {

                    m_CrossServerTick = value;

                    crossServerTick = value;

                }

                m_Tick = Environment.TickCount;



@@ -1006,14 +1006,14 @@
    public void ClearTick()

    {

        extersion.Tick = 0;

        m_CrossServerTick = 0;

        crossServerTick = 0;

    }



    public bool IsTickVaild()

    {

        if (CrossServerUtility.IsCrossServer())

        {

            return m_CrossServerTick != 0;

            return crossServerTick != 0;

        }

        else

        {

@@ -1024,7 +1024,7 @@
    public uint GetWorldTick()

    {

        int _currentTick = Environment.TickCount - m_Tick;

        uint _tick = CrossServerUtility.IsCrossServer() ? m_CrossServerTick + (uint)_currentTick : extersion.Tick + (uint)_currentTick;

        uint _tick = CrossServerUtility.IsCrossServer() ? crossServerTick + (uint)_currentTick : extersion.Tick + (uint)_currentTick;

        return _tick;

    }