wasteland / server | GitLab

28 Jan, 2021

9 commits

a09c8240 Merge branch 'tr/bugfix' into tr/publish/preview ... Browse Code »
```
* tr/bugfix:
  活动结束回收邮件
  宝藏怪
```
zhouhaihai
2021-01-28 16:16:03 +0800
fb344e8a 活动结束回收邮件 Browse Code »

liuzujun
2021-01-28 15:57:43 +0800
bb30b1c1 宝藏怪 Browse Code »

zhouhaihai
2021-01-28 13:10:22 +0800
a6ff70d0 Merge branch 'tr/bugfix' into tr/publish/preview ... Browse Code »
```
* tr/bugfix:
  清空背包gm
  修复拾荒结算时，返还药剂错误导致药水被吞的bug
```
zhouhaihai
2021-01-28 11:39:32 +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
0246a6a6 Merge branch 'tr/bugfix-qa' into tr/publish/preview Browse Code »

熊润斐
2021-01-28 10:31:13 +0800
c32be356 进入拾荒自动补给药水，按当前等级下的携带最大数量计算 Browse Code »

chenyueqi
2021-01-28 10:24:06 +0800

27 Jan, 2021

1 commit

c7a8e254 Merge branch 'tr/bugfix-qa' into tr/publish/preview Browse Code »

熊润斐
2021-01-27 21:42:58 +0800

26 Jan, 2021

1 commit

7cd7fd53 Merge branch 'tr/bugfix' into tr/bugfix-qa ... Browse Code »
```
# Conflicts:
#	src/csvdata
```
熊润斐
2021-01-26 12:10:48 +0800

25 Jan, 2021

8 commits

6e2961fa 获得所有SSR 且满级满觉醒同时获得全部满级金色铭文满精进 Browse Code »

liuzujun
2021-01-25 20:33:06 +0800
2bf99d62 充值mycard Browse Code »

zhouhaihai
2021-01-25 17:38:22 +0800
3cb54d05 Merge branch 'tr/bugfix' into tr/publish/preview ... Browse Code »
```
* tr/bugfix:
  拾荒bug
  无论什么方式翻开中继层格子都给奖励
  跨天礼包重置
```
zhouhaihai
2021-01-25 14:57:03 +0800
70cc72d7 拾荒bug Browse Code »

zhouhaihai
2021-01-25 14:52:57 +0800
1d724b8b pvp 匹配和失败扣减积分 Browse Code »

zhouhaihai
2021-01-25 11:26:13 +0800

6d25be1b Merge branch 'tr/bugfix' into tr/bugfix-qa ... Browse Code »

* tr/bugfix:
  无论什么方式翻开中继层格子都给奖励
  跨天礼包重置
  月重置
  跨月
  拾荒 失败也记录积分
  编队
  世界聊天等级15判断

# Conflicts:
#	src/csvdata

2021-01-25 11:22:39 +0800

ab4aa967 无论什么方式翻开中继层格子都给奖励 Browse Code »

zhouhaihai
2021-01-25 11:03:02 +0800
10020df6 跨天礼包重置 Browse Code »

zhouhaihai
2021-01-25 09:59:06 +0800

23 Jan, 2021

8 commits

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

熊润斐
2021-01-23 18:05:43 +0800
a27e74bf 月重置 Browse Code »

zhouhaihai
2021-01-23 17:46:12 +0800
da5a0f8e Merge branch 'tr/bugfix' into tr/publish/preview Browse Code »

熊润斐
2021-01-23 16:26:14 +0800
ff692d37 跨月 Browse Code »

zhouhaihai
2021-01-23 16:19:58 +0800
9f135969 拾荒失败也记录积分 Browse Code »

zhouhaihai
2021-01-23 15:18:19 +0800
794d3902 Merge branch 'tr/bugfix' into tr/publish/preview Browse Code »

熊润斐
2021-01-23 15:07:32 +0800
607b1031 编队 Browse Code »

zhouhaihai
2021-01-23 11:10:21 +0800
f30a310d 世界聊天等级15判断 Browse Code »

liuzujun
2021-01-23 09:56:40 +0800

22 Jan, 2021

7 commits

a25b4535 fix conflict Browse Code »

liuzujun
2021-01-22 15:58:05 +0800
0285ef6c 活动卡池结束回馈次数通关邮件折算碎片功能注释 Browse Code »

liuzujun
2021-01-22 15:56:18 +0800
3e5f46ca Merge branch 'tr/bugfix' of 120.26.43.151:wasteland/server into tr/bugfix Browse Code »

liuzujun
2021-01-22 15:52:51 +0800
0c54995a 第一次通关拾荒章节推送限时礼包，活动卡池结束回馈次数通关邮件折算碎片 Browse Code »

liuzujun
2021-01-22 15:52:47 +0800
5a8b84a1 Merge branch 'tr/bugfix' into tr/bugfix-qa ... Browse Code »
```
* tr/bugfix:
  可能的报错点
  结算正常
  删除自动封号
  输出删掉
```
zhouhaihai
2021-01-22 14:15:51 +0800
4083e99a 可能的报错点 Browse Code »

zhouhaihai
2021-01-22 14:02:42 +0800
3ffe6116 Merge branch 'tr/bugfix' into tr/publish/preview Browse Code »

熊润斐
2021-01-22 12:21:41 +0800

21 Jan, 2021

6 commits

6a59245c 结算正常 Browse Code »

zhouhaihai
2021-01-21 20:45:13 +0800
f82b9dc2 删除自动封号 Browse Code »

zhouhaihai
2021-01-21 20:39:54 +0800
7207df97 Merge branch 'tr/bugfix' into tr/publish/preview ... Browse Code »
```
* tr/bugfix:
  输出删掉
```
zhouhaihai
2021-01-21 12:54:51 +0800
b2de779a 输出删掉 Browse Code »

zhouhaihai
2021-01-21 12:54:08 +0800
f0272ad8 Merge branch 'tr/bugfix' into tr/publish/preview Browse Code »

熊润斐
2021-01-21 11:46:45 +0800
2e611bcf Merge branch 'tr/bugfix' into tr/bugfix-qa ... Browse Code »
```
* tr/bugfix:
  登入刷新兑换活动商店
```
liuzujun
2021-01-21 11:39:09 +0800