wasteland / server

20 May, 2021

1 commit

e82cb5dc fix: level_addition新增类型17 每日奖励关卡挑战卡可购买次数增加 Browse Dir »

zhangqijia
2021-05-20 14:02:43 +0800

19 May, 2021

4 commits

2820ba20 Merge remote-tracking branch 'origin/cn/develop' into cn/develop Browse Dir »

zhangqijia
2021-05-19 19:42:24 +0800
e2e205be feat: 玩家等级奖励 Browse Dir »

zhangqijia
2021-05-19 19:42:14 +0800
b2afd512 Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop Browse Dir »

liuzujun
2021-05-19 19:32:14 +0800
e9bfa7a2 其他玩家展示界面数据支持，更新sql版本管理 Browse Dir »

liuzujun
2021-05-19 19:32:10 +0800

18 May, 2021

3 commits

756cd488 Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop Browse Dir »

zhangqijia
2021-05-18 20:57:13 +0800

76f0493d feat: 铭文仓库溢出奖励时，通过邮件补发溢出部分 ... Browse Dir »

1.主动拾荒结算时
邮件id=20，奖励内容超过一封邮件上限时，拆成新的邮件发放

铭文获得时,仓库已满，无法操作
1.资助抽奖开始时
2.选择时钟箱拆解时
3.领取邮件时

2021-05-18 20:54:19 +0800

ea54a935 电波塔bug Browse Dir »

liuzujun
2021-05-18 13:48:53 +0800

17 May, 2021

1 commit

8dc5f0dd fix: add金币购买铭文碎片的ItemReason Browse Dir »

zhangqijia
2021-05-17 09:50:41 +0800

14 May, 2021

2 commits

63c0245e fix: 跨天资源值未重置的bug Browse Dir »

zhangqijia
2021-05-14 18:02:17 +0800
c242dda6 fix: 删除print打印 Browse Dir »

zhangqijia
2021-05-14 13:49:49 +0800

13 May, 2021

1 commit

8641a577 fix: 增加竞技场门票次数的字段 Browse Dir »

zhangqijia
2021-05-13 14:10:28 +0800

12 May, 2021

2 commits

d933495e Merge remote-tracking branch 'origin/cn/develop' into cn/develop Browse Dir »

zhangqijia
2021-05-12 11:56:46 +0800
bfa42833 feat: 分解铭文返还强化所需铭文碎片的60% Browse Dir »

zhangqijia
2021-05-12 09:52:29 +0800

11 May, 2021

1 commit

749528eb 拾荒章节解锁条件修改 Browse Dir »

liguanghui
2021-05-11 09:58:07 +0800

10 May, 2021

4 commits

5dee6549 fix: 挂机图鉴- 修复切换关卡需要点两次的bug Browse Dir »

zhangqijia
2021-05-10 20:50:12 +0800
e03f9e59 fix: 修复挂机得到双倍宝藏奖励的bug ... Browse Dir »
```
1.修复挂机得到双倍宝藏奖励的bug；
2.检查资源值足够才能获得宝藏。
```
zhangqijia
2021-05-10 20:40:19 +0800
6afa6078 爬塔成就bug Browse Dir »

liuzujun
2021-05-10 17:02:23 +0800
c0c49098 feat: 竞技场门票购买限制；挂机加速，宝藏奖励加速 Browse Dir »

zhangqijia
2021-05-10 10:48:22 +0800

08 May, 2021

3 commits

058b4f09 feat: 限制每天购买竞技场门票的张数 Browse Dir »

zhangqijia
2021-05-08 15:17:26 +0800
4d684a8b fix: 宝藏图鉴-优化检查拾荒关卡是否通关 Browse Dir »

zhangqijia
2021-05-08 15:17:19 +0800
fe562215 拾荒章节解锁条件修改 Browse Dir »

chenyueqi
2021-05-08 15:10:01 +0800

06 May, 2021

2 commits

3dd204eb Merge branch 'cn/develop_door' into cn/develop Browse Dir »

zhangqijia
2021-05-06 15:18:15 +0800
f0de8a60 挖宝跨天，前一天天正在挖的宝被刷掉的bug ——没在挖的宝才刷新，资源值重置 Browse Dir »

zhangqijia
2021-05-06 15:02:15 +0800

03 May, 2021

2 commits

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

liuzujun
2021-05-03 11:12:18 +0800
7104ee66 重复过新手bug, daily错误更新id bug,增加sql报错日志 Browse Dir »

liuzujun
2021-05-03 11:12:15 +0800

30 Apr, 2021

1 commit

3552b8db 打印log方法要用role的 Browse Dir »

chenyueqi
2021-04-30 09:58:12 +0800

29 Apr, 2021

1 commit

4a25969f 修复登录后新获得的铭文和火花无法装备的问题 Browse Dir »

chenyueqi
2021-04-29 14:24:46 +0800

28 Apr, 2021

1 commit

8fd48928 竞技场保存team数据时增加觉醒字段 Browse Dir »

chenyueqi
2021-04-28 22:11:21 +0800

26 Apr, 2021

2 commits

a2df11d6 fix: 修复天赋点在6星的时候激活4星觉醒技不成功的bug Browse Dir »

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

6 commits

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
06562145 英雄模块增加一个字段 Browse Dir »

zhangqijia
2021-04-23 15:24:55 +0800
659fe200 feat: 天赋点 ... Browse Dir »
```
1. 增加指令228
2. 增加天赋树字段genius
3. 增加检验天赋树的逻辑
```
zhangqijia
2021-04-23 15:18:54 +0800
e639a6b9 fix: 挂机图鉴-绑定关卡 ... Browse Dir »
```
1. 绑定的关卡需要已经解锁
2. 通关10120刷新宝鉴
3。 关卡10120是从表获取的数据
```
zhangqijia
2021-04-23 10:34:52 +0800