Commit Graph

324 Commits (Branch_oumei)

Author SHA1 Message Date
zhangjiannan 45636f67fa 1 2025-07-16 11:01:49 +08:00
zhangjiannan 2c67b93db4 1 2025-06-20 16:46:14 +08:00
zhangjiannan a295675988 1 2025-06-20 14:33:22 +08:00
zhangjiannan de1e17be67 1 2025-06-19 18:28:39 +08:00
PC-202302260912\Administrator 052c464f60 Merge branch 'Branch_oumei' of http://192.168.1.21:3000/root/sk-client into Branch_oumei 2025-05-23 18:22:52 +08:00
zhangjiannan becba72189 1 2025-06-19 16:21:22 +08:00
zhangjiannan ed700c6b06 1 2025-06-19 16:17:44 +08:00
zhangjiannan 72f93722ad 1 2025-06-19 15:33:59 +08:00
zhangjiannan 39a2f90430 1 2025-06-19 11:17:55 +08:00
zhangjiannan 80347a74a3 1 2025-06-19 11:17:12 +08:00
zhangjiannan 6dfbe197ff 1 2025-06-18 12:36:16 +08:00
zhangjiannan 8a79929f66 1 2025-06-17 12:45:22 +08:00
zhangjiannan 3443be1d0c 1 2025-06-16 12:35:46 +08:00
zhangjiannan 5f6b09107d 1 2025-06-12 14:36:14 +08:00
zhangjiannan 8b4b4e02e7 1 2025-06-11 16:43:49 +08:00
zhangjiannan 3cd9098e0c 1 2025-06-09 13:58:48 +08:00
zhangjiannan 79a5bd66af 1 2025-06-03 23:01:17 -04:00
zhangjiannan 923bafd2fe 1 2025-06-03 22:58:33 -04:00
zhangjiannan 81a3d15a4a 1 2025-05-26 12:46:10 +08:00
zhangjiannan ae006daee4 1 2025-05-26 12:37:47 +08:00
zhangjiannan 0e361884c7 Merge branch 'Branch_oumei' of http://192.168.1.21:3000/root/sk-client into Branch_oumei 2025-05-26 12:27:28 +08:00
PC-202302260912\Administrator 35b691b0b1 七日目标大小修改 2025-05-28 12:10:28 +08:00
PC-202302260912\Administrator 6e25678ebe Merge branch 'Branch_oumei' of http://192.168.1.21:3000/root/sk-client into Branch_oumei 2025-05-28 12:00:31 +08:00
PC-202302260912\Administrator 7b147f83db 忘记隐藏的页面修改 2025-05-28 11:59:04 +08:00
zhangjiannan be67be9790 1 2025-05-26 12:27:12 +08:00
zhangjiannan 268b8df801 1 2025-05-26 11:57:06 +08:00
PC-202302260912\Administrator 0aa77529e8 1 2025-05-23 18:16:38 +08:00
zhangjiannan 374e41fdc2 1 2025-05-23 11:25:53 +08:00
zhangjiannan 49eca118d9 1 2025-05-23 11:16:45 +08:00
zhangjiannan fa1ace99e5 1 2025-05-22 14:51:06 +08:00
zhangjiannan b4fad0727d 1 2025-05-22 14:50:47 +08:00
DESKTOP-MMO982B\User 8314f509c9 调整字体大小 2025-05-19 13:48:43 +08:00
zhangjiannan a1dbc520b0 Merge branch 'Branch_oumei' of http://192.168.1.21:3000/root/sk-client into Branch_oumei 2025-05-16 11:10:13 +08:00
zhangjiannan 788f2f3284 1 2025-05-16 11:07:42 +08:00
PC-202302260912\Administrator 2613999882 Merge branch 'Branch_oumei' of http://192.168.1.21:3000/root/sk-client into Branch_oumei 2025-05-15 16:43:43 +08:00
PC-202302260912\Administrator a3107a7c60 游戏公告字体大小调整 2025-05-15 16:43:09 +08:00
zhangjiannan 38382d6df1 1 2025-05-15 13:50:20 +08:00
zhangjiannan a54f28a610 1 2025-05-15 13:01:40 +08:00
zhangjiannan 378882e279 1 2025-05-15 12:01:37 +08:00
zhangjiannan 0d8c9cd24d 1 2025-05-15 12:00:50 +08:00
zhangjiannan bfa8090cfd Merge branch 'Branch_oumei' of http://192.168.1.21:3000/root/sk-client into Branch_oumei 2025-05-15 10:40:01 +08:00
zhangjiannan e2892eae70 1 2025-05-15 10:29:09 +08:00
PC-202302260912\Administrator f43b828e62 调整字体大小 2025-05-14 12:28:18 +08:00
PC-202302260912\Administrator 9ce59b8009 日常副本修改 2025-05-13 19:05:49 +08:00
zhangjiannan 08a01ef763 1 2025-05-12 11:12:43 +08:00
zhangjiannan c8e8fad840 1 2025-05-12 11:12:11 +08:00
zhangjiannan f2753aebb1 1 2025-05-12 11:11:09 +08:00
PC-202302260912\Administrator 93a7ab6d18 1 2025-05-07 19:11:56 +08:00
zhangjiannan 4279bff446 1 2025-05-07 17:47:31 +08:00
zhangjiannan daa07cad74 1 2025-05-07 17:47:08 +08:00
PC-202302260912\Administrator 60f8a5e568 1 2025-05-07 15:44:38 +08:00
PC-202302260912\Administrator 42756a9522 每日任务界面修正 2025-04-08 16:21:35 +08:00
PC-202302260912\Administrator a8d84684c3 修改字体大小 2025-05-01 16:09:17 +08:00
PC-202302260912\Administrator d9407cde4d 修改字体大小 2025-04-22 14:27:03 +08:00
PC-202302260912\Administrator 63c511604c 1 2025-04-22 14:08:30 +08:00
PC-202302260912\Administrator ea01849a92 修正图片 2025-04-22 13:48:25 +08:00
PC-202302260912\Administrator bffecb96b1 修改图片 2025-04-18 13:33:02 +08:00
PC-202302260912\Administrator b7d362449b 修改字体大小 2025-04-15 14:05:12 +08:00
PC-202302260912\Administrator b667e189ea 修改字体大小 2025-04-15 13:23:23 +08:00
PC-202302260912\Administrator b8bd6edd2c 修改字体大小 2025-04-15 12:51:49 +08:00
PC-202302260912\Administrator 72e0ed42dd 修改字体大小 2025-04-15 12:46:34 +08:00
PC-202302260912\Administrator 41f3af0814 修改文字大小 2025-04-15 12:38:24 +08:00
PC-202302260912\Administrator 0c5693ff4a 修改文字大小 2025-04-15 12:29:37 +08:00
PC-202302260912\Administrator 325f5d6c78 字体调大 2025-04-15 12:09:56 +08:00
PC-202302260912\Administrator 6499f78e5c 删除截取 2025-04-11 14:38:07 +08:00
PC-202302260912\Administrator 8614c65eae 修改图片内英文 2025-04-11 14:05:04 +08:00
PC-202302260912\Administrator c5fecd8770 111 2025-05-02 13:30:25 +08:00
PC-202302260912\Administrator bc3a4457b9 Merge branch 'Branch_oumei' of http://192.168.1.21:3000/root/sk-client into Branch_oumei 2025-05-02 13:16:29 +08:00
PC-202302260912\Administrator f43de98f1e 修改预设 2025-05-02 13:12:51 +08:00
PC-202302260912\Administrator a3caadd144 修改三张图片 2025-04-18 12:51:10 +08:00
zhangjiannan 5cbaad5519 1 2025-04-11 12:55:35 +08:00
PC-202302260912\Administrator 8ee1078666 111 2025-04-11 12:09:54 +08:00
PC-202302260912\Administrator f64cbede45 111111 2025-04-30 12:06:51 +08:00
PC-202302260912\Administrator 5421a257f7 111111 2025-04-30 12:05:49 +08:00
PC-202302260912\Administrator a52eb6eaf6 111 2025-04-30 12:03:19 +08:00
PC-202302260912\Administrator 35b10e1df6 1 2025-04-30 12:00:53 +08:00
PC-202302260912\Administrator c63e712a12 图片上传替换 2025-04-30 11:58:33 +08:00
PC-202302260912\Administrator 4756f98194 名字遮挡问题 2025-04-08 16:08:55 +08:00
PC-202302260912\Administrator d070801859 修改竞技场 2025-04-08 16:05:02 +08:00
PC-202302260912\Administrator 9276a6b8de 修改竞技场 2025-04-08 16:04:38 +08:00
zhangjiannan b982581cd0 Merge branch 'Branch_oumei' of http://192.168.1.21:3000/root/sk-client into Branch_oumei 2025-04-08 13:40:38 +08:00
zhangjiannan f5786b4328 1 2025-04-08 13:40:05 +08:00
PC-202302260912\Administrator 79ae239f82 111 2025-04-07 16:02:23 +08:00
zhangjiannan 935ae11512 Merge remote-tracking branch 'remotes/origin/zhibo' into Branch_oumei
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
2025-04-03 20:13:40 +08:00
zhangjiannan 2200de75fc 1 2025-04-03 20:07:22 +08:00
zhangjiannan 67266dea6e Merge branch 'Branch_oumei' of http://192.168.1.21:3000/root/sk-client into Branch_oumei 2025-04-03 17:05:46 +08:00
zhangjiannan 3f21aae331 1 2025-04-03 17:04:56 +08:00
PC-202302260912\Administrator bd0af7c458 Merge branch 'Branch_oumei' of http://192.168.1.21:3000/root/sk-client into Branch_oumei 2025-04-03 12:02:29 +08:00
PC-202302260912\Administrator ab8316d5f0 1111 2025-04-03 12:02:09 +08:00
PC-202302260912\Administrator f1066289a7 更换图片 2025-04-03 12:01:15 +08:00
zhangjiannan ebc3409582 Merge branch 'Branch_oumei' of http://192.168.1.21:3000/root/sk-client into Branch_oumei 2025-04-02 18:40:46 +08:00
zhangjiannan a5c665c713 11 2025-04-02 18:40:16 +08:00
zhangjiannan f0d1596b18 Merge remote-tracking branch 'remotes/origin/zhibo' into Branch_oumei 2025-03-27 15:59:16 +08:00
zhangjiannan cc36cdca34 Merge branch 'Branch_oumei' of http://192.168.1.21:3000/root/sk-client into Branch_oumei 2025-03-27 15:55:17 +08:00
zhangjiannan ad7f3dd098 1 2025-03-27 15:53:06 +08:00
zhangjiannan 2d126ac211 Merge remote-tracking branch 'remotes/origin/zhibo' into Branch_oumei 2025-03-27 15:43:14 +08:00
PC-202302260912\Administrator 75d0cfba88 修改图片 2025-03-26 20:00:42 +08:00
zhangjiannan 9fcb2bd71e Merge branch 'Branch_oumei' of http://192.168.1.21:3000/root/sk-client into Branch_oumei 2025-03-26 19:44:18 +08:00
zhangjiannan c6350fc581 1 2025-03-26 19:44:02 +08:00
zhangjiannan d7940bf6f0 Merge branch 'Branch_oumei' of http://192.168.1.21:3000/root/sk-client into Branch_oumei 2025-03-26 15:32:34 +08:00
zhangjiannan 199ea5b84c 1 2025-03-26 15:32:18 +08:00
zhangjiannan 1ccdb11b49 1 2025-03-26 14:11:43 +08:00
zhangjiannan e773c3f5b9 Merge branch 'Branch_oumei' of http://192.168.1.21:3000/root/sk-client into Branch_oumei 2025-03-26 13:37:37 +08:00
zhangjiannan 64a42545e2 1 2025-03-26 13:37:10 +08:00
zhangjiannan 03ad4754fb Merge branch 'zhibo' of http://192.168.1.21:3000/root/sk-client into zhibo 2025-03-24 21:01:08 +08:00
zhangjiannan 2e0b4fbfc8 1 2025-03-24 21:00:38 +08:00
PC-202302260912\Administrator 3e1aeef2c9 11111 2025-02-28 18:18:37 +08:00
PC-202302260912\Administrator 14b3f88f9a 11111 2025-02-26 11:24:56 +08:00
zhangjiannan 35b9d151fe 1 2025-02-25 17:38:27 +08:00
PC-202302260912\Administrator 027ff1fd74 111 2025-02-21 16:18:36 +08:00
PC-202302260912\Administrator f340dfdbfb 修改图片 2025-02-21 16:01:47 +08:00
PC-202302260912\Administrator 21747b946e 1111 2025-02-21 15:38:27 +08:00
PC-202302260912\Administrator f8c8c11c98 后面带png的修改 2025-02-21 15:34:23 +08:00
PC-202302260912\Administrator 2c6bd87908 图片替换 2025-02-21 15:18:25 +08:00
PC-202302260912\Administrator c39589908a 添加两张翻译图片 2025-02-21 13:36:57 +08:00
PC-202302260912\Administrator 2357d9b27d 上传欧美图片 2025-02-21 13:13:58 +08:00
PC-202302260912\Administrator 7fd45613b5 英文字体 2025-02-21 13:10:12 +08:00
PC-202302260912\Administrator d93946936c 1111 2025-02-21 13:08:42 +08:00
PC-202302260912\Administrator be3999983e 添加两张翻译图片 2025-02-20 18:37:55 +08:00
PC-202302260912\Administrator 47f1e34c46 海外图片上传 2025-02-20 17:13:57 +08:00
zhangjiannan 0e1fd64927 1 2025-02-20 15:34:46 +08:00
PC-202302260912\Administrator a72a8c7fca 修改字体大小 2025-02-20 14:59:35 +08:00
PC-202302260912\Administrator d1cd405a85 修改字体大小 2025-03-20 20:31:00 +08:00
PC-202302260912\Administrator 87e34d4d92 1111 2025-03-20 20:06:05 +08:00
zhangjiannan 6e5d236ee7 1 2025-03-20 11:24:46 +08:00
zhangjiannan 3beb393c8d 1 2025-03-14 13:53:12 +08:00
zhangjiannan 8dd4f9aa01 Merge branch 'Branch_oumei' of http://192.168.1.21:3000/root/sk-client into Branch_oumei 2025-03-14 13:37:04 +08:00
PC-202302260912\Administrator 71672911ed 111111 2025-03-15 01:10:04 +08:00
zhangjiannan 849098cf0d 1 2025-03-14 13:36:54 +08:00
zhangjiannan e5c35a6552 1 2025-03-14 11:09:18 +08:00
PC-202302260912\Administrator c65378202a 11111 2025-02-20 17:26:31 +08:00
zhangjiannan 0bd91f84ff 1 2025-02-17 17:23:30 +08:00
PC-202302260912\Administrator 03c7dc9213 图片位置调整 2025-02-12 17:41:02 +08:00
PC-202302260912\Administrator 35ed86079d 登陆图替换 2025-02-12 17:40:07 +08:00
PC-202302260912\Administrator 54d8cc64f9 特权卡图片替换 2025-02-12 17:33:25 +08:00
zhangjiannan 1701a5eb02 1 2025-02-11 19:03:20 +08:00
zhangjiannan 727ce04435 1 2025-02-11 18:32:15 +08:00
zhangjiannan ffa4750d81 1 2025-02-11 18:30:57 +08:00
zhangjiannan 734bdb542a 1 2025-02-11 15:33:20 +08:00
zhangjiannan cd4aac288d Merge branch 'zhibo' of http://192.168.1.21:3000/root/sk-client into zhibo 2025-02-11 15:00:57 +08:00
zhangjiannan 7890642221 1 2025-02-11 15:00:34 +08:00
PC-202302260912\Administrator ddee9a6610 贞德描述错误修改 2025-02-11 14:33:43 +08:00
zhangjiannan 434b7dce45 修改选服列表快捷选择和公告再开启无内容bug 2025-01-21 13:00:17 +08:00
PC-202302260912\Administrator 548f15eed2 1 2025-01-26 16:30:03 +08:00
PC-202302260912\Administrator e7dc8b3f55 1 2025-01-26 16:29:28 +08:00
zhangjiannan 47b5a20518 1 2025-01-13 19:48:13 +08:00
zhangjiannan c26919b16c 1 2025-01-13 19:46:53 +08:00
zhangjiannan fc4738700d Merge branch 'zhibo' of http://192.168.1.21:3000/root/sk-client into zhibo
# Conflicts:
#	Assets/Scripts/Editor/GameEditor/FrameTool/ServerPathType.cs
2025-01-08 13:46:35 +08:00
zhangjiannan 0c99ba5b3c 1 2025-01-08 13:35:14 +08:00
zhangjiannan 5ebed7f740 1 2025-01-08 13:24:37 +08:00