Commit Graph

1078 Commits

Author SHA1 Message Date
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
a9a5193efe Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix 2024-01-08 14:03:23 +08:00
e597f2969e 全局API接口锁定机制 2024-01-08 14:03:09 +08:00
xichaoyin
ed8fe77656 Merge branch 'bugfix' into dev 2024-01-08 13:49:52 +08:00
xichaoyin
e469ed0b6a fix:
追杀令无限刷bug修复
2024-01-08 13:49:25 +08:00
xichaoyin
ee9114dce4 json:策划json提交 2024-01-08 11:22:39 +08:00
xichaoyin
b354c61358 fix:
养成目标
2024-01-06 17:51:24 +08:00
xichaoyin
c82adea71f Merge branch 'bugfix' into dev 2024-01-06 17:39:44 +08:00
xichaoyin
35d51a3811 fix:
养成目标
2024-01-06 17:39:32 +08:00
xichaoyin
2a35b81f78 Merge branch 'bugfix' into dev 2024-01-06 17:31:25 +08:00
xichaoyin
29f7133f10 fix:
活动刷新脚本
2024-01-06 17:30:57 +08:00
xichaoyin
2d62a387b6 fix:
养成目标礼包重置
2024-01-06 17:30:41 +08:00
xichaoyin
23fd9317ad Merge branch 'dev' of http://git.legu.cc/qixin/HJ_Server into dev 2024-01-06 16:33:08 +08:00
xichaoyin
a8d8ddf954 Merge branch 'feature/skin' into dev 2024-01-06 16:33:05 +08:00
xichaoyin
220717f4a4 fix:
bug
2024-01-06 16:32:46 +08:00
xichaoyin
5e50e29f0a Merge branch 'dev' of http://git.legu.cc/qixin/HJ_Server into dev 2024-01-06 14:59:50 +08:00
xichaoyin
6a81520c68 json:配置提交 2024-01-06 14:59:42 +08:00
xichaoyin
f61b59123b fix:
zhanling重置问题
2024-01-06 00:07:27 +08:00
xichaoyin
2e99a2d592 Merge branch 'feature/skin' into dev 2024-01-05 21:27:23 +08:00
xichaoyin
0902ab6cd5 fix:
bug
2024-01-05 21:26:42 +08:00
xichaoyin
95c767a21f Merge branch 'feature/skin' into dev 2024-01-05 21:21:16 +08:00
xichaoyin
d987b1143b fix:
bug
2024-01-05 21:21:03 +08:00
xichaoyin
82b3a45884 fix:
bingo
2024-01-05 21:12:45 +08:00
xichaoyin
f9b6f8901b Merge branch 'feature/skin' into dev 2024-01-05 21:04:04 +08:00
xichaoyin
1f36269ac9 fix:
bug
2024-01-05 21:03:47 +08:00
xichaoyin
4e2b7ca74e Merge branch 'feature/skin' into dev 2024-01-05 20:46:58 +08:00
xichaoyin
5ba52ad2c8 fix:
目录结构调整
2024-01-05 20:46:46 +08:00
xichaoyin
01c4f28139 Merge branch 'feature/skin' into dev 2024-01-05 20:21:32 +08:00
xichaoyin
70ad3577f8 fix:
皮肤bingo
2024-01-05 20:21:17 +08:00
xichaoyin
3f36fa83ab Merge branch 'feature/skin' into dev 2024-01-05 20:09:26 +08:00
xichaoyin
04fe3029b3 fix:
json格式定义
2024-01-05 20:09:11 +08:00
xichaoyin
edf071105e Merge branch 'feature/skin' into dev 2024-01-05 19:49:59 +08:00
xichaoyin
12d092677a fix:
皮肤穿戴bug
2024-01-05 19:49:47 +08:00
7c3b5e985c Merge pull request 'release' (#1) from release into master 2024-01-05 16:30:25 +08:00
dy
3c54ebe0c4 json:
扭蛋机配置概率修改
2024-01-05 16:03:56 +08:00
xichaoyin
8415d675c4 json:
cehua_public/json配置文件同步
2024-01-05 15:24:03 +08:00
xichaoyin
96b71de06d Merge branch 'bugfix' into release 2024-01-05 15:22:38 +08:00