wasteland / server | GitLab

10 Dec, 2020

1 commit

8e1a3c42 Merge branch 'develop' into player ... Browse File »
```
# Conflicts:
#	config/develop.lua
#	config/nodenames.lua
```
熊润斐
2020-12-10 19:20:45 +0800

08 Dec, 2020

1 commit

2bc706ab 兑换活动重置，累充功能 Browse File »

liuzujun
2020-12-08 16:55:14 +0800

07 Dec, 2020

1 commit

b8b1c164 扭蛋活动，万能碎片bug Browse File »

liuzujun
2020-12-07 16:54:18 +0800

05 Dec, 2020

1 commit

4f7cffe5 多队挂机任务取消功能，累充奖励 Browse File »

liuzujun
2020-12-05 16:58:20 +0800

20 Nov, 2020

2 commits

ffb3e2c5 支付bug Browse File »

zhouhaihai
2020-11-20 20:06:48 +0800
d705a315 充值整理 Browse File »

zhouhaihai
2020-11-20 18:01:18 +0800

06 Nov, 2020

1 commit

3a3a3ddf 下单前检测商品限购次数 Browse File »

liuzujun
2020-11-06 21:04:18 +0800

23 Sep, 2020

1 commit

5f3dd3f8 Merge branch 'bugfix' into player ... Browse File »

* bugfix: (53 commits)
  成就 参数错误
  3星解锁 cg
  增加神器标签
  初始化冒险重置时间
  被动新
  扣层数
  被动 取消
  引导用到的剧情的奖励可以直接领
  调整顺序
  签到成就
  充值返利邮件内容优化
  奖励关卡活动未开启导致Bug
  每周循环任务bug
  运营需要
  屏蔽字 优化
  优化
  充值返利邮件档位排序
  伤害错误
  反的判断
  返利邮件拼接充值档位
  ...

2020-09-23 19:32:19 +0800

10 Sep, 2020

1 commit

e52c384f 探索指令bug, 充值返利活动 Browse File »

liuzujun
2020-09-10 17:23:20 +0800

09 Sep, 2020

5 commits

66347c66 Merge branch 'develop' of 120.26.43.151:wasteland/server into develop Browse File »

liuzujun
2020-09-09 16:38:44 +0800
c99f08df 探索指令调试完成 Browse File »

liuzujun
2020-09-09 16:38:41 +0800
f49ec714 Merge branch 'develop' of 120.26.43.151:wasteland/server into develop ... Browse File »
```
* 'develop' of 120.26.43.151:wasteland/server:
  修改每日礼包检测开启bug
```
zhouhaihai
2020-09-09 14:41:27 +0800
43293781 日志bug Browse File »

zhouhaihai
2020-09-09 14:41:17 +0800
c72853af 修改每日礼包检测开启bug Browse File »

liuzujun
2020-09-09 14:37:48 +0800

08 Sep, 2020

1 commit

f22a33af 自己的日志 Browse File »

zhouhaihai
2020-09-08 14:11:33 +0800

04 Sep, 2020

1 commit

37bb4611 付费签到，抽卡阶段奖励，探索指令 Browse File »

liuzujun
2020-09-04 17:17:40 +0800

03 Sep, 2020

1 commit

91bf6546 Merge branch 'develop' into player ... Browse File »
```
* develop:
  bug
  一些 bug
  付费签到，应用市场反馈
```
zhouhaihai
2020-09-03 14:33:03 +0800

02 Sep, 2020

2 commits

51d9d20b 付费签到，应用市场反馈 Browse File »

liuzujun
2020-09-02 20:55:14 +0800
e3954226 充值没反应 Browse File »

zhouhaihai
2020-09-02 17:13:53 +0800

29 Aug, 2020

1 commit

ba84f3c7 签名回调地址由客户端上传 Browse File »

zhouhaihai
2020-08-29 15:40:15 +0800

26 Aug, 2020

1 commit

5bd12066 增加pay_url Browse File »

zhouhaihai
2020-08-26 21:05:15 +0800

24 Aug, 2020

1 commit

c59e058b 新一批日志记录 Browse File »

zhouhaihai
2020-08-24 14:33:44 +0800

21 Aug, 2020

1 commit

39bcd7ca LOG Browse File »

zhouhaihai
2020-08-21 14:41:10 +0800

20 Aug, 2020

2 commits

80b06009 充值开放 Browse File »

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

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

17 Aug, 2020

1 commit

9ea0c502 限时礼包 Browse File »

liuzujun
2020-08-17 20:57:12 +0800

12 Aug, 2020

1 commit

7f9f002d 循环周活动 Browse File »

liuzujun
2020-08-12 17:40:51 +0800

10 Aug, 2020

2 commits

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

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

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

06 Aug, 2020

1 commit

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

liuzujun
2020-08-06 19:22:03 +0800

05 Aug, 2020

2 commits

317a46a9 添加特权卡 Browse File »

liuzujun
2020-08-05 21:07:56 +0800
3e20f499 完善商城相关协议 Browse File »

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

04 Aug, 2020

1 commit

c5825110 新增用户商城相关数据 Browse File »

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

31 Jul, 2020

1 commit

bd06891b Merge branch 'taptap' into player ... Browse File »
```
# Conflicts:
#	src/config
```
zhouhaihai
2020-07-31 13:36:00 +0800

28 Jul, 2020

1 commit

7228c195 商城购买 Browse File »

zhouhaihai
2020-07-28 19:44:45 +0800

08 Jul, 2020

1 commit

5d51be8b Merge branch 'develop' into player Browse File »

zhouhaihai
2020-07-08 10:28:12 +0800

06 Jul, 2020

2 commits

3ab906d5 重置项目 Browse File »

zhouhaihai
2020-07-06 11:52:39 +0800
f9f877b1 商店 Browse File »

zhouhaihai
2020-07-06 11:51:13 +0800

24 Jun, 2020

1 commit

377a0dae Merge branch 'develop' into player Browse File »

zhouhaihai
2020-06-24 17:33:19 +0800

23 Jun, 2020

1 commit

d284e3ee 商店扣除错误 Browse File »

zhouhaihai
2020-06-23 10:06:15 +0800