wasteland / server | GitLab

20 Aug, 2020

2 commits

80b06009 充值开放 Browse Dir »

zhouhaihai
2020-08-20 20:09:11 +0800
f6b70d91 Merge branch 'temp' into player Browse Dir »

zhouhaihai
2020-08-20 19:56:44 +0800

15 Aug, 2020

1 commit

70aa8660 发送多天邮件bug Browse Dir »

liuzujun
2020-08-15 10:30:15 +0800

14 Aug, 2020

1 commit

024370be 双倍掉掉落bug Browse Dir »

liuzujun
2020-08-14 15:39:20 +0800

12 Aug, 2020

4 commits

aec0d74f 更新配置表 Browse Dir »

liuzujun
2020-08-12 17:52:18 +0800
9782bfc3 Merge branch 'develop' of 120.26.43.151:wasteland/server into develop Browse Dir »

liuzujun
2020-08-12 17:40:54 +0800
7f9f002d 循环周活动 Browse Dir »

liuzujun
2020-08-12 17:40:51 +0800
75614d9f 修改修改 ltime 时机 Browse Dir »

zhouhaihai
2020-08-12 10:51:20 +0800

11 Aug, 2020

1 commit

d9d51454 修改特权卡引用配置错误bug Browse Dir »

liuzujun
2020-08-11 11:11:20 +0800

10 Aug, 2020

2 commits

706b517e 翻倍掉落活动，商城免费宝箱 Browse Dir »

liuzujun
2020-08-10 21:05:30 +0800
fb3d084d 月卡赛季卡发送邮件奖励 Browse Dir »

liuzujun
2020-08-10 11:47:34 +0800

06 Aug, 2020

2 commits

1a0b3c56 抽卡保底，切换定向卡池 Browse Dir »

liuzujun
2020-08-06 19:22:03 +0800
71a18948 成就未生效 Browse Dir »

zhouhaihai
2020-08-06 09:51:31 +0800

05 Aug, 2020

3 commits

317a46a9 添加特权卡 Browse Dir »

liuzujun
2020-08-05 21:07:56 +0800
e68ee005 Merge code Browse Dir »

liuzujun
2020-08-05 11:17:18 +0800
3e20f499 完善商城相关协议 Browse Dir »

saicom
2020-08-05 11:08:01 +0800

04 Aug, 2020

5 commits

d6a66c74 校验失败也返回 Browse Dir »

zhouhaihai
2020-08-04 20:28:06 +0800
7bb30dca 修改发奖 Browse Dir »

zhouhaihai
2020-08-04 19:12:22 +0800
02abfcb2 update csvdata Browse Dir »

saicom
2020-08-04 11:07:57 +0800
3e5be8eb Merge branch 'develop' of 120.26.43.151:wasteland/server into develop Browse Dir »

saicom
2020-08-04 11:01:47 +0800
c5825110 新增用户商城相关数据 Browse Dir »

saicom
2020-08-04 11:01:23 +0800

03 Aug, 2020

10 commits

786b8a44 Merge branch 'taptap' into player Browse Dir »

zhouhaihai
2020-08-03 19:45:40 +0800
211382c3 保底未生效 Browse Dir »

zhouhaihai
2020-08-03 19:45:31 +0800
93b010f5 保底未生效 Browse Dir »

zhouhaihai
2020-08-03 19:44:32 +0800
27b8b57c Merge branch 'taptap' into player Browse Dir »

zhouhaihai
2020-08-03 19:31:41 +0800
cb8d5cf0 ssrup 修改规则 ... Browse Dir »
```
(cherry picked from commit 97f5a8df42abe10e5a6775726dbb3806d3c5de28)
```
zhouhaihai
2020-08-03 19:30:58 +0800
a2f11550 完善道具转换 ... Browse Dir »
```
(cherry picked from commit a7b69ec296f42f49a6cc6e6b1d7c715af2bb34f5)
```
zhouhaihai
2020-08-03 19:30:58 +0800
97f5a8df ssrup 修改规则 Browse Dir »

zhouhaihai
2020-08-03 19:28:56 +0800
e63957d5 引导招募，临时改成对单抽生效，防止满屏都是丝路德 Browse Dir »

chenyueqi
2020-08-03 19:23:17 +0800
a7b69ec2 完善道具转换 Browse Dir »

zhouhaihai
2020-08-03 18:02:04 +0800
77b54f12 中心服录像上传 Browse Dir »

zhouhaihai
2020-08-03 14:50:54 +0800

01 Aug, 2020

5 commits

733419d0 Merge branch 'taptap' into player Browse Dir »

zhouhaihai
2020-08-01 17:29:55 +0800
4293d998 冒险次数bug Browse Dir »

zhouhaihai
2020-08-01 17:29:42 +0800
5a7e4d88 自定义维护公告 Browse Dir »

zhouhaihai
2020-08-01 17:28:56 +0800
92ef9591 冒险次数 Browse Dir »

zhouhaihai
2020-08-01 17:28:27 +0800
1fd96b9f 冒险次数返还 Browse Dir »

zhouhaihai
2020-08-01 16:36:32 +0800

31 Jul, 2020

3 commits

19b44745 被动触发 Browse Dir »

zhouhaihai
2020-07-31 15:14:50 +0800
bd06891b Merge branch 'taptap' into player ... Browse Dir »
```
# Conflicts:
#	src/config
```
zhouhaihai
2020-07-31 13:36:00 +0800
22ef22a5 移除建筑 Browse Dir »

zhouhaihai
2020-07-31 12:00:03 +0800

30 Jul, 2020

1 commit

39e60fd1 支持上传 oss Browse Dir »

zhouhaihai
2020-07-30 20:58:48 +0800