wasteland / server | GitLab

07 May, 2021

1 commit

aa84432f Merge branch 'cn/develop' into cn/publish/preview Browse Code »

熊润斐
2021-05-07 10:10:29 +0800

06 May, 2021

2 commits

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

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

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 Code »

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

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

02 May, 2021

1 commit

889380fd Merge branch 'cn/develop' into cn/publish/preview Browse Code »

熊润斐
2021-05-02 15:02:07 +0800

30 Apr, 2021

2 commits

6b7ee7b1 铭文替换服务器报错 Browse Code »

chenyueqi
2021-04-30 10:31:45 +0800
3552b8db 打印log方法要用role的 Browse Code »

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

29 Apr, 2021

7 commits

abded725 虹光玉购买金币计算bug Browse Code »

chenyueqi
2021-04-29 20:47:22 +0800
1d78ad52 成就奖励方法中字段拼写错误 Browse Code »

chenyueqi
2021-04-29 20:04:19 +0800
8e2d9f73 修复英雄觉醒之后可升级的天赋技没有自动升级问题 Browse Code »

chenyueqi
2021-04-29 17:27:57 +0800
6cb24616 重置突破等级的时候不判断突破等级合法 Browse Code »

chenyueqi
2021-04-29 16:33:59 +0800
6232e121 Merge branch 'cn/develop' into cn/publish/preview ... Browse Code »
```
# Conflicts:
#	src/csvdata
```
熊润斐
2021-04-29 15:24:26 +0800
4a25969f 修复登录后新获得的铭文和火花无法装备的问题 Browse Code »

chenyueqi
2021-04-29 14:24:46 +0800
6aedd904 判断觉醒技能所在的觉醒等级不能大于英雄当前的等级 Browse Code »

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

28 Apr, 2021

5 commits

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

chenyueqi
2021-04-28 22:11:21 +0800
36f26bdb 招募附赠奖励代码移到for循环外 Browse Code »

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

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

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

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

26 Apr, 2021

2 commits

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

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

25 Apr, 2021

3 commits

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

chenyueqi
2021-04-25 20:17:44 +0800
154915ac Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop ... Browse Code »
```
* 'cn/develop' of 120.26.43.151:wasteland/server:
  fix: 挂机图鉴, 切换挂机关卡，重置挂机时间
```
liuzujun
2021-04-25 16:36:06 +0800
09a115e9 fix: 挂机图鉴, 切换挂机关卡，重置挂机时间 Browse Code »

zhangqijia
2021-04-25 14:33:55 +0800

24 Apr, 2021

3 commits

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

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

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

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

23 Apr, 2021

8 commits

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

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

chenyueqi
2021-04-23 17:09:03 +0800
06562145 英雄模块增加一个字段 Browse Code »

zhangqijia
2021-04-23 15:24:55 +0800
659fe200 feat: 天赋点 ... Browse Code »
```
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 Code »

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

22 Apr, 2021

1 commit

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

21 Apr, 2021

3 commits

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

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

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

liuzujun
2021-04-21 16:05:10 +0800