Merge branch 'master' into ItemReconstruction

client_Wu Xijin

2019-02-20 a8c896286840cc372e48765e7039543b1c4e7c64

Merge branch 'master' into ItemReconstruction

 Core/GameEngine/Login/Launch.cs

@@ -284,7 +284,13 @@
            }

        }

#endif



#if UNITY_EDITOR

            if (!AssetSource.allFromEditor)

            {

                FileExtersion.DirectoryCopy(ResourcesPath.CONFIG_FODLER, ResourcesPath.Instance.StreamingAssetPath + "config");

                FileExtersion.DirectoryCopy(ResourcesPath.ResourcesOutPath + "BuiltIn", ResourcesPath.Instance.StreamingAssetPath + "builtin");

            }

#endif

            if (!firstLaunch)

            {

                done = true;


 System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs

@@ -73,6 +73,10 @@
        public void OnSwitchAccount()

        {

            IsMatching = false;

            if (clientMatchClock!=null )

            {

                clientMatchClock.Stop();

            }

        }



        public void OnPlayerLoginOk()

@@ -467,12 +471,13 @@
                    GameNetSystem.Instance.PushPackage(onMatchPackage, ServerType.Main);

                    var randomWaitSeconds = UnityEngine.Random.Range(3, 8);

                    clientMatchClock = Clock.Create(DateTime.Now + new TimeSpan(randomWaitSeconds * TimeSpan.TicksPerSecond), () =>

                   {

                       if (StageLoad.Instance.stageType == Stage.E_StageType.Dungeon)

                       {

                           ClientCrossServerOneVsOne.FakeMatchOk();

                       }

                   });

                    {

                        IsMatching = false;

                        if (GameNetSystem.Instance.netState == GameNetSystem.NetState.Connected)

                        {

                            ClientCrossServerOneVsOne.FakeMatchOk();

                        }

                    });

                }

                else

                {