xichaoyin
|
9e4c1995b7
|
Merge remote-tracking branch 'origin/feature/huangqijiuguan' into release
|
2024-01-12 18:24:57 +08:00 |
|
xichaoyin
|
12f768d887
|
json:配置提交
|
2024-01-12 18:24:25 +08:00 |
|
xichaoyin
|
aca0019d90
|
feat:黄芪酒馆招募次数监控
|
2024-01-12 18:19:43 +08:00 |
|
xichaoyin
|
c52f9b4b9a
|
Merge remote-tracking branch 'origin/feature/skin' into release
|
2024-01-12 17:55:11 +08:00 |
|
xichaoyin
|
129103d061
|
Merge remote-tracking branch 'origin/feature/huangqijiuguan' into release
|
2024-01-12 17:55:00 +08:00 |
|
xichaoyin
|
8fe4e99ddc
|
json:配置提交
|
2024-01-12 17:53:53 +08:00 |
|
|
|
286b10947d
|
外网insertMany报错兼容
|
2024-01-12 17:51:01 +08:00 |
|
xichaoyin
|
a2e3fc1aa9
|
fix:
1：头像框脚本
2：添加监控数据
|
2024-01-12 17:50:37 +08:00 |
|
xichaoyin
|
55cb50a27c
|
feat：heroskin
|
2024-01-12 15:45:56 +08:00 |
|
yushunrui
|
fc1e2c9e1f
|
fix:头像框问题
|
2024-01-12 15:15:23 +08:00 |
|
xichaoyin
|
00ed252403
|
Revert "fix:头像框 聊天框，造型逻辑修改"
This reverts commit 3e43065142.
|
2024-01-12 15:10:54 +08:00 |
|
xichaoyin
|
4c4e1d20dc
|
Revert "fix:处理了头像框和聊天框得逻辑"
This reverts commit e4815b4246.
|
2024-01-12 15:10:54 +08:00 |
|
xichaoyin
|
6d184b20ab
|
Revert "脚本提交，兑换掉落修改礼包内容， 玩家新年头像框刷成永久"
This reverts commit b7c86e9769.
|
2024-01-12 15:10:53 +08:00 |
|
xichaoyin
|
dd9eeca150
|
feat:重置bug修复
|
2024-01-12 14:14:42 +08:00 |
|
xichaoyin
|
8718342e3b
|
feat:log
|
2024-01-12 14:03:18 +08:00 |
|
xichaoyin
|
b27f8e5c64
|
feat:黄芪酒馆
|
2024-01-12 13:42:43 +08:00 |
|
xichaoyin
|
c2f3d0649d
|
json:配置文件提交
|
2024-01-12 03:32:21 +08:00 |
|
xichaoyin
|
f79f341998
|
Merge branch 'feature/huangqijiuguan' into release
|
2024-01-12 03:30:23 +08:00 |
|
xichaoyin
|
1688e5b197
|
feat:黄旗酒馆
|
2024-01-12 03:11:59 +08:00 |
|
xichaoyin
|
e6e1153a49
|
feat:黄旗酒馆
|
2024-01-12 02:53:16 +08:00 |
|
xichaoyin
|
036abb80b4
|
feat:黄芪酒馆
|
2024-01-12 02:29:33 +08:00 |
|
xichaoyin
|
9d3dd2dbc9
|
feat:黄旗酒馆
|
2024-01-12 02:20:16 +08:00 |
|
xichaoyin
|
de40641464
|
Merge branch 'feature/huangqijiuguan' into release
# Conflicts:
# src/public/task.ts
|
2024-01-12 02:07:10 +08:00 |
|
xichaoyin
|
5a8d95307b
|
feat:黄旗酒馆
|
2024-01-12 01:59:37 +08:00 |
|
xichaoyin
|
75e010bbc4
|
feat:黄旗酒馆
|
2024-01-12 01:56:59 +08:00 |
|
xichaoyin
|
cd8e1a44ba
|
任务初始化
|
2024-01-12 01:51:17 +08:00 |
|
xichaoyin
|
b44f083637
|
feat:黄芪酒馆
|
2024-01-12 01:44:51 +08:00 |
|
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 |
|
