Commit Graph

221 Commits (1212678fdb31dcf827cb6699db45d1ae64c676db)

Author SHA1 Message Date
PC-202302260912\Administrator 355663a1bc 图片修改 2024-11-01 17:02:28 +08:00
PC-202302260912\Administrator c03a9b65a4 修改宝箱图标 2024-11-01 17:00:03 +08:00
PC-202302260912\Administrator 0116448b0e 修改图标 2024-11-01 16:57:11 +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
zhangjiannan c318a3f870 修改战斗场景,替换挂机表现 2024-10-10 16:52:39 +08:00
zhangjiannan 4df7b99e38 meta上传 2024-09-23 14:48:00 +08:00
PC-202302260912\Administrator 8c6d179b7f 大剑豪改为宇宙帝王 2024-09-14 15:36:42 +08:00
PC-202302260912\Administrator eab2b58d92 修改神龙图片和预设 2024-09-11 22:10:01 +08:00
PC-202302260912\Administrator 64fb5c4140 添加图标修改预设 2024-09-11 21:25:45 +08:00
PC-202302260912\Administrator e3e3482c9c 修改图片和预设 2024-09-11 19:59:15 +08:00
DESKTOP-MMO982B\User fac68e88ae Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
# Conflicts:
#	Assets/ManagedResources/Icon/Haizeiskill/gedoujiaqiqi_skill1.png.meta
2024-09-11 17:12:37 +08:00
DESKTOP-MMO982B\User 62e6b89b1a 4 2024-09-11 17:10:42 +08:00
DESKTOP-MMO982B\User 3fc9573e8f 头像资源 2024-09-11 16:56:20 +08:00
PC-202302260912\Administrator a0f8876302 技能图片 不分预设修改 2024-09-11 13:02:04 +08:00
DESKTOP-MMO982B\User 1cc18ffe2b 里布里安方形图 2024-09-10 20:56:25 +08:00
DESKTOP-MMO982B\User 8db0e8424a Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu 2024-09-10 20:51:02 +08:00
DESKTOP-MMO982B\User aafa32e29e 方形立绘 2024-09-10 20:50:50 +08:00
PC-202302260912\Administrator 291c157e37 技能图片修改 2024-09-10 20:44:13 +08:00
DESKTOP-MMO982B\User f59aa54f6c 方格立绘 2024-09-10 14:05:36 +08:00
PC-202302260912\Administrator 78e2e6a8da 圣器改为神龙 2024-09-09 18:03:32 +08:00
PC-202302260912\Administrator a63eb3f89e 特训加速所需道具 2024-11-07 16:28:43 +08:00
PC-202302260912\Administrator 69dee76679 技能图标上传 2024-07-23 16:36:00 +08:00
PC-202302260912\Administrator b0f629c34e 新的四个英雄 2024-07-23 14:28:22 +08:00
PC-202302260912\Administrator ac87f95fee 新英雄图片 2024-07-05 15:03:58 +08:00
DESKTOP-MMO982B\User c0ee875808 新英雄 2024-06-09 11:59:20 +08:00
wangzhenxing 0d3cbb7fea 删除老版英雄头像 2024-02-07 16:31: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
wangzhenxing 6f0d2a948c 删除不符合海贼画风的小怪立绘 2024-01-29 17:17:24 +08:00
DESKTOP-MMO982B\User 6c7e3b62f1 称号修改 2024-01-29 23:03:32 +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 ca00e28f35 修改图标 2024-01-20 15:22:19 +08:00
PC-202302260912\Administrator a87cbfea2e 新头像 2024-01-19 10:54:30 +08:00
PC-202302260912\Administrator d2c5bf63f5 修改圣器 2024-01-18 21:27:01 +08:00
PC-202302260912\Administrator 818dcfbfed 加一个头像 2024-01-18 16:34:35 +08:00
PC-202302260912\Administrator e8b53ed1fb 图标和头像替换 2024-01-18 13:46:45 +08:00
PC-202302260912\Administrator cfcc898e62 立绘图两张 2024-01-18 11:45:14 +08:00
PC-202302260912\Administrator fcbb5eb359 新增模型 2024-01-17 22:42:33 +08:00
PC-202302260912\Administrator 61a039fcf0 新头像 2024-01-17 19:28:03 +08:00
PC-202302260912\Administrator b88d5c3b7d 头像 2024-01-17 19:26:35 +08:00
PC-202302260912\Administrator 0ae172b9e8 酒矿石 2024-01-17 14:05:37 +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
PC-202302260912\Administrator 9166aaba61 图标修改 2024-01-05 19:06:16 +08:00
PC-202302260912\Administrator bf7f2efc3c 图修改 2024-01-03 14:12:52 +08:00
PC-202302260912\Administrator b0ebbb1b6b 达斯琪相关和 新英雄图 2023-12-29 15:56:17 +08:00
PC-202302260912\Administrator 5e95ad3a7f 装备图标相关 2023-12-27 15:38:22 +08:00