wasteland / server

29 Apr, 2021

1 commit

6232e121 Merge branch 'cn/develop' into cn/publish/preview ... Browse File »
```
# Conflicts:
#	src/csvdata
```
熊润斐
2021-04-29 15:24:26 +0800

24 Apr, 2021

1 commit

a33ade6c rmb礼包改钻石礼包 Browse File »

liuzujun
2021-04-24 17:19:02 +0800

15 Apr, 2021

1 commit

248570a0 Merge branch 'cn/develop' into cn/publish/preview Browse File »

熊润斐
2021-04-15 16:16:14 +0800

09 Apr, 2021

1 commit

18bf12f3 Merge branch 'cn/develop-mysql' into cn/develop Browse File »

chenyueqi
2021-04-09 17:35:19 +0800

02 Apr, 2021

2 commits

340944f1 Merge branch 'cn/develop' into cn/publish/preview Browse File »

熊润斐
2021-04-02 16:30:19 +0800
ce0149f4 Merge branch 'tr/bugfix' into cn/develop Browse File »

熊润斐
2021-04-02 16:30:06 +0800

01 Apr, 2021

1 commit

c6a4c456 boss挑战门票购买可以超出上限 Browse File »

liuzujun
2021-04-01 13:31:16 +0800

29 Mar, 2021

1 commit

d99a4962 火花系统建表，新增虹光玉 Browse File »

liuzujun
2021-03-29 18:01:53 +0800

26 Mar, 2021

1 commit

3fbbd115 Merge branch 'tr/develop' into cn/develop Browse File »

chenyueqi
2021-03-26 14:54:49 +0800

25 Mar, 2021

1 commit

2dbe4fb9 充值礼包自选部分逻辑 Browse File »

chenyueqi
2021-03-25 16:42:34 +0800

23 Mar, 2021

1 commit

1279810c 海港贸易任务新增表 Browse File »

liuzujun
2021-03-23 17:15:31 +0800

16 Mar, 2021

1 commit

225081f7 Merge branch 'cn/develop' into cn/publish/preview Browse File »

熊润斐
2021-03-16 10:22:20 +0800

09 Mar, 2021

1 commit

913e070e 添加订单表，全局id定时回写数据库 Browse File »

liuzujun
2021-03-09 10:57:05 +0800

08 Mar, 2021

1 commit

8ba57e2c 云游戏的充值消息 Browse File »

chenyueqi
2021-03-08 15:58:20 +0800

05 Feb, 2021

2 commits

4c4367aa Merge branch 'cn/develop' into cn/publish/preview Browse File »

熊润斐
2021-02-05 15:28:46 +0800
9cf14ecd Merge branch 'tr/bugfix' into cn/develop Browse File »

熊润斐
2021-02-05 15:28:37 +0800

04 Feb, 2021

1 commit

668f23ea 单位分 Browse File »

zhouhaihai
2021-02-04 19:59:14 +0800

02 Feb, 2021

2 commits

a167daa2 Merge branch 'cn/develop' into cn/publish/preview Browse File »

熊润斐
2021-02-02 17:08:50 +0800
c6c2b828 Merge branch 'tr/bugfix-qa' into cn/develop Browse File »

熊润斐
2021-02-02 17:08:39 +0800

19 Jan, 2021

1 commit

d19b2af3 活动免费礼包判断活动是否开启 Browse File »

liuzujun
2021-01-19 16:46:46 +0800

09 Jan, 2021

2 commits

44311b9f Merge branch 'cn/develop' into cn/publish ... Browse File »
```
# Conflicts:
#	config/nodenames.lua
```
熊润斐
2021-01-09 11:32:47 +0800
b1daa4a8 Merge branch 'bugfix' into cn/develop Browse File »

熊润斐
2021-01-09 11:32:22 +0800

23 Dec, 2020

1 commit

eb5ffd1c 世界boss翻牌奖励活动卡池保底单独记录 Browse File »

