wasteland / server | GitLab

19 Jan, 2021

3 commits

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

熊润斐
2021-01-19 18:38:16 +0800
1c1ea691 活动战斗结束不发送战斗奖励 Browse Code »

liuzujun
2021-01-19 17:25:27 +0800
d19b2af3 活动免费礼包判断活动是否开启 Browse Code »

liuzujun
2021-01-19 16:46:46 +0800

18 Jan, 2021

11 commits

895903a9 Merge branch 'tr/publish/preview' of 120.26.43.151:wasteland/server into tr/publish/preview Browse Code »

熊润斐
2021-01-18 21:24:49 +0800
21fc00c6 Merge branch 'tr/bugfix' into tr/publish/preview Browse Code »

熊润斐
2021-01-18 21:24:38 +0800
8342ad38 Merge branch 'tr/bugfix' into tr/publish/preview ... Browse Code »
```
* tr/bugfix:
  计算英雄战斗力，天赋，信赖
  错误的
```
zhouhaihai
2021-01-18 21:23:57 +0800
b021e351 Merge branch 'tr/bugfix' of 120.26.43.151:wasteland/server into tr/bugfix Browse Code »

liuzujun
2021-01-18 21:19:11 +0800
63190722 计算英雄战斗力，天赋，信赖 Browse Code »

liuzujun
2021-01-18 21:19:09 +0800
1ef9a7e3 错误的 Browse Code »

zhouhaihai
2021-01-18 20:41:26 +0800
876d9fbd Merge branch 'tr/bugfix' into tr/publish/preview Browse Code »

熊润斐
2021-01-18 19:18:52 +0800
251b105a Merge branch 'tr/bugfix' of 120.26.43.151:wasteland/server into tr/bugfix Browse Code »

liuzujun
2021-01-18 17:05:21 +0800
a1d80fd6 多队挂机电台任务英雄也不能重用 Browse Code »

liuzujun
2021-01-18 17:05:11 +0800
3bbb90ba 冒险次数 Browse Code »

zhouhaihai
2021-01-18 15:37:07 +0800
e089be2e 取消特权卡餐厅加速获得额外道具功能 Browse Code »

liuzujun
2021-01-18 14:51:14 +0800

16 Jan, 2021

4 commits

ef70cd75 Merge branch 'tr/bugfix' into tr/publish/preview ... Browse Code »
```
* tr/bugfix:
  铭文属性问题
```
zhouhaihai
2021-01-16 18:38:51 +0800
e6f9669a 铭文属性问题 Browse Code »

zhouhaihai
2021-01-16 18:36:41 +0800
c4ca1352 Merge branch 'tr/bugfix' into tr/publish/preview ... Browse Code »
```
* tr/bugfix:
  返还bug
```
zhouhaihai
2021-01-16 14:57:49 +0800
0e96d6f4 返还bug Browse Code »

zhouhaihai
2021-01-16 14:40:26 +0800

15 Jan, 2021

17 commits

a616da05 Merge branch 'tr/bugfix' into tr/publish/preview ... Browse Code »
```
* tr/bugfix:
  切换拆解术式bug，造成获得巨大数量的物品
```
zhouhaihai
2021-01-15 18:21:28 +0800
4aadc450 切换拆解术式bug，造成获得巨大数量的物品 Browse Code »

chenyueqi
2021-01-15 17:57:10 +0800
83435eaa Merge branch 'tr/bugfix' into tr/publish/preview ... Browse Code »
```
* tr/bugfix:
  or
```
zhouhaihai
2021-01-15 17:32:50 +0800
1fc9c12a or Browse Code »

zhouhaihai
2021-01-15 17:32:42 +0800
ee24285d Merge branch 'tr/bugfix' into tr/publish/preview ... Browse Code »
```
* tr/bugfix:
  global
```
zhouhaihai
2021-01-15 17:10:20 +0800
017184f4 global Browse Code »

zhouhaihai
2021-01-15 17:09:40 +0800
96c3f7d4 Merge branch 'tr/bugfix' into tr/publish/preview ... Browse Code »
```
* tr/bugfix:
  email
```
zhouhaihai
2021-01-15 17:03:05 +0800
3f935a99 email Browse Code »

zhouhaihai
2021-01-15 17:02:53 +0800
f8be6c7e Merge branch 'tr/bugfix' into tr/publish/preview ... Browse Code »
```
* tr/bugfix:
  添加新的延時類型郵件
```
zhouhaihai
2021-01-15 16:41:11 +0800
62ed4275 添加新的延時類型郵件 Browse Code »

liuzujun
2021-01-15 16:26:33 +0800
e0ea7af2 Merge branch 'tr/bugfix' into tr/publish/preview ... Browse Code »
```
* tr/bugfix:
  发送邮件清标记
```
zhouhaihai
2021-01-15 13:06:48 +0800
0d892cdf 发送邮件清标记 Browse Code »

liuzujun
2021-01-15 13:05:51 +0800
a372ab83 Merge branch 'tr/bugfix' into tr/publish/preview ... Browse Code »
```
* tr/bugfix:
  活动卡池回馈数量丢失Bug
```
zhouhaihai
2021-01-15 12:41:19 +0800
052ae144 Merge branch 'tr/bugfix' of 120.26.43.151:wasteland/server into tr/bugfix Browse Code »

liuzujun
2021-01-15 12:09:15 +0800
6354fd74 活动卡池回馈数量丢失Bug Browse Code »

liuzujun
2021-01-15 12:09:11 +0800
cfa30cf8 Merge branch 'tr/bugfix' into tr/publish/preview ... Browse Code »
```
* tr/bugfix:
  手抽英雄只奖励一个
```
zhouhaihai
2021-01-15 01:36:44 +0800
7125137e 手抽英雄只奖励一个 Browse Code »

chenyueqi
2021-01-15 01:32:20 +0800

13 Jan, 2021

5 commits

8a75396a Merge branch 'tr/bugfix' into tr/publish/preview ... Browse Code »
```
* tr/bugfix:
  奖励内容错误
```
zhouhaihai
2021-01-13 21:24:07 +0800
40dd5057 奖励内容错误 Browse Code »

zhouhaihai
2021-01-13 21:23:27 +0800
eced97f2 Merge branch 'tr/bugfix' into tr/publish/preview ... Browse Code »
```
* tr/bugfix:
  跨服竞技场
```
zhouhaihai
2021-01-13 11:49:22 +0800
69a45034 跨服竞技场 Browse Code »

zhouhaihai
2021-01-13 11:46:46 +0800
f030dacd Merge branch 'tr/bugfix' into tr/publish/preview Browse Code »

熊润斐
2021-01-13 10:03:57 +0800