xichaoyin
|
e4011067fd
|
Merge branch 'feature/huangqijiuguan' into release
# Conflicts:
# src/json/huodong.json5
# src/public/scheduler/scheduler_newDay.ts
# src/shared/protocols/serviceProto.ts
|
2024-01-12 00:45:51 +08:00 |
|
|
|
75be49d528
|
发奖发错了
|
2024-01-12 00:40:17 +08:00 |
|
|
|
799c0a60d3
|
slzd不需要回复次数
|
2024-01-12 00:40:17 +08:00 |
|
|
|
05a1ab6fb3
|
矿洞结算bug
|
2024-01-12 00:40:16 +08:00 |
|
|
|
38aeaf3247
|
积分容错
|
2024-01-12 00:40:16 +08:00 |
|
|
|
625220ca03
|
聊天分组bug
|
2024-01-12 00:40:16 +08:00 |
|
yushunrui
|
b7c86e9769
|
脚本提交，兑换掉落修改礼包内容， 玩家新年头像框刷成永久
|
2024-01-12 00:40:15 +08:00 |
|
yushunrui
|
e4815b4246
|
fix:处理了头像框和聊天框得逻辑
|
2024-01-12 00:40:00 +08:00 |
|
yushunrui
|
3e43065142
|
fix:头像框 聊天框，造型逻辑修改
|
2024-01-12 00:36:00 +08:00 |
|
xichaoyin
|
d421f06edf
|
fix:丛林狩猎定时器修复
|
2024-01-12 00:33:24 +08:00 |
|
|
|
46a333b87f
|
去掉多余的环境变量，解决pm2集群启动失败问题
|
2024-01-12 00:33:24 +08:00 |
|
xichaoyin
|
3a7d3cadf4
|
fix:时区脚本修复
|
2024-01-12 00:33:23 +08:00 |
|
|
|
0947bc386e
|
addhp不应该取整
|
2024-01-12 00:33:04 +08:00 |
|
|
|
a8d0a87f72
|
配件修正
|
2024-01-12 00:33:04 +08:00 |
|
|
|
74e0286250
|
天赋技能
|
2024-01-12 00:33:03 +08:00 |
|
xichaoyin
|
ac90f9db33
|
Merge branch 'feature/skin' into release
# Conflicts:
# src/cross/protocols/serviceProto.ts
# src/json/huodong.json5
# src/json/pay.json
# src/json/renown_level.json
# src/json/tanxian.json
# src/json/xstask.json
# src/jsonType.ts
# src/module/mongodb.ts
# src/monopoly/protocols/serviceProto.ts
# src/shared/protocols/serviceProto.ts
# src/shared/protocols/user/PtlLogin.ts
# src/shared/public/hero.ts
|
2024-01-12 00:28:09 +08:00 |
|
xichaoyin
|
9154278020
|
feat:黄旗酒馆
|
2024-01-11 23:54:13 +08:00 |
|
xichaoyin
|
2bc993ddd3
|
feat:皮肤
|
2024-01-11 23:29:23 +08:00 |
|
xichaoyin
|
52c24d4507
|
feta:黄旗酒馆
|
2024-01-11 23:10:26 +08:00 |
|
xichaoyin
|
0023683669
|
feat:皮肤
|
2024-01-11 23:01:07 +08:00 |
|
xichaoyin
|
4e12d706fe
|
feat：皮肤
|
2024-01-11 22:43:40 +08:00 |
|
xichaoyin
|
70a901ddf4
|
Merge branch 'feature/skin' of http://git.legu.cc/qixin/HJ_Server into feature/skin
|
2024-01-11 22:36:40 +08:00 |
|
xichaoyin
|
afb4c24322
|
feat:皮肤
|
2024-01-11 22:36:38 +08:00 |
|
xichaoyin
|
a494f2a3d8
|
feat:黄旗酒馆
|
2024-01-11 22:33:01 +08:00 |
|
xichaoyin
|
ba124d82c9
|
feat:黄旗酒馆
|
2024-01-11 22:26:21 +08:00 |
|
yushunrui
|
9484a696b3
|
fix:新增头像激活条件
|
2024-01-11 21:05:52 +08:00 |
|
xichaoyin
|
be0923c849
|
feat:黄芪酒馆排行榜排除0伤害玩家
|
2024-01-11 20:57:48 +08:00 |
|
xichaoyin
|
a600998fd3
|
feat:黄芪酒馆红点
|
2024-01-11 20:52:49 +08:00 |
|
yushunrui
|
748da2a3e9
|
fix:增加英雄皮肤提供的头像
|
2024-01-11 20:49:53 +08:00 |
|
yushunrui
|
5161035eae
|
json:配置文件
|
2024-01-11 18:23:12 +08:00 |
|
xichaoyin
|
42f80bde16
|
json:配置文件
|
2024-01-11 18:22:01 +08:00 |
|
yushunrui
|
369e654772
|
fix:处理了头像框和聊天框得逻辑
|
2024-01-11 18:12:47 +08:00 |
|
yushunrui
|
3d7644dce4
|
fix:头像框 聊天框，造型逻辑修改
|
2024-01-11 18:12:46 +08:00 |
|
xichaoyin
|
561954de17
|
feat:黄旗酒馆
|
2024-01-11 18:00:45 +08:00 |
|
xichaoyin
|
86fbc457f8
|
feat:黄芪酒馆
|
2024-01-11 17:45:37 +08:00 |
|
xichaoyin
|
8d35b1d74c
|
feat:添加黄芪酒馆招募次数任务
|
2024-01-11 14:46:05 +08:00 |
|
xichaoyin
|
f1f792ad82
|
feat:黄芪酒馆
|
2024-01-11 14:38:09 +08:00 |
|
xichaoyin
|
a8051b9767
|
feat:npc添加皮肤
|
2024-01-11 14:19:51 +08:00 |
|
xichaoyin
|
13de3624dc
|
feat:黄旗酒馆
|
2024-01-11 13:57:52 +08:00 |
|
xichaoyin
|
55aa5eac26
|
Revert "fix:时区脚本修复"
This reverts commit 99ccf69f19.
|
2024-01-11 11:59:55 +08:00 |
|
|
|
a7b3f4d49e
|
去掉多余的环境变量，解决pm2集群启动失败问题
|
2024-01-11 11:25:01 +08:00 |
|
xichaoyin
|
6f7eab1701
|
feat:黄旗酒馆
|
2024-01-10 21:57:09 +08:00 |
|
xichaoyin
|
206e87d64c
|
feat:黄旗酒馆
|
2024-01-10 20:50:03 +08:00 |
|
xichaoyin
|
d30f62f6c5
|
feat:黄旗酒馆
|
2024-01-10 19:59:27 +08:00 |
|
xichaoyin
|
8b8e14a609
|
feat：黄旗酒馆
|
2024-01-10 19:39:07 +08:00 |
|
xichaoyin
|
1c18a5b7fd
|
feat:黄旗酒馆
|
2024-01-10 18:56:52 +08:00 |
|
xichaoyin
|
950a048742
|
feat:黄旗酒馆
|
2024-01-10 18:23:42 +08:00 |
|
xichaoyin
|
273b1865c3
|
feat:黄旗酒馆
|
2024-01-10 17:53:44 +08:00 |
|
xichaoyin
|
14796bb06b
|
feat：黄旗酒馆
|
2024-01-10 17:38:01 +08:00 |
|
xichaoyin
|
99ccf69f19
|
fix:时区脚本修复
|
2024-01-10 16:44:25 +08:00 |
|
