wasteland / server

29 Apr, 2021

2 commits

6232e121 Merge branch 'cn/develop' into cn/publish/preview ... Browse Dir »
```
# Conflicts:
#	src/csvdata
```
熊润斐
2021-04-29 15:24:26 +0800
6aedd904 判断觉醒技能所在的觉醒等级不能大于英雄当前的等级 Browse Dir »

chenyueqi
2021-04-29 12:33:18 +0800

28 Apr, 2021

4 commits

36f26bdb 招募附赠奖励代码移到for循环外 Browse Dir »

chenyueqi
2021-04-28 22:10:10 +0800
9fa1417d 招募英雄时附带的奖励未到账 Browse Dir »

chenyueqi
2021-04-28 21:55:13 +0800
3b4b15b1 齿轮加速消耗修改为虹光玉 Browse Dir »

liguanghui
2021-04-28 16:59:48 +0800
51e10199 招募增加附加奖励 Browse Dir »

chenyueqi
2021-04-28 15:28:36 +0800

26 Apr, 2021

1 commit

47343863 fix: 天赋点自动升级，重置觉醒技能增加消耗品 ... Browse Dir »
```
1. 升级到五星，觉醒技能自动升级
2. 重置觉醒技能增加消耗品
3. 六星设置四星觉醒技，5星的觉醒技能自动升级
```
zhangqijia
2021-04-26 15:51:39 +0800

25 Apr, 2021

1 commit

bbaa6be7 代理拾荒时间任务，改为开始时记录 Browse Dir »

chenyueqi
2021-04-25 20:17:44 +0800

24 Apr, 2021

3 commits

8ef1416b Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop Browse Dir »

liuzujun
2021-04-24 17:19:06 +0800
a33ade6c rmb礼包改钻石礼包 Browse Dir »

liuzujun
2021-04-24 17:19:02 +0800
62c5e2f0 海港贸易活动自动领取结算奖励时，增加条件，要进行过捐赠 Browse Dir »

chenyueqi
2021-04-24 15:11:53 +0800

23 Apr, 2021

7 commits

f699d337 点击食材供应商的引导步骤改为30 Browse Dir »

chenyueqi
2021-04-23 20:38:49 +0800
d2c8c771 Merge remote-tracking branch 'origin/cn/develop' into cn/develop ... Browse Dir »
```
# Conflicts:
#	src/actions/HangAction.lua
```
zhangqijia
2021-04-23 17:14:06 +0800
251d8e5e fix: 挂机宝鉴，宝藏CD的bug ... Browse Dir »
```
1. 开始新关卡，重置之前正在挖宝关卡的挂机时间，获取之前挖宝关卡的奖励
```
zhangqijia
2021-04-23 17:10:25 +0800
acdaca24 获取宝藏关卡时，处理返回值是nil的情况 Browse Dir »

chenyueqi
2021-04-23 17:09:03 +0800
659fe200 feat: 天赋点 ... Browse Dir »
```
1. 增加指令228
2. 增加天赋树字段genius
3. 增加检验天赋树的逻辑
```
zhangqijia
2021-04-23 15:18:54 +0800
d593a874 Merge remote-tracking branch 'origin/cn/develop' into cn/develop Browse Dir »

zhangqijia
2021-04-23 10:36:20 +0800
e639a6b9 fix: 挂机图鉴-绑定关卡 ... Browse Dir »
```
1. 绑定的关卡需要已经解锁
2. 通关10120刷新宝鉴
3。 关卡10120是从表获取的数据
```
zhangqijia
2021-04-23 10:34:52 +0800

22 Apr, 2021

1 commit

1199daf9 fix: 挂机图鉴，增加宝藏CD检查 ... Browse Dir »
```
1. 开始挖宝藏有结束时间，无过期时间
2. 用户获取宝藏后，宝藏才进入CD状态
```
zhangqijia
2021-04-22 17:05:07 +0800

21 Apr, 2021

6 commits

1dfcef53 好友推荐列表bug Browse Dir »

liuzujun
2021-04-21 17:27:14 +0800
99712f36 gm get hero 不能获取未开发的英雄 Browse Dir »

chenyueqi
2021-04-21 16:48:20 +0800
1ebe1c94 钻石转换日志打点 Browse Dir »

liuzujun
2021-04-21 16:05:10 +0800
a1fd1815 Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop Browse Dir »

zhangqijia
2021-04-21 16:01:35 +0800
70fb62d1 服务器数据打点 Browse Dir »

liuzujun
2021-04-21 15:51:17 +0800

a85b344f feat: 挂机图鉴 ... Browse Dir »

新增组件信息如下：
1. daily中新增字段treasureList
2. 增加宝藏图鉴接口
3. 增加挖宝接口
4. 增加通过英雄id获取英雄信息的函数

2021-04-21 14:37:47 +0800

20 Apr, 2021

1 commit

0df83fa9 料理解锁bug Browse Dir »

liuzujun
2021-04-20 13:57:20 +0800

16 Apr, 2021

1 commit

f043cffc Merge branch 'cn/develop' into cn/publish/preview ... Browse Dir »
```
# Conflicts:
#	src/csvdata
```
熊润斐
2021-04-16 16:41:36 +0800

15 Apr, 2021

2 commits

f2b3aacd fb和fbc命令增加剧情的解锁 Browse Dir »

chenyueqi
2021-04-15 20:46:43 +0800
248570a0 Merge branch 'cn/develop' into cn/publish/preview Browse Dir »

熊润斐
2021-04-15 16:16:14 +0800

12 Apr, 2021

2 commits

54fdf821 觉醒任务参数应该是觉醒后的值 Browse Dir »

chenyueqi
2021-04-12 20:25:42 +0800
0c6b1a62 物资危机增加代理拾荒时间和拾荒击杀boss数量的任务类型 Browse Dir »

chenyueqi
2021-04-12 14:49:59 +0800

10 Apr, 2021

1 commit

78e5b90e 完成需求：新玩家任务 Browse Dir »

liuzujun
2021-04-10 18:12:23 +0800

09 Apr, 2021

3 commits

18bf12f3 Merge branch 'cn/develop-mysql' into cn/develop Browse Dir »

chenyueqi
2021-04-09 17:35:19 +0800
2806380f Merge branch 'cn/develop-mysql' of 120.26.43.151:wasteland/server into cn/develop-mysql Browse Dir »

liuzujun
2021-04-09 11:10:54 +0800
a3bb2d5d 指南改名任务 Browse Dir »

liuzujun
2021-04-09 11:10:51 +0800

07 Apr, 2021

3 commits

4be8f33d 电波塔扩展奖励字段 Browse Dir »

chenyueqi
2021-04-07 20:24:40 +0800
4c442fd4 突破关卡限制判断逻辑修改 Browse Dir »

chenyueqi
2021-04-07 17:24:02 +0800
9b197666 使用通用检查通关关卡方法 Browse Dir »

chenyueqi
2021-04-07 11:20:49 +0800

06 Apr, 2021

2 commits

c49eac9f 升级和突破增加关卡判断代码bug Browse Dir »

chenyueqi
2021-04-06 20:40:47 +0800
f3eb3226 Merge branch 'cn/develop-mysql' of 120.26.43.151:wasteland/server into cn/develop-mysql Browse Dir »

liuzujun
2021-04-06 19:52:20 +0800