Commit Graph

6927 Commits (325bb8b789cd39f0c5b8507b689600e0baa77c88)
 

Author SHA1 Message Date
jiahuiwen 42d5e3a6db 修改redis地址 2022-04-07 18:30:50 +08:00
xuexinpeng 814d5d6cd9 探索优化 2022-04-07 11:32:31 +08:00
duhui 77679ba892 家园强化修改 2022-04-07 11:09:30 +08:00
xuexinpeng 77a87f7ccd 探索优化 2022-04-07 10:51:34 +08:00
jiahuiwen 2bd61083e2 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2022-04-06 15:43:00 +08:00
jiahuiwen cb3ebd6372 玉虚论道 赋值职业 2022-04-06 15:42:50 +08:00
duhui 26d5114213 rpc链接socket设置超时时间 2022-04-06 14:58:57 +08:00
jiahuiwen ce712afeac 神魔 卸下魂宝灵宝 2022-04-06 14:05:03 +08:00
jiahuiwen cc668d9147 神魔 卸下魂宝灵宝 2022-04-06 13:43:50 +08:00
jiahuiwen 6b81fc069a 玉虚论道 增加职业 2022-04-02 16:02:42 +08:00
jiahuiwen f945915126 HARD_STAGE_FIGHT_START_REQUEST 怪物职业赋值 2022-04-02 15:19:52 +08:00
jiahuiwen 2d2dba9374 神魔职业遗漏 2022-04-02 14:47:52 +08:00
yuanshuai b48082bbab 神魔遗漏代码添加 2022-04-02 14:01:53 +08:00
duhui 2791d19ee0 【山河设计图每日玉衡龙魂丹领取调整】 2022-04-02 13:48:21 +08:00
xuexinpeng f22b7b0c94 探索注释打开 2022-04-01 17:58:46 +08:00
yuanshuai 434366cdd3 神魔阵营转职功能bug修改 2022-03-31 17:16:57 +08:00
yuanshuai 38de0cae30 神魔bug修改 2022-03-31 16:35:51 +08:00
yuanshuai e403b6a884 神魔遗漏脚本 2022-03-31 15:22:04 +08:00
yuanshuai 4d0ff71928 神魔遗漏代码 2022-03-31 15:07:08 +08:00
yuanshuai a991708d8e Merge branch 'master_test_gn' into master_test_gn_GodDevil 2022-03-31 09:59:58 +08:00
jiahuiwen 0f7d904e89 Merge branch 'master_prb_gn' into master_test_gn_zf 2022-03-29 16:50:40 +08:00
xuexinpeng cb85945e06 功能注释 2022-03-29 11:27:44 +08:00
duhui 257205b847 车迟斗法挑战人数问题处理,修改完善2 2022-03-29 11:23:22 +08:00
duhui c2bd8a261a Merge remote-tracking branch 'origin/master_test_gn' into master_test_gn 2022-03-29 11:21:36 +08:00
duhui 8aeef0695d 车迟斗法挑战人数问题处理,修改完善 2022-03-29 11:21:22 +08:00
xuexinpeng 59f4fa0077 注释探索功能 2022-03-29 11:16:45 +08:00
duhui eb8327464a 车迟斗法挑战人数问题处理,补充 2022-03-29 10:52:44 +08:00
duhui b0918e4071 车迟斗法挑战人数问题处理 2022-03-29 10:51:10 +08:00
duhui fe4e985187 【车迟斗法调整为开服7日后开启】 2022-04-20 14:10:06 +08:00
jiahuiwen 02134b84c8 战力前后端不一致 bug 2022-03-29 10:10:06 +08:00
yuanshuai 18c2ef0b7b Merge branch 'master_test_gn' into master_test_gn_GodDevil
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java
2022-03-25 18:15:15 +08:00
yuanshuai cb1558f309 脚本修改提交 2022-03-25 18:12:26 +08:00
yuanshuai a53c1d8f97 新增字段赋值 2022-03-25 16:55:00 +08:00
yuanshuai 9bbcb33469 脚本修改提交 2022-03-25 16:14:06 +08:00
xuexinpeng d2c5355948 探索事件 2022-03-25 10:17:27 +08:00
xuexinpeng d3da540689 探索事件 2022-03-24 13:39:39 +08:00
xuexinpeng 73ad9d7c4c 探索事件 2022-03-24 10:47:39 +08:00
xuexinpeng 3bc2c1df69 探索事件 2022-03-23 16:08:10 +08:00
xuexinpeng 86a91c0c2a 探索事件 2022-03-23 13:47:18 +08:00
xuexinpeng c15ab64462 探索事件 2022-03-22 17:20:23 +08:00
jiahuiwen 1d5d9bd0e1 Merge branch 'master_prb_gn' into master_test_gn_zf
# Conflicts:
#	luafight/Modules/Battle/Readme.txt
2022-03-22 17:07:51 +08:00
duhui b64c22c7a9 Merge remote-tracking branch 'origin/master_test_gn' into master_test_gn 2022-03-22 10:23:08 +08:00
duhui 8e1795eb33 东海寻仙,活动报错处理 2022-03-22 10:21:52 +08:00
yuanshuai e29efe8a19 修行技能战力加成脚本提交 2022-03-21 17:38:05 +08:00
yuanshuai eca27060c5 playerskill 添加字段 2022-03-21 17:14:08 +08:00
duhui 9095583374 备用任务类型 2022-03-21 16:57:37 +08:00
xuexinpeng 293e9869b4 探索事件 2022-03-21 16:33:26 +08:00
yuanshuai cc06e2f19b 新增神魔转职功能相关修改 2022-03-21 15:03:40 +08:00
duhui 204c7e9d0c 东海寻仙活动:bug修改 2022-03-21 10:21:08 +08:00
yuanshuai dc0c9819bd 神魔阵营功能脚本提交 2022-03-18 16:45:25 +08:00