Commit Graph

9 Commits (d3b82be19c3f080ded5d179b7f74ff0d1de64e40)

Author SHA1 Message Date
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
wangzhenxing d914ebd111 魂宝灵宝增加精炼技能,神印增加套装技能 2022-11-18 17:35:05 +08:00
wangzhenxing 47bf72fbd0 gm修改器跳转修改 2022-11-07 14:38:55 +08:00
wangzhenxing 4ef723e229 [神印]====显示修改 2022-05-05 11:52:48 +08:00
wangzhenxing 374d5d8d98 shenyin 修改 2022-04-29 18:13:00 +08:00
wangzhenxing 6606b6bc64 56级宝物显示在背包 2022-04-28 13:46:14 +08:00
wangzhenxing 16d6e211a3 神印四灵显示修改 2022-04-27 17:14:20 +08:00
wangzhenxing 7cdf302e90 神印修改提交 2022-04-24 14:20:11 +08:00
wangzhenxing ca2b699259 神印提交 2022-04-22 18:23:01 +08:00