Commit Graph

92 Commits (af2af917f9fd5699fe6133dbe6d5e7b5e128a846)

Author SHA1 Message Date
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