Merge branch 'master' into GrowthFund

client_Zxw

2019-01-15 4c6d58af44cd4235501e15a78bf79674ba2fcc4a

 Lua/Gen/PlayerDatasWrap.cs

@@ -21,9 +21,10 @@
        {
         ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
         System.Type type = typeof(PlayerDatas);
         Utils.BeginObjectRegister(type, L, translator, 0, 19, 14, 7);
         Utils.BeginObjectRegister(type, L, translator, 0, 20, 14, 7);
         
         Utils.RegisterFunc(L, Utils.METHOD_IDX, "InitPlayerData", _m_InitPlayerData);
         Utils.RegisterFunc(L, Utils.METHOD_IDX, "UpdatePlayerData", _m_UpdatePlayerData);
         Utils.RegisterFunc(L, Utils.METHOD_IDX, "FightRefreshPlayerHp", _m_FightRefreshPlayerHp);
         Utils.RegisterFunc(L, Utils.METHOD_IDX, "RefreshPlayerData", _m_RefreshPlayerData);
         Utils.RegisterFunc(L, Utils.METHOD_IDX, "RefreshProperty", _m_RefreshProperty);
@@ -140,6 +141,34 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_UpdatePlayerData(RealStatePtr L)
        {
          try {
            
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                PlayerDatas gen_to_be_invoked = (PlayerDatas)translator.FastGetCSObj(L, 1);
            
            
                
                {
                    HA112_tagMCDBPlayer _data = (HA112_tagMCDBPlayer)translator.GetObject(L, 2, typeof(HA112_tagMCDBPlayer));
                    
                    gen_to_be_invoked.UpdatePlayerData( _data );
                    
                    
                    
                    return 0;
                }
                
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_FightRefreshPlayerHp(RealStatePtr L)
        {
          try {