Commit Graph

239 Commits (4864e304f859e9c679b5e85a0e27c94f733e02c2)

Author SHA1 Message Date
PC-202302260912\Administrator a61b200366 称号icon图标 2025-08-28 11:28:23 +08:00
PC-202302260912\Administrator ef25e65f89 称号图标 2025-08-27 16:48:24 +08:00
PC-202302260912\Administrator 29c2f665e5 优化图标 2025-08-27 16:33:22 +08:00
PC-202302260912\Administrator 9c2d2f1094 特权称号 2025-08-27 16:27:48 +08:00
PC-202302260912\Administrator d53458067c 称号图片修正 2025-08-27 15:59:18 +08:00
PC-202302260912\Administrator 44e851c39f 牛气值修改 2025-08-26 20:13:43 +08:00
PC-202302260912\Administrator 01d516f19a 宝箱相关图片修改 2025-08-26 20:00:04 +08:00
PC-202302260912\Administrator 5b5f006de5 替换图片 2025-07-30 21:03:08 +08:00
PC-202302260912\Administrator 6a276751d0 修正图片大小 2025-07-30 20:59:22 +08:00
PC-202302260912\Administrator f9b3b60a0f 龟仙人替换扎马斯 2025-07-30 20:14:04 +08:00
DESKTOP-MMO982B\User e2e523db7c 神石图片上传 2025-07-08 16:45:19 +08:00
DESKTOP-MMO982B\User 8ad4f1fd32 添加更改 2025-03-21 15:00:00 +08:00
DESKTOP-RH64908\Administrator 36e7c66fca Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
# Conflicts:
#	Assets/ManagedResources/Atlas/ExploreAtlas/r_tongyong_leijishouyi.png.meta
#	Assets/ManagedResources/Atlas/ExploreAtlas/t_tansuo_jindutubiao.png.meta
#	Assets/ManagedResources/Atlas/GMAltas/gm_shop_item_bg.png.meta
#	Assets/ManagedResources/Atlas/GMAltas/gm_shuachong_info_bg.png.meta
#	Assets/ManagedResources/Atlas/GMAltas/gm_sswzc_bg2.png.meta
#	Assets/ManagedResources/Atlas/GuildAtlas/ArtFont/r_gonghui_toubiao_01_zh.png.meta
#	Assets/ManagedResources/Atlas/GuildAtlas/ArtFont/r_gonghui_toubiao_02_zh.png.meta
#	Assets/ManagedResources/Atlas/GuildAtlas/ArtFont/s_shop_yijisi_zh.png.meta
#	Assets/ManagedResources/Atlas/SurpriseBoxAtlas/j_jingxilihe_guizitai.png.meta
#	Assets/ManagedResources/Atlas/SurpriseBoxAtlas/j_jingxilihe_muguijia.png.meta
#	Assets/ManagedResources/BG/UI/1All/X1_tongyong_liebiao_03.png.meta
#	Assets/ManagedResources/BG/UI/1All/X1_tongyong_liebiao_04.png.meta
#	Assets/ManagedResources/BG/UI/1All/X1_tongyong_liebiao_08.png.meta
#	Assets/ManagedResources/BG/UI/Common/UI_hz_qianneng_36.png.meta
#	Assets/ManagedResources/BG/UI/Common/UI_hz_qianneng_38.png.meta
#	Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_11.png.meta
#	Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_112.png.meta
#	Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_80.png.meta
#	Assets/ManagedResources/BG/UI/CommonIcons/UI_hz_zhonghe10.png.meta
#	Assets/ManagedResources/BG/UI/DailyMission/UI_hz_richang_Bg.png.meta
#	Assets/ManagedResources/BG/UI/Guild/UI_hz_zhonghe03_58.png.meta
#	Assets/ManagedResources/BG/UI/Login/UI_hz_zhonghe01_29.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0027_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0028_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0029_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0033_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0034_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0035_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0036_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0037_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0038_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0039_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0041_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0042_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0043_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0044_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0045_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0048_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0049_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0050_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0053_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0054_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0055_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0056_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0057_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_ab_00014_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_bgj_00091_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_cff_0049_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_cff_0078_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_dj_0008_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_dz_00058_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_fhlh_00021_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_ghn_0009_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_gy_00092_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0001_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0002_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0003_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0004_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0005_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0006_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0007_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0008_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0009_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0010_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0011_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0012_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0013_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0014_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0015_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0016_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0017_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0018_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0019_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0020_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0021_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0022_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0023_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0024_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0025_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_hyt_0032_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_jbj_0007_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_jlzz_00060_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_jzy_00043_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_lslz_00046_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_lsx_00069_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_lzz_0002_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_md_00064_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_mp_00051_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_nz_00029_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_swk_00015_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_ts_00017_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_ttjz_00048_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_wsps_00016_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_xllh_00022_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_yc_00052_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_yj_00040_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_yn_009_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_zn_tx_001_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/livetu_ainilu.png.meta
#	Assets/ManagedResources/Icon/Hero/livetu_chushisuolong.png.meta
#	Assets/ManagedResources/Icon/Hero/livetu_chushiwusuopu.png.meta
#	Assets/ManagedResources/Icon/Hero/livetu_kapu.png.meta
#	Assets/ManagedResources/Icon/Hero/livetu_leili.png.meta
#	Assets/ManagedResources/Icon/Hero/livetu_tenghu.png.meta
2025-02-10 20:21:59 +08:00
DESKTOP-RH64908\Administrator 8d4c3a2213 1 2025-02-10 20:20:21 +08:00
DESKTOP-MMO982B\User d997710a07 删除海贼相关图片 2025-02-10 18:37:19 +08:00
PC-202302260912\Administrator 76c2754eea 行军镐修改 2025-01-03 14:39:47 +08:00
PC-202302260912\Administrator 37caafc3fc 修改图标 2025-01-03 14:35:26 +08:00
zhangjiannan 699c903e8d 删除多余资源 2024-11-13 10:29:52 +08:00
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