Commit Graph

5605 Commits (46e112e56a2d6b1495aced53d19063d614bebfe5)

Author SHA1 Message Date
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 d70cbe1509 Merge branch 'master_prb_gn' into master_test_gn 2021-10-19 11:14:56 +08:00
xuexinpeng f57360a851 yx重新晋级仍发奖bug 2021-10-25 00:05:47 +08:00
yuanshuai bd0f84629b 萌新活动修改 2021-10-19 09:50:56 +08:00
duhui b60d589ee9 御剑行剧本一周期一算 2021-10-19 00:13:21 +08:00
jiahuiwen 2c643c4a31 屏蔽开服时间前任务 2021-10-18 20:17:12 +08:00
xuexinpeng 0fb715e75f yx属性显示 2021-10-18 16:37:13 +08:00
jiahuiwen 51f6403add 更新敏感字库 2021-10-18 16:19:34 +08:00
xuexinpeng 875484ac61 yx属性 2021-10-18 16:17:15 +08:00
xuexinpeng 375951b7d5 yx跨服打架灵兽,段位重置1000 2021-10-18 15:10:18 +08:00
xuexinpeng b21cb8f45a 跨服白金套装技能,坐骑技能 2021-10-30 01:00:06 +08:00
DESKTOP-98AVA47\Administrator 4efe978e82 Merge branch 'master_test_gn_xxp' of http://60.1.1.230/backend/jieling_server into master_test_gn_xxp 2021-10-23 03:51:54 +08:00
DESKTOP-98AVA47\Administrator 7591a7e980 七界试炼 2021-10-23 03:51:05 +08:00
DESKTOP-98AVA47\Administrator 12b92a4250 共鸣装备看不到 2021-10-23 01:36:40 +08:00
xuexinpeng f080e07e6a Merge branch 'master_test_gn' into master_test_gn_xxp 2021-10-16 21:09:56 +08:00
xuexinpeng 5974b1a730 跨服罗浮争锋 玉虚高分段没有匹配到机器人规则 2021-10-16 19:14:15 +08:00
xuexinpeng 590003cee9 yx积分 2021-10-16 18:35:13 +08:00
xuexinpeng 659a88a932 yxbug 2021-10-16 18:04:49 +08:00
jiahuiwen 07ef70e1d9 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-10-16 17:47:07 +08:00
yuanshuai c96fc8d7ec 推送bug修改 2021-10-21 15:02:12 +08:00
jiahuiwen b5806bcf26 登录 获取气冲天任务增加进度 2021-10-16 17:46:57 +08:00
xuexinpeng 06c60f4d0a yx查看英雄宝物数字右上标 2021-10-16 15:05:29 +08:00
xuexinpeng ecba1854dd Merge branch 'master_test_gn' into master_test_gn_xxp
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java
2021-10-16 11:44:24 +08:00
xuexinpeng 032c48c8b5 yx跨服属性 2021-10-15 21:06:25 +08:00
xuexinpeng 5c68ad2738 跨服排行榜改动 2021-10-15 20:47:21 +08:00
xuexinpeng 63b1c2de38 yxld赛季重置相关 2021-10-18 00:11:11 +08:00
jiahuiwen 3f86147ef3 根据开服时间决定服务器内的成就 2021-10-15 18:28:10 +08:00
jiahuiwen f9eda6dfe0 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
# Conflicts:
#	tablemanager/src/main/java/config/SAchievementConfig.java
2021-10-15 18:21:48 +08:00
jiahuiwen 7c0c66be39 【成就优化】根据开服时间决定服务器内的成就 2021-10-15 18:20:59 +08:00
xuexinpeng f2c43c9042 yxld 积分 英雄属性 查看英雄 2021-10-15 17:31:16 +08:00
duhui 2f4715b599 Merge branch 'dh_dev_cow' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2021-10-15 17:18:43 +08:00
duhui 6d8a430fab 牛气冲天兼容 2021-10-15 17:16:17 +08:00
yuanshuai 82dd1bd33e Merge branch 'master_test_gn_push' into master_test_gn 2021-10-15 16:52:58 +08:00
duhui 082952c1cc 获得道具问题 2021-10-15 15:55:02 +08:00
duhui da8f356de5 删除排行榜 2021-10-15 15:15:59 +08:00
jiahuiwen b4ad96bba7 处理消息失败 打印异常 2021-10-15 14:06:22 +08:00
xuexinpeng 8b1342df9d yxrpc数据 2021-10-15 14:04:46 +08:00
yuanshuai 8cfbd6ab5e 二期推送需求优化完善 2021-10-15 13:58:52 +08:00
duhui f614593007 二次押注不消耗道具问题处理 2021-10-15 13:57:09 +08:00
xuexinpeng 83a80abd6e yx属性 2021-10-15 12:01:17 +08:00
duhui c44cbff181 不删排行榜了 2021-10-15 11:58:48 +08:00
duhui a7cbcf2323 排行榜处理 2021-10-15 11:45:02 +08:00
xuexinpeng fff846bc3f yx登录请求 2021-10-15 11:26:21 +08:00
yuanshuai bf0652a4ad 二期推送需求修改提交 2021-10-15 10:54:06 +08:00
duhui 93a4f47466 隔天刷新 2021-10-15 10:38:59 +08:00
xuexinpeng f42dfcd0e7 yx红点 2021-10-14 21:47:02 +08:00
xuexinpeng fc18cf8b0e yx红点类型 2021-10-14 21:07:22 +08:00
jiahuiwen 09591d21e0 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-10-14 19:38:11 +08:00
jiahuiwen 44ffcea125 坐骑技能 2021-10-14 19:38:02 +08:00
duhui a30b83494a 邮件修改 2021-10-14 18:23:47 +08:00
duhui a6416fb840 活动结束发送邮件 2021-10-14 18:21:40 +08:00
xuexinpeng e5736e509e yxld10/14 2021-10-14 17:27:59 +08:00
yuanshuai c95cd0c10b 羁绊属性容错处理 2021-10-14 17:10:09 +08:00
duhui 2c1e22ee0d 次数验证 2021-10-14 17:08:03 +08:00
yuanshuai 92b027d90c 根据充值金额推送礼包代码修改 2021-10-14 16:44:14 +08:00
yuanshuai 7bc172d613 Merge branch 'master_test_gn' into master_test_gn_push 2021-10-14 16:36:30 +08:00
duhui bfc5667bb8 Merge branch 'master_test_gn' into dh_dev_ridingsward
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
2021-10-14 16:18:26 +08:00
duhui ba6a32a114 成就任务优化,兼容开服时间条件,补充 2021-10-14 15:37:40 +08:00
duhui 7ab321cc75 成就任务优化,兼容开服时间条件 2021-10-14 15:36:48 +08:00
yuanshuai 4fe6e452ea 添加装备图鉴修改推送 2021-10-14 15:27:14 +08:00
xuexinpeng 363f5f6a53 yx积分 2021-10-14 14:07:30 +08:00
xuexinpeng 24d983ac2b yx初始积分 2021-10-14 13:47:19 +08:00
yuanshuai 8dceb89111 白金装备提交 2021-10-14 13:47:14 +08:00
xuexinpeng ea3e7cdaf3 yx:计分规则 2021-10-14 11:28:22 +08:00
duhui 1e7cc6dea2 御剑飞行 2021-10-14 11:12:23 +08:00
xuexinpeng 433e651a6c Merge branch 'master_test_gn' into master_test_gn_xxp
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
2021-10-13 19:58:49 +08:00
xuexinpeng c6d45cbecf yx10.13测试bug 2021-10-13 19:52:46 +08:00
jiahuiwen aa21c96a4f 点金数量精度计算bug 2021-10-13 15:38:03 +08:00
yuanshuai e8426e7de2 点金bug修改 2021-10-13 14:38:53 +08:00
xuexinpeng 4a2e7bdf22 yx-聊天gm 2021-10-13 13:37:20 +08:00
jiahuiwen c3c1193e58 Exception in thread "main" java.lang.ClassCastException: java.lang.String cannot be cast to java.lang.Double 2021-10-12 15:01:17 +08:00
xuexinpeng 4f615fb11d yx 1.战斗记录排序 2.没队伍输赢判断3.换一批不能匹配到自己 2021-10-12 14:58:06 +08:00
jiahuiwen eb0d4f892b 网页支付 类型转换错误 2021-10-12 14:09:21 +08:00
yuanshuai 107f7eb458 充值金额礼包推送功能优化 2021-10-12 10:38:45 +08:00
yuanshuai 00a7cb0351 vip初始化好感度特权bug修改 2021-10-11 17:01:36 +08:00
yuanshuai 90eec47c30 礼包推送相关修改 2021-10-11 16:51:37 +08:00
xuexinpeng 37ff5b7ca7 寻宝迷踪新一期不刷新 2021-10-11 15:52:19 +08:00
xuexinpeng 86c3f5d1e9 yx赛季重置 2021-10-11 15:31:03 +08:00
yuanshuai d0a68e81c5 神魂相关脚本提交 2021-10-11 14:21:23 +08:00
yuanshuai 7e9469ee38 四象心法飘字提示修改 2021-10-11 11:08:30 +08:00
xuexinpeng fef22e4ae3 yx1.匹配规则的修改
2.战斗回放战力显示
    3.玩家初始化积分
