xuexinpeng
|
b66139651f
|
注释6962 6963礼包
|
2021-10-27 19:01:09 +08:00 |
xuexinpeng
|
7d96a9e494
|
6962 6963礼包废弃
|
2021-10-27 18:30:51 +08:00 |
yuanshuai
|
947bfcf9e2
|
新版三界降魔活动提交
|
2021-10-27 17:41:58 +08:00 |
xuexinpeng
|
bd08edc34e
|
7201活动弃用
|
2021-10-27 17:35:11 +08:00 |
xuexinpeng
|
56bd49949d
|
7201活动弃用
|
2021-10-27 17:27:59 +08:00 |
jiahuiwen
|
5870b939c5
|
test
|
2021-10-27 16:56:37 +08:00 |
xuexinpeng
|
33ea08343d
|
Merge branch 'master_test_gn_zf' of http://60.1.1.230/backend/jieling_server into master_test_gn_zf
|
2021-10-27 16:54:06 +08:00 |
xuexinpeng
|
62a1d3e61c
|
一键领取
|
2021-10-27 16:52:08 +08:00 |
duhui
|
c974df9d8e
|
超级月卡
|
2021-10-27 16:51:44 +08:00 |
yuanshuai
|
434b929b87
|
神魂功能开启修改
|
2021-10-27 16:32:09 +08:00 |
duhui
|
080e3337b7
|
天眼公会
|
2021-10-27 15:54:53 +08:00 |
duhui
|
3179849ffb
|
超级月卡
|
2021-10-27 13:49:08 +08:00 |
yuanshuai
|
e16f2947ca
|
添加神魂等级信息
|
2021-10-27 13:39:12 +08:00 |
xuexinpeng
|
ec3ea76864
|
一键领取代码回滚
|
2021-10-27 07:44:08 +08:00 |
xuexinpeng
|
e6ea0e5451
|
原帅跨服
|
2021-11-06 01:17:31 +08:00 |
yuanshuai
|
004ce5a027
|
主角技能添加用户等级
|
2021-10-26 17:57:10 +08:00 |
yuanshuai
|
379e85704d
|
跨服相关主角技能性别字段修改
|
2021-10-26 17:18:19 +08:00 |
yuanshuai
|
c366955468
|
主角技能添加性别字段
|
2021-10-26 17:06:13 +08:00 |
yuanshuai
|
30a3220741
|
添加神将神魂相关字段
|
2021-10-26 16:26:35 +08:00 |
yuanshuai
|
7a445058d0
|
Merge branch 'master_test_gn' into master_test_gn_godsoul
|
2021-10-26 15:14:15 +08:00 |
yuanshuai
|
1ed3adec43
|
车迟斗法抢夺战斗类型修改
|
2021-10-26 15:11:58 +08:00 |
jiahuiwen
|
872dee96f7
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-10-26 15:00:55 +08:00 |
jiahuiwen
|
d8f053335e
|
获取最大战力兼容机器人
|
2021-10-26 15:00:47 +08:00 |
xuexinpeng
|
155dfbd651
|
飘渺之旅新增绝对日期前后开服两种活动
|
2021-10-26 11:11:53 +08:00 |
yuanshuai
|
ee66dc9c25
|
跨服切磋主角技能bug修改
|
2021-10-26 10:29:50 +08:00 |
xuexinpeng
|
ae732cb0fa
|
跨服参数判空
|
2021-10-26 10:23:17 +08:00 |
yuanshuai
|
08d19e5edd
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-10-25 17:26:39 +08:00 |
yuanshuai
|
6fc96e7f71
|
添加战斗力字段
|
2021-10-25 17:26:26 +08:00 |
xuexinpeng
|
4a1108ae00
|
yx挑战列表战力为0
|
2021-10-25 17:15:40 +08:00 |
yuanshuai
|
5a11a55629
|
大闹天宫和七剑试炼开战协议添加战斗力数据字段
|
2021-10-25 15:32:45 +08:00 |
yuanshuai
|
ccf037d878
|
神魂系统功能修改
|
2021-10-25 15:10:16 +08:00 |
jiahuiwen
|
d478225c1d
|
减少聊天记录缓存数量
|
2021-10-25 13:48:24 +08:00 |
jiahuiwen
|
01771b2fde
|
注释内存中的战斗缓存
|
2021-10-25 13:17:32 +08:00 |
xuexinpeng
|
fe14a4230f
|
yx修改 一键领取注掉
|
2021-10-22 17:46:20 +08:00 |
yuanshuai
|
5bee28c52f
|
后端不做活动兼容了
|
2021-10-22 17:25:12 +08:00 |
yuanshuai
|
ea6545ec83
|
注释至尊降世活动数据兼容(前端做特殊处理了)
|
2021-10-22 17:21:12 +08:00 |
yuanshuai
|
8638f546bd
|
至尊降世活动任务兼容脚本提交
|
2021-10-22 17:09:16 +08:00 |
yuanshuai
|
048adc9c64
|
神魂相关脚本提交
|
2021-10-22 16:56:32 +08:00 |
duhui
|
6066375355
|
御剑行,活动切换修改
|
2021-10-22 16:24:03 +08:00 |
jiahuiwen
|
c183c40c81
|
敏感字服兼容
|
2021-10-22 16:22:55 +08:00 |
jiahuiwen
|
8bdd217c8a
|
Merge branch 'master_test_gn' into master_test_mingan
|
2021-10-22 16:08:16 +08:00 |
jiahuiwen
|
ea50ee77d1
|
Merge branch 'master_test_gn' into master_test_mingan
|
2021-10-22 15:40:02 +08:00 |
duhui
|
dc90208c0d
|
惊喜礼盒类型的活动,添加礼包购买次数校验
|
2021-10-22 15:36:27 +08:00 |
duhui
|
a976c38c49
|
活动初始化清楚老的个人记录
|
2021-10-22 15:03:35 +08:00 |
yuanshuai
|
d35f538ad2
|
Merge branch 'master_test_gn' into master_test_gn_godsoul
|
2021-10-22 14:59:57 +08:00 |
jiahuiwen
|
967d5dc035
|
修仙属性flot 改int
|
2021-10-22 14:56:16 +08:00 |
duhui
|
45c95ced6d
|
竞猜记录
|
2021-10-22 14:49:35 +08:00 |
duhui
|
8c9a4a73d0
|
结算阶段问题修改
|
2021-10-22 14:37:36 +08:00 |
yuanshuai
|
9d0ff2e1da
|
山河社稷图副本添加修行技能相关最高战斗力字段数据
|
2021-10-22 14:36:52 +08:00 |
yuanshuai
|
d2b1ce8966
|
神魂代码修改
|
2021-10-22 14:05:36 +08:00 |
yuanshuai
|
111f57d96b
|
Merge branch 'master_test_gn' into master_test_gn_godsoul
|
2021-10-22 13:50:51 +08:00 |
yuanshuai
|
266fd9526b
|
修行技能升级限制修改
|
2021-10-22 13:38:56 +08:00 |
yuanshuai
|
24d471a7ed
|
神魂相关逻辑修改提交
|
2021-10-22 13:20:17 +08:00 |
duhui
|
df41a517f9
|
心愿抽卡,老玩家兼容
|
2021-10-22 12:01:21 +08:00 |
duhui
|
fea786d9c7
|
上次排行问题
|
2021-10-22 10:53:36 +08:00 |
jiahuiwen
|
72b4a36e9e
|
Merge branch 'master_test_gn' into master_test_mingan
|
2021-10-22 10:07:48 +08:00 |
duhui
|
6829317447
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-10-22 10:07:40 +08:00 |
duhui
|
e947d1044c
|
非空验证
|
2021-10-22 10:07:28 +08:00 |
jiahuiwen
|
47cb3cb3bc
|
山河社稷图 每日奖励 隔天不刷新
|
2021-10-22 10:07:25 +08:00 |
duhui
|
fd55683fc9
|
御剑行,获取跨发玩家数据方法修改
|
2021-10-22 10:01:20 +08:00 |
xuexinpeng
|
b0192aa8ab
|
yx删除机器人服务器编号
|
2021-10-21 18:43:49 +08:00 |
xuexinpeng
|
1a5106db60
|
yx积分修改
|
2021-10-21 18:35:57 +08:00 |
yuanshuai
|
afa7a8932a
|
神将神魂绑定逻辑修改提交
|
2021-10-21 18:31:41 +08:00 |
xuexinpeng
|
8fc2ed63ce
|
1.yx积分变化
2.任务一键领取
|
2021-10-21 18:26:01 +08:00 |
xuexinpeng
|
cf58cda027
|
1.在当前的降分公式的基础上×70%,对方获得的分数不变,挑战和被挑战时均做如此处理
2.一键领取
|
2021-10-21 18:00:54 +08:00 |
duhui
|
091cf93f40
|
新百宝商会活动
|
2021-10-21 17:36:21 +08:00 |
jiahuiwen
|
1249c87f69
|
添加日志
|
2021-10-21 16:27:47 +08:00 |
yuanshuai
|
a389d200f5
|
Merge branch 'master_test_gn' into master_test_gn_godsoul
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java
|
2021-10-21 16:27:40 +08:00 |
jiahuiwen
|
71285d2eb7
|
兼容策划删RechargeCommodityConfig表
|
2021-10-21 16:12:31 +08:00 |
jiahuiwen
|
ce1db905a9
|
通过rpc调用 敏感字检测
|
2021-10-21 16:10:40 +08:00 |
yuanshuai
|
03baa1f90c
|
修行技能代码修改
|
2021-10-21 15:37:01 +08:00 |
yuanshuai
|
93974b5c1b
|
跨服相关添加数据结构
|
2021-10-21 15:19:32 +08:00 |
yuanshuai
|
642afe6d52
|
修行技能战斗相关修改
|
2021-10-21 15:18:09 +08:00 |
yuanshuai
|
cd8777c449
|
修行技能相关脚本修改提交
|
2021-10-21 14:34:21 +08:00 |
yuanshuai
|
5469ead809
|
跨服数据添加历史最高战力字段
|
2021-10-21 14:19:19 +08:00 |
xuexinpeng
|
ffc6d76a84
|
跨服修行技能数据
|
2021-10-21 11:15:35 +08:00 |
xuexinpeng
|
fef9428f5d
|
跨服数据新加修行技能数据
|
2021-10-21 11:07:36 +08:00 |
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
|
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
|
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 |