Commit Graph

5562 Commits (6890e0b2dc28630df76a9de0d663e2a378900782)
 

Author SHA1 Message Date
lvxinran 265392949e 修改编队 2021-08-13 01:38:11 +08:00
duhui fc987e03ae 排行榜展示修改 2021-07-30 16:39:02 +08:00
duhui 7b032b0181 跨服排行榜展示问题 2021-07-30 15:37:33 +08:00
mengchengzhen ec519b4fb9 Merge branch 'master_test_gn_arena' of http://60.1.1.230/backend/jieling_server into master_test_gn_arena 2021-07-30 15:35:05 +08:00
mengchengzhen 47ce524be7 修改跨服聊天bug 2021-07-30 15:34:51 +08:00
duhui dc1ca01483 报错修改 2021-07-30 15:16:39 +08:00
duhui ca861d0788 Merge branch 'master_test_gn_arena' into dev_dh_cross_rank
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/GameApplication.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java
2021-07-30 15:13:09 +08:00
duhui 1bdb4587d7 跨服十绝阵暂时关闭 2021-07-30 15:11:53 +08:00
duhui 931db8e069 跨服十绝阵修改 2021-07-30 15:03:17 +08:00
mengchengzhen 9979be777c 获取聊天报错解决 2021-07-30 11:42:43 +08:00
lvxinran 91eb85793d 称号推送 2021-08-12 20:08:38 +08:00
duhui 66c2617d7f 跨服排行榜 2021-07-30 11:26:27 +08:00
mengchengzhen d7871504cf Merge branch 'master_test_gn_arena' of http://60.1.1.230/backend/jieling_server into master_test_gn_arena 2021-07-29 18:40:43 +08:00
mengchengzhen 66f8199e72 Merge branch 'master_test_gn_zbh' into master_test_gn_arena 2021-07-29 18:37:53 +08:00
mengchengzhen 6b5a77a1b1 //跨服聊天提交 2021-07-29 18:37:39 +08:00
mengchengzhen 9d1c5a3506 Revert "//跨服聊天提交"
This reverts commit c1f3d319e8.
2021-07-29 18:35:48 +08:00
mengchengzhen c1f3d319e8 //跨服聊天提交 2021-07-29 18:34:47 +08:00
duhui afee7ddce0 英雄信息报错兼容 2021-07-29 18:33:30 +08:00
xuexinpeng a552dabd2c 【逐胜之巅优化】功能改为在开服指定天数后开启 战令优化 2021-07-29 17:58:58 +08:00
duhui 765ede1ef7 获取跨服状态修改 2021-07-29 17:46:22 +08:00
lvxinran 5439f6f195 Merge branch 'master_test_gn_arena' of http://60.1.1.230/backend/jieling_server into master_test_gn_arena 2021-08-01 00:03:49 +08:00
lvxinran 7de1656310 称号时间修改 2021-08-01 00:03:40 +08:00
lvxinran 679ca87f36 机器人starBreakId修改 2021-08-09 20:03:07 +08:00
xuexinpeng a1aaf10802 【逐胜之巅优化】功能改为在开服指定天数后开启 2021-07-29 16:02:59 +08:00
lvxinran ad34283f39 判空修改第二次 2021-07-31 01:15:26 +08:00
lvxinran e11735b735 字段名修改 2021-07-31 01:14:37 +08:00
lvxinran 8cf5c7af9c 报空修改 2021-07-31 01:01:11 +08:00
lvxinran 5c09083d07 删除无用日志 2021-07-31 00:56:47 +08:00
lvxinran 15544cbab8 跨服切磋 2021-07-31 00:13:02 +08:00
mengchengzhen 6e22e7040e Merge branch 'master_test_gn_zbh' into master_test_gn_arena 2021-07-29 14:10:25 +08:00
mengchengzhen c091b123ff //跨服聊天提交 2021-07-29 14:09:59 +08:00
duhui 31fd441ae8 跨服获取服务器列表优化 2021-07-29 11:26:43 +08:00
lvxinran fb1d8980a5 Merge branch 'master_test_gn_arena' of http://60.1.1.230/backend/jieling_server into master_test_gn_arena 2021-08-09 18:55:40 +08:00
lvxinran 8987ba9700 称号修改 2021-08-09 18:55:31 +08:00
mengchengzhen d38412726d //跨服聊天提交 2021-07-29 10:38:05 +08:00
mengchengzhen b1551e6b75 Merge branch 'dev_dh_cross_rank' into master_test_gn_zbh 2021-07-29 10:29:44 +08:00
mengchengzhen f96554fee5 Merge branch 'master_test_gn_arena' into master_test_gn_zbh 2021-07-29 10:29:07 +08:00
mengchengzhen ffcb76a740 //跨服聊天提交 2021-07-28 18:25:41 +08:00
duhui 657519a083 Merge branch 'master_test_gn_arena' into dev_dh_cross_rank 2021-07-28 18:05:26 +08:00
duhui 83ced034b6 报错修改 2021-07-28 18:05:10 +08:00
mengchengzhen 0458df7595 //跨服聊天提交 2021-07-28 18:01:16 +08:00
duhui 9126613ba7 Merge branch 'master_test_gn_arena' into dev_dh_cross_rank
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java
2021-07-28 17:52:36 +08:00
duhui 01ec371f1d 跨服排行,显示服务器名字 2021-07-28 17:51:23 +08:00
mengchengzhen 6b76168938 //跨服聊天提交 2021-07-28 17:42:53 +08:00
mengchengzhen 8eb605135d //跨服聊天提交 2021-07-28 16:57:46 +08:00
duhui 44b3b2881f 获取是否跨服 2021-07-28 16:48:40 +08:00
lvxinran 12a9fe7d7b Merge branch 'master_test_gn' into master_test_gn_arena 2021-07-31 01:04:59 +08:00
duhui 0c9f09b13c 跨服十绝阵优化 2021-07-28 16:25:38 +08:00
duhui 94bffe4947 跨服排行,初步修改 2021-07-28 16:05:50 +08:00
duhui d51a4715e0 跨发,十绝阵功能合并 2021-07-28 14:02:13 +08:00