Merge branch 'master' into WindowControl

client_Wu Xijin

2019-02-03 1e54ef7e6a1d7c0a4681f243020fddfed9cf3121

Merge branch 'master' into WindowControl

 Core/GameEngine/Login/LoginStage.cs

@@ -58,13 +58,6 @@


        MapTransferUtility.Instance.Clear();

        //PreFightMission.Instance.Destroy();



        if (PlayerDatas.Instance.hero != null)

        {

            PlayerDatas.Instance.hero.Behaviour.StopHandupAI(true);

            GAMgr.Instance.Release(PlayerDatas.Instance.hero);

            PlayerDatas.Instance.hero = null;

        }

    }



    public override void UnInitialize()


 Core/GameEngine/Model/TelPartialConfig/PartialMapResourcesConfig.cs

@@ -17,6 +17,11 @@
                key = dataMapId * 1000 + 0;
            }

            if (!mapResourcesIdDictionary.ContainsKey(key))
            {
                return null;
            }

            var id = mapResourcesIdDictionary[key];
            var config = Config.Instance.Get<MapResourcesConfig>(id);
            return config;

 Core/SDK/SDKUtility.cs

@@ -4,6 +4,7 @@
using System.Collections;

using System.Collections.Generic;

using System.IO;

using System;



[XLua.LuaCallCSharp]

public class SDKUtility : SingletonMonobehaviour<SDKUtility>

@@ -1061,6 +1062,19 @@
    {

        BuildFreePlatformInfo(data);



        string _url = StringUtility.Contact("http://pub.game.2460web.com:11000/event_receiver?ProductID=snxxz",

        "&OperatorID=", VersionConfig.Get().appId,

         "&RegionName=data&RegionID=0&EventID=1105&Time=",

          DateTime.Now.ToString(),

           "&AccountID=", FreePlatformInfo.account);



        if (DebugUtility.Instance.debugAccount)

        {

            Debug.Log("请求注册埋点的地址数据: " + _url);

        }



        HttpRequest.Instance.RequestHttpGet(_url, HttpRequest.defaultHttpContentType, 1, SendRegistEvent);



        if (onFreePlatformLoginOk != null)

        {

            onFreePlatformLoginOk(FreePlatformInfo);

@@ -1085,11 +1099,17 @@
        SendMessageToSDK(m_Json);

    }



    public void SendRegistEvent()

    public void SendRegistEvent(bool _ok, string _result)

    {

        m_Json.Clear();

        m_Json["code"] = CodeU2A.SendRegistEvent;

        SendMessageToSDK(m_Json);

        if (_ok)

        {

            if (!_result.Equals("0"))

            {

                m_Json.Clear();

                m_Json["code"] = CodeU2A.SendRegistEvent;

                SendMessageToSDK(m_Json);

            }

        }

    }



    public void CreateRoleOk(string roleID, string roleName, string time)


 Fight/Stage/StageLoad.cs

@@ -52,7 +52,17 @@

    public void PushSceneLoadCommand(StageLoadCommand command)
    {
        commands.Enqueue(command);
        if (!isLoading && commands.Count == 0)
        {
            currentCommand = command;
            currentCommand.fromMapId = mapIdRecord;
            currentCommand.fromLineId = lineIdRecord;
            ExcuteCommand(currentCommand);
        }
        else
        {
            commands.Enqueue(command);
        }
    }

    private void ExcuteCommand(StageLoadCommand command)
@@ -136,6 +146,7 @@
        stageLoadProcessor.Begin(tasks);

        StageLoadTimeOutCatcher.Begin(command.toMapId);
        WindowCenter.Instance.Close<MainInterfaceWin>();
        loadStartTime = Time.time;
        isLoading = true;
    }
@@ -190,18 +201,34 @@

    public void BroadcastStageLoadStartEvent(int mapId)
    {
        if (onStartStageLoadingEvent != null)
        try
        {
            onStartStageLoadingEvent(mapId);
            if (onStartStageLoadingEvent != null)
            {
                onStartStageLoadingEvent(mapId);
            }
        }
        catch (System.Exception ex)
        {
            Debug.LogError(ex);
        }

    }

    public void BroadcastStageLoadEndEvent()
    {
        if (onStageLoadFinish != null)
        try
        {
            onStageLoadFinish();
            if (onStageLoadFinish != null)
            {
                onStageLoadFinish();
            }
        }
        catch (System.Exception ex)
        {
            Debug.LogError(ex);
        }

    }

    void Update()

 Fight/Stage/StageLoadProcessor.cs

@@ -102,6 +102,30 @@
            SystemSetting.Instance.LetFPSUnLimit();
            Application.backgroundLoadingPriority = ThreadPriority.High;
            StageLoad.Instance.BroadcastStageLoadStartEvent(command.fromMapId);

            try
            {
                switch (command.toMapId)
                {
                    case 1:
                    case 2:
                    case 3:
                        if (PlayerDatas.Instance.hero != null)
                        {
                            PlayerDatas.Instance.hero.Behaviour.StopHandupAI(true);
                            GAMgr.Instance.Release(PlayerDatas.Instance.hero);
                            PlayerDatas.Instance.hero = null;
                        }
                        break;
                    default:
                        break;
                }
            }
            catch (System.Exception ex)
            {
                Debug.LogError(ex);
            }

            try
            {
                //为什么在这个地方要调用两次关闭其他窗口的接口呢，这个水就深了。

 Lua/Gen/SDKUtilityWrap.cs

@@ -774,8 +774,10 @@
            
                
                {
                    bool __ok = LuaAPI.lua_toboolean(L, 2);
                    string __result = LuaAPI.lua_tostring(L, 3);
                    
                    gen_to_be_invoked.SendRegistEvent(  );
                    gen_to_be_invoked.SendRegistEvent( __ok, __result );
                    
                    
                    

 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -688,17 +688,6 @@
                }

            }



            if (jadeDynastyTowerModel.specialUnLockFloor > 0 && !IsDungeon())

            {

                if (!WindowCenter.Instance.IsOpen("NewBieWin") && !WindowCenter.Instance.IsOpen("TreasureNewGotWin"))

                {

                    if (!WindowCenter.Instance.IsOpen("JadeDynastyTowerUnLockWin"))

                    {

                        WindowCenter.Instance.Open<JadeDynastyTowerUnLockWin>();

                    }

                }

            }



            if (jadeDynastyTowerModel.openJadeDynastyTower && !IsDungeon())

            {

                if (!WindowCenter.Instance.IsOpen("NewBieWin") && !WindowCenter.Instance.IsOpen("TreasureNewGotWin"))