Commit Graph

424 Commits

Author SHA1 Message Date
dy
1d4a34c266 合并,暂时屏蔽其他功能 2023-12-15 10:46:53 +08:00
dy
9f151f182b 合并,暂时屏蔽其他功能 2023-12-15 10:46:47 +08:00
dy
24c2efdfa2 合并 2023-12-15 10:37:29 +08:00
dy
eee802594d 合并 2023-12-15 10:32:21 +08:00
xcy
e99b5dad15 feat:
1.推送礼包
2023-12-15 10:30:47 +08:00
dy
938d881ce3 fix bug 2023-12-15 10:28:06 +08:00
dy
8b15048d0f 周末礼包红点 2023-12-15 10:27:43 +08:00
dy
79f17aa48f 周末礼包 2023-12-15 10:27:33 +08:00
dy
4f6297fc7a 周末礼包,修补钻石替换 2023-12-15 10:27:31 +08:00
dy
61827c52d4 周末礼包 2023-12-15 10:27:28 +08:00
1d02f22df8 fix语言包为null 2023-12-15 10:26:35 +08:00
dy
6aadb030c5 周末礼包 2023-12-15 10:26:23 +08:00
dy
afb925bc40 proto 2023-12-15 10:26:11 +08:00
dy
66918ab247 proto 2023-12-15 10:26:08 +08:00
dy
a189f77303 init 2023-12-15 10:25:44 +08:00
dy
4ba9b9f504 init 2023-12-15 10:25:39 +08:00
dy
0fc409b0dc fix bug 2023-12-15 09:55:18 +08:00
xcy
ef90c131f3 feat:
1.推送礼包
2023-12-14 20:57:15 +08:00
xcy
aab0951e6d Merge remote-tracking branch 'origin/pushgift' into pushgift 2023-12-14 20:53:47 +08:00
5dea65e51a Merge branch 'dev' of http://git.legu.cc/qixin/HJ_Server into dev 2023-12-14 20:43:33 +08:00
0304c78991 战斗清理 2023-12-14 20:42:22 +08:00
dy
5a3f489691 proto 2023-12-14 20:12:17 +08:00
dy
bfc1fb0c9c Merge remote-tracking branch 'origin/dev' into dev 2023-12-14 19:42:13 +08:00
yushunrui
96f8b26ce8 修改圣诞小游戏逻辑 2023-12-16 19:31:48 +08:00
yushunrui
582ac4f7e3 更新圣诞活动相关代码 2023-12-16 19:05:37 +08:00
dy
dc50b71b01 proto 2023-12-14 19:42:03 +08:00
dy
5fabfb2c5a 周末礼包红点 2023-12-14 18:52:17 +08:00
dy
0f7c1db0a1 Merge remote-tracking branch 'origin/pushgift' into dev 2023-12-14 18:35:23 +08:00
dy
8bc84b5816 内网linux服务器一键更新启动脚本 2023-12-14 18:28:58 +08:00
dy
e9a2c50696 内网linux服务器一键更新启动脚本 2023-12-14 18:20:37 +08:00
dy
dcea046183 内网linux服务器一键更新启动脚本 2023-12-14 18:20:14 +08:00
xcy
5d9ece056e feat:
1.推送礼包
2023-12-14 18:18:26 +08:00
dy
39362ea6ab 周末礼包 2023-12-14 17:53:52 +08:00
dy
39cb12ac9a 周末礼包,修补钻石替换 2023-12-14 17:16:36 +08:00
dy
ab8404ef62 周末礼包 2023-12-14 17:01:39 +08:00
e0d9c40be3 Merge branch 'dev' of http://git.legu.cc/qixin/HJ_Server into dev 2023-12-14 16:07:54 +08:00
yushunrui
dc822cc958 Merge remote-tracking branch 'origin/dev' into dev 2023-12-16 15:49:56 +08:00
yushunrui
901484252d 追杀令经验修改 2023-12-16 15:49:22 +08:00
02798b1c1d fix语言包为null 2023-12-14 16:07:36 +08:00
dy
0ebe169f50 周末礼包 2023-12-14 15:34:32 +08:00
dy
49cb5d6f81 proto 2023-12-14 14:01:18 +08:00
dy
ae56d03f72 proto 2023-12-14 13:52:41 +08:00
dy
64f3f75b77 init 2023-12-14 13:51:24 +08:00
dy
d8f8aaa8d1 init 2023-12-14 13:48:47 +08:00
dy
6ea5b82629 Merge branch 'master' into dev
# Conflicts:
#	src/shared/protocols/serviceProto.ts
2023-12-14 11:42:36 +08:00
dy
4f9c1276c4 Merge remote-tracking branch 'origin/dev' into dev 2023-12-14 11:38:57 +08:00
dy
bcab41c9bb proto 2023-12-14 11:38:15 +08:00
e0c0d03f4e Merge branch 'dev' of http://git.legu.cc/qixin/HJ_Server into dev 2023-12-14 11:33:14 +08:00
941d74195d Merge branch 'master' into dev 2023-12-14 11:28:52 +08:00
dy
4c780d3fe4 proto 2023-12-14 11:23:59 +08:00