Commit Graph

990 Commits

Author SHA1 Message Date
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
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
xichaoyin
9d82d08738 Merge branch 'release' of http://git.legu.cc/qixin/HJ_Server into release 2024-01-05 13:34:48 +08:00
xichaoyin
86161fca85 feat:
修改阿里云cli 认证 profile 名称
2024-01-05 13:34:46 +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