15 Jan, 2021

5 commits

• 9587d70a   Merge branch 'tr/bugfix' into tr/publish/release ... Browse Code »

  * tr/bugfix:
    活动卡池回馈数量丢失Bug
  
  # Conflicts:
  #	src/csvdata

  zhouhaihai

  2021-01-15 12:41:43 +0800  
• 052ae144   Merge branch 'tr/bugfix' of 120.26.43.151:wasteland/server into tr/bugfix Browse Code »
  liuzujun

  2021-01-15 12:09:15 +0800  
• 6354fd74   活动卡池回馈数量丢失Bug Browse Code »
  liuzujun

  2021-01-15 12:09:11 +0800  
• acf11d0d   Merge branch 'tr/bugfix' into tr/publish/release ... Browse Code »

  * tr/bugfix:
    手抽英雄只奖励一个

  zhouhaihai

  2021-01-15 01:36:34 +0800  
• 7125137e   手抽英雄只奖励一个 Browse Code »
  chenyueqi

  2021-01-15 01:32:20 +0800  

14 Jan, 2021

1 commit

• ab2d45e2   聊天频道修改1个 Browse Code »
  zhouhaihai

  2021-01-14 23:35:42 +0800  

13 Jan, 2021

4 commits

• 325ec569   Merge branch 'tr/bugfix' into tr/publish/release ... Browse Code »

  * tr/bugfix:
    奖励内容错误

  zhouhaihai

  2021-01-13 21:23:40 +0800  
• 40dd5057   奖励内容错误 Browse Code »
  zhouhaihai

  2021-01-13 21:23:27 +0800  
• 3eb2cbca   Merge branch 'tr/bugfix' into tr/publish/release ... Browse Code »

  * tr/bugfix:
    跨服竞技场
    关卡boss活动扫荡累计伤害值不正确bug

  zhouhaihai

  2021-01-13 11:47:54 +0800  
• 69a45034   跨服竞技场 Browse Code »
  zhouhaihai

  2021-01-13 11:46:46 +0800  

12 Jan, 2021

5 commits

• 38b8089d   关卡boss活动扫荡累计伤害值不正确bug Browse Code »
  liuzujun

  2021-01-12 20:41:15 +0800  
• 96f808db   Merge branch 'tr/bugfix' into tr/publish/release Browse Code »
  熊润斐

  2021-01-12 16:06:26 +0800  
• 064ca715   抽卡up_pool判空 Browse Code »
  liuzujun

  2021-01-12 14:29:22 +0800  
• cac895e3   Merge branch 'tr/bugfix' into tr/publish/release ... Browse Code »

  * tr/bugfix:
    抽卡up失败走全随机，随机池把up角色剔除
    心愿卡池根据心愿单英雄数量调整概率
  
  # Conflicts:
  #	src/csvdata

  zhouhaihai

  2021-01-12 11:52:06 +0800  
• ea2478f4   生产 Browse Code »
  zhouhaihai

  2021-01-12 10:34:45 +0800  

11 Jan, 2021

3 commits

• 43611d57   抽卡up失败走全随机，随机池把up角色剔除 Browse Code »
  liuzujun

  2021-01-11 17:59:36 +0800  
• aa4838cb   心愿卡池根据心愿单英雄数量调整概率 Browse Code »
  liuzujun

  2021-01-11 16:39:19 +0800  
• 5cfb6dad   Merge branch 'tr/bugfix' into tr/publish/release ... Browse Code »

  * tr/bugfix:
    铭文升级超过上限bug
    世界boss行动点奖励领完后重置
    世界boss行动点bug
    拾荒失败也要触发成就引导
  
  # Conflicts:
  #	src/csvdata

  zhouhaihai

  2021-01-11 11:55:22 +0800  

09 Jan, 2021

1 commit

• 1627de1c   铭文升级超过上限bug Browse Code »
  liuzujun

  2021-01-09 11:14:30 +0800  

08 Jan, 2021

