25 May, 2021

5 commits

• ea085293   Merge branch 'cn/develop' into cn/publish/preview Browse Code »
  熊润斐

  2021-05-25 19:09:06 +0800  
• 7fe1158c   Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop Browse Code »
  liuzujun

  2021-05-25 16:38:05 +0800  
• 81ca3a6f   清理电台，代理拾荒，海港贸易机gm Browse Code »
  liuzujun

  2021-05-25 16:38:00 +0800  
• ca787d03   Merge branch 'cn/develop' into cn/publish/preview Browse Code »
  熊润斐

  2021-05-25 11:55:45 +0800  
• 4e68858c   fix: 铭文当随机出2个相同属性词条时，应该分开记录成2个属性 Browse Code »
  zhangqijia

  2021-05-25 09:52:57 +0800  

24 May, 2021

9 commits

• 666d0bfc   fix: 扫荡关卡奖励叠加bug Browse Code »
  zhangqijia

  2021-05-24 21:02:55 +0800  
• d81d8bf2   Merge branch 'cn/develop' into cn/publish/preview Browse Code »
  熊润斐

  2021-05-24 20:41:03 +0800  
• 3e6d391b   fix: 等级效果的bug-修复无法获得奖励关卡每次扫荡额外获得道具 Browse Code »
  zhangqijia

  2021-05-24 20:19:53 +0800  
• 8773133b   Merge branch 'cn/develop' into cn/publish/preview Browse Code »
  熊润斐

  2021-05-24 17:18:32 +0800  
• 61386225   feat: 一键领取任务奖励(包括活跃度奖励) Browse Code »
  zhangqijia

  2021-05-24 16:39:02 +0800  
• 7ba807d6   fix: role:getRuneBatCount()改为role:getRuneBagCount() Browse Code »
  zhangqijia

  2021-05-24 15:23:01 +0800  
• 74376738   Merge branch 'cn/develop' into cn/publish/preview Browse Code »
  熊润斐

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

  2021-05-24 11:23:58 +0800  
• cea66efd   fix: 等级效果的bug， ... Browse Code »

  把等级效果字段levelBnous数据从增量获取改为全量获取

  zhangqijia

  2021-05-24 11:17:14 +0800  

21 May, 2021

4 commits

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

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

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

  zhangqijia

  2021-05-21 17:30:10 +0800  
• a0e99cf4   Merge branch 'cn/develop' into cn/publish/preview Browse Code »
  熊润斐

  2021-05-21 14:43:39 +0800  
• 2485b746   角色名片bug Browse Code »
  liuzujun

  2021-05-21 11:15:29 +0800  

20 May, 2021

4 commits

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

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

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

  2021-05-20 18:53:17 +0800  
• e82cb5dc   fix: level_addition新增类型17 每日奖励关卡挑战卡可购买次数增加 Browse Code »
  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 Code »
  zhangqijia

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

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

  2021-05-19 19:32:14 +0800  
• e9bfa7a2   其他玩家展示界面数据支持， 更新sql版本管理 Browse Code »
  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 Code »
  zhangqijia

  2021-05-18 20:57:13 +0800  
• 76f0493d   feat: 铭文仓库溢出奖励时，通过邮件补发溢出部分 ... Browse Code »

  1.主动拾荒结算时
  邮件id=20，奖励内容超过一封邮件上限时，拆成新的邮件发放
  
  铭文获得时,仓库已满，无法操作
  1.资助抽奖开始时
  2.选择时钟箱拆解时
  3.领取邮件时

  zhangqijia

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

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

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

17 May, 2021

3 commits

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

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

  2021-05-17 14:10:53 +0800  
• 8dc5f0dd   fix: add金币购买铭文碎片的ItemReason Browse Code »
  zhangqijia

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

14 May, 2021

2 commits

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

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

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

13 May, 2021

3 commits

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

  2021-05-13 15:22:08 +0800  
• 8641a577   fix: 增加竞技场门票次数的字段 Browse Code »
  zhangqijia

  2021-05-13 14:10:28 +0800  
• 7bc0509a   fix: 引导跳过逻辑修改 Browse Code »
  zhangqijia

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

12 May, 2021

2 commits

• d933495e   Merge remote-tracking branch 'origin/cn/develop' into cn/develop Browse Code »
  zhangqijia

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

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