wasteland / server

09 Sep, 2020

4 commits

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

* 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 Dir »
```
* 'develop' of 120.26.43.151:wasteland/server:
  修改每日礼包检测开启bug
```
zhouhaihai
2020-09-09 14:41:27 +0800
43293781 日志bug Browse Dir »

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

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

08 Sep, 2020

4 commits

e30b047e Merge branch 'develop' of 120.26.43.151:wasteland/server into develop Browse Dir »

liuzujun
2020-09-08 20:07:57 +0800
e0290d8e 修改引导，抽卡阶段奖励修改 Browse Dir »

liuzujun
2020-09-08 20:07:52 +0800
c3f578ac gm增加跳过引导的命令 guide skip Browse Dir »

chenyueqi
2020-09-08 16:20:51 +0800
f22a33af 自己的日志 Browse Dir »

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

07 Sep, 2020

1 commit

53b4b8bd 自动挂机下一关 Browse Dir »

liuzujun
2020-09-07 20:06:04 +0800

04 Sep, 2020

2 commits

241f5e76 去除日志 Browse Dir »

liuzujun
2020-09-04 18:01:42 +0800
37bb4611 付费签到，抽卡阶段奖励，探索指令 Browse Dir »

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

03 Sep, 2020

5 commits

74f2395e Merge branch 'develop' of 120.26.43.151:wasteland/server into develop Browse Dir »

liuzujun
2020-09-03 20:26:03 +0800
a6dc627f 自选箱子协议 Browse Dir »

liuzujun
2020-09-03 20:25:58 +0800
b5481708 保底日志 Browse Dir »

zhouhaihai
2020-09-03 16:26:06 +0800

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

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

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

b8c1be12 一些 bug Browse Dir »

zhouhaihai
2020-09-03 13:54:41 +0800

02 Sep, 2020

4 commits

5bc88864 Merge branch 'develop' of 120.26.43.151:wasteland/server into develop Browse Dir »

liuzujun
2020-09-02 20:55:17 +0800
51d9d20b 付费签到，应用市场反馈 Browse Dir »

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

zhouhaihai
2020-09-02 17:17:14 +0800
0c90a4f4 拾荒引导结束要设定引导步骤为成就引导 Browse Dir »

chenyueqi
2020-09-02 16:13:32 +0800

01 Sep, 2020

1 commit

c3a70cde 返还 Browse Dir »

zhouhaihai
2020-09-01 19:48:21 +0800

29 Aug, 2020

1 commit

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

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

28 Aug, 2020

3 commits

f58b315e 停止注册 Browse Dir »

zhouhaihai
2020-08-28 20:31:42 +0800
2d21f527 Merge branch 'develop' of 120.26.43.151:wasteland/server into develop Browse Dir »

liuzujun
2020-08-28 17:16:31 +0800
56c7a1c5 修改报错，下载cv奖励记录字段 Browse Dir »

liuzujun
2020-08-28 17:16:27 +0800

26 Aug, 2020

9 commits

5bd12066 增加pay_url Browse Dir »

zhouhaihai
2020-08-26 21:05:15 +0800
5132bac1 挂机选定关卡时，指定新手引导步骤 Browse Dir »

chenyueqi
2020-08-26 17:59:12 +0800
ca55c763 引导招募必送思露德判定出了大问题 Browse Dir »

chenyueqi
2020-08-26 17:28:17 +0800
d4e9b817 战斗日志 Browse Dir »

zhouhaihai
2020-08-26 16:44:51 +0800
286c980a 挂机战斗胜利才触发对应的引导 Browse Dir »

chenyueqi
2020-08-26 14:54:59 +0800
4c7d396c 不回复更改看板娘 Browse Dir »

zhouhaihai
2020-08-26 14:40:39 +0800
3efc352e 增加记录log Browse Dir »

zhouhaihai
2020-08-26 14:27:18 +0800
88c6759a Merge branch 'develop' into tr/publish ... Browse Dir »
```
# Conflicts:
#	src/actions/HeroAction.lua
```
zhouhaihai
2020-08-26 10:21:33 +0800
d43246b0 log 增加 Browse Dir »

zhouhaihai
2020-08-26 10:19:52 +0800

25 Aug, 2020

6 commits

4b903052 触发神器引导的代码移到发奖励的方法里 Browse Dir »

chenyueqi
2020-08-25 22:21:59 +0800
2f68b2e1 神器的引导步骤从55步开始 Browse Dir »

chenyueqi
2020-08-25 17:18:04 +0800
bb10924f 10连保底使用池子全随机 Browse Dir »

liuzujun
2020-08-25 15:26:14 +0800
627305b8 删除没用的代码 Browse Dir »

zhouhaihai
2020-08-25 11:31:53 +0800
c75ce249 Merge branch 'develop' of 120.26.43.151:wasteland/server into develop Browse Dir »

liuzujun
2020-08-25 11:05:53 +0800
9e1a93c2 快速挂机掉落浮点数取整 Browse Dir »

liuzujun
2020-08-25 11:05:49 +0800