Commit Graph

126 Commits (2557f30c3fcdbd193ec0c2a7ed1594078b92e740)

Author SHA1 Message Date
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
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 9ce59b8009 日常副本修改 2025-05-13 19:05:49 +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 63c511604c 1 2025-04-22 14:08:30 +08:00
PC-202302260912\Administrator 6499f78e5c 删除截取 2025-04-11 14:38:07 +08:00
PC-202302260912\Administrator c5fecd8770 111 2025-05-02 13:30:25 +08:00
zhangjiannan 5cbaad5519 1 2025-04-11 12:55:35 +08:00
PC-202302260912\Administrator d070801859 修改竞技场 2025-04-08 16:05:02 +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 3f21aae331 1 2025-04-03 17:04:56 +08:00
zhangjiannan a5c665c713 11 2025-04-02 18:40:16 +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
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
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 3e5cf124cc 神龙币支付修改 屏蔽特权钻盘请求 2024-07-16 15:33:46 +08:00
PC-202302260912\Administrator a4ca12dd25 超级卖场(神龙币商场)提交 2024-07-12 17:48:04 +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 14250f9a34 11111 2024-07-03 18:38:10 +08:00