miduo_client/Assets/ManagedResources/~Lua/Modules/Pokemon
xiejun 6ced2b0507 Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
#	AssetBundles/version.txt
#	Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
2023-08-29 17:58:24 +08:00
..
view 神兵相关修改提交 2023-03-31 17:52:12 +08:00
PokemonAllSkillInfoPopup.lua
PokemonAllSkillInfoPopup.lua.meta
PokemonGetInfoPopup.lua 【灵兽信息】未获得的灵兽查看信息增加技能详细查看和等级信息 2021-08-13 10:31:53 +08:00
PokemonGetInfoPopup.lua.meta
PokemonInfoPanel.lua 神兵功能优化 2023-04-06 18:13:54 +08:00
PokemonInfoPanel.lua.meta
PokemonListPanel.lua
PokemonListPanel.lua.meta
PokemonMainPanel.lua Merge branch 'dev_oneDis' into onepiece_demo 2023-08-29 17:58:24 +08:00
PokemonMainPanel.lua.meta
PokemonManager.lua Merge branch 'dev_oneDis' into onepiece_demo 2023-08-29 17:58:24 +08:00
PokemonManager.lua.meta
PokemonSingleResultPanel.lua 【灵兽】修复巨鲲获取界面文字遮挡 2021-11-02 10:26:26 +08:00
PokemonSingleResultPanel.lua.meta
PokemonSkillInfoPopup.lua
PokemonSkillInfoPopup.lua.meta
PokemonSummonOneResultPanel.lua 神尊bug修改 2022-09-19 17:49:47 +08:00
PokemonSummonOneResultPanel.lua.meta
PokemonSummonPanel.lua 灵兽山修改提交 2022-12-16 15:45:11 +08:00
PokemonSummonPanel.lua.meta
PokemonSummonTenResultPanel.lua 漏提交 2022-09-19 18:05:46 +08:00
PokemonSummonTenResultPanel.lua.meta
PokemonUpStarSuccessPanel.lua
PokemonUpStarSuccessPanel.lua.meta
view.meta