wasteland / server

21 Jan, 2021

7 commits

4b648246 Merge branch 'tr/publish/release' of 120.26.43.151:wasteland/server into tr/publish/release ... Browse Code »
```
* 'tr/publish/release' of 120.26.43.151:wasteland/server:
```
zhouhaihai
2021-01-21 12:55:25 +0800

a8e6aef7 Merge branch 'tr/bugfix' into tr/publish/release ... Browse Code »

* tr/bugfix:
  输出删掉
  登入刷新兑换活动商店
  兑换活动上线检测是否需要刷新
  修复存在的冒险进不去的玩家
  兑换商店不刷新bug
  新增倍数
  bugfix
  同单号充值输出
  relay
  修改中继营地解锁条件
  防作弊
  活动战斗结束不发送战斗奖励
  活动免费礼包判断活动是否开启

# Conflicts:
#	src/csvdata

2021-01-21 12:55:16 +0800

b2de779a 输出删掉 Browse Code »

zhouhaihai
2021-01-21 12:54:08 +0800
7245bc4b 登入刷新兑换活动商店 Browse Code »

liuzujun
2021-01-21 11:38:53 +0800
a6898231 兑换活动上线检测是否需要刷新 Browse Code »

liuzujun
2021-01-21 11:03:49 +0800
67b46a6b 修复存在的冒险进不去的玩家 Browse Code »

zhouhaihai
2021-01-21 10:47:20 +0800
16f58f21 兑换商店不刷新bug Browse Code »

liuzujun
2021-01-21 10:14:08 +0800

20 Jan, 2021

5 commits

73d683e6 新增倍数 Browse Code »

zhouhaihai
2021-01-20 20:48:50 +0800
47c6253a bugfix Browse Code »

zhouhaihai
2021-01-20 20:44:34 +0800
d778335c 同单号充值输出 Browse Code »

zhouhaihai
2021-01-20 19:57:42 +0800
a3062f0d relay Browse Code »

zhouhaihai
2021-01-20 16:17:13 +0800
f2648427 修改中继营地解锁条件 Browse Code »

zhouhaihai
2021-01-20 16:12:18 +0800

19 Jan, 2021

5 commits

af1ad896 Merge branch 'tr/bugfix' into tr/publish/release ... Browse Code »
```
# Conflicts:
#	src/csvdata
```
熊润斐
2021-01-19 19:59:32 +0800
edf2ee12 防作弊 Browse Code »

zhouhaihai
2021-01-19 19:56:38 +0800
1c1ea691 活动战斗结束不发送战斗奖励 Browse Code »

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

liuzujun
2021-01-19 16:46:46 +0800
a42753c3 关闭 gm Browse Code »

zhouhaihai
2021-01-19 11:32:14 +0800

18 Jan, 2021

8 commits

3666c3fa Merge branch 'tr/bugfix' into tr/publish/release ... Browse Code »

* tr/bugfix:
  计算英雄战斗力，天赋，信赖
  错误的
  多队挂机 电台任务英雄也不能重用
  冒险次数
  取消特权卡餐厅加速获得额外道具功能

# Conflicts:
#	src/csvdata

2021-01-18 21:24:53 +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
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

1791bbc5 Merge branch 'tr/bugfix' into tr/publish/release ... Browse Code »
```
* tr/bugfix:
  铭文属性问题
```
zhouhaihai
2021-01-16 18:39:09 +0800
e6f9669a 铭文属性问题 Browse Code »

zhouhaihai
2021-01-16 18:36:41 +0800
c361c7c3 Merge branch 'tr/bugfix' into tr/publish/release ... Browse Code »
```
* tr/bugfix:
  返还bug
```
zhouhaihai
2021-01-16 15:12:35 +0800
0e96d6f4 返还bug Browse Code »

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

15 Jan, 2021

11 commits

18ab94e5 Merge branch 'tr/bugfix' into tr/publish/release ... Browse Code »

* tr/bugfix:
  切换拆解术式bug，造成获得巨大数量的物品
  or
  global
  email
  添加新的延時類型郵件

# Conflicts:
#	src/csvdata

2021-01-15 18:53:25 +0800

4aadc450 切换拆解术式bug，造成获得巨大数量的物品 Browse Code »

chenyueqi
2021-01-15 17:57:10 +0800
1fc9c12a or Browse Code »

zhouhaihai
2021-01-15 17:32:42 +0800
017184f4 global Browse Code »

zhouhaihai
2021-01-15 17:09:40 +0800
3f935a99 email Browse Code »

zhouhaihai
2021-01-15 17:02:53 +0800
62ed4275 添加新的延時類型郵件 Browse Code »

liuzujun
2021-01-15 16:26:33 +0800
0a22a374 Merge branch 'tr/bugfix' into tr/publish/release ... Browse Code »
```
* tr/bugfix:
  发送邮件清标记

# Conflicts:
#	src/csvdata
```
zhouhaihai
2021-01-15 13:07:10 +0800
0d892cdf 发送邮件清标记 Browse Code »

liuzujun
2021-01-15 13:05:51 +0800
9587d70a Merge branch 'tr/bugfix' into tr/publish/release ... Browse Code »
```
* tr/bugfix:
  活动卡池回馈数量丢失Bug

# Conflicts:
#	src/csvdata
```
zhouhaihai
2021-01-15 12:41:43 +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