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  

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

3 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  
• c5fe43c2   fix: 活动派遣不占用正常讨伐电台派遣队伍数量 Browse Dir »
  zhangqijia

  2021-10-27 10:31:55 +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  

14 Oct, 2021

6 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  
• cd4bc13c   商店购买刷购买上限bug 导致虹光玉溢出 Browse Dir »
  liuzujun

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

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

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

11 Oct, 2021

1 commit

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

  2021-10-11 11:45:56 +0800  

09 Oct, 2021

1 commit

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

  2021-10-09 19:15:13 +0800  

30 Sep, 2021

4 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  
• 3f14b267   Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop Browse Dir »
  liuzujun

  2021-09-30 14:08:38 +0800  
• 012f7893   添加 拉满日活跃度 gm指令 Browse Dir »
  liuzujun

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

28 Sep, 2021

5 commits

• bd009f55   fix: 礼包兑换码奖励改回放入背包 Browse Dir »
  zhangqijia

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

  2021-09-28 15:09:34 +0800  
• bc26ccab   Merge branch 'cn/develop' into cn/publish/release Browse Dir »
  jiyue

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

  2021-09-28 14:50:34 +0800  
• e51f5f1d   Merge branch 'cn/develop' into cn/publish/release Browse Dir »
  jiyue

  2021-09-28 11:20:15 +0800  

27 Sep, 2021

1 commit

• 171abf99   每日世界聊天上限 Browse Dir »
  liuzujun

  2021-09-27 15:47:19 +0800  

26 Sep, 2021

4 commits

• 62920af9   fix: 奖励关卡挑战卡消耗逻辑调整 ... Browse Dir »

  bonusC 的数据结构修改为 {"c"=0, "b"=0}

  zhangqijia

  2021-09-26 18:22:33 +0800  
• 2c6371cb   Merge remote-tracking branch 'origin/cn/develop' into cn/develop ... Browse Dir »

  # Conflicts:
  #	src/actions/GmAction.lua

  zhangqijia

  2021-09-26 16:54:19 +0800  
• 7a515b60   feat: 增加一个礼包码的接口 ... Browse Dir »

  1. 把原来的礼包码协议和新增的礼包码接口的共同部分写成一个函数
  2. 增加一个GM指令调用获取礼包。

  zhangqijia

  2021-09-26 16:50:05 +0800  
• cfae632e   玩家商品购买次数减一 Browse Dir »
  liuzujun

  2021-09-26 09:09:22 +0800  

23 Sep, 2021

2 commits

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

  2021-09-23 21:02:31 +0800  
• c0308568   fix: 跨天登录才计登录天数 Browse Dir »
  zhangqijia

  2021-09-23 14:51:14 +0800  

22 Sep, 2021

1 commit

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

  2021-09-22 20:02:28 +0800