Commit Graph

5668 Commits (2fd6b82d040a7721a5c0425075eaf04832ad5f0e)
 

Author SHA1 Message Date
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
mengchengzhen 0f49dae227 //跨服聊天提交 2021-07-27 16:43:50 +08:00
duhui 3cde69f3b8 Merge branch 'master_test_gn' into master_prb_gn 2021-07-26 16:21:41 +08:00
lvxinran 2b26f026dc Merge branch 'master_test_gn' into master_prb_gn 2021-07-31 03:26:35 +08:00
lvxinran dab1f34d8a 材料返回修改 2021-07-31 03:26:18 +08:00
lvxinran 5e2bd46b08 改回15名 2021-07-31 00:48:07 +08:00
lvxinran 77a423fd6a 回放修改 2021-07-31 00:46:14 +08:00
lvxinran 94f9847844 合并分支 2021-07-31 00:01:41 +08:00
lvxinran cc1f0a41c8 记录15条改成10条 2021-07-24 18:45:35 +08:00
xuexinpeng 2d10ce6677 ThemeActivityTaskConfig 商店 2021-07-23 18:13:32 +08:00
xuexinpeng 207c4422a7 山河社稷图参与奖励 2021-07-24 17:16:11 +08:00
xuexinpeng 0cb5e4bc9a 山河社稷图无论输赢 成就+1 2021-07-29 16:27:33 +08:00
xuexinpeng b651a983b7 主题活动增加活动的每日任务和周任务 新增7个任务类型 2021-07-29 15:57:31 +08:00
lvxinran 315c3ae7dd 无用代码删除 2021-07-23 17:15:15 +08:00
lvxinran 491b703d95 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-07-23 15:50:18 +08:00
lvxinran a54bbe491f 打点添加 2021-07-23 15:50:12 +08:00
lvxinran a4942479a0 无尽秘宝刷新推送 2021-08-01 00:00:50 +08:00
lvxinran 29b5e2f236 激活称号推送 2021-07-23 15:45:24 +08:00
lvxinran 23075b41ff 时间修改 2021-07-23 15:00:27 +08:00
duhui b037147e07 记录版本号和重启时间 2021-07-23 13:55:12 +08:00
lvxinran 7e46304575 阶段切换 2021-07-23 11:58:02 +08:00
lvxinran cbdc87a3ef 第一次手动分组 2021-07-22 20:49:44 +08:00
lvxinran 9a0f8b6395 称号添加 2021-08-01 00:28:27 +08:00
lvxinran 407b087763 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-07-22 15:23:17 +08:00
lvxinran 67886d9756 预告添加活动 2021-07-22 15:23:07 +08:00
lvxinran 8a7eb09fe7 容错计算 2021-07-22 15:22:25 +08:00
duhui 58e103510c 心愿抽卡,数数上报 2021-07-22 14:02:55 +08:00
duhui 18df433074 心愿抽卡, 优化提交 2021-07-21 18:21:15 +08:00
lvxinran c414784114 删除多余代码 2021-07-21 13:59:02 +08:00