duhui
|
c05d0ea2b6
|
首次挑战成功时改为不消耗次数
|
2021-04-21 11:30:04 +08:00 |
xuexinpeng
|
2c92ff12e6
|
Merge branch 'master_test_gn' into master_test_gn_arean
|
2021-05-04 00:25:29 +08:00 |
xuexinpeng
|
59b28c36e8
|
竞技场优化 赛季重置不清空积分,初始化为上赛季积分的百分比
|
2021-05-04 00:24:50 +08:00 |
mengchengzhen
|
c48ad44e27
|
新礼包
|
2021-04-20 15:03:50 +08:00 |
mengchengzhen
|
30814f86a5
|
新礼包
|
2021-04-28 18:03:47 +08:00 |
duhui
|
a41d8fff66
|
Merge branch 'dh_dev_cn_oblation' into master_test_gn
通用祭品
|
2021-04-20 14:44:01 +08:00 |
lvxinran
|
305f2879ed
|
社稷大典排行修改
|
2021-04-19 20:20:56 +08:00 |
duhui
|
ed597fd903
|
大闹天宫,招募星级问题
|
2021-04-20 11:08:00 +08:00 |
lvxinran
|
ffbd9ac401
|
公会祭祀 援助 打印日志
|
2021-04-20 10:45:53 +08:00 |
lvxinran
|
416a93b981
|
公会类型排行榜修改
|
2021-04-20 10:26:52 +08:00 |
duhui
|
174a0f799a
|
同系祭品
|
2021-04-19 17:53:44 +08:00 |
duhui
|
5aa5b1fecb
|
Merge branch 'master_test' into master_test_gn
|
2021-04-19 16:50:36 +08:00 |
lvxinran
|
eb11dd82d1
|
Merge branch 'master_test' into master_test_gn
|
2021-04-20 10:26:04 +08:00 |
lvxinran
|
59a2dfa11a
|
公会类型排行榜修改
|
2021-04-20 10:25:38 +08:00 |
duhui
|
5648d6392e
|
大闹天宫,招募星级问题
|
2021-04-19 16:48:00 +08:00 |
mengchengzhen
|
ee6575e2a3
|
装备升星
|
2021-04-19 15:51:36 +08:00 |
duhui
|
4761478c74
|
通用祭品bug修改
|
2021-04-19 15:38:29 +08:00 |
mengchengzhen
|
0b59e617c8
|
新礼包
|
2021-04-19 15:37:34 +08:00 |
lvxinran
|
935740a46e
|
怪物传星级给前端
|
2021-04-19 15:28:05 +08:00 |
mengchengzhen
|
bad33084ee
|
装备升星
|
2021-04-19 15:12:56 +08:00 |
mengchengzhen
|
2f03e2c24e
|
新礼包
|
2021-04-19 14:50:06 +08:00 |
mengchengzhen
|
c5b4dcd3bd
|
新礼包
|
2021-04-19 11:27:48 +08:00 |
mengchengzhen
|
4ffb494609
|
礼包优化1
|
2021-05-14 17:05:27 +08:00 |
lvxinran
|
0f43fb3888
|
掉落组修改
|
2021-04-17 18:01:30 +08:00 |
lvxinran
|
becc82c425
|
一件购买修改
|
2021-04-17 14:22:29 +08:00 |
mengchengzhen
|
7c331eef67
|
装备升星(云游商人)
|
2021-04-16 18:31:26 +08:00 |
mengchengzhen
|
8af7414ec3
|
Merge branch 'master_test_gn_mcz2' into master_test_gn
|
2021-04-16 17:36:19 +08:00 |
mengchengzhen
|
423bb145c5
|
排行榜皮肤
|
2021-04-16 17:35:53 +08:00 |
mengchengzhen
|
d94c023327
|
装备升星
|
2021-04-16 17:19:10 +08:00 |
mengchengzhen
|
92d850c470
|
装备升星(云游商人)
|
2021-04-16 17:16:30 +08:00 |
lvxinran
|
4d08afb0c9
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-04-16 15:59:21 +08:00 |
lvxinran
|
142673a2da
|
车迟斗法0伤害修改
|
2021-04-16 15:59:10 +08:00 |
duhui
|
a3188a2f03
|
Merge branch 'master_test' into master_test_gn
|
2021-04-16 14:28:25 +08:00 |
duhui
|
6f27a41e03
|
合成道具消耗问题
|
2021-04-16 14:28:03 +08:00 |
duhui
|
509c9b57c8
|
添加道具类型:万能狗粮
|
2021-04-16 14:24:48 +08:00 |
mengchengzhen
|
29ae290630
|
Merge branch 'master_test_gn' into master_test_gn_mcz2
|
2021-04-16 14:02:42 +08:00 |
mengchengzhen
|
2cafa21e1d
|
云游商人
|
2021-04-16 14:02:11 +08:00 |
mengchengzhen
|
87ab7cc69c
|
Merge branch 'master_test_gn' into master_test_gn_mcz2
|
2021-04-16 14:01:06 +08:00 |
lvxinran
|
6bcd974ef2
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-04-16 11:56:08 +08:00 |
lvxinran
|
98be53a50e
|
大闹天宫圣物重构
|
2021-04-16 11:56:02 +08:00 |
duhui
|
8c3c80de3f
|
Merge branch 'master_test' into master_test_gn
|
2021-04-16 10:35:02 +08:00 |
duhui
|
c2cd3b8ebe
|
计算机器人突破等级
|
2021-04-16 10:33:33 +08:00 |
duhui
|
4954417643
|
通用祭品
|
2021-04-16 10:31:51 +08:00 |
mengchengzhen
|
b6f5926c4b
|
装备升星
|
2021-04-15 19:13:56 +08:00 |
duhui
|
a9dbd45916
|
Merge branch 'master_test' into master_test_gn
|
2021-04-15 15:39:21 +08:00 |
lvxinran
|
fe9e0858e3
|
车迟斗法修改,处理0伤害
|
2021-04-15 14:24:04 +08:00 |
lvxinran
|
29aa8a6b53
|
森罗幻境修改
|
2021-04-15 14:22:56 +08:00 |
lvxinran
|
49468dc793
|
森罗幻境修改
|
2021-04-15 14:21:18 +08:00 |
duhui
|
e8e120ccc0
|
大闹天宫,专属圣物技能问题处理
|
2021-04-15 09:36:59 +08:00 |
lvxinran
|
8fc939ee52
|
Merge branch 'master_test' into master_test_gn
|
2021-04-12 19:10:13 +08:00 |
lvxinran
|
5b0e09d6be
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-04-12 17:13:50 +08:00 |
lvxinran
|
6742b70568
|
提示修改
|
2021-04-12 17:13:38 +08:00 |
mengchengzhen
|
c0f10f4f49
|
Merge branch 'master_test_gn_mcz' into master_test_gn
|
2021-04-12 15:11:48 +08:00 |
mengchengzhen
|
2aa15c7c32
|
十五日优化
|
2021-04-12 15:09:43 +08:00 |
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
|
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
|
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 |
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 |