xichaoyin
|
cfcf9c7027
|
Merge branch 'bugfix' into dev
|
2024-01-11 14:51:27 +08:00 |
|
xichaoyin
|
847613db4a
|
fix:丛林狩猎定时器修复
|
2024-01-11 14:51:17 +08:00 |
|
xichaoyin
|
8ff548c717
|
Merge branch 'feature/huangqijiuguan' into dev
|
2024-01-11 14:46:25 +08:00 |
|
xichaoyin
|
8d35b1d74c
|
feat:添加黄芪酒馆招募次数任务
|
2024-01-11 14:46:05 +08:00 |
|
xichaoyin
|
0dd6daa2c2
|
Merge branch 'feature/huangqijiuguan' into dev
|
2024-01-11 14:38:27 +08:00 |
|
xichaoyin
|
f1f792ad82
|
feat:黄芪酒馆
|
2024-01-11 14:38:09 +08:00 |
|
xichaoyin
|
9f2a28044c
|
Merge branch 'feature/huangqijiuguan' into dev
|
2024-01-11 14:23:28 +08:00 |
|
xichaoyin
|
a8051b9767
|
feat:npc添加皮肤
|
2024-01-11 14:19:51 +08:00 |
|
xichaoyin
|
fbf2daae91
|
Merge branch 'feature/huangqijiuguan' into dev
|
2024-01-11 13:58:06 +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 |
|
|
|
2e1bd44f0f
|
Merge branch 'bugfix' into dev
|
2024-01-10 23:08:57 +08:00 |
|
|
|
45c5a195ed
|
addhp不应该取整
|
2024-01-10 23:08:14 +08:00 |
|
xichaoyin
|
bed7c86211
|
Merge remote-tracking branch 'origin/bugfix' into dev
|
2024-01-10 21:58:47 +08:00 |
|
xichaoyin
|
b41076023a
|
Merge branch 'feature/huangqijiuguan' into dev
|
2024-01-10 21:57:23 +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
|
48d512a3a6
|
Merge branch 'bugfix' into dev
# Conflicts:
# src/api_s2c/event/chuanshuozhilu/ApiOpen.ts
|
2024-01-10 21:26:19 +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 |
|
yushunrui
|
48b07c2d74
|
Merge branch 'bugfix' into dev
|
2024-01-10 21:06:54 +08:00 |
|
xichaoyin
|
95971d809b
|
proto：协议提交
|
2024-01-10 20:51:50 +08:00 |
|
xichaoyin
|
48ccedcbee
|
Merge branch 'feature/huangqijiuguan' into dev
|
2024-01-10 20:50:54 +08:00 |
|
xichaoyin
|
206e87d64c
|
feat:黄旗酒馆
|
2024-01-10 20:50:03 +08:00 |
|
yushunrui
|
138ee2675c
|
Merge remote-tracking branch 'origin/bugfix' into bugfix
|
2024-01-10 20:38:15 +08:00 |
|
yushunrui
|
8aab7b6322
|
fix:处理人才计划任务领取标识在刷 新一轮的时候没有重置
|
2024-01-10 20:37:58 +08:00 |
|
yushunrui
|
48cd24d309
|
fix:超值基金设置奖励逻辑设置为同步
|
2024-01-11 18:45:59 +08:00 |
|
xichaoyin
|
4fc571d9b0
|
Merge branch 'feature/huangqijiuguan' into dev
|
2024-01-10 19:59:54 +08:00 |
|
xichaoyin
|
d30f62f6c5
|
feat:黄旗酒馆
|
2024-01-10 19:59:27 +08:00 |
|
xichaoyin
|
bb44f79920
|
fix:添加日志
|
2024-01-10 19:52:50 +08:00 |
|
xichaoyin
|
f7b29c24fa
|
Merge branch 'feature/huangqijiuguan' into dev
|
2024-01-10 19:39:17 +08:00 |
|
xichaoyin
|
8b8e14a609
|
feat：黄旗酒馆
|
2024-01-10 19:39:07 +08:00 |
|
xichaoyin
|
a5b3053a20
|
proto:协议上传
|
2024-01-10 19:28:41 +08:00 |
|
xichaoyin
|
1c18a5b7fd
|
feat:黄旗酒馆
|
2024-01-10 18:56:52 +08:00 |
|
xichaoyin
|
dbd59fba83
|
feat:黄旗酒馆
|
2024-01-10 18:56:33 +08:00 |
|
xichaoyin
|
ca28e82823
|
Merge branch 'feature/huangqijiuguan' into dev
|
2024-01-10 18:23:57 +08:00 |
|
xichaoyin
|
950a048742
|
feat:黄旗酒馆
|
2024-01-10 18:23:42 +08:00 |
|
xichaoyin
|
6895a14d04
|
Merge branch 'dev' of http://git.legu.cc/qixin/HJ_Server into dev
|
2024-01-10 18:07:13 +08:00 |
|
xichaoyin
|
eb44e7a9b4
|
json:配置文件提交
|
2024-01-10 18:05:38 +08:00 |
|
xichaoyin
|
001a8166b5
|
Merge branch 'feature/huangqijiuguan' into dev
|
2024-01-10 17:54:45 +08:00 |
|
xichaoyin
|
273b1865c3
|
feat:黄旗酒馆
|
2024-01-10 17:53:44 +08:00 |
|
xichaoyin
|
14796bb06b
|
feat：黄旗酒馆
|
2024-01-10 17:38:01 +08:00 |
|
|
|
c3db97b3be
|
天赋技能
|
2024-01-10 17:08:21 +08:00 |
|
|
|
72b215451b
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2024-01-10 16:57:21 +08:00 |
|
|
|
104a1edadc
|
天赋技能
|
2024-01-10 16:57:11 +08:00 |
|
yushunrui
|
7feff43ee6
|
Merge remote-tracking branch 'origin/bugfix' into bugfix
|
2024-01-10 16:45:22 +08:00 |
|
yushunrui
|
a26aa7dab3
|
fix:处理强化伙伴活动初始没有任务进度的逻辑
|
2024-01-10 16:44:53 +08:00 |
|
