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 |
|
dy
|
64a9ea7360
|
fix 黑帮争霸用户为空时协议报错
|
2023-12-31 17:22:07 +08:00 |
|
dy
|
61a8ae0fc9
|
fix 黑帮争霸取参错误
|
2023-12-31 17:04:59 +08:00 |
|
dy
|
4448b2dfa8
|
Merge branch 'bugfix' into release
|
2023-12-31 16:30:16 +08:00 |
|
|
|
17ae62472e
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2023-12-31 16:29:22 +08:00 |
|
|
|
b75e7155b8
|
增加错误捕获
|
2023-12-31 16:24:07 +08:00 |
|
dy
|
087b8ff146
|
Merge branch 'feature/json' into release
|
2023-12-31 16:01:52 +08:00 |
|
dy
|
3ba27f5180
|
cehua public json
|
2023-12-31 16:01:41 +08:00 |
|
dy
|
d8a7fa14d0
|
Merge remote-tracking branch 'origin/bugfix' into release
|
2023-12-31 15:59:30 +08:00 |
|
dy
|
71c0506a72
|
修复玩家出现的饰品和配件数据错误导致的进不去游戏
|
2023-12-31 15:22:51 +08:00 |
|
dy
|
1090852522
|
修复玩家出现的饰品和配件数据错误导致的进不去游戏
|
2023-12-31 15:21:41 +08:00 |
|
dy
|
09b74e3490
|
黑帮争霸刷新玩家数据
|
2023-12-31 14:26:40 +08:00 |
|
dy
|
ec1b76ed5f
|
竞技场检测头像框是否激活
|
2023-12-31 13:43:47 +08:00 |
|
dy
|
42daf348b9
|
消费竞赛定时器
|
2023-12-31 13:35:38 +08:00 |
|
dy
|
a84f20361f
|
累充
|
2023-12-31 11:45:44 +08:00 |
|
dy
|
f3ec6df093
|
消费竞赛
|
2023-12-31 11:24:38 +08:00 |
|
dy
|
96675a9ff1
|
累计充值
|
2023-12-31 09:48:26 +08:00 |
|
xcy
|
a177c18efe
|
fix:
修复排名数据问题
|
2023-12-30 18:04:01 +08:00 |
|
xcy
|
18b380f620
|
fix:
脚本冲突解决
|
2023-12-30 17:04:56 +08:00 |
|
xcy
|
f99d556736
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2023-12-30 17:04:25 +08:00 |
|
xcy
|
d034105a62
|
fix:
修复排名数据不对
|
2023-12-30 17:02:25 +08:00 |
|
dy
|
6fd4e79fbe
|
累计充值
|
2023-12-30 16:32:26 +08:00 |
|
dy
|
6fae6cd61e
|
破冰礼包
|
2023-12-30 16:07:54 +08:00 |
|
xcy
|
45cec85960
|
patch:
修复元旦活动任务脚本
|
2023-12-30 15:10:35 +08:00 |
|
dy
|
d03d8a8399
|
增加字段
|
2023-12-30 10:42:24 +08:00 |
|
dy
|
35ea01f3aa
|
Merge branch 'master' into bugfix
|
2023-12-30 10:27:48 +08:00 |
|
dy
|
65417fb8bd
|
fix数据刷新
|
2023-12-30 10:26:24 +08:00 |
|
dy
|
6be02bee61
|
Merge branch 'bugfix' into release
|
2023-12-29 19:42:58 +08:00 |
|
dy
|
8f3cb3e091
|
fix 开服竞赛排行榜
|
2023-12-29 19:42:35 +08:00 |
|
dy
|
fc426a283b
|
Merge branch 'feature/json' into release
|
2023-12-29 19:01:28 +08:00 |
|
dy
|
1f3adac088
|
json
|
2023-12-29 19:01:18 +08:00 |
|
xcy
|
e496b3fefb
|
fix:
开服竞赛排行榜问题
|
2023-12-29 18:43:25 +08:00 |
|
dy
|
b9be0901fa
|
Merge remote-tracking branch 'origin/bugfix' into bugfix
|
2023-12-29 17:25:40 +08:00 |
|
dy
|
ecc116bfa1
|
fix 消费竞赛
|
2023-12-29 17:25:34 +08:00 |
|
xcy
|
d71ecf13f9
|
fix:
开服竞赛排行榜修复
|
2023-12-29 17:06:59 +08:00 |
|
dy
|
0dede0ac47
|
cehua json
|
2023-12-29 16:51:21 +08:00 |
|
dy
|
000de548c0
|
fix userpin
|
2023-12-29 16:26:10 +08:00 |
|
dy
|
d5d5d72bad
|
元旦活动
|
2023-12-29 16:21:40 +08:00 |
|
dy
|
aa671a332b
|
fix 配件
|
2023-12-29 15:24:44 +08:00 |
|
dy
|
b56a0c4591
|
fix 配件
|
2023-12-29 15:19:43 +08:00 |
|
dy
|
bf39147538
|
Revert "fix 红点"
This reverts commit e9a27e135e.
|
2023-12-29 15:19:19 +08:00 |
|
dy
|
e9a27e135e
|
fix 红点
|
2023-12-29 14:22:08 +08:00 |
|
dy
|
f9deacd411
|
fix 重大bug
|
2023-12-29 13:51:55 +08:00 |
|
|
|
c2b1a6cb0b
|
增加cpu调试
|
2023-12-29 11:57:41 +08:00 |
|
dy
|
7676fc3142
|
Revert "回滚公用方法"
This reverts commit 89af066d12.
|
2023-12-29 01:19:47 +08:00 |
|
dy
|
2af3bf426b
|
Merge branch 'master' into bugfix
|
2023-12-29 01:19:16 +08:00 |
|
dy
|
89af066d12
|
回滚公用方法
|
2023-12-29 01:07:27 +08:00 |
|
dy
|
8dfe0b4ce8
|
fix 脚本
|
2023-12-28 23:55:07 +08:00 |
|
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 |
|
xcy
|
36a82d135b
|
Merge branch 'fix/conglinshoulie' into dev
|
2023-12-28 00:02:35 +08:00 |
|
dy
|
f0fc5a5901
|
Merge branch 'bugfix' into dev
|
2023-12-31 17:52:22 +08:00 |
|
dy
|
9e032536f0
|
Merge branch 'bugfix' into dev
|
2023-12-31 17:22:26 +08:00 |
|
dy
|
b46260f4a2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-31 17:05:25 +08:00 |
|
dy
|
22dd6644a3
|
Merge branch 'bugfix' into dev
|
2023-12-31 17:05:15 +08:00 |
|
dy
|
76f9dd1f98
|
Merge branch 'bugfix' into dev
|
2023-12-31 15:23:06 +08:00 |
|
xcy
|
60bcf1d794
|
Merge branch 'fix/conglinshoulie' into dev
|
2023-12-31 14:20:08 +08:00 |
|
xcy
|
686f1fafc6
|
fix:
丛林猎手优化
|
2023-12-31 14:18:57 +08:00 |
|
dy
|
3f2daecfef
|
Merge branch 'bugfix' into dev
|
2023-12-31 13:43:53 +08:00 |
|
dy
|
dbd1e72657
|
Merge branch 'bugfix' into dev
|
2023-12-31 13:37:06 +08:00 |
|
dy
|
4128508a4c
|
Merge branch 'feature/leichong' into dev
|
2023-12-31 11:45:57 +08:00 |
|
dy
|
6f17e77f14
|
Merge branch 'bugfix' into dev
|
2023-12-31 11:24:45 +08:00 |
|
dy
|
eafa42880a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-31 09:48:45 +08:00 |
|
dy
|
da4a53d071
|
Merge branch 'feature/leichong' into dev
|
2023-12-31 09:48:33 +08:00 |
|
xcy
|
a7d11fe54e
|
Merge branch 'bugfix' into dev
|
2023-12-30 18:04:20 +08:00 |
|
dy
|
86866e9233
|
Merge branch 'bugfix' into dev
|
2023-12-30 16:32:49 +08:00 |
|
dy
|
611898b501
|
Merge branch 'feature/leichong' into dev
|
2023-12-30 16:32:38 +08:00 |
|
dy
|
f6df6fd8bc
|
Merge branch 'bugfix' into dev
|
2023-12-30 10:43:31 +08:00 |
|
dy
|
005a086ea1
|
Merge branch 'master' into dev
|
2023-12-30 10:28:00 +08:00 |
|
dy
|
9d14aea6b8
|
Merge branch 'bugfix' into dev
|
2023-12-29 19:42:43 +08:00 |
|
xcy
|
59a07175e6
|
Merge branch 'bugfix' into dev
|
2023-12-29 18:43:58 +08:00 |
|
dy
|
718add173f
|
Merge branch 'feature/json' into dev
|
2023-12-29 16:52:17 +08:00 |
|
dy
|
94cf1f9c4f
|
Merge branch 'bugfix' into dev
|
2023-12-29 16:26:22 +08:00 |
|
dy
|
be8691ce6d
|
Merge branch 'bugfix' into dev
|
2023-12-29 16:21:55 +08:00 |
|
dy
|
f7cf497ded
|
Merge branch 'bugfix' into dev
|
2023-12-29 14:22:17 +08:00 |
|
dy
|
3462540159
|
Merge branch 'bugfix' into dev
# Conflicts:
# src/public/pay.ts
|
2023-12-29 13:53:02 +08:00 |
|
xcy
|
52a112085b
|
Merge remote-tracking branch 'origin/bugfix' into dev
|
2023-12-28 18:46:58 +08:00 |
|
xcy
|
2894f384b9
|
Merge remote-tracking branch 'origin/bugfix' into dev
# Conflicts:
# src/public/rank/rank.ts
|
2023-12-28 18:22:20 +08:00 |
|
xcy
|
2739774842
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-28 18:20:15 +08:00 |
|
dy
|
17aa676fa9
|
Merge branch 'bugfix' into dev
|
2023-12-28 16:16:09 +08:00 |
|
xcy
|
34ce5c01aa
|
fix:
修复终身卡邮件没有type
|
2023-12-28 15:19:06 +08:00 |
|
xcy
|
4fa797f93d
|
fix:
终身卡发放奖励bug修复
|
2023-12-28 14:49:17 +08:00 |
|
xcy
|
be85366d04
|
fix:
终身卡定时器log
|
2023-12-28 14:43:00 +08:00 |
|
dy
|
e1430b6411
|
Merge branch 'bugfix' into dev
|
2023-12-28 14:18:58 +08:00 |
|
xcy
|
0b2a9f3dc7
|
累计充值累计金额修改为累计vip经验(金额*10)
|
2023-12-28 13:44:53 +08:00 |
|
xcy
|
b79d80beed
|
fix:
修复终身卡每周奖励未发放bug
|
2023-12-28 11:49:44 +08:00 |
|
Your Name
|
3898cee713
|
fix:
修复悬赏任务一键领取3倍奖励逻辑错误
|
2023-12-28 11:11:34 +08:00 |
|
Your Name
|
dda879b037
|
Merge branch 'dev' of http://git.legu.cc/qixin/HJ_Server into dev
|
2023-12-28 10:10:05 +08:00 |
|
Your Name
|
99e84d65a5
|
fix:修复悬赏任务一键领取特权问题
|
2023-12-28 10:09:58 +08:00 |
|
dy
|
2811d16323
|
Merge branch 'bugfix' into dev
|
2023-12-28 10:06:30 +08:00 |
|
xcy
|
0e93358e74
|
fix:
丛林猎手优化
|
2023-12-28 00:02:12 +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
|
b013e9042c
|
Merge branch 'bugfix' into dev
|
2023-12-27 22:10:19 +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
|
1158f26eaa
|
Merge branch 'feature/xiaofeijingsai' into dev
|
2023-12-27 21:06:10 +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
|
6efe04ed6d
|
Merge branch 'feature/json' into dev
|
2023-12-27 20:49:47 +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
|
968ce25e5f
|
Merge branch 'feature/yuandan' into dev
|
2023-12-27 20:10:25 +08:00 |
|
dy
|
12300703b5
|
每日刷新付费礼包
|
2023-12-27 20:09:59 +08:00 |
|
dy
|
944a675af3
|
Merge branch 'feature/yuandan' into dev
|
2023-12-27 20:00:01 +08:00 |
|
dy
|
6fa3a8224c
|
Merge branch 'bugfix' into dev
|
2023-12-27 19:59:57 +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
|
479c309481
|
Merge branch 'bugfix' into dev
|
2023-12-27 19:32:03 +08:00 |
|
dy
|
dbb012675a
|
fix 自选支付
|
2023-12-27 19:30:49 +08:00 |
|
dy
|
b2eb783dc1
|
Merge branch 'feature/json' into dev
# Conflicts:
# src/json/huodong.json5
|
2023-12-27 19:16:06 +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
|
892717ca09
|
Merge branch 'bugfix' into dev
|
2023-12-27 19:13:24 +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
|
3450796bb7
|
Merge branch 'bugfix' into dev
|
2023-12-27 18:34:16 +08:00 |
|
dy
|
5e476fa5c6
|
fix 探险
|
2023-12-27 18:34:04 +08:00 |
|
dy
|
4ebe8ae338
|
Merge branch 'bugfix' into dev
|
2023-12-27 17:55:29 +08:00 |
|
dy
|
3c034fb296
|
每10分钟刷新排行榜前一千名玩家的用户数据
|
2023-12-27 17:53:32 +08:00 |
|
dy
|
de90e27b3f
|
Merge branch 'bugfix' into dev
|
2023-12-27 17:06:34 +08:00 |
|
dy
|
1292156a9d
|
Merge branch 'feature/yuandan' into dev
|
2023-12-27 17:00:30 +08:00 |
|
dy
|
53a2becac5
|
娃娃机改为掉落组
|
2023-12-27 16:53:33 +08:00 |
|
xcy
|
26fd486595
|
Merge branch 'fix/conglinshoulie' into dev
|
2023-12-27 16:43:28 +08:00 |
|
xcy
|
e00e9c4dfc
|
fix:
丛林狩猎优化
|
2023-12-27 16:42:46 +08:00 |
|
dy
|
95a3e9d3fb
|
Merge branch 'feature/yuandan' into dev
|
2023-12-27 16:41:54 +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
|
03d2736e8d
|
Merge branch 'feature/xiaofeijingsai' into dev
|
2023-12-27 14:17:21 +08:00 |
|
dy
|
b578bb0db0
|
消费竞赛改为跨服活动
|
2023-12-27 14:17:10 +08:00 |
|
dy
|
58e23b1812
|
Merge branch 'feature/yuandan' into dev
|
2023-12-27 11:09:09 +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
|
bff3115f75
|
Merge branch 'feature/yuandan' into dev
|
2023-12-27 11:03:21 +08:00 |
|
dy
|
34ace42872
|
proto
|
2023-12-27 11:03:10 +08:00 |
|
dy
|
1cf4784d42
|
元旦红点，破冰红点
|
2023-12-27 11:02:53 +08:00 |
|
dy
|
9a5cc99fb1
|
Merge branch 'bugfix' into dev
|
2023-12-27 10:23:57 +08:00 |
|
dy
|
4538c0dc16
|
自选礼包红点
|
2023-12-27 10:23:12 +08:00 |
|
dy
|
058529ea6a
|
Merge branch 'bugfix' into dev
|
2023-12-27 10:20:00 +08:00 |
|
dy
|
f9989cf002
|
自选礼包
|
2023-12-27 10:17:38 +08:00 |
|
dy
|
47a9c6efb7
|
Merge branch 'feature/yuandan' into dev
|
2023-12-27 09:51:50 +08:00 |
|
dy
|
944ef41d5d
|
达摩献礼
|
2023-12-27 09:51:37 +08:00 |
|
dy
|
2a4ed01a34
|
Merge branch 'feature/yuandan' into dev
|
2023-12-26 20:04:13 +08:00 |
|
dy
|
8503a65c1f
|
yuandan fun
|
2023-12-26 20:04:05 +08:00 |
|
dy
|
9ee67b5193
|
Merge branch 'feature/yuandan' into dev
|
2023-12-26 19:50:09 +08:00 |
|
dy
|
f50f6de933
|
yuandan
|
2023-12-26 19:49:46 +08:00 |
|
dy
|
f8b87f751e
|
Merge branch 'bugfix' into dev
|
2023-12-26 19:00:08 +08:00 |
|
dy
|
df027cdf08
|
Merge branch 'master' into dev
# Conflicts:
# src/public/pay.ts
|
2023-12-26 19:00:05 +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
|
408562d576
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-26 17:34:21 +08:00 |
|
dy
|
4ae077503f
|
Merge branch 'feature/yuandan' into dev
|
2023-12-26 17:34:11 +08:00 |
|
dy
|
08d0bed291
|
元旦活动
|
2023-12-26 17:33:48 +08:00 |
|
Your Name
|
c901756cc8
|
排行榜修改
|
2023-12-26 17:27:22 +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
|
03b774b73e
|
Merge branch 'feature/yuandan' into dev
|
2023-12-26 16:53:53 +08:00 |
|
dy
|
21994f214a
|
元旦fix
|
2023-12-26 16:53:43 +08:00 |
|
dy
|
ceec9c5be2
|
Merge branch 'feature/json' into dev
# Conflicts:
# src/json/huodong.json5
|
2023-12-26 16:49:13 +08:00 |
|
