wasteland / server

28 Jan, 2021

2 commits

  • 3e76a463   Merge branch 'tr/bugfix' into tr/publish/release ... Browse File » 
    * tr/bugfix:
  清空背包gm
  修复拾荒结算时，返还药剂错误导致药水被吞的bug
  进入拾荒自动补给药水，按当前等级下的携带最大数量计算
  获得所有SSR 且满级 满觉醒 同时获得全部满级金色铭文 满精进
  充值mycard
  pvp 匹配 和 失败扣减积分
  Revert "修改 robot"
  修改 robot
  联动任务活动
  appid
  好友赠送能量活动bug修复
  活动能量bug
  修改联动好友赠送活动的消息通知结构
  少个大括号
  修改联动好友赠送获得的红点记录和通知
  未测试版好友能量助力活动
  联动签到活动
  调理剂生产和使用逻辑优化

# Conflicts:
#	src/csvdata
    zhouhaihai
     
  • 08af0de6   清空背包gm Browse File »
    liuzujun
     

26 Jan, 2021

1 commit

25 Jan, 2021

2 commits

21 Jan, 2021

1 commit

  • a8e6aef7   Merge branch 'tr/bugfix' into tr/publish/release ... Browse File » 
    * tr/bugfix:
  输出删掉
  登入刷新兑换活动商店
  兑换活动上线检测是否需要刷新
  修复存在的冒险进不去的玩家
  兑换商店不刷新bug
  新增倍数
  bugfix
  同单号充值输出
  relay
  修改中继营地解锁条件
  防作弊
  活动战斗结束不发送战斗奖励
  活动免费礼包判断活动是否开启

# Conflicts:
#	src/csvdata
    zhouhaihai
     

20 Jan, 2021

1 commit

19 Jan, 2021

2 commits

05 Jan, 2021

1 commit

18 Dec, 2020

1 commit

16 Dec, 2020

1 commit

14 Dec, 2020

1 commit

07 Dec, 2020

1 commit

03 Dec, 2020

1 commit

19 Nov, 2020

1 commit

18 Nov, 2020

1 commit

15 Sep, 2020

1 commit

12 Sep, 2020

1 commit

10 Sep, 2020

1 commit

08 Sep, 2020

1 commit

07 Sep, 2020

1 commit

04 Sep, 2020

1 commit

24 Aug, 2020

1 commit

10 Aug, 2020

2 commits

06 Aug, 2020

1 commit

05 Aug, 2020

2 commits

04 Aug, 2020

1 commit

24 Jul, 2020

1 commit

23 Jul, 2020

1 commit

21 Jul, 2020

1 commit

04 Jul, 2020

1 commit

16 Jun, 2020

1 commit

06 Jun, 2020

1 commit

02 Jun, 2020

3 commits

28 May, 2020

1 commit