Merge branch 'Cross_Server' of http://192.168.0.87:10010/r/snxxz_scripts in...

client_Zxw

2018-12-26 2dcb69fe1d53359a1c4d9ee19afdad58b6022aec

Merge branch 'Cross_Server' of http://192.168.0.87:10010/r/snxxz_scripts into Cross_Server

 Core/GameEngine/Model/Player/PlayerDatas.cs

@@ -517,6 +517,7 @@
                        StageManager.Instance.Load<DungeonStage>(baseData.MapID, true);

                        if (hero != null && !hero.ActorInfo.serverDie)

                        {

                            hero.RequestName();

                            hero.IdleImmediate();

                            hero.State = E_ActorState.Idle;

                        }


 Core/NetworkPackage/ClientPack/ClientToGameServer/CC0_CrossRealm/CC003_tagCGForceQuitCrossState.cs

New file
@@ -0,0 +1,19 @@
using UnityEngine;
using System.Collections;

// C0 03 强制退出跨服状态 #tagCGForceQuitCrossState

public class CC003_tagCGForceQuitCrossState : GameNetPackBasic
{

    public CC003_tagCGForceQuitCrossState()
    {
        combineCmd = (ushort)0x1801;
        _cmd = (ushort)0xC003;
    }

    public override void WriteToBytes()
    {
    }

}

 Core/NetworkPackage/ClientPack/ClientToGameServer/CC0_CrossRealm/CC003_tagCGForceQuitCrossState.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 8121ba00aeb53ff4cab35031d1b94af1
timeCreated: 1545810908
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 System/Login/CrossServerLogin.cs

@@ -49,8 +49,8 @@
                opponentName = matchOK.MatchPlayer[0].PlayerName,
                opponentJob = matchOK.MatchPlayer[0].Job,
                opponentMaxHp = (int)matchOK.MatchPlayer[0].MaxHP,
                opponentLevel=(int)matchOK.MatchPlayer[0].LV,
                opponentPlayerId=(int)matchOK.MatchPlayer[0].PlayerID,
                opponentLevel = (int)matchOK.MatchPlayer[0].LV,
                opponentPlayerId = (int)matchOK.MatchPlayer[0].PlayerID,
            };

            Clock.Create(DateTime.Now + new TimeSpan(5 * TimeSpan.TicksPerSecond), () =>
@@ -241,7 +241,9 @@
            }
            else
            {
                //需要服务端再给一个封包来处理登录跨服失败的情况
                ExceptionCatcher.ReportException("登录跨服出现异常", StringUtility.Contact("角色:", PlayerDatas.Instance.baseData.PlayerName));
                var sendInfo = new CC003_tagCGForceQuitCrossState();
                GameNetSystem.Instance.SendInfo(sendInfo);
                loginModel.ReAccountLogin();
            }
        }

 Utility/TimeUtility.cs

@@ -134,6 +134,11 @@
    public static event Action OnCreateRoleTimeRefresh;

    public static void OnRefreshCreateRoleTime(HA124_tagMCPlayerInfo _package)

    {

        if (_package.socketType==GameNetSystem.SocketType.CrossSever)

        {

            return;

        }



        createRoleTime = Convert.ToDateTime(UIHelper.GetTime(_package.CreateRoleTime));

        createRoleTimeTail = new DateTime(createRoleTime.Year, createRoleTime.Month, createRoleTime.Day);

        if (OnCreateRoleTimeRefresh != null)

@@ -146,6 +151,11 @@
    public static event Action OnServerTimeRefresh;

    public static void OnRefreshServerTime(HA004_tagServerDateTime vNetData)

    {

        if (vNetData.socketType == GameNetSystem.SocketType.CrossSever)

        {

            return;

        }



        DateTime n = new DateTime(vNetData.Year, vNetData.Month, vNetData.Day, vNetData.Hour, vNetData.Minute, vNetData.Second);

        s_ServerTime = n;

        DebugEx.Log("OnRefreshServerTime月份：" + s_ServerTime.Month);

@@ -159,9 +169,15 @@
            SyncServerTime();

        }, 60);

    }



    public static event Action OnServerOpenDayRefresh;

    public static void OnRefreshServerOpenDay(HA005_tagOpenServerDay package)

    {

        if (package.socketType == GameNetSystem.SocketType.CrossSever)

        {

            return;

        }



        OpenDay = package.Day;

        IsMixServer = package.IsMixServer == 1;

        MixOpenDay = package.MixDay;