03 Dec, 2021

3 commits

• 45c4330c   fix: searchAllRoleRpc协议不进行本地搜索 Browse Code »
  zhangqijia

  2021-12-03 17:55:52 +0800  
• d75c9513   fix: searchAllRoleRpc协议返回错误 Browse Code »
  zhangqijia

  2021-12-03 16:55:43 +0800  
• b42217e6   fix: searchAllRoleRpc协议增加sdk_uid字段 Browse Code »
  zhangqijia

  2021-12-03 16:32:53 +0800  

02 Dec, 2021

4 commits

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

  2021-12-02 19:06:03 +0800  
• ae3753b1   feat: 增加 role_by_uid http接口和查询所有服的角色信息的协议 Browse Code »
  zhangqijia

  2021-12-02 19:05:52 +0800  
• 8c158530   删除清空电台活动队伍的临时代码 Browse Code »
  liuzujun

  2021-12-02 11:48:51 +0800  
• 7356e583   feat: 增加角色注销协议 Browse Code »
  zhangqijia

  2021-12-02 10:51:40 +0800  

17 Nov, 2021

1 commit

• 344d2df3   微信支付宝下单接口 Browse Code »
  liuzujun

  2021-11-17 19:02:23 +0800  

12 Nov, 2021

1 commit

• d81f1a3d   ios支付修改 Browse Code »
  liuzujun

  2021-11-12 17:30:14 +0800  

11 Nov, 2021

1 commit

• 7d5e688f   临时清除活动电台任务 Browse Code »
  liuzujun

  2021-11-11 12:06:57 +0800  

09 Nov, 2021

1 commit

• 7e61a962   新增通用生成订单协议， ... Browse Code »

  上报登录等处消息到中宣
  苹果支付回调修改

  liuzujun

  2021-11-09 17:47:46 +0800  

03 Nov, 2021

1 commit

• e9c1df55   活动商品结束清购买记录 修改Email表content字段 Browse Code »
  liuzujun

  2021-11-03 15:58:48 +0800  

01 Nov, 2021

1 commit

• 54b7749c   fix:英雄突破和英雄升级，日志增加英雄id Browse Code »
  zhangqijia

  2021-11-01 19:27:59 +0800  

29 Oct, 2021

1 commit

• e4814423   fix: 修复 ltrim调用问题 Browse Code »
  zhangqijia

  2021-10-29 14:20:14 +0800  

28 Oct, 2021

2 commits

• 17c9ca5b   fix: 讨伐电台判空 Browse Code »
  zhangqijia

  2021-10-28 18:39:47 +0800  
• 27acaa11   修复一个 nil 带来的报错 Browse Code »
  zhanghualin

  2021-10-28 01:48:06 +0800  

27 Oct, 2021

5 commits

• af6197fd   feat: 兑换魔鬼训练营门票 Browse Code »
  zhangqijia

  2021-10-27 15:59:42 +0800  
• 21c09fa2   fix: 活动派遣 同时只能有一个存在 Browse Code »
  zhangqijia

  2021-10-27 11:21:26 +0800  
• 963598f6   Merge remote-tracking branch 'origin/cn/develop' into cn/develop Browse Code »
  zhangqijia

  2021-10-27 10:32:11 +0800  
• c5fe43c2   fix: 活动派遣不占用正常讨伐电台派遣队伍数量 Browse Code »
  zhangqijia

  2021-10-27 10:31:55 +0800  
• 5204a839   活动电台任务结束时候清理任务 Browse Code »
  liuzujun

  2021-10-27 10:02:06 +0800  

20 Oct, 2021

1 commit

• d1944a2b   fix: 修复 赞誉 加上固有提升数 Browse Code »
  zhangqijia

  2021-10-20 09:53:40 +0800  

19 Oct, 2021

1 commit

• 5b0a99f7   fix: 修复 getDeltaValue函数的bug Browse Code »
  zhangqijia

  2021-10-19 18:16:50 +0800  

14 Oct, 2021

8 commits

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

  2021-10-14 16:58:51 +0800  
• b7106842   fix: add 餐厅 log Browse Code »
  zhangqijia

  2021-10-14 16:58:09 +0800  
• c00d76f7   Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop Browse Code »
  liuzujun

  2021-10-14 14:52:44 +0800  
• cd4bc13c   商店购买刷购买上限bug 导致虹光玉溢出 Browse Code »
  liuzujun

  2021-10-14 14:52:41 +0800  
• eb97418a   fix: delete log Browse Code »
  zhangqijia

  2021-10-14 14:34:49 +0800  
• c3f5ce22   fix: 赞誉度增幅中的餐厅齿轮增幅修改 Browse Code »
  zhangqijia

  2021-10-14 13:07:30 +0800  
• 52837c5a   Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop Browse Code »
  liuzujun

  2021-10-14 10:52:13 +0800  
• f424762f   奇迹魔法 一键领取超上限bug Browse Code »
  liuzujun

  2021-10-14 10:52:11 +0800  

12 Oct, 2021

4 commits

• 3b410558   Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop Browse Code »
  zhangqijia

  2021-10-12 17:55:06 +0800  
• 46c63bba   Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop ... Browse Code »

  # Conflicts:
  #	src/models/Activity.lua

  liuzujun

  2021-10-12 17:05:14 +0800  
• 21581e1f   新增 电台类活动 Browse Code »
  liuzujun

  2021-10-12 17:03:37 +0800  
• e7ba6e04   fix: 赞誉度增幅 餐厅收益计算问题 ... Browse Code »

  level_addition中的效果值6=0计算顺序有误，应该为单份料理的价格提升，实际为单种料理的价格提升
  当卖50份的时候，单价为200，提升价格到250
  应该获得50乘以250的收益
  现在为（200乘以50）+50的收益

  zhangqijia

  2021-10-12 11:24:32 +0800  

11 Oct, 2021

2 commits

• dd328bd6   fix: 常规世界boss，防作弊 Browse Code »
  zhangqijia

  2021-10-11 11:45:56 +0800  
• ec26aa3d   fix: 常规世界boss，日志类型修改 Browse Code »
  zhangqijia

  2021-10-11 10:41:05 +0800  

09 Oct, 2021

2 commits

• 0769908c   feat: 常规世界boss Browse Code »
  zhangqijia

  2021-10-09 19:15:13 +0800  
• 3f9b3dbf   fix: 战令活动，sum字段判空 。 ... Browse Code »

  BattleCommand

  zhangqijia

  2021-10-09 18:00:26 +0800  

30 Sep, 2021

1 commit

• 3f14b267   Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop Browse Code »
  liuzujun

  2021-09-30 14:08:38 +0800