wasteland / server | GitLab

09 Mar, 2021

5 commits

696ddd64 Merge branch 'tr/bugfix' into tr/publish/preview ... Browse Code »
```
# Conflicts:
#	src/csvdata
```
熊润斐
2021-03-09 21:15:37 +0800
6beca974 Merge branch 'tr/bugfix-qa' into tr/bugfix Browse Code »

熊润斐
2021-03-09 21:03:53 +0800
895ed2a9 Merge branch 'tr/develop' into tr/bugfix-qa Browse Code »

熊润斐
2021-03-09 16:52:34 +0800
6e76008a bug修复：电波塔排行榜协议报错 Browse Code »

liguanghui
2021-03-09 11:27:37 +0800
fd494c0b Merge branch 'tr/develop' into tr/bugfix-qa Browse Code »

熊润斐
2021-03-09 10:39:55 +0800

08 Mar, 2021

6 commits

664e0e07 电波塔对食材的加成计算错误 Browse Code »

chenyueqi
2021-03-08 21:03:11 +0800
5ac65e38 Merge branch 'tr/tower' into tr/develop Browse Code »

chenyueqi
2021-03-08 17:18:04 +0800
d199e7b9 物资危机增加消耗体力类型 Browse Code »

zhouhaihai
2021-03-08 17:07:03 +0800
fd18bc26 电波塔战斗激活消息bug Browse Code »

chenyueqi
2021-03-08 15:54:02 +0800
b3737ad4 Merge branch 'tr/bugfix-qa' into tr/develop ... Browse Code »
```
* tr/bugfix-qa:
  diner 加速错误
  修复老月卡用户的月卡id字段
```
zhouhaihai
2021-03-08 13:48:13 +0800
c60a8b9b diner 加速错误 Browse Code »

zhouhaihai
2021-03-08 13:47:31 +0800

05 Mar, 2021

2 commits

f6293a2f Merge branch 'tr/bugfix' into tr/publish/preview ... Browse Code »
```
* tr/bugfix:
  修复老月卡用户的月卡id字段

# Conflicts:
#	src/csvdata
```
zhouhaihai
2021-03-05 11:58:46 +0800
54f63c13 修复老月卡用户的月卡id字段 Browse Code »

liuzujun
2021-03-05 11:56:54 +0800

04 Mar, 2021

1 commit

4e9566f2 电波塔加成算法解析字段方法修正 Browse Code »

chenyueqi
2021-03-04 17:55:26 +0800

03 Mar, 2021

6 commits

4ee2fe31 电波塔bug Browse Code »

chenyueqi
2021-03-03 20:45:35 +0800
27dd1a36 电波塔分塔开放条件读表 Browse Code »

chenyueqi
2021-03-03 17:56:26 +0800
761b3ea8 再改一波电波塔整容相关信息 Browse Code »

chenyueqi
2021-03-03 17:44:13 +0800
40b19300 电波塔激活加成效果后对各个系统的加成 Browse Code »

chenyueqi
2021-03-03 15:18:38 +0800
436ea511 Merge branch 'tr/bugfix' into tr/publish/preview ... Browse Code »
```
# Conflicts:
#	src/csvdata
```
熊润斐
2021-03-03 10:22:36 +0800
3ddf5aa8 Merge branch 'tr/bugfix-qa' into tr/develop Browse Code »

熊润斐
2021-03-03 10:21:38 +0800

02 Mar, 2021

9 commits

2ffd37cc Merge branch 'tr/bugfix-qa' into tr/bugfix Browse Code »

熊润斐
2021-03-02 21:02:00 +0800
580f0906 Merge branch 'tr/bugfix' into tr/bugfix-qa Browse Code »

熊润斐
2021-03-02 19:25:26 +0800
09da2d40 Merge branch 'tr/develop' into tr/bugfix-qa Browse Code »

熊润斐
2021-03-02 18:03:54 +0800
d4ef50f0 召唤怪物指定地点玩家buff 屏蔽 Browse Code »

zhouhaihai
2021-03-02 17:14:50 +0800
8eaed74e 战令活动开启时清除购买记录，新增Boss挑战门票类型道具 type=20 Browse Code »

liuzujun
2021-03-02 15:59:52 +0800
b7c3e49f Merge branch 'tr/develop' into tr/bugfix-qa Browse Code »

熊润斐
2021-03-02 15:02:47 +0800
7bd7eaa5 buff 叠加判定 Browse Code »

zhouhaihai
2021-03-02 12:07:49 +0800
b8108fcf 某些陷阱不触发被动 Browse Code »

zhouhaihai
2021-03-02 11:53:58 +0800
30f12b27 战令活动过期清购买记录，升级月卡只能同等级续费 Browse Code »

liuzujun
2021-03-02 11:23:10 +0800

01 Mar, 2021

1 commit

2e283f60 月卡升级 Browse Code »

liuzujun
2021-03-01 20:20:38 +0800

24 Feb, 2021

6 commits

04da65df tower GM参数值修正 Browse Code »

chenyueqi
2021-02-24 16:38:30 +0800
e50d0cae 计算电波塔层数的加成效果 Browse Code »

chenyueqi
2021-02-24 16:18:58 +0800
03c619fb 电波塔属性塔功能部分功能草稿 Browse Code »

chenyueqi
2021-02-24 11:08:24 +0800
a124b6b0 Merge branch 'tr/bugfix' into tr/publish/preview Browse Code »

熊润斐
2021-02-24 10:05:43 +0800
263f2579 Merge branch 'tr/bugfix-qa' into tr/bugfix Browse Code »

熊润斐
2021-02-24 10:05:30 +0800
28dadd59 Merge branch 'tr/bugfix' into tr/publish/preview ... Browse Code »
```
# Conflicts:
#	src/csvdata
```
熊润斐
2021-02-24 10:03:25 +0800

20 Feb, 2021

3 commits

e8762443 主动效果 Browse Code »

zhouhaihai
2021-02-20 17:44:26 +0800
f4d0af83 Revert "主动效果" ... Browse Code »
```
This reverts commit 722bce59cb4f05b6e0c958b83141d91b6b2d31ed.
```
zhouhaihai
2021-02-20 17:42:41 +0800
722bce59 主动效果 Browse Code »

zhouhaihai
2021-02-20 17:39:56 +0800

19 Feb, 2021

1 commit

21419818 Merge branch 'tr/bugfix' of 120.26.43.151:wasteland/server into tr/bugfix Browse Code »

liuzujun
2021-02-19 11:23:51 +0800