Commit Graph

6007 Commits (1ed3adec43f962b99331ca4df4f7cbcf2135aa23)
 

Author SHA1 Message Date
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
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
jiahuiwen d7586ee251 修仙 2021-10-20 13:17:31 +08:00
jiahuiwen c887793262 注释37上报 2021-10-20 13:14:48 +08:00
yuanshuai 648df4a0b7 Merge branch 'master_test_gn_newActivity' into master_test_gn 2021-10-20 11:16:40 +08:00
yuanshuai c1f4f45656 活动修改 2021-10-25 11:56:58 +08:00
yuanshuai e9350ef9e3 修行技能代码修改 2021-10-20 11:16:13 +08:00
jiahuiwen 1253cce600 Merge branch 'master_prb_gn' of http://60.1.1.230/backend/jieling_server into master_prb_gn 2021-10-20 11:08:06 +08:00
jiahuiwen ca7c565f2f 好友 null 判断 2021-10-20 11:07:54 +08:00
xuexinpeng 9155c7fde2 Merge branch 'master_test_gn' into master_prb_gn 2021-10-19 19:11:07 +08:00
xuexinpeng 3c95660505 yx空阵容挑战记录 2021-10-19 19:09:43 +08:00
duhui 942338df7d 活动时间兼容 2021-10-19 18:25:02 +08:00
xuexinpeng 11fb5eb275 跨服rpcbreakID 2021-10-19 17:22:18 +08:00
jiahuiwen 945d0434af Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-10-19 17:10:23 +08:00
jiahuiwen 302a8a0f2d 【新功能】主角修为
【新功能】山河社稷图增加每日扫荡
2021-10-19 17:10:06 +08:00
yuanshuai 06b9324e05 修行技能登录获取数据脚本提交 2021-10-19 16:37:45 +08:00
xuexinpeng c441a1f25b 跨服rpc四灵试炼等级 2021-10-19 16:34:03 +08:00
yuanshuai 50fca59741 修行技能脚本提交 2021-10-19 16:27:25 +08:00
yuanshuai 75872a85e9 Merge branch 'master_test_gn' into master_test_gn_practiceSkill 2021-10-19 15:40:38 +08:00
yuanshuai 4b3a1a1e42 修行技能逻辑提交 2021-10-19 15:40:05 +08:00
yuanshuai 31a31cbcd2 修行技能代码提交 2021-10-21 10:46:11 +08:00
xuexinpeng 8db77db94c Merge branch 'master_test_gn' into master_test_gn_xxp 2022-01-03 01:09:23 +08:00
xuexinpeng e7d2136f49 team跨服名字 2022-01-03 01:03:59 +08:00
xuexinpeng 7281a39cd2 查看队伍team新接口 帮会id赋值 2022-01-03 01:01:52 +08:00
xuexinpeng 0994b02b85 工会名字 2022-01-03 00:35:02 +08:00
xuexinpeng b0e341601e 罗浮争锋排行榜信息 2022-01-03 00:24:50 +08:00
xuexinpeng bd6d205053 罗浮争锋team消息 2022-01-03 00:03:20 +08:00
xuexinpeng c8c42ddf9d 罗浮争锋队伍请求 2021-12-27 00:47:41 +08:00
xuexinpeng 5345bbaad4 重置奖励修改 2021-12-27 00:40:01 +08:00
xuexinpeng b99f3dffce yx积分重置 exp显示 2021-12-27 00:05:38 +08:00
DESKTOP-98AVA47\Administrator fb75fd38c6 排行榜本服查看英雄信息exp等级显示问题 2021-10-30 09:25:53 +08:00
duhui 1af270944c 罗浮争锋,全局参数{state}修改到redis 2021-10-29 17:29:00 +08:00
jiahuiwen 591ebd34e8 Merge branch 'master_test_gn_zf' into master_test_gn 2021-10-19 13:46:40 +08:00
jiahuiwen e4e0dc5dd6 Merge branch 'master_prb_gn' into master_test_gn_zf 2021-10-19 13:45:06 +08:00
jiahuiwen 358c920cd6 修仙表增加字段 2021-10-19 12:09:30 +08:00