miduo_client/Assets/ManagedResources/~Lua/Modules/GodWeapon
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
..
GodWeaponGetInfoPopup.lua [神兵]==============修改提交 2023-04-12 11:31:04 +08:00
GodWeaponGetInfoPopup.lua.meta 神兵信息弹窗修改提交 2023-03-29 17:21:33 +08:00
GodWeaponInfoPanel.lua 回炉修改 2023-04-07 14:11:44 +08:00
GodWeaponInfoPanel.lua.meta 神兵相关功能提交 2023-03-30 13:16:11 +08:00
GodWeaponListPanel.lua 神兵主界面修改提交 2023-03-28 17:51:43 +08:00
GodWeaponListPanel.lua.meta 神兵提交 2023-03-28 13:57:59 +08:00
GodWeaponListPanel_Fetter.lua 神兵提交 2023-03-28 13:57:59 +08:00
GodWeaponListPanel_Fetter.lua.meta 神兵提交 2023-03-28 13:57:59 +08:00
GodWeaponListPanel_List.lua [神兵]==================修改提交 2023-04-11 14:41:36 +08:00
GodWeaponListPanel_List.lua.meta 神兵提交 2023-03-28 13:57:59 +08:00
GodWeaponListPanel_UpWar.lua Merge branch 'dev_oneDis' into onepiece_demo 2023-08-29 17:58:24 +08:00
GodWeaponListPanel_UpWar.lua.meta 神兵提交 2023-03-28 13:57:59 +08:00
GodWeaponMainPanel.lua [神兵]==============修改提交 2023-04-12 11:31:04 +08:00
GodWeaponMainPanel.lua.meta 神兵提交 2023-03-28 13:57:59 +08:00
GodWeaponManager.lua Merge branch 'dev_oneDis' into onepiece_demo 2023-08-29 17:58:24 +08:00
GodWeaponManager.lua.meta 神兵提交 2023-03-28 13:57:59 +08:00
GodWeaponSkillInfoPopup.lua 神兵升级升星相关功能提交 2023-03-30 16:27:13 +08:00
GodWeaponSkillInfoPopup.lua.meta 神兵升级升星相关功能提交 2023-03-30 16:27:13 +08:00
GodWeaponUpPanel.lua 神兵bug修改 2023-04-07 10:46:39 +08:00
GodWeaponUpPanel.lua.meta 神兵相关功能提交 2023-03-30 13:16:11 +08:00