wasteland / server | GitLab

26 Mar, 2021

2 commits

3bfb5fbe Revert "Merge branch 'tr/publish/release' into cn/develop" ... Browse Code »
```
This reverts commit 0488b666785337c85dc6311df05a97bc3b159944, reversing
changes made to 020d02ee23cbbec11243408f4be221a6e2ac09a4.
```
熊润斐
2021-03-26 11:42:38 +0800
0488b666 Merge branch 'tr/publish/release' into cn/develop ... Browse Code »
```
# Conflicts:
#	src/csvdata
```
熊润斐
2021-03-26 11:41:50 +0800

25 Mar, 2021

2 commits

6d55620c Merge branch 'tr/bugfix' into tr/publish/release Browse Code »

chenyueqi
2021-03-25 13:34:23 +0800
39aebe0b 回归者活动，计算所有任务完成存在bug Browse Code »

chenyueqi
2021-03-25 09:41:05 +0800

24 Mar, 2021

3 commits

c160a876 Merge branch 'tr/bugfix-qa' into tr/bugfix Browse Code »

熊润斐
2021-03-24 11:48:36 +0800
adc9e449 Merge branch 'tr/develop' into tr/bugfix-qa Browse Code »

熊润斐
2021-03-24 11:46:15 +0800
3dbe0d5d #fxtr_10186 修复两个bug Browse Code »

zhouhaihai
2021-03-24 11:28:59 +0800

23 Mar, 2021

3 commits

7a0dc1cf 初始号不触发回归活动 Browse Code »

chenyueqi
2021-03-23 19:42:09 +0800
70fbe691 Merge branch 'tr/develop' into tr/bugfix-qa Browse Code »

熊润斐
2021-03-23 15:31:35 +0800
7bc5b662 检查回归者活动，走正常的时间判断 Browse Code »

chenyueqi
2021-03-23 12:00:50 +0800

22 Mar, 2021

2 commits

c2c9dc14 回归者领取任务协议号，触发限时礼包 Browse Code »

chenyueqi
2021-03-22 16:14:35 +0800
a5dc3b0e 回归活动初版 Browse Code »

chenyueqi
2021-03-22 14:30:13 +0800

20 Mar, 2021

1 commit

61b6c21d Merge branch 'tr/bugfix' into tr/publish/release Browse Code »

chenyueqi
2021-03-20 15:06:50 +0800

19 Mar, 2021

2 commits

c7381e80 去除调试日志 Browse Code »

liuzujun
2021-03-19 17:23:09 +0800
020d02ee Merge branch 'tr/bugfix' into cn/develop Browse Code »

熊润斐
2021-03-19 16:35:17 +0800

18 Mar, 2021

4 commits

1630cd4d Merge branch 'tr/develop' of 120.26.43.151:wasteland/server into tr/develop Browse Code »

liuzujun
2021-03-18 17:47:51 +0800
3d8468b2 火花系统 Browse Code »

liuzujun
2021-03-18 17:47:46 +0800
15f141fc Merge branch 'tr/bugfix-qa' into tr/bugfix Browse Code »

熊润斐
2021-03-18 13:49:30 +0800
dae24d5a Merge branch 'tr/develop' into tr/bugfix-qa Browse Code »

熊润斐
2021-03-18 13:48:31 +0800

17 Mar, 2021

18 commits

81fb8079 Merge branch 'tr/develop' into tr/bugfix Browse Code »

chenyueqi
2021-03-17 17:54:48 +0800
18478207 贸易季委托要返回英雄的信赖值 Browse Code »

chenyueqi
2021-03-17 17:54:36 +0800
f92a4472 Merge branch 'tr/develop' into tr/bugfix Browse Code »

chenyueqi
2021-03-17 17:40:16 +0800
c4814196 从数据库读取捐赠物品顺序错误 Browse Code »

chenyueqi
2021-03-17 17:39:26 +0800
5918ff4c Merge branch 'tr/develop' into tr/bugfix Browse Code »

chenyueqi
2021-03-17 17:11:39 +0800
007a7927 奖励计算错误，遗漏一处 Browse Code »

chenyueqi
2021-03-17 17:10:49 +0800
88ae7b49 Merge branch 'tr/develop' into tr/bugfix Browse Code »

熊润斐
2021-03-17 17:03:22 +0800
0f2ede8d 海港贸易季委托任务奖励计算错误 Browse Code »

chenyueqi
2021-03-17 17:02:37 +0800
4c0df8d0 Merge branch 'tr/bugfix-qa' into tr/bugfix Browse Code »

chenyueqi
2021-03-17 17:01:16 +0800
15127116 海港贸易季委托任务奖励错误 Browse Code »

chenyueqi
2021-03-17 17:01:03 +0800
670e4d84 Merge branch 'tr/bugfix-qa' into tr/bugfix Browse Code »

chenyueqi
2021-03-17 16:36:16 +0800
8864df66 电波塔检查任务参数错误 Browse Code »

chenyueqi
2021-03-17 16:34:52 +0800
ef7978b2 电波塔检查任务参数错误 Browse Code »

chenyueqi
2021-03-17 16:33:32 +0800
e04abcb4 电波塔的任务只算主塔的进度 Browse Code »

chenyueqi
2021-03-17 14:53:49 +0800
e084cd2b 电波塔的任务只算主塔的进度 Browse Code »

chenyueqi
2021-03-17 14:52:51 +0800
1854b04d Merge branch 'tr/bugfix-qa' into tr/bugfix Browse Code »

熊润斐
2021-03-17 13:34:12 +0800
91ef5b2f 自动结算海岛贸易季，领取捐赠奖励报错 Browse Code »

chenyueqi
2021-03-17 10:52:19 +0800
98699b0c 自动结算海岛贸易季捐赠奖励领取报错 Browse Code »

chenyueqi
2021-03-17 10:50:03 +0800

16 Mar, 2021

3 commits

159d3731 Merge branch 'tr/bugfix-qa' into tr/bugfix Browse Code »

熊润斐
2021-03-16 20:51:11 +0800
daab809c Merge branch 'tr/develop' into tr/bugfix-qa Browse Code »

熊润斐
2021-03-16 17:55:06 +0800
adfde2d7 Merge branch 'tr/bugfix-qa' into tr/develop Browse Code »

熊润斐
2021-03-16 17:36:51 +0800