19 Aug, 2021

5 commits

• bdd6c00d   Merge branch 'cn/develop' into cn/publish/preview ... Browse Code »

  * cn/develop:
    东银河订单加签

  saicom

  2021-08-19 15:45:34 +0800  
• c0290d89   东银河订单加签 Browse Code »
  saicom

  2021-08-19 15:45:17 +0800  
• 26f9685e   Merge branch 'cn/develop' into cn/publish/preview Browse Code »
  jiyue

  2021-08-19 13:30:56 +0800  
• ebe413bc   Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop Browse Code »
  saicom

  2021-08-19 09:14:00 +0800  
• d742048c   ios充值前面改为东银河 Browse Code »
  saicom

  2021-08-19 09:13:57 +0800  

18 Aug, 2021

1 commit

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

  2021-08-18 16:50:02 +0800  

17 Aug, 2021

1 commit

• 9e5f9701   feat: 玛尼的英雄帖增加任务类型 ... Browse Code »

  增加任务类型：
  44：玩家拥有拾荒者总星级达到xxx
  45：玩家累计解锁xx张CG

  zhangqijia

  2021-08-17 15:43:45 +0800  

16 Aug, 2021

1 commit

• cd90db08   神稀购买门票协议顺序修改 Browse Code »
  liuzujun

  2021-08-16 18:38:53 +0800  

14 Aug, 2021

2 commits

• 5c8c3b70   离线角色强制保存 Browse Code »
  liuzujun

  2021-08-14 22:04:47 +0800  
• a8bab292   离线对象保存bug Browse Code »
  liuzujun

  2021-08-14 17:57:39 +0800  

13 Aug, 2021

7 commits

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

  2021-08-13 22:07:15 +0800  
• 29c70fba   添加更新sql affect row = 0 log Browse Code »
  liuzujun

  2021-08-13 22:04:31 +0800  
• 304fbbeb   Merge branch 'cn/develop' into cn/publish/preview ... Browse Code »

  # Conflicts:
  #	src/csvdata

  jiyue

  2021-08-13 21:10:24 +0800  
• 209c42ff   添加道具及时保存 Browse Code »
  liuzujun

  2021-08-13 21:04:54 +0800  
• 8d6f978d   Merge branch 'cn/develop' into cn/publish/preview ... Browse Code »

  # Conflicts:
  #	src/csvdata

  jiyue

  2021-08-13 20:33:26 +0800  
• 2f86b7e2   限时礼包清理payR Browse Code »
  liuzujun

  2021-08-13 17:17:27 +0800  
• b92a81c9   CB2限时礼包 Browse Code »
  liuzujun

  2021-08-13 15:35:27 +0800  

12 Aug, 2021

3 commits

• 89894b71   Merge branch 'cn/develop' into cn/publish/preview ... Browse Code »

  * cn/develop:
    神稀扣门票逻辑修改

  liuzujun

  2021-08-12 18:18:47 +0800  
• a29d8377   Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop Browse Code »
  liuzujun

  2021-08-12 17:12:34 +0800  
• 74bb1229   神稀扣门票逻辑修改 Browse Code »
  liuzujun

  2021-08-12 17:12:31 +0800  

11 Aug, 2021

2 commits

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

  2021-08-11 16:29:08 +0800  
• 923a626e   feat: 远征， 增加消耗虹光玉的任务， 任务类型是43 Browse Code »
  zhangqijia

  2021-08-11 15:14:10 +0800  

10 Aug, 2021

2 commits

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

  2021-08-10 18:45:58 +0800  
• d85ecb3f   神稀祭消耗门票bug Browse Code »
  liuzujun

  2021-08-10 16:16:14 +0800  

09 Aug, 2021

5 commits

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

  2021-08-09 20:33:21 +0800  
• e8dce82e   fix: 破冰礼包增加购买记录，用于客户端 展示 Browse Code »
  zhangqijia

  2021-08-09 19:34:05 +0800  
• b0a6cf59   fix: 购买战令后，奖励没发放的bug Browse Code »
  zhangqijia

  2021-08-09 18:43:11 +0800  
• 9fa9ebd9   fix: 海港贸易商店 物品的 shop 值 5 改为 4 Browse Code »
  zhangqijia

  2021-08-09 14:55:58 +0800  
• 0fc7fc5e   fix: 修复 代理拾荒区域特产未获得的bug Browse Code »
  zhangqijia

  2021-08-09 12:28:48 +0800  

07 Aug, 2021

4 commits

• 1a7519ba   fix: 一番赏 抽扭蛋机， incentive和special字段，如果没有对应奖励，则不加入对应的字段 Browse Code »
  zhangqijia

  2021-08-07 18:08:01 +0800  
• 7c3dbe6d   feat: 一番赏 扭蛋机信息-增加roleProgress字段，标识抽取进度。 Browse Code »
  zhangqijia

  2021-08-07 17:54:53 +0800  
• 639bbdff   fix: 一番赏 获取扭蛋机列表，请求参数 coin 改为id Browse Code »
  zhangqijia

  2021-08-07 14:42:51 +0800  
• da026be2   fix: 一番赏 扭蛋机刷新机制 使用定时器刷新，每秒检测一次。 Browse Code »
  zhangqijia

  2021-08-07 11:51:08 +0800  

06 Aug, 2021

7 commits

• cf32785a   fix: 设置 onlineCount 全局变量 Browse Code »
  zhangqijia

  2021-08-06 17:04:37 +0800  
• fc88324a   Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop Browse Code »
  zhangqijia

  2021-08-06 16:59:00 +0800  
• a5a46483   fix: 一番赏 修复消耗票兑换 不增加消耗票的bug Browse Code »
  zhangqijia

  2021-08-06 16:56:30 +0800  
• 06c7246e   按500人分线 Browse Code »
  liuzujun

  2021-08-06 15:57:14 +0800  
• 652ef8f7   fix: 一番赏 修复广播capsuleId 为空的问题 Browse Code »
  zhangqijia

  2021-08-06 15:27:16 +0800  
• f2f84157   fix: 一番赏 修复king赏bug Browse Code »
  zhangqijia

  2021-08-06 14:11:37 +0800  
• 078bdb2f   fix: 一番赏 特殊赏的抽奖记录的数据结构修改 ... Browse Code »

  1. 修改特殊赏抽奖记录的数据结构  {1={},2={}} key=触发特殊赏的 抽奖次数， v=特殊赏商品
  table
  方便客户端把特殊赏的抽奖记录给加入到普通商品的抽奖记录里
  
  2. 修复reset_capsule指令无效的bug

  zhangqijia

  2021-08-06 11:52:54 +0800