From 6a5cc758cd9f385a30783828fd34d1188de25427 Mon Sep 17 00:00:00 2001
From: client_Lhy <995049470@qq.com>
Date: 星期六, 29 六月 2019 16:52:33 +0800
Subject: [PATCH] Merge branch 'master' into HEAD

---
 Lua/Gen/VersionConfigWrap.cs |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/Lua/Gen/VersionConfigWrap.cs b/Lua/Gen/VersionConfigWrap.cs
index 6aa1068..6ec07cf 100644
--- a/Lua/Gen/VersionConfigWrap.cs
+++ b/Lua/Gen/VersionConfigWrap.cs
@@ -21,7 +21,7 @@
         {
 			ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
 			System.Type type = typeof(VersionConfig);
-			Utils.BeginObjectRegister(type, L, translator, 0, 1, 24, 9);
+			Utils.BeginObjectRegister(type, L, translator, 0, 1, 25, 9);
 			
 			Utils.RegisterFunc(L, Utils.METHOD_IDX, "Read", _m_Read);
 			
@@ -32,6 +32,7 @@
             Utils.RegisterFunc(L, Utils.GETTER_IDX, "version", _g_get_version);
             Utils.RegisterFunc(L, Utils.GETTER_IDX, "clientPackageFlag", _g_get_clientPackageFlag);
             Utils.RegisterFunc(L, Utils.GETTER_IDX, "branch", _g_get_branch);
+            Utils.RegisterFunc(L, Utils.GETTER_IDX, "gameId", _g_get_gameId);
             Utils.RegisterFunc(L, Utils.GETTER_IDX, "assetAccess", _g_get_assetAccess);
             Utils.RegisterFunc(L, Utils.GETTER_IDX, "partAssetPackage", _g_get_partAssetPackage);
             Utils.RegisterFunc(L, Utils.GETTER_IDX, "productName", _g_get_productName);
@@ -303,6 +304,20 @@
         }
         
         [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+        static int _g_get_gameId(RealStatePtr L)
+        {
+		    try {
+                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+			
+                VersionConfig gen_to_be_invoked = (VersionConfig)translator.FastGetCSObj(L, 1);
+                LuaAPI.lua_pushstring(L, gen_to_be_invoked.gameId);
+            } catch(System.Exception gen_e) {
+                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+            }
+            return 1;
+        }
+        
+        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
         static int _g_get_assetAccess(RealStatePtr L)
         {
 		    try {

--
Gitblit v1.8.0