Commit Graph

7 Commits (7bbea166e8de9945c51a37f5585c11d41c84a907)

Author SHA1 Message Date
wangzhenxing 902e27918f 活动按钮修改 2023-11-15 17:19:43 +08:00
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 4b4ed9f63a [bt]=======名望特权修改 2022-11-22 15:30:03 +08:00
wangzhenxing 3c1e1c389d 添加名望特权红点 2022-11-08 18:33:09 +08:00
wangzhenxing 22367a5573 名望特权升级提示修改 2022-11-08 10:38:49 +08:00
wangzhenxing f3d4eed21c [gm]=======名望特权修改 2022-10-25 10:23:48 +08:00
wangzhenxing 8d63d391a6 [gm]==============声望特权提交 2022-10-20 17:48:00 +08:00