24 May, 2021

4 commits

• d81d8bf2   Merge branch 'cn/develop' into cn/publish/preview Browse Dir »
  熊润斐

  2021-05-24 20:41:03 +0800  
• 61386225   feat: 一键领取任务奖励(包括活跃度奖励) Browse Dir »
  zhangqijia

  2021-05-24 16:39:02 +0800  
• 74376738   Merge branch 'cn/develop' into cn/publish/preview Browse Dir »
  熊润斐

  2021-05-24 14:42:45 +0800  
• 15b33dc3   fix: 齿轮加速当前加速次数获取错误的bug Browse Dir »
  zhangqijia

  2021-05-24 11:23:58 +0800  

21 May, 2021

2 commits

• 50960165   Merge branch 'cn/develop' into cn/publish/preview Browse Dir »
  熊润斐

  2021-05-21 18:20:42 +0800  
• 2660491b   fix: 铭文仓库爆满限制bug ... Browse Dir »

  1. 穿在英雄身上的铭文不计算在仓库。
  2. 开箱判断物品所占用的仓库格数，item_random.ware字段
  3.
  领取邮件，如果邮件中没有铭文，则不判断铭文仓库是否爆满。

  zhangqijia

  2021-05-21 17:30:10 +0800  

20 May, 2021

4 commits

• 07ad7d3a   Merge branch 'cn/develop' into cn/publish/preview ... Browse Dir »

  # Conflicts:
  #	src/csvdata

  熊润斐

  2021-05-20 21:02:41 +0800  
• a05f7f85   Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop Browse Dir »
  liuzujun

  2021-05-20 18:53:23 +0800  
• b2ff0064   优化删除过期邮件mysql Browse Dir »
  liuzujun

  2021-05-20 18:53:17 +0800  
• 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

4 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.领取邮件时

  zhangqijia

  2021-05-18 20:54:19 +0800  
• ae0d3358   重置单一玩家 讨伐电台、代理拾荒、海港贸易 gm Browse Dir »
  liuzujun

  2021-05-18 16:36:26 +0800  
• ea54a935   电波塔bug Browse Dir »
  liuzujun

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

17 May, 2021

2 commits

• ebbed4db   fix: 获得邮件奖励的bug Browse Dir »
  zhangqijia

  2021-05-17 16:01:18 +0800  
• 3ee9494b   Merge branch 'cn/develop' into cn/publish/preview Browse Dir »
  熊润斐

  2021-05-17 14:10:53 +0800  

13 May, 2021

2 commits

• 21774ba5   feat: 金币购买铭文碎片 Browse Dir »
  zhangqijia

  2021-05-13 15:22:08 +0800  
• 7bc0509a   fix: 引导跳过逻辑修改 Browse Dir »
  zhangqijia

  2021-05-13 13:55:33 +0800  

12 May, 2021

1 commit

• bfa42833   feat: 分解铭文返还强化所需铭文碎片的60% Browse Dir »
  zhangqijia

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

10 May, 2021

5 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  
• 78139af8   ssr增加硬性保底 Browse Dir »
  liuzujun

  2021-05-10 14:07:06 +0800  
• c0c49098   feat: 竞技场门票购买限制；挂机加速，宝藏奖励加速 Browse Dir »
  zhangqijia

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

08 May, 2021

2 commits

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

  2021-05-08 15:17:26 +0800  
• 37f8fb69   fix: 修复点燃火花获得的奖励未添加到背包里的bug Browse Dir »
  zhangqijia

  2021-05-08 09:37:29 +0800  

02 May, 2021

1 commit

• 889380fd   Merge branch 'cn/develop' into cn/publish/preview Browse Dir »
  熊润斐

  2021-05-02 15:02:07 +0800  

30 Apr, 2021

1 commit

• 6b7ee7b1   铭文替换服务器报错 Browse Dir »
  chenyueqi

  2021-04-30 10:31:45 +0800  

29 Apr, 2021

6 commits

• abded725   虹光玉购买金币计算bug Browse Dir »
  chenyueqi

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

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

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

  2021-04-29 16:33:59 +0800  
• 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

2 commits

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

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

  2021-04-28 21:55:13 +0800