Commit Graph

40 Commits

Author SHA1 Message Date
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
dy
3efb9d4075 Merge remote-tracking branch 'origin/dev' into dev 2023-12-14 11:22:57 +08:00
dy
e244b8b495 忽略列表 2023-12-14 11:22:46 +08:00
dy
f08ba5d44c 忽略列表 2023-12-14 11:21:30 +08:00
3d40edd421 动态调整mdb连接上限数 2023-12-14 11:20:35 +08:00
dy
e1f3e726b7 周末礼包 2023-12-14 11:06:54 +08:00
dy
312afa1b69 周末礼包 2023-12-14 11:04:16 +08:00
afbfa70926 根据开服天数,计算开启进程数量 2023-12-14 10:32:24 +08:00
dy
4fea8d6863 json 2023-12-14 09:59:06 +08:00
dy
c99b56b768 json 2023-12-14 09:52:34 +08:00
dy
aefd1d0052 init 2023-12-13 20:51:17 +08:00
DESKTOP-15R5JU0\legu
7d8dff9799 init 2023-11-17 21:55:32 +08:00
DESKTOP-15R5JU0\legu
3163d85652 Revert "WS-2022.2.5 <legu@DESKTOP-15R5JU0 Create ProjectCreationInfoService.xml"
This reverts commit adfaa02d7e.
2023-11-17 14:21:01 +08:00
DESKTOP-15R5JU0\legu
5383e22d69 Revert "WS-2022.2.5 <legu@DESKTOP-15R5JU0 Create find.xml, laf.xml, ide.general.xml, DontShowAgainFeedbackService.xml, filetypes.xml, vcs.xml, nodejs.xml, colors.scheme.xml, diff.xml, debugger.xml"
This reverts commit ad347c5cbe.
2023-11-17 14:20:05 +08:00
DESKTOP-15R5JU0\legu
ad347c5cbe WS-2022.2.5 <legu@DESKTOP-15R5JU0 Create find.xml, laf.xml, ide.general.xml, DontShowAgainFeedbackService.xml, filetypes.xml, vcs.xml, nodejs.xml, colors.scheme.xml, diff.xml, debugger.xml 2023-11-17 13:52:29 +08:00
DESKTOP-15R5JU0\legu
d4dcba8d8c WS-2022.2.5 <legu@DESKTOP-15R5JU0 Merge branch 'master' 2023-11-17 13:43:58 +08:00
DESKTOP-15R5JU0\legu
adfaa02d7e WS-2022.2.5 <legu@DESKTOP-15R5JU0 Create ProjectCreationInfoService.xml 2023-11-17 12:12:21 +08:00
DESKTOP-15R5JU0\legu
97e070ea81 init 2023-11-17 12:02:12 +08:00
DESKTOP-15R5JU0\legu
24d8c75e21 Revert "WS-2022.2.5 <legu@DESKTOP-15R5JU0 Create baseRefactoring.xml, laf.xml, ide.general.xml, nodejs.xml, Windows.xml, advancedSettings.xml, diff.xml, Default.xml, find.xml, ui.lnf.xml, DontShowAgainFeedbackService.xml, filetypes.xml, keymap.xml, vcs.xml, editor-font.xml, colors.scheme.xml, grazie_global.xml, debugger.xml, updates.xml"
This reverts commit b7054eea
2023-11-17 11:46:13 +08:00
DESKTOP-15R5JU0\legu
12cb9d8067 WS-2022.2.5 <legu@DESKTOP-15R5JU0 Merge branch 'master'
Conflicts:
	README.md
2023-11-17 11:43:02 +08:00
DESKTOP-15R5JU0\legu
6828f9b490 WS-2022.2.5 <legu@DESKTOP-15R5JU0 Update vcs.xml 2023-11-17 11:42:29 +08:00
4eb100da58 Initial commit 2023-11-17 11:39:41 +08:00
DESKTOP-15R5JU0\legu
370a514fae WS-2022.2.5 <legu@DESKTOP-15R5JU0 Update vcs.xml 2023-11-17 11:32:01 +08:00
DESKTOP-15R5JU0\legu
b7054eead9 WS-2022.2.5 <legu@DESKTOP-15R5JU0 Create baseRefactoring.xml, laf.xml, ide.general.xml, nodejs.xml, Windows.xml, advancedSettings.xml, diff.xml, Default.xml, find.xml, ui.lnf.xml, DontShowAgainFeedbackService.xml, filetypes.xml, keymap.xml, vcs.xml, editor-font.xml, colors.scheme.xml, grazie_global.xml, debugger.xml, updates.xml 2023-11-17 11:25:43 +08:00
dingdaoyuan
8603e200f8 Initial commit 2023-11-17 10:58:20 +08:00