Commit Graph

6007 Commits (1ed3adec43f962b99331ca4df4f7cbcf2135aa23)
 

Author SHA1 Message Date
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
jiahuiwen 8ef0fffa43 Merge branch 'master_prb_gn' into master_test_gn 2021-09-27 16:00:39 +08:00
jiahuiwen b491e01c9e 战斗参数返回 2021-09-27 16:00:21 +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
jiahuiwen bb904c6d9f Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-09-27 15:12:09 +08:00
jiahuiwen 25040b3815 战斗返回修改 2021-09-27 15:10:13 +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
jiahuiwen 77e0ed5e38 注释 SArenaRobotConfig 类中 玉虚论道 相关代码 2021-09-26 22:22:49 +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 8bc3f13117 白金装备技能 2021-09-26 18:50:43 +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 b81acfa9dc Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-09-24 17:03:02 +08:00
duhui 027fc3eec2 七界秘宝积分问题 2021-09-24 17:02:51 +08:00