From 2da6556c080e680286ce5e8f93b322bdb5a35259 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 22 十月 2018 16:51:46 +0800
Subject: [PATCH] 3335 更新lua库
---
Core/GameEngine/Model/ConfigManager.cs | 1
Core/GameEngine/SnxxzGame.cs | 1
Core/GameEngine/Login/LaunchPostProcess.cs | 1
Core/SFX/SFXPlayUtility.cs | 1
Core/Utilities/AssetPreLoad.cs | 31 +++---
Utility/OperationLogCollect.cs | 2
System/SystemSetting/SettingEffectMgr.cs | 2
UI/Effect/TimeMgr.cs | 2
Fight/BossFakeLineUtility.cs | 2
System/HttpRequest/HttpRequest.cs | 4
System/Welfare/OperationTimeHepler.cs | 3
Fight/Actor/Skill/SkillHelper.cs | 2
Core/GameEngine/Common/Equation.cs | 1
System/Debug/DebugUtility.cs | 7
Fight/GameActor/BattleEffectPlayRule.cs | 2
Lua/LuaBehaviour.cs | 8 +
System/MainInterfacePanel/TaskAllocation.cs | 4
System/Store/Logic/BuySuccessModel.cs | 4
System/Store/BuyItemPopModel.cs | 2
System/SystemSetting/SystemSetting.cs | 2
System/Tip/PwdKeyboard.cs | 2
System/SystemSetting/SettingMgr.cs | 2
System/HeavenBattle/HeavenBattleInfo.cs | 4
System/WorldMap/WorldMapSkip.cs | 2
Utility/GlobalTimeEvent.cs | 4
System/SystemSetting/ChatSetting.cs | 4
Core/ResModule/AssetBundle/AssetBundleUtility.cs | 5
System/MainInterfacePanel/MainRedDot.cs | 4
Fight/MapTransferUtility.cs | 1
System/Pet/PetReinforceModel.cs | 4
System/Strengthening/EquipReinforceModel.cs | 2
System/Voice/SpeechTranslate.cs | 2
System/AssetVersion/InGameDownLoad.cs | 2
System/KnapSack/New/KnapSackEventMgr.cs | 2
Utility/RunTimeExceptionUtility.cs | 4
Fight/Actor/Status/StatusMgr.cs | 2
System/Login/ServerListCenter.cs | 2
System/SystemSetting/PrivateRemind.cs | 2
System/Skill/QuickSetting.cs | 2
UI/Common/TimeDownMgr.cs | 2
System/FakeDungeon/FakeDungeonUtility.cs | 2
System/OpenServerActivity/ImpactRankModel.cs | 4
System/NewBieGuidance/FunctionalGuideCenter.cs | 4
Core/GameEngine/Model/Player/Equip/PlayerStoneData.cs | 1
System/MainInterfacePanel/TipPanel.cs | 4
System/Welfare/WelfareCenter.cs | 4
Lua/LuaWindow.cs | 17 +++
System/AssetVersion/DownLoadAndDiscompressTask.cs | 2
Utility/LanguageVerify.cs | 2
Fight/PrepareHandler.cs | 2
Core/Common/Singleton.cs | 1
System/DailyQuest/DailyQuestActionTimer.cs | 4
Fight/Stage/StageManager.cs | 2
Core/ResModule/GameObjectPoolManager.cs | 1
System/Message/BattleHint.cs | 4
Core/Common/ResourcesPath.cs | 1
System/StartCoroutine/CoroutineMgr.cs | 2
Core/Common/SingletonMonobehaviour.cs | 1
System/WindowBase/WindowCenter.cs | 4
UI/Effect/EffectMgr.cs | 2
Fight/GameActor/GAMgr.cs | 2
System/KnapSack/KnapsackTimeCDMgr.cs | 4
System/Team/GroupDungeonChallengeProcessor.cs | 4
System/Market/PutawayData.cs | 2
System/KnapSack/New/BatchUseModel.cs | 4
System/Redpoint/RedpointCenter.cs | 4
Core/SDK/SDKUtility.cs | 1
Fight/PreFightMission.cs | 2
System/NewBieGuidance/NewBieCenter.cs | 4
System/KnapSack/Logic/PackSendQuestMgr.cs | 4
System/WindowJump/WindowJumpMgr.cs | 1
Utility/GMCommand.cs | 2
Core/Utilities/AnyCountDownUtility.cs | 1
System/Message/SysNotifyMgr.cs | 2
System/Chat/VoiceHttpRequest.cs | 2
System/BossShow/BossShowModel.cs | 4
UI/Common/UI3DModelExhibition.cs | 13 +-
Core/NetworkPackage/GameNetSystem.cs | 1
Fight/Actor/Skill/FlyObject/FlyObjectManager.cs | 2
System/FindPrecious/FindPreciousTimer.cs | 4
System/WindowBase/ModelCenter.cs | 1
System/SystemSetting/HangUpSetModel.cs | 2
System/ClientVersion/VersionUtility.cs | 2
83 files changed, 217 insertions(+), 51 deletions(-)
diff --git a/Core/Common/ResourcesPath.cs b/Core/Common/ResourcesPath.cs
index a45f68c..1a1ad42 100644
--- a/Core/Common/ResourcesPath.cs
+++ b/Core/Common/ResourcesPath.cs
@@ -1,5 +1,6 @@
锘縰sing UnityEngine;
+[XLua.LuaCallCSharp]
public class ResourcesPath : Singleton<ResourcesPath>
{
diff --git a/Core/Common/Singleton.cs b/Core/Common/Singleton.cs
index 6f6b3a8..02d1fa5 100644
--- a/Core/Common/Singleton.cs
+++ b/Core/Common/Singleton.cs
@@ -1,4 +1,5 @@
锘�
+[XLua.LuaCallCSharp]
public class Singleton<T> where T : class, new() {
private static T m_Instance;
diff --git a/Core/Common/SingletonMonobehaviour.cs b/Core/Common/SingletonMonobehaviour.cs
index 1f5ba7d..557d4ec 100644
--- a/Core/Common/SingletonMonobehaviour.cs
+++ b/Core/Common/SingletonMonobehaviour.cs
@@ -1,5 +1,6 @@
锘縰sing UnityEngine;
+[XLua.LuaCallCSharp]
public class SingletonMonobehaviour<T> : MonoBehaviour where T : MonoBehaviour
{
diff --git a/Core/GameEngine/Common/Equation.cs b/Core/GameEngine/Common/Equation.cs
index 243e1a2..cf85a65 100644
--- a/Core/GameEngine/Common/Equation.cs
+++ b/Core/GameEngine/Common/Equation.cs
@@ -5,6 +5,7 @@
using System.Text.RegularExpressions;
using UnityEngine;
+[XLua.LuaCallCSharp]
public class Equation : Singleton<Equation>
{
public static readonly List<char> operatorList = new List<char>() { '*', '-', '+', '/', '^', '!', '@', '%', ';', '#', '$', '~', '&' };
diff --git a/Core/GameEngine/Login/LaunchPostProcess.cs b/Core/GameEngine/Login/LaunchPostProcess.cs
index 6049def..c7ca6ad 100644
--- a/Core/GameEngine/Login/LaunchPostProcess.cs
+++ b/Core/GameEngine/Login/LaunchPostProcess.cs
@@ -5,6 +5,7 @@
using TableConfig;
using System;
+[XLua.LuaCallCSharp]
public class LaunchPostProcess : SingletonMonobehaviour<LaunchPostProcess>
{
diff --git a/Core/GameEngine/Model/ConfigManager.cs b/Core/GameEngine/Model/ConfigManager.cs
index dd6ad4b..a17ab51 100644
--- a/Core/GameEngine/Model/ConfigManager.cs
+++ b/Core/GameEngine/Model/ConfigManager.cs
@@ -8,6 +8,7 @@
using UnityEngine;
using System.Threading;
+[XLua.LuaCallCSharp]
public class Config : Singleton<Config>
{
diff --git a/Core/GameEngine/Model/Player/Equip/PlayerStoneData.cs b/Core/GameEngine/Model/Player/Equip/PlayerStoneData.cs
index 0ef201d..7e60785 100644
--- a/Core/GameEngine/Model/Player/Equip/PlayerStoneData.cs
+++ b/Core/GameEngine/Model/Player/Equip/PlayerStoneData.cs
@@ -7,6 +7,7 @@
/// <summary>
/// 瀹濈煶鏁版嵁
/// </summary>
+[XLua.LuaCallCSharp]
public class PlayerStoneData : Singleton<PlayerStoneData>
{
private Dictionary<int, uint[]> stoneDic = new Dictionary<int, uint[]>();
diff --git a/Core/GameEngine/SnxxzGame.cs b/Core/GameEngine/SnxxzGame.cs
index 9e3884f..61d1fcd 100644
--- a/Core/GameEngine/SnxxzGame.cs
+++ b/Core/GameEngine/SnxxzGame.cs
@@ -3,6 +3,7 @@
using UnityEngine.Events;
using UnityEngine;
+[XLua.LuaCallCSharp]
public class SnxxzGame : SingletonMonobehaviour<SnxxzGame>
{
private event UnityAction m_UpdateActions;
diff --git a/Core/NetworkPackage/GameNetSystem.cs b/Core/NetworkPackage/GameNetSystem.cs
index 2026d59..aeda431 100644
--- a/Core/NetworkPackage/GameNetSystem.cs
+++ b/Core/NetworkPackage/GameNetSystem.cs
@@ -4,6 +4,7 @@
using System.Collections.Generic;
using Snxxz.UI;
+[XLua.LuaCallCSharp]
public class GameNetSystem : Singleton<GameNetSystem>
{
NetUpdateBehaviour m_NetUpdateBehaviour;
diff --git a/Core/ResModule/AssetBundle/AssetBundleUtility.cs b/Core/ResModule/AssetBundle/AssetBundleUtility.cs
index 9407f90..e510e77 100644
--- a/Core/ResModule/AssetBundle/AssetBundleUtility.cs
+++ b/Core/ResModule/AssetBundle/AssetBundleUtility.cs
@@ -4,6 +4,7 @@
using System.Collections.Generic;
using UnityEngine;
+[XLua.LuaCallCSharp]
public class AssetBundleUtility : SingletonMonobehaviour<AssetBundleUtility>
{
private List<AssetBundleInfo> m_AssetBundleInfoList = new List<AssetBundleInfo>();
@@ -28,7 +29,7 @@
}
public IEnumerator InitalizeUIResources()
- {
+ {
#if !UNITY_IOS
yield return StartCoroutine(Co_LoadAssetBundle(ResourcesPath.windowFileBundleName));
yield return StartCoroutine(Co_LoadAssetBundle(ResourcesPath.uiprefabFileBundleName));
@@ -245,7 +246,7 @@
#endif
Sync_LoadAssetBundle(assetBundleName);
- if (m_AssetBundleDict.ContainsKey(assetBundleName))
+ if (m_AssetBundleDict.ContainsKey(assetBundleName))
{
if (_type != null)
{
diff --git a/Core/ResModule/GameObjectPoolManager.cs b/Core/ResModule/GameObjectPoolManager.cs
index b263e86..797e411 100644
--- a/Core/ResModule/GameObjectPoolManager.cs
+++ b/Core/ResModule/GameObjectPoolManager.cs
@@ -3,6 +3,7 @@
using System;
using TableConfig;
+[XLua.LuaCallCSharp]
public class GameObjectPoolManager : SingletonMonobehaviour<GameObjectPoolManager>
{
#if UNITY_EDITOR
diff --git a/Core/SDK/SDKUtility.cs b/Core/SDK/SDKUtility.cs
index c34216e..e55c7d1 100644
--- a/Core/SDK/SDKUtility.cs
+++ b/Core/SDK/SDKUtility.cs
@@ -4,6 +4,7 @@
using System.Collections;
using System.Collections.Generic;
+[XLua.LuaCallCSharp]
public class SDKUtility : SingletonMonobehaviour<SDKUtility>
{
[System.Runtime.InteropServices.DllImport("__Internal")]
diff --git a/Core/SFX/SFXPlayUtility.cs b/Core/SFX/SFXPlayUtility.cs
index ef5f1d5..1ef5e48 100644
--- a/Core/SFX/SFXPlayUtility.cs
+++ b/Core/SFX/SFXPlayUtility.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using TableConfig;
+[XLua.LuaCallCSharp]
public class SFXPlayUtility : SingletonMonobehaviour<SFXPlayUtility>
{
diff --git a/Core/Utilities/AnyCountDownUtility.cs b/Core/Utilities/AnyCountDownUtility.cs
index 6ca3a9d..f35ba73 100644
--- a/Core/Utilities/AnyCountDownUtility.cs
+++ b/Core/Utilities/AnyCountDownUtility.cs
@@ -2,6 +2,7 @@
using UnityEngine.Events;
using System.Collections.Generic;
+[XLua.LuaCallCSharp]
public class AnyCountDownUtility : SingletonMonobehaviour<AnyCountDownUtility>
{
private Stack<CDItem> m_FreeStack;
diff --git a/Core/Utilities/AssetPreLoad.cs b/Core/Utilities/AssetPreLoad.cs
index 5cac9d3..6336bb6 100644
--- a/Core/Utilities/AssetPreLoad.cs
+++ b/Core/Utilities/AssetPreLoad.cs
@@ -1,10 +1,11 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using TableConfig;
-
+锘縰sing System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using TableConfig;
+
+[XLua.LuaCallCSharp]
public class AssetPreLoad : SingletonMonobehaviour<AssetPreLoad>
-{
+{
public void PreLoadNPC(int _mapId)
{
NpcPreloadConfig _config = Config.Instance.Get<NpcPreloadConfig>(_mapId);
@@ -36,8 +37,8 @@
get { return m_Effects ?? (m_Effects = Config.Instance.GetAllValues<EffectConfig>()); }
}
- List<int> loadedJobs = new List<int>();
-
+ List<int> loadedJobs = new List<int>();
+
public void PreLoadJobEffect(int _job)
{
if (loadedJobs.Contains(_job))
@@ -61,8 +62,8 @@
{
StartCoroutine(Co_AsyncLoadEffects(preLoadEffects));
}
- }
-
+ }
+
IEnumerator Co_AsyncLoadEffects(List<int> _effectIds)
{
for (int i = 0; i < _effectIds.Count; i++)
@@ -72,14 +73,14 @@
yield return null;
}
- }
-
+ }
+
private void OnAsyncLoadEffect(bool _ok, Object _object)
{
if (_ok)
{
GameObjectPoolManager.Instance.CacheGameObject(_object as GameObject, 1, false);
}
- }
-
-}
+ }
+
+}
diff --git a/Fight/Actor/Skill/FlyObject/FlyObjectManager.cs b/Fight/Actor/Skill/FlyObject/FlyObjectManager.cs
index 9908557..7365fa7 100644
--- a/Fight/Actor/Skill/FlyObject/FlyObjectManager.cs
+++ b/Fight/Actor/Skill/FlyObject/FlyObjectManager.cs
@@ -1,6 +1,8 @@
锘縰sing System.Collections.Generic;
+[XLua.LuaCallCSharp]
public class FlyObjectManager : Singleton<FlyObjectManager>
+
{
private ObjectPool<IFlyObject> m_FlyObjectPool;
diff --git a/Fight/Actor/Skill/SkillHelper.cs b/Fight/Actor/Skill/SkillHelper.cs
index 361febe..4d59f92 100644
--- a/Fight/Actor/Skill/SkillHelper.cs
+++ b/Fight/Actor/Skill/SkillHelper.cs
@@ -6,7 +6,9 @@
/// <summary>
/// 瀵规墍鏈夋妧鑳芥暟鎹繘琛屽鐞嗗拰缂撳瓨鐨勭被
/// </summary>
+[XLua.LuaCallCSharp]
public class SkillHelper : Singleton<SkillHelper>
+
{
private Dictionary<int, SkillInfo> m_SkillInfoDict;
private Dictionary<int, List<SkillInfo>> m_SkillToSpSkill;
diff --git a/Fight/Actor/Status/StatusMgr.cs b/Fight/Actor/Status/StatusMgr.cs
index e67465e..3b456e0 100644
--- a/Fight/Actor/Status/StatusMgr.cs
+++ b/Fight/Actor/Status/StatusMgr.cs
@@ -3,7 +3,9 @@
using UnityEngine;
using UnityEngine.Events;
+[XLua.LuaCallCSharp]
public class StatusMgr : SingletonMonobehaviour<StatusMgr>
+
{
public static event UnityAction<string> OnGainStatus;
diff --git a/Fight/BossFakeLineUtility.cs b/Fight/BossFakeLineUtility.cs
index 70dceb8..637ecbd 100644
--- a/Fight/BossFakeLineUtility.cs
+++ b/Fight/BossFakeLineUtility.cs
@@ -5,7 +5,9 @@
using System;
using Snxxz.UI;
+[XLua.LuaCallCSharp]
public class BossFakeLineUtility : Singleton<BossFakeLineUtility>
+
{
int m_MakeFakeLineTimes = 0;
public int makeFakeLineTimes {
diff --git a/Fight/GameActor/BattleEffectPlayRule.cs b/Fight/GameActor/BattleEffectPlayRule.cs
index 041fd90..7c1e433 100644
--- a/Fight/GameActor/BattleEffectPlayRule.cs
+++ b/Fight/GameActor/BattleEffectPlayRule.cs
@@ -1,7 +1,9 @@
using System.Collections.Generic;
using UnityEngine;
+[XLua.LuaCallCSharp]
public class BattleEffectPlayRule : Singleton<BattleEffectPlayRule>
+
{
public List<uint> sortPlayerList = new List<uint>();
diff --git a/Fight/GameActor/GAMgr.cs b/Fight/GameActor/GAMgr.cs
index ef79311..efa18c7 100644
--- a/Fight/GameActor/GAMgr.cs
+++ b/Fight/GameActor/GAMgr.cs
@@ -5,7 +5,9 @@
using TableConfig;
using System.Collections;
+[XLua.LuaCallCSharp]
public class GAMgr : SingletonMonobehaviour<GAMgr>
+
{
private List<BossSkillTip_JudgeSummon> m_BossSkillTipList = new List<BossSkillTip_JudgeSummon>();
diff --git a/Fight/MapTransferUtility.cs b/Fight/MapTransferUtility.cs
index 2761c10..2a6b41e 100644
--- a/Fight/MapTransferUtility.cs
+++ b/Fight/MapTransferUtility.cs
@@ -4,6 +4,7 @@
using Snxxz.UI;
using TableConfig;
+[XLua.LuaCallCSharp]
public class MapTransferUtility : SingletonMonobehaviour<MapTransferUtility>
{
public static UnityEngine.Events.UnityAction s_OnHeroLeaveFuncNpc;
diff --git a/Fight/PreFightMission.cs b/Fight/PreFightMission.cs
index 26eb575..0b0e4f0 100644
--- a/Fight/PreFightMission.cs
+++ b/Fight/PreFightMission.cs
@@ -5,7 +5,9 @@
using System.Collections;
using TableConfig;
+[XLua.LuaCallCSharp]
public class PreFightMission : Singleton<PreFightMission>
+
{
private Vector3 m_FirstTrransferStartPos = new Vector3(183.84f, 62.44f, 25.56f);
private Vector3 m_FirstTrransferEndPos = new Vector3(161.33f, 51.545f, 34.84f);
diff --git a/Fight/PrepareHandler.cs b/Fight/PrepareHandler.cs
index 6a3ab7b..be8f8e8 100644
--- a/Fight/PrepareHandler.cs
+++ b/Fight/PrepareHandler.cs
@@ -1,7 +1,9 @@
锘縰sing UnityEngine;
using Snxxz.UI;
+[XLua.LuaCallCSharp]
public class PrepareHandler : Singleton<PrepareHandler>
+
{
public struct ClientH0812
{
diff --git a/Fight/Stage/StageManager.cs b/Fight/Stage/StageManager.cs
index 70376a6..a7a59e4 100644
--- a/Fight/Stage/StageManager.cs
+++ b/Fight/Stage/StageManager.cs
@@ -6,7 +6,9 @@
using Snxxz.UI;
using TableConfig;
+[XLua.LuaCallCSharp]
public class StageManager : Singleton<StageManager>
+
{
private Stage m_CurrentStage;
diff --git a/Lua/LuaBehaviour.cs b/Lua/LuaBehaviour.cs
index f5b8729..d67a6f7 100644
--- a/Lua/LuaBehaviour.cs
+++ b/Lua/LuaBehaviour.cs
@@ -87,4 +87,12 @@
luaStart = null;
table.Dispose();
}
+
+#if UNITY_EDITOR
+ [ContextMenu("LuaReload")]
+ public void ReLoadLua()
+ {
+ LuaUtility.DoString(fileName, "LuaBehaviour", table);
+ }
+#endif
}
diff --git a/Lua/LuaWindow.cs b/Lua/LuaWindow.cs
index b8c3d98..5751373 100644
--- a/Lua/LuaWindow.cs
+++ b/Lua/LuaWindow.cs
@@ -137,4 +137,21 @@
}
}
+#if UNITY_EDITOR
+ [ContextMenu("LuaReload")]
+ public void ReLoadLua()
+ {
+ LuaUtility.Do(string.Format("window.{0}", this.gameObject.name), this.gameObject.name, table);
+
+ if (onBindController != null)
+ {
+ onBindController();
+ }
+
+ if (onAddListeners != null)
+ {
+ onAddListeners();
+ }
+ }
+#endif
}
diff --git a/System/AssetVersion/DownLoadAndDiscompressTask.cs b/System/AssetVersion/DownLoadAndDiscompressTask.cs
index 5674971..ecd076c 100644
--- a/System/AssetVersion/DownLoadAndDiscompressTask.cs
+++ b/System/AssetVersion/DownLoadAndDiscompressTask.cs
@@ -5,7 +5,9 @@
using Snxxz.UI;
using System.Threading;
+[XLua.LuaCallCSharp]
public class DownLoadAndDiscompressTask : Singleton<DownLoadAndDiscompressTask>
+
{
public const int BYTE_PER_KILOBYTE = 1024;
public const int BYTE_PER_MILLIONBYTE = 1048576;
diff --git a/System/AssetVersion/InGameDownLoad.cs b/System/AssetVersion/InGameDownLoad.cs
index dba7b55..cc39cca 100644
--- a/System/AssetVersion/InGameDownLoad.cs
+++ b/System/AssetVersion/InGameDownLoad.cs
@@ -6,7 +6,9 @@
using System.Text.RegularExpressions;
using TableConfig;
+[XLua.LuaCallCSharp]
public class InGameDownLoad : SingletonMonobehaviour<InGameDownLoad>
+
{
public const int BYTE_PER_KILOBYTE = 1024;
public const int BYTE_PER_MILLIONBYTE = 1048576;
diff --git a/System/BossShow/BossShowModel.cs b/System/BossShow/BossShowModel.cs
index 451fa8a..53d8ec1 100644
--- a/System/BossShow/BossShowModel.cs
+++ b/System/BossShow/BossShowModel.cs
@@ -7,7 +7,9 @@
namespace Snxxz.UI
{
- public class BossShowModel : Singleton<BossShowModel>
+ [XLua.LuaCallCSharp]
+public class BossShowModel : Singleton<BossShowModel>
+
{
public BossShowModel()
{
diff --git a/System/Chat/VoiceHttpRequest.cs b/System/Chat/VoiceHttpRequest.cs
index 7ab66ee..757319e 100644
--- a/System/Chat/VoiceHttpRequest.cs
+++ b/System/Chat/VoiceHttpRequest.cs
@@ -4,7 +4,9 @@
using System.Text;
using UnityEngine;
+[XLua.LuaCallCSharp]
public class VoiceHttpRequest : SingletonMonobehaviour<VoiceHttpRequest>
+
{
const string uploadUrl = "http://{0}.voice.2460web.com:53001/voice/upload";
const string downloadUrl = "http://{0}.voice.2460web.com:53001/voice/download";
diff --git a/System/ClientVersion/VersionUtility.cs b/System/ClientVersion/VersionUtility.cs
index 46525e0..7584365 100644
--- a/System/ClientVersion/VersionUtility.cs
+++ b/System/ClientVersion/VersionUtility.cs
@@ -12,7 +12,9 @@
using Snxxz.UI;
using System.Text;
+[XLua.LuaCallCSharp]
public class VersionUtility : Singleton<VersionUtility>
+
{
public static readonly string[] VERSION_URL = new string[] { "http://pub.game.2460web.com:11000/appversion/?" ,
"http://111.230.234.252:11000/appversion/?"};
diff --git a/System/DailyQuest/DailyQuestActionTimer.cs b/System/DailyQuest/DailyQuestActionTimer.cs
index 0565c84..253d30a 100644
--- a/System/DailyQuest/DailyQuestActionTimer.cs
+++ b/System/DailyQuest/DailyQuestActionTimer.cs
@@ -10,7 +10,9 @@
namespace Snxxz.UI
{
- public class DailyQuestActionTimer : SingletonMonobehaviour<DailyQuestActionTimer>
+ [XLua.LuaCallCSharp]
+public class DailyQuestActionTimer : SingletonMonobehaviour<DailyQuestActionTimer>
+
{
DailyQuestModel model { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }
public event Action RefreshDailyQuestState;
diff --git a/System/Debug/DebugUtility.cs b/System/Debug/DebugUtility.cs
index bbd1f73..f554f90 100644
--- a/System/Debug/DebugUtility.cs
+++ b/System/Debug/DebugUtility.cs
@@ -5,6 +5,7 @@
using LitJson;
using System.IO;
+[XLua.LuaCallCSharp]
public class DebugUtility : Singleton<DebugUtility>
{
const string url = "http://pub.game.2460web.com:11000/dbg_player/?";
@@ -12,11 +13,9 @@
GameObject debugRoot;
bool m_DebugAccount = false;
- public bool debugAccount
- {
+ public bool debugAccount {
get { return m_DebugAccount; }
- private set
- {
+ private set {
if (m_DebugAccount != value)
{
m_DebugAccount = value;
diff --git a/System/FakeDungeon/FakeDungeonUtility.cs b/System/FakeDungeon/FakeDungeonUtility.cs
index c07a46c..239c6cd 100644
--- a/System/FakeDungeon/FakeDungeonUtility.cs
+++ b/System/FakeDungeon/FakeDungeonUtility.cs
@@ -2,7 +2,9 @@
using System.Collections.Generic;
using UnityEngine;
+[XLua.LuaCallCSharp]
public class FakeDungeonUtility : Singleton<FakeDungeonUtility>
+
{
int m_TureMapId = -1;
diff --git a/System/FindPrecious/FindPreciousTimer.cs b/System/FindPrecious/FindPreciousTimer.cs
index b08d548..bdd15bb 100644
--- a/System/FindPrecious/FindPreciousTimer.cs
+++ b/System/FindPrecious/FindPreciousTimer.cs
@@ -11,7 +11,9 @@
namespace Snxxz.UI
{
- public class FindPreciousTimer : SingletonMonobehaviour<FindPreciousTimer>
+ [XLua.LuaCallCSharp]
+public class FindPreciousTimer : SingletonMonobehaviour<FindPreciousTimer>
+
{
FindPreciousModel model { get { return ModelCenter.Instance.GetModel<FindPreciousModel>(); } }
Dictionary<int, BossRebornClock> clocks = new Dictionary<int, BossRebornClock>();
diff --git a/System/HeavenBattle/HeavenBattleInfo.cs b/System/HeavenBattle/HeavenBattleInfo.cs
index 8d06470..7577f5a 100644
--- a/System/HeavenBattle/HeavenBattleInfo.cs
+++ b/System/HeavenBattle/HeavenBattleInfo.cs
@@ -6,7 +6,9 @@
namespace Snxxz.UI
{
- public class HeavenBattleInfo : Singleton<HeavenBattleInfo>
+ [XLua.LuaCallCSharp]
+public class HeavenBattleInfo : Singleton<HeavenBattleInfo>
+
{
public HeavenBattleInfo()
{
diff --git a/System/HttpRequest/HttpRequest.cs b/System/HttpRequest/HttpRequest.cs
index 3998e4a..acb99ea 100644
--- a/System/HttpRequest/HttpRequest.cs
+++ b/System/HttpRequest/HttpRequest.cs
@@ -6,7 +6,9 @@
using System.Text;
using UnityEngine;
-public class HttpRequest : SingletonMonobehaviour<HttpRequest>
+[XLua.LuaCallCSharp]
+public class HttpRequest : SingletonMonobehaviour<HttpRequest>
+
{
public const string defaultHttpContentType = "application/x-www-form-urlencoded";
public const string jsonHttpContentType = "application/json ; charset=utf-8";
diff --git a/System/KnapSack/KnapsackTimeCDMgr.cs b/System/KnapSack/KnapsackTimeCDMgr.cs
index cf709ac..7c998ad 100644
--- a/System/KnapSack/KnapsackTimeCDMgr.cs
+++ b/System/KnapSack/KnapsackTimeCDMgr.cs
@@ -6,7 +6,9 @@
namespace Snxxz.UI
{
- public class KnapsackTimeCDMgr : SingletonMonobehaviour<KnapsackTimeCDMgr>
+ [XLua.LuaCallCSharp]
+public class KnapsackTimeCDMgr : SingletonMonobehaviour<KnapsackTimeCDMgr>
+
{
private List<ItemCDCool> itemCDList = new List<ItemCDCool>();
private List<NormalCDCool> normalCDList = new List<NormalCDCool>();
diff --git a/System/KnapSack/Logic/PackSendQuestMgr.cs b/System/KnapSack/Logic/PackSendQuestMgr.cs
index 3529d49..0af41da 100644
--- a/System/KnapSack/Logic/PackSendQuestMgr.cs
+++ b/System/KnapSack/Logic/PackSendQuestMgr.cs
@@ -7,7 +7,9 @@
namespace Snxxz.UI
{
- public class PackSendQuestMgr : Singleton<PackSendQuestMgr>
+ [XLua.LuaCallCSharp]
+public class PackSendQuestMgr : Singleton<PackSendQuestMgr>
+
{
PlayerPackModel _playerPack;
PlayerPackModel playerPack
diff --git a/System/KnapSack/New/BatchUseModel.cs b/System/KnapSack/New/BatchUseModel.cs
index aedf4b7..d49dd41 100644
--- a/System/KnapSack/New/BatchUseModel.cs
+++ b/System/KnapSack/New/BatchUseModel.cs
@@ -6,7 +6,9 @@
namespace Snxxz.UI
{
- public class BatchUseModel : Singleton<BatchUseModel>
+ [XLua.LuaCallCSharp]
+public class BatchUseModel : Singleton<BatchUseModel>
+
{
#region 鎵归噺浣跨敤鏁版嵁
public string guid { get; private set; }
diff --git a/System/KnapSack/New/KnapSackEventMgr.cs b/System/KnapSack/New/KnapSackEventMgr.cs
index 493692a..37fa7d2 100644
--- a/System/KnapSack/New/KnapSackEventMgr.cs
+++ b/System/KnapSack/New/KnapSackEventMgr.cs
@@ -2,7 +2,9 @@
using UnityEngine;
using Snxxz.UI;
+[XLua.LuaCallCSharp]
public class KnapSackEventMgr : Singleton<KnapSackEventMgr>
+
{
public Action<GameObject> AddEquipWinTempObjEvent;
diff --git a/System/Login/ServerListCenter.cs b/System/Login/ServerListCenter.cs
index 913e890..9a0a083 100644
--- a/System/Login/ServerListCenter.cs
+++ b/System/Login/ServerListCenter.cs
@@ -6,7 +6,9 @@
using Snxxz.UI;
using TableConfig;
+[XLua.LuaCallCSharp]
public class ServerListCenter : Singleton<ServerListCenter>
+
{
public static readonly string[] JUMP_URL = new string[] { "http://pub.game.2460web.com:11000/server_list/?"
,"http://111.230.234.252:11000/server_list/?"};
diff --git a/System/MainInterfacePanel/MainRedDot.cs b/System/MainInterfacePanel/MainRedDot.cs
index 2a6ae05..c85b5a3 100644
--- a/System/MainInterfacePanel/MainRedDot.cs
+++ b/System/MainInterfacePanel/MainRedDot.cs
@@ -10,7 +10,9 @@
namespace Snxxz.UI {
- public class MainRedDot : Singleton<MainRedDot> {
+ [XLua.LuaCallCSharp]
+public class MainRedDot : Singleton<MainRedDot> {
+
public const int RedPoint_key = 1;
public const int FAIRY_REDPOINT_KEY1 = 107;
diff --git a/System/MainInterfacePanel/TaskAllocation.cs b/System/MainInterfacePanel/TaskAllocation.cs
index a6a9792..2dc7d15 100644
--- a/System/MainInterfacePanel/TaskAllocation.cs
+++ b/System/MainInterfacePanel/TaskAllocation.cs
@@ -12,7 +12,9 @@
namespace Snxxz.UI
{
- public class TaskAllocation : Singleton<TaskAllocation>
+ [XLua.LuaCallCSharp]
+public class TaskAllocation : Singleton<TaskAllocation>
+
{
private static StringBuilder textBuilder = new StringBuilder();
diff --git a/System/MainInterfacePanel/TipPanel.cs b/System/MainInterfacePanel/TipPanel.cs
index 2063003..e5e3a3e 100644
--- a/System/MainInterfacePanel/TipPanel.cs
+++ b/System/MainInterfacePanel/TipPanel.cs
@@ -12,7 +12,9 @@
{
//鐢ㄤ簬涓荤晫闈㈢殑Tip鐨勫紩瀵肩粨鏉熷悗鍑虹幇
- public class TipPanel : Singleton<TipPanel>
+ [XLua.LuaCallCSharp]
+public class TipPanel : Singleton<TipPanel>
+
{
PlayerMainDate m_MainModel;
PlayerMainDate mainModel { get { return m_MainModel ?? (m_MainModel = ModelCenter.Instance.GetModel<PlayerMainDate>()); } }
diff --git a/System/Market/PutawayData.cs b/System/Market/PutawayData.cs
index 671cd8a..b913931 100644
--- a/System/Market/PutawayData.cs
+++ b/System/Market/PutawayData.cs
@@ -3,7 +3,9 @@
using UnityEngine;
using Snxxz.UI;
+[XLua.LuaCallCSharp]
public class PutawayData:Singleton<PutawayData> {
+
public byte priceType = 0;
public uint priceCnt = 0;//鍑哄敭浠锋牸
public string pwd = string.Empty;//浜ゆ槗瀵嗙爜
diff --git a/System/Message/BattleHint.cs b/System/Message/BattleHint.cs
index 17183b1..59f46a5 100644
--- a/System/Message/BattleHint.cs
+++ b/System/Message/BattleHint.cs
@@ -4,7 +4,9 @@
using UnityEngine;
namespace Snxxz.UI
{
- public class BattleHint : Singleton<BattleHint>
+ [XLua.LuaCallCSharp]
+public class BattleHint : Singleton<BattleHint>
+
{
DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
diff --git a/System/Message/SysNotifyMgr.cs b/System/Message/SysNotifyMgr.cs
index 7e481bf..00896d8 100644
--- a/System/Message/SysNotifyMgr.cs
+++ b/System/Message/SysNotifyMgr.cs
@@ -6,7 +6,9 @@
using TableConfig;
using UnityEngine.UI;
+[XLua.LuaCallCSharp]
public class SysNotifyMgr : SingletonMonobehaviour<SysNotifyMgr>
+
{
/// <summary>
/// 鏈嶅姟绔笅鍙戠殑鏁版嵁
diff --git a/System/NewBieGuidance/FunctionalGuideCenter.cs b/System/NewBieGuidance/FunctionalGuideCenter.cs
index 7630f5f..e7ef831 100644
--- a/System/NewBieGuidance/FunctionalGuideCenter.cs
+++ b/System/NewBieGuidance/FunctionalGuideCenter.cs
@@ -11,7 +11,9 @@
namespace Snxxz.UI
{
- public class FunctionalGuideCenter : Singleton<FunctionalGuideCenter>
+ [XLua.LuaCallCSharp]
+public class FunctionalGuideCenter : Singleton<FunctionalGuideCenter>
+
{
public event Action<int> beginGuideEvent;
public event Action<int> finishGuideEevent;
diff --git a/System/NewBieGuidance/NewBieCenter.cs b/System/NewBieGuidance/NewBieCenter.cs
index 58cd9b4..f8436c2 100644
--- a/System/NewBieGuidance/NewBieCenter.cs
+++ b/System/NewBieGuidance/NewBieCenter.cs
@@ -12,7 +12,9 @@
namespace Snxxz.UI
{
- public class NewBieCenter : Singleton<NewBieCenter>
+ [XLua.LuaCallCSharp]
+public class NewBieCenter : Singleton<NewBieCenter>
+
{
int m_CurrentGuide = 0;
diff --git a/System/OpenServerActivity/ImpactRankModel.cs b/System/OpenServerActivity/ImpactRankModel.cs
index 5126b1e..1f8e0b9 100644
--- a/System/OpenServerActivity/ImpactRankModel.cs
+++ b/System/OpenServerActivity/ImpactRankModel.cs
@@ -681,7 +681,9 @@
#endregion
}
- public class OpenServerActivityCenter : Singleton<OpenServerActivityCenter>
+ [XLua.LuaCallCSharp]
+public class OpenServerActivityCenter : Singleton<OpenServerActivityCenter>
+
{
public event Action openServerActivityStateChange;
diff --git a/System/Pet/PetReinforceModel.cs b/System/Pet/PetReinforceModel.cs
index 41f063d..1f533fe 100644
--- a/System/Pet/PetReinforceModel.cs
+++ b/System/Pet/PetReinforceModel.cs
@@ -8,7 +8,9 @@
using System.Text;
- public class PetReinforceModel:Singleton<PetReinforceModel>
+ [XLua.LuaCallCSharp]
+public class PetReinforceModel:Singleton<PetReinforceModel>
+
{
public PetReinforceTitle PetTitle = PetReinforceTitle.EvolveTrain;
diff --git a/System/Redpoint/RedpointCenter.cs b/System/Redpoint/RedpointCenter.cs
index 17a65a5..12e84aa 100644
--- a/System/Redpoint/RedpointCenter.cs
+++ b/System/Redpoint/RedpointCenter.cs
@@ -5,7 +5,9 @@
namespace Snxxz.UI
{
- public class RedpointCenter : Singleton<RedpointCenter>
+ [XLua.LuaCallCSharp]
+public class RedpointCenter : Singleton<RedpointCenter>
+
{
public event Action<int> redpointValueChangeEvent;
diff --git a/System/Skill/QuickSetting.cs b/System/Skill/QuickSetting.cs
index d97dc04..4e9831f 100644
--- a/System/Skill/QuickSetting.cs
+++ b/System/Skill/QuickSetting.cs
@@ -7,7 +7,9 @@
/// <summary>
/// 鏈嶅姟绔疭etting閰嶇疆锛屽瓨鍌ㄤ竴浜涘揩鎹疯缃紝鐩墠闀垮害涓�100
/// </summary>
+[XLua.LuaCallCSharp]
public class QuickSetting : Singleton<QuickSetting>
+
{
public QuickSetting()
{
diff --git a/System/StartCoroutine/CoroutineMgr.cs b/System/StartCoroutine/CoroutineMgr.cs
index 1954edd..3e91075 100644
--- a/System/StartCoroutine/CoroutineMgr.cs
+++ b/System/StartCoroutine/CoroutineMgr.cs
@@ -6,7 +6,9 @@
using Snxxz.UI;
using System.Linq;
+[XLua.LuaCallCSharp]
public class CoroutineMgr : SingletonMonobehaviour<CoroutineMgr>
+
{
public event Action MainHighTipCdTimeEvent;//涓荤晫闈笂灞傚垏鎹D鏃堕棿
diff --git a/System/Store/BuyItemPopModel.cs b/System/Store/BuyItemPopModel.cs
index 3692ca8..58ca660 100644
--- a/System/Store/BuyItemPopModel.cs
+++ b/System/Store/BuyItemPopModel.cs
@@ -5,7 +5,9 @@
using System.Text;
using TableConfig;
+[XLua.LuaCallCSharp]
public class BuyItemPopModel : Singleton<BuyItemPopModel>
+
{
public StoreConfig storeConfig { get; private set; }
diff --git a/System/Store/Logic/BuySuccessModel.cs b/System/Store/Logic/BuySuccessModel.cs
index 7f8f03f..2e5f02e 100644
--- a/System/Store/Logic/BuySuccessModel.cs
+++ b/System/Store/Logic/BuySuccessModel.cs
@@ -5,7 +5,9 @@
namespace Snxxz.UI
{
- public class BuySuccessModel : Singleton<BuySuccessModel>
+ [XLua.LuaCallCSharp]
+public class BuySuccessModel : Singleton<BuySuccessModel>
+
{
public int ItemID { get; private set; }
public int itemCnt { get; private set; }
diff --git a/System/Strengthening/EquipReinforceModel.cs b/System/Strengthening/EquipReinforceModel.cs
index 5f1a111..fb4d304 100644
--- a/System/Strengthening/EquipReinforceModel.cs
+++ b/System/Strengthening/EquipReinforceModel.cs
@@ -4,7 +4,9 @@
using System.Linq;
using System.Text;
+[XLua.LuaCallCSharp]
public class EquipReinforceModel : Singleton<EquipReinforceModel>
+
{
public EquipReinforceFuncTitle funcTitle = EquipReinforceFuncTitle.Strength;
diff --git a/System/SystemSetting/ChatSetting.cs b/System/SystemSetting/ChatSetting.cs
index 301af13..dbeecf6 100644
--- a/System/SystemSetting/ChatSetting.cs
+++ b/System/SystemSetting/ChatSetting.cs
@@ -33,7 +33,9 @@
//AllianceVoice4G, //鍚岀洘璇煶4G
}
- public class ChatSetting : Singleton<ChatSetting>
+ [XLua.LuaCallCSharp]
+public class ChatSetting : Singleton<ChatSetting>
+
{
const string ChatBoolSet_Key = "ChatBoolSet";
diff --git a/System/SystemSetting/HangUpSetModel.cs b/System/SystemSetting/HangUpSetModel.cs
index 7dbb66c..6be4f39 100644
--- a/System/SystemSetting/HangUpSetModel.cs
+++ b/System/SystemSetting/HangUpSetModel.cs
@@ -24,7 +24,9 @@
isAutoReborn,//鏄惁鑷姩涔版椿
}
+[XLua.LuaCallCSharp]
public class HangUpSetModel : Singleton<HangUpSetModel>
+
{
const string HpSet_Key = "HpSet";
const string HangUpBoolSet_Key = "HangUpBoolSet";
diff --git a/System/SystemSetting/PrivateRemind.cs b/System/SystemSetting/PrivateRemind.cs
index c992b42..7d5e401 100644
--- a/System/SystemSetting/PrivateRemind.cs
+++ b/System/SystemSetting/PrivateRemind.cs
@@ -14,7 +14,9 @@
}
+[XLua.LuaCallCSharp]
public class PrivateRemind : Singleton<HangUpSetModel>
+
{
//const string
const string BoolSet_Key = "BoolSet";
diff --git a/System/SystemSetting/SettingEffectMgr.cs b/System/SystemSetting/SettingEffectMgr.cs
index f420d9e..8df99aa 100644
--- a/System/SystemSetting/SettingEffectMgr.cs
+++ b/System/SystemSetting/SettingEffectMgr.cs
@@ -7,7 +7,9 @@
using TableConfig;
using System.Collections;
+[XLua.LuaCallCSharp]
public class SettingEffectMgr : SingletonMonobehaviour<SettingEffectMgr>
+
{
private bool _isAutoHangUp = false;
private ItemConfig _tagItemModel;
diff --git a/System/SystemSetting/SettingMgr.cs b/System/SystemSetting/SettingMgr.cs
index 2bcc605..377d69c 100644
--- a/System/SystemSetting/SettingMgr.cs
+++ b/System/SystemSetting/SettingMgr.cs
@@ -4,7 +4,9 @@
using System.Text;
using UnityEngine;
+[XLua.LuaCallCSharp]
public class SettingMgr : Singleton<SettingMgr>
+
{
public string accountKey = "";
diff --git a/System/SystemSetting/SystemSetting.cs b/System/SystemSetting/SystemSetting.cs
index d93b252..ccb3d9b 100644
--- a/System/SystemSetting/SystemSetting.cs
+++ b/System/SystemSetting/SystemSetting.cs
@@ -6,7 +6,9 @@
using Snxxz.UI;
using System.Collections;
+[XLua.LuaCallCSharp]
public class SystemSetting : Singleton<SystemSetting>
+
{
const string QUALITY_LEVEL_KEY = "GameQualityLevel";
const string SOUND_VOLUME_KEY = "SoundRatioKey"; //闊充箰
diff --git a/System/Team/GroupDungeonChallengeProcessor.cs b/System/Team/GroupDungeonChallengeProcessor.cs
index 2d03f25..88b4572 100644
--- a/System/Team/GroupDungeonChallengeProcessor.cs
+++ b/System/Team/GroupDungeonChallengeProcessor.cs
@@ -5,7 +5,9 @@
namespace Snxxz.UI
{
- public class GroupDungeonChallengeProcessor : SingletonMonobehaviour<GroupDungeonChallengeProcessor>
+ [XLua.LuaCallCSharp]
+public class GroupDungeonChallengeProcessor : SingletonMonobehaviour<GroupDungeonChallengeProcessor>
+
{
int mapId = 0;
int lineId = 0;
diff --git a/System/Tip/PwdKeyboard.cs b/System/Tip/PwdKeyboard.cs
index c0ba295..2b25e2f 100644
--- a/System/Tip/PwdKeyboard.cs
+++ b/System/Tip/PwdKeyboard.cs
@@ -2,6 +2,8 @@
using System.Collections.Generic;
using UnityEngine;
+[XLua.LuaCallCSharp]
public class PwdKeyboard : Singleton<PwdKeyboard> {
+
public string pwd = string.Empty;
}
diff --git a/System/Voice/SpeechTranslate.cs b/System/Voice/SpeechTranslate.cs
index 13c3be6..f01a700 100644
--- a/System/Voice/SpeechTranslate.cs
+++ b/System/Voice/SpeechTranslate.cs
@@ -3,7 +3,9 @@
using UnityEngine;
using System.Collections.Generic;
+[XLua.LuaCallCSharp]
public class SpeechTranslate : Singleton<SpeechTranslate>
+
{
public const int AUDIO_TIMELIMIT = 8;//绉�
diff --git a/System/Welfare/OperationTimeHepler.cs b/System/Welfare/OperationTimeHepler.cs
index 1b582a2..f879128 100644
--- a/System/Welfare/OperationTimeHepler.cs
+++ b/System/Welfare/OperationTimeHepler.cs
@@ -5,6 +5,7 @@
using UnityEngine;
namespace Snxxz.UI
{
+ [XLua.LuaCallCSharp]
public class OperationTimeHepler : Singleton<OperationTimeHepler>
{
private Dictionary<Operation, OperationBase> operationDict = new Dictionary<Operation, OperationBase>();
@@ -322,7 +323,7 @@
operationBase.startDate = ParseOperationDate(package.StartDate);
operationBase.endDate = ParseOperationDate(package.EndtDate);
operationBase.resetType = package.ResetType;
- ModelCenter.Instance.GetModel<BossRebornModel>().UpdateTaskBaseInfos(package.TaskInfo);
+ ModelCenter.Instance.GetModel<BossRebornModel>().UpdateTaskBaseInfos(package.TaskInfo);
}
}
diff --git a/System/Welfare/WelfareCenter.cs b/System/Welfare/WelfareCenter.cs
index 88e3137..3c6a2b3 100644
--- a/System/Welfare/WelfareCenter.cs
+++ b/System/Welfare/WelfareCenter.cs
@@ -3,7 +3,9 @@
using UnityEngine;
namespace Snxxz.UI
{
- public class WelfareCenter : Singleton<WelfareCenter>
+ [XLua.LuaCallCSharp]
+public class WelfareCenter : Singleton<WelfareCenter>
+
{
SignInModel signInModel { get { return ModelCenter.Instance.GetModel<SignInModel>(); } }
diff --git a/System/WindowBase/ModelCenter.cs b/System/WindowBase/ModelCenter.cs
index eba7d86..6ec7432 100644
--- a/System/WindowBase/ModelCenter.cs
+++ b/System/WindowBase/ModelCenter.cs
@@ -52,6 +52,7 @@
void OnSwitchAccount();
}
+ [XLua.LuaCallCSharp]
public class ModelCenter : Singleton<ModelCenter>
{
bool inited = false;
diff --git a/System/WindowBase/WindowCenter.cs b/System/WindowBase/WindowCenter.cs
index 7333e41..e83ff07 100644
--- a/System/WindowBase/WindowCenter.cs
+++ b/System/WindowBase/WindowCenter.cs
@@ -4,7 +4,9 @@
namespace Snxxz.UI
{
- public class WindowCenter : Singleton<WindowCenter>
+ [XLua.LuaCallCSharp]
+public class WindowCenter : Singleton<WindowCenter>
+
{
public event Action<Window> windowBeforeOpenEvent;
public event Action<Window> windowAfterOpenEvent;
diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index 8d5cc1c..cf38833 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -3,6 +3,7 @@
using TableConfig;
using Snxxz.UI;
+[XLua.LuaCallCSharp]
public class WindowJumpMgr : Singleton<WindowJumpMgr>
{
private FuncConfigConfig funcOpenBagItem = null;
diff --git a/System/WorldMap/WorldMapSkip.cs b/System/WorldMap/WorldMapSkip.cs
index cdf0b73..d715e6e 100644
--- a/System/WorldMap/WorldMapSkip.cs
+++ b/System/WorldMap/WorldMapSkip.cs
@@ -4,7 +4,9 @@
using UnityEngine;
using TableConfig;
+[XLua.LuaCallCSharp]
public class WorldMapSkip : SingletonMonobehaviour<WorldMapSkip>
+
{
Action onSceneLoadCompleted;
diff --git a/UI/Common/TimeDownMgr.cs b/UI/Common/TimeDownMgr.cs
index 12cb2fe..c6d7046 100644
--- a/UI/Common/TimeDownMgr.cs
+++ b/UI/Common/TimeDownMgr.cs
@@ -3,7 +3,9 @@
using System.Collections.Generic;
using UnityEngine;
+[XLua.LuaCallCSharp]
public class TimeDownMgr : SingletonMonobehaviour<TimeDownMgr> {
+
public enum CoolTimeType
{
diff --git a/UI/Common/UI3DModelExhibition.cs b/UI/Common/UI3DModelExhibition.cs
index 79bda42..824622d 100644
--- a/UI/Common/UI3DModelExhibition.cs
+++ b/UI/Common/UI3DModelExhibition.cs
@@ -11,7 +11,7 @@
namespace Snxxz.UI
{
-
+ [XLua.LuaCallCSharp]
public class UI3DModelExhibition : MonoBehaviour
{
[SerializeField] Transform m_PlayerShowPoint;
@@ -66,10 +66,8 @@
public static UI3DModelExhibition Instance { get; private set; }
static UI3DModelExhibition m_InstanceClone1 = null;
- public static UI3DModelExhibition InstanceClone1
- {
- get
- {
+ public static UI3DModelExhibition InstanceClone1 {
+ get {
if (m_InstanceClone1 == null)
{
CreateCloneStage();
@@ -102,6 +100,11 @@
DontDestroyOnLoad(gameObject);
}
+ public string GetName()
+ {
+ return this.name;
+ }
+
public void ShowLoginPlayer(RawImage _rawImage, int _job)
{
var clothesItemId = 0;
diff --git a/UI/Effect/EffectMgr.cs b/UI/Effect/EffectMgr.cs
index 028f592..81605cb 100644
--- a/UI/Effect/EffectMgr.cs
+++ b/UI/Effect/EffectMgr.cs
@@ -1,6 +1,8 @@
锘縰sing Snxxz.UI;
using UnityEngine;
+[XLua.LuaCallCSharp]
public class EffectMgr : SingletonMonobehaviour<EffectMgr>
+
{
public UIEffectBehaviour GetUIEffect(int id, bool _destroy = false)
{
diff --git a/UI/Effect/TimeMgr.cs b/UI/Effect/TimeMgr.cs
index fcbb391..32d3497 100644
--- a/UI/Effect/TimeMgr.cs
+++ b/UI/Effect/TimeMgr.cs
@@ -3,7 +3,9 @@
using System.Collections.Generic;
using UnityEngine;
+[XLua.LuaCallCSharp]
public class TimeMgr : SingletonMonobehaviour<TimeMgr>
+
{
private Dictionary<Component, TimeItem> timeItems = new Dictionary<Component, TimeItem>();
private List<TimeItem> timeItemList = new List<TimeItem>();
diff --git a/Utility/GMCommand.cs b/Utility/GMCommand.cs
index de37800..9834776 100644
--- a/Utility/GMCommand.cs
+++ b/Utility/GMCommand.cs
@@ -7,7 +7,9 @@
using Snxxz.UI;
using LitJson;
+[XLua.LuaCallCSharp]
public class GMCommand : SingletonMonobehaviour<GMCommand>
+
{
public void Begin()
diff --git a/Utility/GlobalTimeEvent.cs b/Utility/GlobalTimeEvent.cs
index 1266d35..20290aa 100644
--- a/Utility/GlobalTimeEvent.cs
+++ b/Utility/GlobalTimeEvent.cs
@@ -3,7 +3,9 @@
using UnityEngine;
using System;
-public class GlobalTimeEvent : SingletonMonobehaviour<GlobalTimeEvent>
+[XLua.LuaCallCSharp]
+public class GlobalTimeEvent : SingletonMonobehaviour<GlobalTimeEvent>
+
{
public event Action secondEvent;
public event Action minuteEvent;
diff --git a/Utility/LanguageVerify.cs b/Utility/LanguageVerify.cs
index 1817ea0..27e7ebd 100644
--- a/Utility/LanguageVerify.cs
+++ b/Utility/LanguageVerify.cs
@@ -7,7 +7,9 @@
using System.Text.RegularExpressions;
using UnityEngine;
+[XLua.LuaCallCSharp]
public class LanguageVerify : Singleton<LanguageVerify>
+
{
const string Sercret = "c345a165b566d1c421afd8a748373d7f";
bool requireVerify
diff --git a/Utility/OperationLogCollect.cs b/Utility/OperationLogCollect.cs
index d8352fc..4fa8050 100644
--- a/Utility/OperationLogCollect.cs
+++ b/Utility/OperationLogCollect.cs
@@ -5,7 +5,9 @@
using Snxxz.UI;
using LitJson;
+[XLua.LuaCallCSharp]
public class OperationLogCollect : Singleton<OperationLogCollect>
+
{
const string url = "http://pub.game.2460web.com:11000/event_receiver?";
diff --git a/Utility/RunTimeExceptionUtility.cs b/Utility/RunTimeExceptionUtility.cs
index a896619..7e46d2a 100644
--- a/Utility/RunTimeExceptionUtility.cs
+++ b/Utility/RunTimeExceptionUtility.cs
@@ -5,7 +5,9 @@
using System.IO;
using System.Threading;
-public class RunTimeExceptionUtility : Singleton<RunTimeExceptionUtility>
+[XLua.LuaCallCSharp]
+public class RunTimeExceptionUtility : Singleton<RunTimeExceptionUtility>
+
{
List<string> logWriteToFileTemp = new List<string>();
--
Gitblit v1.8.0