11 Nov, 2021

2 commits

• 1df833f9   Merge branch 'cn/develop' into cn/publish/release Browse Dir »
  jiyue

  2021-11-11 14:08:27 +0800  
• 7d5e688f   临时清除活动电台任务 Browse Dir »
  liuzujun

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

09 Nov, 2021

1 commit

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

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

  liuzujun

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

04 Nov, 2021

1 commit

• 1a427820   Merge branch 'cn/develop' into cn/publish/release Browse Dir »
  jiyue

  2021-11-04 14:02:29 +0800  

03 Nov, 2021

1 commit

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

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

01 Nov, 2021

1 commit

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

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

29 Oct, 2021

2 commits

• 0bf143be   Merge branch 'cn/develop' into cn/publish/release Browse Dir »
  jiyue

  2021-10-29 14:30:30 +0800  
• e4814423   fix: 修复 ltrim调用问题 Browse Dir »
  zhangqijia

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

28 Oct, 2021

4 commits

• a653a5c9   Merge branch 'cn/develop' into cn/publish/release Browse Dir »
  jiyue

  2021-10-28 19:04:26 +0800  
• 17c9ca5b   fix: 讨伐电台判空 Browse Dir »
  zhangqijia

  2021-10-28 18:39:47 +0800  
• af973e45   Merge branch 'cn/develop' into cn/publish/release Browse Dir »
  jiyue

  2021-10-28 14:04:52 +0800  
• 27acaa11   修复一个 nil 带来的报错 Browse Dir »
  zhanghualin

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

27 Oct, 2021

5 commits

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

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

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

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

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

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

21 Oct, 2021

1 commit

• b7d38179   Merge branch 'cn/develop' into cn/publish/release Browse Dir »
  jiyue

  2021-10-21 11:17:21 +0800  

20 Oct, 2021

1 commit

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

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

19 Oct, 2021

1 commit

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

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

14 Oct, 2021

10 commits

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

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

  2021-10-14 16:58:09 +0800  
• ea4ea775   Merge branch 'cn/develop' into cn/publish/release Browse Dir »
  jiyue

  2021-10-14 14:53:21 +0800  
• c00d76f7   Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop Browse Dir »
  liuzujun

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

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

  2021-10-14 14:34:49 +0800  
• 84193e7a   Merge branch 'cn/develop' into cn/publish/release Browse Dir »
  jiyue

  2021-10-14 13:21:35 +0800  
• c3f5ce22   fix: 赞誉度增幅中的餐厅齿轮增幅修改 Browse Dir »
  zhangqijia

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

  2021-10-14 10:52:13 +0800  
• f424762f   奇迹魔法 一键领取超上限bug Browse Dir »
  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 Dir »
  zhangqijia

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

  # Conflicts:
  #	src/models/Activity.lua

  liuzujun

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

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

  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 Dir »
  zhangqijia

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

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

09 Oct, 2021

2 commits

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

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

  BattleCommand

  zhangqijia

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

30 Sep, 2021

2 commits

• 17fae2ce   正式服屏蔽gm指令 Browse Dir »
  liuzujun

  2021-09-30 15:26:29 +0800  
• 5037f473   Merge branch 'cn/develop' into cn/publish/release ... Browse Dir »

  # Conflicts:
  #	config/nodenames.lua

  jiyue

  2021-09-30 14:20:59 +0800