Commit Graph

65 Commits (42f824de9b63b2753a426d61af54e15159420eb5)

Author SHA1 Message Date
zhangjiannan 42f824de9b 1 2025-05-22 16:22:44 +08:00
zhangjiannan 2613e662d3 1 2025-05-22 15:46:13 +08:00
zhangjiannan 7dac353d15 1 2025-05-22 15:16:42 +08:00
zhangjiannan 13d2027a98 1 2025-05-22 14:49:11 +08:00
zhangjiannan 86d80305af 1 2025-05-21 17:41:42 +08:00
zhangjiannan 49e8906c2e 1 2025-05-15 12:19:31 +08:00
zhangjiannan 4d5951a44b 1 2025-05-08 19:46:06 +08:00
zhangjiannan 38c30b1d65 1 2025-05-08 19:19:23 +08:00
zhangjiannan a18bf96d29 1 2025-04-28 22:22:20 +08:00
zhangjiannan d3530b9128 1 2025-04-28 09:48:37 +08:00
PC-202302260912\Administrator d7851eb2ba 超值礼包 2025-04-23 18:22:51 +08:00
zhangjiannan d06a9cc5dd Merge branch 'zhibo' of http://192.168.1.21:3000/root/sk-client into zhibo 2025-04-10 16:06:35 +08:00
zhangjiannan b032b5e152 1 2025-04-10 16:06:12 +08:00
PC-202302260912\Administrator 457f03c013 1 2025-04-08 18:05:16 +08:00
PC-202302260912\Administrator 14254ef92f 竞技场修改 2025-04-08 16:28:38 +08:00
zhangjiannan 2200de75fc 1 2025-04-03 20:07:22 +08:00
zhangjiannan 2e0b4fbfc8 1 2025-03-24 21:00:38 +08:00
zhangjiannan 35b9d151fe 1 2025-02-25 17:38:27 +08:00
zhangjiannan 0bd91f84ff 1 2025-02-17 17:23:30 +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 7890642221 1 2025-02-11 15:00:34 +08:00
zhangjiannan 434b7dce45 修改选服列表快捷选择和公告再开启无内容bug 2025-01-21 13:00:17 +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 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 acdfe5dd33 切分之上传 2024-11-21 12:08:56 +08:00
PC-202302260912\Administrator bec25fbce2 去掉英雄收集 2024-11-20 17:56:26 +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
zhangjiannan 3f60cfb8b0 替换三个lua文件0.1版本特殊文件 2024-10-25 10:21:10 +08:00
zhangjiannan 8f9cb5ea49 差异同步 2024-10-24 16:58:36 +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 e9041dbc07 1 2024-10-28 00:08:19 +08:00
zhangjiannan 1606cd3433 1 2024-09-18 10:56:11 +08:00