Commit Graph

69 Commits (cfbc6e00efc080aed8fff726a13f4e8bd897dded)

Author SHA1 Message Date
grimm c1e1eecb53 小调整,不影响逻辑 2023-12-21 18:40:10 +08:00
grimm 1dce1ea964 心魔快速战斗适用战力削弱 2023-12-21 18:32:18 +08:00
PC-202302260912\Administrator ba818ad0a1 礼物装备 2023-09-13 15:07:45 +08:00
PC-202302260912\Administrator 6372ce36a7 战力扩充为long 2023-09-05 14:40:34 +08:00
PC-202302260912\Administrator c381a9cf58 自动战斗 2023-07-06 16:02:15 +08:00
duhui 8c808d2aea 多队塔 2023-03-21 11:34:17 +08:00
duhui 17c2291269 法相 2023-02-19 19:40:52 +08:00
duhui d516374225 灵脉 2023-02-14 18:02:56 +08:00
duhui f1e45eaa70 maven镜像 2023-01-09 16:02:39 +08:00
duhui a6841f2f9d 打包异常处理 2022-12-23 16:48:36 +08:00
xuexinpeng a325ba0451 挑战副本 2022-04-14 18:23:30 +08:00
yuanshuai e403b6a884 神魔遗漏脚本 2022-03-31 15:22:04 +08:00
yuanshuai cc06e2f19b 新增神魔转职功能相关修改 2022-03-21 15:03:40 +08:00
xuexinpeng 738ef9c1e2 探索事件 2022-03-18 11:50:59 +08:00
xuexinpeng c8da24671b pvp的超回合按伤害算胜负 2021-11-23 14:17:57 +08:00
xuexinpeng 1a60f70002 跨服灵脉秘境 2021-11-25 09:22:00 +08:00
xuexinpeng e7e12c7228 跨服灵妙秘境 2021-11-17 16:35:43 +08:00
xuexinpeng 0b75d24326 灵脉秘境 2021-11-12 11:54:05 +08:00
xuexinpeng b791353eb9 灵脉秘境 2021-11-12 09:39:03 +08:00
yuanshuai 9e22fed4ad Merge branch 'master_test_gn_godsoul' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
2021-11-03 19:03:22 +08:00
jiahuiwen 39d1c1242f 优化 2021-10-28 17:44:00 +08:00
yuanshuai 30a3220741 添加神将神魂相关字段 2021-10-26 16:26:35 +08:00
xuexinpeng fe14a4230f yx修改 一键领取注掉 2021-10-22 17:46:20 +08:00
xuexinpeng fef22e4ae3 yx1.匹配规则的修改
2.战斗回放战力显示
    3.玩家初始化积分
2021-10-09 20:24:50 +08:00
xuexinpeng d20ba835bf Merge branch 'master_test_gn' into master_test_gn_xxp
# Conflicts:
#	fightmanager/src/main/java/com/ljsd/fight/FightType.java
#	serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.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/GameGM/GMRequestHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/fight/GameFightType.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java
#	serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java
#	tablemanager/src/main/java/config/SArenaRobotConfig.java
#	tablemanager/src/main/java/config/SMServerArenaSetting.java
#	tablemanager/src/main/java/config/SMServerRankConfig.java
#	tablemanager/src/main/java/config/SMServerRankReward.java
2021-09-28 16:47:44 +08:00
jiahuiwen b491e01c9e 战斗参数返回 2021-09-27 16:00:21 +08:00
jiahuiwen 25040b3815 战斗返回修改 2021-09-27 15:10:13 +08:00
jiahuiwen 653f969ac3 战斗返回解析错误 2021-09-26 11:27:17 +08:00
duhui def246c407 合并代码1 2021-09-17 14:19:54 +08:00
duhui 18f91727e4 第一版
(cherry picked from commit 12c3d5d1ba0766fc17b69959690a656dabf14fc6)
2021-09-17 14:13:29 +08:00
duhui 4679fb5af2 十绝伤害超上限 2021-09-27 11:09:52 +08:00
xuexinpeng d6ffd5e348 玉虚论道第一版 2021-09-11 21:14:25 +08:00
duhui 3b843d949b 四灵代码合并 2021-08-31 11:56:33 +08:00
lvxinran c126a79604 合并分支 2021-06-11 14:29:54 +08:00
xuexinpeng 972b6dde78 山河社稷 2021-05-13 17:33:19 +08:00
DESKTOP-98AVA47\Administrator e7ea5f645e 工会副本修改 2021-05-13 01:33:12 +07:00
duhui b20567f328 修改最小值 2021-05-20 11:20:21 +08:00
duhui dd6b800ecb 战斗bug修改 2021-05-20 11:14:23 +08:00
mengchengzhen f561f686e9 山河社稷图 2021-05-11 21:31:07 +08:00
mengchengzhen 79ffc31fa8 山河社稷图 2021-05-11 10:59:39 +08:00
xuexinpeng 7fb75df1b6 踏碎凌霄 2021-04-26 16:25:14 +08:00
lvxinran 34b1c6d891 阈值修改第一版 2021-02-26 15:40:57 +08:00
whb cc2d7f9064 datatype 2021-02-23 15:54:00 +08:00
duhui 3c83e55d89 四灵试炼,首通和最低记录,排行榜功能实现,未调试 2021-01-27 14:58:19 +08:00
lvxinran 934632c4c5 森罗幻境超时血量修改 2021-01-14 17:18:06 +08:00
lvxinran f6ff2bed3d 打印战斗结果日志 2021-01-18 16:25:55 +08:00
duhui 637f25930f 战报和法宝公告功能提交 2020-12-18 11:27:25 +08:00
duhui a52f9e77ca 战报功能二版 2020-12-18 10:01:12 +08:00
zhangshanxue 4bce4b8e96 跨服服务器 2020-12-07 14:44:12 +08:00
zhangshanxue bfb89434cd 跨服服务器 2020-12-03 21:02:17 +08:00