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 |
|
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 |
|
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 |
|
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 |
|
xichaoyin
|
a8051b9767
|
feat:npc添加皮肤
|
2024-01-11 14:19:51 +08:00 |
|
xichaoyin
|
13de3624dc
|
feat:黄旗酒馆
|
2024-01-11 13:57:52 +08:00 |
|
|
|
2c3d53899e
|
去掉多余的环境变量，解决pm2集群启动失败问题
|
2024-01-11 11:23:08 +08:00 |
|
xichaoyin
|
325ed8745c
|
fix:时区脚本修复
|
2024-01-11 11:20:14 +08:00 |
|
|
|
45c5a195ed
|
addhp不应该取整
|
2024-01-10 23:08:14 +08:00 |
|
xichaoyin
|
6f7eab1701
|
feat:黄旗酒馆
|
2024-01-10 21:57:09 +08:00 |
|
|
|
8e9553386f
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2024-01-10 21:55:12 +08:00 |
|
|
|
c09c9dec89
|
配件修正
|
2024-01-10 21:55:02 +08:00 |
|
yushunrui
|
b80263ed16
|
fix:竞技场第一名头像特殊处理，可以用道具直接解锁
|
2024-01-10 21:17:04 +08:00 |
|
yushunrui
|
363787fb39
|
Revert "fix:竞技场第一名头像特殊处理，可以用道具直接解锁"
This reverts commit 0a94965e30.
|
2024-01-10 21:16:13 +08:00 |
|
yushunrui
|
0a94965e30
|
fix:竞技场第一名头像特殊处理，可以用道具直接解锁
|
2024-01-10 21:14:10 +08:00 |
|
