Commit Graph

5059 Commits (c367fce248d45c4402c9ca6c8240de5227507ac2)

Author SHA1 Message Date
xuexinpeng 77ba8534e3 删除无用代码 2021-08-19 20:04:34 +08:00
xuexinpeng 03ef898d14 首发邮件 2021-08-19 19:51:29 +08:00
xuexinpeng a128c5ea74 首发邮件更改 2021-08-19 17:00:48 +08:00
xuexinpeng 821d1425f6 注释:功能开关和礼包开关 后续优化 2021-08-19 15:46:16 +08:00
xuexinpeng 03672cd509 加个判空操作 2021-08-19 11:45:19 +08:00
duhui 08c8b779bc 网页支付 2021-08-18 17:34:11 +08:00
jiahuiwen f9ab39d529 修改参数 2021-08-17 18:31:58 +08:00
jiahuiwen 3efe09db22 检查代码 2021-08-17 18:00:45 +08:00
jiahuiwen 461de0b494 参数调整 2021-08-17 17:56:44 +08:00
xuexinpeng bec145d577 注释掉寻宝迷踪 2021-08-16 18:35:43 +08:00
xuexinpeng 35c0be054c log测试 2021-08-16 18:11:08 +08:00
xuexinpeng d517f05b82 Merge branch 'master_test_gn_zf' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
2021-08-16 14:40:38 +08:00
duhui b30ca90cec 关闭跨服十绝阵 2021-08-16 14:12:15 +08:00
duhui be862b5e17 mongo配置修改 2021-08-16 11:28:35 +08:00
xuexinpeng 23d17dc479 首发邮件更改 2021-08-16 15:34:47 +08:00
lvxinran c1a1219ff2 判断顺序修改 2021-08-14 18:01:34 +08:00
lvxinran f7cfb10a8e 删除英雄代码提交 2021-08-14 17:13:08 +08:00
lvxinran da50d8f7cf 删除无用 2021-08-14 16:57:26 +08:00
lvxinran f40115836e 暂时不删除 2021-08-14 16:54:04 +08:00
lvxinran f24f6954f8 修复英雄数据 2021-08-14 16:01:12 +08:00
lvxinran 99f6f425b8 空判断packid 2021-08-14 14:20:12 +08:00
xuexinpeng 381edf838d 游心gm 20019服错发邮件 2021-08-16 18:58:49 +08:00
duhui 6c56cba35f 十绝阵跨服 2021-08-13 10:37:31 +08:00
xuexinpeng e26b239f1c 太初密卷 2021-08-13 10:01:20 +08:00
lvxinran cc191fe8c1 添加return 2021-08-12 18:45:48 +08:00
lvxinran b9661c9a77 处理报错 2021-08-12 18:35:17 +08:00
duhui abba6adf16 开启跨服十绝阵 2021-08-12 17:12:02 +08:00
xuexinpeng 849b906f61 首发预约邮件 2021-08-16 16:31:38 +08:00
xuexinpeng 2aa6058f2e 首发预约邮件 2021-08-16 16:04:36 +08:00
lvxinran 9af6ed2721 车迟斗法记录修改 2021-08-12 15:11:11 +08:00
lvxinran d7638c3829 防止报错 2021-08-12 13:36:05 +08:00
xuexinpeng c5b9927feb 寻宝迷踪 2021-08-09 18:22:54 +08:00
lvxinran 3018ad8789 修改掉落 2021-08-09 11:30:39 +08:00
xuexinpeng e7f5d7dcfd 功能礼包 封禁 2021-08-06 17:48:25 +08:00
lvxinran 141da04281 注释无用代码 2021-08-05 20:51:31 +08:00
duhui 7d000190d4 跨服战斗中显示皮肤 2021-08-05 16:25:15 +08:00
lvxinran 87911d51f6 数数上报修改 2021-08-05 16:02:57 +08:00
xuexinpeng 277938ccd3 Merge branch 'master_prb_gn' into master_test_gn_zf 2021-08-05 11:49:20 +08:00
xuexinpeng 8f92434f12 【日任务】新做的日任务,会记点将台抽卡次数(有新将活动只记新将抽卡次数) 2021-08-05 11:46:39 +08:00
xuexinpeng 84d0cb053a 新做的日任务,会记点将台抽卡次数(有新将活动只记新将抽卡次数) 2021-08-05 11:32:38 +08:00
duhui 70a16ceaec 跨服排行榜自己排名显示问题处理 2021-08-05 10:46:20 +08:00
lvxinran c7a897e3b9 packid修改 2021-08-04 21:41:47 +08:00
lvxinran 9bd09974d9 mongo慢查询修改 2021-08-04 21:09:06 +08:00
lvxinran 0de9a4ee30 打开图鉴功能 2021-08-04 17:50:20 +08:00
duhui 8f49866e06 跨服bug热更 2021-08-04 16:56:21 +08:00
duhui 527186345c 跨服显示问题 2021-08-04 16:51:31 +08:00
duhui b14a43d74e 跨服排行,展示宝物和英雄皮肤 2021-08-04 16:05:50 +08:00
duhui d876273349 跨服切磋问题处理,无效引用删除 2021-08-04 15:45:25 +08:00
lvxinran 2e7714f94d mongo慢查询修改 2021-08-04 15:16:16 +08:00
lvxinran 56f9773f7b 暂时关闭图鉴激活功能 2021-08-04 10:51:42 +08:00
lvxinran 0d7dde1926 机器人天赋修改 2021-08-03 17:25:29 +08:00
duhui 8e7133efa3 罗浮争锋排行榜服务器名显示问题 2021-08-03 16:44:22 +08:00
duhui ae56c60c1e 罗浮争锋排行榜问题 2021-08-03 09:36:35 +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 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 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