少年修仙传客户端代码仓库
client_linchunjie
2019-07-09 600285f554ecbbf675c8bf0148b77731970716ef
7930 【前端】【主干】骑宠觉醒功能
4个文件已删除
6个文件已修改
151 ■■■■■ 已修改文件
Core/GameEngine/DataToCtl/PackageRegedit.cs 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/NetworkPackage/DTCFile/ServerPack/HA3_Achievement/DTCA312_tagMCMagicWeaponData.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/NetworkPackage/DTCFile/ServerPack/HA3_Achievement/DTCA312_tagMCMagicWeaponData.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/NetworkPackage/ServerPack/HA3_Function/HA312_tagMCMagicWeaponData.cs 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/NetworkPackage/ServerPack/HA3_Function/HA312_tagMCMagicWeaponData.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/Gen/MountModelWrap.cs 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/Gen/SnxxzUIPetModelWrap.cs 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Mount/MountModel.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Pet/PetModel.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Pet/PetWin.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/DataToCtl/PackageRegedit.cs
@@ -325,7 +325,6 @@
        Register(typeof(HA340_tagMCSuccessInfoList), typeof(DTCA340_tagMCSuccessInfoInfoList));
        Register(typeof(HA341_tagMCSuccessFinish), typeof(DTCA341_tagMCSuccessFinish));
        Register(typeof(HA342_tagMCSuccessFinishAwardRecordList), typeof(DTCA342_tagMCSuccessFinishAwardRecordList));
        Register(typeof(HA312_tagMCMagicWeaponData), typeof(DTCA312_tagMCMagicWeaponData));
        #endregion
        #region 组队
Core/NetworkPackage/DTCFile/ServerPack/HA3_Achievement/DTCA312_tagMCMagicWeaponData.cs
File was deleted
Core/NetworkPackage/DTCFile/ServerPack/HA3_Achievement/DTCA312_tagMCMagicWeaponData.cs.meta
File was deleted
Core/NetworkPackage/ServerPack/HA3_Function/HA312_tagMCMagicWeaponData.cs
File was deleted
Core/NetworkPackage/ServerPack/HA3_Function/HA312_tagMCMagicWeaponData.cs.meta
File was deleted
Lua/Gen/MountModelWrap.cs
@@ -21,7 +21,7 @@
        {
            ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            System.Type type = typeof(MountModel);
            Utils.BeginObjectRegister(type, L, translator, 0, 21, 17, 15);
            Utils.BeginObjectRegister(type, L, translator, 0, 22, 17, 15);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "UnInit", _m_UnInit);
@@ -43,6 +43,7 @@
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "IsSkillUnlock", _m_IsSkillUnlock);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetSkillUnlockLevel", _m_GetSkillUnlockLevel);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "IsHorseMaxLevel", _m_IsHorseMaxLevel);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "IsHorseUnlock", _m_IsHorseUnlock);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "onHorseInfoUpdate", _e_onHorseInfoUpdate);
            
@@ -736,6 +737,35 @@
            
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_IsHorseUnlock(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                MountModel gen_to_be_invoked = (MountModel)translator.FastGetCSObj(L, 1);
                {
                    int _horseId = LuaAPI.xlua_tointeger(L, 2);
                        bool gen_ret = gen_to_be_invoked.IsHorseUnlock( _horseId );
                        LuaAPI.lua_pushboolean(L, gen_ret);
                    return 1;
                }
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
        }
        
        
        
Lua/Gen/SnxxzUIPetModelWrap.cs
@@ -21,7 +21,7 @@
        {
            ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            System.Type type = typeof(Snxxz.UI.PetModel);
            Utils.BeginObjectRegister(type, L, translator, 0, 26, 18, 14);
            Utils.BeginObjectRegister(type, L, translator, 0, 27, 18, 14);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "UnInit", _m_UnInit);
@@ -47,6 +47,7 @@
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "IsSkillUnlock", _m_IsSkillUnlock);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetSkillUnlockLevel", _m_GetSkillUnlockLevel);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "IsPetMaxLevel", _m_IsPetMaxLevel);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "IsPetUnlock", _m_IsPetUnlock);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "PlayerLoginOkData", _e_PlayerLoginOkData);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "onPetInfoUpdate", _e_onPetInfoUpdate);
@@ -841,6 +842,35 @@
            
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_IsPetUnlock(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                Snxxz.UI.PetModel gen_to_be_invoked = (Snxxz.UI.PetModel)translator.FastGetCSObj(L, 1);
                {
                    int _petId = LuaAPI.xlua_tointeger(L, 2);
                        bool gen_ret = gen_to_be_invoked.IsPetUnlock( _petId );
                        LuaAPI.lua_pushboolean(L, gen_ret);
                    return 1;
                }
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
        }
        
        
        
System/Mount/MountModel.cs
@@ -964,4 +964,9 @@
            return false;
        }
    }
    public bool IsHorseUnlock(int horseId)
    {
        return _DicHorse.ContainsKey(horseId);
    }
}
System/Pet/PetModel.cs
@@ -996,5 +996,10 @@
            }
            return false;
        }
        public bool IsPetUnlock(int petId)
        {
            return _DicPetBack.ContainsKey(petId);
        }
    }
}
System/Pet/PetWin.cs
@@ -47,6 +47,15 @@
        {
            base.OnPreOpen();
            DisplayButtons();
            var petHorseAwaking = LuaUtility.Global.Get<IPetHorseAwaking>("PetHorseAwakingModel");
            petHorseAwaking.onFuncStateUpdate += OnFuncStateUpdate;
        }
        protected override void OnPreClose()
        {
            var petHorseAwaking = LuaUtility.Global.Get<IPetHorseAwaking>("PetHorseAwakingModel");
            petHorseAwaking.onFuncStateUpdate -= OnFuncStateUpdate;
            base.OnPreClose();
        }
        protected override void OnActived()
@@ -99,5 +108,10 @@
            functionOrder = 2;
        }
        private void OnFuncStateUpdate()
        {
            DisplayButtons();
        }
    }
}