wasteland / server | GitLab

07 Jan, 2021

3 commits

cb150aef Merge branch 'bugfix' into tr/publish ... Browse Code »
```
* bugfix:
  掉落活动配置最大掉落周期数
```
zhouhaihai
2021-01-07 17:11:38 +0800
6662e7d2 掉落活动配置最大掉落周期数 Browse Code »

liuzujun
2021-01-07 11:09:06 +0800
ff82181e Merge branch 'bugfix' into tr/publish Browse Code »

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

06 Jan, 2021

4 commits

b8d77233 拆解周活动跨轮数据异常bug Browse Code »

liuzujun
2021-01-06 21:03:42 +0800
e5c60a40 Merge branch 'bugfix' into tr/publish Browse Code »

熊润斐
2021-01-06 15:00:14 +0800
c7991bb0 道具开时钟箱，检查箱子够不够 Browse Code »

chenyueqi
2021-01-06 14:29:29 +0800
4ddd9baa Merge branch 'bugfix' into tr/publish Browse Code »

熊润斐
2021-01-06 09:52:41 +0800

05 Jan, 2021

5 commits

5b4db3a3 增加电台任务日志完成类型 Browse Code »

liuzujun
2021-01-05 20:40:22 +0800
57e52b3d 空的是nil Browse Code »

zhouhaihai
2021-01-05 19:30:14 +0800
ef0e04dd Merge branch 'bugfix' into tr/publish Browse Code »

熊润斐
2021-01-05 17:41:59 +0800
9e91460a appid Browse Code »

zhouhaihai
2021-01-05 16:50:34 +0800
1b555008 讨伐电台日志增加开始结束 Browse Code »

zhouhaihai
2021-01-05 15:52:36 +0800

04 Jan, 2021

1 commit

0a6fcddc log 发现的bug Browse Code »

zhouhaihai
2021-01-04 17:10:59 +0800

31 Dec, 2020

5 commits

0da2b316 Merge branch 'bugfix' into tr/publish ... Browse Code »
```
* bugfix:
  bug
  取消抽卡保底的保底次数默认值，因为有些卡池不需要保底
```
zhouhaihai
2020-12-31 18:00:58 +0800
4591e219 bug Browse Code »

zhouhaihai
2020-12-31 18:00:16 +0800
bb8c1d57 取消抽卡保底的保底次数默认值，因为有些卡池不需要保底 Browse Code »

liuzujun
2020-12-31 17:37:37 +0800

57a73438 Merge branch 'bugfix' into tr/publish ... Browse Code »

* bugfix:
  邮件
  活动奖励bug
  cb 返利调整
  世界boss 胜利才扣门票，扫荡根据之前的最大值给行动点
  任务
  付费签到规则改为按登录天数计算进度， 世界boss

2020-12-31 15:03:54 +0800

e1b5f6ec 邮件 Browse Code »

zhouhaihai
2020-12-31 15:02:38 +0800

30 Dec, 2020

4 commits

b47316e6 活动奖励bug Browse Code »

zhouhaihai
2020-12-30 16:51:45 +0800
91019d1f cb 返利调整 Browse Code »

zhouhaihai
2020-12-30 16:51:21 +0800
6a18cfa7 Merge branch 'bugfix' of 120.26.43.151:wasteland/server into bugfix Browse Code »

liuzujun
2020-12-30 16:15:09 +0800
34d9f192 世界boss 胜利才扣门票，扫荡根据之前的最大值给行动点 Browse Code »

liuzujun
2020-12-30 16:15:05 +0800

29 Dec, 2020

3 commits

56d52cf4 任务 Browse Code »

zhouhaihai
2020-12-29 20:14:51 +0800
54a82e42 Merge branch 'bugfix' of 120.26.43.151:wasteland/server into bugfix Browse Code »

liuzujun
2020-12-29 19:22:21 +0800
ede282c0 付费签到规则改为按登录天数计算进度，世界boss Browse Code »

liuzujun
2020-12-29 19:22:14 +0800

28 Dec, 2020

5 commits

ece07be5 Merge branch 'bugfix' into tr/publish Browse Code »

熊润斐
2020-12-28 20:55:53 +0800
c5e11ffc 解锁条件修改 Browse Code »

zhouhaihai
2020-12-28 20:50:49 +0800
1085e95a Merge branch 'bugfix' into tr/publish Browse Code »

熊润斐
2020-12-28 20:15:19 +0800
c8c76cda 活动卡池保底出指定英雄 Browse Code »

liuzujun
2020-12-28 10:43:17 +0800
cb8d4368 拆解术式充能的时候领取道具，获得个数计算错误 Browse Code »

chenyueqi
2020-12-28 10:16:48 +0800

25 Dec, 2020

9 commits

cd183b39 Merge branch 'bugfix' into tr/publish Browse Code »

熊润斐
2020-12-25 20:54:28 +0800
de1a55b4 新手卡池限制30抽 Browse Code »

liuzujun
2020-12-25 18:18:24 +0800
5bc3f172 pull csvdata Browse Code »

liuzujun
2020-12-25 17:23:45 +0800
fa2af595 给保底抽配置加默认值10 Browse Code »

liuzujun
2020-12-25 17:21:31 +0800
4eba3da0 Merge branch 'develop' into tr/publish ... Browse Code »
```
* develop:
  cb 返利
  重写拆解室功能
  去除globald中发放活动排行奖励
  支付bug
```
zhouhaihai
2020-12-25 11:44:55 +0800

fbd1b98c Merge branch 'bugfix' into develop ... Browse Code »

* bugfix:
  cb 返利
  重写拆解室功能
  去除globald中发放活动排行奖励
  支付bug

# Conflicts:
#	src/actions/RoleAction.lua

2020-12-25 11:44:43 +0800

1a31fdc6 Merge branch 'develop' into tr/publish ... Browse Code »
```
* develop:
  拆解室功能重写
  世界Boss 增加行动点
  世界boss翻牌奖励 活动卡池保底单独记录
```
zhouhaihai
2020-12-25 11:38:41 +0800
320f5b54 cb 返利 Browse Code »

zhouhaihai
2020-12-25 11:16:33 +0800
0a093ba8 重写拆解室功能 Browse Code »

chenyueqi
2020-12-25 09:29:50 +0800

24 Dec, 2020

1 commit

89760dbe 拆解室功能重写 Browse Code »

chenyueqi
2020-12-24 20:52:17 +0800