wasteland / server

04 Feb, 2021

2 commits

ee34955c Merge branch 'tr/bugfix' into tr/publish/preview ... Browse File »
```
* tr/bugfix:
  单位分
```
zhouhaihai
2021-02-04 20:04:43 +0800
668f23ea 单位分 Browse File »

zhouhaihai
2021-02-04 19:59:14 +0800

19 Jan, 2021

2 commits

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

熊润斐
2021-01-19 18:38:16 +0800
d19b2af3 活动免费礼包判断活动是否开启 Browse File »

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

25 Dec, 2020

1 commit

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

23 Dec, 2020

1 commit

eb5ffd1c 世界boss翻牌奖励活动卡池保底单独记录 Browse File »

liuzujun
2020-12-23 19:04:36 +0800

10 Dec, 2020

1 commit

4ae70ca2 Merge branch 'develop' into tr/publish Browse File »

熊润斐
2020-12-10 16:55:50 +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

2 commits

75f56020 Merge branch 'develop' into tr/publish ... Browse File »
```
# Conflicts:
#	config/nodenames.lua
```
熊润斐
2020-12-05 18:43:16 +0800
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

14 Sep, 2020

1 commit

073ba265 Merge branch 'develop' into tr/publish ... Browse File »

* develop:
  两个记录bug
  新设备
  遗失的log
  充值返利邮件新增
  调整压测
  error
  探索指令bug, 充值返利活动
  挂机打完困难20101才设定完成引导22
  挂机编队完成的时候服务器主动保存下一步引导，防止极端意外
  探索指令调试完成

2020-09-14 15:32:29 +0800

10 Sep, 2020

1 commit

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

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

09 Sep, 2020

6 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

252524fc Merge branch 'develop' into tr/publish ... Browse File »

* develop:
  日志bug
  修改每日礼包检测开启bug
  log缺失 ucode
  nokey
  修改引导， 抽卡阶段奖励修改
  gm增加跳过引导的命令 guide skip
  自己的日志
  自动挂机下一关
  去除日志
  拾荒引导拾取探险点后服务器设置当前引导步骤，而不是客户端指定
  付费签到，抽卡阶段奖励，探索指令
  自选箱子协议
  保底日志

2020-09-09 14:48:42 +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

7dba3b17 Merge branch 'develop' into tr/publish ... Browse File »

* develop:
  quest 增加定制
  bug
  一些 bug
  付费签到，应用市场反馈
  twd
  拾荒引导结束要设定引导步骤为成就引导
  返还
  冒险bug

2020-09-03 15:22:03 +0800

02 Sep, 2020

2 commits

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

liuzujun
2020-09-02 20:55:14 +0800
1ecdc048 屏蔽充值接口 Browse File »

zhouhaihai
2020-09-02 17:17:14 +0800

29 Aug, 2020

1 commit

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

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

26 Aug, 2020

2 commits

5bd12066 增加pay_url Browse File »

zhouhaihai
2020-08-26 21:05:15 +0800
88c6759a Merge branch 'develop' into tr/publish ... Browse File »
```
# Conflicts:
#	src/actions/HeroAction.lua
```
zhouhaihai
2020-08-26 10:21:33 +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

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

2 commits

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

liuzujun
2020-08-06 19:22:03 +0800
b08bbc1f 商城回调 Browse File »

zhouhaihai
2020-08-06 17:34:41 +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