少年修仙传客户端代码仓库
client_Hale
2019-05-16 5834ae724e3adad27f7fe6c8c27125277d0afaec
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
13个文件已修改
2个文件已添加
531 ■■■■■ 已修改文件
Lua/CSharpCallLua.cs 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/Gen/ImageExWrap.cs 130 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/Gen/ImageExWrap.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/Gen/PrepareHandlerWrap.cs 181 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/Gen/TaskFeedbackConfigWrap.cs 92 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/Gen/XLuaGenAutoRegister.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/Gen/link.xml 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CreateRole/CreateRoleBehaviour.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CreateRole/CreateRoleScriptableObject.cs 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/HazyRegion/HazyRegionWin.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/TaskModel.cs 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainWin/MainWinYinJiBehaviour.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/SelectRole/SelectRoleBehaviour.cs 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Welfare/MultipleRealmPointModel.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI/Core/ImageEx.cs 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/CSharpCallLua.cs
@@ -37,10 +37,10 @@
    public static void Init()
    {
        LuaUtility.DoString("protocol.LuaProtocalRegister");
        LuaUtility.DoString("protocol.manager.LuaProtocalRegister");
        onRecieveLuaNetPackage = LuaUtility.Global.Get<LuaNetPackage>("OnRecieveNetPackage");
        LuaUtility.DoString("protocol.CSharpProtocalEvent");
        LuaUtility.DoString("protocol.manager.CSharpProtocalEvent");
        onCSharpNetPackage = LuaUtility.Global.Get<CSharpNetPackage>("OnCSharpNetEvent");
        LuaUtility.DoString("event.AfterPlayerDataInitialize");
Lua/Gen/ImageExWrap.cs
New file
@@ -0,0 +1,130 @@
#if USE_UNI_LUA
using LuaAPI = UniLua.Lua;
using RealStatePtr = UniLua.ILuaState;
using LuaCSFunction = UniLua.CSharpFunctionDelegate;
#else
using LuaAPI = XLua.LuaDLL.Lua;
using RealStatePtr = System.IntPtr;
using LuaCSFunction = XLua.LuaDLL.lua_CSFunction;
#endif
using XLua;
using System.Collections.Generic;
namespace XLua.CSObjectWrap
{
    using Utils = XLua.Utils;
    public class ImageExWrap
    {
        public static void __Register(RealStatePtr L)
        {
            ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            System.Type type = typeof(ImageEx);
            Utils.BeginObjectRegister(type, L, translator, 0, 0, 2, 1);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "canvasAddition", _g_get_canvasAddition);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "gray", _g_get_gray);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "gray", _s_set_gray);
            Utils.EndObjectRegister(type, L, translator, null, null,
                null, null, null);
            Utils.BeginClassRegister(type, L, __CreateInstance, 1, 0, 0);
            Utils.EndClassRegister(type, L, translator);
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int __CreateInstance(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                if(LuaAPI.lua_gettop(L) == 1)
                {
                    ImageEx gen_ret = new ImageEx();
                    translator.Push(L, gen_ret);
                    return 1;
                }
            }
            catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return LuaAPI.luaL_error(L, "invalid arguments to ImageEx constructor!");
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_canvasAddition(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                ImageEx gen_to_be_invoked = (ImageEx)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.canvasAddition);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_gray(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                ImageEx gen_to_be_invoked = (ImageEx)translator.FastGetCSObj(L, 1);
                LuaAPI.lua_pushboolean(L, gen_to_be_invoked.gray);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _s_set_gray(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                ImageEx gen_to_be_invoked = (ImageEx)translator.FastGetCSObj(L, 1);
                gen_to_be_invoked.gray = LuaAPI.lua_toboolean(L, 2);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 0;
        }
    }
}
Lua/Gen/ImageExWrap.cs.meta
New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 515afb4cd137ba444b73aac6a4b92909
timeCreated: 1557920329
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData:
  assetBundleName:
  assetBundleVariant:
