Commit Graph

5905 Commits (358c920cd6599cf1aa357b7ed3abb573c5c2b67d)
 

Author SHA1 Message Date
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
jiahuiwen 5d4ef3ac50 BlessingConfigNew 表 basicPoolId 改 String 2021-09-18 10:43:52 +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