Commit Graph

324 Commits (Branch_oumei)

Author SHA1 Message Date
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
zhangjiannan fc3a972e8f 1 2024-12-25 14:02:53 +08:00
zhangjiannan dce176de85 1 2024-12-25 12:01:49 +08:00
zhangjiannan c1b60d1531 1 2024-12-25 11:33:18 +08:00
zhangjiannan d7b6cccf02 1 2024-12-19 15:56:32 +08:00
zhangjiannan 73d45e64ef 1 2024-12-09 17:52:30 +08:00
zhangjiannan 34c71f1cd2 1 2024-12-09 15:33:22 +08:00
zhangjiannan 391d63dbbc 1 2024-12-09 13:09:32 +08:00
zhangjiannan c9528b474e 1 2024-11-30 22:45:52 +08:00
zhangjiannan 98e66ccb48 1 2024-12-02 16:12:37 +08:00
zhangjiannan a62bfa6368 Merge branch 'master' of http://192.168.1.21:3000/root/sk-client
# Conflicts:
#	Assembly-CSharp.csproj
#	Assets/LuaFramework/Scenes/Logo.unity
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2024-12-02 12:14:21 +08:00
zhangjiannan 024fd4dcd0 1 2024-12-02 12:13:04 +08:00
zhangjiannan ee9353b4da 1 2024-11-27 13:15:09 +08:00
zhangjiannan a0a1cf59c6 1 2024-11-26 19:24:07 +08:00
zhangjiannan e77e3379f9 1 2024-11-26 19:18:33 +08:00
zhangjiannan acdfe5dd33 切分之上传 2024-11-21 12:08:56 +08:00
PC-202302260912\Administrator bec25fbce2 去掉英雄收集 2024-11-20 17:56:26 +08:00
zhangjiannan 4d5ebb7812 1 2024-11-25 20:58:46 +08:00
zhangjiannan 9a16ade326 社稷大典 2024-11-25 18:36:30 +08:00
zhangjiannan c469f485f8 修改commonproto 2024-11-07 19:10:01 +08:00
DESKTOP-RH64908\Administrator b6dff0ba59 替换commonproto 2024-11-07 11:48:54 +08:00
zhangjiannan 8d5d401aba xianshangbug 2024-11-14 15:44:22 +08:00
miDuoMac dea3eb67e0 Merge branch 'master' of http://192.168.1.21:3000/root/sk-client
# Conflicts:
#	BuildABs/BuildABs
#	BuildABs/BuildABs.manifest
#	BuildABs/files.unity3d
#	BuildABs/files.unity3d.manifest
2024-10-28 18:15:33 +08:00
zhangjiannan 3f60cfb8b0 替换三个lua文件0.1版本特殊文件 2024-10-25 10:21:10 +08:00
zhangjiannan 8f9cb5ea49 差异同步 2024-10-24 16:58:36 +08:00
zhangjiannan 42af7901dc Merge branch 'master' of http://192.168.1.21:3000/root/sk-client 2024-10-23 14:07:23 +08:00
zhangjiannan 546fe93491 1 2024-10-23 14:07:16 +08:00
zhangjiannan 75fee1cd91 1 2024-10-22 16:49:27 +08:00
zhangjiannan e9651e773e 1 2024-10-22 16:31:31 +08:00
zhangjiannan 62017488d9 1 2024-10-21 19:25:57 +08:00
miDuoMac dbfc0e3ab8 1 2024-10-16 18:49:23 +08:00
zhangjiannan e8cf982492 1 2024-10-16 16:34:55 +08:00
zhangjiannan a37a3972f6 android hotfix 2024-10-16 16:27:29 +08:00
zhangjiannan 1b9533aa8d 同步差异文件 2024-10-28 05:00:03 +08:00
zhangjiannan 5c1c5cf335 添加subchannel 2024-10-28 03:50:58 +08:00
zhangjiannan e9041dbc07 1 2024-10-28 00:08:19 +08:00
zhangjiannan 5b93aa1e7f 服务器 2024-10-15 18:19:00 +08:00
DESKTOP-RH64908\Administrator 921064d8fd Merge branch 'master' of http://192.168.1.21:3000/root/sk-client 2024-10-15 16:24:42 +08:00
DESKTOP-RH64908\Administrator dc3b4468d6 1 2024-10-15 16:24:07 +08:00
zhangjiannan 9570cd8379 Merge branch 'master' of http://192.168.1.21:3000/root/sk-client
# Conflicts:
#	Assembly-CSharp-Editor-firstpass.csproj
#	Assembly-CSharp-Editor.csproj
#	Assembly-CSharp-firstpass.csproj
#	Assembly-CSharp.csproj
#	ProjectSettings/ProjectSettings.asset
#	Unity.AssetBundleBrowser.Editor.Tests.csproj
#	Unity.AssetBundleBrowser.Editor.csproj
#	Unity.Postprocessing.Editor.csproj
#	Unity.Postprocessing.Runtime.csproj
#	spine-unity-editor.csproj
#	spine-unity.csproj
2024-10-15 16:18:10 +08:00
zhangjiannan 77f4923b2a 1 2024-10-15 16:16:50 +08:00
DESKTOP-RH64908\Administrator 8fcd9c1704 Merge branch 'master' of http://192.168.1.21:3000/root/sk-client 2024-10-15 15:34:42 +08:00
DESKTOP-RH64908\Administrator 48e47a998f t 2024-10-15 15:34:26 +08:00
zhangjiannan 03279951a9 1 2024-10-09 11:55:01 +08:00
zhangjiannan 42946d541b 1 2024-10-09 11:45:47 +08:00
zhangjiannan cd2bd84569 Merge branch 'master' of http://192.168.1.21:3000/root/sk-client
# Conflicts:
#	.gitignore
#	Assembly-CSharp-Editor-firstpass.csproj
#	Assembly-CSharp-Editor.csproj
#	Assembly-CSharp-firstpass.csproj
#	Assembly-CSharp.csproj
#	Assets/LuaFramework/Scenes/Logo.unity
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
#	ThinkingAnalytics.csproj
#	ThinkingSDK.csproj
#	Unity.AssetBundleBrowser.Editor.Tests.csproj
#	Unity.AssetBundleBrowser.Editor.csproj
#	Unity.Postprocessing.Editor.csproj
#	Unity.Postprocessing.Runtime.csproj
#	spine-unity-editor.csproj
#	spine-unity.csproj
2024-09-18 10:58:24 +08:00
zhangjiannan 1606cd3433 1 2024-09-18 10:56:11 +08:00
DESKTOP-MMO982B\User f36d578e0b Revert "屏蔽"
This reverts commit 75fb8f2b94.
2024-09-14 13:25:38 +08:00
DESKTOP-MMO982B\User 75fb8f2b94 屏蔽 2024-09-12 23:03:50 +08:00
DESKTOP-MMO982B\User 5740292131 屏蔽大胸 2024-09-12 23:03:24 +08:00
DESKTOP-MMO982B\User 1870f450fc 屏蔽大胸 2024-09-12 23:03:00 +08:00
PC-202302260912\Administrator b398a13127 临时替换大胸图片 2024-09-15 20:24:30 +08:00
zhangjiannan 8a3af06260 转平台差异 2024-09-05 15:37:12 +08:00
PC-202302260912\Administrator 7b88f22b56 时空打包切换平台差异上传 2024-09-05 12:44:28 +08:00
DESKTOP-RH64908\Administrator af3e6bc535 转移客户端到7 2024-08-29 20:21:16 +08:00
zhangjiannan a8c85c4b1e 注释权限问题 2024-08-26 16:21:37 +08:00
zhangjiannan a24c112c9b 开启权限 2024-08-26 13:03:26 +08:00
zhangjiannan 3980c4d41f 开放申请好友列表 2024-08-26 12:48:59 +08:00
DESKTOP-RH64908\Administrator 8138a77723 一七玩quick参数配置 2024-08-23 14:15:05 +08:00
PC-202302260912\Administrator 4bf48e6ee6 生成wrap 2024-08-09 12:19:19 +08:00
miduoMac2 d02cface70 重新生成wrap 文件 2024-08-08 19:49:41 +08:00
PC-202302260912\Administrator 0b27c2f8d1 network 修改回原来的设置 2024-08-08 19:24:53 +08:00
PC-202302260912\Administrator b19e21b835 聊天处理修改 2024-08-08 18:02:27 +08:00
PC-202302260912\Administrator c3a5e2a30a network修改 2024-08-08 16:37:54 +08:00
PC-202302260912\Administrator 60e9d97f30 时空添加一七玩渠道 2024-08-01 18:32:55 +08:00
DESKTOP-RH64908\Administrator ac616c9bde 服务器列表修改提交 2024-07-23 18:07:50 +08:00
PC-202302260912\Administrator 3e5cf124cc 神龙币支付修改 屏蔽特权钻盘请求 2024-07-16 15:33:46 +08:00
PC-202302260912\Administrator cd240fef19 神龙币图片提交 2024-07-15 17:43:11 +08:00
PC-202302260912\Administrator a4ca12dd25 超级卖场(神龙币商场)提交 2024-07-12 17:48:04 +08:00
PC-202302260912\Administrator 349b1daecc 服务器地址修改 2024-07-11 18:59:18 +08:00
PC-202302260912\Administrator 9d33b67862 Revert "Revert "连米多本地服修改 请求路径去掉tk/""
This reverts commit 04271808ae.
2024-07-11 17:19:13 +08:00
PC-202302260912\Administrator 04271808ae Revert "连米多本地服修改 请求路径去掉tk/"
This reverts commit a5aae7137f.
2024-07-10 17:02:12 +08:00
PC-202302260912\Administrator a5aae7137f 连米多本地服修改 请求路径去掉tk/ 2024-07-10 16:59:18 +08:00
PC-202302260912\Administrator 67b3cf7783 2222 2024-07-03 18:46:27 +08:00
PC-202302260912\Administrator 14250f9a34 11111 2024-07-03 18:38:10 +08:00