Merge branch 'master' into TreasureRevise

client_linchunjie

2019-02-21 11971eedb6531fa41b33111e917d877e5aed7e1a

 Lua/Gen/LaunchPostProcessWrap.cs

@@ -21,13 +21,12 @@
        {
         ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
         System.Type type = typeof(LaunchPostProcess);
         Utils.BeginObjectRegister(type, L, translator, 0, 1, 2, 1);
         Utils.BeginObjectRegister(type, L, translator, 0, 1, 1, 1);
         
         Utils.RegisterFunc(L, Utils.METHOD_IDX, "Begin", _m_Begin);
         
         
         Utils.RegisterFunc(L, Utils.GETTER_IDX, "completed", _g_get_completed);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "progress", _g_get_progress);
            
         Utils.RegisterFunc(L, Utils.SETTER_IDX, "completed", _s_set_completed);
            
@@ -113,20 +112,6 @@
         
                LaunchPostProcess gen_to_be_invoked = (LaunchPostProcess)translator.FastGetCSObj(L, 1);
                LuaAPI.lua_pushboolean(L, gen_to_be_invoked.completed);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_progress(RealStatePtr L)
        {
          try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                LaunchPostProcess gen_to_be_invoked = (LaunchPostProcess)translator.FastGetCSObj(L, 1);
                LuaAPI.lua_pushnumber(L, gen_to_be_invoked.progress);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }