27 Oct, 2021

5 commits

• 5ef0f2c7   Merge branch 'cn/develop' into cn/publish/preview Browse Code »
  jiyue

  2021-10-27 15:46:08 +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

2 commits

• 057afd89   Merge branch 'cn/develop' into cn/publish/preview Browse Code »
  jiyue

  2021-10-20 18:06:12 +0800  
• 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

12 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  
• 3127068f   fix: delete log Browse Code »
  zhangqijia

  2021-10-14 14:54:18 +0800  
• 265ee99f   商店购买刷购买上限bug 导致虹光玉溢出 Browse Code »
  liuzujun

  2021-10-14 14:54:18 +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  
• 25e5cbb7   Merge branch 'cn/develop' into cn/publish/preview Browse Code »
  jiyue

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

  2021-10-14 13:07:30 +0800  
• d66e5487   Merge branch 'cn/develop' into cn/publish/preview ... Browse Code »

  # Conflicts:
  #	src/csvdata

  jiyue

  2021-10-14 11:06:48 +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  

13 Oct, 2021

1 commit

• f9823bb4   Merge branch 'cn/develop' into cn/publish/preview Browse Code »
  jiyue

  2021-10-13 18:04:02 +0800  

12 Oct, 2021

5 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  
• 7a749326   Merge branch 'cn/develop' into cn/publish/preview ... Browse Code »

  # Conflicts:
  #	config/nodenames.lua

  jiyue

  2021-10-12 09:54:11 +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

2 commits

• 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  
• 012f7893   添加 拉满日活跃度 gm指令 Browse Code »
  liuzujun

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

28 Sep, 2021

7 commits

• 311e4c8d   Merge branch 'cn/develop' into cn/publish/preview Browse Code »
  jiyue

  2021-09-28 18:24:44 +0800  
• 37c968fa   fix: 礼包码奖励改为邮件 Browse Code »
  zhangqijia

  2021-09-28 16:52:21 +0800  
• 58893852   Merge branch 'cn/develop' into cn/publish/preview Browse Code »
  jiyue

  2021-09-28 15:10:18 +0800  
• 6e0a6d6b   fix: 礼包兑换码奖励改回放入背包 Browse Code »
  zhangqijia

  2021-09-28 15:09:34 +0800  
• ced79bc3   Merge branch 'cn/develop' into cn/publish/preview Browse Code »
  jiyue

  2021-09-28 14:54:05 +0800  
• 6ad7e803   fix: 礼包兑换码奖励通过邮件发送 Browse Code »
  zhangqijia

  2021-09-28 14:50:34 +0800  
• 79b03260   Merge branch 'cn/develop' into cn/publish/preview Browse Code »
  jiyue

  2021-09-28 10:51:09 +0800  

27 Sep, 2021

1 commit

• c8981ed2   chatTimes数据下发 Browse Code »
  liuzujun

  2021-09-27 16:33:58 +0800