Commit Graph

4136 Commits (7bba32a4580aa11d6beba89a24796f195c0e7605)

Author SHA1 Message Date
lvxinran 176d9e122f Merge branch 'master_online_hw' into master_test_hw 2021-01-16 00:21:30 +08:00
lvxinran 4b44ae7d04 重置进图点 2021-01-16 00:20:28 +08:00
lvxinran 668501092f Merge branch 'master_test_hw' into master_online_hw 2021-01-14 05:08:27 +08:00
lvxinran 9cc7bf8588 暂时不打印无用日志 2021-01-08 15:01:21 +08:00
lvxinran 127a5f4abd 0点5点遗留修改 2021-01-08 13:58:36 +08:00
lvxinran 11aa829ae0 Merge branch 'master_test_hw' into master_test_hw_five_to_zero 2021-01-17 00:29:05 +08:00
lvxinran 25b2245f5c 5点改0点修改 2021-01-14 00:08:59 +08:00
duhui 7c348f0833 Merge branch 'master_test_hw' into master_test_hw_hongmeng
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.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/GetPlayerInfoHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/hero/SaveHeroChangeRequestHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/pokemon/GetAllPokemonHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java
#	serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java
#	tablemanager/src/main/java/config/SErrorCodeEerverConfig.java
#	tablemanager/src/main/java/config/SItem.java
#	tablemanager/src/main/java/config/SJewelConfig.java
2021-01-07 14:31:08 +08:00
lvxinran 03e86acfbe 删除无用日志 2021-01-06 14:48:04 +08:00
lvxinran 34d1ce106e 日志修改 2021-01-06 14:35:31 +08:00
lvxinran a3a6d52276 活动检测日志 2021-01-06 14:23:35 +08:00
lvxinran 7771e161be 添加日志信息 2021-01-06 14:00:07 +08:00
lvxinran adbe1f5fde 删除无用注释 添加异常信息 2021-01-06 12:17:25 +08:00
lvxinran ff37cd0a76 每分钟线程日志修改 2021-01-06 12:09:30 +08:00
lvxinran c3286931d1 日志打印 2021-01-06 12:02:49 +08:00
duhui 5ad536f679 鸿蒙阵3.0.1,法宝公告同步 2021-01-06 10:20:12 +08:00
duhui a1eb022f14 鸿蒙阵3.0,成就任务 2021-01-05 18:39:35 +08:00
duhui 6084f9aa96 鸿蒙阵2.1 2021-01-05 12:15:25 +08:00
duhui 9c9f43d686 鸿蒙阵2.0 2021-01-04 15:11:00 +08:00
duhui f82b25d392 无尽副本,调试日志 2021-01-04 11:44:58 +08:00
lvxinran f5c70afcb2 修改森罗保存阵容 2021-01-04 10:10:15 +08:00
lvxinran ca822eba4e 公会日志打印 2020-12-31 18:03:42 +08:00
lvxinran 9b4b01bedd 暂时修改特权到期时间 2020-12-31 14:52:21 +08:00
lvxinran b69ffd6329 打印错误日志 2020-12-31 13:54:27 +08:00
duhui 3a4bceeaca 车迟斗法缓存问题修改 2021-01-08 10:16:49 +08:00
lvxinran f6f5a3c60f 打点报错修改 2020-12-30 13:47:06 +08:00
duhui 5037916fd5 新将来袭和降妖夺宝埋点添加 2020-12-29 14:03:18 +08:00
lvxinran 4e6d89c062 打点单例 2020-12-29 10:36:14 +08:00
duhui 1cfc04c82d 鸿蒙阵,法宝验证修改1.3 2020-12-28 11:30:57 +08:00
duhui 73cc224b50 鸿蒙阵1.2 2020-12-28 09:41:49 +08:00
duhui 3834f8321f 鸿蒙阵1.1 2020-12-25 18:43:55 +08:00
duhui e3391faa6e 鸿蒙阵1.0,存在bug正在修改 2020-12-25 14:21:57 +08:00
jiahuiwen 58cb744e2e 鸿蒙信息单独获取 推送 2020-12-21 16:05:19 +08:00
jiahuiwen 5776065109 鸿蒙阵 2020-12-21 14:47:20 +08:00
jiahuiwen 6a1faf574c 鸿蒙阵 2020-12-17 15:04:46 +08:00
lvxinran d2c1b418a9 社稷大典埋点 2020-12-14 11:42:10 +08:00
lvxinran fbc893124f 车迟斗法报错 2020-12-14 11:41:05 +08:00
lvxinran e40d422d55 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-12-28 16:38:45 +08:00
lvxinran d616cdb2d1 竞技场埋点 敏感字添加竞技守卫 2020-12-28 16:38:39 +08:00
duhui 0c851e6967 新将伤害计算修改1.2 2020-12-28 15:07:13 +08:00
duhui dffe1b81b9 新将血量修改1.1 2020-12-28 11:12:16 +08:00
duhui 225e58e5ee 新将,血量计算修改 2020-12-28 11:03:39 +08:00
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
jiahuiwen ed1e5e1233 鸿蒙碑等级 2020-12-08 18:08:45 +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
jiahuiwen d3a11d5305 鸿蒙碑 2020-12-08 16:28:09 +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
jiahuiwen 98ddcf78fc 鸿蒙碑 2020-12-02 19:30:19 +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 11ac7ec7ad 鸿蒙 切分支 2020-11-27 10:57:42 +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