wasteland / server | GitLab

17 Mar, 2021

10 commits

d106e758 Merge branch 'tr/bugfix' into tr/publish/preview Browse Code »

chenyueqi
2021-03-17 17:01:42 +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
9101db34 Merge branch 'tr/bugfix' into tr/publish/preview Browse Code »

chenyueqi
2021-03-17 16:37:10 +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
a94f25f8 Merge branch 'tr/bugfix' into tr/publish/preview Browse Code »

熊润斐
2021-03-17 15:45:47 +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

16 Mar, 2021

11 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
edb76e27 Merge branch 'tr/bugfix' into tr/bugfix-qa Browse Code »

熊润斐
2021-03-16 17:36:40 +0800
cee86c7b bug修复：海港贸易委托无法领取奖励 Browse Code »

liguanghui
2021-03-16 17:11:39 +0800
09582aac 海港贸易相关bug修复 Browse Code »

liguanghui
2021-03-16 16:07:12 +0800
e820b3f3 海港贸易季bug修正 Browse Code »

chenyueqi
2021-03-16 12:35:45 +0800
5fb0ac5f 海港贸易相关bug修复 Browse Code »

liguanghui
2021-03-16 11:38:47 +0800
ac57fc89 贸易季兑换商店记录次数 Browse Code »

chenyueqi
2021-03-16 10:22:30 +0800
1dc5abc2 字符串分割错误遗漏 Browse Code »

chenyueqi
2021-03-16 10:18:41 +0800
9fc8b7f0 分割字符串错误 Browse Code »

chenyueqi
2021-03-16 10:04:24 +0800

15 Mar, 2021

2 commits

b8788f58 海港贸易季委托增加魔导石加速完成 Browse Code »

chenyueqi
2021-03-15 19:22:40 +0800
65b551a7 海港贸易季初版 Browse Code »

chenyueqi
2021-03-15 15:09:16 +0800

11 Mar, 2021

1 commit

76c1102d Merge branch 'tr/develop' of 120.26.43.151:wasteland/server into tr/develop ... Browse Code »
```
* 'tr/develop' of 120.26.43.151:wasteland/server:
  电波塔加成错误
```
zhouhaihai
2021-03-11 13:52:07 +0800

10 Mar, 2021

5 commits

0d8a89ca Merge branch 'tr/bugfix' into tr/publish/preview Browse Code »

熊润斐
2021-03-10 21:06:27 +0800
f854f3a3 电波塔对贩卖食材的金币加成计算错误 Browse Code »

chenyueqi
2021-03-10 21:01:08 +0800
ff805127 电波塔对贩卖食材金币的加成作用于金币总收益，不是对金币价格 Browse Code »

chenyueqi
2021-03-10 20:17:10 +0800
bab9a167 电波塔加成错误 Browse Code »

chenyueqi
2021-03-10 18:09:20 +0800
a42130ee 电波塔加成错误 ... Browse Code »
```
(cherry picked from commit bf1aebbc6f7d25e3d537e52a90f065e465400771)
```
chenyueqi
2021-03-10 17:15:47 +0800

09 Mar, 2021

5 commits

696ddd64 Merge branch 'tr/bugfix' into tr/publish/preview ... Browse Code »
```
# Conflicts:
#	src/csvdata
```
熊润斐
2021-03-09 21:15:37 +0800
6beca974 Merge branch 'tr/bugfix-qa' into tr/bugfix Browse Code »

熊润斐
2021-03-09 21:03:53 +0800
895ed2a9 Merge branch 'tr/develop' into tr/bugfix-qa Browse Code »

熊润斐
2021-03-09 16:52:34 +0800
6e76008a bug修复：电波塔排行榜协议报错 Browse Code »

liguanghui
2021-03-09 11:27:37 +0800
fd494c0b Merge branch 'tr/develop' into tr/bugfix-qa Browse Code »

熊润斐
2021-03-09 10:39:55 +0800

08 Mar, 2021

6 commits

664e0e07 电波塔对食材的加成计算错误 Browse Code »

chenyueqi
2021-03-08 21:03:11 +0800
5ac65e38 Merge branch 'tr/tower' into tr/develop Browse Code »

chenyueqi
2021-03-08 17:18:04 +0800
d199e7b9 物资危机增加消耗体力类型 Browse Code »

zhouhaihai
2021-03-08 17:07:03 +0800
fd18bc26 电波塔战斗激活消息bug Browse Code »

chenyueqi
2021-03-08 15:54:02 +0800
b3737ad4 Merge branch 'tr/bugfix-qa' into tr/develop ... Browse Code »
```
* tr/bugfix-qa:
  diner 加速错误
  修复老月卡用户的月卡id字段
```
zhouhaihai
2021-03-08 13:48:13 +0800
c60a8b9b diner 加速错误 Browse Code »

zhouhaihai
2021-03-08 13:47:31 +0800