709 Commits

Author SHA1 Message Date
pengtao
0e1dea75bf new combine 2021-01-25 11:44:48 +08:00
pengtao
717b38b18e change full workflow to 3 step 2021-01-14 17:35:06 +08:00
pengtao
b6e0d6f93f a 2021-01-14 15:51:34 +08:00
pengtao
507c2595d1 change gitignore 2021-01-13 17:33:53 +08:00
pengtao
a35739e3b4 change ips make func 2021-01-13 17:33:06 +08:00
pengtao
045da09b5e fix bug 2021-01-13 17:14:07 +08:00
pengtao
c45f3f7a4b close # line 2021-01-13 12:19:04 +08:00
pengtao
c59bff2492 fix bug 2021-01-13 12:15:57 +08:00
pengtao
8e31b20ec8 fix workpath 2021-01-13 11:52:14 +08:00
pengtao
bf984c5dc2 a 2021-01-13 11:49:57 +08:00
pengtao
e0423ec2e5 a 2021-01-13 10:30:45 +08:00
pengtao
3790f55899 fix workpath 2021-01-13 10:29:23 +08:00
pengtao
fe619f7e84 change work path 2021-01-12 19:33:33 +08:00
pengtao
650de7dc86 add combine workflow script 2021-01-12 19:32:11 +08:00
pengtao
ad4745c1c3 Merge remote-tracking branch 'origin/master' 2021-01-11 16:14:06 +08:00
pengtao
c2e505d6a8 Default Changelist 2021-01-11 16:13:58 +08:00
zhl
340cf3fbfa Merge branch 'release' 2021-01-08 15:57:18 +08:00
zhl
e9392415c5 新服启动时, 设为hot 2021-01-08 15:55:30 +08:00
pengtao
82411c980a 20210108 new combine config 2021-01-05 15:41:20 +08:00
pengtao
8c533a1754 20210108 new combine config 2021-01-05 15:39:52 +08:00
zhl
d4be6db4e8 Merge branch 'release' 2020-12-31 10:37:04 +08:00
zhl
11d2d9516a 调整世界boss机器人策略 2020-12-31 10:35:35 +08:00
pengtao
b976127088 remove no used 1012 2020-12-29 16:50:34 +08:00
pengtao
844b0ec065 Merge remote-tracking branch 'origin/master' 2020-12-29 15:53:26 +08:00
pengtao
2189b5600e new wjtx combine config 2020-12-29 15:53:19 +08:00
zhl
ed9809c056 Merge branch 'release' 2020-12-28 13:48:35 +08:00
zhl
bbd7b98b3a 增加重置世界boss等级的功能 2020-12-28 13:46:34 +08:00
pengtao
2dd0d083ba Merge remote-tracking branch 'origin/master' 2020-12-23 15:36:11 +08:00
pengtao
df3021b6e6 add wjtx mysql clear no used data 2020-12-23 15:36:04 +08:00
pengtao
0276974bff fix bug with combine_redis 2020-12-23 14:49:46 +08:00
pengtao
e82c2e7a21 1022 combine config 2020-12-22 11:11:54 +08:00
pengtao
7c8c075861 1012 combine config 2020-12-21 14:20:13 +08:00
pengtao
0c50e95367 1012 combine config 2020-12-21 11:00:20 +08:00
pengtao
a75ba9fdf5 1012 combine config 2020-12-18 11:47:25 +08:00
pengtao
bf4c1c90ab 1012 combine config 2020-12-18 11:44:57 +08:00
pengtao
73ec93c3aa 1012 combine config 2020-12-18 11:36:31 +08:00
pengtao
7230c53486 new combine plan 2020-12-15 11:07:28 +08:00
pengtao
052dbe0f91 new combine plan 2020-12-15 10:57:15 +08:00
pengtao
89a39af258 new combine plane 2020-12-07 16:55:22 +08:00
zhl
dcff669ad5 Merge branch 'release' 2020-12-03 17:06:55 +08:00
zhl
25a2870c2e 新服服务启动时, 将global redis中的服务器状态置为新服,隐藏 2020-12-03 16:55:44 +08:00
pengtao
509be068a2 Merge remote-tracking branch 'origin/master' 2020-11-30 15:49:41 +08:00
pengtao
ec959af0eb add new combine 2020-11-30 15:49:30 +08:00
zhl
fb0cde6882 Merge branch 'release' 2020-11-30 10:44:07 +08:00
zhl
9b9a7fb13f roleDto增加创角时间 2020-11-30 10:42:40 +08:00
zhl
bb20962154 Merge branch 'release' 2020-11-24 12:16:21 +08:00
zhl
cc30fa8987 修正一个上报人数时可能引起内存溢出的bug 2020-11-24 12:13:21 +08:00
aozhiwei
60d95ccae9 1 2020-11-19 16:04:42 +08:00
aozhiwei
fef6977a07 1 2020-11-19 15:59:45 +08:00
aozhiwei
0110a9b5f5 修复三千武会和服问题 2020-11-19 15:34:50 +08:00