xcy
|
9f744b7cee
|
Revert "fix:脚本"
This reverts commit 76794921fb .
|
2023-12-18 20:04:35 +08:00 |
|
xcy
|
9523f7c00d
|
fix:
积天好礼bug
|
2023-12-18 20:00:49 +08:00 |
|
|
9964e12f80
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2023-12-18 19:22:48 +08:00 |
|
|
a452f12654
|
分析db find数据
|
2023-12-18 19:22:37 +08:00 |
|
dy
|
a1b7cb1d7c
|
Merge branch 'bugfix' into dev
|
2023-12-18 19:19:13 +08:00 |
|
dy
|
c8d6f7d433
|
修复充值经验任务计算,开服狂欢进度,优化dayPay查询
|
2023-12-18 19:12:51 +08:00 |
|
xcy
|
20bb0c9478
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-18 18:35:44 +08:00 |
|
xcy
|
76794921fb
|
fix:脚本
|
2023-12-18 18:34:41 +08:00 |
|
|
af0225005a
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2023-12-18 18:02:15 +08:00 |
|
|
3f275e4af4
|
去掉发邮件时的上限判断机制
|
2023-12-18 18:01:55 +08:00 |
|
dy
|
540291696a
|
Merge branch 'dev-meirilibao' into dev
|
2023-12-18 16:51:38 +08:00 |
|
dy
|
d84173b67e
|
每日礼包改版,增加一键购买
|
2023-12-18 16:49:54 +08:00 |
|
yushunrui
|
9882a28090
|
fix:处理圣诞活动免费次数bug
|
2023-12-18 16:16:11 +08:00 |
|
dy
|
a5ad7ee2cf
|
Merge remote-tracking branch 'origin/bugfix' into bugfix
|
2023-12-18 15:50:50 +08:00 |
|
dy
|
7ae81dc6f5
|
战力数值计算加上速度倍数
|
2023-12-18 15:50:40 +08:00 |
|
|
ea179c2a3c
|
redis优化
|
2023-12-18 15:50:28 +08:00 |
|
yushunrui
|
25a8e15ed3
|
task增加新的任务类型,154是圣诞小游戏挑战 155是每日任务最终宝箱奖励
|
2023-12-18 15:29:48 +08:00 |
|
|
dd34a1c3a4
|
equip去redis化
|
2023-12-18 15:27:10 +08:00 |
|
yushunrui
|
89b75bbf2b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-18 15:02:07 +08:00 |
|
yushunrui
|
30de992a62
|
圣诞活动增加异步按钮
|
2023-12-18 14:58:41 +08:00 |
|
dy
|
b615f5d4fc
|
Merge branch 'dev-json' into dev
|
2023-12-18 14:47:30 +08:00 |
|
dy
|
fdbf22f62f
|
Merge branch 'bugfix' into dev
|
2023-12-18 14:47:13 +08:00 |
|
dy
|
7474b4583f
|
json
|
2023-12-18 14:46:36 +08:00 |
|
|
327f9c9b5a
|
全面去掉hero的redis依赖
|
2023-12-18 14:43:13 +08:00 |
|
xcy
|
954c2e8d2e
|
fix:脚本
|
2023-12-18 14:38:26 +08:00 |
|
xcy
|
6809bdc2b3
|
fix:
积天好礼bug
|
2023-12-18 14:29:31 +08:00 |
|
xcy
|
4737f94fcd
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-18 13:51:20 +08:00 |
|
xcy
|
5679361eab
|
fix:
积天好礼bug
|
2023-12-18 13:48:43 +08:00 |
|
dy
|
3cbc09345a
|
策划JSON同步
|
2023-12-18 11:37:23 +08:00 |
|
yushunrui
|
192ee578dc
|
圣诞功能还原版本
|
2023-12-18 11:23:13 +08:00 |
|
dy
|
23f56c3964
|
Merge remote-tracking branch 'origin/dev-tequan' into dev
|
2023-12-18 10:26:31 +08:00 |
|
dy
|
ce11402430
|
Merge branch 'bugfix' into dev
|
2023-12-18 10:06:55 +08:00 |
|
dy
|
2bbfb55704
|
修复矿洞延时接口
|
2023-12-16 11:15:16 +08:00 |
|
dy
|
5ccea04bbe
|
Merge branch 'master' into bugfix
|
2023-12-16 11:05:37 +08:00 |
|
dy
|
64f333908d
|
bugfix
|
2023-12-15 22:58:48 +08:00 |
|
dy
|
99500b7bf4
|
干部功能redis直取修复
|
2023-12-15 22:49:54 +08:00 |
|
dy
|
77159cc7e3
|
干部功能redis直取修复
|
2023-12-15 22:48:45 +08:00 |
|
dy
|
ec3f954518
|
fix bug
|
2023-12-15 22:41:20 +08:00 |
|
dy
|
87466c68ad
|
Merge branch 'release' into bugfix
|
2023-12-15 22:38:34 +08:00 |
|
dy
|
5150032d20
|
cehua json
|
2023-12-15 22:32:02 +08:00 |
|
dy
|
5106632893
|
cehua json
|
2023-12-15 22:31:48 +08:00 |
|
dy
|
a550711bbb
|
cehua json
|
2023-12-15 21:16:14 +08:00 |
|
dy
|
2dcb2f2082
|
cehua json
|
2023-12-15 21:15:42 +08:00 |
|
xcy
|
404bb9a7e5
|
fix:
修改伙伴招募的奖励领取条件
|
2023-12-15 21:11:31 +08:00 |
|
dy
|
9d436fd34a
|
Merge remote-tracking branch 'origin/dev-jitianhaoli' into dev
|
2023-12-15 20:21:24 +08:00 |
|
dy
|
2f87f25a8d
|
fix bug
|
2023-12-15 20:20:46 +08:00 |
|
xcy
|
7e775e90e1
|
fix:
修改情报特权
|
2023-12-15 20:06:20 +08:00 |
|
xcy
|
fb6a6dfb38
|
Merge remote-tracking branch 'origin/dev' into dev-shouchong
|
2023-12-15 18:28:50 +08:00 |
|
xcy
|
14ab1d45b8
|
fix:
过滤没有充值得payid
|
2023-12-15 18:27:57 +08:00 |
|
xcy
|
00f829c48c
|
fix:
协议
|
2023-12-15 18:26:25 +08:00 |
|