Commit Graph

5077 Commits (a720fca31c0cc97a54851075a208775a7ec9795e)

Author SHA1 Message Date
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 9797af171b 【巅峰赛】赛开服第一天就解锁了巅峰 2021-07-31 23:59:36 +08:00
xuexinpeng 504271bdc1 【巅峰赛】赛开服第一天就解锁了巅峰 2021-08-06 00:03:08 +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
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
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 88871d789a Merge branch 'master_test_gn' into master_test_gn_arena
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
2021-08-01 08:08:27 +08:00
lvxinran b6accfb599 跨服等级关联表,修改奖励 2021-08-01 01:12:10 +08:00
lvxinran b858575a71 跨服修改 2021-08-01 02:28:08 +08:00
lvxinran 4639b612ea 时间少一周 2021-07-31 21:37:10 +08:00
lvxinran 8828912661 修改错误提示 2021-07-25 23:08:59 +08:00
duhui 48617157b8 跨服, 十绝阵 2021-07-21 10:40:24 +08:00
duhui c708ffd3e6 Revert "超值基金, 老玩家时间兼容问题"
This reverts commit 65326a1808.
2021-07-20 20:49:47 +08:00
duhui 65326a1808 超值基金, 老玩家时间兼容问题 2021-07-20 20:46:59 +08:00
lvxinran 4b7d67c586 Merge branch 'master_test_gn_zf' into master_test_gn 2021-07-20 09:57:02 +08:00
lvxinran 7e93977007 埋点修改 2021-07-20 09:56:10 +08:00
duhui ad6dfd7de6 超值基金bug修改 2021-07-20 09:55:43 +08:00
lvxinran 6e8dc9fb64 Merge branch 'master_test_gn_zf' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2021-07-19 19:40:38 +08:00
xuexinpeng 65fbb27c1b 快速挑战:拍脸 2021-07-19 18:33:28 +08:00
xuexinpeng 83e9c81b8c 山河试炼快速挑战 拍脸 2021-07-19 18:08:08 +08:00
lvxinran 62fe24b3af Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-07-19 17:15:09 +08:00
lvxinran 1cdc3e658d 被封禁后不再上报 2021-07-19 17:15:03 +08:00
lvxinran a01d8d6037 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-07-31 11:46:41 +08:00
lvxinran 37fc2796ce 十绝阵解散修改 2021-07-31 11:46:32 +08:00
lvxinran 20cf1f52b2 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-07-29 23:16:26 +08:00
lvxinran 917331ec42 第一次刷新修改 2021-07-29 23:16:20 +08:00
xuexinpeng 5eb495a8e4 活动类型:5 2021-07-20 16:34:02 +08:00
duhui fca529e5d9 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-07-19 17:04:07 +08:00
duhui 567f31c33a 超值基金修改 2021-07-19 17:03:56 +08:00
xuexinpeng 1ac7d8e139 活动类型:5 2021-07-19 16:04:59 +08:00
xuexinpeng 70576ce70a 活动类型:5 2021-07-19 15:46:20 +08:00
duhui 414f2c91db 超值基金活动修改 2021-07-19 13:51:50 +08:00
duhui 3415e92270 超值基金bug修改 2021-07-19 10:57:02 +08:00
lvxinran a9802099c0 跨服修改 2021-07-19 06:07:09 +08:00
lvxinran 4b641f5109 跨服修改 2021-07-18 23:57:59 +08:00
lvxinran cbe1b7753e 封禁提示 2021-07-18 01:26:33 +08:00
xuexinpeng cdaeb7c971 新活动类型:5 2021-07-16 18:56:13 +08:00
xuexinpeng f30d36473d 新加活动类型:5 2021-07-16 17:07:17 +08:00
lvxinran d93d9a1f6a 心愿抽卡发邮件替换 2021-07-16 15:25:15 +08:00
duhui 3000c791f2 Merge branch 'dh_dev_wishDrawCard' into master_test_gn
(cherry picked from commit 5c69363203)
2021-07-16 14:26:33 +08:00
duhui f61b9c81f6 超值基金bug修改 2021-07-16 14:16:46 +08:00
DESKTOP-98AVA47\Administrator bc3ec7b772 杜辉提交,心愿抽卡主题活动兼容 2021-07-16 00:51:40 +08:00
mengchengzhen b2b03eb17a 增加丢失代码 2021-07-15 18:11:47 +08:00
mengchengzhen 91080b333b Merge branch 'master_test_gn' into master_test_gn_mcz
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2021-07-15 17:33:45 +08:00
mengchengzhen c87f0e1864 许愿魂印 2021-07-15 17:12:34 +08:00
duhui 5c69363203 Merge branch 'dh_dev_wishDrawCard' into master_test_gn 2021-07-15 16:33:54 +08:00
duhui 8a1b28f04e Merge branch 'dh_dev_qimendunjia' into master_test_gn
奇门遁甲协议合并
2021-07-15 16:33:44 +08:00
duhui 708cc0b718 Merge branch 'dh_dev_fund' into master_test_gn 2021-07-15 16:31:12 +08:00
duhui fd888a7141 奇门遁甲消耗 2021-07-15 16:27:08 +08:00
duhui b2f31798b0 心愿抽卡优化 2021-07-15 16:03:04 +08:00
xuexinpeng 83f9c3fe83 热更奖励id变更 bug 2021-07-15 14:06:42 +08:00
lvxinran 07fe5c89ed Merge branch 'master_test_gn_zf' into master_test_gn 2021-07-15 04:34:40 +08:00