Commit Graph

5561 Commits (f13360abd37e0ebad0770e2a418bee592d6e0e81)

Author SHA1 Message Date
jiahuiwen bf1a911880 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-10-29 10:53:14 +08:00
jiahuiwen 542563c2c3 删除日志 2021-10-29 10:53:03 +08:00
duhui 17a8cc3811 车迟斗法积分为0处理 2021-10-29 10:51:29 +08:00
duhui 040d8bff45 gm类名修改 2021-10-29 09:48:39 +08:00
duhui 5410f0ecce 测试,gm需求 2021-10-28 18:10:20 +08:00
jiahuiwen 39d1c1242f 优化 2021-10-28 17:44:00 +08:00
duhui eb91e2169d 车迟斗法伤害溢出问题 2021-10-28 16:58:37 +08:00
duhui 0cdf8dfe92 异常码 2021-10-28 14:50:02 +08:00
duhui 83501823b7 日志 2021-10-28 13:30:59 +08:00
duhui 0b0f021bf5 天眼日志添加 2021-10-28 13:20:24 +08:00
yuanshuai fb7ed91a36 新版三界降魔活动提交 2021-10-28 12:05:47 +08:00
duhui d5dc87e1cd 天眼,取消旧公会信息兼容 2021-10-28 11:59:22 +08:00
xuexinpeng bb2ace9b66 Merge branch 'master_test_gn_zf' into master_test_gn 2021-10-28 11:31:53 +08:00
xuexinpeng d62ad1c030 Merge branch 'master_prb_gn' of http://60.1.1.230/backend/jieling_server into master_prb_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/mission/TakeMissionRewardHandler.java
2021-10-28 11:22:58 +08:00
duhui 4b0447625d 七界试炼数数埋点 2021-10-28 10:23:14 +08:00
xuexinpeng 61a71d847c 去掉注释 2021-10-27 20:24:44 +08:00
xuexinpeng 18201b0de6 日志 2021-10-27 19:47:27 +08:00
xuexinpeng 6021025dc6 判空操作 2021-10-27 19:39:37 +08:00
xuexinpeng f72b071efd 判空返回 2021-10-27 19:17:58 +08:00
xuexinpeng b66139651f 注释6962 6963礼包 2021-10-27 19:01:09 +08:00
xuexinpeng 7d96a9e494 6962 6963礼包废弃 2021-10-27 18:30:51 +08:00
yuanshuai 947bfcf9e2 新版三界降魔活动提交 2021-10-27 17:41:58 +08:00
xuexinpeng bd08edc34e 7201活动弃用 2021-10-27 17:35:11 +08:00
xuexinpeng 56bd49949d 7201活动弃用 2021-10-27 17:27:59 +08:00
jiahuiwen 5870b939c5 test 2021-10-27 16:56:37 +08:00
xuexinpeng 33ea08343d Merge branch 'master_test_gn_zf' of http://60.1.1.230/backend/jieling_server into master_test_gn_zf 2021-10-27 16:54:06 +08:00
xuexinpeng 62a1d3e61c 一键领取 2021-10-27 16:52:08 +08:00
duhui c974df9d8e 超级月卡 2021-10-27 16:51:44 +08:00
duhui 080e3337b7 天眼公会 2021-10-27 15:54:53 +08:00
duhui 3179849ffb 超级月卡 2021-10-27 13:49:08 +08:00
xuexinpeng ec3ea76864 一键领取代码回滚 2021-10-27 07:44:08 +08:00
xuexinpeng e6ea0e5451 原帅跨服 2021-11-06 01:17:31 +08:00
yuanshuai 004ce5a027 主角技能添加用户等级 2021-10-26 17:57:10 +08:00
yuanshuai 379e85704d 跨服相关主角技能性别字段修改 2021-10-26 17:18:19 +08:00
yuanshuai c366955468 主角技能添加性别字段 2021-10-26 17:06:13 +08:00
yuanshuai 1ed3adec43 车迟斗法抢夺战斗类型修改 2021-10-26 15:11:58 +08:00
jiahuiwen 872dee96f7 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-10-26 15:00:55 +08:00
jiahuiwen d8f053335e 获取最大战力兼容机器人 2021-10-26 15:00:47 +08:00
xuexinpeng 155dfbd651 飘渺之旅新增绝对日期前后开服两种活动 2021-10-26 11:11:53 +08:00
yuanshuai ee66dc9c25 跨服切磋主角技能bug修改 2021-10-26 10:29:50 +08:00
xuexinpeng ae732cb0fa 跨服参数判空 2021-10-26 10:23:17 +08:00
yuanshuai 08d19e5edd Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-10-25 17:26:39 +08:00
yuanshuai 6fc96e7f71 添加战斗力字段 2021-10-25 17:26:26 +08:00
xuexinpeng 4a1108ae00 yx挑战列表战力为0 2021-10-25 17:15:40 +08:00
yuanshuai 5a11a55629 大闹天宫和七剑试炼开战协议添加战斗力数据字段 2021-10-25 15:32:45 +08:00
jiahuiwen d478225c1d 减少聊天记录缓存数量 2021-10-25 13:48:24 +08:00
jiahuiwen 01771b2fde 注释内存中的战斗缓存 2021-10-25 13:17:32 +08:00
xuexinpeng fe14a4230f yx修改 一键领取注掉 2021-10-22 17:46:20 +08:00
yuanshuai 5bee28c52f 后端不做活动兼容了 2021-10-22 17:25:12 +08:00
yuanshuai ea6545ec83 注释至尊降世活动数据兼容(前端做特殊处理了) 2021-10-22 17:21:12 +08:00
yuanshuai 8638f546bd 至尊降世活动任务兼容脚本提交 2021-10-22 17:09:16 +08:00
duhui 6066375355 御剑行,活动切换修改 2021-10-22 16:24:03 +08:00
jiahuiwen c183c40c81 敏感字服兼容 2021-10-22 16:22:55 +08:00
jiahuiwen 8bdd217c8a Merge branch 'master_test_gn' into master_test_mingan 2021-10-22 16:08:16 +08:00
jiahuiwen ea50ee77d1 Merge branch 'master_test_gn' into master_test_mingan 2021-10-22 15:40:02 +08:00
duhui dc90208c0d 惊喜礼盒类型的活动,添加礼包购买次数校验 2021-10-22 15:36:27 +08:00
duhui a976c38c49 活动初始化清楚老的个人记录 2021-10-22 15:03:35 +08:00
jiahuiwen 967d5dc035 修仙属性flot 改int 2021-10-22 14:56:16 +08:00
duhui 45c95ced6d 竞猜记录 2021-10-22 14:49:35 +08:00
duhui 8c9a4a73d0 结算阶段问题修改 2021-10-22 14:37:36 +08:00
yuanshuai 9d0ff2e1da 山河社稷图副本添加修行技能相关最高战斗力字段数据 2021-10-22 14:36:52 +08:00
yuanshuai 266fd9526b 修行技能升级限制修改 2021-10-22 13:38:56 +08:00
duhui df41a517f9 心愿抽卡,老玩家兼容 2021-10-22 12:01:21 +08:00
duhui fea786d9c7 上次排行问题 2021-10-22 10:53:36 +08:00
jiahuiwen 72b4a36e9e Merge branch 'master_test_gn' into master_test_mingan 2021-10-22 10:07:48 +08:00
duhui 6829317447 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-10-22 10:07:40 +08:00
duhui e947d1044c 非空验证 2021-10-22 10:07:28 +08:00
jiahuiwen 47cb3cb3bc 山河社稷图 每日奖励 隔天不刷新 2021-10-22 10:07:25 +08:00
duhui fd55683fc9 御剑行,获取跨发玩家数据方法修改 2021-10-22 10:01:20 +08:00
xuexinpeng b0192aa8ab yx删除机器人服务器编号 2021-10-21 18:43:49 +08:00
xuexinpeng 1a5106db60 yx积分修改 2021-10-21 18:35:57 +08:00
xuexinpeng 8fc2ed63ce 1.yx积分变化
2.任务一键领取
2021-10-21 18:26:01 +08:00
xuexinpeng cf58cda027 1.在当前的降分公式的基础上×70%,对方获得的分数不变,挑战和被挑战时均做如此处理
2.一键领取
2021-10-21 18:00:54 +08:00
duhui 091cf93f40 新百宝商会活动 2021-10-21 17:36:21 +08:00
jiahuiwen 1249c87f69 添加日志 2021-10-21 16:27:47 +08:00
jiahuiwen 71285d2eb7 兼容策划删RechargeCommodityConfig表 2021-10-21 16:12:31 +08:00
jiahuiwen ce1db905a9 通过rpc调用 敏感字检测 2021-10-21 16:10:40 +08:00
yuanshuai 03baa1f90c 修行技能代码修改 2021-10-21 15:37:01 +08:00
yuanshuai 93974b5c1b 跨服相关添加数据结构 2021-10-21 15:19:32 +08:00
yuanshuai 642afe6d52 修行技能战斗相关修改 2021-10-21 15:18:09 +08:00
yuanshuai cd8777c449 修行技能相关脚本修改提交 2021-10-21 14:34:21 +08:00
yuanshuai 5469ead809 跨服数据添加历史最高战力字段 2021-10-21 14:19:19 +08:00
xuexinpeng ffc6d76a84 跨服修行技能数据 2021-10-21 11:15:35 +08:00
xuexinpeng fef9428f5d 跨服数据新加修行技能数据 2021-10-21 11:07:36 +08:00
xuexinpeng 95820f7f10 跨服新加战斗属性 2021-10-21 10:46:02 +08:00
yuanshuai db2b1d7283 Merge branch 'master_test_gn_practiceSkill' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java
2021-10-20 18:38:33 +08:00
duhui 70b19c8beb 御剑行功能优化 2021-11-03 23:46:27 +08:00
yuanshuai 578cc29315 修行技能战斗相关脚本修改 2021-10-20 18:24:43 +08:00
xuexinpeng e2cf755930 新月卡 2021-10-20 18:20:39 +08:00
jiahuiwen 28c89f68a0 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-10-20 16:55:07 +08:00
xuexinpeng cf11f25859 新增挚礼月卡 2021-10-29 00:14:33 +08:00
jiahuiwen 33fb73daea 山河社稷图每日领取奖励bug 2021-10-20 16:54:58 +08:00
jiahuiwen d435e81ffc Merge branch 'master_prb_gn' into master_test_gn 2021-10-20 16:06:37 +08:00
jiahuiwen 50dd2f47bb 屏蔽其他服 2021-10-20 15:41:19 +08:00
jiahuiwen f61e384ff8 获取推荐好友 null 判断 2021-10-20 13:56:27 +08:00
duhui 606b22a670 御剑行合并 2021-10-20 13:44:18 +08:00
jiahuiwen d9a224add4 删除37上报 2021-10-20 13:27:01 +08:00
jiahuiwen eb425bc259 删除无用代码 2021-10-20 13:19:02 +08:00
jiahuiwen d1841984b7 Merge branch 'master_prb_gn' into master_test_gn 2021-10-20 13:17:58 +08:00
jiahuiwen d410b576a0 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-10-20 13:17:41 +08:00