Lua/Gen/PrepareHandlerWrap.cs
@@ -21,8 +21,11 @@
        {
            ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            System.Type type = typeof(PrepareHandler);
            Utils.BeginObjectRegister(type, L, translator, 0, 2, 5, 4);
            Utils.BeginObjectRegister(type, L, translator, 0, 5, 8, 7);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "Arrive", _m_Arrive);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "Leave", _m_Leave);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "ServerPrepareStart", _m_ServerPrepareStart);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "ServerPrepareEnd", _m_ServerPrepareEnd);
            
@@ -30,11 +33,17 @@
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "H0812", _g_get_H0812);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "clientPrepareH0812", _g_get_clientPrepareH0812);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "isPreparing", _g_get_isPreparing);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "m_ArriveList", _g_get_m_ArriveList);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "OnShowCollectIcon", _g_get_OnShowCollectIcon);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "OnHideCollectIcon", _g_get_OnHideCollectIcon);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "OnPrepareEndSuccess", _g_get_OnPrepareEndSuccess);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "OnPrepareEnd", _g_get_OnPrepareEnd);
            
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "clientPrepareH0812", _s_set_clientPrepareH0812);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "isPreparing", _s_set_isPreparing);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "m_ArriveList", _s_set_m_ArriveList);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "OnShowCollectIcon", _s_set_OnShowCollectIcon);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "OnHideCollectIcon", _s_set_OnHideCollectIcon);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "OnPrepareEndSuccess", _s_set_OnPrepareEndSuccess);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "OnPrepareEnd", _s_set_OnPrepareEnd);
            
