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 |
|
dy
|
3e1c45aaf9
|
Merge remote-tracking branch 'origin/bugfix' into bugfix
|
2024-01-04 16:05:59 +08:00 |
|
dy
|
f1dacd19b6
|
破冰礼包增加轮次，修复bug
|
2024-01-04 16:05:52 +08:00 |
|
|
|
a5e726e811
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2024-01-04 15:51:52 +08:00 |
|
|
|
8afa624f44
|
跨服聊天分组
|
2024-01-04 15:51:40 +08:00 |
|
dy
|
6ec6de4d56
|
破冰礼包拦截前端空字符串请求
|
2024-01-04 15:37:09 +08:00 |
|
xichaoyin
|
809030edee
|
frat:json配置提交
|
2024-01-04 15:22:33 +08:00 |
|
xichaoyin
|
df3c9a79bf
|
Merge remote-tracking branch 'origin/bugfix' into dev
|
2024-01-04 14:43:08 +08:00 |
|
|
|
52ab7e9979
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2024-01-04 14:30:47 +08:00 |
|
|
|
a1dbacd7fe
|
积分赛只刷出本服对手
|
2024-01-04 14:30:37 +08:00 |
|
dy
|
dabcc8baa4
|
Merge branch 'feature/json' into dev
# Conflicts:
# src/json/renown_level.json
# src/json/tanxian.json
|
2024-01-04 14:25:34 +08:00 |
|
dy
|
12e21ce0f1
|
cehua json
|
2024-01-04 14:25:12 +08:00 |
|
dy
|
0cde599ddd
|
Merge branch 'master' into feature/json
# Conflicts:
# src/json/clsl_com.json5
|
2024-01-04 14:24:42 +08:00 |
|
dy
|
4c0a37cd78
|
Merge branch 'bugfix' into dev
|
2024-01-04 11:36:52 +08:00 |
|
dy
|
04533c80f4
|
fix pata/saodang
|
2024-01-04 11:20:00 +08:00 |
|
dy
|
98a3927966
|
fix lingzhulaixi
|
2024-01-04 11:05:05 +08:00 |
|
dy
|
eb73af1dd2
|
数据监测改为查半小时内在线用户
|
2024-01-03 22:40:24 +08:00 |
|
dy
|
1dd7bc2175
|
api pay
|
2024-01-03 22:10:35 +08:00 |
|
dy
|
ecc17a22a9
|
api 锁修改,一键接取悬赏
|
2024-01-03 21:57:12 +08:00 |
|
dy
|
124681d757
|
Merge branch 'release' into dev
|
2024-01-03 20:50:12 +08:00 |
|
dy
|
826840455c
|
api 锁修改
|
2024-01-03 20:19:58 +08:00 |
|
dy
|
60d0e04e33
|
fix 探险 gamelog
|
2024-01-03 19:36:28 +08:00 |
|
dy
|
6233a6672e
|
Merge remote-tracking branch 'origin/bugfix' into bugfix
|
2024-01-03 19:28:34 +08:00 |
|
dy
|
afd856af30
|
fix 探险
|
2024-01-03 19:28:22 +08:00 |
|
xichaoyin
|
698c7bd3f6
|
fix:
修复讨伐海盗挑战boss胜利不扣除战斗次数bug
|
2024-01-03 18:42:36 +08:00 |
|
dy
|
7dd83e06ef
|
watchdog.json
|
2024-01-03 17:35:08 +08:00 |
|
xichaoyin
|
a1a687773c
|
Merge branch 'feature/weiwang' into dev
|
2024-01-03 16:28:15 +08:00 |
|
xichaoyin
|
3c50fdbd01
|
fix:
修复威望升级消耗计算错误
|
2024-01-03 16:27:59 +08:00 |
|
xichaoyin
|
20f0f41c22
|
fix:
王者荣耀发奖定时器容错修改
|
2024-01-03 15:47:02 +08:00 |
|
xichaoyin
|
9f512e8fbc
|
Merge branch 'dev' of http://git.legu.cc/qixin/HJ_Server into dev
|
2024-01-03 15:33:09 +08:00 |
|
xichaoyin
|
a7f527bf09
|
fix:
王者荣耀发奖定时器容错修改
|
2024-01-03 15:33:05 +08:00 |
|
dy
|
f2911269e0
|
Merge branch 'bugfix' into dev
|
2024-01-03 15:22:58 +08:00 |
|
dy
|
6cc58ffd94
|
还原
|
2024-01-03 15:22:36 +08:00 |
|
xichaoyin
|
7eec14188f
|
Merge branch 'dev' of http://git.legu.cc/qixin/HJ_Server into dev
|
2024-01-03 14:49:00 +08:00 |
|
xichaoyin
|
bc078b9c95
|
feat:
探险新增声望掉落
|
2024-01-03 14:48:58 +08:00 |
|
dy
|
d3f272f1e4
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-01-03 14:47:03 +08:00 |
|
dy
|
89ea1a47af
|
Merge branch 'bugfix' into dev
|
2024-01-03 14:46:58 +08:00 |
|
dy
|
8d9ecf30b6
|
Merge remote-tracking branch 'origin/bugfix' into bugfix
# Conflicts:
# src/api_s2c/event/leijichongzhi/ApiRec.ts
|
2024-01-03 14:46:30 +08:00 |
|
dy
|
ec85961633
|
累计充值轮次加校验
|
2024-01-03 14:45:51 +08:00 |
|
|
|
d490550abf
|
容错
|
2024-01-03 14:44:50 +08:00 |
|
xichaoyin
|
08c59b522b
|
Merge branch 'feature/weiwang' into dev
|
2024-01-03 14:35:58 +08:00 |
|
xichaoyin
|
c65aea9ae2
|
fix:
威望配置提交
|
2024-01-03 14:35:19 +08:00 |
|
|
|
38dca3a653
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2024-01-03 14:32:40 +08:00 |
|
|
|
7e589e23b3
|
容错
|
2024-01-03 14:31:47 +08:00 |
|
dy
|
22b577036f
|
watchdog
|
2024-01-03 14:29:22 +08:00 |
|
|
|
6e9d65241e
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2024-01-03 14:00:29 +08:00 |
|
|
|
43aeef2501
|
容错
|
2024-01-03 13:44:51 +08:00 |
|
dy
|
1a9f942297
|
还原
|
2024-01-03 11:38:06 +08:00 |
|
dy
|
8f0c24bc87
|
Merge branch 'feature/warning' into bugfix
|
2024-01-03 11:09:56 +08:00 |
|
dy
|
1fcedaff59
|
还原
|
2024-01-03 11:09:39 +08:00 |
|
dy
|
a1c7f2e4d0
|
监控init
|
2024-01-03 11:01:12 +08:00 |
|
|
|
78c306ce5e
|
数据监控
|
2024-01-03 10:58:09 +08:00 |
|
|
|
ad15cf73bf
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2024-01-03 10:36:35 +08:00 |
|
|
|
3c380f1e55
|
数据监控
|
2024-01-03 10:36:17 +08:00 |
|
dy
|
953303d9a4
|
Merge branch 'master' into feature/warning
|
2024-01-03 10:18:20 +08:00 |
|
dy
|
8f92372471
|
Merge branch 'master' into dev
|
2024-01-03 10:18:06 +08:00 |
|
dy
|
c839d844ec
|
Merge branch 'bugfix' into release
|
2024-01-02 20:42:33 +08:00 |
|
dy
|
ee99de169d
|
Revert "fix 悬赏任务上限限制"
This reverts commit bfe48a54f4.
|
2024-01-02 20:42:23 +08:00 |
|
dy
|
4f5a1492a6
|
Merge remote-tracking branch 'origin/bugfix' into bugfix
|
2024-01-02 20:30:20 +08:00 |
|
dy
|
bfe48a54f4
|
fix 悬赏任务上限限制
|
2024-01-02 20:30:11 +08:00 |
|
|
|
5750b83dc6
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2024-01-02 20:26:16 +08:00 |
|
|
|
5a7d2b2d55
|
错误log
|
2024-01-02 20:26:04 +08:00 |
|
dy
|
ef60b3ba26
|
Merge branch 'bugfix' into release
|
2024-01-02 20:15:54 +08:00 |
|
dy
|
1006826bfe
|
fix 悬赏任务上限限制
|
2024-01-02 20:15:34 +08:00 |
|
dy
|
049f1599bf
|
Merge branch 'bugfix' into release
|
2024-01-02 20:09:32 +08:00 |
|
dy
|
499acf3684
|
Merge branch 'bugfix' into dev
|
2024-01-02 19:55:57 +08:00 |
|
dy
|
46401b90ee
|
fix 悬赏任务上限限制
|
2024-01-02 19:55:36 +08:00 |
|
|
|
ea1be8cff2
|
残余redis代码
|
2024-01-02 18:17:43 +08:00 |
|
|
|
4b30eaab04
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2024-01-02 17:38:18 +08:00 |
|
|
|
2425ca07d0
|
删除残余redis代码
|
2024-01-02 17:38:07 +08:00 |
|
dy
|
d2ddc62752
|
fix round
|
2024-01-02 15:49:24 +08:00 |
|
xichaoyin
|
57faacbe9b
|
Merge branch 'dev' of http://git.legu.cc/qixin/HJ_Server into dev
|
2024-01-02 15:24:01 +08:00 |
|
xichaoyin
|
abf47d251f
|
Merge branch 'feature/weiwang' into dev
|
2024-01-02 15:23:56 +08:00 |
|
xichaoyin
|
77e06ba769
|
feat:
威望系统
|
2024-01-02 15:23:39 +08:00 |
|
dy
|
dec416a158
|
Merge branch 'master' into dev
|
2024-01-02 11:11:47 +08:00 |
|
dy
|
3899b9157c
|
Merge branch 'bugfix' into release
|
2024-01-02 11:11:03 +08:00 |
|
dy
|
76c96b7abb
|
暂时屏蔽矿洞延时
|
2024-01-02 11:10:27 +08:00 |
|
dy
|
2c625416a8
|
proto
|
2024-01-02 09:53:42 +08:00 |
|
dy
|
c927d3b7bc
|
Merge branch 'fix/conglinshoulie' into release
# Conflicts:
# src/public/rank/rank.ts
|
2024-01-02 09:53:11 +08:00 |
|
xichaoyin
|
9955c4db93
|
fix:
提交测试
|
2024-01-02 09:50:35 +08:00 |
|
dy
|
ab872cf185
|
cehua json
|
2024-01-02 09:50:33 +08:00 |
|
|
|
fc7c7ceaad
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2024-01-02 09:45:51 +08:00 |
|
|
|
51a31e4b91
|
容错
|
2024-01-02 09:45:38 +08:00 |
|
xichaoyin
|
8d9002b1a5
|
Merge branch 'fix/conglinshoulie' into dev
|
2023-12-31 21:36:32 +08:00 |
|
xichaoyin
|
dc45a38f4e
|
Merge branch 'fix/conglinshoulie' into dev
|
2024-01-04 20:08:01 +08:00 |
|
xichaoyin
|
c8f9d0c7d7
|
fix:
修复定时器数据
|
2024-01-04 20:07:42 +08:00 |
|
xichaoyin
|
ab12f52e2e
|
Merge branch 'fix/conglinshoulie' into dev
|
2024-01-03 10:04:46 +08:00 |
|
xichaoyin
|
a82e9c560e
|
fix:
从林狩猎open添加week
|
2024-01-03 10:04:27 +08:00 |
|
xichaoyin
|
9bf6e3e724
|
fix:
week添加
|
2024-01-03 09:50:21 +08:00 |
|
xichaoyin
|
06540083ab
|
Merge branch 'fix/conglinshoulie' into dev
|
2024-01-03 09:43:10 +08:00 |
|
xichaoyin
|
2b5be18ea5
|
fix:
丛林猎手优化
|
2024-01-03 09:42:13 +08:00 |
|
xichaoyin
|
a69ca2312a
|
Merge branch 'fix/conglinshoulie' into dev
# Conflicts:
# src/public/rank/rank.ts
|
2024-01-01 09:22:18 +08:00 |
|
xcy
|
381aeb1792
|
fix:
丛林猎手优化
|
2024-01-01 09:04:08 +08:00 |
|
xichaoyin
|
b45eec43f9
|
fix:
丛林猎手优化
|
2023-12-31 21:35:11 +08:00 |
|
dy
|
afe6ddc20b
|
Merge branch 'bugfix' into dev
|
2023-12-31 18:56:47 +08:00 |
|
dy
|
b466826d94
|
修复第一次打开没有round报错
|
2023-12-31 18:56:42 +08:00 |
|
dy
|
e95928b060
|
Merge branch 'master' into dev
|
2023-12-31 18:48:42 +08:00 |
|
dy
|
428033b26f
|
Merge branch 'bugfix' into release
|
2023-12-31 17:43:30 +08:00 |
|
dy
|
7aaa0699f9
|
fix 竞技场头像激活
|
2023-12-31 17:42:56 +08:00 |
|
