wasteland / server | GitLab

13 Apr, 2021

1 commit

27ce2ba0 Merge branch 'tr/bugfix' into tr/publish/preview Browse Dir »

熊润斐
2021-04-13 19:57:01 +0800

12 Apr, 2021

2 commits

cbc30891 所有的觉醒任务bug，参数应该是觉醒后的值 Browse Dir »

chenyueqi
2021-04-12 20:23:14 +0800
4b3327eb 物资危机增加代理拾荒时长和击杀boss数量的任务类型 Browse Dir »

chenyueqi
2021-04-12 14:36:34 +0800

06 Apr, 2021

1 commit

13846d71 头像永久 Browse Dir »

zhouhaihai
2021-04-06 14:36:05 +0800

01 Apr, 2021

7 commits

d4ed4fa1 Merge branch 'tr/bugfix' into tr/publish/preview ... Browse Dir »
```
* tr/bugfix:
  boss挑战门票购买可以超出上限
  bug修复：扫荡会多给一次奖励

# Conflicts:
#	src/csvdata
```
zhouhaihai
2021-04-01 14:15:08 +0800
4a4ea798 Merge branch 'tr/develop' into tr/bugfix ... Browse Dir »
```
* tr/develop:
  bug修复：扫荡会多给一次奖励
```
zhouhaihai
2021-04-01 14:14:19 +0800
c6a4c456 boss挑战门票购买可以超出上限 Browse Dir »

liuzujun
2021-04-01 13:31:16 +0800
7a4c9ac8 bug修复：扫荡会多给一次奖励 Browse Dir »

liguanghui
2021-04-01 11:17:37 +0800
c46c7782 Merge branch 'tr/bugfix' into tr/publish/preview Browse Dir »

chenyueqi
2021-04-01 10:29:28 +0800
eb1d28df bug修复：夜间打工发奖数量有误 Browse Dir »

liguanghui
2021-04-01 10:25:22 +0800
2bb89538 Merge branch 'tr/bugfix' into tr/publish/preview Browse Dir »

chenyueqi
2021-04-01 10:24:17 +0800

31 Mar, 2021

3 commits

77770cb6 无用log移除 Browse Dir »

liguanghui
2021-03-31 14:24:44 +0800
5de5479e 工作日玩法奖励结算bug修复 Browse Dir »

liguanghui
2021-03-31 14:24:03 +0800
72690e7d Merge branch 'tr/bugfix' into tr/publish/preview Browse Dir »

熊润斐
2021-03-31 11:13:52 +0800

30 Mar, 2021

3 commits

ffb897e9 免费次数记录错误 Browse Dir »

zhouhaihai
2021-03-30 16:45:12 +0800
007e3c41 增加的分数不同 Browse Dir »

zhouhaihai
2021-03-30 16:42:38 +0800
29fbbc10 夜间打工 Browse Dir »

zhouhaihai
2021-03-30 11:18:41 +0800

29 Mar, 2021

1 commit

243bf75b Merge branch 'tr/bugfix-qa' into tr/develop Browse Dir »

熊润斐
2021-03-29 11:43:17 +0800

25 Mar, 2021

4 commits

dfc732c5 每日登陆签到，领奖时邮件自动发送 Browse Dir »

chenyueqi
2021-03-25 19:23:59 +0800
2dbe4fb9 充值礼包自选部分逻辑 Browse Dir »

chenyueqi
2021-03-25 16:42:34 +0800
206e4d84 Merge branch 'tr/bugfix' into tr/publish/preview Browse Dir »

chenyueqi
2021-03-25 09:41:27 +0800
39aebe0b 回归者活动，计算所有任务完成存在bug Browse Dir »

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

24 Mar, 2021

1 commit

6ace26f2 Merge branch 'tr/bugfix' into tr/publish/preview ... Browse Dir »
```
# Conflicts:
#	src/csvdata
```
熊润斐
2021-03-24 13:45:13 +0800

22 Mar, 2021

2 commits

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

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

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

19 Mar, 2021

1 commit

c7381e80 去除调试日志 Browse Dir »

liuzujun
2021-03-19 17:23:09 +0800

18 Mar, 2021

2 commits

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

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

liuzujun
2021-03-18 17:47:46 +0800

17 Mar, 2021

11 commits

1e6f5758 Merge branch 'tr/bugfix' into tr/publish/preview Browse Dir »

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

chenyueqi
2021-03-17 17:54:36 +0800
0f2ede8d 海港贸易季委托任务奖励计算错误 Browse Dir »

chenyueqi
2021-03-17 17:02:37 +0800
d106e758 Merge branch 'tr/bugfix' into tr/publish/preview Browse Dir »

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

chenyueqi
2021-03-17 17:01:03 +0800
9101db34 Merge branch 'tr/bugfix' into tr/publish/preview Browse Dir »

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

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

chenyueqi
2021-03-17 16:33:32 +0800
a94f25f8 Merge branch 'tr/bugfix' into tr/publish/preview Browse Dir »

熊润斐
2021-03-17 15:45:47 +0800
e04abcb4 电波塔的任务只算主塔的进度 Browse Dir »

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

chenyueqi
2021-03-17 14:52:51 +0800

16 Mar, 2021

1 commit

cee86c7b bug修复：海港贸易委托无法领取奖励 Browse Dir »

liguanghui
2021-03-16 17:11:39 +0800