@@ -81,6 +90,89 @@
        
        
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_Init(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                PrepareHandler gen_to_be_invoked = (PrepareHandler)translator.FastGetCSObj(L, 1);
                {
                    gen_to_be_invoked.Init(  );
                    return 0;
                }
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_Arrive(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                PrepareHandler gen_to_be_invoked = (PrepareHandler)translator.FastGetCSObj(L, 1);
                {
                    GA_NpcCollect _npc = (GA_NpcCollect)translator.GetObject(L, 2, typeof(GA_NpcCollect));
                    gen_to_be_invoked.Arrive( _npc );
                    return 0;
                }
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_Leave(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                PrepareHandler gen_to_be_invoked = (PrepareHandler)translator.FastGetCSObj(L, 1);
                {
                    GA_NpcCollect _npc = (GA_NpcCollect)translator.GetObject(L, 2, typeof(GA_NpcCollect));
                    gen_to_be_invoked.Leave( _npc );
                    return 0;
                }
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_ServerPrepareStart(RealStatePtr L)
@@ -184,6 +276,48 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_m_ArriveList(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                PrepareHandler gen_to_be_invoked = (PrepareHandler)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.m_ArriveList);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_OnShowCollectIcon(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                PrepareHandler gen_to_be_invoked = (PrepareHandler)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.OnShowCollectIcon);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_OnHideCollectIcon(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                PrepareHandler gen_to_be_invoked = (PrepareHandler)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.OnHideCollectIcon);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_OnPrepareEndSuccess(RealStatePtr L)
        {
            try {
@@ -245,6 +379,51 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _s_set_m_ArriveList(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                PrepareHandler gen_to_be_invoked = (PrepareHandler)translator.FastGetCSObj(L, 1);
                gen_to_be_invoked.m_ArriveList = (System.Collections.Generic.List<GA_NpcCollect>)translator.GetObject(L, 2, typeof(System.Collections.Generic.List<GA_NpcCollect>));
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 0;
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _s_set_OnShowCollectIcon(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                PrepareHandler gen_to_be_invoked = (PrepareHandler)translator.FastGetCSObj(L, 1);
                gen_to_be_invoked.OnShowCollectIcon = translator.GetDelegate<UnityEngine.Events.UnityAction<uint, int>>(L, 2);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 0;
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _s_set_OnHideCollectIcon(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                PrepareHandler gen_to_be_invoked = (PrepareHandler)translator.FastGetCSObj(L, 1);
                gen_to_be_invoked.OnHideCollectIcon = translator.GetDelegate<UnityEngine.Events.UnityAction<uint, int>>(L, 2);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 0;
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _s_set_OnPrepareEndSuccess(RealStatePtr L)
        {
            try {
Lua/Gen/TaskFeedbackConfigWrap.cs
@@ -21,12 +21,18 @@
        {
            ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            System.Type type = typeof(TaskFeedbackConfig);
            Utils.BeginObjectRegister(type, L, translator, 0, 0, 6, 0);
            Utils.BeginObjectRegister(type, L, translator, 0, 0, 9, 0);
            
            
            
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "taskId", _g_get_taskId);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "type", _g_get_type);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "condition", _g_get_condition);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "equips", _g_get_equips);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "items", _g_get_items);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "sideTasks", _g_get_sideTasks);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "succGuide", _g_get_succGuide);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "failGuide", _g_get_failGuide);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "remind", _g_get_remind);
            
            
@@ -304,6 +310,90 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_condition(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                TaskFeedbackConfig gen_to_be_invoked = (TaskFeedbackConfig)translator.FastGetCSObj(L, 1);
                LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.condition);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_equips(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                TaskFeedbackConfig gen_to_be_invoked = (TaskFeedbackConfig)translator.FastGetCSObj(L, 1);
                LuaAPI.lua_pushstring(L, gen_to_be_invoked.equips);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_items(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                TaskFeedbackConfig gen_to_be_invoked = (TaskFeedbackConfig)translator.FastGetCSObj(L, 1);
                LuaAPI.lua_pushstring(L, gen_to_be_invoked.items);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_sideTasks(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                TaskFeedbackConfig gen_to_be_invoked = (TaskFeedbackConfig)translator.FastGetCSObj(L, 1);
                LuaAPI.lua_pushstring(L, gen_to_be_invoked.sideTasks);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_succGuide(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                TaskFeedbackConfig gen_to_be_invoked = (TaskFeedbackConfig)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.succGuide);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_failGuide(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                TaskFeedbackConfig gen_to_be_invoked = (TaskFeedbackConfig)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.failGuide);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_remind(RealStatePtr L)
        {
            try {
Lua/Gen/XLuaGenAutoRegister.cs
@@ -1555,6 +1555,9 @@
            translator.DelayWrapLoader(typeof(ButtonEx), ButtonExWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(ImageEx), ImageExWrap.__Register);
            translator.DelayWrapLoader(typeof(Snxxz.UI.UIAlphaTween), SnxxzUIUIAlphaTweenWrap.__Register);
        
        
@@ -1584,13 +1587,13 @@
        
            translator.DelayWrapLoader(typeof(E_ClientNpcType), E_ClientNpcTypeWrap.__Register);
        
            translator.DelayWrapLoader(typeof(E_NpcType), E_NpcTypeWrap.__Register);
        }
        
        static void wrapInit10(LuaEnv luaenv, ObjectTranslator translator)
        {
            translator.DelayWrapLoader(typeof(E_NpcType), E_NpcTypeWrap.__Register);
        
            translator.DelayWrapLoader(typeof(E_MovingState), E_MovingStateWrap.__Register);
        
@@ -1741,14 +1744,14 @@
        
            translator.DelayWrapLoader(typeof(ItemWinType), ItemWinTypeWrap.__Register);
        
            translator.DelayWrapLoader(typeof(ItemTipChildType), ItemTipChildTypeWrap.__Register);
        }
        
        static void wrapInit11(LuaEnv luaenv, ObjectTranslator translator)
        {
        
            translator.DelayWrapLoader(typeof(ItemTipChildType), ItemTipChildTypeWrap.__Register);
            translator.DelayWrapLoader(typeof(InstalledAsset), InstalledAssetWrap.__Register);
        
        
Lua/Gen/link.xml
@@ -481,6 +481,7 @@
        <type fullname="TimeDownMgr" preserve="all"/>
        <type fullname="Snxxz.UI.UI3DModelExhibition" preserve="all"/>
        <type fullname="ButtonEx" preserve="all"/>
        <type fullname="ImageEx" preserve="all"/>
        <type fullname="Snxxz.UI.UIAlphaTween" preserve="all"/>
        <type fullname="EffectMgr" preserve="all"/>
        <type fullname="TimeMgr" preserve="all"/>
System/CreateRole/CreateRoleBehaviour.cs
@@ -23,7 +23,7 @@
            behaviour.name = showParams.platformPrefabName;
            shadow = behaviour.GetComponentInChildren<ActorShadowCaster>();
            platform = behaviour.GetComponentInChildren<CreateRoleHeroPlatform>();
            platform.transform.localScale = showParams.platformScale;
            var camera = behaviour.GetComponent<Camera>("CreateRoleCamera");
            if (camera != null)
            {
System/CreateRole/CreateRoleScriptableObject.cs
@@ -60,6 +60,7 @@
        public float scale;
        public string platformPrefabName;
        public Vector3 platformPosition;
        public Vector3 platformScale;
        public EnterPictureType enterPictureType;
        public string animation;
        public float animationDuration;
System/HazyRegion/HazyRegionWin.cs
@@ -188,7 +188,7 @@
            yield return WaitingForSecondConst.WaitMS500;
            var allComplete = true;
            bool existAnyDoingIncident = false;
            bool existAnySatisfyGoto = false;
            var incidents = model.GetAllIncidents();
            if (incidents != null)
            {
@@ -203,14 +203,22 @@
                        }
                        if (incident.state == HazyRegionModel.IncidentState.Processing)
                        {
                            existAnyDoingIncident = true;
                            existAnySatisfyGoto = true;
                        }
                        else if (incident.state == HazyRegionModel.IncidentState.UnStart)
                        {
                            var error = 0;
                            if (model.TryGotoIncident(id, false, out error))
                            {
                                existAnySatisfyGoto = true;
                            }
                        }
                    }
                }
                if (!allComplete)
                {
                    if (!existAnyDoingIncident && model.point == 0)
                    if (!existAnySatisfyGoto && model.point == 0)
                    {
                        allComplete = true;
                    }
System/MainInterfacePanel/TaskModel.cs
@@ -130,7 +130,6 @@
    private bool AutomaticityBool = false;//控制是否自动进行自动任务
    private int retainTaskID = 0;
    private float BossDelayTimeint = 0;
    private List<int> FaBaoNPCIdList = new List<int>();//用于获取需要消失的法宝NPCID;
    public Vector3 UIeffectFabaoVec = new Vector3();//法宝NPC消失时获取的坐标
    //----关于前期无操作自动执行主线
    public int TaskAutoLv = 0;
@@ -153,14 +152,7 @@
    {
        StageLoad.Instance.onStageLoadFinish += onStageLoadFinish;
        NPCInteractProcessor.s_NpcInteractEvent += NpcInterac;
        FaBaoNPCIdList.Clear();
        string strFabao = FuncConfigConfig.Get("FaBaoNPCID").Numerical1;
        string[] strFabaoNpcID = ConfigParse.GetMultipleStr(strFabao);//解析出数组|
        for (int i = 0; i < strFabaoNpcID.Length; i++)
        {
            FaBaoNPCIdList.Add(int.Parse(strFabaoNpcID[i]));
        }
        string BossDelayTime = FuncConfigConfig.Get("BossDelayTime").Numerical1;
        BossDelayTimeint = float.Parse(BossDelayTime);
        var Task_Auto = FuncConfigConfig.Get("TaskAuto");
@@ -1475,20 +1467,8 @@
                if (Npcid != 0 && NPCShowDic.ContainsKey(Npcid))
                {
                    if (NPCShowDic[Npcid] == 0)
                    {
                        if (FaBaoNPCIdList.Contains(Npcid))
                        {
                            GA_NpcFunc.SetNpcFuncVisible(Npcid, false, 0.5f, (Vector3 _pos) =>
                            {
                                WindowCenter.Instance.Open<EffectToFaBaoWin>();
                                UIeffectFabaoVec = _pos;
                            }, 0.3f);
                        }
                        else
                        {
                            GA_NpcFunc.SetNpcFuncVisible(Npcid, false);
                        }
                    {
                        GA_NpcFunc.SetNpcFuncVisible(Npcid, false);
                    }
                    else if (NPCShowDic[Npcid] == 1)
                    {
@@ -1508,20 +1488,8 @@
            if (Npcid != 0 && NPCShowDic.ContainsKey(Npcid))
            {
                if (NPCShowDic[Npcid] == 0)
                {
                    if (FaBaoNPCIdList.Contains(Npcid))
                    {
                        GA_NpcFunc.SetNpcFuncVisible(Npcid, false, 0.5f, (Vector3 _pos) =>
                        {
                            WindowCenter.Instance.Open<EffectToFaBaoWin>();
                            UIeffectFabaoVec = _pos;
                        }, 0.3f);
                    }
                    else
                    {
                        GA_NpcFunc.SetNpcFuncVisible(Npcid, false);
                    }
                {
                    GA_NpcFunc.SetNpcFuncVisible(Npcid, false);
                }
                else if (NPCShowDic[Npcid] == 1)
                {
@@ -1747,8 +1715,10 @@
                foreach (var key in taskWaits.Keys)
                {
                    if ((Time.realtimeSinceStartup - taskWaits[key]) < 1f)
                    {
                        DebugEx.LogFormat("<color=#00ffff>由于{0}开始任务等待</color>", key.ToString());
                    {
#if UNITY_EDITOR
                        DebugEx.LogFormat("<color=#00ffff>由于{0}开始任务等待</color>", GetTaskWaitTypeLabel(key));
#endif
                        return true;
                    }
                }
@@ -1761,7 +1731,26 @@
        public void Push(TaskWaitType type)
        {
            taskWaits[type] = Time.realtimeSinceStartup;
        }
#if UNITY_EDITOR
        static string GetTaskWaitTypeLabel(TaskWaitType waitType)
        {
            switch (waitType)
            {
                case TaskWaitType.TaskComplete:
                    return "主界面任务完成表现";
                case TaskWaitType.LevelUp:
                    return "玩家升级表现";
                case TaskWaitType.TreasureProgress:
                    return "法宝进度更新";
                case TaskWaitType.BetterEquip:
                    return "获得更好装备";
                default:
                    return waitType.ToString();
            }
        }
#endif
    }
    public enum TaskWaitType
System/MainWin/MainWinYinJiBehaviour.cs
@@ -22,11 +22,13 @@
        private void OnEnable()
        {
            PlayerDatas.Instance.playerDataRefreshEvent += OnPlayerDataRefresh;
            DTC0102_tagCDBPlayer.afterPlayerDataInitializeEvent += DisplayYinJiCount;
            DisplayYinJiCount();
        }
        private void OnDisable()
        {
            DTC0102_tagCDBPlayer.afterPlayerDataInitializeEvent -= DisplayYinJiCount;
            PlayerDatas.Instance.playerDataRefreshEvent -= OnPlayerDataRefresh;
        }
System/SelectRole/SelectRoleBehaviour.cs
@@ -108,6 +108,7 @@
            behaviour.name = showParams.platformPrefabName;
            shadow = behaviour.GetComponentInChildren<ActorShadowCaster>();
            platform = behaviour.GetComponentInChildren<CreateRoleHeroPlatform>();
            platform.transform.localScale = showParams.platformScale;
            ceateRoleCamera = behaviour.GetComponentInChildren<Camera>();
        }
    }
System/Welfare/MultipleRealmPointModel.cs
@@ -48,9 +48,13 @@
        {
            get
            {
                OperationBase operation;
                OperationTimeHepler.Instance.TryGetOperationTime(Operation.MultipRealmPoint, out operation);
                return operation != null && (operation as OperationMultipleRealmPoint).InActiveTime(TimeUtility.ServerNow);
                OperationBase operationBase;
                if (OperationTimeHepler.Instance.TryGetOperationTime(Operation.MultipRealmPoint, out operationBase))
                {
                    var operation = operationBase as OperationMultipleRealmPoint;
                    return operation.InActiveTime(TimeUtility.ServerNow) && operation.SatisfyOpenCondition();
                }
                return false;
            }
        }
UI/Core/ImageEx.cs
@@ -2,6 +2,7 @@
using UnityEngine;
[XLua.LuaCallCSharp]
public class ImageEx : Image
{