wasteland / server | GitLab

18 Sep, 2020

2 commits

06056f64 Merge branch 'bugfix' into tr/publish ... Browse Code »
```
* bugfix:
  引导用到的剧情的奖励可以直接领
```
熊润斐
2020-09-18 18:23:53 +0800
c23734ee 引导用到的剧情的奖励可以直接领 Browse Code »

chenyueqi
2020-09-18 14:24:26 +0800

17 Sep, 2020

17 commits

9ffa5949 Merge branch 'bugfix' into tr/publish ... Browse Code »
```
* bugfix:
  调整顺序
  签到成就
```
zhouhaihai
2020-09-17 21:02:44 +0800
f0aff632 调整顺序 Browse Code »

zhouhaihai
2020-09-17 20:46:23 +0800
e7806e6f 签到成就 Browse Code »

zhouhaihai
2020-09-17 20:41:32 +0800
8193e07b Merge branch 'bugfix' into tr/publish ... Browse Code »
```
* bugfix:
  充值返利邮件内容优化
```
熊润斐
2020-09-17 20:16:43 +0800
1cfe4c75 充值返利邮件内容优化 Browse Code »

liuzujun
2020-09-17 19:27:47 +0800
8abfe8d3 Merge branch 'bugfix' into tr/publish ... Browse Code »
```
* bugfix:
  奖励关卡活动未开启导致Bug
  每周循环任务bug
```
熊润斐
2020-09-17 17:57:45 +0800
a526f9ef 奖励关卡活动未开启导致Bug Browse Code »

liuzujun
2020-09-17 17:16:49 +0800
ee021c58 每周循环任务bug Browse Code »

liuzujun
2020-09-17 16:55:49 +0800
58371494 Merge branch 'bugFix' into tr/publish ... Browse Code »
```
* bugFix:
  运营需要
  屏蔽字 优化
```
熊润斐
2020-09-17 14:46:40 +0800
2f7891b4 运营需要 Browse Code »

zhouhaihai
2020-09-17 14:23:50 +0800
10ea6c0f 屏蔽字优化 Browse Code »

zhouhaihai
2020-09-17 12:10:47 +0800

003806dc Merge branch 'bugfix' into tr/publish ... Browse Code »

* bugfix:
  优化
  充值返利邮件档位排序
  伤害错误
  反的判断
  返利邮件拼接充值档位
  bug
  buff  被动 限定地图

2020-09-17 11:00:17 +0800

8e524d41 优化 Browse Code »

zhouhaihai
2020-09-17 10:59:15 +0800
d92cda58 Merge branch 'bugfix' of 120.26.43.151:wasteland/server into bugfix Browse Code »

liuzujun
2020-09-17 10:26:03 +0800
56d191ec 充值返利邮件档位排序 Browse Code »

liuzujun
2020-09-17 10:26:01 +0800
294408d9 伤害错误 Browse Code »

zhouhaihai
2020-09-17 10:07:54 +0800
e0c0365a 反的判断 Browse Code »

zhouhaihai
2020-09-17 09:56:43 +0800

16 Sep, 2020

10 commits

8dc7d93a Merge branch 'bugfix' of 120.26.43.151:wasteland/server into bugfix Browse Code »

liuzujun
2020-09-16 21:22:28 +0800
4709685d 返利邮件拼接充值档位 Browse Code »

liuzujun
2020-09-16 21:22:24 +0800
46eaa47a bug Browse Code »

zhouhaihai
2020-09-16 21:12:11 +0800
9c8e9482 buff 被动限定地图 Browse Code »

zhouhaihai
2020-09-16 20:35:15 +0800
00178a01 Merge branch 'bugfix' into tr/publish ... Browse Code »
```
* bugfix:
  活动以类型标识，修改双倍活动bug
  伤害计算
  数据保护
  数据保护
```
zhouhaihai
2020-09-16 17:49:40 +0800
44d8a134 Merge branch 'develop' of 120.26.43.151:wasteland/server into develop Browse Code »

liuzujun
2020-09-16 17:46:54 +0800
accf94c4 活动以类型标识，修改双倍活动bug Browse Code »

liuzujun
2020-09-16 17:46:48 +0800
6df85179 伤害计算 Browse Code »

zhouhaihai
2020-09-16 14:40:37 +0800
d02368d3 数据保护 Browse Code »

zhouhaihai
2020-09-16 14:12:21 +0800
0719a220 数据保护 Browse Code »

zhouhaihai
2020-09-16 14:10:35 +0800

15 Sep, 2020

4 commits

3e4079d9 Merge branch 'develop' into tr/publish Browse Code »

熊润斐
2020-09-15 17:20:03 +0800
c888fcc3 充值 gm Browse Code »

zhouhaihai
2020-09-15 17:14:34 +0800
59926d8f 结算rmb Browse Code »

zhouhaihai
2020-09-15 16:55:36 +0800
59a88b80 客户端要用到角色创建时间 Browse Code »

chenyueqi
2020-09-15 15:18:27 +0800

14 Sep, 2020

2 commits

073ba265 Merge branch 'develop' into tr/publish ... Browse Code »

* develop:
  两个记录bug
  新设备
  遗失的log
  充值返利邮件新增
  调整压测
  error
  探索指令bug, 充值返利活动
  挂机打完困难20101才设定完成引导22
  挂机编队完成的时候服务器主动保存下一步引导，防止极端意外
  探索指令调试完成

2020-09-14 15:32:29 +0800

fcf03f75 两个记录bug Browse Code »

zhouhaihai
2020-09-14 11:44:26 +0800

12 Sep, 2020

2 commits

3aac1e3a 新设备 Browse Code »

zhouhaihai
2020-09-12 14:42:27 +0800
d02f7904 遗失的log Browse Code »

zhouhaihai
2020-09-12 10:58:54 +0800

11 Sep, 2020

3 commits

d825d304 Merge branch 'develop' of 120.26.43.151:wasteland/server into develop Browse Code »

liuzujun
2020-09-11 19:13:43 +0800
df0c8718 充值返利邮件新增 Browse Code »

liuzujun
2020-09-11 19:13:37 +0800
7d31daa8 调整压测 Browse Code »

zhouhaihai
2020-09-11 14:40:39 +0800