05 Dec, 2020

6 commits

• 75f56020   Merge branch 'develop' into tr/publish ... Browse Dir »

  # Conflicts:
  #	config/nodenames.lua

  熊润斐

  2020-12-05 18:43:16 +0800  
• eb87ab7d   Merge branch 'develop' of 120.26.43.151:wasteland/server into develop Browse Dir »
  liuzujun

  2020-12-05 16:58:25 +0800  
• 4f7cffe5   多队挂机任务取消功能，累充奖励 Browse Dir »
  liuzujun

  2020-12-05 16:58:20 +0800  
• c3b1fa38   缺个tou Browse Dir »
  zhouhaihai

  2020-12-05 15:32:07 +0800  
• b4b28ccd   数据保护 Browse Dir »
  zhouhaihai

  2020-12-05 14:59:16 +0800  
• 782c178b   举报功能 Browse Dir »
  liuzujun

  2020-12-05 10:28:56 +0800  

04 Dec, 2020

4 commits

• e9e384bf   Merge branch 'develop' of 120.26.43.151:wasteland/server into develop Browse Dir »
  liuzujun

  2020-12-04 18:21:01 +0800  
• 86584add   新手卡池，心愿单卡池 Browse Dir »
  liuzujun

  2020-12-04 18:20:57 +0800  
• fed94c7c   错误的函数 Browse Dir »
  zhouhaihai

  2020-12-04 18:07:16 +0800  
• 8cfb25d7   传递 敌人信息 Browse Dir »
  zhouhaihai

  2020-12-04 11:23:17 +0800  

03 Dec, 2020

4 commits

• 36875ec5   宝藏怪 Browse Dir »
  zhouhaihai

  2020-12-03 17:57:39 +0800  
• f2bebfc4   Merge branch 'develop' of 120.26.43.151:wasteland/server into develop Browse Dir »
  liuzujun

  2020-12-03 11:51:36 +0800  
• 847f9a7b   兑换活动，邮件内容修改 Browse Dir »
  liuzujun

  2020-12-03 11:51:30 +0800  
• 6838209b   增加buff Browse Dir »
  zhouhaihai

  2020-12-03 10:45:58 +0800  

27 Nov, 2020

3 commits

• 0c7b1a2c   光环 buga Browse Dir »
  zhouhaihai

  2020-11-27 16:20:56 +0800  
• 3ec5de90   光环 bug Browse Dir »
  zhouhaihai

  2020-11-27 11:16:20 +0800  
• 400f1f91   auras Browse Dir »
  zhouhaihai

  2020-11-27 09:44:06 +0800  

26 Nov, 2020

1 commit

• 22288eb6   bug Browse Dir »
  zhouhaihai

  2020-11-26 16:59:50 +0800  

25 Nov, 2020

1 commit

• fe296849   归还消耗指定道具或钻石 Browse Dir »
  liuzujun

  2020-11-25 21:03:19 +0800  

23 Nov, 2020

4 commits

• d93ec42c   Merge branch 'develop' of 120.26.43.151:wasteland/server into develop Browse Dir »
  liuzujun

  2020-11-23 20:33:23 +0800  
• 8efb24c9   天赋系统属性加成改为百分比 Browse Dir »
  liuzujun

  2020-11-23 20:33:19 +0800  
• be24b6ad   传递 count Browse Dir »
  zhouhaihai

  2020-11-23 15:22:37 +0800  
• ce950b6e   bug Browse Dir »
  zhouhaihai

  2020-11-23 14:21:47 +0800  

20 Nov, 2020

6 commits

• ffb3e2c5   支付bug Browse Dir »
  zhouhaihai

  2020-11-20 20:06:48 +0800  
• 1d83eec2   Merge branch 'bugfix' into develop ... Browse Dir »

  * bugfix:
    充值 整理

  zhouhaihai

  2020-11-20 18:01:31 +0800  
• d705a315   充值 整理 Browse Dir »
  zhouhaihai

  2020-11-20 18:01:18 +0800  
• e4a17692   奖励关卡 满星奖励 Browse Dir »
  zhouhaihai

  2020-11-20 14:32:54 +0800  
• 3139a116   光环相关buff Browse Dir »
  zhouhaihai

  2020-11-20 14:26:23 +0800  
• 3c51e6d4   奖励副本 完成 Browse Dir »
  zhouhaihai

  2020-11-20 11:20:46 +0800  

19 Nov, 2020

6 commits

• 42dcb7da   merge code Browse Dir »
  liuzujun

  2020-11-19 17:29:14 +0800  
• 7d662b85   编队增加战术字段 Browse Dir »
  liuzujun

  2020-11-19 17:27:05 +0800  
• f7f26c15   编队整理 增加 tactics战术 Browse Dir »
  zhouhaihai

  2020-11-19 17:13:53 +0800  
• a80fee7c   光环 Browse Dir »
  zhouhaihai

  2020-11-19 11:58:34 +0800  
• 505479c7   bug Browse Dir »
  zhouhaihai

  2020-11-19 11:17:01 +0800  
• a55177a3   bug Browse Dir »
  zhouhaihai

  2020-11-19 11:07:08 +0800  

18 Nov, 2020

5 commits

• 22b2987b   merge code Browse Dir »
  liuzujun

  2020-11-18 17:46:45 +0800  
• 16634605   多队挂机，天赋道具合成 Browse Dir »
  liuzujun

  2020-11-18 17:45:42 +0800  
• 4615ea54   修改调用位置 Browse Dir »
  zhouhaihai

  2020-11-18 14:43:01 +0800  
• 1e789624   新的 buff 效果 Browse Dir »
  zhouhaihai

  2020-11-18 14:20:32 +0800  
• a95b35ce   删除等级 Browse Dir »
  zhouhaihai

  2020-11-18 11:02:32 +0800