DESKTOP-RH64908\Administrator
|
8d4c3a2213
|
1
|
2025-02-10 20:20:21 +08:00 |
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
|
a0f8876302
|
技能图片 不分预设修改
|
2024-09-11 13:02:04 +08:00 |
PC-202302260912\Administrator
|
291c157e37
|
技能图片修改
|
2024-09-10 20:44:13 +08:00 |
PC-202302260912\Administrator
|
69dee76679
|
技能图标上传
|
2024-07-23 16:36:00 +08:00 |
PC-202302260912\Administrator
|
ac87f95fee
|
新英雄图片
|
2024-07-05 15:03:58 +08:00 |
PC-202302260912\Administrator
|
25e716c5e2
|
名刀文件夹上传
|
2024-01-30 15:49:34 +08:00 |
PC-202302260912\Administrator
|
b1786016ed
|
名刀图标
|
2024-01-30 14:05:10 +08:00 |
PC-202302260912\Administrator
|
46c36bd841
|
修改技能图标
|
2024-01-25 19:26:18 +08:00 |
PC-202302260912\Administrator
|
9d4eeef6e2
|
修改英雄立绘相关
|
2024-01-22 16:25:38 +08:00 |
PC-202302260912\Administrator
|
e8b53ed1fb
|
图标和头像替换
|
2024-01-18 13:46:45 +08:00 |
PC-202302260912\Administrator
|
14f1ffd0ca
|
修改图片
|
2024-01-17 13:54:30 +08:00 |
PC-202302260912\Administrator
|
d899c6e161
|
神印图标
|
2024-01-13 19:30:41 +08:00 |
PC-202302260912\Administrator
|
891830d175
|
添加一些技能图标
|
2024-01-12 14:46:41 +08:00 |
PC-202302260912\Administrator
|
1f9c0f2457
|
传一批图标
|
2024-01-11 21:21:30 +08:00 |