Commit Graph

6147 Commits (46e112e56a2d6b1495aced53d19063d614bebfe5)
 

Author SHA1 Message Date
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
yuanshuai d35f538ad2 Merge branch 'master_test_gn' into master_test_gn_godsoul 2021-10-22 14:59:57 +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 d2b1ce8966 神魂代码修改 2021-10-22 14:05:36 +08:00
yuanshuai 111f57d96b Merge branch 'master_test_gn' into master_test_gn_godsoul 2021-10-22 13:50:51 +08:00
yuanshuai 266fd9526b 修行技能升级限制修改 2021-10-22 13:38:56 +08:00
yuanshuai 24d471a7ed 神魂相关逻辑修改提交 2021-10-22 13:20:17 +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
yuanshuai afa7a8932a 神将神魂绑定逻辑修改提交 2021-10-21 18:31:41 +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
yuanshuai a389d200f5 Merge branch 'master_test_gn' into master_test_gn_godsoul
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java
2021-10-21 16:27:40 +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 6c4b096175 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-10-21 11:10:13 +08:00
xuexinpeng fef9428f5d 跨服数据新加修行技能数据 2021-10-21 11:07:36 +08:00
yuanshuai b27b38d3d0 修行技能相关修改 2021-10-21 11:03:55 +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 a7b02e8627 兼容策划删 RechargeCommodityConfig 表数据 2021-10-20 17:11:38 +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