xuexinpeng
|
4c92ff6135
|
战力冲刺
|
2022-02-25 14:56:07 +08:00 |
xuexinpeng
|
4982b2c70d
|
战力冲刺邮件奖励
|
2022-02-25 14:34:58 +08:00 |
xuexinpeng
|
84d5015304
|
战力冲刺排行榜修改
|
2022-02-25 13:37:49 +08:00 |
xuexinpeng
|
4ce354caa5
|
战力冲刺排行榜调整
|
2022-02-25 11:52:23 +08:00 |
jiahuiwen
|
163a14fe36
|
修仙增加日志
|
2022-02-24 13:56:43 +08:00 |
duhui
|
e6ba9c0ac4
|
至尊降世活动提高1000档
|
2022-02-23 18:06:38 +08:00 |
duhui
|
9836cab7a7
|
补充2:跨服分组兼容,当分组id<=0时,表示不用跨服
|
2022-02-21 17:37:00 +08:00 |
duhui
|
803280eaf0
|
补充:跨服分组兼容,当分组id<=0时,表示不用跨服
|
2022-02-21 17:17:35 +08:00 |
duhui
|
dc0eacd113
|
跨服分组兼容,当分组id<=0时,表示不用跨服
|
2022-02-21 17:12:37 +08:00 |
xuexinpeng
|
900412365d
|
战力冲刺
|
2022-02-22 21:02:47 +08:00 |
duhui
|
1368922c6d
|
跨服分组改为gm上手动分组,去除自动分组
|
2022-02-21 00:11:00 +08:00 |
jiahuiwen
|
51b0872905
|
Merge branch 'master_prb_gn' into master_test_gn
|
2022-02-20 10:05:13 +08:00 |
jiahuiwen
|
7df22af548
|
规范日志
|
2022-02-20 10:04:18 +08:00 |
jiahuiwen
|
af4b08c3d2
|
重复购买礼包算成功
|
2022-02-20 09:37:51 +08:00 |
xuexinpeng
|
54f6e06a74
|
活动:战力冲刺
|
2022-02-18 22:57:40 +08:00 |
jiahuiwen
|
6b88e120cd
|
_oaid _imei赋值 deviceid
|
2022-02-18 16:46:27 +08:00 |
jiahuiwen
|
8f7ca009a9
|
上报增加 _androidid
|
2022-02-18 16:34:46 +08:00 |
jiahuiwen
|
df28c22959
|
上报增加默认值
|
2022-02-18 13:35:01 +08:00 |
jiahuiwen
|
980477b790
|
上报修改
|
2022-02-17 20:46:33 +08:00 |
jiahuiwen
|
f2e2835076
|
增加报送的头信息
|
2022-02-17 19:26:02 +08:00 |
jiahuiwen
|
283439f860
|
改post
|
2022-02-17 19:18:34 +08:00 |
jiahuiwen
|
a906ad4712
|
增加字段
|
2022-02-17 18:53:30 +08:00 |
jiahuiwen
|
fb94ec7526
|
金额改字符串
|
2022-02-17 18:48:36 +08:00 |
jiahuiwen
|
e9238bd713
|
openId赋值错误
|
2022-02-17 18:40:42 +08:00 |
jiahuiwen
|
f579fbf20c
|
开天上报打印参数
|
2022-02-17 18:17:55 +08:00 |
jiahuiwen
|
831722996d
|
开天上报 价格 改为 元
|
2022-02-17 18:05:36 +08:00 |
jiahuiwen
|
5ec60747ef
|
开天增加充值上报
|
2022-02-17 17:34:09 +08:00 |
yuanshuai
|
4af6f92c99
|
超值返利兼容老数据bug修改
|
2022-02-21 16:27:25 +08:00 |
yuanshuai
|
0d5a19339b
|
超值返利兼容老数据bug修改
|
2022-02-17 16:28:27 +08:00 |
duhui
|
1210a30798
|
【补充】升星操作增加鸿蒙阵等级限制
|
2022-02-17 14:43:08 +08:00 |
duhui
|
0b1295cb61
|
【优化】升星操作增加鸿蒙阵等级限制
|
2022-02-17 14:14:19 +08:00 |
jiahuiwen
|
91be761235
|
删除多余代码
|
2022-02-15 17:54:42 +08:00 |
jiahuiwen
|
e1a5cd8db8
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-02-15 11:34:35 +08:00 |
jiahuiwen
|
802a85021e
|
神将可控制进入版本时间优化
|
2022-02-15 11:34:25 +08:00 |
duhui
|
b0a1347ddf
|
特权刷新日志添加
|
2022-02-15 10:33:03 +08:00 |
jiahuiwen
|
b4f4c43a0e
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-02-14 17:11:01 +08:00 |
jiahuiwen
|
cc1f777372
|
神将可控制进入版本时间
|
2022-02-14 17:10:51 +08:00 |
yuanshuai
|
45d0438456
|
每日豪礼活动重新开启
|
2022-02-11 16:59:12 +08:00 |
jiahuiwen
|
9b7c9af1cc
|
大圣升星活动添加判断
|
2022-02-11 15:25:48 +08:00 |
yuanshuai
|
e2fc3f54cd
|
超值返利活动修改提交
|
2022-02-26 00:05:29 +08:00 |
xuexinpeng
|
92b7b7ee82
|
每日特惠
|
2022-02-11 11:25:49 +08:00 |
xuexinpeng
|
1ccd802b2d
|
Merge branch 'master_prb_gn' into master_test_gn
|
2022-02-10 16:46:56 +08:00 |
xuexinpeng
|
647882cd4e
|
注释掉每日特惠中60元七天特惠活动
|
2022-02-10 16:19:55 +08:00 |
yuanshuai
|
cafea7ce46
|
大闹天宫开战报错bug修改
|
2022-02-10 15:05:13 +08:00 |
yuanshuai
|
3544b10c47
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-02-10 15:04:05 +08:00 |
yuanshuai
|
4443ac1bf2
|
大闹天宫开战报错bug修改
|
2022-02-10 15:03:52 +08:00 |
jiahuiwen
|
63cf33f5d4
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-02-10 11:28:36 +08:00 |
jiahuiwen
|
6053cf9db9
|
神将可控制进入版本时间
|
2022-02-10 11:28:33 +08:00 |
duhui
|
b3b7ce5ed7
|
日志级别调整
|
2022-02-08 18:26:13 +08:00 |
jiahuiwen
|
acb0dcb9d3
|
探索优化
|
2022-01-26 15:06:16 +08:00 |
xuexinpeng
|
36e8abdb61
|
探索相关报错
|
2022-01-26 13:44:38 +08:00 |
xuexinpeng
|
6f9a1ee82c
|
log相关
|
2022-01-25 13:43:02 +08:00 |
DESKTOP-98AVA47\Administrator
|
0c84030817
|
超值基金bug修改
|
2022-01-18 01:10:52 +08:00 |
duhui
|
b94adebdc7
|
超值基金活动修改,线上兼容2
|
2022-01-24 18:03:13 +08:00 |
duhui
|
a29f8a08c2
|
超值基金活动修改,线上兼容
|
2022-01-24 17:31:49 +08:00 |
duhui
|
121bd7924f
|
超值基金活动修改
|
2022-01-24 17:10:11 +08:00 |
jiahuiwen
|
a7c5616dbf
|
Merge branch 'master_prb_gn' into master_test_gn
|
2022-01-24 10:58:53 +08:00 |
duhui
|
73687ceeaa
|
新增主角时装类型
(cherry picked from commit e2c331f840 )
|
2022-01-22 14:27:54 +08:00 |
xuexinpeng
|
fe971df10d
|
探索公会重置
|
2022-01-22 11:31:16 +08:00 |
xuexinpeng
|
09efdc1b7a
|
探索退出公会重置个人数
|
2022-02-10 01:00:05 +08:00 |
xuexinpeng
|
02f41921ab
|
探索达人
|
2022-02-04 16:38:47 +08:00 |
xuexinpeng
|
9310dcfc4f
|
探索达人
|
2022-02-10 00:04:06 +08:00 |
xuexinpeng
|
85969b7acf
|
探索bug
|
2022-01-21 17:19:47 +08:00 |
yuanshuai
|
1f3fce5ece
|
战斗力不一致bug修复(总好感度属性加成导致的)
|
2022-01-20 15:17:00 +08:00 |
duhui
|
12600a3bed
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2022-01-19 17:05:44 +08:00 |
duhui
|
df9f1501c2
|
家园特权,重复购买问题解决
|
2022-01-19 17:04:52 +08:00 |
yuanshuai
|
19ab726801
|
Merge branch 'master_test_gn' into master_test_gn_feisheng
|
2022-01-19 16:31:10 +08:00 |
yuanshuai
|
925b06352f
|
Merge branch 'master_test_gn' into master_test_gn_feisheng
# Conflicts:
# tablemanager/src/main/java/config/SSpecialConfig.java
|
2022-01-22 11:14:33 +08:00 |
jiahuiwen
|
64fc286053
|
Merge branch 'master_prb_gn' into master_test_gn
|
2022-01-18 16:32:14 +08:00 |
yuanshuai
|
89152453e6
|
节日登录活动提交
|
2022-02-13 23:59:56 +08:00 |
jiahuiwen
|
2203e54375
|
优化代码
|
2022-01-18 16:31:48 +08:00 |
duhui
|
3e3e5ee1bf
|
牛气冲天任务优化
|
2022-01-18 10:06:09 +08:00 |
jiahuiwen
|
351909d5f3
|
鸿蒙阵推送
|
2022-01-18 09:56:28 +08:00 |
jiahuiwen
|
ff3c81bfbe
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-01-17 18:59:05 +08:00 |
jiahuiwen
|
fc6bf6f613
|
家园任务bug
|
2022-01-17 18:58:56 +08:00 |
xuexinpeng
|
4bbf743013
|
断线重连探索
|
2022-01-17 18:34:22 +08:00 |
xuexinpeng
|
6bd1bb83ee
|
规范部分log
|
2022-01-17 11:16:47 +08:00 |
xuexinpeng
|
2aecb022a6
|
探索冲突
|
2022-01-15 18:46:26 +08:00 |
jiahuiwen
|
c3075fadb4
|
Merge branch 'master_test_gn_zf' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/explorerMap/ExplorerMapLogic.java
|
2022-01-15 18:44:15 +08:00 |
xuexinpeng
|
eb9ed25093
|
探索报空
|
2022-01-15 18:33:19 +08:00 |
xuexinpeng
|
3a1a61171a
|
SExplore判空
|
2022-01-15 18:27:25 +08:00 |
xuexinpeng
|
315083312d
|
【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息
|
2022-01-15 16:38:31 +08:00 |
jiahuiwen
|
ee98e74895
|
类型转换错误
|
2022-01-15 11:43:57 +08:00 |
jiahuiwen
|
cf6c9cc9ff
|
Merge branch 'master_prb_gn' into master_test_gn
|
2022-01-15 11:08:09 +08:00 |
jiahuiwen
|
5cecf52687
|
森罗幻境阵容bug
|
2022-01-15 11:07:23 +08:00 |
duhui
|
70d69c58b4
|
每日特惠活动
|
2022-01-15 10:09:18 +08:00 |
xuexinpeng
|
129e31c61f
|
断线重连玩家处理/log
|
2022-01-14 13:56:52 +08:00 |
xuexinpeng
|
8aa8865f42
|
【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息
|
2022-01-14 11:41:57 +08:00 |
xuexinpeng
|
8dd658edc5
|
【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息
|
2022-01-13 18:32:39 +08:00 |
yuanshuai
|
f5ea9a3b8c
|
天地洪炉脚本抽奖脚本完善
|
2022-01-13 15:12:29 +08:00 |
yuanshuai
|
144ea73fa0
|
代码整理
|
2022-01-12 10:15:53 +08:00 |
jiahuiwen
|
996169647e
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-01-11 14:00:08 +08:00 |
duhui
|
f305dea91f
|
修改注释
|
2022-03-14 00:01:18 +08:00 |
jiahuiwen
|
d352dbb972
|
Merge branch 'master_test_gn' into master_test_gn_upStarHeroActiviry
|
2022-01-11 11:09:46 +08:00 |
yuanshuai
|
813ca52e63
|
英雄升星活动选择英雄限制
|
2022-01-22 16:30:21 +08:00 |
yuanshuai
|
bb15b379ea
|
升星活动脚本修改提交
|
2022-01-22 16:20:41 +08:00 |
yuanshuai
|
c532cad640
|
多提交的内容还原
|
2022-01-22 10:53:53 +08:00 |
yuanshuai
|
2594a30e6a
|
新版升星活动脚本提交
|
2022-01-20 18:36:25 +08:00 |
duhui
|
6f35e726a0
|
家园建筑gm,修改1
|
2022-01-10 18:21:28 +08:00 |
duhui
|
f0a19957b2
|
家园建筑gm
|
2022-01-10 18:18:27 +08:00 |
yuanshuai
|
69166c0950
|
天地洪炉抽卡特殊处理
|
2022-01-22 16:24:57 +08:00 |
yuanshuai
|
1367f81092
|
天地洪炉bug修改
|
2022-01-10 13:44:39 +08:00 |
yuanshuai
|
058cb045ce
|
天地洪炉bug修改提交
|
2022-01-10 13:42:45 +08:00 |
yuanshuai
|
e9b492ee5d
|
天地洪炉抽奖bug修改
|
2022-01-10 12:07:44 +08:00 |
duhui
|
c03ae4a02f
|
易经宝库gm
|
2022-01-06 18:14:26 +08:00 |
xuexinpeng
|
a7c2a5a71f
|
森罗幻境自动挂机返回掉落展示清除
|
2022-01-06 16:25:22 +08:00 |
duhui
|
718ca61a46
|
Merge branch '开发/dev_dh' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
# tablemanager/src/main/java/config/SHomeLand.java
# tablemanager/src/main/java/config/SHomeLandLevel.java
# tablemanager/src/main/java/config/SSpecialConfig.java
|
2022-01-06 16:15:00 +08:00 |
xuexinpeng
|
5031f7d9e8
|
Merge branch 'master_test_gn' into master_test_gn_xxp
|
2022-01-06 16:08:27 +08:00 |
xuexinpeng
|
a58b5f8948
|
删除没用引用
|
2022-01-06 16:07:45 +08:00 |
duhui
|
8946f22d57
|
【法宝聚灵&跨服rpc】
1、聚灵表添加新列
2、rpc方法添加catch,简化log
|
2022-01-06 14:59:08 +08:00 |
duhui
|
c82267c4ea
|
【法宝聚灵】
1、添加总星级属性
|
2022-01-06 13:45:37 +08:00 |
duhui
|
91c2a4bf0c
|
Merge branch 'master_test_gn' into 开发/dev_dh
|
2022-01-06 11:20:07 +08:00 |
duhui
|
06bdbf2a78
|
法宝聚灵优化,添加总星级属性加成
|
2022-01-06 11:12:26 +08:00 |
xuexinpeng
|
a1fbed11b2
|
单笔充值领奖活动
|
2022-01-05 18:34:53 +08:00 |
duhui
|
0689f52cbe
|
【家园功能1.1.16】
1、建筑升级,解决特权加速时间bug2
|
2022-01-05 16:07:50 +08:00 |
duhui
|
ff205bd900
|
【家园功能1.1.15】
1、建筑升级,解决特权加速时间bug
|
2022-01-05 15:46:22 +08:00 |
duhui
|
a0de4fd484
|
【家园功能1.1.14】
1、处理装备强化逻辑bug2
|
2022-01-05 15:03:28 +08:00 |
duhui
|
1e11b909fc
|
【家园功能1.1.13】
1、处理装备强化逻辑bug
|
2022-01-05 14:28:35 +08:00 |
duhui
|
e912f389ca
|
【家园功能1.1.12】
1、代码优化,防止空指针
|
2022-01-05 13:38:55 +08:00 |
duhui
|
fb9f074c17
|
Merge branch 'master_test_gn' into 开发/dev_dh
|
2022-01-05 10:18:43 +08:00 |
duhui
|
215cc76897
|
【家园功能1.1.11】
1、装备升级优化
|
2022-01-05 10:15:17 +08:00 |
duhui
|
2707c018f0
|
【家园功能1.1.10】
1、zhuang bei sheng ji
|
2022-01-04 18:34:57 +08:00 |
duhui
|
bd9c2e002a
|
【家园功能1.1.9】
1、特权收益加成修改
|
2022-01-04 15:55:50 +08:00 |
jiahuiwen
|
567a46b4ad
|
Merge branch 'master_prb_gn' into master_test_gn
|
2022-01-04 14:33:01 +08:00 |
jiahuiwen
|
5e51e9c8dc
|
删除多余代码
|
2022-01-04 14:27:28 +08:00 |
duhui
|
6870645ea4
|
代码格式处理,不影响逻辑
|
2022-01-04 11:50:35 +08:00 |
duhui
|
a6595b054e
|
Merge branch 'master_test_gn_zf' of http://60.1.1.230/backend/jieling_server into master_test_gn_zf
|
2022-01-04 11:45:13 +08:00 |
duhui
|
e9b526e61b
|
大闹天宫机器人,星级问题处理
|
2022-01-04 11:44:43 +08:00 |
jiahuiwen
|
e4e4715543
|
竞技试炼发奖励bug
|
2022-01-04 11:44:43 +08:00 |
DESKTOP-98AVA47\Administrator
|
29dc23ed4e
|
跨服战斗,身外化身技能
|
2022-01-04 11:44:42 +08:00 |
jiahuiwen
|
6074368c60
|
删除多余代码
|
2022-01-04 11:44:42 +08:00 |
jiahuiwen
|
925b9688c0
|
神将回退突破等级归 0
|
2022-01-04 11:44:41 +08:00 |
jiahuiwen
|
71ecc1510a
|
超值返利删除容错代码
|
2022-01-04 11:44:40 +08:00 |
jiahuiwen
|
454388b731
|
神将回退卸下魂印bug
|
2022-01-04 11:44:40 +08:00 |
jiahuiwen
|
70ce7e3446
|
神将回退bug
|
2022-01-04 11:44:39 +08:00 |
jiahuiwen
|
812f8ac7d1
|
神将回退bug
|
2022-01-04 11:44:39 +08:00 |
jiahuiwen
|
7642a5b5fb
|
神将回退增加上报
|
2022-01-04 11:44:38 +08:00 |
jiahuiwen
|
8d014c2269
|
减少玩家数据在内存时间
|
2022-01-04 11:44:38 +08:00 |
jiahuiwen
|
9284eb0e48
|
删除无用代码
|
2022-01-04 11:44:37 +08:00 |
yuanshuai
|
352a586ae2
|
超值返利网页支付重复购买礼包问题修改
|
2022-01-04 11:44:36 +08:00 |
yuanshuai
|
b870b9afa2
|
命石快速合成bug修改
|
2022-01-04 11:44:36 +08:00 |
jiahuiwen
|
61b3a6113e
|
逐胜商店刷新错误
|
2022-01-04 11:44:35 +08:00 |
yuanshuai
|
c8f9014741
|
命石一键合成bug修改
|
2022-01-04 11:44:34 +08:00 |
yuanshuai
|
b8de92f98c
|
添加批量删除道具GM
|
2022-01-04 11:44:12 +08:00 |
yuanshuai
|
93555c633d
|
命石快速合成脚本修改提交
|
2022-01-04 11:43:23 +08:00 |
yuanshuai
|
0414793568
|
命石快速合成脚本优化
|
2022-01-04 11:43:23 +08:00 |
yuanshuai
|
d17c6cdec9
|
命格脚本修改
|
2022-01-04 11:43:22 +08:00 |
yuanshuai
|
2028b3cfe2
|
命格脚本优化
|
2022-01-04 11:43:22 +08:00 |
yuanshuai
|
f06acc6801
|
命格脚本优化
|
2022-01-04 11:43:21 +08:00 |
yuanshuai
|
946d97a7d4
|
脚本优化
|
2022-01-04 11:43:20 +08:00 |
yuanshuai
|
4a2f7fc95e
|
整理代码
|
2022-01-04 11:43:16 +08:00 |
yuanshuai
|
a66ff0d2ba
|
添加命格计算战斗力逻辑
|
2022-01-04 11:43:16 +08:00 |
yuanshuai
|
487722d6ac
|
命格脚本提交
|
2022-01-04 11:43:05 +08:00 |
yuanshuai
|
a58adbbb18
|
超值返利网页支付bug修改
|
2022-01-04 11:41:54 +08:00 |
jiahuiwen
|
7c21b147a0
|
返还道具bug
|
2022-01-04 11:41:54 +08:00 |
xuexinpeng
|
ebae30feef
|
战斗星级
|
2022-01-04 11:41:54 +08:00 |
jiahuiwen
|
64f4f644de
|
int NEW_WELFARE = 42;//萌新福利 这个活动未开启需要记录进度
|
2022-01-04 11:41:54 +08:00 |
DESKTOP-98AVA47\Administrator
|
30111415c0
|
补充
|
2022-01-04 11:41:54 +08:00 |
jiahuiwen
|
eb504fd20c
|
2021-12-22 09:00:00 之后开的服,首充不显示累充满100元任务
|
2022-01-04 11:41:54 +08:00 |
DESKTOP-98AVA47\Administrator
|
17242edf01
|
获取活动开启时间
|
2022-01-04 11:41:53 +08:00 |
jiahuiwen
|
6e3b1b5be9
|
升星配方调整补偿
|
2022-01-04 11:41:53 +08:00 |
duhui
|
5312fc728c
|
大闹天宫机器人,星级问题处理
|
2022-01-04 11:40:52 +08:00 |
jiahuiwen
|
458b8a8165
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2022-01-04 11:05:02 +08:00 |
jiahuiwen
|
affe194539
|
竞技试炼发奖励bug
|
2022-01-04 11:02:41 +08:00 |
xuexinpeng
|
f6ac2a88bd
|
探索时间戳进位
|
2021-12-31 17:33:31 +08:00 |
xuexinpeng
|
3b14b27161
|
探索
|
2021-12-31 14:03:07 +08:00 |
xuexinpeng
|
64df199aee
|
探索
|
2021-12-31 13:49:24 +08:00 |
duhui
|
a56918a674
|
【家园功能1.1.8】
1、装备强化增加战力修改
|
2021-12-31 13:39:41 +08:00 |
jiahuiwen
|
50d5195692
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-31 10:49:12 +08:00 |
jiahuiwen
|
ffb0488e50
|
赠送好友友情点bug
|
2021-12-31 10:49:04 +08:00 |
xuexinpeng
|
82dde4cdb8
|
森罗幻境自动挂机奖励展示
|
2021-12-31 10:36:32 +08:00 |
duhui
|
b1c4e0ba35
|
【家园功能1.1.7】
1、装备方法bug修改
|
2021-12-31 10:22:49 +08:00 |
duhui
|
3dab8bf18c
|
【家园功能1.1.6】
1、家园装备强化展示
|
2021-12-30 18:34:43 +08:00 |
xuexinpeng
|
188ea389e6
|
森罗幻境自动挂机奖励展示
|
2021-12-30 18:19:24 +08:00 |
yuanshuai
|
c3553579e2
|
新增被动技能注释
|
2021-12-30 17:40:47 +08:00 |
duhui
|
6cbd8104e7
|
云游商人,装备升级逻辑修改
|
2021-12-30 17:09:45 +08:00 |
yuanshuai
|
8ac39917af
|
牛魔王4火不生效bug修改(添加了一个被动技能)
|
2021-12-30 16:23:13 +08:00 |
duhui
|
9e433e1969
|
【家园功能1.1.5】
1、家园特权功能添加
|
2021-12-30 16:09:24 +08:00 |
duhui
|
a61999d664
|
【家园功能1.1.4(特殊)】
1、删除栖云阁一键领取代码,之后有需要可以从本次提交找回
|
2021-12-30 15:21:27 +08:00 |
duhui
|
6b139b482e
|
【家园功能1.1.3】
1、装备强化验证bug修改
|
2021-12-30 13:51:29 +08:00 |
xuexinpeng
|
16fc0ffbbb
|
离线探索
|
2021-12-30 13:34:34 +08:00 |
xuexinpeng
|
bb1bea214f
|
探索
|
2021-12-30 10:26:22 +08:00 |
xuexinpeng
|
f4f027c40c
|
探索
|
2021-12-29 18:24:24 +08:00 |
duhui
|
7c19af673d
|
【家园功能1.1.2】
1、装备强化表数据修改
|
2021-12-29 18:20:43 +08:00 |
xuexinpeng
|
35c2547c89
|
探索
|
2021-12-29 17:44:51 +08:00 |
xuexinpeng
|
b816997e38
|
探索
|
2021-12-29 19:16:02 +08:00 |
xuexinpeng
|
dae028d07f
|
探索
|
2021-12-29 19:05:13 +08:00 |
xuexinpeng
|
28e984d9e9
|
探索
|
2021-12-29 19:01:26 +08:00 |
xuexinpeng
|
4ea6f544cb
|
探索
|
2021-12-29 17:26:42 +08:00 |
duhui
|
dc71d70ad2
|
【家园功能1.1.1】
1、建筑解锁修改
|
2021-12-29 17:08:18 +08:00 |
yuanshuai
|
e8fd75b925
|
Merge branch 'master_test_gn' into master_test_gn_feisheng
|
2021-12-29 15:17:19 +08:00 |
duhui
|
07dfc01d30
|
【家园功能1.1.0】
1、任务功能完善
2、添加装备突破功能
3、装备强化信息添加到英雄信息
4、跨服添加家园装备强化信息
|
2021-12-29 15:12:02 +08:00 |
yuanshuai
|
455cccd059
|
飞升跑马灯脚本提交
|
2021-12-29 14:55:38 +08:00 |
xuexinpeng
|
5e811fb9aa
|
探索血量更新
|
2021-12-28 18:25:41 +08:00 |
xuexinpeng
|
eab1eb0b89
|
探索
|
2021-12-28 18:02:46 +08:00 |
duhui
|
e5fc1ea28c
|
【家园功能1.0.9】建筑升级只允许一次升级一个建筑,装备强化bug优化
|
2021-12-28 17:39:20 +08:00 |
xuexinpeng
|
705e81c629
|
探索
|
2021-12-28 16:32:49 +08:00 |
jiahuiwen
|
973c2b9ce8
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-28 15:24:45 +08:00 |
jiahuiwen
|
bf85dfec3c
|
超值返利删除容错代码
|
2021-12-28 15:24:37 +08:00 |
DESKTOP-98AVA47\Administrator
|
97bd55af89
|
跨服战斗,身外化身技能
|
2021-12-28 15:21:14 +08:00 |
yuanshuai
|
9b31eeadc9
|
飞升脚本修改提交
|
2021-12-28 15:07:39 +08:00 |
duhui
|
ee97a40004
|
【家园功能1.0.8】建筑解锁推送修改,只推送解锁的建筑
|
2021-12-28 14:59:59 +08:00 |
xuexinpeng
|
3c5f29e2e5
|
探索 测试 不扣消耗
|
2021-12-28 14:33:23 +08:00 |
ZhangBiao
|
304d1da7ef
|
[家园功能1.0.7]建筑解锁Indication修改
|
2021-12-28 11:52:54 +08:00 |
ZhangBiao
|
c7a22e0787
|
[家园功能1.0.6]建筑收益bug修改
|
2021-12-28 11:12:31 +08:00 |
xuexinpeng
|
6b07593757
|
探索
|
2021-12-27 18:36:31 +08:00 |
jiahuiwen
|
71eb51d017
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-12-27 17:18:57 +08:00 |
jiahuiwen
|
89f4eae73e
|
删除多余代码
|
2021-12-27 17:18:31 +08:00 |
jiahuiwen
|
313053ed5d
|
神将回退突破等级归 0
|
2021-12-27 17:17:56 +08:00 |
jiahuiwen
|
811d67c536
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-12-27 17:00:18 +08:00 |
duhui
|
937c740ebd
|
【家园功能1.0.5】建筑升级前置条件判断,添加长度验证
|
2021-12-27 16:56:32 +08:00 |
jiahuiwen
|
7ebd8878de
|
神将回退卸下魂印bug
|
2021-12-27 16:55:11 +08:00 |
xuexinpeng
|
87bcc6d5d7
|
探索
|
2021-12-27 16:33:32 +08:00 |
yuanshuai
|
6faac1d034
|
超值返利网页支付bug修改
|
2021-12-27 16:24:46 +08:00 |
jiahuiwen
|
ac30e70c2e
|
神将回退bug
|
2021-12-27 16:11:51 +08:00 |
jiahuiwen
|
5f04e68e3d
|
神将回退bug
|
2021-12-27 16:09:56 +08:00 |
jiahuiwen
|
9c998b86e6
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-12-27 16:01:30 +08:00 |
jiahuiwen
|
4ee0f7b5f2
|
神将回退bug
|
2021-12-27 15:57:09 +08:00 |
duhui
|
bee333690e
|
【家园功能1.0.4】无用代码删除,不影响原有逻辑
|
2021-12-27 14:57:24 +08:00 |
jiahuiwen
|
ecd017281d
|
神将回退增加上报
|
2021-12-27 14:25:21 +08:00 |
duhui
|
fed5fcf59b
|
【家园功能1.0.4】日志完善内容
|
2021-12-27 14:01:55 +08:00 |
duhui
|
ad1cf08eae
|
【家园功能1.0.3】建筑升级添加前置建筑等级验证,建筑解锁逻辑优化
|
2021-12-27 13:45:47 +08:00 |
duhui
|
4e852db95b
|
【家园功能1.0.2】生产建筑存储总上限修改,部分建筑生产无总上限,只有领取上限
|
2021-12-27 11:47:40 +08:00 |
jiahuiwen
|
b88a69ef3a
|
减少玩家数据在内存时间
|
2021-12-27 10:25:35 +08:00 |
xuexinpeng
|
8f0010b1be
|
Merge branch 'master_test_gn' into master_test_gn_xxp
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
|
2021-12-27 10:04:54 +08:00 |
xuexinpeng
|
6a6cbaca50
|
探索
|
2021-12-27 10:02:59 +08:00 |
duhui
|
20b1c958e5
|
【家园功能1.0.1】任务优化,添加升级取消功能
|
2021-12-24 18:20:10 +08:00 |
jiahuiwen
|
c6d13b6685
|
Merge branch 'master_test_gn' into master_prb_gn
|
2021-12-24 17:52:59 +08:00 |
jiahuiwen
|
4132cd1f80
|
删除无用代码
|
2021-12-24 17:52:09 +08:00 |
duhui
|
6f3c8768bf
|
【家园功能1.0】待联调
|
2021-12-24 17:07:57 +08:00 |
jiahuiwen
|
8f47418546
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-24 13:55:10 +08:00 |
jiahuiwen
|
0602b9f003
|
逐胜商店刷新错误
|
2021-12-24 13:55:03 +08:00 |
xuexinpeng
|
b9cc3dec5f
|
探索
|
2021-12-24 11:29:51 +08:00 |
yuanshuai
|
93596965dd
|
超值返利网页支付重复购买礼包问题修改
|
2021-12-24 09:49:28 +08:00 |
yuanshuai
|
540e61d512
|
超值返利网页支付bug修改
|
2021-12-23 16:05:15 +08:00 |
yuanshuai
|
5cedfa6e4e
|
命石快速合成bug修改
|
2021-12-23 15:14:43 +08:00 |
yuanshuai
|
9b545e5eea
|
Merge branch 'master_test_gn' into master_test_gn_lifeGrid
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java
|
2021-12-23 09:53:52 +08:00 |
yuanshuai
|
4de94d16ea
|
飞升脚本提交
|
2021-12-23 09:51:48 +08:00 |
xuexinpeng
|
503ef57f57
|
探索
|
2021-12-22 18:04:05 +08:00 |
jiahuiwen
|
a9df7aa7e0
|
返还道具bug
|
2021-12-22 10:54:44 +08:00 |
xuexinpeng
|
49811877fa
|
战斗星级
|
2021-12-21 19:07:26 +08:00 |
xuexinpeng
|
e683d993d5
|
探索 战斗
|
2021-12-21 19:04:56 +08:00 |
jiahuiwen
|
90e98f6355
|
int NEW_WELFARE = 42;//萌新福利 这个活动未开启需要记录进度
|
2021-12-21 17:48:01 +08:00 |
xuexinpeng
|
9253e775f0
|
探索
|
2021-12-21 16:46:24 +08:00 |
xuexinpeng
|
db7dbb84c2
|
探索
|
2021-12-23 17:19:54 +08:00 |
jiahuiwen
|
d3b35d55d0
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-21 10:50:52 +08:00 |
DESKTOP-98AVA47\Administrator
|
8aba14dbe2
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-23 19:13:48 +08:00 |
DESKTOP-98AVA47\Administrator
|
5421882672
|
补充
|
2021-12-23 19:13:39 +08:00 |
DESKTOP-98AVA47\Administrator
|
9b6f5a8e0c
|
获取活动开启时间
|
2021-12-23 19:01:57 +08:00 |
jiahuiwen
|
bd15f69616
|
2021-12-22 09:00:00 之后开的服,首充不显示累充满100元任务
|
2021-12-21 10:50:43 +08:00 |
jiahuiwen
|
cf91ff167b
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-21 09:55:23 +08:00 |
jiahuiwen
|
a97bca5c9b
|
升星配方调整补偿
|
2021-12-21 09:55:12 +08:00 |
yuanshuai
|
b473c1a6ca
|
旧版积天豪礼bug修改
|
2021-12-20 18:52:08 +08:00 |
xuexinpeng
|
048c240cb4
|
礼包刷新
|
2021-12-23 17:21:26 +08:00 |
jiahuiwen
|
fb5036ea29
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-20 11:51:23 +08:00 |
xuexinpeng
|
a7ff90e6a7
|
规范代码
|
2021-12-29 00:03:50 +08:00 |
jiahuiwen
|
2596eb08b9
|
2021-12-22 09:00:00 之后开的服,首充不显示累充满100元任务
|
2021-12-20 11:51:13 +08:00 |
xuexinpeng
|
d9e9f378ef
|
Merge branch 'master_test_gn' into master_test_gn_xxp
|
2021-12-20 11:31:19 +08:00 |
jiahuiwen
|
7ea5e79269
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-20 11:12:59 +08:00 |
yuanshuai
|
9d7058bec8
|
新版天天尊降世bug修改
|
2021-12-23 11:04:02 +08:00 |
yuanshuai
|
652caf6b5b
|
旧版积天豪礼代码兼容
|
2021-12-31 00:02:41 +08:00 |
jiahuiwen
|
58311e37df
|
心愿抽奖 400 次后不重置剩余保底次数
|
2021-12-20 11:12:47 +08:00 |
jiahuiwen
|
fc01267f37
|
每日豪礼 活动类型 13 不再更新,补发奖励
|
2021-12-20 10:20:31 +08:00 |
jiahuiwen
|
78bf408e42
|
积天豪礼活动已被替换,未参与的玩家不再累计
|
2021-12-17 18:31:52 +08:00 |
jiahuiwen
|
80f48b3f42
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-17 17:19:57 +08:00 |
jiahuiwen
|
7012d6c647
|
灵兽宝阁特殊使用
|
2021-12-17 17:19:40 +08:00 |
yuanshuai
|
f473965b9d
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-17 16:13:59 +08:00 |
yuanshuai
|
df0059632a
|
新版积天豪礼活动提交
|
2021-12-17 16:13:50 +08:00 |
yuanshuai
|
d814ecb635
|
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/logic/activity/ActivityType.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java
|
2022-01-03 11:48:04 +08:00 |
yuanshuai
|
b3d5dfc0e6
|
新积天豪礼活动脚本修改提交
|
2022-01-03 11:46:33 +08:00 |
jiahuiwen
|
ebc1106e3c
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-17 15:05:08 +08:00 |
jiahuiwen
|
847efbe252
|
原有罗浮货币登录时转化为逐胜徽章
|
2021-12-17 15:05:01 +08:00 |
jiahuiwen
|
87f073bb89
|
新人商城活动
|
2021-12-17 10:52:19 +08:00 |
xuexinpeng
|
e54a1c6243
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-29 00:22:01 +08:00 |
xuexinpeng
|
70d147e593
|
新特惠
|
2021-12-29 00:20:38 +08:00 |
xuexinpeng
|
652097f613
|
新每日特惠
|
2021-12-17 17:58:55 +08:00 |
xuexinpeng
|
956c9cc2fe
|
新特惠礼包
|
2021-12-23 00:17:13 +08:00 |
jiahuiwen
|
2715ea64a3
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-16 18:19:21 +08:00 |
jiahuiwen
|
5ef7afe587
|
功能开启关闭
|
2021-12-16 18:19:13 +08:00 |
yuanshuai
|
d96dc3a63d
|
新版天尊降世代码提交
|
2021-12-16 16:39:02 +08:00 |
jiahuiwen
|
d56b0b6a08
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-16 16:30:06 +08:00 |
jiahuiwen
|
701d32c31f
|
回退bug
|
2021-12-16 16:29:55 +08:00 |
yuanshuai
|
83c72f95ba
|
道具添加使用等级限制
|
2021-12-16 15:28:08 +08:00 |
yuanshuai
|
93993d8150
|
挂机收益道具逻辑修改
|
2021-12-16 11:14:48 +08:00 |
yuanshuai
|
db39942231
|
使用资源包道具逻辑完善
|
2021-12-16 10:44:32 +08:00 |
jiahuiwen
|
4ae13de871
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-15 18:42:17 +08:00 |
jiahuiwen
|
6f38da5b27
|
回退修复
|
2021-12-15 18:42:12 +08:00 |
yuanshuai
|
1c3a458869
|
漏提交关卡限制条件脚本
|
2021-12-15 13:07:39 +08:00 |
yuanshuai
|
a5762d9aa9
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-15 13:01:53 +08:00 |
yuanshuai
|
ce4d17763f
|
新增道具类型
|
2021-12-15 13:01:44 +08:00 |
jiahuiwen
|
3b112b0dff
|
回退不飘字
|
2021-12-15 10:57:50 +08:00 |
jiahuiwen
|
1f08ca2f33
|
回退所得神将不更新任务或活动
|
2021-12-15 09:45:00 +08:00 |
jiahuiwen
|
edf251cd1f
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-14 17:58:42 +08:00 |
jiahuiwen
|
53b29d606e
|
神将回退
|
2021-12-14 17:58:31 +08:00 |
yuanshuai
|
9a02fbc459
|
使用资源包道具修改脚本提交
|
2021-12-14 17:40:30 +08:00 |
yuanshuai
|
b865fac770
|
新增经验和金币收益道具脚本提交
|
2021-12-14 17:37:27 +08:00 |
yuanshuai
|
23b2c9285e
|
命石一键合成bug修改
|
2021-12-14 16:06:41 +08:00 |
yuanshuai
|
2fcf50d33e
|
添加批量删除道具GM
|
2021-12-14 14:55:59 +08:00 |
xuexinpeng
|
8313116aa3
|
御剑行活动配置
|
2021-12-14 13:45:12 +08:00 |
xuexinpeng
|
0117de31fc
|
探索地图
|
2021-12-14 11:45:17 +08:00 |
yuanshuai
|
1ee2a60fc0
|
命石快速合成脚本修改提交
|
2021-12-13 18:41:46 +08:00 |
yuanshuai
|
9a2bf80a9b
|
脚本优化
|
2021-12-13 17:34:19 +08:00 |
yuanshuai
|
69607c3c66
|
命石快速合成脚本优化
|
2021-12-13 16:23:32 +08:00 |
jiahuiwen
|
bdc1aa723a
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-12-13 16:10:24 +08:00 |
jiahuiwen
|
9d232a7783
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-13 16:07:02 +08:00 |
jiahuiwen
|
aa4341c12b
|
无尽秘宝,英雄升星需要增加数量
|
2021-12-13 16:06:55 +08:00 |
yuanshuai
|
ce6b4d239b
|
关卡限制脚本优化
|
2021-12-13 14:55:23 +08:00 |
jiahuiwen
|
08ca89a90f
|
开商店
|
2021-12-13 14:44:08 +08:00 |
jiahuiwen
|
586945be2c
|
删除报错
|
2021-12-13 14:05:11 +08:00 |
jiahuiwen
|
1f952efa98
|
Merge branch 'master_test_gn_zf' of http://60.1.1.230/backend/jieling_server into master_test_gn_zf
|
2021-12-13 14:04:18 +08:00 |
jiahuiwen
|
bbc555db7c
|
删活动
|
2021-12-13 14:04:12 +08:00 |
yuanshuai
|
312ad1cd58
|
主线关卡限制条件增加
|
2021-12-13 12:04:33 +08:00 |
jiahuiwen
|
ea6ebeb278
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-12-13 11:56:42 +08:00 |
jiahuiwen
|
8a5b72f0fa
|
消除编译错误
|
2021-12-13 11:55:29 +08:00 |
jiahuiwen
|
450ab39a7e
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-12-13 11:38:56 +08:00 |
jiahuiwen
|
308f406daa
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-13 11:38:23 +08:00 |
jiahuiwen
|
292b395dfe
|
优化
|
2021-12-13 11:38:12 +08:00 |
jiahuiwen
|
a19352578e
|
登录检测已开启的活动,商店是否开启
|
2021-12-13 11:30:53 +08:00 |
yuanshuai
|
0b34d98e99
|
Merge branch 'master_test_gn' into master_test_gn_lifeGrid
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
|
2021-12-13 10:49:37 +08:00 |
yuanshuai
|
ea545c50ac
|
主线关卡限制条件增加
|
2021-12-13 10:12:29 +08:00 |
yuanshuai
|
8a77b7c2d5
|
添加关卡附加条件功能提交
|
2021-12-10 18:43:49 +08:00 |
duhui
|
9a7a6f71f5
|
公会boss伤害超上限
|
2021-12-10 18:27:30 +08:00 |
duhui
|
8d7394d1ac
|
公会boss伤害超上限
|
2021-12-10 16:44:38 +08:00 |
duhui
|
1af8836d72
|
注释修改
|
2021-12-10 16:24:53 +08:00 |
duhui
|
143c7a5230
|
招募秘宝
|
2021-12-10 14:24:47 +08:00 |
yuanshuai
|
72637c0ec5
|
命格脚本修改
|
2021-12-10 14:03:45 +08:00 |
yuanshuai
|
09cd66d6ca
|
命格脚本优化
|
2021-12-10 11:03:32 +08:00 |
yuanshuai
|
9060e00553
|
命格脚本优化
|
2021-12-10 09:55:51 +08:00 |
jiahuiwen
|
02807f9c49
|
关闭 云梦祈福
|
2021-12-09 16:22:35 +08:00 |
jiahuiwen
|
50118efe42
|
优化打印
|
2021-12-09 15:34:45 +08:00 |
jiahuiwen
|
33546f01b2
|
增加保存
|
2021-12-09 15:26:51 +08:00 |
jiahuiwen
|
3ba82851fd
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-09 14:14:51 +08:00 |
jiahuiwen
|
afa8040533
|
竞技试炼
|
2021-12-09 14:14:39 +08:00 |
duhui
|
32a5f49782
|
连续礼包补充
|
2021-12-09 11:44:19 +08:00 |
duhui
|
c555ca977f
|
连续礼包,礼包id重复问题处理
|
2021-12-09 11:32:58 +08:00 |
yuanshuai
|
b8de907745
|
脚本优化
|
2021-12-09 10:11:14 +08:00 |
yuanshuai
|
be54f4627d
|
整理代码
|
2021-12-08 17:13:16 +08:00 |
yuanshuai
|
1455339b03
|
添加命格计算战斗力逻辑
|
2021-12-08 17:03:28 +08:00 |
yuanshuai
|
204eb5f959
|
命格脚本提交
|
2021-12-08 16:50:41 +08:00 |
xuexinpeng
|
d69aca969f
|
删除部分无用log
|
2021-12-08 13:28:06 +08:00 |
jiahuiwen
|
e754405dfe
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-08 13:20:02 +08:00 |
jiahuiwen
|
ad85622fe3
|
竞技试炼
|
2021-12-08 13:19:21 +08:00 |
xuexinpeng
|
ca60360b64
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-07 18:38:06 +08:00 |
xuexinpeng
|
9d893b37ad
|
战斗同步
|
2021-12-07 18:37:27 +08:00 |
jiahuiwen
|
e6d3b7a85c
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-12-07 17:59:54 +08:00 |
jiahuiwen
|
426b23d23f
|
Merge branch 'master_prb_gn' into master_test_gn_zf
|
2021-12-07 17:58:45 +08:00 |
xuexinpeng
|
c6fc2fd87a
|
李海洋-gm降关卡
|
2021-12-07 17:02:43 +08:00 |
duhui
|
0914af5631
|
活动非空判断
|
2021-12-07 16:08:00 +08:00 |
duhui
|
946ae79b7c
|
补充
|
2021-12-07 15:24:37 +08:00 |
duhui
|
aedf20d453
|
计算机器人星级
|
2021-12-07 15:24:03 +08:00 |
duhui
|
43e355c242
|
计算机器人星级
|
2021-12-07 15:04:02 +08:00 |
xuexinpeng
|
595735ff93
|
超值基金加判空操作
|
2021-12-07 10:28:41 +08:00 |
duhui
|
147a3a2368
|
计算星级
|
2021-12-06 18:31:53 +08:00 |
duhui
|
2c549257e0
|
机器人星级修改
|
2021-12-06 17:38:38 +08:00 |
duhui
|
92a1305eaf
|
大闹天宫优化
|
2021-12-06 15:35:18 +08:00 |
duhui
|
0cf8bb430b
|
连续礼包优化
|
2021-12-10 00:29:26 +08:00 |
duhui
|
257a5afaf8
|
Merge branch 'master_test_gn' into 开发/dev_dh
|
2021-12-03 10:05:46 +08:00 |
jiahuiwen
|
8157f05b32
|
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/logic/activity/ActivityLogic.java
|
2021-12-03 10:03:01 +08:00 |
jiahuiwen
|
bde0bb4ed2
|
重置天宫商店
|
2021-12-03 10:01:07 +08:00 |
duhui
|
910670c66c
|
连续礼包优化,bug修改提交
|
2021-12-02 16:44:17 +08:00 |
duhui
|
f0b55b5ffb
|
四灵试炼,层数刷新日志
|
2021-12-02 16:16:23 +08:00 |
duhui
|
1dc148d469
|
Merge branch 'master_test_gn' into 开发/dev_dh
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java
|
2021-12-02 15:17:41 +08:00 |
duhui
|
2717cdefec
|
连续礼包优化
|
2021-12-02 15:16:02 +08:00 |
duhui
|
b418a8e53c
|
日志管理
|
2021-12-02 10:20:55 +08:00 |
jiahuiwen
|
275426aadc
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-12-01 18:49:01 +08:00 |
jiahuiwen
|
5c4874ab9e
|
重置天宫商店
|
2021-12-01 17:55:46 +08:00 |
duhui
|
4e4ed641ca
|
方寸寻宝活动
|
2021-12-01 15:25:19 +08:00 |
duhui
|
c4e252a3ed
|
礼包活动报错
|
2021-12-01 07:14:08 +08:00 |
duhui
|
345b573ddc
|
战斗报错
|
2021-12-01 06:58:13 +08:00 |
yuanshuai
|
40ae47feb0
|
修改异常飘字
|
2021-11-30 11:25:01 +08:00 |
duhui
|
d6f16d1f61
|
变身卡激活消耗道具
|
2021-11-30 10:09:44 +08:00 |
yuanshuai
|
d97164a2db
|
天地洪炉选择up添加限制
|
2021-12-05 15:05:28 +08:00 |
duhui
|
c91b204bdc
|
活动改版,初版
|
2021-11-29 18:32:14 +08:00 |
jiahuiwen
|
1fc0a0a4d3
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-27 17:35:16 +08:00 |
jiahuiwen
|
cff11e010c
|
剧情关不需要战斗
|
2021-11-27 17:35:07 +08:00 |
duhui
|
f119b88123
|
连续礼包活动
|
2021-11-27 16:07:55 +08:00 |
jiahuiwen
|
f929ea69db
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-27 15:43:34 +08:00 |
yuanshuai
|
e84a1463c4
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-02 17:35:31 +08:00 |
DESKTOP-98AVA47\Administrator
|
9873a26fff
|
身外化身战斗
|
2021-12-09 15:19:21 +08:00 |
DESKTOP-98AVA47\Administrator
|
aab2103698
|
技能修改
|
2021-12-09 02:36:39 +08:00 |
yuanshuai
|
7709b634fd
|
天地洪炉活动脚本提交
|
2021-12-02 17:35:25 +08:00 |
jiahuiwen
|
8c359f8e44
|
每月礼包刷新时间改每天0点
|
2021-11-27 15:43:26 +08:00 |
xuexinpeng
|
e944250fb8
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-11-26 13:14:58 +08:00 |
duhui
|
0402d633a0
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-26 10:34:34 +08:00 |
duhui
|
3c85141eab
|
多活动
|
2021-11-26 10:34:22 +08:00 |
jiahuiwen
|
287f295530
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-25 19:28:04 +08:00 |
jiahuiwen
|
c11813b44e
|
月礼包特殊处理,可每日都刷新购买次数
|
2021-11-25 19:27:52 +08:00 |
yuanshuai
|
609bea38bd
|
活动类型整理
|
2021-11-25 17:49:29 +08:00 |
jiahuiwen
|
af0b9547c5
|
支持删 RechargeCommodityConfig
|
2021-11-25 17:41:32 +08:00 |
yuanshuai
|
31859110b4
|
Merge branch 'master_prb_gn' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java
|
2021-11-25 16:59:54 +08:00 |
yuanshuai
|
f850101322
|
灵兽宝阁bug
|
2021-11-25 16:56:36 +08:00 |
yuanshuai
|
fad0cadb25
|
Merge branch 'master_prb_gn' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java
|
2021-11-25 16:49:34 +08:00 |
yuanshuai
|
17e32849ae
|
灵兽宝阁领取bug修改
|
2021-11-25 16:39:23 +08:00 |
xuexinpeng
|
4c11a6db16
|
log
|
2021-11-25 16:34:50 +08:00 |
duhui
|
9c45649824
|
【优化】限时招募,乾坤宝盒,灵兽宝阁整体包装
|
2021-11-25 16:29:08 +08:00 |
jiahuiwen
|
188bf0bf25
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-11-25 16:27:11 +08:00 |
yuanshuai
|
4c462a99dc
|
灵兽抽奖替换bug修改
|
2021-11-25 16:20:46 +08:00 |
yuanshuai
|
b8267cba0b
|
灵兽抽奖替换bug修改
|
2021-11-25 16:19:59 +08:00 |
xuexinpeng
|
80603a4de5
|
跨服灵脉
|
2021-11-25 16:06:31 +08:00 |
xuexinpeng
|
a9cbf7a046
|
日志
|
2021-11-25 15:39:09 +08:00 |
yuanshuai
|
150742a64d
|
灵兽宝阁bug修改
|
2021-11-25 15:23:09 +08:00 |
yuanshuai
|
fca3f6510c
|
灵兽宝阁bug修改
|
2021-11-25 15:21:59 +08:00 |
xuexinpeng
|
4bfbad8254
|
跨服灵脉
|
2021-11-25 15:15:33 +08:00 |
xuexinpeng
|
edb39cf2af
|
跨服灵脉bug
|
2021-11-25 14:53:18 +08:00 |
xuexinpeng
|
4722b7a07c
|
灵兽bug
|
2021-11-25 14:24:23 +08:00 |
jiahuiwen
|
0074c35de4
|
公会技能,一次性掉落100亿金币
|
2021-11-25 14:07:43 +08:00 |
duhui
|
1893a900ff
|
Merge branch '开发/dev_dh' into master_test_gn
# Conflicts:
# globalidserver/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java
# globalidserver/src/main/java/com/global/thrift/idl/InnerResult.java
# globalidserver/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java
# serverlogic/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java
# serverlogic/src/main/java/com/global/thrift/idl/InnerResult.java
# serverlogic/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java
# serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java
# serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java
# serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/InvalidOperException.java
# serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Pokemon.java
# serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PropertyItem.java
# serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java
# serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java
# serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RechargeResult.java
# serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Result.java
# serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java
# serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java
# serverlogic/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java
# serverlogic/src/main/java/com/world/thrift/idl/InnerResult.java
# serverlogic/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java
# serverlogic/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java
# serverlogic/src/main/thrift/idl/core.thrift
# serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerInvalidOperException.java
# serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerResult.java
# serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/RPCgTGRequestIFace.java
# serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java
# serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java
# serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/InvalidOperException.java
# serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Pokemon.java
# serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PropertyItem.java
# serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java
# serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java
# serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RechargeResult.java
# serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Result.java
# serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java
# serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerInvalidOperException.java
# serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerResult.java
# serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCgTwRequestIFace.java
# serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCwTgRequestIFace.java
# tablemanager/src/main/java/config/SLodeRankReward.java
# tablemanager/src/main/java/config/STrumpBook.java
# worldserver/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java
# worldserver/src/main/java/com/world/thrift/idl/InnerResult.java
# worldserver/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java
# worldserver/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java
|
2021-11-26 09:41:35 +08:00 |
duhui
|
a8a85512a0
|
灵兽限时抽卡跨周重置
|
2021-11-25 18:13:17 +08:00 |
duhui
|
8260b6fd83
|
限时招募进度条重置
|
2021-11-25 17:45:26 +08:00 |
xuexinpeng
|
15f2f5d6ed
|
代码优化
|
2021-11-25 11:09:12 +08:00 |
xuexinpeng
|
3566a3a665
|
跨服灵脉代码优化
|
2021-11-25 11:02:27 +08:00 |
xuexinpeng
|
ce85c5e94f
|
跨服灵脉
|
2021-11-25 20:42:11 +08:00 |
xuexinpeng
|
7a6e9b1a26
|
跨服灵脉
|
2021-11-25 19:25:33 +08:00 |
xuexinpeng
|
64b5e819da
|
跨服灵脉
|
2021-11-25 19:17:21 +08:00 |
xuexinpeng
|
3b091987e9
|
跨服灵脉秘境
|
2021-11-25 18:37:14 +08:00 |
xuexinpeng
|
e4aec66ae1
|
注释清空数据操作
|
2021-11-25 17:46:20 +08:00 |
jiahuiwen
|
a2fc1eda05
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-11-24 13:59:25 +08:00 |
yuanshuai
|
858be0cc77
|
消耗道具数量long int类型转换报错
|
2021-11-24 13:54:09 +08:00 |
jiahuiwen
|
a42a12ef79
|
删除日志
|
2021-11-24 13:53:48 +08:00 |
jiahuiwen
|
294bae6c89
|
修仙修改
|
2021-11-24 11:30:48 +08:00 |
xuexinpeng
|
a4027f9f0f
|
日志
|
2021-11-23 18:09:57 +08:00 |
xuexinpeng
|
4af6f1bffa
|
服务器挂掉 停服 期间内的也算收益
|
2021-11-23 17:37:48 +08:00 |
xuexinpeng
|
8a1e4fe26a
|
Merge branch 'master_test_gn' into master_prb_gn
|
2021-11-23 16:07:15 +08:00 |
xuexinpeng
|
7f5d453b4b
|
跨服灵脉rpc红点
|
2021-11-23 15:58:54 +08:00 |
yuanshuai
|
e235a796de
|
法宝聚灵bug修改
|
2021-11-23 15:55:27 +08:00 |
xuexinpeng
|
80f0a0364b
|
红点log
|
2021-11-23 15:05:43 +08:00 |
xuexinpeng
|
c8da24671b
|
pvp的超回合按伤害算胜负
|
2021-11-23 14:17:57 +08:00 |
DESKTOP-98AVA47\Administrator
|
13101fbdee
|
公会技能bug修改
|
2021-12-04 16:10:54 +08:00 |
yuanshuai
|
f5ab60c286
|
法宝聚灵bug修改
|
2021-11-23 10:33:41 +08:00 |
xuexinpeng
|
8e65c6b752
|
跨服灵脉积分优化
|
2021-11-23 10:29:10 +08:00 |
xuexinpeng
|
a122652d60
|
跨服灵妙计分
|
2021-11-23 10:13:43 +08:00 |
duhui
|
056986bede
|
删除无用注释
|
2021-11-18 17:48:35 +08:00 |
duhui
|
afe97f00e7
|
修改
|
2021-11-18 11:49:40 +08:00 |
duhui
|
5911e2dc8f
|
Merge branch 'master_test_gn_zf' into 开发/dev_dh
|
2021-11-17 18:20:14 +08:00 |
duhui
|
1eff1588bc
|
rpc协议提交
|
2021-11-17 17:28:19 +08:00 |
jiahuiwen
|
7961a40690
|
宝物分解bug
|
2021-11-17 17:24:30 +08:00 |
jiahuiwen
|
daa339ee54
|
脱装备bug
|
2021-11-17 17:16:28 +08:00 |
duhui
|
cbf61cfafc
|
身外化身提交
|
2021-11-17 16:47:25 +08:00 |
yuanshuai
|
7dd2521295
|
修行刷新排行榜战斗力脚本添加
|
2021-11-26 14:14:49 +08:00 |
jiahuiwen
|
252208e6fb
|
合成宝物bug
|
2021-11-17 13:11:48 +08:00 |
jiahuiwen
|
9d90b6b6bf
|
获取服务器id错误
|
2021-11-17 10:32:17 +08:00 |
jiahuiwen
|
ecbed9777d
|
Merge branch 'master_prb_gn' into master_test_gn_zf
|
2021-11-17 09:37:14 +08:00 |
jiahuiwen
|
dbfd1588c4
|
增加null判断
|
2021-11-17 09:34:39 +08:00 |
duhui
|
e6bafcd98b
|
Merge branch 'master_test_gn' into master_prb_gn
|
2021-11-30 15:47:05 +08:00 |
duhui
|
c5de1c8ce5
|
Receive类型礼包购买条件类型修改
|
2021-11-30 15:46:46 +08:00 |
duhui
|
849f0d4d52
|
报错
|
2021-11-17 08:59:12 +08:00 |
duhui
|
a52e39292d
|
魂宝灵宝二改
|
2021-11-17 08:52:43 +08:00 |
duhui
|
fbb977b360
|
魂宝灵宝强转问题
|
2021-11-17 08:31:25 +08:00 |
duhui
|
1e166894d2
|
跨服旧数据兼容
|
2021-11-15 10:20:30 +08:00 |
DESKTOP-98AVA47\Administrator
|
e341f52da6
|
车迟斗法挑战记录bug修改
|
2021-11-14 15:21:49 +08:00 |
xuexinpeng
|
9d4bfa19a5
|
跨服灵脉秘境
|
2021-11-23 19:06:17 +08:00 |
xuexinpeng
|
d7c548f248
|
跨服灵脉秘境积分计算
|
2021-11-23 18:46:46 +08:00 |
xuexinpeng
|
0fd3f53795
|
跨服灵妙秘境
|
2021-11-22 17:59:49 +08:00 |
xuexinpeng
|
9e8a57674c
|
跨服灵脉秘境
|
2021-11-22 17:50:17 +08:00 |
xuexinpeng
|
1a60f70002
|
跨服灵脉秘境
|
2021-11-25 09:22:00 +08:00 |
jiahuiwen
|
33d8fd7746
|
优化日志
|
2021-11-22 14:40:11 +08:00 |
jiahuiwen
|
1c28ff4797
|
道具数量改long
|
2021-11-22 14:23:18 +08:00 |
jiahuiwen
|
ad0654545b
|
7天未登录玩家,竞技场,不发奖励
|
2021-11-22 10:17:26 +08:00 |
duhui
|
7cda83d0f0
|
公会技能升级修改,道具数量改long
|
2021-11-22 09:52:24 +08:00 |
yuanshuai
|
7c536a5c08
|
添加法宝碎片道具类型
|
2021-11-19 18:15:08 +08:00 |
xuexinpeng
|
8615af222f
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-18 18:00:22 +08:00 |
yuanshuai
|
889720d392
|
法宝聚灵技能修改
|
2021-11-19 16:42:33 +08:00 |
xuexinpeng
|
79b1ac3759
|
Merge branch 'master_test_gn' into master_test_gn_xxp
|
2021-11-18 17:58:34 +08:00 |
xuexinpeng
|
4785536487
|
跨服灵脉秘境挑战记录新加
|
2021-11-18 17:57:22 +08:00 |
yuanshuai
|
fbf48a1903
|
Merge branch 'master_test_gn' into master_test_gn_fabao
|
2021-11-18 17:49:27 +08:00 |
yuanshuai
|
3614aa978a
|
法宝聚灵技能修改
|
2021-11-18 17:49:18 +08:00 |
xuexinpeng
|
55c463569c
|
跨服灵脉秘境1.先后手问题2.记录删除问题3.排行榜自己排名问题
|
2021-11-18 16:33:36 +08:00 |
yuanshuai
|
dfa218d8ba
|
添加战中属性
|
2021-11-18 15:09:45 +08:00 |
xuexinpeng
|
01f4d79966
|
跨服灵脉秘境
|
2021-11-18 14:50:29 +08:00 |
xuexinpeng
|
96123a6d22
|
跨服灵脉秘境
|
2021-11-18 14:45:43 +08:00 |
xuexinpeng
|
f0edb6f5b0
|
跨服灵脉秘境
|
2021-11-19 11:28:35 +08:00 |
xuexinpeng
|
dc98b314ae
|
跨服灵脉秘境
|
2021-11-18 21:55:20 +08:00 |
xuexinpeng
|
d4daed3d65
|
跨服灵脉秘境
|
2021-11-18 21:08:32 +08:00 |
xuexinpeng
|
1acf753951
|
跨服灵脉秘境
|
2021-11-18 18:27:33 +08:00 |
jiahuiwen
|
dc30ecffb7
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-11-17 17:29:32 +08:00 |
xuexinpeng
|
e7e12c7228
|
跨服灵妙秘境
|
2021-11-17 16:35:43 +08:00 |
jiahuiwen
|
0da78da3da
|
每秒执行线程,增加延迟启动
|
2021-11-17 16:08:20 +08:00 |
yuanshuai
|
782d39ab2d
|
法宝之魂共鸣技能相关代码修改
|
2021-11-17 14:48:00 +08:00 |
yuanshuai
|
661594c422
|
添加注释
|
2021-11-17 13:55:25 +08:00 |
jiahuiwen
|
8a5712fdb2
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-11-17 13:24:03 +08:00 |
yuanshuai
|
f8aa4e339b
|
法宝聚灵功能提交
|
2021-11-17 13:18:27 +08:00 |
jiahuiwen
|
010f1b97ff
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-11-17 10:37:02 +08:00 |
jiahuiwen
|
30dae1d80e
|
宝物穿戴bug
|
2021-11-16 16:56:40 +08:00 |
jiahuiwen
|
f8dbd74b31
|
Merge branch 'master_test_gn' into master_prb_gn
|
2021-11-12 18:58:21 +08:00 |
xuexinpeng
|
39b276f03d
|
森罗幻境特殊处理还原
|
2021-11-12 18:28:22 +08:00 |
xuexinpeng
|
3b36c250ba
|
森罗幻境特殊处理
|
2021-11-12 17:32:20 +08:00 |
xuexinpeng
|
2eae6c3890
|
森罗幻境特殊处理
|
2021-11-12 17:23:07 +08:00 |
xuexinpeng
|
676dce9bf8
|
灵脉秘境
|
2021-11-12 16:55:14 +08:00 |
xuexinpeng
|
34c0d4bd69
|
Merge branch 'master_test_gn' into master_test_gn_xxp
|
2021-11-12 13:26:53 +08:00 |
xuexinpeng
|
9facaffd99
|
跨服排行榜切磋战力先后手
|
2021-11-12 13:24:27 +08:00 |
xuexinpeng
|
0b75d24326
|
灵脉秘境
|
2021-11-12 11:54:05 +08:00 |
xuexinpeng
|
b791353eb9
|
灵脉秘境
|
2021-11-12 09:39:03 +08:00 |
jiahuiwen
|
02a052d5e1
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-11 16:29:11 +08:00 |
jiahuiwen
|
44f88a241c
|
修复StackOverflowError
|
2021-11-11 16:29:05 +08:00 |
jiahuiwen
|
29518695a9
|
优化离线清理玩家逻辑
|
2021-11-11 14:34:47 +08:00 |
jiahuiwen
|
0b67387c77
|
完善
|
2021-11-11 13:51:14 +08:00 |
jiahuiwen
|
f7e184aeba
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-11 13:38:29 +08:00 |
jiahuiwen
|
808ebea12f
|
服务器数据互通
|
2021-11-11 13:38:21 +08:00 |
xuexinpeng
|
66258da6b5
|
森罗幻境任务计数恢复之前的计数
|
2021-11-11 11:16:01 +08:00 |
yuanshuai
|
8649778e5c
|
灵兽宝阁功能修改
|
2021-11-25 18:26:02 +08:00 |
jiahuiwen
|
88142c8fcd
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-10 18:54:02 +08:00 |
jiahuiwen
|
f7baeed51e
|
rpc获取user
|
2021-11-10 18:53:42 +08:00 |
duhui
|
a1fce080ee
|
好友问题处理
|
2021-11-10 18:22:23 +08:00 |
yuanshuai
|
d381581b73
|
更新排行榜战斗力代码
|
2021-11-10 15:26:43 +08:00 |
yuanshuai
|
0f7b73924d
|
送走支援神将以后,排行榜外面战力不对 bug修改
|
2021-11-10 15:15:59 +08:00 |
jiahuiwen
|
372c0f9f9f
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-11-10 14:57:48 +08:00 |
jiahuiwen
|
a4c59660d0
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-10 14:57:07 +08:00 |
jiahuiwen
|
8b42f44b54
|
修复启动报错
|
2021-11-10 14:56:55 +08:00 |
xuexinpeng
|
bdd561d75f
|
森罗幻境达人特殊处理
|
2021-11-10 14:12:25 +08:00 |
duhui
|
3009caf6b5
|
队伍id修改,跨服添加主线和罗浮战力属性
|
2021-11-10 13:16:28 +08:00 |
duhui
|
04c1840d88
|
玩家数据添加缓存
(cherry picked from commit df45247e5f )
|
2021-11-10 09:55:43 +08:00 |
duhui
|
df45247e5f
|
玩家数据添加缓存
|
2021-11-10 09:54:22 +08:00 |
jiahuiwen
|
b3b8da2ba9
|
先还原离线清除逻辑
|
2021-11-09 22:59:27 +08:00 |
duhui
|
24de93f03e
|
注销无用类
|
2021-11-09 11:46:27 +08:00 |
duhui
|
90bf135e95
|
天眼类型
|
2021-11-09 11:43:45 +08:00 |
xuexinpeng
|
6b645813ed
|
换一批问题 积分
|
2021-11-09 10:18:43 +08:00 |
jiahuiwen
|
ba917c12af
|
修改注释
|
2021-11-08 17:57:11 +08:00 |
jiahuiwen
|
c9eff64beb
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-08 17:51:43 +08:00 |
jiahuiwen
|
9366e2acd4
|
删除英雄技能获取多余方法
|
2021-11-08 17:51:31 +08:00 |
DESKTOP-98AVA47\Administrator
|
4bcc279ea3
|
报错修改提交
|
2022-01-08 00:36:49 +08:00 |
duhui
|
8afb5b1e80
|
获取跨服玩家英雄信息修改
|
2021-11-08 17:48:33 +08:00 |
duhui
|
9e82d2541a
|
跨服,获取英雄信息
|
2021-11-08 17:23:33 +08:00 |
DESKTOP-98AVA47\Administrator
|
00c2cac6ec
|
罗浮争锋,获取跨服排行榜数据,问题数据跳过
|
2022-01-08 00:10:11 +08:00 |
xuexinpeng
|
1cb588960f
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-11-08 16:59:44 +08:00 |
xuexinpeng
|
c3af7c66f8
|
yx积分规则修改
|
2021-11-08 16:55:57 +08:00 |
xuexinpeng
|
81630e50dc
|
yx匹配换一批log
|
2021-11-08 16:37:37 +08:00 |
xuexinpeng
|
047acea4e4
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-11-08 15:03:50 +08:00 |
xuexinpeng
|
41e12db5a7
|
森罗环境隐藏关卡问题 山河社稷图奖励领取问题
|
2021-11-08 15:02:06 +08:00 |
jiahuiwen
|
5729561082
|
清除7天以上玩家排行榜
|
2021-11-08 12:02:45 +08:00 |
yuanshuai
|
91df74da9c
|
森罗幻境添加神魂等级
|
2021-11-08 11:37:33 +08:00 |
xuexinpeng
|
9580c06b25
|
罗浮争锋的先后手问题
|
2021-11-08 11:03:03 +08:00 |
jiahuiwen
|
820a0d710c
|
日志
|
2021-11-08 10:49:50 +08:00 |
jiahuiwen
|
821e459337
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-08 10:47:06 +08:00 |
jiahuiwen
|
6d004e2114
|
英雄技能调用统一方法
|
2021-11-08 10:46:46 +08:00 |
xuexinpeng
|
2e15f40597
|
sh变量名修改
|
2021-11-08 10:46:42 +08:00 |
DESKTOP-98AVA47\Administrator
|
845d32326c
|
跨服获取玩家rpc信息错误返回
|
2021-12-28 09:41:11 +08:00 |
jiahuiwen
|
b3df483ef8
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-06 08:01:21 +08:00 |
jiahuiwen
|
71dd1931c8
|
修改日志打印
|
2021-11-06 08:01:14 +08:00 |
xuexinpeng
|
15e172c85c
|
战斗记录
|
2021-11-05 19:51:42 +08:00 |
xuexinpeng
|
c477f8a529
|
存储结构改变
|
2021-11-05 19:32:27 +08:00 |
jiahuiwen
|
b9d44ccd3e
|
删除无用代码
|
2021-11-05 19:22:22 +08:00 |
xuexinpeng
|
38c39eeea4
|
山河社稷图redis改为mongo存储
|
2021-11-05 19:19:16 +08:00 |
DESKTOP-98AVA47\Administrator
|
02e09225e9
|
排行榜bug修改
|
2021-11-15 00:21:21 +08:00 |
jiahuiwen
|
dcd9f119d7
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-05 18:31:26 +08:00 |
jiahuiwen
|
c1e72e259b
|
竞技场 超7天未登录玩家不发奖励
|
2021-11-05 18:31:17 +08:00 |
yuanshuai
|
7dbea21500
|
跨服排行英雄数据添加神魂等级数据
|
2021-11-05 18:27:08 +08:00 |
duhui
|
7b8e4db67b
|
跨服数据容错,发现一个小问题,如果跨服排行榜有服务器未开启,那么对应服务器的玩家在排行榜上战斗力会显示0
|
2021-11-05 17:51:22 +08:00 |
duhui
|
e807b5b743
|
排行榜批量修改,跨服逻辑统一接口,本地获取排行玩家数据不放缓存
|
2021-11-05 17:20:36 +08:00 |
duhui
|
93a653423f
|
无用代码删除
|
2021-11-05 17:10:56 +08:00 |
yuanshuai
|
bbe20d2156
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-05 17:00:22 +08:00 |
yuanshuai
|
20293ed53c
|
山河社稷图添加神魂等级数据
|
2021-11-05 17:00:07 +08:00 |
xuexinpeng
|
ad50ec11cb
|
玉虚积分修正
|
2021-11-05 16:39:48 +08:00 |
duhui
|
33f33f9550
|
优化
|
2021-11-05 16:18:45 +08:00 |
xuexinpeng
|
108c2d98ea
|
玉虚修正2
|
2021-11-05 16:16:59 +08:00 |
yuanshuai
|
438b0e85db
|
大闹天宫添加神魂等级信息
|
2021-11-05 16:10:02 +08:00 |
yuanshuai
|
3b96e6549c
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-05 15:52:42 +08:00 |
yuanshuai
|
eeff859f95
|
竞技场神魂等级数据添加
|
2021-11-05 15:52:32 +08:00 |
xuexinpeng
|
89e0335f5b
|
森罗排行排除神秘关卡
|
2021-11-05 15:51:13 +08:00 |
yuanshuai
|
241b8facb5
|
报错修改
|
2021-11-05 15:35:03 +08:00 |
yuanshuai
|
f756444b5a
|
森罗幻境添加神魂等级信息
|
2021-11-05 15:15:54 +08:00 |
xuexinpeng
|
ad571664eb
|
【优化调整】森罗达人
|
2021-11-14 00:14:35 +08:00 |
jiahuiwen
|
aa938f7edb
|
优化世界等级起服计算
|
2021-11-05 14:08:28 +08:00 |
xuexinpeng
|
d3c4ea921b
|
【山河社稷图】最低战力通关和首次通关的战斗数据由redis改为数据库储存
|
2021-11-05 10:18:52 +08:00 |
xuexinpeng
|
c92e5b1b7a
|
【玉虚优化】优化分数丢失规则: +新增表格内修正分数
|
2021-11-04 18:10:21 +08:00 |
xuexinpeng
|
e8ac427ae3
|
森罗达人排行榜 机制修改
|
2021-11-04 17:50:43 +08:00 |
xuexinpeng
|
3e3fb783ee
|
周卡表结构变化
|
2021-11-11 16:45:48 +08:00 |
duhui
|
8ac3c8adb0
|
无尽副本日志
|
2021-11-04 16:17:45 +08:00 |
duhui
|
2aba5b20cc
|
无用代码注释
|
2021-11-04 16:14:20 +08:00 |
xuexinpeng
|
3f38bf784a
|
周卡表数据为空后不返回
|
2021-11-22 00:45:22 +08:00 |
jiahuiwen
|
2392506183
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-04 14:25:53 +08:00 |
xuexinpeng
|
4721fd9342
|
周卡发邮件
|
2021-11-22 00:01:55 +08:00 |
jiahuiwen
|
11470e73b3
|
mongo映射java bean 需要默认构造函数
|
2021-11-04 14:25:42 +08:00 |
yuanshuai
|
dfc37aef28
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-04 14:02:06 +08:00 |
yuanshuai
|
2ef8596a6f
|
注释修改
|
2021-11-04 14:01:48 +08:00 |
xuexinpeng
|
8ef68e0a98
|
周卡修改
|
2021-11-08 00:04:52 +08:00 |
xuexinpeng
|
58e6af7f72
|
SGlobalSystemConfig中ifopen开关不好使
|
2021-11-04 13:47:06 +08:00 |
jiahuiwen
|
aef4398c40
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-04 13:46:04 +08:00 |
jiahuiwen
|
f13360abd3
|
优化内存中玩家清除逻辑
|
2021-11-04 13:45:57 +08:00 |
yuanshuai
|
f7041150b6
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-04 10:59:22 +08:00 |
yuanshuai
|
2f675017fa
|
英雄图鉴bug修改
|
2021-11-04 10:59:12 +08:00 |
duhui
|
8f35b31222
|
跨服排行榜修改
|
2021-11-04 10:47:51 +08:00 |
duhui
|
5c70df47db
|
跨服分组修改
|
2021-11-04 10:11:42 +08:00 |
xuexinpeng
|
fb69e8de2e
|
周卡打开
|
2021-11-08 00:06:49 +08:00 |
yuanshuai
|
9e22fed4ad
|
Merge branch 'master_test_gn_godsoul' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
|
2021-11-03 19:03:22 +08:00 |
jiahuiwen
|
a4e418364d
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-03 17:48:08 +08:00 |
jiahuiwen
|
bff21f989c
|
支持商店下架商品
|
2021-11-03 17:46:27 +08:00 |
duhui
|
ed62e827fe
|
Merge branch 'dh_dev_crossrank' into master_test_gn
|
2021-11-03 17:35:26 +08:00 |
duhui
|
34333c9a33
|
跨服数据更到最新
|
2021-11-03 17:35:01 +08:00 |
DESKTOP-98AVA47\Administrator
|
0458b323bf
|
车迟斗法个人排行积分
|
2021-11-10 11:00:11 +08:00 |
xuexinpeng
|
d3ffae3f7e
|
yx挑战限制
|
2021-11-07 23:34:20 +08:00 |
xuexinpeng
|
190e3fcf79
|
玉虚换一批11.30过后不让刷新
|
2021-11-07 23:33:08 +08:00 |
duhui
|
692e3858c8
|
礼包bug修改
|
2021-11-03 16:33:48 +08:00 |
jiahuiwen
|
b24f82df04
|
redis key 优化
|
2021-11-03 14:51:44 +08:00 |
xuexinpeng
|
772420df81
|
删除yx换一批log
|
2021-11-08 01:47:15 +08:00 |
xuexinpeng
|
77b5e4b3d2
|
yx线上log查问题
|
2021-11-08 01:13:45 +08:00 |
xuexinpeng
|
d4c461a5e1
|
战斗数据新加职业类型
|
2021-11-02 20:02:30 +08:00 |
duhui
|
bcfe4d5dac
|
竞技场每日发奖
|
2021-11-02 11:14:19 +08:00 |
yuanshuai
|
20a26c4f7c
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-11-02 11:02:47 +08:00 |
yuanshuai
|
bbe44fe3c6
|
修行主角技能相关代码还原
|
2021-11-02 11:01:59 +08:00 |
duhui
|
fbdf3ebdad
|
车迟挑战
|
2021-11-02 10:40:49 +08:00 |
yuanshuai
|
667c1a1845
|
神魂绑定条件修改提交
|
2021-11-02 10:27:29 +08:00 |
duhui
|
5ce581f898
|
支付端口redis缓存
|
2021-11-02 10:01:40 +08:00 |
yuanshuai
|
7c1b05d419
|
-神魂绑定修改
|
2021-11-01 18:54:48 +08:00 |
jiahuiwen
|
30fbdc5683
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-01 18:39:16 +08:00 |
jiahuiwen
|
449efd9de5
|
优化http 关闭连接
|
2021-11-01 18:39:03 +08:00 |
yuanshuai
|
5c0c449856
|
神魂绑定检测条件代码修改
|
2021-11-01 18:32:03 +08:00 |
xuexinpeng
|
e3813d4e47
|
玉虚打机器人先后手
|
2021-11-01 17:30:06 +08:00 |
jiahuiwen
|
61bb5e7e14
|
删除修复bug代码
|
2021-11-01 15:44:16 +08:00 |
jiahuiwen
|
922f532aca
|
优化log
|
2021-11-01 15:28:15 +08:00 |
jiahuiwen
|
b8e9545c55
|
删除无用方法
|
2021-11-01 15:26:43 +08:00 |
jiahuiwen
|
51e47e6588
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-01 15:25:54 +08:00 |
duhui
|
6b577dca45
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-01 15:00:43 +08:00 |
duhui
|
74c7f78291
|
无尽秘宝网页支付
|
2021-11-01 15:00:30 +08:00 |
xuexinpeng
|
032ce3646d
|
玉虚三个修改 玉虚赛季发奖时间 挑战后自动换一批 战斗的先后手问题
注释周卡相关
|
2021-11-01 15:00:09 +08:00 |
jiahuiwen
|
77b9fb6426
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-01 14:23:52 +08:00 |
duhui
|
59f9bf9f70
|
Merge branch 'dh_dev' into master_test_gn
|
2021-11-01 14:01:20 +08:00 |
duhui
|
121c01dce1
|
道具,坐骑碎片
|
2021-11-01 14:00:43 +08:00 |
xuexinpeng
|
fc2d33d4c9
|
周卡相关
|
2021-11-01 13:18:29 +08:00 |
duhui
|
182244cfb0
|
好友获取优化
|
2021-11-07 10:43:49 +08:00 |
duhui
|
0692f312fa
|
玲珑宝阁问题修改
|
2021-11-04 18:04:59 +08:00 |
jiahuiwen
|
eadaa7d40e
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-11-01 10:07:11 +08:00 |
jiahuiwen
|
7747c85c86
|
罗浮争锋修复bug
|
2021-10-31 21:28:06 +08:00 |
jiahuiwen
|
b58f222669
|
Merge branch 'master_prb_gn' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
|
2021-10-31 16:29:34 +08:00 |
jiahuiwen
|
3388120fa1
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-10-31 16:17:24 +08:00 |
jiahuiwen
|
dfdd659e0c
|
优化
|
2021-10-31 16:17:17 +08:00 |
jiahuiwen
|
452462606d
|
计算世界等级bug
|
2021-10-30 15:01:52 +08:00 |
jiahuiwen
|
29194289cc
|
分解英雄,和升星吞
|
2021-10-30 02:20:57 +08:00 |
jiahuiwen
|
faa21bb46f
|
白金装备增加过滤掉脱装备获得
|
2021-10-30 01:43:45 +08:00 |
duhui
|
cdd3b6b7dd
|
玲珑宝阁,奖池分活动
|
2021-10-29 17:19:44 +08:00 |
jiahuiwen
|
ff57fe280e
|
修复商店
|
2021-10-29 16:19:26 +08:00 |
jiahuiwen
|
59c91e3233
|
修复指定活动
|
2021-10-29 16:10:22 +08:00 |
jiahuiwen
|
40ae6b6a1b
|
添加日志
|
2021-10-29 16:02:35 +08:00 |
jiahuiwen
|
de7c59dff1
|
Merge branch 'master_test_gn_zf' into master_prb_gn
|
2021-10-29 15:50:00 +08:00 |
jiahuiwen
|
97e23512f2
|
热更修复bug
|
2021-10-29 15:49:40 +08:00 |
yuanshuai
|
3e2455b84a
|
神魂功能战斗相关修改
|
2021-10-29 13:26:43 +08:00 |
yuanshuai
|
f39af137f9
|
Merge branch 'master_test_gn' into master_test_gn_godsoul
|
2021-10-29 11:39:38 +08:00 |
duhui
|
3524c6ea23
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-10-29 11:00:18 +08:00 |
duhui
|
d6fcda16a0
|
gm轩辕宝镜跳关
|
2021-10-29 11:00:03 +08:00 |
jiahuiwen
|
bf1a911880
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-10-29 10:53:14 +08:00 |
jiahuiwen
|
542563c2c3
|
删除日志
|
2021-10-29 10:53:03 +08:00 |
duhui
|
17a8cc3811
|
车迟斗法积分为0处理
|
2021-10-29 10:51:29 +08:00 |
duhui
|
040d8bff45
|
gm类名修改
|
2021-10-29 09:48:39 +08:00 |
duhui
|
5410f0ecce
|
测试,gm需求
|
2021-10-28 18:10:20 +08:00 |
jiahuiwen
|
39d1c1242f
|
优化
|
2021-10-28 17:44:00 +08:00 |
duhui
|
eb91e2169d
|
车迟斗法伤害溢出问题
|
2021-10-28 16:58:37 +08:00 |
yuanshuai
|
b0d4de5917
|
添加跨服相关神将神魂信息
|
2021-10-28 15:32:36 +08:00 |
yuanshuai
|
149b0a2186
|
神魂技能属性脚本添加
|
2021-10-28 15:09:51 +08:00 |
duhui
|
0cdf8dfe92
|
异常码
|
2021-10-28 14:50:02 +08:00 |
yuanshuai
|
540018f484
|
神魂修改
|
2021-10-28 14:23:27 +08:00 |
duhui
|
83501823b7
|
日志
|
2021-10-28 13:30:59 +08:00 |
duhui
|
0b0f021bf5
|
天眼日志添加
|
2021-10-28 13:20:24 +08:00 |
yuanshuai
|
fb7ed91a36
|
新版三界降魔活动提交
|
2021-10-28 12:05:47 +08:00 |
duhui
|
d5dc87e1cd
|
天眼,取消旧公会信息兼容
|
2021-10-28 11:59:22 +08:00 |
xuexinpeng
|
bb2ace9b66
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-10-28 11:31:53 +08:00 |
xuexinpeng
|
d62ad1c030
|
Merge branch 'master_prb_gn' of http://60.1.1.230/backend/jieling_server into master_prb_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/mission/TakeMissionRewardHandler.java
|
2021-10-28 11:22:58 +08:00 |
duhui
|
4b0447625d
|
七界试炼数数埋点
|
2021-10-28 10:23:14 +08:00 |
xuexinpeng
|
61a71d847c
|
去掉注释
|
2021-10-27 20:24:44 +08:00 |
xuexinpeng
|
18201b0de6
|
日志
|
2021-10-27 19:47:27 +08:00 |
xuexinpeng
|
6021025dc6
|
判空操作
|
2021-10-27 19:39:37 +08:00 |
xuexinpeng
|
f72b071efd
|
判空返回
|
2021-10-27 19:17:58 +08:00 |
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 |
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 |
duhui
|
7af7724b0c
|
Merge branch 'master_test_gn' into dh_dev_rediskey
|
2021-09-14 00:07:34 +08:00 |
duhui
|
987f4c6729
|
十绝阵删除key
|
2021-09-14 00:07:25 +08:00 |
jiahuiwen
|
8b3031f9b9
|
DEATH_PATH
|
2021-09-10 18:11:29 +08:00 |
duhui
|
989f45f926
|
Merge branch 'master_test_gn_zf' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java
|
2021-09-10 16:01:28 +08:00 |
duhui
|
2e03d50d47
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-09-10 15:59:42 +08:00 |
duhui
|
393635b930
|
第一版
|
2021-09-10 15:57:48 +08:00 |
yuanshuai
|
3f2c236333
|
开启修行等级限制
|
2021-09-10 15:09:03 +08:00 |
jiahuiwen
|
47a2e454aa
|
轩辕宝镜礼包只胜利推送
|
2021-09-10 14:46:02 +08:00 |
jiahuiwen
|
9b4654b3a6
|
优化删帮派boos排行榜 使用 keys *
|
2021-09-10 14:14:22 +08:00 |
yuanshuai
|
d1544c7cee
|
【四象心法】脚本修改
|
2021-09-10 09:43:43 +08:00 |
yuanshuai
|
e819858d77
|
Revert "四象心法"
This reverts commit 9178024c9f .
|
2021-09-09 20:25:53 +08:00 |
yuanshuai
|
31c1268a27
|
Revert "冲突修改"
This reverts commit 987c524652 .
|
2021-09-09 20:25:40 +08:00 |
duhui
|
bf4ed2054a
|
Merge branch 'master_prb_gn' into master_test_gn_zf
|
2021-09-09 19:25:44 +08:00 |
duhui
|
2972a394a5
|
礼包限购优化
|
2021-09-09 19:12:35 +08:00 |
duhui
|
d0acbe1f46
|
公会刷新日志
|
2021-09-09 17:09:23 +08:00 |
yuanshuai
|
987c524652
|
冲突修改
|
2021-09-09 17:03:29 +08:00 |
yuanshuai
|
ea4430e298
|
Merge branches 'master_test_gn' and 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-09-09 16:58:43 +08:00 |
yuanshuai
|
9178024c9f
|
四象心法
|
2021-09-09 16:58:28 +08:00 |
duhui
|
42bcad935b
|
封装优化
|
2021-09-09 16:57:33 +08:00 |
yuanshuai
|
70b92f1b91
|
Merge branch 'dev_dh_fourSpirit2' into master_test_gn
|
2021-09-09 16:36:32 +08:00 |
jiahuiwen
|
6020686a9c
|
宝物礼包推送修改
|
2021-09-09 16:32:45 +08:00 |
duhui
|
66f27217aa
|
开服失败提示
|
2021-09-09 11:25:49 +08:00 |
duhui
|
40911b8f24
|
大闹天宫,商店刷新优化
|
2021-09-08 14:13:23 +08:00 |
duhui
|
bdf8522a7f
|
编队
|
2021-09-07 11:50:01 +08:00 |
duhui
|
eb1dfc554e
|
Merge branch 'master_prb_gn' into master_test_gn_zf
|
2021-09-07 10:15:44 +08:00 |
DESKTOP-98AVA47\Administrator
|
9cc7e78add
|
登峰造极bug修改
|
2021-09-10 10:13:34 +08:00 |
duhui
|
e0612fe088
|
四灵,重复
|
2021-09-06 17:33:26 +08:00 |
xuexinpeng
|
c367fce248
|
玉虚论道
|
2021-09-06 11:33:10 +08:00 |
jiahuiwen
|
6405173b88
|
优化上报
|
2021-09-06 10:57:55 +08:00 |
duhui
|
1d58ba91e1
|
修改数数上报参数
|
2021-09-06 09:33:15 +08:00 |
DESKTOP-98AVA47\Administrator
|
b0c8a8627f
|
登峰造极bug处理
|
2021-09-05 02:21:32 +08:00 |
duhui
|
0a96f7d622
|
四灵,零点推送
|
2021-09-04 00:01:20 +08:00 |
duhui
|
d1815b4e8c
|
助战bug修改
|
2021-09-03 14:55:04 +08:00 |
duhui
|
79936df349
|
Merge branch 'master_test_gn' into master_prb_gn
|
2021-09-03 09:44:00 +08:00 |
duhui
|
587d5b33c5
|
报错修改
|
2021-09-03 09:43:25 +08:00 |
duhui
|
bd31b30334
|
Merge branch 'master_test_gn' into master_prb_gn
|
2021-09-02 21:06:22 +08:00 |
duhui
|
e0ee603f12
|
Merge branch 'dev_dh_fourSpirit2' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java
# serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java
|
2021-09-02 21:02:20 +08:00 |
duhui
|
3bb466b720
|
热更去除
|
2021-09-04 12:58:43 +08:00 |
duhui
|
40f1b0769b
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-09-04 12:58:05 +08:00 |
duhui
|
c37f2e6fb7
|
战力显示
|
2021-09-04 12:54:25 +08:00 |
duhui
|
a392424eba
|
罗浮争锋,机器人等级问题处理
|
2021-09-04 12:37:12 +08:00 |
duhui
|
a4730edbd0
|
跨服十绝阵总排行,占阵次数不对修改
|
2021-09-03 10:32:52 +08:00 |
duhui
|
c7a9262a34
|
英雄属性同步修改
|
2021-09-02 18:10:50 +08:00 |
duhui
|
33c1e09d65
|
修改编队
|
2021-09-02 17:30:40 +08:00 |
duhui
|
3592547ada
|
助战英雄战力
|
2021-09-02 15:25:21 +08:00 |
duhui
|
ebff88ed90
|
推送礼包
|
2021-09-02 13:52:12 +08:00 |
jiahuiwen
|
0cf0f239d0
|
宝物品质 宝物精炼 轩辕宝境 礼包推送
|
2021-09-02 13:46:53 +08:00 |
xuexinpeng
|
6890e0b2dc
|
鸿蒙碑
|
2021-09-02 11:45:47 +08:00 |
xuexinpeng
|
3824976fb6
|
玉虚论道
|
2021-09-02 11:44:00 +08:00 |
duhui
|
bb94e531e8
|
鸿蒙阵bug修改
|
2021-09-02 11:39:53 +08:00 |
duhui
|
130e7fd09b
|
数数公共事件添加
|
2021-09-02 10:58:07 +08:00 |
duhui
|
23b4cb9eb8
|
四灵,跑马灯
|
2021-09-01 18:14:42 +08:00 |
duhui
|
11073857f8
|
四灵bug修改和功能优化
|
2021-09-01 16:50:05 +08:00 |
duhui
|
38130a2aa0
|
四灵,排行榜
|
2021-08-31 17:53:04 +08:00 |
duhui
|
bf20b62bf8
|
报错修改
|
2021-08-31 11:23:37 +08:00 |
duhui
|
771c39577e
|
Merge branch 'master_test_gn' into dev_dh_fourSpirit2
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/family/CrossDeathPathLogic.java
|
2021-08-31 11:19:47 +08:00 |
duhui
|
a720fca31c
|
四灵
|
2021-08-31 11:09:18 +08:00 |
duhui
|
19c3a04559
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into dev_dh_fourSpirit2
|
2021-09-02 15:17:00 +08:00 |
duhui
|
fed17b2767
|
获取好友信息报错,兼容
|
2021-09-02 11:55:59 +08:00 |
duhui
|
52e620b449
|
跨服十绝阵,推送添加服务器名字
|
2021-08-30 18:19:51 +08:00 |
duhui
|
7c534b9955
|
Merge branch 'master_test_gn' into master_test_gn_zf
|
2021-08-30 18:00:40 +08:00 |
duhui
|
c880ba81a0
|
跨服十绝阵,次数刷新问题
|
2021-08-30 18:00:13 +08:00 |
DESKTOP-98AVA47\Administrator
|
cacac662d3
|
duhui,青龙秘宝提交
|
2021-10-01 00:06:09 +08:00 |
duhui
|
73200c6578
|
Merge branch 'master_test_gn_arena' into master_test_gn
|
2021-09-02 20:32:47 +08:00 |
duhui
|
2131ee0ec2
|
开服十绝阵修改
|
2021-09-02 20:05:34 +08:00 |
duhui
|
e8eb2d531a
|
跨服十绝阵,结束
|
2021-09-02 18:44:21 +08:00 |
duhui
|
c934e39777
|
跨服十绝阵,时间优化
|
2021-09-02 18:01:02 +08:00 |
duhui
|
60df6bcf8f
|
十绝阵推送
|
2021-09-02 17:38:56 +08:00 |
duhui
|
ccd8cf89c3
|
跨服十绝阵
|
2021-09-02 17:00:42 +08:00 |
duhui
|
610a6e6ec7
|
跨服十绝阵
|
2021-09-02 15:20:25 +08:00 |
duhui
|
607a2b569a
|
跨服十绝阵
|
2021-09-02 13:49:36 +08:00 |
duhui
|
6f02df1ee8
|
跨服十绝阵
|
2021-08-30 17:22:54 +08:00 |
duhui
|
6c60f45c88
|
Merge branch 'master_test_gn' into master_test_gn_arena
|
2021-08-30 17:21:10 +08:00 |
duhui
|
327bbe281d
|
Merge branch 'master_test_gn' into master_test_gn_zf
|
2021-08-30 13:45:56 +08:00 |
duhui
|
6ae1932181
|
Merge branch 'master_test_gn' into master_test_gn_zf
|
2021-09-02 20:34:20 +08:00 |
duhui
|
88f82ae849
|
日志
|
2021-09-02 17:33:51 +08:00 |
duhui
|
deb937f6cc
|
跨服十绝阵
|
2021-08-27 16:50:34 +08:00 |
duhui
|
92defedfc4
|
Merge branch 'dh_dev_webpay' into master_test_gn
|
2021-08-27 16:11:51 +08:00 |
duhui
|
605b2e9952
|
公会推荐分页
|
2021-08-27 16:00:31 +08:00 |
duhui
|
170796f61d
|
添加功能开启条件验证
|
2021-08-27 15:59:33 +08:00 |
duhui
|
a4d388f092
|
功能开关,条件判断
|
2021-08-27 15:47:11 +08:00 |
duhui
|
df7a84b206
|
十绝阵,时间
|
2021-08-27 15:30:20 +08:00 |
duhui
|
f5688ef3a5
|
无用代码
|
2021-08-27 15:17:46 +08:00 |
duhui
|
d4fbda936b
|
网页支付,青龙秘宝
|
2021-08-27 14:44:44 +08:00 |
duhui
|
839e2a6fac
|
网页支付,缥缈之旅
|
2021-08-27 11:58:04 +08:00 |
duhui
|
0d2822a5f1
|
跨服十绝阵,十绝阵开启判断
|
2021-08-27 11:56:50 +08:00 |
duhui
|
2d12976dc4
|
四灵编队
|
2021-08-27 11:47:26 +08:00 |
xuexinpeng
|
3c15f4b049
|
bug:云游商人次数 挑战山河社稷宝箱不算挑战
|
2021-08-27 11:36:02 +08:00 |
duhui
|
d3098bfa67
|
网页支付,青龙战令特殊处理
|
2021-08-27 11:33:17 +08:00 |
duhui
|
663ca87868
|
Merge branch 'master_test_gn' into master_test_gn_arena
|
2021-08-27 09:51:49 +08:00 |
duhui
|
645352464e
|
网页支付,豪华基金问题处理
|
2021-08-26 18:25:56 +08:00 |
duhui
|
161d7ff900
|
罗浮争锋,排行榜头像问题处理
|
2021-08-26 17:55:27 +08:00 |
duhui
|
7f5a0d7432
|
Merge branch 'dh_dev_webpay' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-08-26 17:54:51 +08:00 |
duhui
|
abd7351a15
|
网页支付,不开的活动删除购买礼包
|
2021-08-26 17:45:50 +08:00 |
duhui
|
275f8976b3
|
去除功能报错日志
|
2021-08-26 14:19:44 +08:00 |
duhui
|
d5fb23c220
|
网页支付
|
2021-08-26 11:11:30 +08:00 |
duhui
|
e777765c9e
|
四灵试炼,老玩家开活动
|
2021-08-26 10:04:23 +08:00 |
duhui
|
12e8e10fd6
|
代码优化
|
2021-08-27 16:43:51 +08:00 |
duhui
|
bd442dce22
|
网页支付,公会红包
|
2021-08-25 18:17:39 +08:00 |
duhui
|
a298850c48
|
网页支付
|
2021-08-25 17:32:14 +08:00 |
duhui
|
c7e2243818
|
网页支付,礼包优化
|
2021-08-27 16:51:48 +08:00 |
duhui
|
081a3bc8f0
|
跨服十绝阵
|
2021-08-25 17:13:40 +08:00 |
xuexinpeng
|
5c9c7282e7
|
工会临时改成推荐20个 下个版本改成分页
|
2021-08-24 19:26:25 +08:00 |
duhui
|
48c0b940fe
|
十绝阵,不显示跨服
|
2021-08-27 16:58:36 +08:00 |
xuexinpeng
|
f718f99b77
|
Merge branch 'master_test_gn' into master_prb_gn
|
2021-08-24 14:52:15 +08:00 |
duhui
|
5e561f5fcd
|
四灵试炼,代码合并
|
2021-08-24 13:40:29 +08:00 |
duhui
|
6e601e035a
|
规范
|
2021-08-31 11:56:57 +08:00 |
duhui
|
3b843d949b
|
四灵代码合并
|
2021-08-31 11:56:33 +08:00 |
xuexinpeng
|
936170391e
|
十绝阵每日刷新次数不重置
|
2021-08-24 11:05:21 +08:00 |
duhui
|
e62e7a4ed9
|
日志更新
|
2021-08-20 21:31:46 +08:00 |
duhui
|
c3f634740d
|
日志更新
|
2021-08-20 21:27:19 +08:00 |
duhui
|
5619ab66a1
|
日志
|
2021-08-20 21:19:29 +08:00 |
duhui
|
d02218c3b0
|
在线奖励bug修改
|
2021-08-20 20:27:43 +08:00 |
xuexinpeng
|
299a608590
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-08-19 20:05:55 +08:00 |
xuexinpeng
|
77ba8534e3
|
删除无用代码
|
2021-08-19 20:04:34 +08:00 |
xuexinpeng
|
03ef898d14
|
首发邮件
|
2021-08-19 19:51:29 +08:00 |
xuexinpeng
|
a128c5ea74
|
首发邮件更改
|
2021-08-19 17:00:48 +08:00 |
xuexinpeng
|
821d1425f6
|
注释:功能开关和礼包开关 后续优化
|
2021-08-19 15:46:16 +08:00 |
xuexinpeng
|
03672cd509
|
加个判空操作
|
2021-08-19 11:45:19 +08:00 |
duhui
|
08c8b779bc
|
网页支付
|
2021-08-18 17:34:11 +08:00 |
jiahuiwen
|
f9ab39d529
|
修改参数
|
2021-08-17 18:31:58 +08:00 |
jiahuiwen
|
3efe09db22
|
检查代码
|
2021-08-17 18:00:45 +08:00 |
jiahuiwen
|
461de0b494
|
参数调整
|
2021-08-17 17:56:44 +08:00 |
xuexinpeng
|
bec145d577
|
注释掉寻宝迷踪
|
2021-08-16 18:35:43 +08:00 |
xuexinpeng
|
35c0be054c
|
log测试
|
2021-08-16 18:11:08 +08:00 |
xuexinpeng
|
d517f05b82
|
Merge branch 'master_test_gn_zf' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
|
2021-08-16 14:40:38 +08:00 |
duhui
|
b30ca90cec
|
关闭跨服十绝阵
|
2021-08-16 14:12:15 +08:00 |
duhui
|
be862b5e17
|
mongo配置修改
|
2021-08-16 11:28:35 +08:00 |
xuexinpeng
|
23d17dc479
|
首发邮件更改
|
2021-08-16 15:34:47 +08:00 |
lvxinran
|
c1a1219ff2
|
判断顺序修改
|
2021-08-14 18:01:34 +08:00 |
lvxinran
|
f7cfb10a8e
|
删除英雄代码提交
|
2021-08-14 17:13:08 +08:00 |
lvxinran
|
da50d8f7cf
|
删除无用
|
2021-08-14 16:57:26 +08:00 |
lvxinran
|
f40115836e
|
暂时不删除
|
2021-08-14 16:54:04 +08:00 |
lvxinran
|
f24f6954f8
|
修复英雄数据
|
2021-08-14 16:01:12 +08:00 |
lvxinran
|
99f6f425b8
|
空判断packid
|
2021-08-14 14:20:12 +08:00 |
xuexinpeng
|
381edf838d
|
游心gm 20019服错发邮件
|
2021-08-16 18:58:49 +08:00 |
duhui
|
6c56cba35f
|
十绝阵跨服
|
2021-08-13 10:37:31 +08:00 |
xuexinpeng
|
e26b239f1c
|
太初密卷
|
2021-08-13 10:01:20 +08:00 |
lvxinran
|
cc191fe8c1
|
添加return
|
2021-08-12 18:45:48 +08:00 |
lvxinran
|
b9661c9a77
|
处理报错
|
2021-08-12 18:35:17 +08:00 |
duhui
|
abba6adf16
|
开启跨服十绝阵
|
2021-08-12 17:12:02 +08:00 |
xuexinpeng
|
849b906f61
|
首发预约邮件
|
2021-08-16 16:31:38 +08:00 |
xuexinpeng
|
2aa6058f2e
|
首发预约邮件
|
2021-08-16 16:04:36 +08:00 |
lvxinran
|
9af6ed2721
|
车迟斗法记录修改
|
2021-08-12 15:11:11 +08:00 |
lvxinran
|
d7638c3829
|
防止报错
|
2021-08-12 13:36:05 +08:00 |
xuexinpeng
|
c5b9927feb
|
寻宝迷踪
|
2021-08-09 18:22:54 +08:00 |
lvxinran
|
3018ad8789
|
修改掉落
|
2021-08-09 11:30:39 +08:00 |
xuexinpeng
|
e7f5d7dcfd
|
功能礼包 封禁
|
2021-08-06 17:48:25 +08:00 |
lvxinran
|
141da04281
|
注释无用代码
|
2021-08-05 20:51:31 +08:00 |
duhui
|
7d000190d4
|
跨服战斗中显示皮肤
|
2021-08-05 16:25:15 +08:00 |
lvxinran
|
87911d51f6
|
数数上报修改
|
2021-08-05 16:02:57 +08:00 |
xuexinpeng
|
277938ccd3
|
Merge branch 'master_prb_gn' into master_test_gn_zf
|
2021-08-05 11:49:20 +08:00 |
xuexinpeng
|
8f92434f12
|
【日任务】新做的日任务,会记点将台抽卡次数(有新将活动只记新将抽卡次数)
|
2021-08-05 11:46:39 +08:00 |
xuexinpeng
|
84d0cb053a
|
新做的日任务,会记点将台抽卡次数(有新将活动只记新将抽卡次数)
|
2021-08-05 11:32:38 +08:00 |
duhui
|
70a16ceaec
|
跨服排行榜自己排名显示问题处理
|
2021-08-05 10:46:20 +08:00 |
lvxinran
|
c7a897e3b9
|
packid修改
|
2021-08-04 21:41:47 +08:00 |
lvxinran
|
9bd09974d9
|
mongo慢查询修改
|
2021-08-04 21:09:06 +08:00 |
lvxinran
|
0de9a4ee30
|
打开图鉴功能
|
2021-08-04 17:50:20 +08:00 |
duhui
|
8f49866e06
|
跨服bug热更
|
2021-08-04 16:56:21 +08:00 |
duhui
|
527186345c
|
跨服显示问题
|
2021-08-04 16:51:31 +08:00 |
duhui
|
b14a43d74e
|
跨服排行,展示宝物和英雄皮肤
|
2021-08-04 16:05:50 +08:00 |
duhui
|
d876273349
|
跨服切磋问题处理,无效引用删除
|
2021-08-04 15:45:25 +08:00 |
lvxinran
|
2e7714f94d
|
mongo慢查询修改
|
2021-08-04 15:16:16 +08:00 |
lvxinran
|
56f9773f7b
|
暂时关闭图鉴激活功能
|
2021-08-04 10:51:42 +08:00 |
lvxinran
|
0d7dde1926
|
机器人天赋修改
|
2021-08-03 17:25:29 +08:00 |
duhui
|
8e7133efa3
|
罗浮争锋排行榜服务器名显示问题
|
2021-08-03 16:44:22 +08:00 |
duhui
|
ae56c60c1e
|
罗浮争锋排行榜问题
|
2021-08-03 09:36:35 +08:00 |
lvxinran
|
d0601f797c
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-08-07 19:24:57 +08:00 |
lvxinran
|
e875b3688d
|
后续添加
|
2021-08-07 19:24:47 +08:00 |
lvxinran
|
3048f8a305
|
充值前接口检测
|
2021-08-07 17:18:46 +08:00 |
lvxinran
|
346feae774
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-08-07 15:04:25 +08:00 |
lvxinran
|
8e3790eaa6
|
青龙秘宝空邮件
|
2021-08-07 15:04:16 +08:00 |
lvxinran
|
3e9de07975
|
提示信息修改
|
2021-08-07 00:17:47 +08:00 |
duhui
|
ce261cb562
|
Merge branch 'master_test_gn_arena' into master_test_gn
|
2021-08-02 18:31:01 +08:00 |
duhui
|
c5686fcd14
|
跨服修改
|
2021-08-16 00:16:20 +08:00 |
duhui
|
69a15015de
|
跨服排行修改
|
2021-08-16 00:03:52 +08:00 |
duhui
|
d08086fe78
|
跨服bug提交
|
2021-08-09 17:44:19 +08:00 |
duhui
|
55d4050347
|
Merge branch 'master_test_gn_arena' into master_test_gn
|
2021-08-02 14:38:25 +08:00 |
duhui
|
ea93c562cc
|
跨服修改
|
2021-08-02 14:37:52 +08:00 |
lvxinran
|
222e8b18b4
|
Merge branch 'master_test_gn_arena' of http://60.1.1.230/backend/jieling_server into master_test_gn_arena
|
2021-08-07 14:03:40 +08:00 |
lvxinran
|
cde4df5928
|
罗浮排行等级不一致
|
2021-08-07 14:03:30 +08:00 |
duhui
|
cc0574a4a6
|
跨服修改
|
2021-08-02 13:34:35 +08:00 |
duhui
|
4f8f6cd44d
|
跨服战力补充提交
|
2021-08-02 11:18:54 +08:00 |
duhui
|
fdf2e28b6f
|
跨服排行战力显示问题
|
2021-08-02 11:18:03 +08:00 |
duhui
|
28a7882999
|
跨服bug修改
|
2021-09-13 00:29:30 +08:00 |
lvxinran
|
e6f55bb76f
|
删掉错误物品
|
2021-08-02 10:56:13 +08:00 |
lvxinran
|
3e396b771a
|
错误提示修改
|
2021-08-02 10:55:52 +08:00 |
lvxinran
|
5c0a4802b9
|
没小怪时不能使用炸弹
|
2021-08-02 10:55:37 +08:00 |
xuexinpeng
|
9797af171b
|
【巅峰赛】赛开服第一天就解锁了巅峰
|
2021-07-31 23:59:36 +08:00 |
xuexinpeng
|
504271bdc1
|
【巅峰赛】赛开服第一天就解锁了巅峰
|
2021-08-06 00:03:08 +08:00 |