wasteland / server | GitLab

12 Oct, 2021

1 commit

7a749326 Merge branch 'cn/develop' into cn/publish/preview ... Browse Dir »
```
# Conflicts:
#	config/nodenames.lua
```
jiyue
2021-10-12 09:54:11 +0800

30 Sep, 2021

1 commit

012f7893 添加拉满日活跃度 gm指令 Browse Dir »

liuzujun
2021-09-30 14:08:28 +0800

17 May, 2021

1 commit

3ee9494b Merge branch 'cn/develop' into cn/publish/preview Browse Dir »

熊润斐
2021-05-17 14:10:53 +0800

10 May, 2021

1 commit

6afa6078 爬塔成就bug Browse Dir »

liuzujun
2021-05-10 17:02:23 +0800

29 Apr, 2021

1 commit

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

20 Apr, 2021

1 commit

0df83fa9 料理解锁bug Browse Dir »

liuzujun
2021-04-20 13:57:20 +0800

15 Apr, 2021

2 commits

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

熊润斐
2021-04-15 16:16:14 +0800
efabf9d8 添加预发布mysql配置 Browse Dir »

liuzujun
2021-04-15 15:22:13 +0800

15 Mar, 2021

1 commit

9b69ca55 mysql 配置添加 Browse Dir »

liuzujun
2021-03-15 15:18:52 +0800

11 Nov, 2020

1 commit

ab016bf6 配置文件 Browse Dir »

zhouhaihai
2020-11-11 16:56:17 +0800

27 Oct, 2020

2 commits

551a935b Merge branch 'develop' into tr/publish Browse Dir »

熊润斐
2020-10-27 20:01:36 +0800
1a076875 录像 Browse Dir »

zhouhaihai
2020-10-27 14:30:40 +0800

26 Oct, 2020

1 commit

2f148e9e 关闭日志 Browse Dir »

zhouhaihai
2020-10-26 20:18:35 +0800

13 Oct, 2020

3 commits

63df76e7 排队队列 Browse Dir »

zhouhaihai
2020-10-13 15:01:20 +0800

e677aec1 Merge branch 'develop' into tr/publish ... Browse Dir »

* develop:
  排队功能
  付费签到改为主动领取，战斗关卡不一定是当前挂机关卡
  推送
  挂机关卡可以选择，经验金币根据最高关卡计算
  bug
  挂机排除噩梦难度
  英雄帖任务bug
  被动技新
  英雄帖活动初始化
  日历活动 穿戴x个y品质铭文
  英雄令英雄收集相关任务
  英雄帖任务简单类型测试

2020-10-13 15:00:38 +0800

5e6af9d6 排队功能 Browse Dir »

zhouhaihai
2020-10-13 14:39:11 +0800

29 Aug, 2020

3 commits

abe6f9d5 签名回调地址由客户端发送 Browse Dir »

zhouhaihai
2020-08-29 15:42:10 +0800
45bf6f3d Merge branch 'develop' into tr/publish Browse Dir »

zhouhaihai
2020-08-29 15:41:38 +0800
ba84f3c7 签名回调地址由客户端上传 Browse Dir »

zhouhaihai
2020-08-29 15:40:15 +0800

28 Aug, 2020

1 commit

a5c70352 开启日志 Browse Dir »

zhouhaihai
2020-08-28 18:03:57 +0800

26 Aug, 2020

3 commits

a22485f3 Merge branch 'develop' into tr/publish ... Browse Dir »
```
# Conflicts:
#	src/actions/StoreAction.lua
```
zhouhaihai
2020-08-26 21:07:48 +0800
5bd12066 增加pay_url Browse Dir »

zhouhaihai
2020-08-26 21:05:15 +0800
88c6759a Merge branch 'develop' into tr/publish ... Browse Dir »
```
# Conflicts:
#	src/actions/HeroAction.lua
```
zhouhaihai
2020-08-26 10:21:33 +0800

11 Aug, 2020

1 commit

4da209ac 配置文件 Browse Dir »

zhouhaihai
2020-08-11 13:57:20 +0800

30 Jul, 2020

1 commit

39e60fd1 支持上传 oss Browse Dir »

zhouhaihai
2020-07-30 20:58:48 +0800

08 Jul, 2020

1 commit

081dd429 配置文件梳理 Browse Dir »

zhouhaihai
2020-07-08 11:40:36 +0800