liuzujun
2020-12-23 19:04:36 +0800

09 Dec, 2020

2 commits

e159aad6 Merge branch 'cn/develop' into cn/publish Browse File »

chenyueqi
2020-12-09 21:03:13 +0800
775d0388 ios支付订单签名参数错误 Browse File »

chenyueqi
2020-12-09 21:03:00 +0800

08 Dec, 2020

1 commit

2bc706ab 兑换活动重置，累充功能 Browse File »

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

07 Dec, 2020

1 commit

b8b1c164 扭蛋活动，万能碎片bug Browse File »

liuzujun
2020-12-07 16:54:18 +0800

05 Dec, 2020

1 commit

4f7cffe5 多队挂机任务取消功能，累充奖励 Browse File »

liuzujun
2020-12-05 16:58:20 +0800

30 Nov, 2020

1 commit

a90b1f03 Merge branch 'cn/develop' into cn/publish Browse File »

chenyueqi
2020-11-30 15:32:51 +0800

27 Nov, 2020

2 commits

f9b72d4f 支付协议号 Browse File »

chenyueqi
2020-11-27 17:02:44 +0800
7a3a7fff 支付协议号 Browse File »

chenyueqi
2020-11-27 17:01:35 +0800

24 Nov, 2020

2 commits

4d8d33c3 Merge branch 'cn/develop' into cn/publish ... Browse File »

* cn/develop: (30 commits)
  天赋系统属性加成改为百分比
  修改Google的充值参数
  bili-android渠道的充值方法，先临时用改造后的google
  传递 count
  bug
  支付bug
  充值 整理
  奖励关卡 满星奖励
  光环相关buff
  奖励副本 完成
  编队增加战术字段
  编队整理 增加 tactics战术
  光环
  bug
  bug
  多队挂机，天赋道具合成
  修改调用位置
  新的 buff 效果
  删除等级
  天赋技能
  ...

2020-11-24 20:58:40 +0800

cbefef4c Merge branch 'develop' into cn/develop ... Browse File »

* develop: (24 commits)
  天赋系统属性加成改为百分比
  传递 count
  bug
  支付bug
  充值 整理
  奖励关卡 满星奖励
  光环相关buff
  奖励副本 完成
  编队增加战术字段
  编队整理 增加 tactics战术
  光环
  bug
  bug
  多队挂机，天赋道具合成
  修改调用位置
  新的 buff 效果
  删除等级
  天赋技能
  被动触发
  冒险 buff 类型 34 35
  ...

2020-11-24 20:57:12 +0800

23 Nov, 2020

2 commits

ebeefd34 修改Google的充值参数 Browse File »

chenyueqi
2020-11-23 18:09:04 +0800
19c418d9 bili-android渠道的充值方法，先临时用改造后的google Browse File »

chenyueqi
2020-11-23 18:08:32 +0800

20 Nov, 2020

2 commits

ffb3e2c5 支付bug Browse File »

zhouhaihai
2020-11-20 20:06:48 +0800
d705a315 充值整理 Browse File »

zhouhaihai
2020-11-20 18:01:18 +0800

06 Nov, 2020

1 commit

3a3a3ddf 下单前检测商品限购次数 Browse File »

liuzujun
2020-11-06 21:04:18 +0800

14 Sep, 2020

1 commit

073ba265 Merge branch 'develop' into tr/publish ... Browse File »

* develop:
  两个记录bug
  新设备
  遗失的log
  充值返利邮件新增
  调整压测
  error
  探索指令bug, 充值返利活动
  挂机打完困难20101才设定完成引导22
  挂机编队完成的时候服务器主动保存下一步引导，防止极端意外
  探索指令调试完成

2020-09-14 15:32:29 +0800

10 Sep, 2020

1 commit

e52c384f 探索指令bug, 充值返利活动 Browse File »

liuzujun
2020-09-10 17:23:20 +0800