2021-10-09 20:24:50 +08:00
jiahuiwen 86dae30e4f 点金 减少精度 2021-10-09 15:34:21 +08:00
xuexinpeng fd70ebb1c3 yx领奖 2021-10-09 11:57:14 +08:00
xuexinpeng 40ec544c1a yx领奖bug 2021-10-09 11:24:11 +08:00
jiahuiwen ccc07db16b 点金特权加成 2021-10-09 11:18:50 +08:00
jiahuiwen f9115627b9 Merge branch 'master_test_gn_zf' into master_test_gn 2021-10-09 11:06:31 +08:00
jiahuiwen 3df6b64f82 删错误宝器bug 2021-10-09 11:06:03 +08:00
xuexinpeng a03ee2095c 玉虚论道10.8 2021-10-09 10:57:12 +08:00
jiahuiwen 24da18a4e4 点金增加特权加成 2021-10-08 14:54:20 +08:00
jiahuiwen bb6ef14fcf 点石成金基础收益随着玩家等级提升,玩家等级提升时 发放道具进背包 2021-10-08 11:11:24 +08:00
jiahuiwen 7303e9d92d Merge branch 'master_test_gn_zf' into master_test_gn 2021-09-30 17:34:53 +08:00
jiahuiwen 4133f80879 网页支付bug 2021-09-30 17:34:16 +08:00
jiahuiwen 11ba70d8bc Merge branch 'master_prb_gn' into master_test_gn 2021-09-30 14:28:55 +08:00
jiahuiwen 93eb07e78d 云游商人bug 2021-09-30 14:28:31 +08:00
jiahuiwen 6386448536 Merge branch 'master_test_gn_zf' into master_test_gn 2021-09-29 18:10:18 +08:00
jiahuiwen 54b53fda54 战斗力时事计算 2021-09-29 18:09:37 +08:00
xuexinpeng 7204d7187c 玉虚论道排行榜删除机器人 rpc调用修改 2021-09-29 17:27:41 +08:00
yuanshuai 235a3d3a8c Merge branch 'master_test_gn_likable' into master_test_gn 2021-09-29 15:45:09 +08:00
jiahuiwen 4376b5ece7 删除key* 2021-09-29 15:23:15 +08:00
jiahuiwen 80c0a72ac9 删除 keys* 2021-09-29 14:54:59 +08:00
xuexinpeng 8437b6f9ea 海洋改掉落 2021-09-29 14:34:00 +08:00
xuexinpeng 4a1f019c1a 玉虚论道 2021-09-28 19:15:13 +08:00
yuanshuai 9c1f77abfb bug修改 2021-09-28 17:37:54 +08:00
duhui f846e981d1 奇门遁甲,代码格式优化 2021-09-28 16:51:40 +08:00
xuexinpeng d20ba835bf Merge branch 'master_test_gn' into master_test_gn_xxp
# Conflicts:
#	fightmanager/src/main/java/com/ljsd/fight/FightType.java
#	serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java
#	serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/fight/GameFightType.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java
#	serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java
#	tablemanager/src/main/java/config/SArenaRobotConfig.java
#	tablemanager/src/main/java/config/SMServerArenaSetting.java
#	tablemanager/src/main/java/config/SMServerRankConfig.java
#	tablemanager/src/main/java/config/SMServerRankReward.java
2021-09-28 16:47:44 +08:00
duhui b06a1b3124 玲珑宝阁奖励提交 2021-09-28 14:59:56 +08:00
yuanshuai be9fa17c70 【好感度】bug修改 2021-09-28 12:05:32 +08:00
jiahuiwen 8903413162 修复玩家魂宝灵宝 2021-09-27 20:40:15 +08:00
duhui dc98d0fc75 车迟斗法战斗bug修改 2021-09-27 18:01:53 +08:00
duhui 93a0b5bf50 战斗修改 2021-09-27 17:53:04 +08:00
jiahuiwen 55d71eaa4d Merge branch 'master_prb_gn' of http://60.1.1.230/backend/jieling_server into master_prb_gn 2021-09-27 17:23:14 +08:00
jiahuiwen 906baf0968 车迟斗法结算bug 2021-09-27 17:23:04 +08:00
duhui 093ddaa0e9 优化一下 2021-09-27 16:40:39 +08:00
duhui be4c659ffa 七界,排名 2021-09-27 16:24:44 +08:00
duhui e157abb248 七界试炼,排名奖励 2021-09-27 15:59:13 +08:00
duhui 2e7417278c 七界试炼,排行发奖bug 2021-09-27 15:32:01 +08:00
duhui 385db300e4 每日累充,网页支付特殊处理 2021-09-27 15:29:18 +08:00
duhui 9c8bb8b283 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-09-27 14:34:44 +08:00
duhui 34249d3d3f 日志 2021-09-27 14:34:29 +08:00
duhui a7b964ffcc 排行榜问题,和发奖时间日志 2021-10-10 23:34:35 +08:00
jiahuiwen 3952359f2b Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-09-27 12:01:44 +08:00
jiahuiwen 4c68000711 魂宝灵宝 id赋值错误 2021-09-27 12:01:39 +08:00
duhui 36e07bc438 七界,跨服数据更新 2021-09-27 10:12:52 +08:00
duhui 544eb87500 七界,跨发排行榜,玩家取出不方缓存 2021-09-27 10:03:19 +08:00
yuanshuai 4ba1470fb5 添加每日赠送次数限制 2021-09-27 09:45:44 +08:00
xuexinpeng dc74736fdb 玉虚论道排行榜 2021-09-27 03:15:14 +08:00
xuexinpeng 53de5be768 玉虚论道 2021-09-27 00:08:39 +08:00
xuexinpeng 0f06046daf 玉虚论道 2021-09-27 00:09:16 +08:00
yuanshuai 3eab389f36 好感度兼容老数据脚本 2021-09-26 20:05:12 +08:00
yuanshuai 6724ea31cf 好感度功能完善 2021-09-26 19:51:17 +08:00
yuanshuai 970b3911f8 好感度脚本提交 2021-09-26 19:43:02 +08:00
jiahuiwen 177b95c6fe Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-09-26 18:34:53 +08:00
jiahuiwen 971447a392 白金装备技能加入战斗数据 2021-09-26 18:34:46 +08:00
xuexinpeng 38c2782933 玉虚论道rpc数据 2021-09-26 18:01:09 +08:00
xuexinpeng 5e34ac46f5 玉虚论道 2021-09-26 16:09:06 +08:00
xuexinpeng 30fe0d8ca6 【跨服优化】跨服排行榜和跨服聊天改为在开服7天内不开放 2021-09-26 11:42:33 +08:00
jiahuiwen 447ac9d61b Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-09-26 11:27:44 +08:00
duhui a52efb87e1 跨服,返回第几周 2021-10-02 18:44:00 +08:00
jiahuiwen 653f969ac3 战斗返回解析错误 2021-09-26 11:27:17 +08:00
xuexinpeng b05a894355 玉虚论道代码优化 2021-09-25 18:26:31 +08:00
xuexinpeng dec1f13d85 玉虚论道战斗rpc调用数据 2021-09-25 18:09:00 +08:00
duhui 027fc3eec2 七界秘宝积分问题 2021-09-24 17:02:51 +08:00
jiahuiwen 47eacce939 合并代码 2021-09-24 16:42:02 +08:00
duhui 14f6e735bc 编队修改 2021-09-24 16:36:36 +08:00
jiahuiwen 492d5d96fe 合并代码 2021-09-24 16:30:38 +08:00
jiahuiwen 7e46c61114 合并代码 2021-09-24 15:42:34 +08:00
jiahuiwen 5a4a0b1534 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-09-24 15:04:21 +08:00
jiahuiwen c286ae0f36 云游商人修改 2021-09-24 15:04:08 +08:00
yuanshuai 4f8249150d 好感度功能修改 2021-09-24 14:36:37 +08:00
yuanshuai c900a018ec 好感度脚本提交 2021-09-24 14:10:02 +08:00
duhui f69e502d39 七界遗物buf修改 2021-09-24 11:51:17 +08:00
duhui a10e1988ec 七界战斗问题 2021-09-24 10:24:40 +08:00
duhui 5d341b4a1c 七界战斗 2021-09-23 18:28:35 +08:00
yuanshuai 8dc19f2d98 好感度代码提交 2021-09-23 17:22:40 +08:00
xuexinpeng 8ec8e3a0df 跨服rpc 玉虚论道 2021-09-23 15:56:07 +08:00
jiahuiwen 8ba37641ba GetPlayerInfoResponse 增加服务器开服时间 2021-09-23 15:47:19 +08:00
jiahuiwen 4a8ecca725 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-09-23 15:45:33 +08:00
duhui 78ac3e8df1 七界,领取奖励 2021-09-23 14:48:42 +08:00
jiahuiwen 7dfb9563c0 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
2021-09-23 14:37:30 +08:00
jiahuiwen 0b674943e7 删除无用代码 2021-09-23 14:33:37 +08:00
duhui eb3c5d359b 玲珑宝阁,十连抽 2021-09-23 14:25:24 +08:00
duhui d627ad64e6 七界秘宝和跨服排行榜 2021-09-23 14:00:50 +08:00
duhui 9c8f867c91 七界秘宝修改 2021-09-23 12:02:58 +08:00
duhui 8692f5829f 玲珑宝阁新优化,活动优化 2021-09-23 11:18:52 +08:00
duhui e6221cfd40 七界试炼,回合数 2021-09-23 10:44:21 +08:00
yuanshuai 0f5ef029d1 【四象心法】bug修改 2021-09-22 20:31:11 +08:00
duhui ef3c6e81c7 网页支付 2021-09-22 18:34:44 +08:00
duhui 1b4426b9e4 玲珑宝镜功能修改 2021-09-22 18:34:29 +08:00
xuexinpeng 2cb6b7998b 人物基本信息redis存储 2021-09-22 17:21:57 +08:00
yuanshuai db8504e51f Merge branch 'master_test_gn_ys' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/AbstractWelfareBag.java
2021-09-22 15:23:50 +08:00
duhui 3673e1b713 Merge branch 'master_prb_gn' into master_test_gn 2021-09-22 14:59:53 +08:00
duhui 6577d05bdf 礼包报错兼容 2021-09-22 14:19:48 +08:00
xuexinpeng f479efce7c GetPlayerOneTeamInfo 还原 2021-09-22 14:08:19 +08:00
duhui dfbf4285a0 Merge branch 'dh_dev_qijie' into master_test_gn 2021-09-22 13:57:54 +08:00
jiahuiwen f5c52e7bd7 Merge branch 'master_prb_gn' into master_test_gn 2021-09-22 10:58:22 +08:00
jiahuiwen fa89891f2f 新战斗力计算 2021-09-22 10:57:38 +08:00
duhui b4f8483c4c 日志 2021-09-18 17:45:49 +08:00
duhui 921482467c 七界,显示回合 2021-09-18 17:33:09 +08:00
duhui a29bc9b60a 七界推送 2021-09-18 15:48:06 +08:00
duhui d3d6924a57 不影响逻辑,美观 2021-09-18 15:19:14 +08:00
duhui 5cbba695bf 七界合并3--bug修改 2021-09-24 00:42:13 +08:00
jiahuiwen 00037467d2 公会援助失败也算援助次数 2021-09-18 11:59:06 +08:00
xuexinpeng 3434799eda 跨服rpc 2021-09-17 19:13:53 +08:00
jiahuiwen a5e82c01a0 Merge branch 'master_test_gn' into master_prb_gn 2021-09-17 16:47:07 +08:00
jiahuiwen 8427f08a4a 还原战力计算公式 2021-09-17 16:20:13 +08:00
duhui 613a724623 助战兼容,报错修改 2021-09-17 14:28:39 +08:00
duhui ff3f04af63 合并代码2 2021-09-17 14:21:01 +08:00
duhui 2050067fb1 战斗修改补充
(cherry picked from commit 901ab76a3aad4862318a8c76378ea138d21a9095)
2021-09-17 14:20:07 +08:00
duhui def246c407 合并代码1 2021-09-17 14:19:54 +08:00
duhui 18f91727e4 第一版
(cherry picked from commit 12c3d5d1ba0766fc17b69959690a656dabf14fc6)
2021-09-17 14:13:29 +08:00
duhui 01457210b5 本地gm,四灵跳关 2021-09-17 14:09:25 +08:00
jiahuiwen 484298240c Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-09-17 11:40:01 +08:00
jiahuiwen e125b19b99 战斗力公式修改 2021-09-17 11:39:48 +08:00
xuexinpeng 5988014300 玉虚论道 2021-09-16 20:43:13 +08:00
duhui dfc615ae0a 鸿蒙阵英雄魂印问题处理 2021-09-16 16:41:57 +08:00
duhui 9e964a10f1 日志调整 2021-09-16 11:27:57 +08:00
duhui 42cbcab535 鸿蒙阵推送bug处理 2021-09-15 15:52:32 +08:00
xuexinpeng d4b117d4c3 寻宝迷踪打开 2021-09-15 15:15:07 +08:00
duhui 31ce7a2522 鸿蒙阵请求返回 2021-09-21 01:45:46 +08:00
duhui a362ba1838 Merge branch 'master_prb_gn' into master_test_gn 2021-09-27 11:18:31 +08:00
duhui 68239e5634 时间修改 2021-09-27 11:13:53 +08:00
duhui 0219a8ae12 Merge branch 'master_test_gn_zf' into master_prb_gn 2021-09-27 11:12:53 +08:00
duhui 7f1180c2b2 轩辕宝镜礼包推送 2021-09-27 11:12:30 +08:00
duhui 4679fb5af2 十绝伤害超上限 2021-09-27 11:09:52 +08:00
DESKTOP-98AVA47\Administrator c39cb8eac6 十绝阵刷新 2021-09-22 11:09:06 +08:00
DESKTOP-98AVA47\Administrator 95223a0c98 测试回滚 2021-09-22 10:18:53 +08:00
duhui b70260fc88 Merge branch 'master_prb_gn' of http://60.1.1.230/backend/jieling_server into master_prb_gn 2021-09-14 20:06:52 +08:00
duhui 1c3fdf907c 数数修改 2021-09-14 20:06:34 +08:00
xuexinpeng 96df236aa1 玉虚论道 2021-09-14 19:27:08 +08:00
jiahuiwen 713dda777f 礼包推送 增加判断 2021-09-14 15:49:29 +08:00
jiahuiwen b6f4eb1b24 轩辕宝镜礼包增加 推送扫荡推送 2021-09-14 14:53:24 +08:00
yuanshuai 5bfabb7e7f 【四象心法】跑马灯问题修改 2021-09-14 14:32:17 +08:00
yuanshuai e3a628d5ad Merge branch 'master_test_gn' into master_test_gn_ys
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/SituationLogic.java
2021-09-14 13:57:03 +08:00
yuanshuai 0d7c337ced 【四象心法】添加技能属性加成 2021-09-14 11:36:38 +08:00
yuanshuai d172e4d48f 跑马灯修改 2021-09-14 09:48:53 +08:00
duhui eeac777798 版本号读表 2021-09-13 17:52:00 +08:00
yuanshuai 10cb106a8d 四象心法bug 修改 2021-09-13 17:18:53 +08:00
duhui 081266e83d 十绝阵定时清理 2021-09-13 13:58:12 +08:00
duhui 045e1ce82f 跨服十绝阵 2021-09-13 11:37:48 +08:00
xuexinpeng 3b5fbb92dd 玉虚论道bug修改 2021-09-12 23:53:51 +08:00
yuanshuai 3a29dc0ce3 【四象心法】bug修改 2021-09-11 18:06:34 +08:00
xuexinpeng 65045c93d9 玉虚论道二版 2021-09-10 22:50:10 +08:00
xuexinpeng d6ffd5e348 玉虚论道第一版 2021-09-11 21:14:25 +08:00
duhui 2fd6b82d04 十绝阵兼容 2021-09-10 19:51:44 +08:00
duhui 686f22d60d 竞技场刷新 2021-09-10 19:12:34 +08:00
duhui 8a05dbe235 Merge branch 'dh_dev_rediskey' of http://60.1.1.230/backend/jieling_server into dh_dev_rediskey 2021-09-10 18:29:04 +08:00
duhui 59b4e12b17 公会援助刷新回滚 2021-09-10 18:28:52 +08:00
duhui aa040195e0 竞技场每日发奖 2021-09-14 00:35:05 +08:00