grimm
|
b5db821978
|
Merge branch 'master_0.05' into master_dev
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/GmDialActivity.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java
|
2024-03-21 15:02:02 +08:00 |
|
grimm
|
b1f60947ca
|
装备加道具日志
|
2024-03-21 14:32:32 +08:00 |
|
grimm
|
6aafcc9cd2
|
聊天修改
|
2024-03-18 14:48:48 +08:00 |
|
grimm
|
a27e058066
|
聊天去锁
|
2024-03-18 13:55:50 +08:00 |
|
grimm
|
7afdf411bf
|
装备更新修改，数据库存储
|
2024-03-18 10:30:02 +08:00 |
|
grimm
|
bedc8a1c0a
|
好友推荐优化
|
2024-03-13 18:11:52 +08:00 |
|
grimm
|
f99362b388
|
vip刷新逻辑修改
|
2024-02-27 17:01:04 +08:00 |
|
grimm
|
16e05fd4b7
|
vip刷新逻辑修改
|
2024-02-27 16:15:42 +08:00 |
|
grimm
|
0c55069829
|
线上热更,vip刷新
|
2024-02-26 14:10:04 +08:00 |
|
grimm
|
1c2a27a128
|
特权逻辑修改
|
2024-02-23 23:46:53 +08:00 |
|
grimm
|
e3d0b77bac
|
特权逻辑修改
|
2024-02-23 18:28:30 +08:00 |
|
grimm
|
5ed94f515c
|
灵脉挑战失败不扣次数
|
2024-02-23 18:21:04 +08:00 |
|
grimm
|
05f2ebf7eb
|
线上热更,vip刷新
|
2024-02-23 16:37:25 +08:00 |
|
grimm
|
aa4cb55b7e
|
vip特权刷新逻辑修改
|
2024-02-22 16:42:24 +08:00 |
|
grimm
|
d122ae17b5
|
新增活动gm礼包
|
2024-02-22 11:22:57 +08:00 |
|
grimm
|
23ffa5b58b
|
竞技场重写8版，初始化竞技场刷新对手
|
2024-02-21 16:24:34 +08:00 |
|
grimm
|
45d941793b
|
竞技场重写8版，去除第一名拍脸
|
2024-02-21 15:10:56 +08:00 |
|
grimm
|
2a9b4f755c
|
gm礼包购买新增逻辑，判断是否购买过礼包
|
2024-02-21 11:52:49 +08:00 |
|
grimm
|
0a68e0ebc1
|
竞技场重写七版，本服竞技场和机器人不显示区服名称
|
2024-02-21 11:47:57 +08:00 |
|
grimm
|
4a0065bfc5
|
竞技场重写七版，竞技场战斗赢了对面积分为负数
|
2024-02-20 17:52:38 +08:00 |
|
grimm
|
05c7077b58
|
竞技场重写七版，竞技场任务
|
2024-02-20 14:58:11 +08:00 |
|
grimm
|
707fc9b22f
|
竞技场重写六版，修改对手匹配机制，尽量匹配真人
|
2024-02-19 17:43:03 +08:00 |
|
grimm
|
2bd413795e
|
竞技场重写六版，微调redis缓存
|
2024-02-19 15:57:07 +08:00 |
|
grimm
|
c41462be94
|
竞技场重写六版，竞技场跨服战斗
|
2024-02-19 15:10:29 +08:00 |
|
grimm
|
45eb1165f8
|
竞技场重写五版，刷新对手bug修改
|
2024-02-19 15:00:55 +08:00 |
|
grimm
|
7bf8cc4be6
|
竞技场重写四版，邮件排名信息
|
2024-02-19 11:49:15 +08:00 |
|
grimm
|
911657915b
|
竞技场重写四版，领奖报错修改
|
2024-02-19 11:31:35 +08:00 |
|
grimm
|
9c4b9673bc
|
竞技场重写四版，gm工具修改，格式优化
|
2024-02-19 11:12:49 +08:00 |
|
grimm
|
9fbfae861a
|
竞技场重写三版，拍脸推送
|
2024-02-06 18:24:27 +08:00 |
|
grimm
|
745dde1d59
|
竞技场重写二版
|
2024-02-06 15:09:27 +08:00 |
|
grimm
|
6bf881b06d
|
竞技场重写初版
|
2024-02-06 14:54:09 +08:00 |
|
grimm
|
a2b847371b
|
Merge branch 'master_dev' into master_arena
|
2024-01-29 17:27:01 +08:00 |
|
grimm
|
71931154e5
|
牛气冲天活动bug修改
|
2024-01-29 17:18:04 +08:00 |
|
grimm
|
6f0a8cda79
|
牛气冲天活动bug修改
|
2024-01-29 16:29:30 +08:00 |
|
grimm
|
37eca15b46
|
牛气冲天活动
|
2024-01-25 18:17:27 +08:00 |
|
grimm
|
6ab029cff4
|
牛气冲天活动
|
2024-01-25 18:08:18 +08:00 |
|
grimm
|
a34c8013d9
|
经验道具
|
2024-01-25 17:12:38 +08:00 |
|
grimm
|
0360262525
|
经验道具
|
2024-01-25 16:50:07 +08:00 |
|
grimm
|
b3e7918545
|
经验道具
|
2024-01-25 16:38:14 +08:00 |
|
grimm
|
984a7943df
|
经验到上限后不发邮件
|
2024-01-25 10:56:41 +08:00 |
|
grimm
|
49165586a3
|
经验到上限后不发邮件
|
2024-01-22 11:28:38 +08:00 |
|
grimm
|
782cd915fd
|
gm功能，修补玩家法相错误数据
|
2024-01-18 11:16:08 +08:00 |
|
grimm
|
fe5bed800a
|
特训gm
|
2024-01-16 16:18:45 +08:00 |
|
grimm
|
5101384e3b
|
连续购买日志
|
2024-01-16 15:08:59 +08:00 |
|
grimm
|
cff23b5715
|
连续购买日志
|
2024-01-16 15:06:48 +08:00 |
|
grimm
|
5fb5901b47
|
连续购买日志
|
2024-01-16 14:37:28 +08:00 |
|
grimm
|
12d46dfacd
|
未找到英雄异常
|
2024-01-15 16:24:44 +08:00 |
|
grimm
|
3147706388
|
公会名称修改为全渠道唯一
|
2024-01-11 16:06:15 +08:00 |
|
grimm
|
21fc5dd12b
|
合服后公会区服id未更正修复
|
2024-01-11 16:01:13 +08:00 |
|
grimm
|
8a9e97259b
|
礼物不同种类区分
|
2024-01-09 17:25:03 +08:00 |