wasteland / server | GitLab

03 Sep, 2020

4 commits

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

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

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

c048e676 quest 增加定制 Browse Code »

zhouhaihai
2020-09-03 14:54:02 +0800
7754304d bug Browse Code »

zhouhaihai
2020-09-03 14:17:52 +0800
b8c1be12 一些 bug Browse Code »

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

02 Sep, 2020

5 commits

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

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

liuzujun
2020-09-02 20:55:14 +0800
83e959c0 twd Browse Code »

zhouhaihai
2020-09-02 17:22:44 +0800
1ecdc048 屏蔽充值接口 Browse Code »

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

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

01 Sep, 2020

1 commit

c3a70cde 返还 Browse Code »

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

29 Aug, 2020

5 commits

ed20b43c 冒险bug Browse Code »

zhouhaihai
2020-08-29 16:05:11 +0800
abe6f9d5 签名回调地址由客户端发送 Browse Code »

zhouhaihai
2020-08-29 15:42:10 +0800
45bf6f3d Merge branch 'develop' into tr/publish Browse Code »

zhouhaihai
2020-08-29 15:41:38 +0800
ba84f3c7 签名回调地址由客户端上传 Browse Code »

zhouhaihai
2020-08-29 15:40:15 +0800
ca128b32 邮件时间bug Browse Code »

zhouhaihai
2020-08-29 15:27:48 +0800

28 Aug, 2020

8 commits

ff72c84a Merge branch 'develop' into tr/publish Browse Code »

zhouhaihai
2020-08-28 20:31:57 +0800
f58b315e 停止注册 Browse Code »

zhouhaihai
2020-08-28 20:31:42 +0800
cbaf5746 Merge branch 'develop' into tr/publish Browse Code »

zhouhaihai
2020-08-28 18:04:43 +0800
88eaae64 日志端口 Browse Code »

zhouhaihai
2020-08-28 18:04:36 +0800
a5c70352 开启日志 Browse Code »

zhouhaihai
2020-08-28 18:03:57 +0800
59f2831d Merge branch 'develop' into tr/publish Browse Code »

zhouhaihai
2020-08-28 18:03:20 +0800
2d21f527 Merge branch 'develop' of 120.26.43.151:wasteland/server into develop Browse Code »

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

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

26 Aug, 2020

12 commits

a22485f3 Merge branch 'develop' into tr/publish ... Browse Code »
```
# Conflicts:
#	src/actions/StoreAction.lua
```
zhouhaihai
2020-08-26 21:07:48 +0800
5bd12066 增加pay_url Browse Code »

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

chenyueqi
2020-08-26 17:59:12 +0800
4cf5dec9 battle bug Browse Code »

zhouhaihai
2020-08-26 17:48:33 +0800
ca55c763 引导招募必送思露德判定出了大问题 Browse Code »

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

zhouhaihai
2020-08-26 16:44:51 +0800
05ab09a2 新的被动效果 Browse Code »

zhouhaihai
2020-08-26 15:34:41 +0800
286c980a 挂机战斗胜利才触发对应的引导 Browse Code »

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

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

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

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

25 Aug, 2020

5 commits

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

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

chenyueqi
2020-08-25 17:18:04 +0800
62b92a1c Merge branch 'develop' of 120.26.43.151:wasteland/server into develop Browse Code »

liuzujun
2020-08-25 15:26:18 +0800
bb10924f 10连保底使用池子全随机 Browse Code »

liuzujun
2020-08-25 15:26:14 +0800
df627a2d 优化防止出错 Browse Code »

zhouhaihai
2020-08-25 13:45:29 +0800