Commit Graph

946 Commits

Author SHA1 Message Date
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
09a72cf039 json:配置文件 2024-01-08 20:20:59 +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
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
xichaoyin
ef80c8b984 Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix 2024-01-05 15:05:17 +08:00
xichaoyin
8560986246 fix:
修复丛林猎手段位奖励漏发问题
2024-01-05 15:05:14 +08:00
xichaoyin
75cadfe391 Merge branch 'dev' of http://git.legu.cc/qixin/HJ_Server into dev 2024-01-05 14:46:33 +08:00
xichaoyin
6e87898cfa feat:json提交 2024-01-05 14:46:22 +08:00
fa25e745eb 次数调整 2024-01-05 10:36:50 +08:00
dcb83e9520 次数调整 2024-01-05 10:00:59 +08:00
dy
bd4f128179 Merge remote-tracking branch 'origin/bugfix' into release 2024-01-05 00:38:57 +08:00
xichaoyin
a04394149d fix:
修复破冰bug
2024-01-05 00:37:40 +08:00
xichaoyin
3b3d61795e Merge remote-tracking branch 'origin/feature/weiwang' into release 2024-01-04 22:30:14 +08:00
xichaoyin
98e34a065b Merge branch 'bugfix' into dev 2024-01-04 22:25:31 +08:00
xichaoyin
da37b162d9 fix:
破冰礼包一键领取
2024-01-04 22:25:17 +08:00
xichaoyin
8e1c5412d6 fix:
破冰礼包一键领取
2024-01-04 22:20:30 +08:00
xichaoyin
ca0517c4b4 Merge branch 'bugfix' into dev 2024-01-04 21:41:38 +08:00
xichaoyin
b04ce950cd fix:
充值之后推一次活动红点change
2024-01-04 21:41:21 +08:00
xichaoyin
77087741a7 Merge branch 'bugfix' into dev 2024-01-04 21:37:11 +08:00
xichaoyin
8ec4a46837 fix:
修复礼包在最后一天可以一键领取所有奖励
2024-01-04 21:36:45 +08:00
xichaoyin
7415823947 Merge branch 'bugfix' into dev 2024-01-04 21:05:25 +08:00
xichaoyin
d7f0f22df7 fix:
伙伴招募红点修改
2024-01-04 21:05:11 +08:00
xichaoyin
3a383d6f54 Merge branch 'bugfix' into dev 2024-01-04 20:32:50 +08:00
xichaoyin
779709a32f fix:
伙伴招募红点修改
2024-01-04 20:32:31 +08:00
xichaoyin
6cb6d8f60d Merge branch 'dev' of http://git.legu.cc/qixin/HJ_Server into dev 2024-01-04 19:51:01 +08:00
xichaoyin
b4221ff4b0 feat:json配置提交 2024-01-04 19:48:58 +08:00
dy
01f57b347f 新增活动脚本 2024-01-04 18:25:27 +08:00
xichaoyin
7aaf803fb3 Merge branch 'feature/weiwang' into dev 2024-01-04 18:08:20 +08:00
xichaoyin
ec40da9ad5 fix:
修复战斗威望属性没有生效
2024-01-04 18:08:05 +08:00
dy
28adc88ff0 新增活动脚本 2024-01-04 18:04:39 +08:00
xichaoyin
72377fa50d Merge branch 'feat/skin' into dev 2024-01-04 17:49:17 +08:00
xichaoyin
83485d0fd0 fix:
皮肤系统
2024-01-04 17:42:14 +08:00
xichaoyin
e2df48498a Merge branch 'feature/weiwang' into dev 2024-01-04 17:17:28 +08:00
xichaoyin
42601c29fd fix:
修改gud中weiwang字段为weiwangbuff
2024-01-04 17:17:10 +08:00
dy
3c7985642e Merge branch 'bugfix' into dev 2024-01-04 17:04:36 +08:00
dy
a50b2624ac 累计充值红点 2024-01-04 17:04:01 +08:00
dy
65d306227b 领奖,红点 2024-01-04 16:56:33 +08:00
dy
38b2f9a99e 破冰礼包增加最后一天可领取所有奖励 2024-01-04 16:50:16 +08:00
xichaoyin
a0d06cdaf4 Merge branch 'feature/weiwang' into dev 2024-01-04 16:13:12 +08:00
xichaoyin
2e054daa65 fix:
修复威望系统属性在探险战斗中没有生效
2024-01-04 16:12:55 +08:00