wasteland / server | GitLab

28 Aug, 2020

3 commits

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

9 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
84c2734c 怪物增加 spset Browse Code »

zhouhaihai
2020-08-25 12:02:21 +0800
627305b8 删除没用的代码 Browse Code »

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

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

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

24 Aug, 2020

16 commits

7eb8d136 引导抽招募 Browse Code »

chenyueqi
2020-08-24 21:46:27 +0800
94e886cc Merge branch 'develop' of 120.26.43.151:wasteland/server into develop Browse Code »

liuzujun
2020-08-24 20:19:35 +0800
f3eb34b1 删除无用日志 Browse Code »

liuzujun
2020-08-24 20:19:33 +0800
16f5fa68 引导招募的引导改动被回退 Browse Code »

chenyueqi
2020-08-24 19:26:47 +0800
78ab75e4 战斗结算加经验log报错 Browse Code »

chenyueqi
2020-08-24 18:33:46 +0800
ed44e7de merge code Browse Code »

liuzujun
2020-08-24 16:27:17 +0800
533db86a 代理拾荒bug Browse Code »

liuzujun
2020-08-24 16:26:40 +0800
850145e0 json 格式处理 Browse Code »

zhouhaihai
2020-08-24 15:46:16 +0800
887c1843 日志新一批 Browse Code »

zhouhaihai
2020-08-24 15:25:06 +0800
c59e058b 新一批日志记录 Browse Code »

zhouhaihai
2020-08-24 14:33:44 +0800
a3e69a31 缺了 id 来源 Browse Code »

zhouhaihai
2020-08-24 14:15:52 +0800
890ad900 Merge branch 'develop' of 120.26.43.151:wasteland/server into develop Browse Code »

chenyueqi
2020-08-24 14:09:33 +0800
0cc5de89 签到log类型再改回来，餐厅刷新顾客判断修正 Browse Code »

chenyueqi
2020-08-24 14:09:24 +0800
44baeb7a 漏掉了 bug Browse Code »

zhouhaihai
2020-08-24 14:06:27 +0800
254ed866 餐厅强制引导跨天刷新顾客时判断条件bug Browse Code »

chenyueqi
2020-08-24 13:49:17 +0800
20226e47 签到输出log类型未定义 Browse Code »

chenyueqi
2020-08-24 13:41:44 +0800