wasteland / server

30 Dec, 2020

1 commit

34d9f192 世界boss 胜利才扣门票，扫荡根据之前的最大值给行动点 Browse Code »

liuzujun
2020-12-30 16:15:05 +0800

29 Dec, 2020

2 commits

54a82e42 Merge branch 'bugfix' of 120.26.43.151:wasteland/server into bugfix Browse Code »

liuzujun
2020-12-29 19:22:21 +0800
ede282c0 付费签到规则改为按登录天数计算进度，世界boss Browse Code »

liuzujun
2020-12-29 19:22:14 +0800

28 Dec, 2020

3 commits

c5e11ffc 解锁条件修改 Browse Code »

zhouhaihai
2020-12-28 20:50:49 +0800
c8c76cda 活动卡池保底出指定英雄 Browse Code »

liuzujun
2020-12-28 10:43:17 +0800
cb8d4368 拆解术式充能的时候领取道具，获得个数计算错误 Browse Code »

chenyueqi
2020-12-28 10:16:48 +0800

25 Dec, 2020

6 commits

de1a55b4 新手卡池限制30抽 Browse Code »

liuzujun
2020-12-25 18:18:24 +0800
5bc3f172 pull csvdata Browse Code »

liuzujun
2020-12-25 17:23:45 +0800
fa2af595 给保底抽配置加默认值10 Browse Code »

liuzujun
2020-12-25 17:21:31 +0800

fbd1b98c Merge branch 'bugfix' into develop ... Browse Code »

* bugfix:
  cb 返利
  重写拆解室功能
  去除globald中发放活动排行奖励
  支付bug

# Conflicts:
#	src/actions/RoleAction.lua

2020-12-25 11:44:43 +0800

320f5b54 cb 返利 Browse Code »

zhouhaihai
2020-12-25 11:16:33 +0800
0a093ba8 重写拆解室功能 Browse Code »

chenyueqi
2020-12-25 09:29:50 +0800

24 Dec, 2020

7 commits

89760dbe 拆解室功能重写 Browse Code »

chenyueqi
2020-12-24 20:52:17 +0800
14f57eed 去除globald中发放活动排行奖励 Browse Code »

liuzujun
2020-12-24 20:42:39 +0800

a952123e Merge branch 'develop' into bugfix ... Browse Code »

* develop: (79 commits)
  世界Boss 增加行动点
  物资危机bug
  物资危机
  冒险bug
  宝藏怪活动
  世界boss翻牌奖励 活动卡池保底单独记录
  充值
  天赋升级写日志报错
  活动剧情解锁
  充值重复
  bug
  下一关提前
  battle Bug
  奖励副本 新机制
  活动礼包购买记录活动过期清理
  挑战活动打完再扣门票
  heros 增加 supports
  挑战关卡活动打完再扣门票
  关卡挑战活动奖励错误bug
  修改活动boss关卡三星条件
  ...

2020-12-24 16:29:30 +0800

59a25ac7 fix conflict Browse Code »

liuzujun
2020-12-24 15:21:42 +0800
6857a37f 世界Boss 增加行动点 Browse Code »

liuzujun
2020-12-24 15:21:05 +0800
e8719dc4 物资危机bug Browse Code »

zhouhaihai
2020-12-24 14:29:53 +0800
558c9044 物资危机 Browse Code »

zhouhaihai
2020-12-24 13:48:22 +0800

23 Dec, 2020

5 commits

a5660239 冒险bug Browse Code »

zhouhaihai
2020-12-23 20:38:19 +0800
161c50cc 宝藏怪活动 Browse Code »

zhouhaihai
2020-12-23 20:37:48 +0800
51cac1d4 Merge branch 'develop' of 120.26.43.151:wasteland/server into develop Browse Code »

liuzujun
2020-12-23 19:04:43 +0800
eb5ffd1c 世界boss翻牌奖励活动卡池保底单独记录 Browse Code »

liuzujun
2020-12-23 19:04:36 +0800
1ce3adac 充值 Browse Code »

zhouhaihai
2020-12-23 11:20:28 +0800

22 Dec, 2020

5 commits

8ec16c21 天赋升级写日志报错 Browse Code »

liuzujun
2020-12-22 16:30:51 +0800
f0c47e33 Merge branch 'develop' of 120.26.43.151:wasteland/server into develop Browse Code »

liuzujun
2020-12-22 15:38:58 +0800
be697585 活动剧情解锁 Browse Code »

liuzujun
2020-12-22 15:38:56 +0800
cd597363 充值重复 Browse Code »

zhouhaihai
2020-12-22 12:18:20 +0800
2b31c43f bug Browse Code »

zhouhaihai
2020-12-22 10:58:43 +0800

21 Dec, 2020

7 commits

76c48085 下一关提前 Browse Code »

zhouhaihai
2020-12-21 20:44:24 +0800
c8235ab8 battle Bug Browse Code »

zhouhaihai
2020-12-21 20:27:35 +0800
55c7c172 奖励副本新机制 Browse Code »

zhouhaihai
2020-12-21 16:33:41 +0800
54379452 fix conflict Browse Code »

liuzujun
2020-12-21 16:09:21 +0800
485c8c35 活动礼包购买记录活动过期清理 Browse Code »

liuzujun
2020-12-21 16:08:10 +0800
23847cc0 挑战活动打完再扣门票 Browse Code »

zhouhaihai
2020-12-21 14:40:14 +0800
821e2704 heros 增加 supports Browse Code »

zhouhaihai
2020-12-21 14:38:15 +0800

19 Dec, 2020

3 commits

8e892c71 挑战关卡活动打完再扣门票 Browse Code »

liuzujun
2020-12-19 16:54:11 +0800
598bd73f 关卡挑战活动奖励错误bug Browse Code »

liuzujun
2020-12-19 13:42:46 +0800
0163328c 修改活动boss关卡三星条件 Browse Code »

liuzujun
2020-12-19 10:33:54 +0800

18 Dec, 2020

1 commit

6d4b10bc Merge branch 'develop' of 120.26.43.151:wasteland/server into develop Browse Code »

liuzujun
2020-12-18 17:27:06 +0800