15 Dec, 2020

2 commits

• 7cba6588   Merge branch 'develop' into player Browse Dir »
  熊润斐

  2020-12-15 12:05:10 +0800  
• 576c791c   玛尼英雄帖活动通过任务bug 元旦挂机活动 Browse Dir »
  测试

  2020-12-15 11:51:47 +0800  

14 Dec, 2020

7 commits

• 46b128fd   多队挂机70005报错 Bug Browse Dir »
  测试

  2020-12-14 21:04:24 +0800  
• b1b3c0d6   合成道具数量不对bug ... Browse Dir »

  # Conflicts:
  #	src/csvdata

  测试

  2020-12-14 21:04:19 +0800  
• cf1d48e8   多队挂机70005报错 Bug Browse Dir »
  测试

  2020-12-14 19:56:36 +0800  
• cd949029   合成道具数量不对bug Browse Dir »
  测试

  2020-12-14 17:35:33 +0800  
• ef3450bd   Merge branch 'develop' of 120.26.43.151:wasteland/server into develop Browse Dir »
  测试

  2020-12-14 17:25:47 +0800  
• 66fe093a   元旦关卡活动 Browse Dir »
  测试

  2020-12-14 17:25:45 +0800  
• d3e7f275   不要穿装备的引导了 Browse Dir »
  chenyueqi

  2020-12-14 16:11:21 +0800  

10 Dec, 2020

1 commit

• 8e1a3c42   Merge branch 'develop' into player ... Browse Dir »

  # Conflicts:
  #	config/develop.lua
  #	config/nodenames.lua

  熊润斐

  2020-12-10 19:20:45 +0800  

09 Dec, 2020

1 commit

• 68a6dc62   匹配规则调整 Browse Dir »
  zhouhaihai

  2020-12-09 15:37:34 +0800  

08 Dec, 2020

2 commits

• 1be743f3   扭蛋机调试 Browse Dir »
  测试

  2020-12-08 21:05:20 +0800  
• 2bc706ab   兑换活动重置，累充功能 Browse Dir »
  测试

  2020-12-08 16:55:14 +0800  

07 Dec, 2020

3 commits

• b8b1c164   扭蛋活动，万能碎片bug Browse Dir »
  测试

  2020-12-07 16:54:18 +0800  
• 819f6c60   战斗不判断防守阵容 Browse Dir »
  zhouhaihai

  2020-12-07 14:58:36 +0800  
• 53227d9c   pvp 编队胜利推送 Browse Dir »
  zhouhaihai

  2020-12-07 14:51:40 +0800  

05 Dec, 2020

4 commits

• eb87ab7d   Merge branch 'develop' of 120.26.43.151:wasteland/server into develop Browse Dir »
  测试

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

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

  2020-12-05 15:32:07 +0800  
• 782c178b   举报功能 Browse Dir »
  测试

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

04 Dec, 2020

3 commits

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

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

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

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

03 Dec, 2020

1 commit

• 847f9a7b   兑换活动，邮件内容修改 Browse Dir »
  测试

  2020-12-03 11:51:30 +0800  

25 Nov, 2020

1 commit

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

  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 »
  测试

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

  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

5 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  
• 3c51e6d4   奖励副本 完成 Browse Dir »
  zhouhaihai

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

19 Nov, 2020

3 commits

• 42dcb7da   merge code Browse Dir »
  测试

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

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

  2020-11-19 17:13:53 +0800  

18 Nov, 2020

3 commits

• 22b2987b   merge code Browse Dir »
  测试

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

  2020-11-18 17:45:42 +0800  
• a95b35ce   删除等级 Browse Dir »
  zhouhaihai

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