wasteland / server | GitLab

07 Feb, 2021

1 commit

59fc95ea Merge branch 'tr/bugfix-qa' into tr/publish/qa-out Browse Code »

熊润斐
2021-02-07 16:03:45 +0800

04 Feb, 2021

2 commits

abdf8cf1 Merge branch 'tr/bugfix' into tr/bugfix-qa ... Browse Code »
```
* tr/bugfix:
  单位分
```
zhouhaihai
2021-02-04 19:59:49 +0800
668f23ea 单位分 Browse Code »

zhouhaihai
2021-02-04 19:59:14 +0800

03 Feb, 2021

8 commits

914d474f Merge branch 'tr/bugfix-qa' into tr/publish/qa-out Browse Code »

熊润斐
2021-02-03 21:53:27 +0800
427520d2 Merge branch 'tr/bugfix' into tr/bugfix-qa Browse Code »

熊润斐
2021-02-03 20:14:58 +0800
2d046fcb 通知邮件 Browse Code »

zhouhaihai
2021-02-03 16:57:58 +0800
614d504d 选择 bug Browse Code »

zhouhaihai
2021-02-03 16:23:51 +0800
c2e24956 战令-周任务没有刷新, 日活跃签到初始化时候检测当前活跃度是否达到签到标准 Browse Code »

liuzujun
2021-02-03 16:05:52 +0800

82520a23 Merge branch 'tr/bugfix' into tr/bugfix-qa ... Browse Code »

* tr/bugfix:
  美食币计算错误
  开启x品质时钟箱任务计数错误bug
  活动结束回收邮件

# Conflicts:
#	src/models/Activity.lua

2021-02-03 14:57:27 +0800

5a8b7a33 拾荒随机错误 Browse Code »

zhouhaihai
2021-02-03 14:12:17 +0800
af2870d8 金额使用乘以 100 的方式 Browse Code »

zhouhaihai
2021-02-03 12:12:37 +0800

02 Feb, 2021

6 commits

57c6d341 Merge branch 'tr/bugfix-qa' into tr/publish/qa-out ... Browse Code »
```
* tr/bugfix-qa:
  mycard twd
  反回 的是twd
```
zhouhaihai
2021-02-02 16:38:11 +0800
6df9d5e1 mycard twd Browse Code »

zhouhaihai
2021-02-02 16:37:31 +0800
e9da8c21 反回的是twd Browse Code »

zhouhaihai
2021-02-02 15:44:10 +0800
ee7b3c2a Merge branch 'tr/bugfix-qa' into tr/publish/qa-out Browse Code »

熊润斐
2021-02-02 13:52:57 +0800
e3b29f2f 战令-一次性领取超出周上限的战令经验应该只领取到达周上限的那一部分 Browse Code »

liuzujun
2021-02-02 11:57:10 +0800
30d52f8f 战令奖励错位 Browse Code »

liuzujun
2021-02-02 11:41:11 +0800

01 Feb, 2021

2 commits

7e5d9ac6 战令活动购买等级扣除钻石bug Browse Code »

liuzujun
2021-02-01 20:36:48 +0800
75876cb3 代理拾荒出勤人数计数错误，代理拾荒没有统计进拾荒体力消耗 Browse Code »

liuzujun
2021-02-01 14:21:46 +0800

30 Jan, 2021

2 commits

f4a07e64 Merge branch 'tr/bugfix-qa' into tr/publish/qa-out ... Browse Code »
```
* tr/bugfix-qa:
  httpweb
```
zhouhaihai
2021-01-30 10:44:52 +0800
3fdfef30 httpweb Browse Code »

zhouhaihai
2021-01-30 10:44:02 +0800

29 Jan, 2021

5 commits

1cefb7ca Merge branch 'tr/bugfix-qa' into tr/publish/qa-out Browse Code »

熊润斐
2021-01-29 18:04:51 +0800
cb356900 美食币计算错误 Browse Code »

zhouhaihai
2021-01-29 16:00:13 +0800
6e411115 开启x品质时钟箱任务计数错误bug Browse Code »

liuzujun
2021-01-29 15:32:14 +0800
86a873b9 活动任务数据重置 Browse Code »

liuzujun
2021-01-29 15:28:26 +0800
5eedb119 战令每周积分判空 Browse Code »

liuzujun
2021-01-29 14:18:47 +0800

28 Jan, 2021

14 commits

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

熊润斐
2021-01-28 16:18:44 +0800
fb344e8a 活动结束回收邮件 Browse Code »

liuzujun
2021-01-28 15:57:43 +0800
cf9eda88 Merge branch 'tr/bugfix-qa' into tr/develop ... Browse Code »
```
* tr/bugfix-qa:
  进入中继层补给药剂，补足到上限，扣除错误
  宝藏怪
```
zhouhaihai
2021-01-28 15:19:58 +0800
3c16709d Merge branch 'tr/bugfix-qa' into tr/publish/qa-out Browse Code »

熊润斐
2021-01-28 14:05:49 +0800
b3ca5d1f Merge branch 'tr/bugfix' into tr/bugfix-qa Browse Code »

熊润斐
2021-01-28 14:05:39 +0800
4c1418b6 Merge branch 'tr/bugfix-qa' into tr/publish/qa-out Browse Code »

熊润斐
2021-01-28 14:04:45 +0800
4122c3bd 进入中继层补给药剂，补足到上限，扣除错误 Browse Code »

chenyueqi
2021-01-28 13:56:25 +0800
8c422eee Merge branch 'tr/bugfix' into tr/publish/qa-out ... Browse Code »
```
* tr/bugfix:
  宝藏怪
```
zhouhaihai
2021-01-28 13:10:56 +0800
bb30b1c1 宝藏怪 Browse Code »

zhouhaihai
2021-01-28 13:10:22 +0800
4c553f28 Merge branch 'tr/bugfix-qa' into tr/publish/qa-out Browse Code »

熊润斐
2021-01-28 12:44:42 +0800

e1f521ec Merge branch 'tr/bugfix-qa' into tr/develop ... Browse Code »

* tr/bugfix-qa:
  清空背包gm
  修复拾荒结算时，返还药剂错误导致药水被吞的bug
  进入拾荒自动补给药水，按当前等级下的携带最大数量计算

2021-01-28 11:41:57 +0800

a5a2c706 Merge branch 'tr/bugfix-qa' of 120.26.43.151:wasteland/server into tr/bugfix-qa Browse Code »

liuzujun
2021-01-28 11:19:32 +0800
08af0de6 清空背包gm Browse Code »

liuzujun
2021-01-28 11:19:27 +0800
1b08afa7 修复拾荒结算时，返还药剂错误导致药水被吞的bug Browse Code »

chenyueqi
2021-01-28 10:48:58 +0800