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 |
|
|
|
a0043e1080
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2023-12-26 10:33:07 +08:00 |
|
|
|
7537f108ad
|
增加索引，解决慢查询
|
2023-12-26 10:32:27 +08:00 |
|
|
|
ba364e13f6
|
fix: 修复领主来袭接口回参缺少 num 字段的问题
|
2023-12-26 10:24:35 +08:00 |
|
dy
|
9c4ba3a334
|
fix
|
2023-12-26 09:47:06 +08:00 |
|
dy
|
d5ef0b3187
|
yuandan
|
2023-12-26 09:40:15 +08:00 |
|
dy
|
905ed441e4
|
redis临时修复
|
2023-12-25 20:54:59 +08:00 |
|
dy
|
8df40bff28
|
Merge remote-tracking branch 'origin/bugfix' into bugfix
|
2023-12-25 20:27:48 +08:00 |
|
dy
|
91c2827b33
|
fix 自选支付
|
2023-12-25 20:27:39 +08:00 |
|
|
|
bb7495379e
|
去掉所有注释了的G.redis的代码，为全面弃用该redisJson做准备
|
2023-12-25 20:21:46 +08:00 |
|
dy
|
5486c2adf7
|
json
|
2023-12-25 18:03:15 +08:00 |
|
Your Name
|
080665f24e
|
黑帮争霸积分
|
2023-12-25 17:43:34 +08:00 |
|
Your Name
|
5ab463eadd
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2023-12-25 17:43:12 +08:00 |
|
Your Name
|
3274911772
|
铁笼死斗积分修改
|
2023-12-25 17:40:59 +08:00 |
|
dy
|
4b8be68516
|
fix pay
|
2023-12-25 17:17:57 +08:00 |
|
dy
|
1d6143794c
|
元旦活动
|
2023-12-25 17:13:59 +08:00 |
|
dy
|
93f6b5b7ba
|
自选类型购买改为统一方法
|
2023-12-25 16:38:05 +08:00 |
|
|
|
36d92262b7
|
fix: 修复 boss 锁状态不释放的问题
|
2023-12-25 15:50:06 +08:00 |
|
|
|
1244a99c4c
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2023-12-25 14:33:01 +08:00 |
|
|
|
dd2962a80e
|
清理redis
|
2023-12-25 14:32:52 +08:00 |
|
dy
|
cba4f4563d
|
json
|
2023-12-25 14:00:30 +08:00 |
|
dy
|
a4d7fb7909
|
Merge remote-tracking branch 'origin/bugfix' into bugfix
|
2023-12-25 13:50:53 +08:00 |
|
dy
|
88c39187a0
|
商店加入version，当版本不一致时刷新商店内容
|
2023-12-25 13:50:43 +08:00 |
|
|
|
43f640595b
|
脚本模板
|
2023-12-25 13:50:28 +08:00 |
|
dy
|
00804fa8c1
|
init 元旦活动
|
2023-12-25 13:48:18 +08:00 |
|
|
|
c323a9e255
|
fix: 修复抢红包日志列表长度限制未生效的问题
|
2023-12-25 11:06:45 +08:00 |
|
dy
|
14daa94dba
|
fix 黑帮争霸分组定时器
|
2023-12-23 12:30:11 +08:00 |
|
dy
|
077f7a488e
|
Merge branch 'release' into bugfix
# Conflicts:
# src/api_s2c/email/ApiAllRemove.ts
|
2023-12-23 11:46:49 +08:00 |
|
xcy
|
f8298f08e9
|
fix:
修复邮件
|
2023-12-23 01:35:48 +08:00 |
|
xcy
|
8c0487bd58
|
Merge remote-tracking branch 'origin/release' into release
|
2023-12-23 01:11:56 +08:00 |
|
xcy
|
862052e827
|
fix:
修复邮件
|
2023-12-23 01:11:45 +08:00 |
|
dy
|
d37774d54f
|
fix:
json配置提交
|
2023-12-23 01:08:49 +08:00 |
|
xcy
|
e49861bcaf
|
fix:
修复邮件
|
2023-12-23 00:46:08 +08:00 |
|
xcy
|
ef6498c0d6
|
fix:
修复邮件
|
2023-12-23 00:44:04 +08:00 |
|
xcy
|
7354ad9ae8
|
Merge remote-tracking branch 'origin/release' into bugfix
|
2023-12-23 00:40:20 +08:00 |
|
dy
|
a242d6a66a
|
fix:
json同步
|
2023-12-22 23:33:02 +08:00 |
|
dy
|
34b3f84418
|
proto
|
2023-12-22 22:58:49 +08:00 |
|
dy
|
7fb7f952c7
|
Merge branch 'feature/json' into release
|
2023-12-22 22:56:38 +08:00 |
|
dy
|
4d3377fc3c
|
json
|
2023-12-22 22:54:36 +08:00 |
|
dy
|
38c1b28f9c
|
Merge remote-tracking branch 'origin/dev-leijichongzhi' into release
# Conflicts:
# src/api_s2c/hongdian/ApiGet.ts
# src/api_s2c/pushgift/ApiOpen.ts
# src/globalListener.ts
# src/module/collection_event.ts
# src/public/pushgift.ts
# src/shared/protocols/hongdian/PtlGet.ts
# src/shared/protocols/msg_s2c/MsgPushGiftChange.ts
# src/shared/protocols/serviceProto.ts
|
2023-12-22 22:50:59 +08:00 |
|
dy
|
eabcc57242
|
Merge remote-tracking branch 'origin/dev-meirilibao' into release
|
2023-12-22 22:43:24 +08:00 |
|
dy
|
5ed699a64a
|
Merge remote-tracking branch 'origin/feature/xiaofeijingsai' into release
# Conflicts:
# src/shared/protocols/serviceProto.ts
|
2023-12-22 22:43:08 +08:00 |
|
dy
|
75e921dbc2
|
Merge remote-tracking branch 'origin/feature/planb' into release
# Conflicts:
# src/api_s2c/hongdian/ApiGet.ts
# src/module/collection_event.ts
# src/shared/protocols/hongdian/PtlGet.ts
# src/shared/protocols/serviceProto.ts
|
2023-12-22 22:42:44 +08:00 |
|
dy
|
466d02221d
|
Merge remote-tracking branch 'origin/feature/pay_for_diamond' into release
# Conflicts:
# src/shared/protocols/serviceProto.ts
|
2023-12-22 22:40:40 +08:00 |
|
dy
|
a4a84aba24
|
Merge remote-tracking branch 'origin/feature/dadian' into release
|
2023-12-22 22:40:03 +08:00 |
|
xcy
|
62d954c743
|
fix:
推送礼包
|
2023-12-22 22:20:56 +08:00 |
|
xcy
|
474246463c
|
Merge remote-tracking branch 'origin/pushgift' into release
# Conflicts:
# src/api_s2c/pushgift/ApiOpen.ts
# src/public/fight.ts
# src/public/pushgift.ts
# src/shared/protocols/msg_s2c/MsgPushGiftChange.ts
# src/shared/protocols/serviceProto.ts
|
2023-12-22 22:18:56 +08:00 |
|
dy
|
2c3219918a
|
json
|
2023-12-22 21:57:22 +08:00 |
|
dy
|
e269b1412a
|
类型报错
|
2023-12-22 21:27:44 +08:00 |
|
|
|
c304a6d8cc
|
fix: 已领取的玩家添加gotAmount 字段
|
2023-12-22 21:23:13 +08:00 |
|
dy
|
287db25686
|
json
|
2023-12-22 20:59:18 +08:00 |
|
|
|
4a6a40403d
|
fix: canReceive 接口添加玩家领取到的数额
|
2023-12-22 20:47:52 +08:00 |
|
xcy
|
5a7c645e0f
|
fix:
推送礼包
|
2023-12-22 20:39:14 +08:00 |
|
xcy
|
ae8da996ae
|
fix:
推送礼包
|
2023-12-22 20:38:43 +08:00 |
|
xcy
|
58ba7b489d
|
feat:
1.推送礼包
(cherry picked from commit e99b5dad15)
|
2023-12-22 20:34:51 +08:00 |
|
xcy
|
df641aa69f
|
feat:
1.推送礼包
(cherry picked from commit ef90c131f3)
|
2023-12-22 20:34:42 +08:00 |
|
dy
|
30a02fbd36
|
json
|
2023-12-22 20:33:34 +08:00 |
|
dy
|
7fc9b0564f
|
每日礼包领取免费
|
2023-12-22 20:26:25 +08:00 |
|
|
|
bcca0ebbab
|
fix: 修复最大总额计算错误的 bug
|
2023-12-22 20:13:18 +08:00 |
|
dy
|
d00cb7895e
|
json
|
2023-12-22 19:47:15 +08:00 |
|
|
|
7eb34f872d
|
fix: 调整可领取红包的判断逻辑
|
2023-12-22 19:26:18 +08:00 |
|
|
|
02dccd18a7
|
fix: 修复细节问题
|
2023-12-22 19:00:11 +08:00 |
|
|
|
40774138d2
|
fix: 将活动改为跨服活动
|
2023-12-22 18:27:46 +08:00 |
|
dy
|
7f60477a86
|
游戏内打点
|
2023-12-22 18:18:10 +08:00 |
|
xcy
|
4c9ad23bc1
|
fix:
添加接口
|
2023-12-22 18:04:56 +08:00 |
|
dy
|
acbf8a6ec6
|
json
|
2023-12-22 17:57:50 +08:00 |
|
|
|
eed6dd1b8f
|
fix: 添加红点及玩家发奖
|
2023-12-22 17:06:19 +08:00 |
|
dy
|
c3ba3934d4
|
消费竞赛定时器发奖，每天0点5分检测活动 结束
|
2023-12-22 16:49:21 +08:00 |
|
|
|
36b15af077
|
fix: 添加 price 回参表示领取门槛
|
2023-12-22 16:34:54 +08:00 |
|
xcy
|
a2d16fb530
|
fix:
email 过滤 prizelist
|
2023-12-22 16:15:06 +08:00 |
|
xcy
|
753dd8decb
|
fix:
异步查库改为同步插库
|
2023-12-22 16:06:57 +08:00 |
|
dy
|
8837ded042
|
Merge branch 'feature/json' into feature/xiaofeijingsai
|
2023-12-22 16:00:28 +08:00 |
|
xcy
|
791dbc5472
|
fix:
异步查库改为同步插库
|
2023-12-22 16:00:23 +08:00 |
|
dy
|
6b80b07cfe
|
json
|
2023-12-22 15:01:23 +08:00 |
|
dy
|
a135acbc93
|
Merge branch 'master' into feature/json
|
2023-12-22 15:00:23 +08:00 |
|
|
|
2a492a8919
|
fix: 修复玩家可以重复领取的 bug
|
2023-12-22 14:59:33 +08:00 |
|
|
|
7ca6fe75e3
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2023-12-22 14:34:18 +08:00 |
|
|
|
dda11bb122
|
事件容错处理
|
2023-12-22 14:33:49 +08:00 |
|
xcy
|
6526d386c4
|
feat:
累充礼包
|
2023-12-22 14:33:43 +08:00 |
|
dy
|
445cd60548
|
fix bug 支付、英雄上阵bug
|
2023-12-22 14:07:55 +08:00 |
|
|
|
86910e7ad7
|
debug: 添加玩家领取记录的日志输出
|
2023-12-22 14:05:15 +08:00 |
|
|
|
c5817b4acf
|
fix: 添加玩家领取记录的 upsert 选项
|
2023-12-22 13:57:02 +08:00 |
|
|
|
06062716ef
|
fix: 调整领取时查询的条件表达式
|
2023-12-22 13:40:13 +08:00 |
|
|
|
e0a624adba
|
fix: 添加领取日志信息
|
2023-12-22 12:11:20 +08:00 |
|
xcy
|
bafed44a56
|
feat:
proto
|
2023-12-22 11:57:39 +08:00 |
|
xcy
|
377b7553e2
|
Merge branch 'dev' into dev-leijichongzhi
# Conflicts:
# src/shared/protocols/serviceProto.ts
|
2023-12-22 11:51:18 +08:00 |
|
xcy
|
1184b0b6de
|
feat:
脚本
|
2023-12-22 11:50:45 +08:00 |
|
xcy
|
a326ef7d39
|
feat:
脚本
|
2023-12-22 11:49:14 +08:00 |
|
dy
|
6e67ae6441
|
Merge branch 'master' into feature/xiaofeijingsai
|
2023-12-22 11:39:29 +08:00 |
|
dy
|
f17f4182a9
|
消费竞赛定时器
|
2023-12-22 11:39:17 +08:00 |
|
|
|
ce9238ccdb
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 11:31:31 +08:00 |
|
|
|
76a04a34d5
|
fix: 修复 groups 配置取值错误的问题
|
2023-12-22 11:30:54 +08:00 |
|
dy
|
e34a5a635f
|
Merge branch 'master' into dev
|
2023-12-22 11:04:11 +08:00 |
|
|
|
e660adb95c
|
Merge branch 'feature/pay_for_diamond' into dev
|
2023-12-22 10:15:44 +08:00 |
|
|
|
bb60b00d93
|
Merge branch 'feature/json' into dev
|
2023-12-22 10:12:43 +08:00 |
|
|
|
4b190272b1
|
fix: 调整 remaining 计算规则
|
2023-12-22 10:11:24 +08:00 |
|
|
|
3d43fa1a34
|
fix: 更新抢钻石活动的数据结构
|
2023-12-22 10:07:23 +08:00 |
|
dy
|
ba2c49868f
|
fix pay
|
2023-12-22 00:22:54 +08:00 |
|
dy
|
c695388208
|
fix pay
|
2023-12-21 23:51:03 +08:00 |
|
dy
|
50c52556e0
|
fix pay
|
2023-12-21 23:40:41 +08:00 |
|
dy
|
be5d421393
|
Merge branch 'master' into bugfix
|
2023-12-21 22:14:30 +08:00 |
|
|
|
607d590f2f
|
Merge branch 'feature/json' into dev
|
2023-12-21 21:41:18 +08:00 |
|
|
|
bfb6e4ff4e
|
build: 更新活动配置
|
2023-12-21 21:40:49 +08:00 |
|
xcy
|
c70c154099
|
feat:
累充礼包
|
2023-12-21 21:38:53 +08:00 |
|
|
|
2fc85853dc
|
feat: 充值抢钻石活动
|
2023-12-21 21:14:13 +08:00 |
|
|
|
ba8653dca9
|
fix: 添加领取数额的最大值配置
|
2023-12-21 21:08:22 +08:00 |
|
|
|
6808b53dd4
|
fix: 允许玩家领取到的钻石数小于配置的最低档位额度
|
2023-12-21 20:33:47 +08:00 |
|
|
|
2ae2a1362d
|
feat: 添加炫耀逻辑
|
2023-12-21 20:16:29 +08:00 |
|
|
|
82b4b61725
|
feat: 抢红包分钻石接口 初版
|
2023-12-21 19:52:19 +08:00 |
|
xcy
|
122041f404
|
feat:
脚本目录
|
2023-12-21 18:16:54 +08:00 |
|
dy
|
5bf5f59bfa
|
Merge branch 'feature/xiaofeijingsai' into dev
|
2023-12-21 17:49:19 +08:00 |
|
dy
|
351f8f7934
|
Merge branch 'bugfix' into dev
|
2023-12-21 17:34:06 +08:00 |
|
dy
|
720d89e988
|
主角皮肤计算属性
|
2023-12-21 17:33:31 +08:00 |
|
yushunrui
|
4690254453
|
fix:圣诞活动修改异步按钮逻辑
|
2023-12-21 16:42:43 +08:00 |
|
yushunrui
|
f1a4daece3
|
fix:圣诞活动修改异步按钮逻辑
|
2023-12-21 16:42:42 +08:00 |
|
yushunrui
|
05368fc0de
|
fix:圣诞活动修改异步按钮逻辑
|
2023-12-21 16:42:42 +08:00 |
|
yushunrui
|
48038d1b07
|
fix:圣诞活动新增vip经验任务157
|
2023-12-21 16:42:41 +08:00 |
|
yushunrui
|
ad439d0b14
|
fix:圣诞活动礼包改成每日重置
|
2023-12-21 16:42:40 +08:00 |
|
yushunrui
|
1d7b1a4f58
|
fix:圣诞活动红点报错处理
|
2023-12-21 16:42:40 +08:00 |
|
yushunrui
|
5ec8b60e99
|
fix:新增圣诞活动签到也加上经验
|
2023-12-21 16:42:39 +08:00 |
|
yushunrui
|
4e74b001b5
|
fix:新增圣诞活动每日消耗钻石任务类型
|
2023-12-21 16:42:39 +08:00 |
|
yushunrui
|
ec3d872390
|
fix:圣诞活动红点
|
2023-12-21 16:42:38 +08:00 |
|
yushunrui
|
1b222a9fc6
|
fix:圣诞活动充值不到账
|
2023-12-21 16:41:32 +08:00 |
|
yushunrui
|
80908e5a46
|
fix:圣诞任务增加圣诞经验字段
|
2023-12-21 16:41:31 +08:00 |
|
dy
|
0cc3d1c031
|
Merge branch 'feature/playerhead' into release
|
2023-12-21 16:29:11 +08:00 |
|
dy
|
8ca2772e30
|
Merge branch 'feature/playerhead' into dev
|
2023-12-21 16:10:47 +08:00 |
|
dy
|
b38fc4f21f
|
fix use item model
|
2023-12-21 16:10:37 +08:00 |
|
dy
|
c59cae6a16
|
Merge branch 'bugfix' into release
|
2023-12-21 15:00:10 +08:00 |
|
dy
|
02ae6ada55
|
Merge branch 'feature/playerhead' into release
|
2023-12-21 14:59:48 +08:00 |
|
dy
|
deeac9c1f8
|
Merge branch 'feature/json' into release
|
2023-12-21 14:59:42 +08:00 |
|
dy
|
36dc1e6f8c
|
Merge branch 'feature/json' into dev
# Conflicts:
# src/json/pay.json
# src/json/tuisonglibao.json
|
2023-12-21 14:57:47 +08:00 |
|
dy
|
1d847480fc
|
cehua json
|
2023-12-21 14:57:26 +08:00 |
|
dy
|
85ccd8dd90
|
造型脚本
|
2023-12-21 14:56:30 +08:00 |
|
dy
|
40d4bb64fc
|
Merge branch 'feature/dev-json' into dev
|
2023-12-21 14:47:31 +08:00 |
|
dy
|
7bfa453bea
|
cehua json
|
2023-12-21 14:47:06 +08:00 |
|
dy
|
2f9483725d
|
头像脚本
|
2023-12-21 14:46:25 +08:00 |
|
xcy
|
44dc10fae6
|
fix:
修复定时器重复执行导致邮件重复发送问题
|
2023-12-21 14:01:47 +08:00 |
|
xcy
|
f725816c20
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-21 14:01:16 +08:00 |
|
xcy
|
c20bf92491
|
fix:
修复定时器重复执行导致邮件重复发送问题
|
2023-12-21 14:01:08 +08:00 |
|
dy
|
825a056415
|
Merge branch 'feature/json' into release
# Conflicts:
# src/json/tuisonglibao.json
|
2023-12-21 13:34:27 +08:00 |
|
dy
|
0ea1acac43
|
cehua json
|
2023-12-21 13:33:33 +08:00 |
|
dy
|
12f6729f4e
|
Merge branch 'feature/playerhead' into release
|
2023-12-21 13:25:18 +08:00 |
|
dy
|
ba978c827a
|
Merge branch 'bugfix' into release
|
2023-12-21 13:25:04 +08:00 |
|
dy
|
527cd64b24
|
Merge branch 'feature/playerhead' into dev
|
2023-12-21 12:43:56 +08:00 |
|
dy
|
54c483bed0
|
造型更换bug
|
2023-12-21 12:43:25 +08:00 |
|
dy
|
3dff056df6
|
Merge branch 'feature/playerhead' into dev
|
2023-12-21 12:37:55 +08:00 |
|
dy
|
3194dc6449
|
造型更换
|
2023-12-21 12:37:39 +08:00 |
|
dy
|
185c929f31
|
Merge branch 'bugfix' into dev
|
2023-12-21 12:01:06 +08:00 |
|
dy
|
59720a4a2b
|
内存泄露优化
|
2023-12-21 12:01:00 +08:00 |
|
dy
|
d5ce29164a
|
Merge branch 'bugfix' into dev
|
2023-12-21 11:55:54 +08:00 |
|
dy
|
cd6c79f6ac
|
内存泄露优化
|
2023-12-21 11:55:32 +08:00 |
|
dy
|
f013d35dc4
|
Merge branch 'feature/playerhead' into dev
|
2023-12-21 11:37:33 +08:00 |
|
dy
|
4ceaeb8a5e
|
用户头像造型修复bug
|
2023-12-21 11:36:53 +08:00 |
|
dy
|
e477b14546
|
Merge branch 'feature/playerhead' into dev
|
2023-12-21 11:32:30 +08:00 |
|
dy
|
552da79951
|
用户头像造型修复bug
|
2023-12-21 11:32:15 +08:00 |
|
dy
|
3b3a322168
|
Merge branch 'feature/playerhead' into dev
|
2023-12-21 10:14:32 +08:00 |
|
dy
|
d633d52d80
|
造型
|
2023-12-21 10:14:21 +08:00 |
|
dy
|
f52e3ca55c
|
Merge branch 'feature/playerhead' into dev
# Conflicts:
# src/json/playerHead.json
# src/json/tuisonglibao.json
|
2023-12-21 09:53:14 +08:00 |
|
dy
|
dd60fe3bab
|
Merge branch 'bugfix' into dev
|
2023-12-21 09:52:15 +08:00 |
|
|
|
87ccce1875
|
fix: 对主角技能 buff 造成的伤害添加上限限制
|
2023-12-21 09:45:08 +08:00 |
|
dy
|
715f564848
|
造型
|
2023-12-20 21:59:23 +08:00 |
|
dy
|
6cb39ad523
|
消费竞赛limit
|
2023-12-20 21:08:06 +08:00 |
|
dy
|
463c272089
|
Merge branch 'feature/planb' into dev
|
2023-12-20 20:07:22 +08:00 |
|
dy
|
d3ebfdcc02
|
Merge branch 'feature/xiaofeijingsai' into dev
|
2023-12-20 20:07:20 +08:00 |
|
yushunrui
|
abed7be68f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-25 19:33:39 +08:00 |
|
yushunrui
|
772993260e
|
fix:圣诞活动修改异步按钮逻辑
|
2023-12-25 19:30:55 +08:00 |
|
dy
|
97d1ddb142
|
破冰
|
2023-12-20 20:06:52 +08:00 |
|
dy
|
fd3c13d2b5
|
消耗竞赛
|
2023-12-20 20:05:40 +08:00 |
|
dy
|
9429dacc63
|
公路狂飙性能优化
|
2023-12-20 19:22:51 +08:00 |
|
dy
|
5f0d645c08
|
Merge branch 'feature/playerhead' into dev
|
2023-12-20 19:18:10 +08:00 |
|
dy
|
48e656e652
|
玩家头像框，造型，头像，对话框增加model解锁配置
|
2023-12-20 19:17:17 +08:00 |
|
xcy
|
23e1941812
|
fix:
修复定时器重复执行导致邮件重复发送问题
|
2023-12-20 19:05:09 +08:00 |
|
yushunrui
|
e1386c698a
|
fix:圣诞活动修改异步按钮逻辑
|
2023-12-20 19:03:41 +08:00 |
|
yushunrui
|
e71c562e08
|
fix:圣诞活动修改异步按钮逻辑
|
2023-12-20 18:56:40 +08:00 |
|
dy
|
6953349058
|
消费竞赛
|
2023-12-20 18:21:43 +08:00 |
|
dy
|
1e46f70cd9
|
Merge branch 'feature/planb' into dev
|
2023-12-20 18:02:39 +08:00 |
|
dy
|
44be68a8ca
|
破冰礼包
|
2023-12-20 18:02:26 +08:00 |
|
dy
|
41799960e0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-20 17:49:15 +08:00 |
|
dy
|
56aa689a18
|
Merge branch 'feature/xiaofeijingsai' into dev
|
2023-12-20 17:48:53 +08:00 |
|
dy
|
5b4e0cce65
|
消费竞赛
|
2023-12-20 17:48:42 +08:00 |
|
yushunrui
|
e09d057f32
|
fix:圣诞活动新增vip经验任务157
|
2023-12-20 17:47:37 +08:00 |
|
yushunrui
|
fcf79d7df0
|
fix:圣诞活动礼包改成每日重置
|
2023-12-20 17:32:31 +08:00 |
|
yushunrui
|
ec524e1ebd
|
fix:圣诞活动红点报错处理
|
2023-12-20 16:59:16 +08:00 |
|
xcy
|
dacd312bfe
|
fix:
日常任务初始值问题修复
|
2023-12-20 16:56:23 +08:00 |
|
dy
|
6d1c58492b
|
Merge branch 'feature/dev-json' into dev
|
2023-12-20 16:55:29 +08:00 |
|
dy
|
d41cde3297
|
cehua public json
|
2023-12-20 16:55:21 +08:00 |
|
dy
|
7ae262ba06
|
Merge branch 'feature/dev-json' into dev
|
2023-12-20 16:47:58 +08:00 |
|
dy
|
d3f8d9d9e8
|
cehua public json
|
2023-12-20 16:47:39 +08:00 |
|
dy
|
2932cf071b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-20 16:44:55 +08:00 |
|
dy
|
8df2ccf160
|
Merge branch 'feature/planb' into dev
|
2023-12-20 16:44:44 +08:00 |
|
dy
|
fa88c44593
|
破冰礼包fix
|
2023-12-20 16:44:30 +08:00 |
|
yushunrui
|
c22d471260
|
fix:新增圣诞活动签到也加上经验
|
2023-12-20 16:39:29 +08:00 |
|
xcy
|
e2d9eea5ed
|
fix:
修复Class_task_134任务监听参数问题导致的报错
|
2023-12-20 16:31:32 +08:00 |
|
yushunrui
|
16254610b0
|
fix:新增圣诞活动每日消耗钻石任务类型
|
2023-12-20 16:25:22 +08:00 |
|
yushunrui
|
8a10552203
|
fix:圣诞活动红点
|
2023-12-20 16:17:09 +08:00 |
|
dy
|
88aa94bc09
|
proto
|
2023-12-20 16:08:52 +08:00 |
|
dy
|
2ade418245
|
Merge branch 'feature/xiaofeijingsai' into dev
# Conflicts:
# src/shared/protocols/serviceProto.ts
|
2023-12-20 16:08:20 +08:00 |
|
dy
|
4631cba0b3
|
消费竞赛
|
2023-12-20 16:07:59 +08:00 |
|
xcy
|
c613cb4e53
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-20 15:42:21 +08:00 |
|
xcy
|
d1750bb097
|
fix:
玩家退出公会时gud残留ghid，在登录时检测修复一下
|
2023-12-20 15:42:14 +08:00 |
|
dy
|
d0a80a4c73
|
Merge branch 'bugfix' into dev
|
2023-12-20 15:41:53 +08:00 |
|
xcy
|
b2ef913c26
|
feat:
脚本文件
|
2023-12-20 15:20:38 +08:00 |
|
xcy
|
276ca85bc3
|
feat:
脚本文件
|
2023-12-20 15:20:16 +08:00 |
|
xcy
|
fb7684326e
|
feat:
在临时停服执行脚本时，可以使用这个方案
|
2023-12-20 15:19:45 +08:00 |
|
xcy
|
7e24671983
|
fix:
1.下限保底，拉去英雄列表时，检测英雄穿戴的peijian是否存在，不存在就置空
|
2023-12-20 15:18:31 +08:00 |
|
dy
|
8247613c27
|
proto
|
2023-12-20 14:52:02 +08:00 |
|
dy
|
47ebe4fe14
|
Merge branch 'feature/pushgift' into dev
# Conflicts:
# src/shared/protocols/serviceProto.ts
|
2023-12-20 14:50:58 +08:00 |
|
|
|
3c84f4092a
|
王者荣耀性能优化
|
2023-12-20 14:14:52 +08:00 |
|
|
|
0b9da72279
|
增加gc Test
|
2023-12-20 14:14:42 +08:00 |
|
dy
|
105af9bbc7
|
revert 推送礼包
|
2023-12-20 13:59:38 +08:00 |
|
dy
|
a113f4c461
|
Revert "Revert "feat:""
This reverts commit c282ece109.
|
2023-12-20 13:56:45 +08:00 |
|
dy
|
146f5a1daa
|
Revert "Revert "feat:""
This reverts commit ce5836be83.
|
2023-12-20 13:56:24 +08:00 |
|
dy
|
7488802fd0
|
revert 推送礼包
|
2023-12-20 13:56:20 +08:00 |
|
|
|
47769ab6bf
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2023-12-20 12:30:41 +08:00 |
|
|
|
b77f97c740
|
王者荣耀性能优化
|
2023-12-20 12:29:19 +08:00 |
|
dy
|
b9db5098cc
|
Merge branch 'feature/planb' into dev
|
2023-12-20 11:28:35 +08:00 |
|
dy
|
1a6789b17b
|
破冰礼包
|
2023-12-20 11:27:25 +08:00 |
|
dy
|
0ba9688238
|
Merge remote-tracking branch 'origin/master-cross-emial' into release
|
2023-12-19 22:32:18 +08:00 |
|
dy
|
cea27e9ea4
|
Merge branch 'master' into feature/planb
|
2023-12-19 22:31:20 +08:00 |
|
xcy
|
24ca69bc08
|
fix:修复开服删除邮件
|
2023-12-19 22:30:01 +08:00 |
|
dy
|
5be46475f4
|
Merge branch 'bugfix' into dev
|
2023-12-19 22:20:07 +08:00 |
|
dy
|
6ffe4eba17
|
Merge branch 'master' into bugfix
|
2023-12-19 22:17:37 +08:00 |
|
dy
|
ec68b193a0
|
公路狂飙性能优化
|
2023-12-19 22:06:34 +08:00 |
|
dy
|
145c1ef8fe
|
Merge branch 'feature/json' into release
|
2023-12-19 20:39:24 +08:00 |
|
yushunrui
|
b0cc406d43
|
fix:圣诞活动充值不到账
|
2023-12-19 19:35:45 +08:00 |
|
dy
|
9844a5323a
|
Merge branch 'dev-tequan' into release
|
2023-12-19 19:27:54 +08:00 |
|
xcy
|
c75f14d88e
|
fix:作战特权增加免费快速探险次数2->5
|
2023-12-19 19:12:01 +08:00 |
|
xcy
|
a969fb65df
|
fix:伙伴招募
|
2023-12-19 19:11:54 +08:00 |
|
xcy
|
4bdee9fc7c
|
fix:伙伴招募
|
2023-12-19 19:11:08 +08:00 |
|
xcy
|
eb7c4204b8
|
fix:作战特权增加免费快速探险次数2->5
|
2023-12-19 19:03:29 +08:00 |
|
xcy
|
8d765e5027
|
fix:伙伴招募修改条件至尊月卡
|
2023-12-19 19:00:42 +08:00 |
|
xcy
|
5969e32323
|
fix:伙伴招募修改条件至尊月卡
|
2023-12-19 19:00:11 +08:00 |
|
dy
|
2262d86d18
|
Merge branch 'feature/json' into dev
|
2023-12-19 18:46:39 +08:00 |
|
dy
|
36f233d6c4
|
cehua json
|
2023-12-19 18:46:28 +08:00 |
|
dy
|
3b12f760e1
|
Merge branch 'dev-tequan' into dev
|
2023-12-19 18:40:10 +08:00 |
|
dy
|
9257595264
|
Merge branch 'dev-tequan' into release
|
2023-12-19 18:39:27 +08:00 |
|
xcy
|
8b157a047a
|
fix:伙伴招募修改条件至尊月卡
|
2023-12-19 18:38:42 +08:00 |
|
dy
|
4c33bad9fb
|
Merge branch 'bugfix' into dev
|
2023-12-19 18:12:14 +08:00 |
|
dy
|
5c6e403e19
|
Merge branch 'release' into bugfix
|
2023-12-19 18:01:22 +08:00 |
|
xcy
|
070edf1cb5
|
fix:
修改伙伴招募的奖励领取条件
|
2023-12-19 18:00:29 +08:00 |
|
xcy
|
db2286509c
|
fix:
修改情报特权
|
2023-12-19 18:00:02 +08:00 |
|
yushunrui
|
0326ceffd7
|
fix:圣诞任务增加圣诞经验字段
|
2023-12-19 17:38:59 +08:00 |
|
dy
|
94bf56cc9e
|
Merge branch 'feature/json' into release
|
2023-12-19 17:14:00 +08:00 |
|
|
|
58ff276e10
|
Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix
|
2023-12-19 17:00:42 +08:00 |
|
|
|
11e5f17b20
|
增加gc Test
|
2023-12-19 17:00:25 +08:00 |
|
xcy
|
7ae7349550
|
fix:跨服邮件定时器
|
2023-12-19 16:26:41 +08:00 |
|
dy
|
b84fd92528
|
Merge branch 'bugfix' into release
|
2023-12-19 16:24:37 +08:00 |
|
dy
|
dbda10a17e
|
去掉trace log
|
2023-12-19 16:24:14 +08:00 |
|
dy
|
b1e3c9c488
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-19 15:01:14 +08:00 |
|
dy
|
581022d579
|
Merge branch 'feature/json' into dev
|
2023-12-19 15:01:08 +08:00 |
|
dy
|
19893f8faa
|
Merge branch 'feature/shouchong' into dev
|
2023-12-19 15:01:02 +08:00 |
|
dy
|
6215737571
|
cehua-json
|
2023-12-19 15:00:51 +08:00 |
|
dy
|
1a703f1ecd
|
首充改为直购
|
2023-12-19 14:59:28 +08:00 |
|
xcy
|
1a38710669
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-19 14:43:00 +08:00 |
|
xcy
|
0ceae9c2bb
|
fix:跨服邮件定时器
|
2023-12-19 14:42:51 +08:00 |
|
dy
|
87d5b0902f
|
铁笼死斗，相同积分用战力排名
|
2023-12-19 14:30:01 +08:00 |
|
dy
|
beae71eb7f
|
铁笼死斗，相同积分用战力排名
|
2023-12-19 14:29:14 +08:00 |
|
dy
|
38e04d29ab
|
破冰礼包
|
2023-12-19 13:42:23 +08:00 |
|
dy
|
eb1e346988
|
Merge branch 'dev' into release
|
2023-12-19 10:13:21 +08:00 |
|
xcy
|
d4634f729e
|
fix:跨服邮件定时器
|
2023-12-19 10:12:49 +08:00 |
|
dy
|
d1b9aa476b
|
Merge branch 'dev' into release
# Conflicts:
# src/json/herogrow_ewai.json
# src/json/huodong.json5
# src/json/item.json
# src/json/pay.json
|
2023-12-19 10:10:20 +08:00 |
|
dy
|
83c99c25bd
|
Merge branch 'bugfix' into release
|
2023-12-19 10:08:44 +08:00 |
|
dy
|
c428d0d2f7
|
cehua-json
|
2023-12-19 09:48:43 +08:00 |
|
xcy
|
91f14c69ce
|
fix:红点
|
2023-12-18 21:31:51 +08:00 |
|
xcy
|
0ac5246d5b
|
fix:
积天好礼bug
|
2023-12-18 21:22:01 +08:00 |
|
xcy
|
3cce7bbfc7
|
fix:
过滤没有充值得payid
|
2023-12-18 21:22:01 +08:00 |
|
