Commit Graph

1310 Commits

Author SHA1 Message Date
yzh
f38946dc7a 数值:等级 2021-12-15 21:42:24 +08:00
jingyushiwo
55e17ff5f2 添加礼包修改 2021-12-15 13:33:54 +08:00
luying
2092d692df Merge branch 'master' into feature/backend 2021-12-15 09:53:28 +08:00
yzh
cb865ae6af 关卡:经验和消耗 2021-12-14 21:10:12 +08:00
luying
d4722c4099 Merge branch 'master' into feature/backend
# Conflicts:
#	game-server/app/servers/connector/handler/entryHandler.ts
#	game-server/app/servers/role/handler/itemHandler.ts
#	shared/consts/constModules/sysConst.ts
#	shared/pubUtils/util.ts
#	web-server/app.ts
#	web-server/app/service/Auth.ts
2021-12-14 18:08:44 +08:00
yzh
e9c471c583 数值:体力表 2021-12-14 11:43:49 +08:00
yzh
986f6207ac 关卡:324 2021-12-14 11:16:49 +08:00
luying
7d2c5da109 fix:delete json 2021-12-13 16:54:46 +08:00
zhaolei
bad0f6a13c 关卡:特技表更新冲突修复 2021-12-13 16:49:27 +08:00
zhaolei
32caff1eb4 Merge branch 'master' of https://gitlab.trgame.cn/zyztech/zyz_server 2021-12-13 16:47:08 +08:00
yzh
6218de69d8 关卡:324 2021-12-12 20:27:51 +08:00
yzh
fbc643eca5 关卡:316 2021-12-10 18:29:45 +08:00
zhaolei
58c6b9bb70 关卡:特技表更新 2021-12-10 16:14:27 +08:00
zhaolei
7e517f1e12 关卡:PVP 2021-12-10 15:39:32 +08:00
jingyushiwo
efc7b5a73f 事件:添加名 2021-12-10 13:47:27 +08:00
chenxingzhi
a68c22d7f3 修改:pvp表 2021-12-09 20:09:55 +08:00
yzh
876b3834d5 关卡:吊桥 2021-12-09 19:06:08 +08:00
yzh
10f9d8b631 关卡:36地形改动 2021-12-09 16:53:52 +08:00
yzh
5079433c66 关卡:改民居移动 2021-12-09 16:16:53 +08:00
yzh
4d4456470b 武将:拒马 2021-12-08 22:00:10 +08:00
yzh
156b8cd8a4 关卡:2512所需的陷阱平原 2021-12-08 19:34:33 +08:00
yzh
4f802802e7 关卡:312关卡信息修改 2021-12-08 19:28:53 +08:00
yzh
e680644ea3 一个美丽的误会 2021-12-08 18:22:17 +08:00
yzh
9eed858088 关卡:传令兵spine对应 2021-12-08 18:10:57 +08:00
yzh
747bd2ee75 关卡:地形透明度 2021-12-08 17:49:23 +08:00
yzh
8b7cc31da6 关卡:新增地形字段 2021-12-08 17:11:46 +08:00
yajunlu
6d1e78646c 关卡:主线奖励更新 2021-12-08 16:00:26 +08:00
zhaolei
4cc3a3cef8 关卡:远征 2021-12-08 15:57:06 +08:00
yzh
6633eb7583 关卡:spine修改 2021-12-08 15:21:13 +08:00
yzh
648d1fc3dd 关卡:修改地形对应的spine 2021-12-08 13:53:44 +08:00
yzh
b1401be976 关卡:改拒马 2021-12-08 12:02:39 +08:00
luying
aec83c1481 Merge commit '7cfbc45e80094334c9da8fe00c4f5833d67082a7' into feature/backend 2021-12-08 10:25:33 +08:00
yzh
7cfbc45e80 关卡:地形和攻城兵种 2021-12-07 20:23:37 +08:00
yzh
6d85b41c40 关卡:投石车spine 2021-12-07 11:08:48 +08:00
luying
103314a8bf 后台:更新开服邮件 2021-12-07 10:34:52 +08:00
yzh
764ab98054 关卡:更改spine配置 2021-12-06 19:42:03 +08:00
jingyushiwo
e688762389 关卡:每日、秘境关卡等级限制 2021-12-06 15:05:58 +08:00
yzh
322a215328 关卡:2512朝向 2021-12-06 14:55:00 +08:00
yajunlu
dcc565be01 更新 2021-12-06 14:46:15 +08:00
yzh
48f9ca2c8b 关卡:补充血池、阴兵位置 2021-12-06 13:55:49 +08:00
luying
d33eb67429 Merge branch 'master' into feature/backend 2021-12-06 09:37:55 +08:00
yzh
9293263d45 关卡:新增2小兵 2021-12-05 21:30:17 +08:00
yzh
baccf460fd 关卡:地形 2021-12-05 21:15:15 +08:00
yzh
1c4be24d37 关卡:阴兵位置 2021-12-05 20:55:54 +08:00
yzh
26b842d8fc 关卡:2512位置 2021-12-04 16:58:14 +08:00
yzh
2811c0f1de 关卡:2512 2021-12-04 16:41:26 +08:00
yzh
5c64df9d24 关卡:2511阴兵立绘 2021-12-04 15:26:51 +08:00
yzh
cdacda74a9 关卡:2511和2512信息修改 2021-12-04 14:17:39 +08:00
luying
b505381fa9 Merge branch 'master' into feature/backend
# Conflicts:
#	game-server/app/servers/connector/filter/global.ts
2021-12-03 18:36:39 +08:00
yzh
a6ee89854a 关卡:遗迹前置id 2021-12-03 17:17:47 +08:00