dy
|
55fae245e9
|
fix 脚本模板
|
2023-12-28 19:49:06 +08:00 |
|
dy
|
ad9e3cca46
|
Merge branch 'bugfix' into release
# Conflicts:
# src/public/rank/rank.ts
|
2023-12-28 19:17:09 +08:00 |
|
xcy
|
cedce860c5
|
fix:
排行榜bug
|
2023-12-28 18:46:38 +08:00 |
|
dy
|
cc6aad7223
|
Merge remote-tracking branch 'origin/bugfix' into bugfix
|
2023-12-28 18:19:52 +08:00 |
|
dy
|
566c3aeb7b
|
fix 公共方法
|
2023-12-28 18:19:40 +08:00 |
|
xcy
|
8a69a4fc1e
|
修复排行榜
|
2023-12-28 18:13:50 +08:00 |
|
dy
|
63877a2664
|
Merge branch 'bugfix' into release
|
2023-12-28 17:34:02 +08:00 |
|
dy
|
1a88ed0784
|
Merge branch 'feature/json' into release
|
2023-12-28 17:33:54 +08:00 |
|
dy
|
f2b9f12390
|
huodong.json
|
2023-12-28 17:33:47 +08:00 |
|
dy
|
6a0a158fba
|
fix 脚本
|
2023-12-28 17:33:08 +08:00 |
|
dy
|
9d9c37714b
|
Merge branch 'bugfix' into release
|
2023-12-28 16:13:54 +08:00 |
|
dy
|
37f2472f5d
|
修复脚本模板，刷新活动内容脚本
|
2023-12-28 16:10:56 +08:00 |
|
xcy
|
bf4f22d092
|
fix:
修复终身卡邮件没有type
|
2023-12-28 15:18:47 +08:00 |
|
dy
|
4343d50f7c
|
Merge branch 'feature/yuandan' into release
|
2023-12-28 15:17:35 +08:00 |
|
dy
|
5512bf3422
|
Merge branch 'feature/json' into release
|
2023-12-28 15:17:24 +08:00 |
|
dy
|
86595c68b3
|
cehua json
|
2023-12-28 15:17:06 +08:00 |
|
dy
|
847a1d03e9
|
注释
|
2023-12-28 15:14:42 +08:00 |
|
xcy
|
96729c719a
|
fix:
终身卡发放奖励bug修复
|
2023-12-28 14:48:52 +08:00 |
|
xcy
|
075c60a9f8
|
fix:
终身卡定时器log
|
2023-12-28 14:42:45 +08:00 |
|
dy
|
1412da00ae
|
Merge remote-tracking branch 'origin/bugfix' into bugfix
|
2023-12-28 14:18:33 +08:00 |
|
dy
|
4e19dc21a1
|
fix聊天禁言，英雄阵形战力计算
|
2023-12-28 14:18:26 +08:00 |
|
xcy
|
27d7a56d10
|
累计充值累计金额修改为累计vip经验(金额*10)
|
2023-12-28 13:44:35 +08:00 |
|
dy
|
053ab1ab23
|
Merge remote-tracking branch 'origin/bugfix' into bugfix
|
2023-12-28 13:39:54 +08:00 |
|
dy
|
07fa117614
|
fix公共方法 random
|
2023-12-28 13:39:28 +08:00 |
|
xcy
|
d6e41758f9
|
fix:
修复终身卡每周奖励未发放bug
|
2023-12-28 11:49:21 +08:00 |
|
Your Name
|
4fc0aa8576
|
fix:
修复悬赏任务一键领取3倍奖励逻辑错误
|
2023-12-28 11:11:13 +08:00 |
|
Your Name
|
47b1fe4d22
|
fix:修复悬赏任务一键领取特权问题
|
2023-12-28 10:08:19 +08:00 |
|
dy
|
e098e41885
|
paylog增加args记录
|
2023-12-28 10:05:52 +08:00 |
|
dy
|
57c5a8a5e7
|
Revert "fix pay"
This reverts commit b9a556ea30.
|
2023-12-27 22:56:55 +08:00 |
|
dy
|
7b5c470f52
|
fix 红点
|
2023-12-27 22:31:09 +08:00 |
|
dy
|
b9a556ea30
|
fix pay
|
2023-12-27 22:09:53 +08:00 |
|
dy
|
757f1ba4b8
|
Merge branch 'feature/xiaofeijingsai' into release
|
2023-12-27 21:06:44 +08:00 |
|
dy
|
722e92a54b
|
消费竞赛
|
2023-12-27 21:05:53 +08:00 |
|
dy
|
2309ff4a9c
|
Merge branch 'feature/json' into release
|
2023-12-27 20:50:05 +08:00 |
|
dy
|
c0e6f6516c
|
cehua json
|
2023-12-27 20:49:23 +08:00 |
|
dy
|
d6d8b39afe
|
Merge branch 'feature/json' into release
# Conflicts:
# src/json/attr.json
# src/json/huodong.json5
|
2023-12-27 20:21:51 +08:00 |
|
dy
|
27ec272347
|
cehua json
|
2023-12-27 20:21:13 +08:00 |
|
dy
|
47f16b583a
|
Merge branch 'feature/xiaofeijingsai' into release
|
2023-12-27 20:20:23 +08:00 |
|
dy
|
82d323d5c8
|
Merge branch 'feature/yuandan' into release
# Conflicts:
# src/public/pay.ts
|
2023-12-27 20:20:01 +08:00 |
|
dy
|
dced990c89
|
Merge remote-tracking branch 'origin/fix_rank' into release
|
2023-12-27 20:19:25 +08:00 |
|
dy
|
12300703b5
|
每日刷新付费礼包
|
2023-12-27 20:09:59 +08:00 |
|
dy
|
2e84333776
|
fix 元旦任务计数
|
2023-12-27 19:59:50 +08:00 |
|
dy
|
add9c7c562
|
fix 元旦任务
|
2023-12-27 19:49:33 +08:00 |
|
dy
|
dbb012675a
|
fix 自选支付
|
2023-12-27 19:30:49 +08:00 |
|
dy
|
771c4a2ceb
|
cehua json
|
2023-12-27 19:15:51 +08:00 |
|
dy
|
3e198b688e
|
Merge branch 'master' into feature/json
|
2023-12-27 19:15:27 +08:00 |
|
dy
|
7af728b68c
|
fix 自选购买
|
2023-12-27 19:13:17 +08:00 |
|
dy
|
837e9b58c8
|
fix 元旦红点
|
2023-12-27 18:50:36 +08:00 |
|
dy
|
5e476fa5c6
|
fix 探险
|
2023-12-27 18:34:04 +08:00 |
|
dy
|
3c034fb296
|
每10分钟刷新排行榜前一千名玩家的用户数据
|
2023-12-27 17:53:32 +08:00 |
|
dy
|
53a2becac5
|
娃娃机改为掉落组
|
2023-12-27 16:53:33 +08:00 |
|
dy
|
7c83a8bbe8
|
娃娃机改为掉落组
|
2023-12-27 16:41:22 +08:00 |
|
dy
|
0df09e0f9e
|
娃娃机改为掉落组
|
2023-12-27 16:33:31 +08:00 |
|
dy
|
bdb83f9da7
|
英雄爆伤限制为最大值1000%
|
2023-12-27 16:00:43 +08:00 |
|
dy
|
b821afc6b0
|
修复配件套装战力计算
|
2023-12-27 15:47:44 +08:00 |
|
dy
|
6089ad5dd2
|
增加抓娃娃的任务类型，userPing同步玩家钻石金币
|
2023-12-27 15:06:22 +08:00 |
|
dy
|
b578bb0db0
|
消费竞赛改为跨服活动
|
2023-12-27 14:17:10 +08:00 |
|
dy
|
d4bd776b48
|
proto
|
2023-12-27 11:09:00 +08:00 |
|
dy
|
c3fa18c9b1
|
proto
|
2023-12-27 11:08:42 +08:00 |
|
dy
|
34ace42872
|
proto
|
2023-12-27 11:03:10 +08:00 |
|
dy
|
1cf4784d42
|
元旦红点，破冰红点
|
2023-12-27 11:02:53 +08:00 |
|
dy
|
4538c0dc16
|
自选礼包红点
|
2023-12-27 10:23:12 +08:00 |
|
dy
|
f9989cf002
|
自选礼包
|
2023-12-27 10:17:38 +08:00 |
|
dy
|
944ef41d5d
|
达摩献礼
|
2023-12-27 09:51:37 +08:00 |
|
dy
|
8503a65c1f
|
yuandan fun
|
2023-12-26 20:04:05 +08:00 |
|
dy
|
f50f6de933
|
yuandan
|
2023-12-26 19:49:46 +08:00 |
|
dy
|
a6efa1019e
|
fix 讨伐海盗
|
2023-12-26 18:57:23 +08:00 |
|
dy
|
1f92fe7dc3
|
Revert "Revert "fix 自选支付""
This reverts commit 9e3d1b92aa.
|
2023-12-26 18:38:20 +08:00 |
|
dy
|
3e5479760d
|
Revert "Revert "fix pay""
This reverts commit d13b9fcae0.
|
2023-12-26 18:38:17 +08:00 |
|
dy
|
74c28c787b
|
Revert "Revert "自选类型购买改为统一方法""
This reverts commit 9837d27132.
|
2023-12-26 18:38:14 +08:00 |
|
dy
|
08d0bed291
|
元旦活动
|
2023-12-26 17:33:48 +08:00 |
|
Your Name
|
78b246f32a
|
排行榜修改
|
2023-12-26 17:25:03 +08:00 |
|
dy
|
720dc255fe
|
Revert "redis临时修复"
This reverts commit 0e089582
|
2023-12-26 17:03:32 +08:00 |
|
dy
|
9837d27132
|
Revert "自选类型购买改为统一方法"
This reverts commit 93f6b5b7ba.
|
2023-12-26 17:02:36 +08:00 |
|
dy
|
d13b9fcae0
|
Revert "fix pay"
This reverts commit 4b8be68516.
|
2023-12-26 17:02:33 +08:00 |
|
dy
|
9e3d1b92aa
|
Revert "fix 自选支付"
This reverts commit 91c2827b33.
|
2023-12-26 17:02:15 +08:00 |
|
dy
|
5a62e3e965
|
Merge branch 'bugfix' into release
# Conflicts:
# src/public/gud.ts
|
2023-12-26 17:01:48 +08:00 |
|
dy
|
7b7a4486eb
|
shop json
|
2023-12-26 17:00:33 +08:00 |
|
Your Name
|
d6c801db91
|
商店刷新更改
|
2023-12-26 17:00:33 +08:00 |
|
dy
|
0e08958202
|
redis临时修复
|
2023-12-26 17:00:33 +08:00 |
|
dy
|
21994f214a
|
元旦fix
|
2023-12-26 16:53:43 +08:00 |
|
dy
|
5fa9d088d9
|
cehua json
|
2023-12-26 16:48:20 +08:00 |
|
dy
|
ae0a5c6882
|
fix元旦
|
2023-12-26 16:33:31 +08:00 |
|
dy
|
bfc9ff369c
|
fix元旦
|
2023-12-26 16:20:59 +08:00 |
|
Your Name
|
b67087a3bf
|
修改api进程锁
|
2023-12-26 16:12:09 +08:00 |
|
dy
|
72ff17ba0b
|
元旦活动
|
2023-12-26 15:26:58 +08:00 |
|
dy
|
1e90b96c6c
|
huodong json
|
2023-12-26 15:07:00 +08:00 |
|
|
|
0511ce1727
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2023-12-26 14:38:44 +08:00 |
|
|
|
884c2570a0
|
fix: 调整锁超时时间
|
2023-12-26 14:34:30 +08:00 |
|
|
|
fb28f2d4e7
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2023-12-26 14:33:14 +08:00 |
|
|
|
cd2a54e431
|
更换地下擂台功能redis
|
2023-12-26 14:33:04 +08:00 |
|
dy
|
9b6d29ddf2
|
元旦活动,娃娃机
|
2023-12-26 14:30:10 +08:00 |
|
|
|
58abdd2fd4
|
fix: 添加多语言 dixialeitai_13
|
2023-12-26 14:22:07 +08:00 |
|
|
|
c0103565a7
|
fix: 调整地下擂台 fight 接口返回的多语言
|
2023-12-26 14:14:15 +08:00 |
|
Your Name
|
da35c5ecde
|
商店刷新更改
|
2023-12-26 14:10:21 +08:00 |
|
dy
|
fd035faf86
|
元旦活动
|
2023-12-26 14:04:19 +08:00 |
|
|
|
9585377a97
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2023-12-26 14:03:26 +08:00 |
|
|
|
5f81ba1189
|
替换tanxian的redis缓存
|
2023-12-26 14:03:15 +08:00 |
|
|
|
4a9f5cb02e
|
fix: DldFight 接口添加玩家锁
|
2023-12-26 13:54:49 +08:00 |
|
|
|
2a78f515b1
|
fix: 大乱斗添加积分上限
|
2023-12-26 11:50:17 +08:00 |
|
