lvxinran
|
ef6347f38d
|
Merge branch 'master_online_hw' into master_test_hw
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionBetInfoHandler.java
|
2020-12-26 18:37:54 +08:00 |
lvxinran
|
09b18714f0
|
好友上限申请修改
|
2021-01-09 00:00:00 +08:00 |
lvxinran
|
b603634e6b
|
十绝阵暂时关闭
|
2021-01-01 21:37:04 +08:00 |
lvxinran
|
53b1dc1480
|
森罗小怪红点
|
2021-01-01 19:35:29 +08:00 |
duhui
|
3a9ab2167d
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-12-25 10:07:42 +08:00 |
lvxinran
|
3e87cb50d6
|
竞技场埋点
|
2021-01-01 01:36:57 +08:00 |
lvxinran
|
9a3c3fc9dc
|
竞技场挑战
|
2021-01-01 01:36:01 +08:00 |
lvxinran
|
7118b6a40c
|
巅峰赛埋点
|
2021-01-01 01:35:18 +08:00 |
duhui
|
a1cea20bdc
|
新将来袭活动结束,清空道具
|
2020-12-25 10:06:22 +08:00 |
duhui
|
41ee275964
|
新将boss,改获取伤害为获取血量
|
2020-12-24 18:53:27 +08:00 |
duhui
|
0e9e5e6502
|
新将伤害溢出问题
|
2020-12-24 18:26:49 +08:00 |
lvxinran
|
fbdad03acd
|
小怪数量修改
|
2021-01-01 00:20:38 +08:00 |
lvxinran
|
8aa67eb6bf
|
森罗 无尽bug修改
|
2021-01-01 00:05:11 +08:00 |
lvxinran
|
d6775fc511
|
跨服十绝阵暂时关闭
|
2021-01-01 00:04:20 +08:00 |
lvxinran
|
afdd25f829
|
怪物战力修改
|
2021-01-01 00:04:06 +08:00 |
zhangshanxue
|
03ea28558f
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-02-20 23:01:52 +08:00 |
zhangshanxue
|
b17ef4d6f4
|
膜拜limit
|
2021-02-20 20:37:51 +08:00 |
zhangshanxue
|
de27c8aea3
|
跨服提交
|
2021-02-20 20:13:15 +08:00 |
zhangshanxue
|
7f991f8045
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-02-20 20:11:01 +08:00 |
zhangshanxue
|
a0486a2da1
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java
|
2021-01-18 01:41:19 +08:00 |
zhangshanxue
|
71821d360b
|
跨服服务器
|
2021-01-18 01:40:33 +08:00 |
zhangshanxue
|
c160bca82e
|
Merge branch 'master_online_hw' into master_test_hw
|
2021-02-08 01:28:00 +08:00 |
zhangshanxue
|
e3b2fedbcd
|
跨服服务器
|
2021-02-08 01:25:47 +08:00 |
zhangshanxue
|
fd681d5350
|
Merge branch 'master_test_hw' into master_test_hw_server_arena
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java
# serverlogic/src/main/java/com/ljsd/jieling/core/VipPrivilegeType.java
# serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionBetInfoHandler.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionGuessHandler.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/pokemon/GetAllPokemonHandler.java
# serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_global_gm.java
# serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportUtil.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SheJiActivity.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/ArenaRank.java
# tablemanager/src/main/java/config/SPassiveSkillLogicConfig.java
|
2021-02-08 01:17:41 +08:00 |
zhangshanxue
|
e004d4d76c
|
跨服服务器
|
2021-02-08 01:06:51 +08:00 |
zhangshanxue
|
b7b1154a68
|
跨服服务器
|
2021-01-30 00:15:10 +08:00 |
duhui
|
3115844973
|
防止冲突,缓存减少一分钟
|
2020-12-24 16:07:07 +08:00 |
duhui
|
98d95f187a
|
修改proto路径后,合并代码战斗补充
|
2020-12-24 10:09:51 +08:00 |
duhui
|
645718da78
|
Merge branch 'master_test_hw' into dev_dh_chechi
# Conflicts:
# serverlogic/src/main/java/com/ljsd/GmService.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/StartExpeditionBattleRequest.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/monsterAttack/QuickStartMonsterFighter.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightRecordLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/fight/result/FightResult.java
# tablemanager/src/main/java/config/SGlobalSystemConfig.java
|
2020-12-24 10:04:18 +08:00 |
lvxinran
|
bcf5191e7f
|
协议位置修改
|
2020-12-30 03:11:14 +08:00 |
lvxinran
|
4908ac4145
|
errorcode修改
|
2020-12-30 02:10:45 +08:00 |
lvxinran
|
d872a55549
|
错误提示提交
|
2020-12-30 00:26:13 +08:00 |
lvxinran
|
23f35b428e
|
车迟斗法过时提示
|
2020-12-30 00:25:48 +08:00 |
lvxinran
|
697e2892a8
|
添加好友提示
|
2020-12-30 00:25:26 +08:00 |
lvxinran
|
a520eb96db
|
礼包购买刷新修改0点
|
2020-12-30 00:25:11 +08:00 |
lvxinran
|
3df4fb246d
|
灵兽放生等级限制
|
2020-12-30 00:24:54 +08:00 |
duhui
|
e1ee6d7b69
|
Merge branch 'master_test_hw' into dev_dh_xinjiang
|
2020-12-23 11:23:08 +08:00 |
duhui
|
71791a4342
|
降妖夺宝
|
2020-12-22 17:44:05 +08:00 |
zhangshanxue
|
025128b6ec
|
巅峰赛 竞猜币补发
|
2020-12-22 17:42:32 +08:00 |
duhui
|
045dab3175
|
车迟斗法排行榜留存增加一天
|
2020-12-22 09:48:51 +08:00 |
duhui
|
c9558bd116
|
无尽副本不显示皮肤bug
|
2020-12-21 14:00:26 +08:00 |
duhui
|
c2d7171578
|
法宝公告还原
|
2020-12-18 18:30:29 +08:00 |
duhui
|
9d33fc7b4d
|
战报和法宝功能补充
|
2020-12-18 14:04:07 +08:00 |
duhui
|
be72f2f913
|
修改上限次数
|
2020-12-18 13:50:46 +08:00 |
duhui
|
c11dd1b1ce
|
战报功能二版
|
2020-12-18 13:50:34 +08:00 |
duhui
|
ce1de8c9af
|
战报功能和法宝公告,初版未测试
|
2020-12-18 13:50:16 +08:00 |
duhui
|
637f25930f
|
战报和法宝公告功能提交
|
2020-12-18 11:27:25 +08:00 |
duhui
|
2d91a2eb1e
|
修改上限次数
|
2020-12-18 10:51:44 +08:00 |
duhui
|
a52f9e77ca
|
战报功能二版
|
2020-12-18 10:01:12 +08:00 |
zhangshanxue
|
58b3f69aac
|
巅峰赛 竞猜币补发
|
2020-12-17 21:24:03 +08:00 |
duhui
|
9ea1ceec59
|
战报功能和法宝公告,初版未测试
|
2020-12-17 11:17:57 +08:00 |
lvxinran
|
3cf66b94fe
|
Merge branch 'master_online_hw' into master_test_hw
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/arena/ArenaChallengeHandler.java
|
2020-12-15 16:32:46 +08:00 |
lvxinran
|
8916a76543
|
法宝最大等级校验
|
2020-12-15 14:44:37 +08:00 |
zhangshanxue
|
fa6e6bcad5
|
Merge branch 'master_test_hw_server_arena' of http://60.1.1.230/backend/jieling_server into master_test_hw_server_arena
# Conflicts:
# gamecommon/src/main/java/rpc/protocols/ActivityProto.java
# gamecommon/src/main/java/rpc/protocols/ArenaInfoProto.java
# gamecommon/src/main/java/rpc/protocols/ChatProto.java
# gamecommon/src/main/java/rpc/protocols/CommonProto.java
# gamecommon/src/main/java/rpc/protocols/Family.java
# gamecommon/src/main/java/rpc/protocols/HeroInfoProto.java
# gamecommon/src/main/java/rpc/protocols/MessageTypeProto.java
# gamecommon/src/main/java/rpc/protocols/PlayerInfoProto.java
# gamecommon/src/main/java/rpc/world/WorldProto.java
# worldserver/src/main/java/com/world/redis/RedisUtil.java
|
2020-12-15 14:01:24 +08:00 |
lvxinran
|
dff49eded3
|
rediskey修改
|
2021-01-06 10:12:22 +08:00 |
lvxinran
|
e086fd1e97
|
十绝阵删除信息修改
|
2020-12-25 10:19:50 +08:00 |
lvxinran
|
5cd2499af6
|
跨服十绝阵第二版
|
2020-12-17 20:07:30 +08:00 |
zhangshanxue
|
6ef71dc4b5
|
跨服服务器
|
2020-12-15 14:00:20 +08:00 |
lvxinran
|
2e240b33d0
|
打点修改提交
|
2020-12-14 11:07:37 +08:00 |
lvxinran
|
1272ae01f8
|
宝物错误数据修改
|
2020-12-12 18:09:46 +08:00 |
lvxinran
|
1f0f27727b
|
宝物分解bug,竞猜打点提交
|
2020-12-12 17:51:29 +08:00 |
lvxinran
|
9784aa4c3f
|
公会排行榜
|
2020-12-20 06:09:08 +08:00 |
lvxinran
|
3c636a42be
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-12-18 05:03:08 +08:00 |
lvxinran
|
874fc8f2c5
|
森罗bug修改
|
2020-12-18 05:03:02 +08:00 |
lvxinran
|
fb5da8c93b
|
Merge branch 'master_test_hw_server_arena' of http://60.1.1.230/backend/jieling_server into master_test_hw_server_arena
# Conflicts:
# gamecommon/src/main/java/rpc/protocols/CommonProto.java
# gamecommon/src/main/java/rpc/protocols/MessageTypeProto.java
# gamecommon/src/main/java/rpc/world/WorldProto.java
# worldserver/build.gradle
# worldserver/src/main/java/com/world/handler/GetWorldArenaChallengeRequestHandler.java
# worldserver/src/main/java/com/world/handler/GetWorldArenaRecordInfoRequestHandler.java
# worldserver/src/main/java/com/world/redis/RedisKey.java
|
2020-12-12 15:06:17 +08:00 |
lvxinran
|
ac40a91389
|
跨服十绝阵代码提交
|
2020-12-12 15:03:54 +08:00 |
lvxinran
|
543cca1864
|
大闹天宫皮肤添加
|
2020-12-12 14:45:49 +08:00 |
duhui
|
813ff75cfb
|
套装优化
|
2020-12-11 17:17:12 +08:00 |
zhangshanxue
|
95870b74d5
|
跨服服务器
|
2020-12-11 13:57:47 +08:00 |
zhangshanxue
|
64700c9190
|
社稷积分
|
2020-12-10 16:37:14 +08:00 |
DESKTOP-98AVA47\Administrator
|
13849ac7b8
|
社稷大典积分恢复
|
2020-12-11 02:07:22 +08:00 |
lvxinran
|
3e4b27fa9d
|
竞技场修改
|
2020-12-08 21:10:15 +08:00 |
zhangshanxue
|
5e0c455469
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-12-08 16:58:46 +08:00 |
zhangshanxue
|
220d2b802d
|
巅峰赛 记录bug
|
2020-12-08 16:58:38 +08:00 |
duhui
|
2ae47522f3
|
Merge branch 'dev_dh_xinjiang' into master_test_hw
|
2020-12-08 11:36:41 +08:00 |
lvxinran
|
a2a1edb290
|
战斗覆盖技能
|
2020-12-08 11:32:59 +08:00 |
duhui
|
d7b5a22965
|
竞技场积分加减1问题
|
2020-12-08 11:12:09 +08:00 |
duhui
|
39505c9d24
|
竞技场分数+-1问题
|
2020-12-08 10:40:42 +08:00 |
DESKTOP-98AVA47\Administrator
|
951e54fb0b
|
社稷大典跨期刷新
|
2020-12-15 21:38:46 +08:00 |
zhangshanxue
|
4bce4b8e96
|
跨服服务器
|
2020-12-07 14:44:12 +08:00 |
duhui
|
c1fcfcf3a2
|
新将活动应策划需求改版,掉落比例重新计算
|
2020-12-07 13:53:25 +08:00 |
zhangshanxue
|
bfb89434cd
|
跨服服务器
|
2020-12-03 21:02:17 +08:00 |
zhangshanxue
|
92e5c50e24
|
大闹天宫圣物效果
|
2020-12-03 19:32:28 +08:00 |
zhangshanxue
|
08b85eb654
|
大闹天宫圣物效果
|
2020-12-03 16:23:56 +08:00 |
duhui
|
686596375d
|
新将来袭初版
|
2020-12-03 10:27:55 +08:00 |
lvxinran
|
b217c19431
|
竞技场排名优化
|
2020-12-03 10:06:22 +08:00 |
duhui
|
e0c2c51303
|
no message
|
2020-12-02 14:13:11 +08:00 |
duhui
|
21aec6d252
|
竞技场修改
|
2020-12-02 10:42:23 +08:00 |
duhui
|
ed7d883cce
|
临时提交2
|
2020-12-02 10:29:51 +08:00 |
zhangshanxue
|
904d77814f
|
Merge branch 'master_online_hw' into master_test_hw
|
2020-11-30 11:56:35 +08:00 |
zhangshanxue
|
93b394ce7e
|
【模块】大闹天宫-战斗后圣物刷新种类不正确
|
2020-11-30 11:55:29 +08:00 |
lvxinran
|
e1bae5947d
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-28 08:55:56 +08:00 |
lvxinran
|
2476e457af
|
挂机预览修改
|
2020-11-28 08:55:46 +08:00 |
lvxinran
|
f275342e67
|
物品上限添加
|
2020-11-27 18:49:25 +08:00 |
zhangshanxue
|
6b4d5296db
|
Merge branch 'master_test_hw_server_arena' of http://60.1.1.230/backend/jieling_server into master_test_hw_server_arena
|
2020-11-27 15:27:06 +08:00 |
zhangshanxue
|
b27f4e489c
|
初步提交
|
2020-11-27 15:26:55 +08:00 |
duhui
|
4051b4dd61
|
法宝升级通知
|
2020-11-27 14:19:14 +08:00 |
duhui
|
249580edf7
|
暂存,功能没写完
|
2020-11-27 14:07:56 +08:00 |
lvxinran
|
44a241b52c
|
Revert "鸿蒙碑初版"
This reverts commit 8057c913bb .
|
2020-11-27 10:58:29 +08:00 |
lvxinran
|
e80c2b6e03
|
Revert "鸿蒙阵"
This reverts commit c1bc98d972 .
|
2020-11-27 10:58:18 +08:00 |
lvxinran
|
fd5d07ee15
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-27 10:49:33 +08:00 |
lvxinran
|
c2bbab2c13
|
灵兽分页,背包已满 添加
|
2020-11-27 10:49:24 +08:00 |
jiahuiwen
|
c1bc98d972
|
鸿蒙阵
|
2020-11-26 20:24:33 +08:00 |
jiahuiwen
|
0ad0e87617
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-26 20:06:24 +08:00 |
jiahuiwen
|
8057c913bb
|
鸿蒙碑初版
|
2020-11-26 20:06:17 +08:00 |
duhui
|
1c3102157d
|
竞技场积分修改,物品掉落
|
2020-11-26 11:13:47 +08:00 |
zhangshanxue
|
42b0ca9980
|
恢复榜单
|
2020-11-25 21:19:59 +08:00 |
zhangshanxue
|
b16b5e79de
|
恢复榜单
|
2020-11-25 21:14:27 +08:00 |
zhangshanxue
|
8ea43c3aff
|
恢复榜单
|
2020-11-25 20:40:42 +08:00 |
zhangshanxue
|
1c43e235ae
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-11-25 20:28:44 +08:00 |
zhangshanxue
|
c35dbf7dbe
|
恢复榜单
|
2020-11-25 20:28:11 +08:00 |
lvxinran
|
82f9aca0d0
|
社稷大典修改删除数据
|
2020-11-25 17:01:22 +08:00 |
lvxinran
|
6c7b164b53
|
打点加入日志
|
2020-11-24 16:36:03 +08:00 |
lvxinran
|
a44c3aa81f
|
Merge branch 'master_online_hw' into master_test_hw
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java
|
2020-11-23 21:24:05 +08:00 |
zhangshanxue
|
424fe9e01d
|
社稷大典活动开始 公会积分不清
|
2020-11-23 17:13:01 +08:00 |
lvxinran
|
976671200f
|
工会副本边界修改
|
2020-11-23 16:43:40 +08:00 |
lvxinran
|
9de88982e2
|
天宫秘宝15攻击力加成
|
2020-11-23 14:31:37 +08:00 |
lvxinran
|
0a9e9203cd
|
公会副本修改
|
2020-12-01 09:18:18 +08:00 |
lvxinran
|
a8a99c38e9
|
技能修改
|
2020-12-01 04:08:02 +08:00 |
lvxinran
|
6789a64113
|
公会副本修改
|
2020-11-30 10:50:30 +08:00 |
lvxinran
|
171bbd248d
|
跨服竞技场新加功能
|
2020-11-30 09:23:00 +08:00 |
lvxinran
|
24643113b9
|
灵兽抽卡打点修改
|
2020-11-30 09:22:21 +08:00 |
lvxinran
|
850ff06022
|
充值上报设备id,公会副本第二天首次不嫩挑战
|
2020-11-30 08:09:14 +08:00 |
lvxinran
|
d2b35e4d32
|
公会副本最后一个修改
|
2020-11-26 07:37:51 +08:00 |
lvxinran
|
2868cf7c6e
|
副本刷新
|
2020-11-24 07:28:52 +08:00 |
lvxinran
|
416beb8d33
|
分组提交
|
2020-12-01 10:55:37 +08:00 |
lvxinran
|
dae97e80a4
|
车迟斗法抢夺排行修改
|
2020-11-21 19:29:58 +08:00 |
lvxinran
|
499bc8099f
|
埋点错误修改
|
2020-11-21 19:29:37 +08:00 |
lvxinran
|
1cd25bedf6
|
数数打点修改
|
2020-11-20 15:26:40 +08:00 |
lvxinran
|
3d6da1905c
|
每分钟线程加入打印内存
|
2020-11-22 07:40:52 +08:00 |
lvxinran
|
f8a502b6b0
|
推送礼包修改
|
2020-11-21 15:17:31 +08:00 |
lvxinran
|
46257c701e
|
公会副本boss修改
|
2020-11-20 13:20:00 +08:00 |
zhangshanxue
|
b9fd7bfdf7
|
跨服服务器通信初版完成
|
2020-11-20 10:23:16 +08:00 |
zhangshanxue
|
4d9a185be5
|
跨服服务器通信初版完成
|
2020-11-19 20:33:41 +08:00 |
zhangshanxue
|
360a8c51e0
|
跨服服务器
|
2020-11-19 17:24:22 +08:00 |
jiahuiwen
|
47d40eae84
|
Merge branch 'master_online_hw' into master_test_hw
|
2020-11-16 16:13:52 +08:00 |
lvxinran
|
6b88321136
|
车迟斗法超int修改,打点信息修改
|
2020-11-18 11:44:37 +08:00 |
zhangshanxue
|
f94f4dca70
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-14 11:17:12 +08:00 |
lvxinran
|
23bfdbe50f
|
灵兽抽卡修改
|
2020-11-16 21:09:43 +08:00 |
lvxinran
|
3a9dd33fe9
|
Merge branch 'master_test_hw' into master_test_hw_monsterActivity
|
2020-11-16 20:21:10 +08:00 |
lvxinran
|
36304b135e
|
灵兽活动提交
|
2020-11-16 20:20:45 +08:00 |
zhangshanxue
|
e49bce75c2
|
巅峰赛竞猜bug
|
2020-11-14 11:17:04 +08:00 |
zhangshanxue
|
aa985f2a7f
|
公会任命bug
|
2020-11-14 05:59:44 +08:00 |
jiahuiwen
|
1d9f38d9ca
|
最大星级判断
|
2020-11-11 14:25:54 +08:00 |
lvxinran
|
e97dc6b28c
|
灵兽相关打点
|
2020-12-24 08:35:32 +08:00 |
lvxinran
|
f72e72a48e
|
累计充值修改bug
|
2020-12-24 06:27:56 +08:00 |
lvxinran
|
dbd56d502e
|
特权0点到期
|
2020-12-15 18:07:28 +08:00 |
lvxinran
|
64136e2f0f
|
特权时间改5点
|
2020-12-15 17:39:23 +08:00 |
lvxinran
|
79d99139fe
|
Merge branch 'master_online_hw' into master_test_hw
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_review_gm.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java
|
2020-12-15 17:00:45 +08:00 |
lvxinran
|
7e59e80929
|
特权时间修复
|
2020-12-15 15:40:13 +08:00 |