Commit Graph

5823 Commits (b60d589ee93efbc29d8f762fd4df91a517f35399)
 

Author SHA1 Message Date
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
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 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
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
jiahuiwen 1c901e2e77 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-09-24 16:42:11 +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
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