Commit Graph

1078 Commits

Author SHA1 Message Date
xichaoyin
0023683669 feat:皮肤 2024-01-11 23:01:07 +08:00
08a9dd335a 发奖发错了 2024-01-11 22:52:24 +08:00
xichaoyin
9744576070 Merge branch 'feature/skin' into dev 2024-01-11 22:43:49 +08:00
xichaoyin
4e12d706fe feat:皮肤 2024-01-11 22:43:40 +08:00
xichaoyin
06cefdeb53 Merge branch 'feature/skin' into dev 2024-01-11 22:36:48 +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
xichaoyin
3b0495fe24 Merge branch 'feature/huangqijiuguan' into dev 2024-01-11 22:33:13 +08:00
xichaoyin
a494f2a3d8 feat:黄旗酒馆 2024-01-11 22:33:01 +08:00
xichaoyin
92ff993129 Merge branch 'feature/huangqijiuguan' into dev 2024-01-11 22:26:37 +08:00
xichaoyin
ba124d82c9 feat:黄旗酒馆 2024-01-11 22:26:21 +08:00
xichaoyin
e6320bb040 json:配置提交 2024-01-11 21:49:05 +08:00
xichaoyin
a776a4c01e fix:baseurl 2024-01-11 21:36:06 +08:00
xichaoyin
af29ee51ac Merge branch 'bugfix' into dev 2024-01-11 21:31:31 +08:00
b23d311dbd slzd不需要回复次数 2024-01-11 21:19:48 +08:00
yushunrui
c4a60ac6ab Merge branch 'feature/skin' into dev 2024-01-11 21:10:05 +08:00
yushunrui
9484a696b3 fix:新增头像激活条件 2024-01-11 21:05:52 +08:00
69945c3964 回退层数逻辑 2024-01-11 21:01:00 +08:00
xichaoyin
a91a8f0657 Merge branch 'feature/huangqijiuguan' into dev 2024-01-11 20:57:59 +08:00
xichaoyin
be0923c849 feat:黄芪酒馆排行榜排除0伤害玩家 2024-01-11 20:57:48 +08:00
xichaoyin
ae2952ea5d Merge branch 'feature/huangqijiuguan' into dev 2024-01-11 20:53:03 +08:00
xichaoyin
a600998fd3 feat:黄芪酒馆红点 2024-01-11 20:52:49 +08:00
yushunrui
748da2a3e9 fix:增加英雄皮肤提供的头像 2024-01-11 20:49:53 +08:00
00804b9b49 矿洞结算bug 2024-01-11 20:23:08 +08:00
b5a9f6f530 积分容错 2024-01-11 19:14:56 +08:00
yushunrui
d6bafb7704 fix:竞技场第一名头像特殊处理,可以用道具直接解锁 2024-01-11 18:20:06 +08:00
xichaoyin
02d17c5f73 Merge branch 'feature/huangqijiuguan' into dev 2024-01-11 18:01:24 +08:00
xichaoyin
561954de17 feat:黄旗酒馆 2024-01-11 18:00:45 +08:00
xichaoyin
5a29cbe802 Merge branch 'feature/huangqijiuguan' into dev 2024-01-11 17:46:09 +08:00
xichaoyin
86fbc457f8 feat:黄芪酒馆 2024-01-11 17:45:37 +08:00
xichaoyin
eb76193922 Merge branch 'dev' of http://git.legu.cc/qixin/HJ_Server into dev 2024-01-11 17:12:37 +08:00
xichaoyin
2dce99387d json:配置提交 2024-01-11 17:12:35 +08:00
yushunrui
323ed2115b fix:刷新兑换脚本 2024-01-11 17:11:07 +08:00
xichaoyin
fd7b8d945d fix:任务修复脚本 2024-01-11 17:06:39 +08:00
yushunrui
5bbeee2f9a fix:脚本提交 2024-01-11 16:54:35 +08:00
yushunrui
ddabcbe8ac fix:脚本修改 2024-01-11 16:19:39 +08:00
yushunrui
5ba323fa49 Merge branch 'bugfix' into dev 2024-01-11 16:14:55 +08:00
xichaoyin
c18c0fcb76 proto:协议提交 2024-01-11 16:09:55 +08:00
xichaoyin
3f7e68b5bf fix:skin 2024-01-11 16:07:40 +08:00
7d85f554f4 聊天分组bug 2024-01-11 16:06:35 +08:00
yushunrui
6eb61ece9c fix:处理活动和新年头像框 2024-01-12 23:53:59 +08:00
yushunrui
184bdd304e 脚本提交,兑换掉落修改礼包内容, 玩家新年头像框刷成永久 2024-01-12 23:32:40 +08:00
yushunrui
8c86b05fe1 Merge remote-tracking branch 'origin/bugfix' into bugfix 2024-01-12 23:13:23 +08:00
yushunrui
c7ce70fcc0 fix:处理了头像框和聊天框得逻辑 2024-01-12 23:10:39 +08:00
yushunrui
ac4432fea8 fix:头像框 聊天框,造型逻辑修改 2024-01-12 22:52:56 +08:00
xichaoyin
f0df93cdd1 Merge remote-tracking branch 'origin/bugfix' into dev
# Conflicts:
#	src/public/player.ts
#	src/shared/fightControl/fightCntrol.ts
2024-01-11 16:05:21 +08:00
xichaoyin
82c47aaadf Merge remote-tracking branch 'origin/feature/huangqijiuguan' into dev
# Conflicts:
#	src/public/scheduler/scheduler_newDay.ts
#	src/shared/protocols/serviceProto.ts
2024-01-11 16:00:20 +08:00
xichaoyin
847613db4a fix:丛林狩猎定时器修复 2024-01-11 14:51:17 +08:00
xichaoyin
8d35b1d74c feat:添加黄芪酒馆招募次数任务 2024-01-11 14:46:05 +08:00
xichaoyin
f1f792ad82 feat:黄芪酒馆 2024-01-11 14:38:09 +08:00