3 commits

• 8b6745bf   世界boss行动点奖励领完后重置 Browse Code »
  liuzujun

  2021-01-08 20:53:47 +0800  
• 3e80ee56   世界boss行动点bug Browse Code »
  liuzujun

  2021-01-08 20:24:11 +0800  
• 4bd10b43   拾荒失败也要触发成就引导 Browse Code »
  chenyueqi

  2021-01-08 11:11:45 +0800  

07 Jan, 2021

2 commits

• ff08d2c3   Merge branch 'bugfix' into tr/ob ... Browse Code »

  * bugfix:
    掉落活动配置最大掉落周期数
    拆解周活动跨轮数据异常bug
    道具开时钟箱，检查箱子够不够
  
  # Conflicts:
  #	src/csvdata

  zhouhaihai

  2021-01-07 17:11:26 +0800  
• 6662e7d2   掉落活动配置最大掉落周期数 Browse Code »
  liuzujun

  2021-01-07 11:09:06 +0800  

06 Jan, 2021

3 commits

• b8d77233   拆解周活动跨轮数据异常bug Browse Code »
  liuzujun

  2021-01-06 21:03:42 +0800  
• c7991bb0   道具开时钟箱，检查箱子够不够 Browse Code »
  chenyueqi

  2021-01-06 14:29:29 +0800  
• 786de7e5   Merge branch 'bugfix' into tr/ob Browse Code »
  熊润斐

  2021-01-06 09:54:33 +0800  

05 Jan, 2021

5 commits

• 5b4db3a3   增加电台任务日志完成类型 Browse Code »
  liuzujun

  2021-01-05 20:40:22 +0800  
• 57e52b3d   空的是nil Browse Code »
  zhouhaihai

  2021-01-05 19:30:14 +0800  
• fd4e7761   Merge branch 'bugfix' into tr/ob ... Browse Code »

  * bugfix:
    appid
    讨伐电台日志增加 开始结束

  zhouhaihai

  2021-01-05 16:50:45 +0800  
• 9e91460a   appid Browse Code »
  zhouhaihai

  2021-01-05 16:50:34 +0800  
• 1b555008   讨伐电台日志增加 开始结束 Browse Code »
  zhouhaihai

  2021-01-05 15:52:36 +0800  

04 Jan, 2021

2 commits

• b32cb70f   Merge branch 'bugfix' into tr/ob ... Browse Code »

  * bugfix:
    log 发现的bug
    bug
    取消抽卡保底的保底次数默认值，因为有些卡池不需要保底
    邮件
    活动奖励bug
    cb 返利调整
    世界boss 胜利才扣门票，扫荡根据之前的最大值给行动点
    任务
    付费签到规则改为按登录天数计算进度， 世界boss
    解锁条件修改
  
  # Conflicts:
  #	src/csvdata

  zhouhaihai

  2021-01-04 17:13:46 +0800  
• 0a6fcddc   log 发现的bug Browse Code »
  zhouhaihai

  2021-01-04 17:10:59 +0800  

31 Dec, 2020

3 commits

• 4591e219   bug Browse Code »
  zhouhaihai

  2020-12-31 18:00:16 +0800  
• bb8c1d57   取消抽卡保底的保底次数默认值，因为有些卡池不需要保底 Browse Code »
  liuzujun

  2020-12-31 17:37:37 +0800  
• e1b5f6ec   邮件 Browse Code »
  zhouhaihai

  2020-12-31 15:02:38 +0800  

30 Dec, 2020

3 commits

• b47316e6   活动奖励bug Browse Code »
  zhouhaihai

  2020-12-30 16:51:45 +0800  
• 91019d1f   cb 返利调整 Browse Code »
  zhouhaihai

  2020-12-30 16:51:21 +0800  
• 6a18cfa7   Merge branch 'bugfix' of 120.26.43.151:wasteland/server into bugfix Browse Code »
  liuzujun

  2020-12-30 16:15:09 +0800