Commit Graph

10 Commits (a40effc79ef74009c33f82b59928c8e74e86156f)

Author SHA1 Message Date
xiejun 21440d79ce 周卡 2024-01-10 14:30:56 +08:00
xiejun b76b62f525 周卡UI 2024-01-10 14:29:19 +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 7ed1c88ee4 周卡修改提交 2023-01-29 17:20:29 +08:00
wangzhenxing 1e8db13fbd [周卡]======周卡显示修改 2022-09-07 16:42:23 +08:00
wangzhenxing 6185ec6e58 【周卡】====周卡修改 2022-07-27 10:15:40 +08:00
wangzhenxing bf108a4f18 [周卡]======周卡修改提交 2022-07-26 17:39:41 +08:00
wangzhenxing dd7a256469 [周卡]======红点修改提交 2022-06-01 14:50:08 +08:00
wangzhenxing 054c31caee [周卡]=====红点提交 2022-06-01 13:23:34 +08:00
wangzhenxing 6925105782 [周卡]======周卡提交 2022-06-01 09:34:41 +08:00