Commit Graph

13 Commits (212d6f92c6cb1dc958a2c74dd11368b4a375ca11)

Author SHA1 Message Date
zhangjiannan 19484d6b62 Merge remote-tracking branch 'remotes/origin/onepiece_bt' into TCX_LongZhu
# Conflicts:
#	Assets/ManagedResources/Icon/Haizeiskill.meta
#	Assets/ManagedResources/Icons/luofu_huobi_1.png
#	Assets/ManagedResources/Icons/luofu_huobi_1.png.meta
#	Assets/ManagedResources/Icons/luofu_huobi_2.png
#	Assets/ManagedResources/Icons/luofu_huobi_2.png.meta
#	Assets/ManagedResources/Icons/luofu_huobi_3.png
#	Assets/ManagedResources/Icons/luofu_huobi_3.png.meta
#	Assets/ManagedResources/Icons/luofu_huobi_4.png
#	Assets/ManagedResources/Icons/luofu_huobi_4.png.meta
#	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
#	Assets/ManagedResources/Prefabs/UI/GMPanel/GMShuaChongTeQuan.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGiftNew.prefab
#	Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Recruit/RecruitMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/UppperMonthCardView/UppperMonthCard.prefab
#	Assets/ManagedResources/Prefabs/UI/XunBaoMiZong/XunBaoMiZongPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Language.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
2024-10-11 16:36:50 +08:00
PC-202302260912\Administrator e3e3482c9c 修改图片和预设 2024-09-11 19:59:15 +08:00
wangzhenxing a3d42ec9fb 特训修改 2024-06-04 17:46:36 +08:00
wangzhenxing 2aa3d13593 特训修改 2024-05-31 19:09:59 +08:00
wangzhenxing e9461ad1cc 特训信息界面修改提交 2024-01-16 15:06:57 +08:00
wangzhenxing 030431e3fc 合并0.1新功能修改 2024-01-03 15:24:49 +08:00
xiejun fe8af4d7ff 特训修改 2023-12-19 19:17:52 +08:00
xiejun 71140a84d7 特训BUG 2023-12-08 11:23:14 +08:00
xiejun b261ab62d6 修改UI 2023-11-29 20:48:01 +08:00
xiejun 7f3d5e8e6d 修改预制体 2023-11-29 18:31:57 +08:00
xiejun bacab5b38b 特训修改 2023-11-29 17:00:29 +08:00
xiejun 155b3bb178 UI修改 2023-11-29 03:01:44 +08:00
xiejun 4e6e0f29bd 角色特训 2023-11-28 21:31:01 +08:00