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

client_linchunjie

2019-05-25 62de0d44f8440a7d32d5225c5d4dfe3bcb1f98ea

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

 Core/GameEngine/Login/Launch.cs

@@ -1138,8 +1138,10 @@


            try

            {

                LuaUtility.Instance.Init();

                CSharpCallLua.Init();

                LuaUtility.Init();

                CSharpCallLua.LaunchStart();

                CSharpCallLua.RegisterLuaEvent();

                CSharpCallLua.ConfigInit();

            }

            catch (Exception e)

            {


 Core/GameEngine/Login/LaunchPostProcess.cs

@@ -39,6 +39,8 @@
                MapTransferUtility.Instance.Initialize();

                NewBieCenter.Instance.Init();

                ClientDungeonStageUtility.Init();

                CSharpCallLua.LaunchPostProcess();



                if (Application.isMobilePlatform)

                {

                    AssetDeCompressTask.Delete7zFiles(ResourcesPath.Instance.ExternalStorePath);


 Fight/Actor/HeroBehaviour.cs

@@ -745,6 +745,12 @@


                _serverHurtList.Clear();



                if (ClientDungeonStageUtility.isClientDungeon)

                {

                    _b405.PosX = (ushort)(GA_Hero.recordServerPos.x + GA_Hero.MapOffset.x);

                    _b405.PosY = (ushort)(GA_Hero.recordServerPos.z + GA_Hero.MapOffset.z);

                }



                //        Debug.LogFormat("释放了技能: {0},当前位置: {1} 目标位置: {2}", _b405.SkillID, new Vector2(_b405.PosX, _b405.PosY), new Vector2(_b405.TagPosX, _b405.TagPosY));

                uint _bindID = 0;

                // 创建出攻击客户端攻击对象和服务端攻击对象

@@ -766,11 +772,6 @@
                        if (_bindID == 0)

                        {

                            continue;

                        }

                        else

                        {

                            _b405.PosX = (ushort)(GA_Hero.recordServerPos.x + GA_Hero.MapOffset.x);

                            _b405.PosY = (ushort)(GA_Hero.recordServerPos.z + GA_Hero.MapOffset.z);

                        }

                    }




 Lua/CSharpCallLua.cs

@@ -18,8 +18,6 @@

    [CSharpCallLua]
    public delegate void GeneralDelegate();
    static GeneralDelegate configInit;
    static GeneralDelegate modelInit;

    static GeneralDelegate beforePlayerDataInitialize;
    static GeneralDelegate afterPlayerDataInitialize;
@@ -35,7 +33,7 @@
    static boolReturnedValueDelegate isLuaDailyQuest;
    static boolReturnedValueDelegate gotoLuaDailyQuest;

    public static void Init()
    public static void RegisterLuaEvent()
    {
        LuaUtility.DoString("protocol.manager.LuaProtocalRegister");
        onRecieveLuaNetPackage = LuaUtility.Global.Get<LuaNetPackage>("OnRecieveNetPackage");
@@ -65,14 +63,6 @@
        LuaUtility.DoString("interface.DailyQuestInterface");
        isLuaDailyQuest = LuaUtility.Global.Get<boolReturnedValueDelegate>("IsLuaDailyQuest");
        gotoLuaDailyQuest = LuaUtility.Global.Get<boolReturnedValueDelegate>("GotoDailyQuest");

        LuaUtility.DoString("config.ConfigInit");
        configInit = LuaUtility.Global.Get<GeneralDelegate>("ConfigInit");
        if (configInit != null)
        {
            configInit();
        }


    }

@@ -178,13 +168,37 @@
        }
    }

    public static void ModelInit()
    public static void LaunchStart()
    {
        LuaUtility.DoString("manager.ModelCenter");
        modelInit = LuaUtility.Global.Get<GeneralDelegate>("ModelInit");
        if (modelInit != null)
        LuaUtility.DoString("manager.Launch");
        var launchAction = LuaUtility.Global.Get<GeneralDelegate>("LaunchStart");
        if (launchAction != null)
        {
            modelInit();
            launchAction();
        }

#if !UNITY_EDITOR
        Do("hotfix.hotfix");
#endif
    }

    public static void LaunchPostProcess()
    {
        LuaUtility.DoString("manager.Launch");
        var action = LuaUtility.Global.Get<GeneralDelegate>("LaunchPostProcess");
        if (action != null)
        {
            action();
        }
    }

    public static void ConfigInit()
    {
        LuaUtility.DoString("config.ConfigInit");
        var configInit = LuaUtility.Global.Get<GeneralDelegate>("ConfigInit");
        if (configInit != null)
        {
            configInit();
        }
    }


 Lua/LuaLaunch.cs

@@ -7,7 +7,6 @@

    void Awake()
    {
        LuaUtility.Instance.Init();
    }

}

 Lua/LuaUtility.cs

@@ -30,22 +30,9 @@
        get { return env.Global; }
    }

    public void Init()
    public static void Init()
    {
        Do("global.table");
        Do("global.util");
        Do("global.logex");
        Do("global.functions");
        Do("global.object");
        Do("global.define");
        Do("global.stringutil");
        Do("fight/utils/FightRequire");
        Do("protocol.manager.LuaProtocalRegister");

#if !UNITY_EDITOR
        Do("hotfix.hotfix");
#endif
        lastGCTime = 0f;
    }

    void Update()

 System/WindowBase/ModelCenter.cs

@@ -236,15 +236,6 @@
            RegisterModel<OtherPlayerEquipModel>();

            RegisterModel<TaskFeedbackModel>();



            try

            {

                CSharpCallLua.ModelInit();

            }

            catch (System.Exception e)

            {

                DebugEx.Log(e);

            }



            inited = true;

        }