Commit Graph

691 Commits (3f9a40e9f2a3080e4bd3bd23bfbb207c6fa278b9)

Author SHA1 Message Date
PC-202302260912\Administrator b6c99d6166 添加1 2024-12-05 17:42:46 +08:00
PC-202302260912\Administrator ccd7d6941c 对号 2024-12-05 17:42:08 +08:00
PC-202302260912\Administrator 11bb5719df 添加图片 2024-12-05 17:38:59 +08:00
PC-202302260912\Administrator 584e247032 添加图片 2024-12-05 17:38:17 +08:00
PC-202302260912\Administrator 768b94c089 美术字图片上传 2024-12-05 17:15:17 +08:00
PC-202302260912\Administrator fcf85a29b3 批量上传图片 2024-12-05 17:09:03 +08:00
PC-202302260912\Administrator 31abee07f2 批量优化页面 2024-12-05 17:04:22 +08:00
PC-202302260912\Administrator 126e860e4f 星替换 2024-12-09 18:59:10 +08:00
PC-202302260912\Administrator 06a783f973 优化页面 2024-12-09 17:50:57 +08:00
PC-202302260912\Administrator c01bf047d5 添加背景框 2024-12-09 16:52:59 +08:00
PC-202302260912\Administrator 57e38c2595 添加装备图片 2024-12-09 16:52:03 +08:00
PC-202302260912\Administrator 6419101a0b 优化界面2 2024-12-03 15:50:36 +08:00
PC-202302260912\Administrator 5c7c441ab1 修改图片位置 2024-12-03 15:02:29 +08:00
PC-202302260912\Administrator e81f85579a 删除无用图片 2024-12-02 19:36:28 +08:00
PC-202302260912\Administrator 95c4856e5c 删除无用图片 2024-12-02 19:35:08 +08:00
PC-202302260912\Administrator a61679d241 删除海贼相关图片 2024-12-02 19:34:12 +08:00
PC-202302260912\Administrator 26b666eee5 删除海贼相关图片 2024-12-02 19:29:13 +08:00
PC-202302260912\Administrator 0b47ab99db 删除海贼相关图片 2024-12-02 19:28:29 +08:00
PC-202302260912\Administrator fddbc9a855 删除海贼相关图片 2024-12-02 19:26:56 +08:00
PC-202302260912\Administrator 281637c9d9 删除无用图片 2024-12-02 19:25:25 +08:00
PC-202302260912\Administrator 8aa1fa6171 删除无用图片 2024-12-02 19:24:28 +08:00
PC-202302260912\Administrator 1f27855a94 删除无用的图片 2024-12-02 19:23:45 +08:00
PC-202302260912\Administrator bddc2b40b3 1 2024-12-02 19:22:54 +08:00
PC-202302260912\Administrator 4ba04bc343 1 2024-12-02 15:47:58 +08:00
PC-202302260912\Administrator d1ded00273 修改页面 2024-12-02 15:36:51 +08:00
PC-202302260912\Administrator 18a5d7a8f6 优化页面1 2024-12-02 15:12:25 +08:00
PC-202302260912\Administrator d68ed80886 添加页面 2024-12-02 13:48:55 +08:00
PC-202302260912\Administrator 88db117538 页面添加 2024-12-02 13:26:34 +08:00
PC-202302260912\Administrator da9fded45b 添加一张loding图 2024-11-16 16:46:16 +08:00
PC-202302260912\Administrator 37dc41068d 添加图片 2024-11-26 13:15:49 +08:00
PC-202302260912\Administrator 9a9cdd46e4 添加一张图片 2024-11-23 10:51:09 +08:00
DESKTOP-RH64908\Administrator 351f192b82 1 2024-11-22 20:12:01 +08:00
PC-202302260912\Administrator baf6c5b320 修改页面 2024-11-18 16:19:58 +08:00
PC-202302260912\Administrator b844a90e18 漏传的图标和修改的UI 2024-11-13 15:05:03 +08:00
PC-202302260912\Administrator 8cdea0c7fd 战斗页面修改 2024-11-13 13:42:53 +08:00
zhangjiannan add2914126 Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu 2024-11-13 10:31:36 +08:00
zhangjiannan 699c903e8d 删除多余资源 2024-11-13 10:29:52 +08:00
PC-202302260912\Administrator 709c27781c 奖励 2024-11-12 18:17:24 +08:00
PC-202302260912\Administrator 4d72b97d7a 修改图片 2024-11-08 15:50:04 +08:00
PC-202302260912\Administrator c5df825104 修改页面 2024-11-08 14:27:58 +08:00
PC-202302260912\Administrator 6ddce72569 神印界面 2024-11-08 12:58:38 +08:00
PC-202302260912\Administrator ad7ca90ccb 漏传的图片 2024-11-04 20:32:17 +08:00
PC-202302260912\Administrator b85f1a1f1a 优化页面 2024-11-04 19:39:00 +08:00
PC-202302260912\Administrator b875c64b48 优化页面 2024-11-04 18:52:30 +08:00
PC-202302260912\Administrator ff73787a57 头替换 2024-11-04 18:30:08 +08:00
PC-202302260912\Administrator fef7707cc1 周卡 2024-11-07 15:22:27 +08:00
zhangjiannan d34fc37a50 挂机角色压缩 2024-11-06 15:28:47 +08:00
PC-202302260912\Administrator a7a29489a0 冲榜等图片优化 2024-11-02 11:25:45 +08:00
PC-202302260912\Administrator eb3e040ec5 删除无用图片 2024-11-02 11:05:37 +08:00
PC-202302260912\Administrator 6efa4d2789 修改图片 2024-11-01 14:17:45 +08:00
PC-202302260912\Administrator 8de323924e 替换按钮 2024-10-31 17:27:24 +08:00
PC-202302260912\Administrator b4f98b61e6 工会战页面修改 2024-10-30 19:32:08 +08:00
PC-202302260912\Administrator d0eb885d88 漏传的按钮修改 2024-10-30 17:36:48 +08:00
PC-202302260912\Administrator 2790e1be8d 优化部分页面 2024-10-30 17:17:21 +08:00
PC-202302260912\Administrator a843f164ac 优化页面 2024-10-30 15:43:35 +08:00
PC-202302260912\Administrator ae3c3d45d8 战斗和七界页面修改 2024-10-30 14:27:28 +08:00
PC-202302260912\Administrator 79032f7480 竞技场相关页面优化 2024-10-29 18:26:57 +08:00
PC-202302260912\Administrator 25539942ff 百抽页面修改 2024-10-29 17:32:18 +08:00
PC-202302260912\Administrator 16840d5d9e 漏传的图片修改 2024-10-24 19:09:43 +08:00
PC-202302260912\Administrator e59c2bd678 聊天背景上传 2024-10-24 15:31:29 +08:00
PC-202302260912\Administrator e33adf73b4 漏传的图片 2024-10-24 15:26:07 +08:00
PC-202302260912\Administrator db97daa792 龙珠相关上传 2024-10-24 14:53:28 +08:00
PC-202302260912\Administrator 959ffb9a23 图标错误修改 2024-10-21 19:23:47 +08:00
PC-202302260912\Administrator c573269695 页面优化 2024-10-21 18:42:21 +08:00
PC-202302260912\Administrator 7abcf61da2 修改礼包购买 2024-10-21 17:42:19 +08:00
PC-202302260912\Administrator ee44f8c130 修改等级提升页面 2024-10-21 17:32:56 +08:00
PC-202302260912\Administrator 571a67b46f 修改页面 2024-10-21 17:22:02 +08:00
PC-202302260912\Administrator bb9a718ade 优化页面 2024-10-20 14:39:00 +08:00
PC-202302260912\Administrator b42652e9cd 优化页面 2024-10-16 18:27:30 +08:00
PC-202302260912\Administrator 182954e571 鸿蒙杯 2024-10-16 18:19:44 +08:00
PC-202302260912\Administrator 00e453f708 优化页面 2024-10-16 17:58:13 +08:00
PC-202302260912\Administrator e8788d9a4e 更换图片 2024-10-16 17:33:16 +08:00
PC-202302260912\Administrator 438ab3edf5 优化页面 2024-10-16 16:26:42 +08:00
PC-202302260912\Administrator 9dd81f082d 鸿蒙塔相关 还有其余一些零碎修改 2024-10-14 17:34:32 +08:00
PC-202302260912\Administrator 3d9fb78989 战斗页面缺少的图 2024-10-14 14:16:49 +08:00
PC-202302260912\Administrator 91d3f61fbd 商店遗漏图片上传 2024-10-14 14:05:10 +08:00
PC-202302260912\Administrator 5db7e33db2 图片上传 2024-10-14 13:59:59 +08:00
PC-202302260912\Administrator 55c174594f 替换两张loading图 2024-10-14 13:33:42 +08:00
PC-202302260912\Administrator 9d07674d7d 修改页面 2024-10-14 11:34:01 +08:00
PC-202302260912\Administrator 13028d37d4 修改图片 2024-10-11 17:58:34 +08:00
PC-202302260912\Administrator 194d935bd7 Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
# Conflicts:
#	Assets/ManagedResources/BG/UI/1All/X1_shouzha_beijing_02.png.meta
#	Assets/ManagedResources/BG/UI/BaoKu/X1_tongyong_liebiao_07.png.meta
#	Assets/ManagedResources/BG/UI/BaoKu/X1_yindao_duihuakuang_02.png.meta
#	Assets/ManagedResources/BG/UI/BaoKu/X1_zhuangbei_pinzhidi.png.meta
2024-10-11 17:09:33 +08:00
PC-202302260912\Administrator b60c878050 冲突图片修改 2024-10-11 17:03:08 +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 d82cdf1bfd Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu 2024-10-10 16:54:17 +08:00
zhangjiannan c318a3f870 修改战斗场景,替换挂机表现 2024-10-10 16:52:39 +08:00
PC-202302260912\Administrator 1a6a9d9e96 创建公会页面底图修改 2024-10-10 16:08:02 +08:00
PC-202302260912\Administrator 1b061bc2ef 商店页面图片修改 2024-10-10 16:01:03 +08:00
PC-202302260912\Administrator 365ee67b4e 活动修改 2024-10-09 18:00:38 +08:00
PC-202302260912\Administrator a4f4e0dbed 海贼更换图片 2024-10-09 16:26:36 +08:00
PC-202302260912\Administrator a69312a80e 优化英雄获取页面 2024-10-08 15:29:44 +08:00
PC-202302260912\Administrator b5a342110c 添加图片 2024-10-08 14:06:21 +08:00
PC-202302260912\Administrator 61b79d39cc 竞技场排行榜页面修改 2024-10-08 13:14:18 +08:00
PC-202302260912\Administrator 3f4f39ab7e 英雄页面修改 2024-09-26 19:33:49 +08:00
PC-202302260912\Administrator 6f949f00e4 添加一张图片 2024-09-26 18:21:56 +08:00
PC-202302260912\Administrator cf6b6a6479 添加图标 2024-09-26 18:19:28 +08:00
PC-202302260912\Administrator 32ecd1ed15 添加图片 2024-09-25 19:54:42 +08:00
PC-202302260912\Administrator bde267ea49 修改loading图 2024-09-25 15:50:31 +08:00
PC-202302260912\Administrator fbdb4f5818 漏传图片添加 2024-09-25 15:30:32 +08:00
PC-202302260912\Administrator a19aaee4d8 添加图片 2024-09-25 15:13:40 +08:00
PC-202302260912\Administrator 8be7272707 预设和图片上传 2024-09-25 15:06:36 +08:00
PC-202302260912\Administrator 4c58c6be5a 页面优化 2024-09-24 21:10:04 +08:00
PC-202302260912\Administrator 4c10e4cd65 英雄热榜 2024-09-23 19:00:01 +08:00
PC-202302260912\Administrator 5eefbadf1b 八日登陆页面 2024-09-23 18:07:48 +08:00
zhangjiannan 4df7b99e38 meta上传 2024-09-23 14:48:00 +08:00
PC-202302260912\Administrator dc7e9bcfb3 8日登陆页面 2024-09-23 14:27:19 +08:00
PC-202302260912\Administrator 16187dc891 十绝阵图片更换 2024-09-23 11:50:57 +08:00
PC-202302260912\Administrator dfacd9001e 优化页面 2024-09-23 11:24:27 +08:00
PC-202302260912\Administrator e11197dd91 优化页面 2024-09-18 13:37:34 +08:00
PC-202302260912\Administrator c860d62433 优化页面 2024-09-18 13:22:59 +08:00
PC-202302260912\Administrator a44ddef1e0 添加图片 2024-09-14 19:25:09 +08:00
PC-202302260912\Administrator 1bca57670c 遗漏图片上传 2024-09-14 19:15:55 +08:00
PC-202302260912\Administrator aec45117d0 补图片 2024-09-14 19:08:48 +08:00
PC-202302260912\Administrator 8267aff2a0 活动图标 2024-09-14 17:58:10 +08:00
PC-202302260912\Administrator 5785195039 图标修正 2024-09-14 17:49:25 +08:00
PC-202302260912\Administrator 6d5b8483cc 七日狂欢 2024-09-14 17:10:10 +08:00
PC-202302260912\Administrator cc56527abf 无限送抽图片 2024-09-13 19:46:41 +08:00
PC-202302260912\Administrator 6674712783 称号底图修改 2024-09-13 18:53:03 +08:00
PC-202302260912\Administrator 913f5891ca 主角等级被遮挡修改 宇宙武道会秘宝修改 2024-09-13 18:46:39 +08:00
PC-202302260912\Administrator 3e6e50af7c 开服排行 2024-09-13 18:31:47 +08:00
PC-202302260912\Administrator 3eab54ae39 十绝阵图片 2024-09-16 17:18:29 +08:00
PC-202302260912\Administrator 08543cdd46 公会图片 2024-09-16 16:44:55 +08:00
PC-202302260912\Administrator 54f599ce81 开服冲榜 2024-09-16 16:26:12 +08:00
PC-202302260912\Administrator c048f7fcc5 图片 2024-09-16 11:41:54 +08:00
PC-202302260912\Administrator b0e8b5d069 蛇道背景 2024-09-16 11:23:01 +08:00
PC-202302260912\Administrator 0a864ffc99 漏传的图 2024-09-12 18:24:19 +08:00
PC-202302260912\Administrator 9575dab930 按钮图片修改 2024-09-12 16:28:27 +08:00
DESKTOP-MMO982B\User 17e16691a1 活动底部页签图 2024-09-12 15:33:50 +08:00
PC-202302260912\Administrator ec21f3ca80 添加部分缺失图片 2024-09-12 11:12:28 +08:00
PC-202302260912\Administrator 64fb5c4140 添加图标修改预设 2024-09-11 21:25:45 +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
PC-202302260912\Administrator 78e2e6a8da 圣器改为神龙 2024-09-09 18:03:32 +08:00
PC-202302260912\Administrator a07ca97cdb 优化页面 2024-09-09 14:52:28 +08:00
PC-202302260912\Administrator e5665703b0 排行榜 和部分页面表头 2024-09-09 11:37:10 +08:00
PC-202302260912\Administrator 7e7b86d35e 阵营命修改 上传一部分杂乱的mat 2024-09-06 19:30:37 +08:00
PC-202302260912\Administrator 6be4c4c610 龙珠阵营图标修改 2024-09-05 17:20:13 +08:00
PC-202302260912\Administrator ae6a3f8284 神器页面修改 2024-08-27 21:00:27 +08:00
PC-202302260912\Administrator 92ba16975a 雷达寻宝 2024-08-27 15:35:08 +08:00
PC-202302260912\Administrator aaf833528f 海上寻宝 2024-08-27 14:42:40 +08:00
PC-202302260912\Administrator 4da3013110 GM修改器 2024-08-27 11:50:16 +08:00
PC-202302260912\Administrator 6caf7b2ae6 月卡图片替换 2024-08-27 11:18:58 +08:00
PC-202302260912\Administrator cc353f0815 超值连充图片替换 2024-08-27 11:10:36 +08:00
PC-202302260912\Administrator 63eb082f63 名望页面替换 2024-08-27 11:05:27 +08:00
PC-202302260912\Administrator 9ad09bc847 首冲好礼图片更改 2024-08-27 10:57:15 +08:00
PC-202302260912\Administrator 4ad01a20d6 图片改名从新提交 2024-08-27 10:39:45 +08:00
PC-202302260912\Administrator da6f374385 海上夺宝 2024-08-26 18:05:53 +08:00
PC-202302260912\Administrator 9d93feac7e 修改图片 2024-08-26 17:54:30 +08:00
PC-202302260912\Administrator 6f37a0c2e3 宇宙武道会 2024-08-26 17:47:05 +08:00
PC-202302260912\Administrator 6a16d2d6d8 loading页面修改 2024-08-26 17:05:09 +08:00
PC-202302260912\Administrator b80c70f053 公会申请页面修改 2024-08-26 16:22:48 +08:00
PC-202302260912\Administrator 24dd64fbc0 公会页面 2024-08-16 18:50:42 +08:00