Commit Graph

5562 Commits (6890e0b2dc28630df76a9de0d663e2a378900782)
 

Author SHA1 Message Date
lvxinran c32513ab42 Merge branch 'master_test_gn' into master_test_gn_zf 2021-08-03 17:36:11 +08:00
lvxinran 29fa1eb079 Merge branch 'master_test_gn' into master_prb_gn 2021-08-03 17:28:15 +08:00
lvxinran 3867ce735c 同步本地战斗 2021-08-03 17:27:36 +08:00
lvxinran 0d7dde1926 机器人天赋修改 2021-08-03 17:25:29 +08:00
duhui 98cf249c70 Merge branch 'master_test_gn' into master_prb_gn 2021-08-03 16:47:40 +08:00
duhui 8e7133efa3 罗浮争锋排行榜服务器名显示问题 2021-08-03 16:44:22 +08:00
duhui c542ac0f86 Merge branch 'master_test_gn' into master_prb_gn 2021-08-03 10:26:34 +08:00
lvxinran f4c37edd1c Merge branch 'master_test_gn' into master_prb_gn 2021-08-07 19:58:38 +08:00
lvxinran d0601f797c Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-08-07 19:24:57 +08:00
lvxinran e875b3688d 后续添加 2021-08-07 19:24:47 +08:00
lvxinran 3048f8a305 充值前接口检测 2021-08-07 17:18:46 +08:00
lvxinran 346feae774 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-08-07 15:04:25 +08:00
lvxinran 8e3790eaa6 青龙秘宝空邮件 2021-08-07 15:04:16 +08:00
lvxinran 3e9de07975 提示信息修改 2021-08-07 00:17:47 +08:00
duhui ae56c60c1e 罗浮争锋排行榜问题 2021-08-03 09:36:35 +08:00
duhui ce261cb562 Merge branch 'master_test_gn_arena' into master_test_gn 2021-08-02 18:31:01 +08:00
duhui c5686fcd14 跨服修改 2021-08-16 00:16:20 +08:00
duhui 69a15015de 跨服排行修改 2021-08-16 00:03:52 +08:00
duhui d08086fe78 跨服bug提交 2021-08-09 17:44:19 +08:00
duhui 55d4050347 Merge branch 'master_test_gn_arena' into master_test_gn 2021-08-02 14:38:25 +08:00
duhui ea93c562cc 跨服修改 2021-08-02 14:37:52 +08:00
lvxinran 222e8b18b4 Merge branch 'master_test_gn_arena' of http://60.1.1.230/backend/jieling_server into master_test_gn_arena 2021-08-07 14:03:40 +08:00
lvxinran cde4df5928 罗浮排行等级不一致 2021-08-07 14:03:30 +08:00
duhui cc0574a4a6 跨服修改 2021-08-02 13:34:35 +08:00
duhui 4f8f6cd44d 跨服战力补充提交 2021-08-02 11:18:54 +08:00
duhui fdf2e28b6f 跨服排行战力显示问题 2021-08-02 11:18:03 +08:00
duhui 28a7882999 跨服bug修改 2021-09-13 00:29:30 +08:00
lvxinran e6f55bb76f 删掉错误物品 2021-08-02 10:56:13 +08:00
lvxinran 3e396b771a 错误提示修改 2021-08-02 10:55:52 +08:00
lvxinran 5c0a4802b9 没小怪时不能使用炸弹 2021-08-02 10:55:37 +08:00
xuexinpeng 978df81cb8 Merge branch 'master_test_gn' into master_prb_gn 2021-08-01 02:16:04 +08:00
xuexinpeng 9797af171b 【巅峰赛】赛开服第一天就解锁了巅峰 2021-07-31 23:59:36 +08:00
xuexinpeng 504271bdc1 【巅峰赛】赛开服第一天就解锁了巅峰 2021-08-06 00:03:08 +08:00
lvxinran 8acc62e19b 判空修改第二次 2021-07-31 01:15:46 +08:00
lvxinran a88c856888 报空修改 2021-07-31 01:07:04 +08:00
duhui 6957ef336f Merge branch 'master_test_gn_arena' into master_test_gn 2021-07-30 19:19:14 +08:00
duhui ca301e1733 跨服工会修改 2021-07-30 19:17:44 +08:00
duhui e44ee9244b Merge branch 'master_test_gn_arena' into master_test_gn 2021-07-30 19:08:38 +08:00
duhui e39df9d30b 跨服工会修改 2021-07-30 19:03:48 +08:00
xuexinpeng 7f9281a259 急速探索计数 2021-07-30 18:56:45 +08:00
xuexinpeng f4402cd95f Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-07-30 18:49:43 +08:00
xuexinpeng 77f5f9150b 新将招募 任务限制 2021-07-30 18:47:44 +08:00
xuexinpeng d39777c4dc 日常任务在线跨天限制 2021-08-02 00:04:00 +08:00
xuexinpeng 744a0d4e5b 【逐胜之巅优化】功能改为在开服指定天数后开启 2021-07-31 10:56:29 +08:00
duhui c5debd98ad Merge branch 'master_test_gn_arena' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java
2021-07-30 18:43:07 +08:00
duhui 07287547b0 跨服工会 2021-07-30 18:33:52 +08:00
duhui 57433529aa 跨服修改 2021-07-30 18:04:48 +08:00
duhui 8b31780b65 跨服排行展示 2021-07-30 17:54:14 +08:00
duhui c256929f93 跨服排行战力展示 2021-07-30 17:16:43 +08:00
duhui 5e2cadc2fe 跨服排行修改 2021-07-30 16:48:40 +08:00