Commit Graph

964 Commits

Author SHA1 Message Date
xichaoyin
001a8166b5 Merge branch 'feature/huangqijiuguan' into dev 2024-01-10 17:54:45 +08:00
xichaoyin
273b1865c3 feat:黄旗酒馆 2024-01-10 17:53:44 +08:00
xichaoyin
14796bb06b feat:黄旗酒馆 2024-01-10 17:38:01 +08:00
c3db97b3be 天赋技能 2024-01-10 17:08:21 +08:00
72b215451b Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix 2024-01-10 16:57:21 +08:00
104a1edadc 天赋技能 2024-01-10 16:57:11 +08:00
yushunrui
7feff43ee6 Merge remote-tracking branch 'origin/bugfix' into bugfix 2024-01-10 16:45:22 +08:00
yushunrui
a26aa7dab3 fix:处理强化伙伴活动初始没有任务进度的逻辑 2024-01-10 16:44:53 +08:00
xichaoyin
ca3e973afd patch:终身卡周奖励补发脚本 2024-01-10 15:50:49 +08:00
xichaoyin
0932d3ee47 patch:终身卡周奖励补发脚本 2024-01-10 15:46:41 +08:00
xichaoyin
452f5f3d14 patch:任务修复脚本 2024-01-10 15:19:38 +08:00
xichaoyin
0a296d739a fix:屏蔽检测生成新的任务逻辑 2024-01-10 14:52:41 +08:00
xichaoyin
6d4851930f Merge branch 'dev' of http://git.legu.cc/qixin/HJ_Server into dev 2024-01-10 14:29:20 +08:00
xichaoyin
7550fdf237 feat:黄旗酒馆 2024-01-10 14:29:17 +08:00
yushunrui
0fd7f63f87 Merge branch 'bugfix' into dev
# Conflicts:
#	src/public/player.ts
2024-01-10 14:13:16 +08:00
yushunrui
4596fb537c Merge remote-tracking branch 'origin/bugfix' into bugfix 2024-01-10 14:09:36 +08:00
3bdc98a1f6 Merge branch 'dev' of http://git.legu.cc/qixin/HJ_Server into dev 2024-01-10 14:08:45 +08:00
0642ccb48c 验证专属技能 2024-01-10 14:08:33 +08:00
d8a47e85b2 Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix 2024-01-10 14:01:01 +08:00
f802242b35 fix:自选礼包异常 2024-01-10 14:00:48 +08:00
xichaoyin
d2ed18117f Merge branch 'feature/huangqijiuguan' into dev 2024-01-10 13:48:59 +08:00
xichaoyin
c2ce055c73 fix:黄旗酒馆open修改 2024-01-10 13:48:35 +08:00
xichaoyin
51ddb55637 fix:玩家邮件修复脚本 2024-01-10 13:38:27 +08:00
4c37d4c846 Merge branch 'dev' of http://git.legu.cc/qixin/HJ_Server into dev 2024-01-10 11:35:16 +08:00
c04264a88f 还原饰物和天赋技能 2024-01-10 11:33:03 +08:00
f1963d2e53 Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix 2024-01-09 22:31:04 +08:00
0ddd611c59 去掉无效刷新 2024-01-09 22:30:35 +08:00
xichaoyin
12b1941aa1 Merge branch 'bugfix' into dev 2024-01-09 22:24:00 +08:00
xichaoyin
666b7e51c5 fix:fightlog添加ttl 2024-01-09 22:23:42 +08:00
xichaoyin
73ccfd4921 Merge branch 'bugfix' into dev 2024-01-09 22:17:30 +08:00
xichaoyin
0d736e4854 fix:jjc战斗日志添加_id倒序 2024-01-09 22:14:56 +08:00
yushunrui
b0a3c17927 fix:玩家道具扣除逻辑脚本提交 2024-01-10 18:32:23 +08:00
yushunrui
24cae9a4e9 fix:战令任务每轮重置进度 2024-01-10 16:19:56 +08:00
yushunrui
1c256ab58b fix:竞技场第一名头像特殊处理,可以用道具直接解锁 2024-01-09 22:00:30 +08:00
xichaoyin
4d15b50a66 fix:
配置和协议提交
2024-01-09 17:18:17 +08:00
xichaoyin
a53e7a9887 Merge branch 'feature/huangqijiuguan' into dev 2024-01-09 17:16:46 +08:00
xichaoyin
61afa26e45 feat:
黄旗酒馆
2024-01-09 17:12:11 +08:00
xichaoyin
5714848a35 Merge branch 'feature/skin' into dev 2024-01-08 20:38:04 +08:00
xichaoyin
e914f3f11b feat:
皮肤升级新增本体碎片消耗
2024-01-08 20:37:46 +08:00
xichaoyin
0c26c6d5bb fix:
修复任务添加配置后不会自动生成后续任务
2024-01-08 18:19:51 +08:00
xichaoyin
d91c413603 fix:
战令重置定时器时间计算问题修复
2024-01-08 17:12:11 +08:00
xichaoyin
3f90c61490 Merge branch 'bugfix' into dev 2024-01-08 15:48:33 +08:00
xichaoyin
e016e708c4 fix:
解除屏蔽
2024-01-08 15:48:22 +08:00
ccc6470f7b Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix 2024-01-08 15:40:04 +08:00
85dc5e02ff fix 每日定时器只执行1次 2024-01-08 15:39:48 +08:00
xichaoyin
29204ab949 Merge branch 'bugfix' into dev 2024-01-08 15:26:39 +08:00
xichaoyin
63ce399c56 fix:
战令重置问题
2024-01-08 15:26:24 +08:00
xichaoyin
a9166e8f52 json:配置文件提交 2024-01-08 14:40:23 +08:00
xichaoyin
da0df2ff95 Merge branch 'feature/skin' into dev 2024-01-08 14:25:42 +08:00
xichaoyin
a4188eee24 fix:
皮肤
2024-01-08 14:25:23 +08:00