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
|
040711b793
|
跨服服务器
|
2021-01-18 01:40:05 +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 |
lvxinran
|
29b4dc5fdd
|
十绝阵key修改
|
2021-01-08 14:19:24 +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
|
9634301446
|
代码类型修改
|
2020-12-30 03:14: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 |
duhui
|
2e851c83ae
|
config提交
|
2020-12-22 17:40:15 +08:00 |
duhui
|
045dab3175
|
车迟斗法排行榜留存增加一天
|
2020-12-22 09:48:51 +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 |
duhui
|
5fce8f9920
|
神树配置表字段添加
|
2020-12-15 15:02:44 +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 |