mengchengzhen
|
8af8ba001c
|
称号优化
|
2021-04-12 15:06:14 +08:00 |
lvxinran
|
a765b7ec45
|
车迟斗法时间间隔修改
|
2021-04-12 00:33:31 +08:00 |
lvxinran
|
be6a1b07d4
|
主题活动刷新修改
|
2021-04-12 00:33:17 +08:00 |
lvxinran
|
b9503983ba
|
报空修改
|
2021-04-11 00:00:05 +08:00 |
lvxinran
|
153c9d618e
|
修改报空
|
2021-04-10 23:43:56 +08:00 |
lvxinran
|
94fec0387f
|
邮件修改
|
2021-04-12 23:32:38 +08:00 |
duhui
|
65b0008884
|
Merge branch 'master_test' into master_test_gn
|
2021-04-09 15:22:08 +08:00 |
duhui
|
3262b65099
|
gm,扶持功能
|
2021-04-09 15:21:47 +08:00 |
duhui
|
4d393b942f
|
Merge branch 'master_test' into master_test_gn
|
2021-04-07 14:32:19 +08:00 |
duhui
|
ad665bf5e5
|
魂印图鉴,英雄装备中魂印兼容
|
2021-04-07 14:31:46 +08:00 |
duhui
|
523501b6bf
|
Merge branch 'master_test' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
|
2021-04-07 13:38:27 +08:00 |
duhui
|
286f1e42b8
|
魂印图鉴,旧数据容错处理
|
2021-04-07 13:34:29 +08:00 |
duhui
|
323be12310
|
魂印图鉴,旧数据容错
|
2021-04-07 11:52:45 +08:00 |
mengchengzhen
|
bce07ebf64
|
Merge branch 'master_test_gn_mcz' into master_test_gn
|
2021-04-06 15:54:48 +08:00 |
mengchengzhen
|
b6031f08de
|
排行榜战力刷新优化
|
2021-04-06 15:53:00 +08:00 |
mengchengzhen
|
b4029e7fd9
|
15
|
2021-04-06 15:51:32 +08:00 |
mengchengzhen
|
12a6f5d580
|
15
|
2021-04-16 20:47:46 +08:00 |
whb
|
8acb5abc25
|
天书秘卷
|
2021-04-02 10:36:36 +08:00 |
mengchengzhen
|
6b7a26a1e0
|
战力更新
|
2021-04-16 20:48:57 +08:00 |
lvxinran
|
f6f0a20294
|
删除无用打印
|
2021-04-01 16:16:57 +08:00 |
mengchengzhen
|
f07c099715
|
Merge branch 'master_test_gn' into master_test_gn_mcz
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java
|
2021-04-01 13:45:41 +08:00 |
lvxinran
|
ee53f583f5
|
归元修改
|
2021-05-19 00:18:01 +08:00 |
lvxinran
|
448c13c550
|
福星高照计时修改
|
2021-05-19 00:01:18 +08:00 |
lvxinran
|
15bd393c89
|
福星高照
|
2021-05-02 20:26:14 +08:00 |
lvxinran
|
0228b97402
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-04-01 13:57:43 +08:00 |
lvxinran
|
bfe16940b2
|
储值活动、聊天修改 提交
|
2021-04-01 13:57:12 +08:00 |
lvxinran
|
c4b4415e00
|
活动类型添加
|
2021-03-31 21:40:07 +08:00 |
mengchengzhen
|
859daed04b
|
15
|
2021-03-30 16:41:53 +08:00 |
whb
|
3db8b587be
|
Merge branch 'master_test_gn' into master_test_gn_whb
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/HeroNodeGetInfoRequestHandler.java
|
2021-03-30 13:50:29 +08:00 |
mengchengzhen
|
2d9ad53842
|
Merge branch 'master_test_gn' into master_test_gn_mcz
|
2021-03-29 18:09:37 +08:00 |
mengchengzhen
|
c6df17e07b
|
坐骑,皮肤,称号
|
2021-03-29 18:02:38 +08:00 |
duhui
|
a7e306a564
|
惊喜礼盒时间优化
|
2021-03-29 17:05:39 +08:00 |
duhui
|
24323d620d
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-03-29 15:53:55 +08:00 |
lvxinran
|
80df35b883
|
头像入库修改
|
2021-04-01 15:12:08 +08:00 |
lvxinran
|
638dc34630
|
删除无用日志
|
2021-04-01 15:00:30 +08:00 |
lvxinran
|
723d4336db
|
大闹天宫首次刷新bug修改
|
2021-04-01 14:03:19 +08:00 |
duhui
|
63b0989a9e
|
三界降魔发放奖励
|
2021-03-29 15:52:29 +08:00 |
lvxinran
|
e39ac0cd61
|
冲突修改
|
2021-03-29 14:29:35 +08:00 |
lvxinran
|
d080a9a0d8
|
Merge branch 'master_online_gn' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java
|
2021-03-29 14:26:02 +08:00 |
lvxinran
|
ad35dedf3b
|
0元不算首冲修改,公会副本推送修改
|
2021-03-31 09:13:49 +08:00 |
lvxinran
|
1b472203e7
|
报错修改
|
2021-03-27 18:45:00 +08:00 |
lvxinran
|
4fa6b8e8af
|
冲突修改
|
2021-03-27 16:43:49 +08:00 |
lvxinran
|
2b06894b07
|
merge2
|
2021-03-27 16:40:32 +08:00 |
lvxinran
|
5f335130c9
|
merge
|
2021-03-27 16:30:56 +08:00 |
whb
|
7c14f87a04
|
图鉴
|
2021-03-25 16:05:35 +08:00 |
duhui
|
55dc3c50af
|
牛气冲天
|
2021-03-25 14:07:35 +08:00 |
lvxinran
|
4c0ce0872c
|
工会副本修改
|
2021-03-23 03:30:42 +08:00 |
lvxinran
|
6f8e28efcd
|
充值成功indication
|
2021-03-20 21:17:16 +08:00 |
lvxinran
|
70c50ed74b
|
删除无用日志
|
2021-03-20 14:59:55 +08:00 |
lvxinran
|
58713e49da
|
添加日志
|
2021-04-02 00:24:40 +08:00 |
lvxinran
|
97b65368e2
|
添加日志
|
2021-04-02 00:10:33 +08:00 |
lvxinran
|
c6286f1834
|
添加日志
|
2021-04-01 23:51:00 +08:00 |
lvxinran
|
4f9f8a76eb
|
删除无用公会代码
|
2021-03-19 23:26:07 +08:00 |
whb
|
61ffca630c
|
羁绊激活
|
2021-03-19 18:41:28 +08:00 |
lvxinran
|
6907229c3f
|
修复代码
|
2021-03-19 17:49:49 +08:00 |
duhui
|
63a8cc5b33
|
Merge branch 'master_test' into master_test_gn
|
2021-03-19 17:26:26 +08:00 |
duhui
|
7786fa994a
|
大闹天宫,星级突破修改
|
2021-03-19 17:25:40 +08:00 |
duhui
|
ba5554e271
|
Merge branch 'master_test' into master_test_gn
|
2021-03-19 16:58:18 +08:00 |
duhui
|
206a9496d5
|
星级突破等级上限修改
|
2021-03-19 16:54:43 +08:00 |
lvxinran
|
888c11dde2
|
国服设置第十四天后开启天宫秘宝
|
2021-03-19 16:43:04 +08:00 |
duhui
|
ce52e73800
|
Merge branch 'master_test' into master_test_gn
|
2021-03-19 16:30:58 +08:00 |
duhui
|
47ac15c42f
|
修改求平均等级逻辑
|
2021-03-19 16:30:39 +08:00 |
duhui
|
88fba2ddb6
|
Merge branch 'master_test' into master_test_gn
|
2021-03-19 16:25:15 +08:00 |
duhui
|
5bec625ba5
|
大闹天宫,招募英雄限制最大星级和最低等级
|
2021-03-19 16:18:24 +08:00 |
mengchengzhen
|
1a197070ca
|
Merge branch 'master_test' into master_test_gn
|
2021-03-19 15:11:07 +08:00 |
mengchengzhen
|
54dabc2564
|
大闹天宫优化
|
2021-03-19 15:10:36 +08:00 |
lvxinran
|
39e39e3ef6
|
tapdb参数修改
|
2021-03-19 14:12:43 +08:00 |
mengchengzhen
|
baeb7e03cd
|
Merge branch 'master_test' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ExpeditionManager.java
|
2021-03-19 14:06:44 +08:00 |
mengchengzhen
|
66bea3f2c5
|
大闹天宫优化
|
2021-03-19 14:05:16 +08:00 |
mengchengzhen
|
86103f1067
|
大闹天宫 优化
|
2021-03-19 13:43:45 +08:00 |
lvxinran
|
1c97143e97
|
大闹天宫修改
|
2021-03-18 22:35:49 +08:00 |
lvxinran
|
f0677a6706
|
节点信息修改
|
2021-03-18 18:55:47 +08:00 |
lvxinran
|
3905b8b26d
|
Merge branch 'master_test' into master_test_gn
|
2021-03-18 18:01:51 +08:00 |
lvxinran
|
dc3cb7f760
|
大闹天宫保存血量
|
2021-03-18 18:01:35 +08:00 |
lvxinran
|
889b1d0513
|
Merge branch 'master_test' into master_test_gn
|
2021-03-18 16:58:21 +08:00 |
lvxinran
|
8f0f004ec6
|
血量修改
|
2021-03-18 16:57:42 +08:00 |
lvxinran
|
8b4c3c6703
|
Merge branch 'master_test_hw' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/HeroNodeGetInfoRequestHandler.java
|
2021-03-18 16:19:50 +08:00 |
duhui
|
29bf5b17be
|
代码修复
|
2021-03-18 16:16:45 +08:00 |
lvxinran
|
129a0cdaa1
|
Merge branch 'master_test_hw' into master_test_gn
|
2021-03-18 15:50:51 +08:00 |
lvxinran
|
5f5562938b
|
贪婪节点英雄信息
|
2021-03-18 15:50:35 +08:00 |
DESKTOP-98AVA47\Administrator
|
530468ba0c
|
大闹天宫,试炼节点调优
|
2021-03-20 02:42:45 +07:00 |
lvxinran
|
ad85797051
|
贪婪节点没有英雄信息
|
2021-03-18 15:48:07 +08:00 |
lvxinran
|
bce5d3c34c
|
buff值代码修改
|
2021-03-18 13:52:12 +08:00 |
lvxinran
|
9c684c7c8f
|
int long 修改
|
2021-03-18 11:55:54 +08:00 |
lvxinran
|
2b61537ab7
|
活跃度修改
|
2021-03-17 16:41:28 +08:00 |
duhui
|
1c518d0f73
|
大闹天宫,怪物魂印逻辑修改
|
2021-03-17 15:10:21 +08:00 |
duhui
|
1cd71db5cb
|
1.大闹天宫,招募英雄逻辑重写
2.竞技场,机器人突破id计算逻辑重写
3.公会排行榜,添加非空验证
|
2021-03-17 14:09:55 +08:00 |
lvxinran
|
aa9fee7c60
|
buff类型回滚
|
2021-03-16 17:43:22 +08:00 |
duhui
|
bf0ab56a93
|
大闹天宫,随机阵容问题处理
|
2021-03-16 11:14:27 +08:00 |
duhui
|
028c534428
|
四灵试炼,助战重写(算上鸿蒙阵加成)
|
2021-03-16 09:58:26 +08:00 |
duhui
|
0567561cee
|
大闹天宫,boos节点和精英节点战力问题解决
|
2021-03-16 09:49:37 +08:00 |
mengchengzhen
|
409b7a3468
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-03-15 18:50:19 +08:00 |
mengchengzhen
|
eff18fe054
|
danaotiangong update
|
2021-03-15 18:50:12 +08:00 |
duhui
|
15fbc91a9b
|
原有的升级通知更换到setLevel外边,因为这个方法不只是升级用,也可能归送
hero实现clone接口,对象克隆
|
2021-03-15 16:18:16 +08:00 |
lvxinran
|
6804684744
|
非空判断
|
2021-03-15 11:11:21 +08:00 |
lvxinran
|
8966f25c5b
|
限时神装
|
2021-03-15 11:09:03 +08:00 |
lvxinran
|
72d408063d
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-03-15 09:52:06 +08:00 |
lvxinran
|
9fbb26d855
|
离线逻辑修改
|
2021-03-15 09:52:01 +08:00 |
mengchengzhen
|
8fa36b3b1a
|
dntg bug
|
2021-03-11 21:01:10 +08:00 |
duhui
|
9e488abe4e
|
鸿蒙阵突破等级
|
2021-03-11 18:34:36 +08:00 |
duhui
|
f086046586
|
符号
|
2021-03-11 18:27:32 +08:00 |
duhui
|
e01097fabc
|
鸿蒙阵突破共鸣问题
|
2021-03-11 18:19:09 +08:00 |
duhui
|
f85e86a2eb
|
公告问题
|
2021-03-11 17:12:52 +08:00 |
mengchengzhen
|
d4e5a2b6a4
|
holy 37type update
|
2021-03-11 17:02:35 +08:00 |
duhui
|
888a04a023
|
助战小bug修改
|
2021-03-11 11:19:31 +08:00 |
lvxinran
|
f0abc728be
|
阈值修改提交
|
2021-03-10 17:29:28 +08:00 |
lvxinran
|
dbcb1f98f9
|
阈值修改
|
2021-03-10 16:56:08 +08:00 |
lvxinran
|
5d7fad815e
|
修改阈值冲突
|
2021-03-10 16:16:22 +08:00 |
lvxinran
|
ecde209b04
|
Merge branch 'master_test_gn' into master_test_gn_datatype
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/CommonStaticConfig.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java
# tablemanager/src/main/java/config/SCHero.java
|
2021-03-10 16:13:37 +08:00 |
duhui
|
b1d5c773c2
|
四灵试炼,跑马灯
|
2021-03-10 16:09:24 +08:00 |
mengchengzhen
|
b83f8583ec
|
danaotiangong battlenode
|
2021-03-10 15:17:47 +08:00 |
duhui
|
14f3dd54e3
|
建木神树,跑马灯
|
2021-03-10 11:22:58 +08:00 |
duhui
|
3ff5d19972
|
四灵试炼,跑马灯
|
2021-03-10 11:16:21 +08:00 |
duhui
|
06a18387ed
|
Merge branch 'master_test_hw' into dh_dev_HavocInHeaven
|
2021-03-10 11:02:56 +08:00 |
mengchengzhen
|
9fe8dd3e5f
|
大闹天宫圣物修改
|
2021-03-10 10:28:59 +08:00 |
duhui
|
53aa975368
|
Revert "查看他人装备共鸣"
This reverts commit 36b669d9e9 .
|
2021-03-09 16:06:17 +08:00 |
duhui
|
e46c9b42ab
|
二次提交
|
2021-03-09 16:04:12 +08:00 |
duhui
|
36b669d9e9
|
查看他人装备共鸣
|
2021-03-09 16:02:49 +08:00 |
lvxinran
|
f2a0fffe24
|
敏感字修改
|
2021-03-09 15:48:48 +08:00 |
duhui
|
0b60f9c4f7
|
表字段添加,战力排行榜查看他人共鸣熟悉
|
2021-03-09 15:29:49 +08:00 |
lvxinran
|
269d7e07e2
|
越南敏感字
|
2021-03-08 16:00:55 +08:00 |
duhui
|
3a3b2725e3
|
redis批量查询key问题处理
|
2021-03-08 15:29:40 +08:00 |
duhui
|
50ce973616
|
Merge branch 'master_test_hw' into master_test_hw_four_challenge
|
2021-03-08 15:21:46 +08:00 |
duhui
|
cf740db4e4
|
1.大闹天宫创建节点结构修改,有旧代码删除逻辑
2.公用静态类部分map添加注释,无逻辑修改
3.其他文件无用引导包删除
|
2021-03-08 15:12:05 +08:00 |
lvxinran
|
927d7d3352
|
邮件移交会长修改
|
2021-03-07 21:58:14 +08:00 |
lvxinran
|
0e1dad5f4a
|
Merge branch 'master_test_hw' into master_test_hw_i18n
|
2021-03-05 18:17:16 +08:00 |
lvxinran
|
3f97a7c4b9
|
起名修改
|
2021-03-06 09:51:45 +08:00 |
lvxinran
|
e52d39d346
|
邮件本地化修改
|
2021-03-06 06:48:02 +08:00 |
duhui
|
c766cc8622
|
等级上限容错
|
2021-03-05 16:59:25 +08:00 |
lvxinran
|
6b6fc590b0
|
修改Error
|
2021-03-05 16:20:21 +08:00 |
lvxinran
|
183326536f
|
错误消息修改
|
2021-03-05 14:37:38 +08:00 |
duhui
|
bbf63c4918
|
试炼节点bug处理
|
2021-03-05 13:59:51 +08:00 |
lvxinran
|
a66380f1fc
|
获得宝物本地化提示修改
|
2021-03-05 12:36:34 +08:00 |
whb
|
e0daeb180d
|
大闹天宫招募2
|
2021-03-05 11:29:10 +08:00 |
whb
|
0ef63cdd79
|
大闹天宫招募
|
2021-03-05 10:54:42 +08:00 |
duhui
|
9cc1fd8fc9
|
大闹天宫,获取排行榜速度优化
|
2021-03-05 10:11:35 +08:00 |
duhui
|
25aa13bfd5
|
大闹天宫,圣物刷新,去除已刷出得圣物
|
2021-03-04 14:09:35 +08:00 |
lvxinran
|
220954d949
|
Merge branch 'dh_dev_HavocInHeaven' of http://60.1.1.230/backend/jieling_server into dh_dev_HavocInHeaven
|
2021-03-05 09:07:33 +08:00 |
lvxinran
|
bc75aaade9
|
贪婪节点奖励修改
|
2021-03-05 09:06:47 +08:00 |
lvxinran
|
ce12694f5a
|
Merge branch 'dh_dev_HavocInHeaven' of http://60.1.1.230/backend/jieling_server into dh_dev_HavocInHeaven
|
2021-03-04 09:48:33 +08:00 |
lvxinran
|
52b8d83bab
|
试炼节点修改
|
2021-03-04 09:48:27 +08:00 |
duhui
|
ba269c61b8
|
大闹天宫,灵兽问题处理
|
2021-03-03 17:16:03 +08:00 |
duhui
|
e4e241192a
|
获取灵兽信息,代码冗余处理
|
2021-03-03 14:18:27 +08:00 |
duhui
|
55500f6aaa
|
大闹天宫,用户等级修正和遇敌灵兽添加
|
2021-03-03 13:58:12 +08:00 |
duhui
|
c99f1bea67
|
机器人类
|
2021-03-02 17:54:24 +08:00 |
duhui
|
76b9919dbb
|
Merge branch 'master_online_hw' into master_test_hw
|
2021-03-02 10:02:45 +08:00 |
lvxinran
|
6076d7d47f
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-03-02 12:11:34 +08:00 |
lvxinran
|
63aa8f13f3
|
断线重连 心跳修改
|
2021-03-02 12:11:25 +08:00 |
lvxinran
|
f87beb7368
|
删除无用日志
|
2021-03-06 04:44:59 +08:00 |
duhui
|
3dbc87013d
|
邮件,非道具邮件可重复领取问题处理
|
2021-03-02 10:01:53 +08:00 |
duhui
|
78709a72e8
|
大闹天宫,英雄排序方式优化
|
2021-03-02 09:50:44 +08:00 |
duhui
|
bb842b6ea6
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-03-01 11:50:16 +08:00 |
duhui
|
11fb77045f
|
非空验证
|
2021-03-01 11:50:02 +08:00 |
duhui
|
974891f80a
|
大闹天宫,遇敌
|
2021-03-01 11:01:24 +08:00 |
duhui
|
abb94cdfb1
|
建木神树和四灵试炼,公告添加
|
2021-03-01 10:14:49 +08:00 |
duhui
|
987e392ae9
|
四灵试炼,回放战力
|
2021-02-26 18:22:59 +08:00 |
lvxinran
|
34b1c6d891
|
阈值修改第一版
|
2021-02-26 15:40:57 +08:00 |
mengchengzhen
|
91e53bdf42
|
zabbix登陆限制监测
|
2021-02-26 14:09:29 +08:00 |
duhui
|
0c84c3f839
|
邮件背包已满提示处理
|
2021-02-26 11:31:50 +08:00 |
duhui
|
2dc01e8b26
|
大闹天宫,遇敌刷新逻辑修改
|
2021-02-26 11:29:44 +08:00 |
lvxinran
|
4a09b99d48
|
回滚临时代码
|
2021-02-26 00:22:20 +08:00 |
lvxinran
|
976e8bcafd
|
初始200级
|
2021-02-26 00:04:03 +08:00 |
lvxinran
|
fc432b013e
|
200人测试
|
2021-02-25 23:59:23 +08:00 |
lvxinran
|
bcc02f5447
|
添加虚拟账号代码
|
2021-02-25 23:56:55 +08:00 |
duhui
|
60231a23a5
|
鸿蒙阵,根据最大星级获取最大等级,走表
|
2021-02-25 11:11:54 +08:00 |
duhui
|
1099169d1f
|
大闹天宫,初版未完成
|
2021-02-25 10:34:05 +08:00 |
mengchengzhen
|
d8160bdfb0
|
排行榜20位优化
|
2021-02-24 10:27:08 +08:00 |
mengchengzhen
|
91dd46a809
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-02-24 10:20:07 +08:00 |
mengchengzhen
|
4e82991332
|
新头像
|
2021-02-24 10:19:59 +08:00 |
lvxinran
|
afe20ec571
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-02-24 00:07:20 +08:00 |
lvxinran
|
5a1f8e8268
|
删除公会 删除排行
|
2021-02-24 00:07:11 +08:00 |
lvxinran
|
bf68a3b434
|
Merge branch 'master_test_hw' into master_test_hw_i18n
|
2021-02-23 18:20:04 +08:00 |
duhui
|
0cca7ec7b4
|
助战刷新问题处理
|
2021-02-23 17:44:27 +08:00 |
whb
|
cc2d7f9064
|
datatype
|
2021-02-23 15:54:00 +08:00 |
duhui
|
f1847c33a0
|
鸿蒙阵,升级返回原始等级
|
2021-02-20 17:20:11 +08:00 |
duhui
|
a4f7cb971f
|
鸿蒙阵,魂宝灵宝计算修改
|
2021-02-20 16:51:30 +08:00 |
duhui
|
944b5d5405
|
鸿蒙阵,魂灵宝bug修改
|
2021-02-19 15:50:46 +08:00 |
duhui
|
256fff3c57
|
鸿蒙阵,鸿蒙守卫魂宝灵宝,等级显示问题处理
|
2021-02-19 15:44:59 +08:00 |
duhui
|
fa6937881c
|
redis模糊key,scan方法封装
|
2021-02-19 15:23:49 +08:00 |
lvxinran
|
371bf21d90
|
释放redis连接池
|
2021-02-19 15:09:46 +08:00 |
lvxinran
|
79902665e7
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-02-19 14:55:16 +08:00 |
duhui
|
32b5f8d8fd
|
Merge branch 'master_test_hw' into master_test_hw_hongmeng
|
2021-02-19 11:06:29 +08:00 |
duhui
|
8c37ee1338
|
四灵试炼,小bug修补
|
2021-02-09 16:07:41 +08:00 |
duhui
|
5ca456b0dc
|
四灵试炼第三版,基本完成
|
2021-02-08 15:22:38 +08:00 |
lvxinran
|
860397c890
|
发奖修改
|
2021-02-05 15:00:12 +08:00 |
lvxinran
|
a4077e200c
|
大闹天宫神将空位逻辑修改
|
2021-02-05 13:58:22 +08:00 |
duhui
|
a11a01b363
|
四灵试炼,第二版,待调试
|
2021-02-03 10:35:55 +08:00 |
duhui
|
6ed7ee4b2f
|
挂机奖励,结束时间,内存修改
|
2021-02-02 11:29:56 +08:00 |
duhui
|
751421144b
|
会长转移,空指针修改
|
2021-02-02 10:21:12 +08:00 |
duhui
|
8086106b52
|
挂机奖励修改,随机改一次一次算
|
2021-02-02 11:13:43 +08:00 |
duhui
|
b363301111
|
Merge branch 'dh_dev_guaji' into master_test_hw
|
2021-02-01 22:55:14 +08:00 |
lvxinran
|
3c24ef97fc
|
删除 无用打印
|
2021-02-01 16:52:17 +08:00 |
lvxinran
|
5ed63868e5
|
工会邮件内容修改
|
2021-01-31 14:49:05 +08:00 |
lvxinran
|
5d9812cff2
|
兑换码时间控制
|
2021-01-31 13:55:57 +08:00 |
duhui
|
bca44c2d71
|
助战系统,初版未完成
|
2021-01-29 18:25:59 +08:00 |
duhui
|
508eda57d8
|
挂机奖励修改
|
2021-01-29 10:52:56 +08:00 |
lvxinran
|
f72e134f0f
|
抽卡逻辑
|
2021-01-28 17:53:22 +08:00 |
lvxinran
|
a4dca69532
|
抽卡生效次数校验修改
|
2021-01-28 17:19:08 +08:00 |
lvxinran
|
1b2e00e478
|
修改抽卡逻辑
|
2021-01-28 17:05:37 +08:00 |
lvxinran
|
50824acdd9
|
抽卡计次修改
|
2021-01-28 16:41:54 +08:00 |
duhui
|
2fb09e6844
|
轩辕宝镜和逍遥游埋点
|
2021-01-28 15:42:27 +08:00 |
lvxinran
|
674c00ff98
|
工会关联表
|
2021-01-28 15:33:57 +08:00 |
lvxinran
|
e4b32a7b03
|
加入在线判断逻辑
|
2021-02-24 01:23:23 +08:00 |
duhui
|
56048956ea
|
日常任务,隔天在线完成优化
|
2021-01-28 10:00:33 +08:00 |
lvxinran
|
2dbe80f3a5
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-01-27 16:19:38 +08:00 |
lvxinran
|
f8e47dd12b
|
公会检测修改
|
2021-01-27 16:19:33 +08:00 |
duhui
|
7cb1072126
|
邮件问题状态修改,只保留1和2,1:成功,2:背包已满
|
2021-01-27 16:00:03 +08:00 |
duhui
|
c09cb66fe0
|
天宫密保时间未到计算积分问题处理
|
2021-01-27 15:53:57 +08:00 |
lvxinran
|
633f531425
|
Merge branch 'master_test_hw' into master_test_hw_i18n
|
2021-01-27 15:22:26 +08:00 |
lvxinran
|
ef472bdbd2
|
会长转移初版
|
2021-01-27 15:22:10 +08:00 |
duhui
|
3c83e55d89
|
四灵试炼,首通和最低记录,排行榜功能实现,未调试
|
2021-01-27 14:58:19 +08:00 |
duhui
|
0633b9ae1c
|
分支合并
|
2021-02-12 14:34:48 +08:00 |
duhui
|
d887ff2d90
|
Merge branch 'master_test_hw' into master_test_hw_four_challenge
|
2021-02-12 14:21:21 +08:00 |
duhui
|
c2d127e325
|
注释
|
2021-02-12 14:11:20 +08:00 |
duhui
|
ca1b4f3fa8
|
Merge branch 'dev_dh_tree' into master_test_hw_four_challenge
# Conflicts:
# luafight/Modules/Battle/Logic/Base/Passivity.lua
# luafight/Modules/Battle/Logic/Misc/BattleUtil.lua
# luafight/Modules/Battle/Logic/Role/RoleLogic.lua
# serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java
|
2021-01-26 11:26:56 +08:00 |
duhui
|
fa39c7eb9b
|
四灵试炼添加注释
|
2021-01-26 11:18:18 +08:00 |
lvxinran
|
47c4bd6818
|
空指针修改
|
2021-01-25 21:22:24 +08:00 |
duhui
|
d736b60c24
|
邮件bug
|
2021-01-25 18:09:40 +08:00 |
duhui
|
07dbb37262
|
一键领取邮件bug处理
|
2021-01-25 16:04:16 +08:00 |
duhui
|
b17a248bb8
|
0127连续签到宝箱重置
|
2021-01-22 16:33:33 +08:00 |
duhui
|
fcbf678d97
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-01-22 16:18:14 +08:00 |
duhui
|
9317e9ea24
|
0127挂机奖励2.0
|
2021-01-22 16:18:03 +08:00 |
lvxinran
|
ea69d5b7e9
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-01-22 15:32:44 +08:00 |
lvxinran
|
18b4fdfb9c
|
上报战斗修改
|
2021-01-22 15:32:37 +08:00 |
lvxinran
|
0ae007f55f
|
埋点修改
|
2021-01-22 15:32:27 +08:00 |
duhui
|
0a6a81c40c
|
新将来袭战斗超回合
|
2021-01-22 15:13:01 +08:00 |
duhui
|
b019334012
|
0127连续签到推送前端显示
|
2021-01-22 14:09:07 +08:00 |
duhui
|
9eca089593
|
空指针修改
|
2021-01-22 11:26:55 +08:00 |
duhui
|
8bf9552c0c
|
挂机,不足一次的奖励随机
|
2021-01-21 14:37:17 +08:00 |
lvxinran
|
6e396124ec
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-01-21 11:03:35 +08:00 |
lvxinran
|
ae79e8d410
|
扭转乾坤活动提交
|
2021-01-21 11:03:31 +08:00 |
lvxinran
|
816847c112
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-02-09 20:13:03 +08:00 |
lvxinran
|
4c0e63ddaf
|
公会boss保底
|
2021-02-09 20:12:54 +08:00 |
duhui
|
91bd1096bd
|
0127极速探索奖励计算
|
2021-01-21 11:01:16 +08:00 |
duhui
|
c4850d97c4
|
共鸣脱装备bug修改
|
2021-01-20 15:20:20 +08:00 |
duhui
|
f5e5bf662b
|
灵兽升级报空处理
|
2021-01-20 15:01:02 +08:00 |
duhui
|
b5f1b291ad
|
无用代码屏蔽
|
2021-01-20 14:53:27 +08:00 |
duhui
|
a200be7f35
|
鸿蒙阵共鸣脱装备bug修改
|
2021-01-20 14:41:04 +08:00 |
duhui
|
36306b509e
|
0127挂机奖励计算
|
2021-01-20 10:05:46 +08:00 |
duhui
|
fd4cd6dd7f
|
0127连续签到奖励
|
2021-01-19 15:19:58 +08:00 |
duhui
|
65e781d66c
|
Merge branch 'master_online_hw' into master_test_hw
|
2021-01-18 17:59:37 +08:00 |
duhui
|
0fd8be20c5
|
限时头像框bug修改
|
2021-02-11 15:09:07 +08:00 |
duhui
|
5bb9c26ed9
|
永久头像框时间bug
|
2021-01-25 10:30:59 +08:00 |
duhui
|
78827a8f33
|
头像框可以重复使用,重置时间
|
2021-01-18 09:57:20 +08:00 |
lvxinran
|
e55325dd14
|
Merge branch 'master_test_hw' into master_test_hw_i18n
|
2021-01-17 14:45:49 +08:00 |
duhui
|
46d3b765e2
|
鸿蒙阵breaId修复
|
2021-01-15 18:54:29 +08:00 |
duhui
|
14ba7c1599
|
限时头像框完善
|
2021-01-15 18:28:43 +08:00 |
duhui
|
664b4c748c
|
限时头像框
|
2021-01-15 17:40:56 +08:00 |
lvxinran
|
6c0c612fae
|
删除无用测试代码
|
2021-01-14 19:59:06 +08:00 |
lvxinran
|
63711469b2
|
删除无用日志
|
2021-01-14 19:46:19 +08:00 |
lvxinran
|
5db99079a1
|
修改测试重发方式
|
2021-01-14 18:53:48 +08:00 |
lvxinran
|
f28fd3a65d
|
抽卡校验修改
|
2021-01-14 17:22:19 +08:00 |
lvxinran
|
934632c4c5
|
森罗幻境超时血量修改
|
2021-01-14 17:18:06 +08:00 |
lvxinran
|
cb739797c8
|
删除模拟重发
|
2021-01-14 16:39:35 +08:00 |
duhui
|
986d8049f1
|
鸿蒙碑初始化breaId
|
2021-01-14 16:39:25 +08:00 |
lvxinran
|
21faa2b905
|
推送重发次数限制,时间限制修改
|
2021-01-14 16:01:39 +08:00 |
lvxinran
|
98fe5af92d
|
模拟重发
|
2021-01-14 15:45:30 +08:00 |
duhui
|
51042972c0
|
幸运转盘保底
|
2021-01-14 15:34:13 +08:00 |
duhui
|
53970cef1a
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-01-14 14:11:37 +08:00 |
lvxinran
|
2b60d06ff8
|
申请工会修改
|
2021-01-30 15:05:18 +08:00 |
lvxinran
|
984f0f7bae
|
使用道具最后扣除
|
2021-01-30 13:23:34 +08:00 |
lvxinran
|
19dd002643
|
删除多余装备
|
2021-01-17 18:25:08 +08:00 |
duhui
|
4aed4a4592
|
邮件修改
|
2021-01-14 14:11:25 +08:00 |
duhui
|
bce959fd87
|
青龙秘宝,竞技场连胜,被防守失败中断问题修改
|
2021-01-13 16:53:21 +08:00 |
duhui
|
14d06145c9
|
Merge branch 'dh_dev_mail' into master_test_hw
邮件功能合并
|
2021-01-13 16:01:15 +08:00 |
duhui
|
09749e697d
|
已经存在的不变,后续开放的顺延
|
2021-01-13 14:54:06 +08:00 |
duhui
|
6dab85335f
|
鸿蒙阵,breaId补充
|
2021-01-13 13:33:14 +08:00 |
duhui
|
1bc6fe656d
|
Merge branch 'master_test_hw' into master_test_hw_hongmeng
0120版本合并
|
2021-01-13 11:44:03 +08:00 |
duhui
|
65c31a8ae6
|
英雄breakid问题处理初版,未解决
|
2021-01-13 11:40:33 +08:00 |
duhui
|
0b580e8ce3
|
0120版本更新
1、竞技场机器人英雄显示bug处理
2、心魔试炼添加排名奖励功能实现
|
2021-01-13 11:38:48 +08:00 |
duhui
|
188952ad47
|
战报功能,好友类型补充和报错修改
|
2021-01-11 17:13:17 +08:00 |
duhui
|
98967d13ce
|
新将打点和奖励计算修改
|
2021-01-11 11:14:27 +08:00 |
lvxinran
|
3d388fcf32
|
Merge branch 'master_test_hw' into master_test_hw_five_to_zero
|
2021-01-16 23:44:37 +08:00 |
lvxinran
|
ef2f1617f3
|
社稷大典开始清除往期道具
|
2021-01-16 21:15:13 +08:00 |
lvxinran
|
9894eab18d
|
活动5点修改
|
2021-01-16 20:24:14 +08:00 |
duhui
|
0c4041c74d
|
车迟斗法优化,根据boss更换排行奖励
|
2021-01-13 21:12:52 +08:00 |
duhui
|
d423925752
|
鸿蒙阵3.2
|
2021-01-08 18:36:58 +08:00 |
duhui
|
70a69c02af
|
邮件bug修改
|
2021-01-08 15:12:33 +08:00 |
lvxinran
|
176d9e122f
|
Merge branch 'master_online_hw' into master_test_hw
|
2021-01-16 00:21:30 +08:00 |
lvxinran
|
4b44ae7d04
|
重置进图点
|
2021-01-16 00:20:28 +08:00 |
lvxinran
|
668501092f
|
Merge branch 'master_test_hw' into master_online_hw
|
2021-01-14 05:08:27 +08:00 |
lvxinran
|
9cc7bf8588
|
暂时不打印无用日志
|
2021-01-08 15:01:21 +08:00 |
lvxinran
|
127a5f4abd
|
0点5点遗留修改
|
2021-01-08 13:58:36 +08:00 |
lvxinran
|
11aa829ae0
|
Merge branch 'master_test_hw' into master_test_hw_five_to_zero
|
2021-01-17 00:29:05 +08:00 |
lvxinran
|
25b2245f5c
|
5点改0点修改
|
2021-01-14 00:08:59 +08:00 |
duhui
|
7c348f0833
|
Merge branch 'master_test_hw' into master_test_hw_hongmeng
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.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/GetPlayerInfoHandler.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/hero/SaveHeroChangeRequestHandler.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/pokemon/GetAllPokemonHandler.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java
# serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java
# tablemanager/src/main/java/config/SErrorCodeEerverConfig.java
# tablemanager/src/main/java/config/SItem.java
# tablemanager/src/main/java/config/SJewelConfig.java
|
2021-01-07 14:31:08 +08:00 |
lvxinran
|
ff016668c4
|
报错修改
|
2021-01-06 17:00:19 +08:00 |
lvxinran
|
202943d84f
|
Merge branch 'master_test_hw' into master_test_hw_i18n
|
2021-01-06 16:53:54 +08:00 |
lvxinran
|
03e86acfbe
|
删除无用日志
|
2021-01-06 14:48:04 +08:00 |
lvxinran
|
34d1ce106e
|
日志修改
|
2021-01-06 14:35:31 +08:00 |
lvxinran
|
a3a6d52276
|
活动检测日志
|
2021-01-06 14:23:35 +08:00 |
lvxinran
|
7771e161be
|
添加日志信息
|
2021-01-06 14:00:07 +08:00 |
lvxinran
|
adbe1f5fde
|
删除无用注释 添加异常信息
|
2021-01-06 12:17:25 +08:00 |
lvxinran
|
ff37cd0a76
|
每分钟线程日志修改
|
2021-01-06 12:09:30 +08:00 |
lvxinran
|
c3286931d1
|
日志打印
|
2021-01-06 12:02:49 +08:00 |
duhui
|
5ad536f679
|
鸿蒙阵3.0.1,法宝公告同步
|
2021-01-06 10:20:12 +08:00 |
duhui
|
a1eb022f14
|
鸿蒙阵3.0,成就任务
|
2021-01-05 18:39:35 +08:00 |
duhui
|
6084f9aa96
|
鸿蒙阵2.1
|
2021-01-05 12:15:25 +08:00 |
duhui
|
9c9f43d686
|
鸿蒙阵2.0
|
2021-01-04 15:11:00 +08:00 |
duhui
|
f82b25d392
|
无尽副本,调试日志
|
2021-01-04 11:44:58 +08:00 |
lvxinran
|
f5c70afcb2
|
修改森罗保存阵容
|
2021-01-04 10:10:15 +08:00 |
lvxinran
|
ca822eba4e
|
公会日志打印
|
2020-12-31 18:03:42 +08:00 |
lvxinran
|
9b4b01bedd
|
暂时修改特权到期时间
|
2020-12-31 14:52:21 +08:00 |
lvxinran
|
b69ffd6329
|
打印错误日志
|
2020-12-31 13:54:27 +08:00 |
duhui
|
3a4bceeaca
|
车迟斗法缓存问题修改
|
2021-01-08 10:16:49 +08:00 |
lvxinran
|
f6f5a3c60f
|
打点报错修改
|
2020-12-30 13:47:06 +08:00 |
duhui
|
5037916fd5
|
新将来袭和降妖夺宝埋点添加
|
2020-12-29 14:03:18 +08:00 |
lvxinran
|
4e6d89c062
|
打点单例
|
2020-12-29 10:36:14 +08:00 |
lvxinran
|
661ac71df3
|
Merge branch 'master_test_hw' into master_test_hw_i18n
|
2020-12-28 13:58:01 +08:00 |
lvxinran
|
41066efe5a
|
Merge branch 'master_test_hw' into master_test_hw_i18n
|
2021-01-09 00:00:16 +08:00 |
lvxinran
|
09b18714f0
|
好友上限申请修改
|
2021-01-09 00:00:00 +08:00 |
lvxinran
|
b603634e6b
|
十绝阵暂时关闭
|
2021-01-01 21:37:04 +08:00 |
lvxinran
|
53b1dc1480
|
森罗小怪红点
|
2021-01-01 19:35:29 +08:00 |
lvxinran
|
46d3d86d68
|
Merge branch 'master_test_hw' into master_test_hw_i18n
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LuckyCatActivity.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/family/DeathPathLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java
# tablemanager/src/main/java/config/SErrorCodeEerverConfig.java
|
2021-01-01 01:51:02 +08:00 |
lvxinran
|
3e87cb50d6
|
竞技场埋点
|
2021-01-01 01:36:57 +08:00 |
lvxinran
|
9a3c3fc9dc
|
竞技场挑战
|
2021-01-01 01:36:01 +08:00 |
lvxinran
|
7118b6a40c
|
巅峰赛埋点
|
2021-01-01 01:35:18 +08:00 |
duhui
|
1cfc04c82d
|
鸿蒙阵,法宝验证修改1.3
|
2020-12-28 11:30:57 +08:00 |
duhui
|
dffe1b81b9
|
新将血量修改1.1
|
2020-12-28 11:12:16 +08:00 |
duhui
|
225e58e5ee
|
新将,血量计算修改
|
2020-12-28 11:03:39 +08:00 |
duhui
|
73cc224b50
|
鸿蒙阵1.2
|
2020-12-28 09:41:49 +08:00 |
lvxinran
|
8394061f97
|
四灵试炼提交
|
2020-12-27 19:05:39 +08:00 |
lvxinran
|
ef6347f38d
|
Merge branch 'master_online_hw' into master_test_hw
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionBetInfoHandler.java
|
2020-12-26 18:37:54 +08:00 |
duhui
|
3834f8321f
|
鸿蒙阵1.1
|
2020-12-25 18:43:55 +08:00 |
duhui
|
e3391faa6e
|
鸿蒙阵1.0,存在bug正在修改
|
2020-12-25 14:21:57 +08:00 |
duhui
|
3a9ab2167d
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-12-25 10:07:42 +08:00 |
duhui
|
a1cea20bdc
|
新将来袭活动结束,清空道具
|
2020-12-25 10:06:22 +08:00 |
duhui
|
41ee275964
|
新将boss,改获取伤害为获取血量
|
2020-12-24 18:53:27 +08:00 |
duhui
|
0e9e5e6502
|
新将伤害溢出问题
|
2020-12-24 18:26:49 +08:00 |
lvxinran
|
fbdad03acd
|
小怪数量修改
|
2021-01-01 00:20:38 +08:00 |
lvxinran
|
8aa67eb6bf
|
森罗 无尽bug修改
|
2021-01-01 00:05:11 +08:00 |
lvxinran
|
d6775fc511
|
跨服十绝阵暂时关闭
|
2021-01-01 00:04:20 +08:00 |
lvxinran
|
afdd25f829
|
怪物战力修改
|
2021-01-01 00:04:06 +08:00 |
zhangshanxue
|
03ea28558f
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-02-20 23:01:52 +08:00 |
zhangshanxue
|
b17ef4d6f4
|
膜拜limit
|
2021-02-20 20:37:51 +08:00 |
zhangshanxue
|
de27c8aea3
|
跨服提交
|
2021-02-20 20:13:15 +08:00 |
zhangshanxue
|
7f991f8045
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-02-20 20:11:01 +08:00 |
zhangshanxue
|
a0486a2da1
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java
|
2021-01-18 01:41:19 +08:00 |
zhangshanxue
|
71821d360b
|
跨服服务器
|
2021-01-18 01:40:33 +08:00 |
zhangshanxue
|
c160bca82e
|
Merge branch 'master_online_hw' into master_test_hw
|
2021-02-08 01:28:00 +08:00 |
zhangshanxue
|
e3b2fedbcd
|
跨服服务器
|
2021-02-08 01:25:47 +08:00 |
zhangshanxue
|
fd681d5350
|
Merge branch 'master_test_hw' into master_test_hw_server_arena
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java
# serverlogic/src/main/java/com/ljsd/jieling/core/VipPrivilegeType.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/champion/ChampionBetInfoHandler.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionGuessHandler.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/pokemon/GetAllPokemonHandler.java
# serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_global_gm.java
# serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportUtil.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SheJiActivity.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/ArenaRank.java
# tablemanager/src/main/java/config/SPassiveSkillLogicConfig.java
|
2021-02-08 01:17:41 +08:00 |
zhangshanxue
|
e004d4d76c
|
跨服服务器
|
2021-02-08 01:06:51 +08:00 |
zhangshanxue
|
b7b1154a68
|
跨服服务器
|
2021-01-30 00:15:10 +08:00 |
duhui
|
3115844973
|
防止冲突,缓存减少一分钟
|
2020-12-24 16:07:07 +08:00 |
duhui
|
98d95f187a
|
修改proto路径后,合并代码战斗补充
|
2020-12-24 10:09:51 +08:00 |
duhui
|
645718da78
|
Merge branch 'master_test_hw' into dev_dh_chechi
# Conflicts:
# serverlogic/src/main/java/com/ljsd/GmService.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/StartExpeditionBattleRequest.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/monsterAttack/QuickStartMonsterFighter.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightRecordLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/fight/result/FightResult.java
# tablemanager/src/main/java/config/SGlobalSystemConfig.java
|
2020-12-24 10:04:18 +08:00 |
lvxinran
|
bcf5191e7f
|
协议位置修改
|
2020-12-30 03:11:14 +08:00 |
lvxinran
|
4908ac4145
|
errorcode修改
|
2020-12-30 02:10:45 +08:00 |
lvxinran
|
d872a55549
|
错误提示提交
|
2020-12-30 00:26:13 +08:00 |
lvxinran
|
23f35b428e
|
车迟斗法过时提示
|
2020-12-30 00:25:48 +08:00 |
lvxinran
|
697e2892a8
|
添加好友提示
|
2020-12-30 00:25:26 +08:00 |
lvxinran
|
a520eb96db
|
礼包购买刷新修改0点
|
2020-12-30 00:25:11 +08:00 |
lvxinran
|
3df4fb246d
|
灵兽放生等级限制
|
2020-12-30 00:24:54 +08:00 |
duhui
|
e1ee6d7b69
|
Merge branch 'master_test_hw' into dev_dh_xinjiang
|
2020-12-23 11:23:08 +08:00 |
duhui
|
71791a4342
|
降妖夺宝
|
2020-12-22 17:44:05 +08:00 |
zhangshanxue
|
025128b6ec
|
巅峰赛 竞猜币补发
|
2020-12-22 17:42:32 +08:00 |
duhui
|
045dab3175
|
车迟斗法排行榜留存增加一天
|
2020-12-22 09:48:51 +08:00 |
jiahuiwen
|
58cb744e2e
|
鸿蒙信息单独获取 推送
|
2020-12-21 16:05:19 +08:00 |
jiahuiwen
|
5776065109
|
鸿蒙阵
|
2020-12-21 14:47:20 +08:00 |
duhui
|
c9558bd116
|
无尽副本不显示皮肤bug
|
2020-12-21 14:00:26 +08:00 |
duhui
|
c2d7171578
|
法宝公告还原
|
2020-12-18 18:30:29 +08:00 |
duhui
|
abcf1b4686
|
神树修改2.0
|
2020-12-18 18:12:12 +08:00 |
duhui
|
9d33fc7b4d
|
战报和法宝功能补充
|
2020-12-18 14:04:07 +08:00 |
duhui
|
be72f2f913
|
修改上限次数
|
2020-12-18 13:50:46 +08:00 |
duhui
|
c11dd1b1ce
|
战报功能二版
|
2020-12-18 13:50:34 +08:00 |
duhui
|
ce1de8c9af
|
战报功能和法宝公告,初版未测试
|
2020-12-18 13:50:16 +08:00 |
duhui
|
637f25930f
|
战报和法宝公告功能提交
|
2020-12-18 11:27:25 +08:00 |
duhui
|
2d91a2eb1e
|
修改上限次数
|
2020-12-18 10:51:44 +08:00 |
duhui
|
a52f9e77ca
|
战报功能二版
|
2020-12-18 10:01:12 +08:00 |
zhangshanxue
|
58b3f69aac
|
巅峰赛 竞猜币补发
|
2020-12-17 21:24:03 +08:00 |
jiahuiwen
|
6a1faf574c
|
鸿蒙阵
|
2020-12-17 15:04:46 +08:00 |
duhui
|
9ea1ceec59
|
战报功能和法宝公告,初版未测试
|
2020-12-17 11:17:57 +08:00 |
lvxinran
|
3cf66b94fe
|
Merge branch 'master_online_hw' into master_test_hw
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/arena/ArenaChallengeHandler.java
|
2020-12-15 16:32:46 +08:00 |
lvxinran
|
8916a76543
|
法宝最大等级校验
|
2020-12-15 14:44:37 +08:00 |
zhangshanxue
|
fa6e6bcad5
|
Merge branch 'master_test_hw_server_arena' of http://60.1.1.230/backend/jieling_server into master_test_hw_server_arena
# Conflicts:
# gamecommon/src/main/java/rpc/protocols/ActivityProto.java
# gamecommon/src/main/java/rpc/protocols/ArenaInfoProto.java
# gamecommon/src/main/java/rpc/protocols/ChatProto.java
# gamecommon/src/main/java/rpc/protocols/CommonProto.java
# gamecommon/src/main/java/rpc/protocols/Family.java
# gamecommon/src/main/java/rpc/protocols/HeroInfoProto.java
# gamecommon/src/main/java/rpc/protocols/MessageTypeProto.java
# gamecommon/src/main/java/rpc/protocols/PlayerInfoProto.java
# gamecommon/src/main/java/rpc/world/WorldProto.java
# worldserver/src/main/java/com/world/redis/RedisUtil.java
|
2020-12-15 14:01:24 +08:00 |
lvxinran
|
dff49eded3
|
rediskey修改
|
2021-01-06 10:12:22 +08:00 |
lvxinran
|
e086fd1e97
|
十绝阵删除信息修改
|
2020-12-25 10:19:50 +08:00 |
lvxinran
|
5cd2499af6
|
跨服十绝阵第二版
|
2020-12-17 20:07:30 +08:00 |
zhangshanxue
|
6ef71dc4b5
|
跨服服务器
|
2020-12-15 14:00:20 +08:00 |
duhui
|
fe8bc9ec57
|
建木神树二版,bug修改,添加注释
|
2020-12-14 16:47:32 +08:00 |
lvxinran
|
d2c1b418a9
|
社稷大典埋点
|
2020-12-14 11:42:10 +08:00 |
lvxinran
|
fbc893124f
|
车迟斗法报错
|
2020-12-14 11:41:05 +08:00 |
lvxinran
|
e40d422d55
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-12-28 16:38:45 +08:00 |
lvxinran
|
d616cdb2d1
|
竞技场埋点 敏感字添加竞技守卫
|
2020-12-28 16:38:39 +08:00 |
duhui
|
0c851e6967
|
新将伤害计算修改1.2
|
2020-12-28 15:07:13 +08:00 |
lvxinran
|
2e240b33d0
|
打点修改提交
|
2020-12-14 11:07:37 +08:00 |
lvxinran
|
1272ae01f8
|
宝物错误数据修改
|
2020-12-12 18:09:46 +08:00 |
lvxinran
|
1f0f27727b
|
宝物分解bug,竞猜打点提交
|
2020-12-12 17:51:29 +08:00 |
lvxinran
|
9784aa4c3f
|
公会排行榜
|
2020-12-20 06:09:08 +08:00 |
lvxinran
|
3c636a42be
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-12-18 05:03:08 +08:00 |
lvxinran
|
874fc8f2c5
|
森罗bug修改
|
2020-12-18 05:03:02 +08:00 |
lvxinran
|
fb5da8c93b
|
Merge branch 'master_test_hw_server_arena' of http://60.1.1.230/backend/jieling_server into master_test_hw_server_arena
# Conflicts:
# gamecommon/src/main/java/rpc/protocols/CommonProto.java
# gamecommon/src/main/java/rpc/protocols/MessageTypeProto.java
# gamecommon/src/main/java/rpc/world/WorldProto.java
# worldserver/build.gradle
# worldserver/src/main/java/com/world/handler/GetWorldArenaChallengeRequestHandler.java
# worldserver/src/main/java/com/world/handler/GetWorldArenaRecordInfoRequestHandler.java
# worldserver/src/main/java/com/world/redis/RedisKey.java
|
2020-12-12 15:06:17 +08:00 |
lvxinran
|
ac40a91389
|
跨服十绝阵代码提交
|
2020-12-12 15:03:54 +08:00 |
lvxinran
|
543cca1864
|
大闹天宫皮肤添加
|
2020-12-12 14:45:49 +08:00 |
duhui
|
813ff75cfb
|
套装优化
|
2020-12-11 17:17:12 +08:00 |
zhangshanxue
|
95870b74d5
|
跨服服务器
|
2020-12-11 13:57:47 +08:00 |
duhui
|
ad8641f96c
|
建木神树初版,未测试
|
2020-12-11 11:30:41 +08:00 |
zhangshanxue
|
64700c9190
|
社稷积分
|
2020-12-10 16:37:14 +08:00 |
DESKTOP-98AVA47\Administrator
|
13849ac7b8
|
社稷大典积分恢复
|
2020-12-11 02:07:22 +08:00 |
lvxinran
|
3e4b27fa9d
|
竞技场修改
|
2020-12-08 21:10:15 +08:00 |
jiahuiwen
|
ed1e5e1233
|
鸿蒙碑等级
|
2020-12-08 18:08:45 +08:00 |
zhangshanxue
|
5e0c455469
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-12-08 16:58:46 +08:00 |
zhangshanxue
|
220d2b802d
|
巅峰赛 记录bug
|
2020-12-08 16:58:38 +08:00 |
jiahuiwen
|
d3a11d5305
|
鸿蒙碑
|
2020-12-08 16:28:09 +08:00 |
duhui
|
2ae47522f3
|
Merge branch 'dev_dh_xinjiang' into master_test_hw
|
2020-12-08 11:36:41 +08:00 |
lvxinran
|
a2a1edb290
|
战斗覆盖技能
|
2020-12-08 11:32:59 +08:00 |
duhui
|
d7b5a22965
|
竞技场积分加减1问题
|
2020-12-08 11:12:09 +08:00 |
duhui
|
e02da1d687
|
test
|
2020-12-08 11:06:24 +08:00 |
duhui
|
39505c9d24
|
竞技场分数+-1问题
|
2020-12-08 10:40:42 +08:00 |
DESKTOP-98AVA47\Administrator
|
951e54fb0b
|
社稷大典跨期刷新
|
2020-12-15 21:38:46 +08:00 |
zhangshanxue
|
4bce4b8e96
|
跨服服务器
|
2020-12-07 14:44:12 +08:00 |
duhui
|
c1fcfcf3a2
|
新将活动应策划需求改版,掉落比例重新计算
|
2020-12-07 13:53:25 +08:00 |
zhangshanxue
|
bfb89434cd
|
跨服服务器
|
2020-12-03 21:02:17 +08:00 |
zhangshanxue
|
92e5c50e24
|
大闹天宫圣物效果
|
2020-12-03 19:32:28 +08:00 |
zhangshanxue
|
08b85eb654
|
大闹天宫圣物效果
|
2020-12-03 16:23:56 +08:00 |
duhui
|
686596375d
|
新将来袭初版
|
2020-12-03 10:27:55 +08:00 |
lvxinran
|
b217c19431
|
竞技场排名优化
|
2020-12-03 10:06:22 +08:00 |
jiahuiwen
|
98ddcf78fc
|
鸿蒙碑
|
2020-12-02 19:30:19 +08:00 |
duhui
|
e0c2c51303
|
no message
|
2020-12-02 14:13:11 +08:00 |
duhui
|
21aec6d252
|
竞技场修改
|
2020-12-02 10:42:23 +08:00 |
duhui
|
ed7d883cce
|
临时提交2
|
2020-12-02 10:29:51 +08:00 |
zhangshanxue
|
904d77814f
|
Merge branch 'master_online_hw' into master_test_hw
|
2020-11-30 11:56:35 +08:00 |
zhangshanxue
|
93b394ce7e
|
【模块】大闹天宫-战斗后圣物刷新种类不正确
|
2020-11-30 11:55:29 +08:00 |
lvxinran
|
e1bae5947d
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-28 08:55:56 +08:00 |
lvxinran
|
2476e457af
|
挂机预览修改
|
2020-11-28 08:55:46 +08:00 |
lvxinran
|
f275342e67
|
物品上限添加
|
2020-11-27 18:49:25 +08:00 |
zhangshanxue
|
6b4d5296db
|
Merge branch 'master_test_hw_server_arena' of http://60.1.1.230/backend/jieling_server into master_test_hw_server_arena
|
2020-11-27 15:27:06 +08:00 |
zhangshanxue
|
b27f4e489c
|
初步提交
|
2020-11-27 15:26:55 +08:00 |
duhui
|
4051b4dd61
|
法宝升级通知
|
2020-11-27 14:19:14 +08:00 |
duhui
|
249580edf7
|
暂存,功能没写完
|
2020-11-27 14:07:56 +08:00 |
lvxinran
|
44a241b52c
|
Revert "鸿蒙碑初版"
This reverts commit 8057c913bb .
|
2020-11-27 10:58:29 +08:00 |
lvxinran
|
e80c2b6e03
|
Revert "鸿蒙阵"
This reverts commit c1bc98d972 .
|
2020-11-27 10:58:18 +08:00 |
lvxinran
|
11ac7ec7ad
|
鸿蒙 切分支
|
2020-11-27 10:57:42 +08:00 |
lvxinran
|
fd5d07ee15
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-27 10:49:33 +08:00 |
lvxinran
|
c2bbab2c13
|
灵兽分页,背包已满 添加
|
2020-11-27 10:49:24 +08:00 |
jiahuiwen
|
c1bc98d972
|
鸿蒙阵
|
2020-11-26 20:24:33 +08:00 |
jiahuiwen
|
0ad0e87617
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-26 20:06:24 +08:00 |
jiahuiwen
|
8057c913bb
|
鸿蒙碑初版
|
2020-11-26 20:06:17 +08:00 |
duhui
|
1c3102157d
|
竞技场积分修改,物品掉落
|
2020-11-26 11:13:47 +08:00 |
zhangshanxue
|
42b0ca9980
|
恢复榜单
|
2020-11-25 21:19:59 +08:00 |
zhangshanxue
|
b16b5e79de
|
恢复榜单
|
2020-11-25 21:14:27 +08:00 |
zhangshanxue
|
8ea43c3aff
|
恢复榜单
|
2020-11-25 20:40:42 +08:00 |
zhangshanxue
|
1c43e235ae
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-11-25 20:28:44 +08:00 |
zhangshanxue
|
c35dbf7dbe
|
恢复榜单
|
2020-11-25 20:28:11 +08:00 |
lvxinran
|
82f9aca0d0
|
社稷大典修改删除数据
|
2020-11-25 17:01:22 +08:00 |
lvxinran
|
6c7b164b53
|
打点加入日志
|
2020-11-24 16:36:03 +08:00 |
lvxinran
|
a44c3aa81f
|
Merge branch 'master_online_hw' into master_test_hw
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java
|
2020-11-23 21:24:05 +08:00 |
zhangshanxue
|
424fe9e01d
|
社稷大典活动开始 公会积分不清
|
2020-11-23 17:13:01 +08:00 |
lvxinran
|
976671200f
|
工会副本边界修改
|
2020-11-23 16:43:40 +08:00 |
lvxinran
|
9de88982e2
|
天宫秘宝15攻击力加成
|
2020-11-23 14:31:37 +08:00 |
lvxinran
|
0a9e9203cd
|
公会副本修改
|
2020-12-01 09:18:18 +08:00 |
lvxinran
|
a8a99c38e9
|
技能修改
|
2020-12-01 04:08:02 +08:00 |
lvxinran
|
6789a64113
|
公会副本修改
|
2020-11-30 10:50:30 +08:00 |
lvxinran
|
171bbd248d
|
跨服竞技场新加功能
|
2020-11-30 09:23:00 +08:00 |
lvxinran
|
24643113b9
|
灵兽抽卡打点修改
|
2020-11-30 09:22:21 +08:00 |
lvxinran
|
850ff06022
|
充值上报设备id,公会副本第二天首次不嫩挑战
|
2020-11-30 08:09:14 +08:00 |
lvxinran
|
d2b35e4d32
|
公会副本最后一个修改
|
2020-11-26 07:37:51 +08:00 |
lvxinran
|
2868cf7c6e
|
副本刷新
|
2020-11-24 07:28:52 +08:00 |
lvxinran
|
416beb8d33
|
分组提交
|
2020-12-01 10:55:37 +08:00 |
lvxinran
|
dae97e80a4
|
车迟斗法抢夺排行修改
|
2020-11-21 19:29:58 +08:00 |
lvxinran
|
499bc8099f
|
埋点错误修改
|
2020-11-21 19:29:37 +08:00 |
lvxinran
|
1cd25bedf6
|
数数打点修改
|
2020-11-20 15:26:40 +08:00 |
lvxinran
|
3d6da1905c
|
每分钟线程加入打印内存
|
2020-11-22 07:40:52 +08:00 |
lvxinran
|
f8a502b6b0
|
推送礼包修改
|
2020-11-21 15:17:31 +08:00 |
lvxinran
|
46257c701e
|
公会副本boss修改
|
2020-11-20 13:20:00 +08:00 |
zhangshanxue
|
b9fd7bfdf7
|
跨服服务器通信初版完成
|
2020-11-20 10:23:16 +08:00 |
zhangshanxue
|
4d9a185be5
|
跨服服务器通信初版完成
|
2020-11-19 20:33:41 +08:00 |
zhangshanxue
|
360a8c51e0
|
跨服服务器
|
2020-11-19 17:24:22 +08:00 |
jiahuiwen
|
47d40eae84
|
Merge branch 'master_online_hw' into master_test_hw
|
2020-11-16 16:13:52 +08:00 |
lvxinran
|
6b88321136
|
车迟斗法超int修改,打点信息修改
|
2020-11-18 11:44:37 +08:00 |
zhangshanxue
|
f94f4dca70
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-14 11:17:12 +08:00 |
lvxinran
|
23bfdbe50f
|
灵兽抽卡修改
|
2020-11-16 21:09:43 +08:00 |
lvxinran
|
3a9dd33fe9
|
Merge branch 'master_test_hw' into master_test_hw_monsterActivity
|
2020-11-16 20:21:10 +08:00 |
lvxinran
|
36304b135e
|
灵兽活动提交
|
2020-11-16 20:20:45 +08:00 |
zhangshanxue
|
e49bce75c2
|
巅峰赛竞猜bug
|
2020-11-14 11:17:04 +08:00 |
zhangshanxue
|
aa985f2a7f
|
公会任命bug
|
2020-11-14 05:59:44 +08:00 |
jiahuiwen
|
1d9f38d9ca
|
最大星级判断
|
2020-11-11 14:25:54 +08:00 |
lvxinran
|
e97dc6b28c
|
灵兽相关打点
|
2020-12-24 08:35:32 +08:00 |
lvxinran
|
f72e72a48e
|
累计充值修改bug
|
2020-12-24 06:27:56 +08:00 |
lvxinran
|
dbd56d502e
|
特权0点到期
|
2020-12-15 18:07:28 +08:00 |
lvxinran
|
64136e2f0f
|
特权时间改5点
|
2020-12-15 17:39:23 +08:00 |
lvxinran
|
79d99139fe
|
Merge branch 'master_online_hw' into master_test_hw
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_review_gm.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java
|
2020-12-15 17:00:45 +08:00 |
lvxinran
|
7e59e80929
|
特权时间修复
|
2020-12-15 15:40:13 +08:00 |
jiahuiwen
|
5a84536aa6
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-11 09:57:25 +08:00 |
jiahuiwen
|
d646106de5
|
英雄觉醒飘字
|
2020-11-11 09:57:11 +08:00 |
zhangshanxue
|
0c67fac433
|
//重置线上线上线程
|
2020-11-09 15:06:29 +08:00 |
zhangshanxue
|
718468b3a1
|
易经宝库
|
2020-11-09 13:42:03 +08:00 |
zhangshanxue
|
f84dcbd84c
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-09 11:12:44 +08:00 |
lvxinran
|
3be0f4ff8d
|
更换皮肤 上传战力修改
|
2020-11-15 10:58:25 +08:00 |
lvxinran
|
3da4886afb
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-15 09:47:39 +08:00 |
zhangshanxue
|
16ded73f10
|
易经宝库道具回收
|
2020-11-17 16:59:04 +08:00 |
lvxinran
|
73510bd864
|
皮肤活动提交
|
2020-11-15 09:47:25 +08:00 |
zhangshanxue
|
08e1b94c60
|
易经宝库
|
2020-11-09 11:12:37 +08:00 |
lvxinran
|
f303840402
|
森罗环境皮肤
|
2020-11-06 17:18:07 +08:00 |
zhangshanxue
|
cd8fd29036
|
Merge branch 'master_test_hw' into master_test_hw_sub
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
|
2020-11-06 16:24:38 +08:00 |
zhangshanxue
|
8e3704bf67
|
易经宝库提交
|
2020-11-06 16:22:53 +08:00 |
jiahuiwen
|
d1d38a85a0
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-06 16:12:42 +08:00 |
jiahuiwen
|
fd8e564a15
|
英雄觉醒
|
2020-11-06 16:12:37 +08:00 |
lvxinran
|
51d30fe4e0
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-06 15:11:24 +08:00 |
lvxinran
|
298d799594
|
技能皮肤修改
|
2020-11-06 15:11:18 +08:00 |
zhangshanxue
|
7a42112a9c
|
查看历史记录
|
2020-11-06 14:38:34 +08:00 |
lvxinran
|
44852b0601
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-11-12 14:47:52 +08:00 |
lvxinran
|
76d2fea459
|
打点修改,车迟斗法无抢夺目标修改
|
2020-11-12 14:47:15 +08:00 |
zhangshanxue
|
977df8a09c
|
大闹天宫
|
2020-11-06 13:32:43 +08:00 |
lvxinran
|
9ee34bc002
|
森罗皮肤时间
|
2020-11-06 10:56:52 +08:00 |
lvxinran
|
01620df5a9
|
Merge branch 'master_test_hw' into master_test_skin
|
2020-11-06 10:21:37 +08:00 |
lvxinran
|
841d2aa8a8
|
皮肤逻辑提交
|
2020-11-06 10:21:12 +08:00 |
zhangshanxue
|
9e9fc2e3c6
|
网页支付礼包逻辑
|
2020-11-04 18:10:18 +08:00 |
zhangshanxue
|
711fa42582
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-11-04 17:54:04 +08:00 |
zhangshanxue
|
1c56fa0487
|
网页支付礼包逻辑
|
2020-11-04 17:51:50 +08:00 |
lvxinran
|
ebc1382f72
|
过期数据清除
|
2020-12-30 05:15:14 +08:00 |
lvxinran
|
4a85ed8661
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-12-30 04:43:14 +08:00 |
lvxinran
|
3c8b1cd713
|
灵兽修改
|
2020-12-30 04:43:06 +08:00 |
lvxinran
|
ffc193d2fe
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-12-30 03:46:25 +08:00 |
lvxinran
|
3ea067d9cb
|
配置加入
|
2020-12-30 03:46:13 +08:00 |
lvxinran
|
da8f86864d
|
老号特权修改
|
2020-12-30 02:04:05 +08:00 |
lvxinran
|
b99117fe0b
|
默认值修改
|
2020-12-23 01:16:14 +08:00 |
lvxinran
|
cda3ad53a7
|
巅峰赛修改
|
2020-12-23 01:10:55 +08:00 |
lvxinran
|
5dc5ab2ae5
|
巅峰赛加入灵兽
|
2020-12-08 23:47:25 +08:00 |
zhangshanxue
|
fa68864f62
|
Revert "巅峰赛临时提交"
This reverts commit c654004bc8 .
|
2020-11-07 12:35:33 +08:00 |
zhangshanxue
|
c654004bc8
|
巅峰赛临时提交
|
2020-11-07 12:28:04 +08:00 |
zhangshanxue
|
ca17f5d39d
|
Revert "巅峰赛临时提交"
This reverts commit 78dc96b172 .
|
2020-11-07 12:26:15 +08:00 |
zhangshanxue
|
78dc96b172
|
巅峰赛临时提交
|
2020-11-07 12:16:26 +08:00 |
lvxinran
|
17fc7ac344
|
打点报错信息打印,抽卡打点修改
|
2020-11-04 14:24:08 +08:00 |
lvxinran
|
f3af1b0c4b
|
皮肤修改
|
2020-11-04 13:50:33 +08:00 |
lvxinran
|
93fae4842a
|
商店try catch
|
2020-11-04 09:34:50 +08:00 |
lvxinran
|
4105cb1292
|
激活皮肤消耗
|
2020-11-01 18:50:54 +08:00 |
lvxinran
|
7232b8604a
|
皮肤 头像修改
|
2020-11-03 05:25:17 +08:00 |
lvxinran
|
aa6133e571
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-01 17:38:13 +08:00 |
zhangshanxue
|
adc51d3942
|
战斗日志打印
|
2020-11-07 01:43:58 +08:00 |
lvxinran
|
606753c705
|
森罗灵兽加成修改,宝物容错加入
|
2020-11-01 17:38:08 +08:00 |
lvxinran
|
4c78acd96f
|
上阵校验
|
2020-11-03 06:11:39 +08:00 |
lvxinran
|
348fff34e4
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-03 05:27:01 +08:00 |
zhangshanxue
|
1478f5e48b
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-04 03:34:26 +08:00 |
zhangshanxue
|
cedf01492c
|
商店可动态控制栏位显示
|
2020-11-04 03:34:10 +08:00 |
lvxinran
|
51ef8ff581
|
编队灵兽修改
|
2020-11-03 05:26:52 +08:00 |
lvxinran
|
51dbb4e596
|
循环最大次数校验
|
2020-10-31 10:50:25 +08:00 |
lvxinran
|
d81ab02559
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-10-31 10:02:42 +08:00 |
zhangshanxue
|
345de35e8e
|
Merge branch 'master_online_hw' into master_test_hw
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SheJiActivity.java
# tablemanager/src/main/java/config/SGodSacrificeSetting.java
|
2020-11-04 00:32:18 +08:00 |
zhangshanxue
|
9a4e721ba7
|
功能刷新和大闹天宫试炼节点bug
|
2020-11-04 00:26:44 +08:00 |
zhangshanxue
|
f9b2a3e52a
|
修复月卡不触发
|
2020-11-09 01:11:50 +08:00 |
lvxinran
|
8eb7441775
|
小游戏内存修改
|
2020-10-31 10:02:33 +08:00 |
lvxinran
|
aa94e3bc5b
|
英雄皮肤添加
|
2020-10-31 09:58:34 +08:00 |
lvxinran
|
66c2308952
|
车迟斗法抢夺匹配修改
|
2020-10-31 04:54:46 +08:00 |
lvxinran
|
4b53c7e5d0
|
皮肤添加
|
2020-10-31 04:53:56 +08:00 |
lvxinran
|
1ee9ca08fa
|
逍遥游上个首通的限制
|
2020-10-30 13:24:31 +08:00 |
lvxinran
|
f420ebc347
|
地方teamSkill
|
2020-10-30 13:14:21 +08:00 |
lvxinran
|
8528baa1b4
|
teamSkill修改
|
2020-10-30 12:58:04 +08:00 |
lvxinran
|
edc1b58d5e
|
无尽修改坐标
|
2020-10-29 12:01:44 +08:00 |
lvxinran
|
19069e4586
|
地图修改
|
2020-10-29 10:29:22 +08:00 |
lvxinran
|
161bc6fa52
|
无尽副本位置弹回
|
2020-10-28 21:07:49 +08:00 |
lvxinran
|
f9da69c0a5
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-10-28 16:53:08 +08:00 |
zhangshanxue
|
d560e2bfee
|
月卡刷新
|
2020-11-06 17:35:10 +08:00 |
zhangshanxue
|
4b389f5a8f
|
社稷大典公会排行发奖
|
2020-10-28 20:24:15 +08:00 |
zhangshanxue
|
5fcfaa1f36
|
社稷大典
|
2020-10-31 14:06:31 +08:00 |
zhangshanxue
|
763872915f
|
社稷大典公会排行
|
2020-10-31 14:02:38 +08:00 |
zhangshanxue
|
7c907c8f73
|
社稷大典个人排行结算限制
|
2020-11-01 10:04:08 +08:00 |
zhangshanxue
|
6d538792e9
|
Merge branch 'master_online_hw' into master_test_hw
|
2020-11-01 09:58:23 +08:00 |
zhangshanxue
|
afe95a16e8
|
社稷大典
|
2020-10-31 19:37:33 +08:00 |
lvxinran
|
dd2ef8617d
|
判官笔复活不计入天宫达人,bug修改
|
2020-10-28 16:52:59 +08:00 |
lvxinran
|
4f3c4fc8fb
|
灵兽系统消息添加
|
2020-10-28 16:51:51 +08:00 |
lvxinran
|
1fa383a2ed
|
首通奖励添加
|
2020-10-27 18:28:52 +08:00 |
lvxinran
|
89122562b5
|
怪物组内添加灵兽提交
|
2020-10-27 17:23:04 +08:00 |
lvxinran
|
09d9d1d536
|
活动抽卡埋点,升星埋点修改,灵兽升级修改
|
2020-10-27 15:43:28 +08:00 |
lvxinran
|
c96a16f112
|
Merge branch 'master_test_hw' into master_test_hw_special_monster
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
|
2020-10-27 13:56:10 +08:00 |
zhangshanxue
|
101c50c28f
|
社稷大典公会排行
|
2020-10-31 11:39:15 +08:00 |
lvxinran
|
9f44b5de2a
|
无用日志
|
2020-10-27 13:53:49 +08:00 |
zhangshanxue
|
76c082bccc
|
数数免费礼包不上报 社稷大典排行进度 月礼包
|
2020-10-26 19:27:16 +08:00 |
lvxinran
|
40f12ac7b6
|
容错代码添加,心魔打点修改
|
2020-10-26 17:25:52 +08:00 |
zhangshanxue
|
2cf701c6eb
|
数数免费礼包不上报
|
2020-10-28 12:19:11 +08:00 |
zhangshanxue
|
ecc95a79a4
|
社稷大典公会排行
|
2020-10-28 12:14:06 +08:00 |
lvxinran
|
29fadcb9ea
|
灵兽信息获取
|
2020-10-26 16:05:50 +08:00 |
jiahuiwen
|
f62d9b6a13
|
注释日志
|
2020-10-26 13:43:56 +08:00 |
jiahuiwen
|
1a6a115b1c
|
getStartTime 添加日志
|
2020-10-26 10:19:20 +08:00 |
lvxinran
|
46fee5ae4e
|
战斗 灵兽修改
|
2020-10-26 10:05:30 +08:00 |
zhangshanxue
|
f1d7511218
|
社稷大典 初始化提交
|
2020-10-25 18:24:34 +08:00 |
zhangshanxue
|
df0850d74b
|
Merge branch 'master_test_hw' into master_test_hw_sheji
|
2020-10-25 17:01:48 +08:00 |
zhangshanxue
|
1d9452992c
|
社稷大典功能提交
|
2020-10-25 17:00:45 +08:00 |
zhangshanxue
|
210f4a1529
|
社稷大典代码提交
|
2020-10-25 17:00:00 +08:00 |
lvxinran
|
3dd49ea868
|
折扣 妖精抽卡次数提交
|
2020-10-24 15:52:25 +08:00 |
lvxinran
|
8a1c93570d
|
灵兽战斗数据组装
|
2020-10-23 17:54:22 +08:00 |
lvxinran
|
3cece5a571
|
代码优化
|
2020-10-23 14:11:02 +08:00 |
lvxinran
|
64fcc5a485
|
修改内存不一致,无尽副本迷雾问题
|
2020-10-23 14:09:46 +08:00 |
lvxinran
|
d054d48907
|
灵兽战斗数据添加
|
2020-10-23 13:38:08 +08:00 |
lvxinran
|
bf282624e7
|
灵兽提交
|
2020-10-22 20:26:40 +08:00 |
lvxinran
|
03069929b7
|
灵兽代码整理
|
2020-10-22 14:59:51 +08:00 |
lvxinran
|
ea949f28e5
|
Merge branch 'master_test_hw_special_monster' of http://60.1.1.230/backend/jieling_server into master_test_hw_special_monster
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
|
2020-10-22 14:57:57 +08:00 |
lvxinran
|
f5427e27a7
|
灵兽放生,涅槃
|
2020-10-22 14:48:26 +08:00 |
jiahuiwen
|
bc486f6f9b
|
Merge branch 'master_test_hw_special_monster' of http://60.1.1.230/backend/jieling_server into master_test_hw_special_monster
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
|
2020-10-21 17:54:16 +08:00 |
jiahuiwen
|
c8622ee56d
|
灵兽上阵
|
2020-10-21 17:52:39 +08:00 |
lvxinran
|
9f2f406561
|
商品空判断
|
2020-10-21 15:32:49 +08:00 |
lvxinran
|
c78f778881
|
灵兽升级
|
2020-10-21 15:30:47 +08:00 |
lvxinran
|
fc8401823f
|
修复十绝阵问题
|
2020-10-21 14:58:35 +08:00 |
zhangshanxue
|
19d6490be2
|
免费礼包无法领取
|
2020-10-21 11:22:30 +08:00 |
lvxinran
|
64744bb3bb
|
修改灵兽
|
2020-10-21 10:21:06 +08:00 |
jiahuiwen
|
871ba646e0
|
异妖可下阵
|
2020-10-20 20:08:36 +08:00 |
zhangshanxue
|
44f3df5fcf
|
获取玩家信息失败
|
2020-10-20 19:10:45 +08:00 |
jiahuiwen
|
defb87c5da
|
异妖编队修改
|
2020-10-20 17:56:27 +08:00 |
zhangshanxue
|
57f55498ee
|
gm账号添加英雄
|
2020-10-20 16:44:22 +08:00 |
lvxinran
|
34f3d40ee4
|
商店修改
|
2020-10-29 04:57:51 +08:00 |
lvxinran
|
4ff51ce551
|
添加特权
|
2020-10-29 09:29:23 +08:00 |
lvxinran
|
c38ea8c334
|
红点修改
|
2020-10-19 23:41:30 +08:00 |
lvxinran
|
947b8f78b5
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-10-19 23:17:57 +08:00 |
lvxinran
|
0a838fffcd
|
初始化道具修改
|
2020-10-19 23:17:48 +08:00 |
zhangshanxue
|
423787d310
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-10-19 22:49:16 +08:00 |
zhangshanxue
|
9ef34cd692
|
异步发奖 出错
|
2020-10-19 22:48:45 +08:00 |
lvxinran
|
b89fd738ca
|
添加道具
|
2020-10-19 22:36:24 +08:00 |
lvxinran
|
75d86b8203
|
逍遥游数据删除
|
2020-10-19 21:36:23 +08:00 |
zhangshanxue
|
005483bbf1
|
Merge branch 'master_online_hw' into master_test_hw
|
2020-10-19 21:28:50 +08:00 |
zhangshanxue
|
e6c6819aae
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-10-19 21:27:08 +08:00 |
zhangshanxue
|
8740994520
|
线上账号登录异常
|
2020-10-19 21:26:55 +08:00 |
lvxinran
|
048c9177fd
|
逍遥游红点
|
2020-10-19 20:22:47 +08:00 |
lvxinran
|
1c0cbabcad
|
修改灵兽
|
2020-10-19 19:58:52 +08:00 |
lvxinran
|
42c7e31723
|
灵兽 结构修改,部分接口修改
|
2020-10-19 16:36:17 +08:00 |
lvxinran
|
d307a4a0fc
|
逍遥游消耗物品
|
2020-10-19 15:22:22 +08:00 |
lvxinran
|
7abd3c2dba
|
等级校验添加
|
2020-10-19 14:01:14 +08:00 |
lvxinran
|
674e421e27
|
普通奖励修改
|
2020-10-19 09:59:56 +08:00 |
lvxinran
|
3f862e1ce3
|
Merge branch 'master_test_hw' into master_test_journey
|
2020-10-17 18:14:06 +08:00 |
lvxinran
|
f4c4f22919
|
逍遥游修改
|
2020-10-17 18:11:58 +08:00 |
zhangshanxue
|
b27077e6f2
|
充值金额过滤
|
2020-10-16 15:22:12 +08:00 |
zhangshanxue
|
82673bcee7
|
user lru
|
2020-10-16 14:46:13 +08:00 |
lvxinran
|
f7c5cfb7c4
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-10-31 17:26:31 +08:00 |
lvxinran
|
f2cb92c4c2
|
宝物精炼不消耗bug
|
2020-10-31 17:26:22 +08:00 |
zhangshanxue
|
4c60691839
|
修复宝器进错背包数据
|
2020-10-19 01:13:31 +08:00 |
zhangshanxue
|
0c8cfc0e4a
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-10-19 00:33:52 +08:00 |
zhangshanxue
|
ab8815cfcd
|
魂印过滤及日常刷新
|
2020-10-19 00:33:42 +08:00 |
zhangshanxue
|
171d86addf
|
青龙秘宝任务刷新
|
2020-10-17 22:10:01 +08:00 |
lvxinran
|
10011c4027
|
Merge branch 'master_online_hw' into master_test_hw
|
2020-10-30 16:25:17 +08:00 |
lvxinran
|
97de16f24a
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-10-30 15:40:18 +08:00 |
zhangshanxue
|
cccb53e1ae
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-11-08 14:35:00 +08:00 |
zhangshanxue
|
ddc7f15b63
|
掉落bug
|
2020-11-08 14:34:02 +08:00 |
lvxinran
|
c556d0c425
|
修改宝物分解
|
2020-10-30 15:40:14 +08:00 |
lvxinran
|
2d28e51301
|
回春散加血修改
|
2020-10-30 11:15:42 +08:00 |
lvxinran
|
6991d23e69
|
特权修复
|
2020-10-30 10:47:45 +08:00 |
lvxinran
|
663b3c9723
|
逍遥游逻辑
|
2020-10-16 14:19:16 +08:00 |
lvxinran
|
7ced543cb1
|
大闹天宫机器人修改
|
2020-10-15 21:27:25 +08:00 |
lvxinran
|
07cb65d63a
|
十绝阵排行修改
|
2020-10-15 21:25:20 +08:00 |
lvxinran
|
2cfe662de8
|
战斗类型添加
|
2020-10-14 21:12:24 +08:00 |
DESKTOP-98AVA47\Administrator
|
5fc0a86b00
|
乾坤宝盒保底次数负数修改
|
2020-10-14 16:31:35 +08:00 |
DESKTOP-98AVA47\Administrator
|
e8616191b6
|
日常修复、森罗幻境修复
|
2020-10-14 16:29:19 +08:00 |
jiahuiwen
|
5499d28bf2
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-10-13 14:58:30 +08:00 |
jiahuiwen
|
8df6762548
|
25闯关礼包、26、心魔试炼礼包 触发和推送
|
2020-10-13 14:58:25 +08:00 |
zhangshanxue
|
af5d3395c3
|
新增达人活动
|
2020-10-12 13:45:00 +08:00 |
zhangshanxue
|
16cb452afe
|
新增达人活动
|
2020-10-23 14:27:52 +08:00 |
zhangshanxue
|
1751ac7e44
|
英雄脱装备修复
|
2020-10-10 10:51:21 +08:00 |
zhangshanxue
|
ca2e499a9f
|
法宝分解前后端不一致
|
2020-10-09 18:03:05 +08:00 |
zhangshanxue
|
42917b3043
|
升星法宝报错 和 法宝穿戴bug
|
2020-10-09 17:24:53 +08:00 |
zhangshanxue
|
43943aeed3
|
大闹天宫返还会掉落的装备
|
2020-10-09 17:24:01 +08:00 |
zhangshanxue
|
384f4ff481
|
踢人下线
|
2020-10-09 14:18:27 +08:00 |
zhangshanxue
|
f0bda1ef52
|
死循环
|
2020-10-02 02:22:11 +08:00 |
zhangshanxue
|
72256d2370
|
死循环
|
2020-10-02 01:00:48 +08:00 |
lvxinran
|
838db384fd
|
迷宫达人修改
|
2020-10-17 23:21:38 +08:00 |
lvxinran
|
166b93b3f7
|
邮件本地化提交
|
2020-10-01 00:55:09 +08:00 |
lvxinran
|
2f45a0710a
|
车迟斗法 记录修改
|
2020-12-07 15:37:41 +08:00 |
lvxinran
|
9016e7a36d
|
本地化消息修改
|
2020-12-07 02:10:34 +08:00 |
lvxinran
|
07dcdbb7c3
|
本地化系统消息
|
2020-12-07 01:56:43 +08:00 |
lvxinran
|
e79d844eec
|
系统公告本地化修改
|
2020-12-06 08:57:25 +08:00 |
DESKTOP-98AVA47\Administrator
|
c9e04ee252
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-10-01 00:23:35 +08:00 |
lvxinran
|
b5b616016a
|
技能修改再次提交
|
2020-11-25 11:03:16 +08:00 |
lvxinran
|
4419d44283
|
上报数据 报空修改
|
2020-11-24 14:05:32 +08:00 |
lvxinran
|
4dd8ad89d9
|
灵兽宝阁打点
|
2020-11-24 13:49:03 +08:00 |
lvxinran
|
452b929053
|
宝物合成打点修改
|
2020-11-23 21:34:24 +08:00 |
lvxinran
|
8ee35244fb
|
暂时改回上个版本
|
2020-11-23 21:30:25 +08:00 |
DESKTOP-98AVA47\Administrator
|
5b660609f4
|
社稷大典提交
|
2020-10-01 00:23:25 +08:00 |
zhangshanxue
|
adb2c8d9c9
|
成长基金报错
|
2020-09-30 14:12:02 +08:00 |
zhangshanxue
|
10d97f1de4
|
成长基金报错
|
2020-09-30 13:25:38 +08:00 |
lvxinran
|
0e8b31c1a7
|
森罗环境修复
|
2020-09-27 20:54:41 +08:00 |
lvxinran
|
dee3658f2f
|
下一层校验
|
2020-09-27 20:05:11 +08:00 |
lvxinran
|
dc59c1f768
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-26 18:36:20 +08:00 |
zhangshanxue
|
935131223e
|
Merge branch 'master_online_hw' into master_test_hw
|
2020-09-27 18:19:02 +08:00 |
zhangshanxue
|
9186cfc5dc
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-09-27 18:03:51 +08:00 |
zhangshanxue
|
c7e179ba55
|
网页支付过滤条件
|
2020-09-27 18:03:38 +08:00 |
lvxinran
|
1384cca3ee
|
云梦祈福修改
|
2020-09-26 18:36:08 +08:00 |
lvxinran
|
6fda647587
|
活动特权修复
|
2020-09-26 17:59:40 +08:00 |
lvxinran
|
742dfb5cbb
|
免费礼包修改
|
2020-09-26 15:00:05 +08:00 |
lvxinran
|
7c88b404c9
|
金额校验
|
2020-09-27 11:58:44 +08:00 |
lvxinran
|
dc9665c93a
|
特权时间修改
|
2020-09-27 10:01:52 +08:00 |
lvxinran
|
45d15fec1f
|
宝物bug修改
|
2020-09-27 10:01:35 +08:00 |
lvxinran
|
64ba0f5ac7
|
积天好礼发邮件修改
|
2020-09-25 16:19:53 +08:00 |
lvxinran
|
805ac98057
|
Merge branch 'master_online_hw' into master_test_hw
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/ForceCurrRank.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java
|
2020-09-25 14:31:42 +08:00 |
lvxinran
|
5ec7abded1
|
森罗环境小怪重置刷新
|
2020-09-25 14:02:20 +08:00 |
lvxinran
|
647a31a16b
|
三界除魔提交,达人活动发奖异步
|
2020-09-25 13:57:09 +08:00 |
zhangshanxue
|
9ad1f39f5b
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-09-25 11:37:14 +08:00 |
lvxinran
|
716d2160de
|
天宫秘宝bug修改
|
2020-10-02 05:01:11 +08:00 |
zhangshanxue
|
02f957f54e
|
网页支付礼包限制
|
2020-09-25 11:37:04 +08:00 |
lvxinran
|
b958742c74
|
三界活动 修改
|
2020-09-24 18:28:04 +08:00 |
zhangshanxue
|
fc6c95fc22
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-09-23 16:58:11 +08:00 |
lvxinran
|
e73992d1d3
|
满级校验
|
2020-10-10 13:30:27 +08:00 |
zhangshanxue
|
fe44a27b41
|
大闹天宫节点刷新bug
|
2020-09-23 16:58:00 +08:00 |
lvxinran
|
5ea0547673
|
三界提交
|
2020-09-23 01:34:58 +08:00 |
lvxinran
|
749f0aa253
|
青龙秘宝修改
|
2020-09-28 05:06:42 +08:00 |
lvxinran
|
16c9e3deac
|
达人活动添加
|
2020-09-23 16:08:00 +08:00 |
lvxinran
|
0dc8d8c5b8
|
天宫达人
|
2020-09-23 14:17:39 +08:00 |
lvxinran
|
175b75a796
|
免费礼包、达人活动提交
|
2020-09-25 11:44:36 +08:00 |
zhangshanxue
|
c264817928
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-09-22 18:17:15 +08:00 |
zhangshanxue
|
8788dba24e
|
公会bug
|
2020-09-22 18:16:40 +08:00 |
zhangshanxue
|
65602bd986
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-09-21 21:00:46 +08:00 |
zhangshanxue
|
cba3a332a7
|
未入库
|
2020-09-21 21:00:38 +08:00 |
lvxinran
|
a339c6f8df
|
关卡战斗修改
|
2020-09-21 20:44:23 +08:00 |
zhangshanxue
|
0875daa209
|
未入库
|
2020-09-21 20:29:09 +08:00 |
zhangshanxue
|
949cc3cf50
|
数据上报错误
|
2020-09-21 20:06:34 +08:00 |
lvxinran
|
e347397922
|
关卡日志修改
|
2020-09-21 18:21:45 +08:00 |
zhangshanxue
|
c90d741866
|
数据上报错误
|
2020-09-21 17:41:48 +08:00 |
zhangshanxue
|
86724a73b7
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-09-21 16:19:12 +08:00 |
zhangshanxue
|
f3eea7067d
|
数据上报目录配置
|
2020-09-21 16:18:43 +08:00 |
lvxinran
|
cff0723c20
|
战力排行修复
|
2020-09-21 12:14:43 +08:00 |
lvxinran
|
d2c96bbe1a
|
战力排行信息修改
|
2020-09-21 11:58:20 +08:00 |
lvxinran
|
085e611beb
|
战力排行日志
|
2020-09-21 11:56:43 +08:00 |
lvxinran
|
0778e74ca8
|
战力排行日志
|
2020-09-21 11:18:30 +08:00 |
lvxinran
|
0d28f6fae5
|
0.99充值活动修改
|
2020-09-23 07:14:49 +08:00 |
lvxinran
|
e3027f1157
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-09-21 06:03:35 +08:00 |
lvxinran
|
c107d23934
|
累充0.99修改
|
2020-09-21 06:03:24 +08:00 |
zhangshanxue
|
0b3715aae1
|
大闹天宫刷新时间
|
2020-09-18 18:31:08 +08:00 |
lvxinran
|
c8913cb5ac
|
上报ip修改
|
2020-09-18 00:53:27 +08:00 |
lvxinran
|
991f789f6c
|
道具流水gm修改
|
2020-09-17 17:50:23 +08:00 |
DESKTOP-98AVA47\Administrator
|
1fa16cadd0
|
猎妖之路节点生成错误
|
2020-09-24 21:43:09 +08:00 |
lvxinran
|
22a5668ac2
|
在线奖励添加一键领取
|
2020-09-16 12:32:53 +08:00 |
lvxinran
|
28d2780c3b
|
车迟斗法排行日志
|
2020-09-16 05:16:02 +08:00 |
lvxinran
|
cb75ce8f9d
|
破阵诛仙活动 刷新修改
|
2020-09-16 05:03:09 +08:00 |
lvxinran
|
64e67ae8a1
|
大闹天宫打点
|
2020-09-15 20:52:46 +08:00 |
lvxinran
|
7b33db16df
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-15 18:49:27 +08:00 |
lvxinran
|
8bc3d089dd
|
大闹天宫埋点修改
|
2020-09-15 18:49:17 +08:00 |
jiahuiwen
|
ff1271b151
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-15 16:44:32 +08:00 |
jiahuiwen
|
a4d8819350
|
规范日志
|
2020-09-15 16:44:15 +08:00 |
lvxinran
|
a9c7040dc9
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-15 16:19:35 +08:00 |
zhangshanxue
|
0a565bb025
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-15 16:16:07 +08:00 |
zhangshanxue
|
f4dc939fc2
|
网页支付玩家定制化商品列表
|
2020-09-15 16:15:59 +08:00 |
lvxinran
|
ff8772dd4f
|
工会副本buff修改
|
2020-09-15 16:15:56 +08:00 |
lvxinran
|
bb6a149f89
|
天宫秘宝修改
|
2020-09-15 14:43:13 +08:00 |
lvxinran
|
d0aebf10f3
|
数据上报字段修改,森罗环境层数排行修改
|
2020-09-15 13:47:04 +08:00 |
lvxinran
|
3328d48b41
|
重置最高层减1
|
2020-09-15 11:02:02 +08:00 |
jiahuiwen
|
33bd562ea6
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-11 10:05:49 +08:00 |
lvxinran
|
a1b7bc9e68
|
tapdb货币类型
|
2020-09-17 16:12:13 +08:00 |
jiahuiwen
|
5c4d7e49e2
|
添加空判断
|
2020-09-11 10:05:43 +08:00 |
lvxinran
|
ccc1011023
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-10 15:17:12 +08:00 |
lvxinran
|
644632f740
|
心魔、日常打点修改
|
2020-09-10 15:17:04 +08:00 |
lvxinran
|
4b0083bea9
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-25 10:32:14 +08:00 |
lvxinran
|
066de19115
|
天宫秘宝修改
|
2020-09-25 10:32:09 +08:00 |
zhangshanxue
|
d2c5509766
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-09 15:06:55 +08:00 |
zhangshanxue
|
7aad0e485b
|
商品id未赋值
|
2020-09-09 15:06:48 +08:00 |
zhangshanxue
|
70d170c341
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-07 18:13:05 +08:00 |
zhangshanxue
|
eb37e958f6
|
充值上报汇率
|
2020-09-07 18:12:26 +08:00 |
lvxinran
|
9e32a22e06
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-20 20:55:38 +08:00 |
lvxinran
|
d00c9f8c64
|
cdk 服务器id添加
|
2020-09-20 20:55:04 +08:00 |
lvxinran
|
834f6e303e
|
八日登录修改,公会副本边界,不发排行奖励修改
|
2020-09-09 08:13:51 +08:00 |
lvxinran
|
2d788828d5
|
0消耗判断
|
2020-09-07 17:31:46 +08:00 |
lvxinran
|
897563644f
|
魂印战力修改
|
2020-09-07 16:23:38 +08:00 |
lvxinran
|
324a93d144
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-07 15:51:49 +08:00 |
lvxinran
|
51ca7053a1
|
购买buff修改,魂印基础战力
|
2020-09-07 15:51:44 +08:00 |
lvxinran
|
748f792faa
|
工会副本修改
|
2020-09-17 19:18:08 +08:00 |
lvxinran
|
09a07cd559
|
修改副本
|
2020-09-17 19:06:11 +08:00 |
lvxinran
|
92ed17c747
|
保存编队修改
|
2020-09-17 02:40:36 +08:00 |
lvxinran
|
13ca97db1c
|
代码回滚
|
2020-09-17 01:41:58 +08:00 |
lvxinran
|
80bdaf491e
|
删除无用buff
|
2020-09-17 01:41:16 +08:00 |
lvxinran
|
99febadec7
|
清除无用buff点
|
2020-09-17 01:40:38 +08:00 |
DESKTOP-98AVA47\Administrator
|
5cf95e7e09
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-07 10:28:48 +08:00 |
lvxinran
|
2b16cf567b
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-19 08:15:03 +08:00 |
lvxinran
|
de8524d70a
|
暂时修改工会副本
|
2020-09-19 08:14:27 +08:00 |
lvxinran
|
fcc07cc679
|
森罗幻境埋点
|
2020-09-19 07:56:53 +08:00 |
lvxinran
|
e2ab570525
|
打点修改 工会副本5点刷新伤害
|
2020-09-19 06:59:17 +08:00 |
lvxinran
|
28d42eb762
|
破阵诛仙任务读表修改
|
2021-01-17 05:02:58 +08:00 |
lvxinran
|
ade62badfa
|
论数修改
|
2021-01-17 05:02:10 +08:00 |
zhangshanxue
|
6125cbcb65
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-14 17:52:49 +08:00 |
zhangshanxue
|
048d00080e
|
网页支付玩家商品信息获取
|
2020-09-14 17:52:00 +08:00 |
lvxinran
|
37735820ef
|
日常副本打点修改
|
2020-09-14 09:49:16 +08:00 |
lvxinran
|
556fe1e95b
|
本地服修改
|
2020-09-11 13:52:51 +08:00 |
lvxinran
|
9256a17ef9
|
本地服修改
|
2020-09-11 12:20:04 +08:00 |
lvxinran
|
2f4c29045b
|
打点修改,道具流水修改,天宫秘宝修改
|
2020-09-11 11:50:10 +08:00 |
DESKTOP-98AVA47\Administrator
|
5fe1028faf
|
redis key错误
|
2020-09-07 10:28:28 +08:00 |
lvxinran
|
d37d1176ed
|
修改森罗环境卡牌被分解不能战斗
|
2020-09-04 11:57:02 +08:00 |
jiahuiwen
|
2982500416
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-04 10:31:26 +08:00 |
jiahuiwen
|
b5feff687e
|
消耗增加负值判断
|
2020-09-04 10:31:21 +08:00 |
lvxinran
|
612a407006
|
打点修改
|
2020-09-03 10:58:07 +08:00 |
jiahuiwen
|
c3aa0b815f
|
替换 System.out.println
|
2020-09-02 16:27:26 +08:00 |
jiahuiwen
|
d1eccf88b9
|
代码优化
|
2020-09-01 17:20:57 +08:00 |
jiahuiwen
|
c3be084f49
|
优化代码
|
2020-09-01 14:45:47 +08:00 |
jiahuiwen
|
f6d885559b
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-01 10:45:21 +08:00 |
jiahuiwen
|
8e31ca0acf
|
优化代码
|
2020-09-01 10:45:16 +08:00 |
lvxinran
|
f223f8217c
|
血量战斗修改
|
2020-08-28 05:26:02 +08:00 |
lvxinran
|
e4fd71e3a5
|
无尽本修改
|
2020-08-28 04:45:17 +08:00 |
lvxinran
|
3a2d1001aa
|
打印日志
|
2020-08-28 04:37:22 +08:00 |
lvxinran
|
b96da4ee17
|
无尽修改
|
2020-08-28 04:29:41 +08:00 |
lvxinran
|
f078d184f0
|
副本修改
|
2020-08-28 04:10:01 +08:00 |
lvxinran
|
064d737212
|
云梦祈福 修改状态
|
2020-08-28 03:06:54 +08:00 |
lvxinran
|
87955174a7
|
上报修改
|
2020-08-28 01:34:47 +08:00 |
lvxinran
|
8c917c414b
|
进阶编队校验修改
|
2020-09-10 05:35:54 +08:00 |
lvxinran
|
9c658b6acd
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-10 05:15:01 +08:00 |
lvxinran
|
8b5fd5bc20
|
五星任务
|
2020-09-10 05:14:50 +08:00 |
lvxinran
|
9ccd699d8b
|
天宫秘宝修改
|
2020-09-20 04:24:44 +08:00 |
zhangshanxue
|
a1b2d3e3f3
|
任务类型和充值计费点
|
2020-09-09 23:22:00 +08:00 |
lvxinran
|
e45c58c3d1
|
云梦祈福修改
|
2020-09-04 03:37:06 +08:00 |
lvxinran
|
7d141098f9
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-04 02:15:02 +08:00 |
lvxinran
|
8bd27071d3
|
副本修改
|
2020-09-04 02:14:54 +08:00 |
lvxinran
|
f6d757aa16
|
吃装备计数修改
|
2020-09-03 15:30:10 +08:00 |
lvxinran
|
445f0a4965
|
天宫7天限制
|
2020-09-03 15:29:48 +08:00 |
zhangshanxue
|
be086265c7
|
上报报错
|
2020-08-28 20:46:06 +08:00 |
zhangshanxue
|
5ff3eb46ba
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-08-28 18:02:29 +08:00 |
zhangshanxue
|
31677bdff6
|
任务累充金额
|
2020-08-28 18:02:16 +08:00 |
lvxinran
|
62fbd0f9b8
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-08-27 13:32:01 +08:00 |
zhangshanxue
|
3075948147
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-08-28 11:00:40 +08:00 |
lvxinran
|
c8cc9af30e
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-04 10:38:01 +08:00 |
lvxinran
|
32aab7a641
|
竞技场排行榜
|
2020-09-04 10:37:36 +08:00 |
lvxinran
|
fbb03e44f8
|
森罗修改
|
2020-10-05 02:11:20 +08:00 |
lvxinran
|
5f9b70ea80
|
天宫秘宝积分购买添加 公会副本击杀奖励修改
|
2020-10-01 00:40:30 +08:00 |
lvxinran
|
e0e89d377e
|
公会副本排行奖励
|
2020-10-01 00:19:39 +08:00 |
lvxinran
|
f0f28b8fa6
|
世界等级 物品掉落 宝物战力修改
|
2020-09-10 17:46:14 +08:00 |
lvxinran
|
77098ce6a1
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-10 16:25:09 +08:00 |
lvxinran
|
ce9370be4a
|
基金修改
|
2020-09-10 16:25:00 +08:00 |
lvxinran
|
656e089d0f
|
公会副本修改
|
2020-09-10 15:10:04 +08:00 |
lvxinran
|
d4ee477baa
|
云梦祈福刷新
|
2020-09-10 11:19:40 +08:00 |
zhangshanxue
|
9fd22f7623
|
巅峰赛名次任务
|
2020-08-28 11:00:12 +08:00 |
zhangshanxue
|
0417a4c728
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-08-27 21:09:08 +08:00 |
zhangshanxue
|
8b01414491
|
先后手
|
2020-08-27 21:08:56 +08:00 |
lvxinran
|
85c45138da
|
排行修改
|
2020-08-27 13:31:49 +08:00 |
zhangshanxue
|
8257fbe430
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-08-26 15:43:58 +08:00 |
zhangshanxue
|
7f55f8cbc4
|
浮点精度
|
2020-08-26 15:43:42 +08:00 |
lvxinran
|
f1d88626b6
|
森罗环境修改
|
2020-09-10 18:17:09 +08:00 |
lvxinran
|
330e7c105a
|
青龙秘宝修改
|
2020-09-10 17:59:38 +08:00 |
lvxinran
|
bcf288b69f
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-08-25 15:11:31 +08:00 |
lvxinran
|
793be7aeb2
|
修改青龙礼包合公会副本经验
|
2020-08-25 15:11:20 +08:00 |
zhangshanxue
|
459ef26b50
|
测试充值
|
2020-08-25 14:50:19 +08:00 |
zhangshanxue
|
07595796fa
|
合分支
|
2020-08-24 23:36:16 +08:00 |
zhangshanxue
|
23ade886ae
|
Merge branch 'master' into master_test_hw
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
# tablemanager/src/main/java/config/SRechargeCommodityConfig.java
|
2020-08-24 23:16:18 +08:00 |
zhangshanxue
|
e77644359d
|
充值价格
|
2020-08-24 23:14:03 +08:00 |
lvxinran
|
a57bdbc37f
|
五星成长礼修改
|
2020-09-01 22:11:12 +08:00 |
lvxinran
|
10858c2606
|
剑影仙踪活动修改
|
2020-09-01 18:30:29 +08:00 |
lvxinran
|
b586b0c502
|
时间5天改成30天
|
2020-09-01 14:55:09 +08:00 |
lvxinran
|
cc3f0d662d
|
公会副本次数修改
|
2020-09-01 14:14:26 +08:00 |
lvxinran
|
c98aa7f20d
|
公会副本次数修改
|
2020-09-01 22:30:59 +08:00 |
lvxinran
|
57057330aa
|
上报乘100修改
|
2020-08-22 16:57:01 +08:00 |
lvxinran
|
d56aa73460
|
Merge branch 'master' into 公会副本
|
2020-08-22 15:39:33 +08:00 |
lvxinran
|
146c394e7a
|
公会副本提交
|
2020-08-22 15:38:31 +08:00 |
lvxinran
|
86eee21319
|
怪物战力修改表数据
|
2020-08-21 20:53:26 +08:00 |
zhangshanxue
|
3ef43a64a7
|
灵动网页支付
|
2020-08-21 20:31:30 +08:00 |
lvxinran
|
26e02ac204
|
无尽修改
|
2020-08-21 19:25:31 +08:00 |
lvxinran
|
388a28507b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-08-21 18:46:55 +08:00 |
lvxinran
|
e9fe5e2992
|
礼包修改
|
2020-08-21 18:46:49 +08:00 |
lvxinran
|
f7b77d668a
|
副本提交
|
2020-08-28 14:38:20 +08:00 |
lilei
|
80bd02138f
|
破阵诛仙累冲任务修正
|
2020-08-21 18:00:07 +08:00 |
lilei
|
7c7e5cf9f1
|
破阵诛仙系列任务
|
2020-08-21 16:36:46 +08:00 |
lvxinran
|
c6a0354f81
|
公会副本提交,大闹天宫埋点提交
|
2020-08-20 23:02:13 +08:00 |
lvxinran
|
95375eab26
|
公会副本提交
|
2020-08-27 19:49:57 +08:00 |
lilei
|
2cdf521ce3
|
探索达人替换为极速达人,增加探索次数特权逻辑
|
2020-08-20 14:06:48 +08:00 |
lilei
|
bf1ef4c1a3
|
活动热更延期增加遗留数据清理
|
2020-08-19 20:36:18 +08:00 |
zhangshanxue
|
b83687ea23
|
revert 错误合并
|
2020-08-19 11:16:28 +08:00 |
lvxinran
|
ec758ee011
|
公会副本排行榜
|
2020-08-19 09:58:33 +08:00 |
lvxinran
|
41d73df618
|
公会副本排行
|
2020-08-19 09:50:37 +08:00 |
lilei
|
50f33a02c0
|
Merge branch 'develop_treasure'
|
2020-08-19 09:47:27 +08:00 |
lilei
|
2ef8972406
|
青龙秘宝
|
2020-08-19 09:47:02 +08:00 |
zhangshanxue
|
bc50b90957
|
重连有问题
|
2020-08-18 22:27:30 +08:00 |
zhangshanxue
|
413f84af8a
|
十绝阵结算
|
2020-08-18 20:10:12 +08:00 |
lvxinran
|
1b70b3c73a
|
公会副本
|
2020-08-18 19:42:50 +08:00 |
lilei
|
f202f73b73
|
青龙秘宝,工坊合成装备任务改为锻器阁合成装备
|
2020-08-18 17:10:06 +08:00 |
zhangshanxue
|
22aca76856
|
充值和数据转换
|
2020-08-18 16:22:38 +08:00 |
zhangshanxue
|
000b4466b3
|
充值和数据转换
|
2020-08-18 16:12:54 +08:00 |
lvxinran
|
38c3cffa54
|
appId加入
|
2020-08-21 14:22:14 +08:00 |
zhangshanxue
|
cc801a8510
|
充值价格
|
2020-08-18 11:27:03 +08:00 |
lilei
|
c18ac44bcf
|
青龙秘宝
|
2020-08-18 09:42:32 +08:00 |
zhangshanxue
|
024e339bc3
|
合服
|
2020-08-17 22:31:25 +08:00 |
zhangshanxue
|
90e14e4493
|
合服
|
2020-08-17 21:40:49 +08:00 |
lilei
|
b797c85de6
|
青龙秘宝,新增任务类型
|
2020-08-17 19:53:26 +08:00 |
zhangshanxue
|
d9bd59ea26
|
合服
|
2020-08-17 15:30:25 +08:00 |
lilei
|
f73829b5d4
|
青龙秘宝,新增部分任务类型
|
2020-08-17 15:01:28 +08:00 |
zhangshanxue
|
29f85c959b
|
合服
|
2020-08-17 11:09:35 +08:00 |
zhangshanxue
|
b643307e5a
|
合服
|
2020-08-17 10:26:46 +08:00 |
lvxinran
|
588e22626f
|
修改部分日志
|
2020-08-17 10:11:27 +08:00 |
lvxinran
|
237317a677
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-08-30 21:15:02 +08:00 |
lvxinran
|
8aaf2d698b
|
十绝阵邮件发奖修改
|
2020-08-30 21:14:49 +08:00 |
lvxinran
|
bde18afb04
|
轩辕宝镜修改推送
|
2020-08-24 05:02:20 +08:00 |
zhangshanxue
|
2826ce87de
|
合服
|
2020-08-15 17:28:53 +08:00 |
zhangshanxue
|
05a1f88da3
|
合服
|
2020-08-15 15:47:51 +08:00 |
zhangshanxue
|
7c8743c71e
|
Merge branch 'master_test_combin' of http://60.1.1.230/backend/jieling_server into master_test_combin
|
2020-08-15 15:41:50 +08:00 |
zhangshanxue
|
7c5c28d6a1
|
Merge branch 'master_test_hw' into master_test_combin
|
2020-08-15 15:40:46 +08:00 |
zhangshanxue
|
68aa9fc53d
|
合服
|
2020-08-15 15:25:55 +08:00 |
zhangshanxue
|
0a162ccce7
|
充值类型更换
|
2020-08-14 23:41:23 +08:00 |
zhangshanxue
|
47bfc8c339
|
充值类型更换
|
2020-08-14 23:19:12 +08:00 |
zhangshanxue
|
329cb6dcc2
|
充值类型更换
|
2020-08-14 23:18:18 +08:00 |
zhangshanxue
|
433ef98265
|
充值类型更换
|
2020-08-14 23:08:45 +08:00 |
zhangshanxue
|
a2504adc4c
|
合服
|
2020-08-14 14:30:31 +08:00 |
zhangshanxue
|
e81eeb4cf6
|
英雄创建类型
|
2020-08-14 14:10:56 +08:00 |
lvxinran
|
9a25d556a2
|
换层清除数据
|
2020-08-23 07:03:47 +08:00 |
lvxinran
|
3b384d0698
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-08-23 07:02:32 +08:00 |
lvxinran
|
c0126ead43
|
线程加入try catch
|
2020-08-23 07:02:27 +08:00 |
lvxinran
|
20a0adb7fe
|
森罗环境 小怪计血量
|
2020-08-23 07:02:07 +08:00 |
lvxinran
|
a8087e7b84
|
森罗幻境重置商人
|
2020-08-22 05:02:27 +08:00 |
lvxinran
|
dbfb8f4110
|
限时兑换活动物品掉落修改
|
2020-08-21 11:30:47 +08:00 |
lilei
|
517f156037
|
每日签到宝箱
|
2020-08-14 09:39:38 +08:00 |
zhangshanxue
|
ca65ff8689
|
合服
|
2020-08-13 21:44:36 +08:00 |
zhangshanxue
|
60abb970a9
|
Merge branch 'master' into master_test_combin
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
|
2020-08-13 19:28:39 +08:00 |
zhangshanxue
|
cbde195205
|
合服
|
2020-08-13 19:26:18 +08:00 |
zhangshanxue
|
c36c3abdde
|
英雄置换
|
2020-08-13 16:53:56 +08:00 |
lvxinran
|
eff5b8a1f3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-08-17 06:21:36 +08:00 |
lvxinran
|
315ef31145
|
车迟斗法打点修改
|
2020-08-17 06:21:31 +08:00 |
lvxinran
|
19ee0348b9
|
合成英雄修改
|
2020-08-17 05:36:19 +08:00 |
zhangshanxue
|
31274417cd
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-08-13 15:01:33 +08:00 |
zhangshanxue
|
993ad432b2
|
英雄置换
|
2020-08-13 15:01:25 +08:00 |
zhangshanxue
|
b5295969ca
|
英雄置换
|
2020-08-13 14:34:05 +08:00 |
lvxinran
|
7d298ccfbb
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-08-17 05:08:40 +08:00 |
lvxinran
|
6dfd305c73
|
轩辕宝镜排行发奖
|
2020-08-17 05:08:35 +08:00 |
lvxinran
|
cf3704b456
|
神将合成进阶修改
|
2020-09-07 14:45:25 +08:00 |
lvxinran
|
e371b00b38
|
推送修改
|
2020-08-26 05:58:13 +08:00 |
lvxinran
|
2ba3f2d76f
|
埋点报错修改
|
2020-08-26 05:43:23 +08:00 |
zhangshanxue
|
53993024b6
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-08-13 12:07:29 +08:00 |
zhangshanxue
|
64e4e2911b
|
英雄置换
|
2020-08-13 12:07:16 +08:00 |
zhangshanxue
|
2b33f18c05
|
Merge branch 'equip_develop'
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java
# tablemanager/src/main/java/config/SSpecialConfig.java
|
2020-08-12 15:20:22 +08:00 |
lvxinran
|
1bbf5bc010
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-08-16 14:21:45 +08:00 |
lvxinran
|
9934547352
|
修改装备返还
|
2020-08-16 14:21:35 +08:00 |
lvxinran
|
a05812d3e6
|
修复战斗被动
|
2020-08-16 12:38:09 +08:00 |
lvxinran
|
a5d9a17b29
|
怪物被动修改
|
2020-08-16 11:27:35 +08:00 |
lvxinran
|
5dfcc37f29
|
判断宝镜
|
2020-08-15 20:24:41 +08:00 |
lvxinran
|
1af2208ab8
|
修改校验条件
|
2020-08-15 20:01:33 +08:00 |
lvxinran
|
2d92899d8f
|
打点修改
|
2020-08-15 19:17:46 +08:00 |
lvxinran
|
ef2184ac99
|
二期打点需求
|
2020-08-15 18:18:32 +08:00 |
lvxinran
|
d46749052d
|
战斗位置
|
2020-08-15 17:08:45 +08:00 |
lvxinran
|
c3aa6aaec9
|
报空 修改
|
2020-08-15 16:25:45 +08:00 |
lvxinran
|
00198786e9
|
轩辕宝镜代码提交
|
2020-08-15 13:42:36 +08:00 |
lvxinran
|
fffe477523
|
英雄装备掉落修改
|
2020-08-13 09:41:07 +08:00 |
lvxinran
|
5c23253d5e
|
轩辕宝镜
|
2020-08-13 09:37:01 +08:00 |
zhangshanxue
|
4e0dd14dce
|
英雄置换
|
2020-08-12 14:16:08 +08:00 |
zhangshanxue
|
efc21ecbf3
|
英雄置换
|
2020-08-10 15:26:19 +08:00 |
lvxinran
|
424b64e6c9
|
挑战 扫荡 逻辑
|
2020-08-07 15:26:25 +08:00 |
lvxinran
|
b5a0c8de0e
|
轩辕宝镜接口添加
|
2020-08-06 22:55:38 +08:00 |
lvxinran
|
ee0c50242b
|
轩辕宝镜提交
|
2020-08-06 22:54:25 +08:00 |
lvxinran
|
5cd1a592e0
|
添加轩辕宝镜功能
|
2020-08-07 19:29:13 +08:00 |
lvxinran
|
96625ede21
|
法宝归元,秘境时间代码提交
|
2020-08-07 15:12:49 +08:00 |
lvxinran
|
d7a98fe7fc
|
法宝归元
|
2020-08-05 16:41:42 +08:00 |
lvxinran
|
4a50b29266
|
上报代码提交
|
2020-08-04 20:37:39 +08:00 |
lvxinran
|
ebe8ebed4a
|
暂时删除异常
|
2020-08-04 17:12:40 +08:00 |
lvxinran
|
233c166a8b
|
森罗幻境修复
|
2020-08-04 16:23:13 +08:00 |
lvxinran
|
7cb039e0fb
|
修复地图
|
2020-08-04 09:51:01 +08:00 |
lvxinran
|
8b402e70aa
|
修改部分数据
|
2020-08-03 21:47:59 +08:00 |
lvxinran
|
6895ec3444
|
Merge branch 'master_test'
|
2020-08-03 18:06:05 +08:00 |
lvxinran
|
52745a48b4
|
配置不存在,暂时修改
|
2020-08-03 18:05:32 +08:00 |
zhangshanxue
|
e0b3889a67
|
公会经验bug
|
2020-08-16 20:28:01 +08:00 |
zhangshanxue
|
1f59c36e5e
|
Merge branch 'master_test' of http://60.1.1.230/backend/jieling_server into master_test
|
2020-08-16 20:06:05 +08:00 |
zhangshanxue
|
1dee96141d
|
数据不一致。战斗日志,猎妖积分
|
2020-08-16 17:49:57 +08:00 |
zhangshanxue
|
e5ae741308
|
Merge branch 'master_test'
|
2020-08-09 22:38:14 +08:00 |
zhangshanxue
|
a78faa7d4b
|
玩家清除 和日志打印
|
2020-08-09 22:37:25 +08:00 |
lvxinran
|
b53e2604fa
|
创建地图循环修改
|
2020-08-03 15:36:03 +08:00 |
lvxinran
|
57671563ac
|
升星暂时修改
|
2020-08-03 14:43:03 +08:00 |
lvxinran
|
62d5f5af73
|
代码回滚
|
2020-07-31 18:43:21 +08:00 |
lvxinran
|
c8722e9047
|
装备成就修改,地图炸弹添加,全服邮件红点,装备分解归元修改,打点种类添加
|
2020-07-31 17:37:39 +08:00 |
lvxinran
|
400704e087
|
Merge branch 'master' into master_test
|
2020-07-30 18:27:06 +08:00 |
lvxinran
|
331c386003
|
车迟斗法日志打印
|
2020-07-30 18:26:44 +08:00 |
zhangshanxue
|
94e3477729
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-08-06 21:23:16 +08:00 |
zhangshanxue
|
4960916a72
|
bug
|
2020-08-06 21:22:54 +08:00 |
zhangshanxue
|
2268fdbf5a
|
热更新
|
2020-08-06 21:15:06 +08:00 |
zhangshanxue
|
3ab0b9c3a8
|
出包前bug
|
2020-08-02 23:44:02 +08:00 |
zhangshanxue
|
8fff0be3c3
|
巅峰赛
|
2020-08-11 21:48:46 +08:00 |