mengchengzhen
|
87463b9b15
|
自动封禁
|
2021-05-28 10:58:57 +08:00 |
lvxinran
|
7144d5fcd6
|
敏感词
|
2021-05-28 10:51:24 +08:00 |
duhui
|
a8a013ec5c
|
Merge branch 'dh_dev_activiyDraw' into master_test_gn
|
2021-05-28 10:10:59 +08:00 |
duhui
|
ce512050b3
|
Merge branch 'master_test_gn' into dh_dev_activiyDraw
|
2021-05-28 10:10:39 +08:00 |
xuexinpeng
|
c617212ba7
|
山河社稷
|
2021-05-27 23:08:20 +08:00 |
xuexinpeng
|
1f7ba67aa4
|
山河社稷
|
2021-05-31 02:17:18 +08:00 |
lvxinran
|
4e969510f5
|
Merge branch 'master_test_gn' into master_test_gn_endless
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/mission/GameEvent.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionType.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/DataManagerDistributor.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java
|
2021-07-03 01:25:41 +08:00 |
lvxinran
|
99cd3246f2
|
无尽副本最后修改
|
2021-07-03 00:05:36 +08:00 |
lvxinran
|
de1432222f
|
无尽提交
|
2021-06-09 03:46:51 +08:00 |
lvxinran
|
dfd2bdc968
|
无尽修改第三版
|
2021-06-01 00:06:40 +08:00 |
duhui
|
ab885c392a
|
心愿抽奖,后端自测完成
|
2021-05-27 19:35:53 +08:00 |
xuexinpeng
|
fecbddb920
|
山河社稷任务
|
2021-05-27 18:24:07 +08:00 |
mengchengzhen
|
d01dcff730
|
灵兽礼包
|
2021-05-27 17:08:47 +08:00 |
duhui
|
8e37bd922c
|
牛气冲天, 活动结束发送未领取奖励
|
2021-05-27 16:10:19 +08:00 |
duhui
|
2a5d149ac6
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-05-27 16:07:17 +08:00 |
duhui
|
839eb2af4f
|
修行,名字颜色
|
2021-05-27 16:06:07 +08:00 |
mengchengzhen
|
cd49002893
|
福利红包
|
2021-05-27 15:52:33 +08:00 |
xuexinpeng
|
e1dbce80cf
|
山河社稷图排行榜
|
2021-05-27 14:48:39 +08:00 |
duhui
|
2bfb6228b0
|
牛气冲天活动结束,未发送未领取奖励问题处理
|
2021-05-27 11:48:59 +08:00 |
duhui
|
6214e3d8b8
|
修行bug处理: 附身神将分解
|
2021-05-27 10:31:11 +08:00 |
duhui
|
829bfccf16
|
修行: 系统消息添加玩家名字颜色
|
2021-05-26 18:31:33 +08:00 |
lvxinran
|
1d7e46ee36
|
玩家经验修改
|
2021-05-26 16:23:24 +08:00 |
xuexinpeng
|
62e5fac672
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-05-26 16:18:33 +08:00 |
xuexinpeng
|
945a238748
|
山河战斗记录修行等级
|
2021-05-26 16:14:49 +08:00 |
lvxinran
|
a597b3545e
|
无尽副本第二版
|
2021-05-26 16:14:29 +08:00 |
duhui
|
ee63e36511
|
修行bug处理, 编队展示错误和不入库问题处理
|
2021-05-26 16:09:10 +08:00 |
xuexinpeng
|
98ee42fb6c
|
Merge branch 'master_test_mcz_hardstage' into master_test_gn
# Conflicts:
# tablemanager/src/main/java/config/SSpecialConfig.java
|
2021-05-26 11:20:11 +08:00 |
xuexinpeng
|
202b170cd5
|
心魔试炼扫荡,一键扫荡
|
2021-05-26 11:09:58 +08:00 |
mengchengzhen
|
69462d976d
|
怪物战力计算
|
2021-05-26 10:38:31 +08:00 |
mengchengzhen
|
7da6f963ba
|
新礼包优化
|
2021-05-25 20:13:42 +08:00 |
mengchengzhen
|
f1776030ef
|
新红包优化
|
2021-05-25 20:13:30 +08:00 |
duhui
|
d1a2849a56
|
心愿抽奖初版,未联调
|
2021-05-25 18:05:56 +08:00 |
duhui
|
66d10040d3
|
Merge branch 'dh_dev_gm' into master_test_gn
(cherry picked from commit b404814382 )
|
2021-05-25 14:07:59 +08:00 |
lvxinran
|
6d76941d51
|
Merge branch 'master_test_gn' into master_test_gn_endless
|
2021-05-25 13:37:39 +08:00 |
lvxinran
|
7978510f02
|
分支合并
|
2021-05-25 11:56:06 +08:00 |
xuexinpeng
|
e74314c6c7
|
山河社稷成就任务 心魔试炼扫荡
|
2021-05-25 11:40:43 +08:00 |
duhui
|
3030bb501f
|
修行: 附身神印展示使用中全部
|
2021-05-25 11:09:25 +08:00 |
duhui
|
b404814382
|
Merge branch 'dh_dev_gm' into master_test_gn
|
2021-05-25 10:25:12 +08:00 |
xuexinpeng
|
e74a860a80
|
特权等级奖励
|
2021-05-24 18:49:46 +08:00 |
mengchengzhen
|
276f842d5c
|
福利红包
|
2021-05-24 18:28:24 +08:00 |
xuexinpeng
|
3811d59299
|
山河社稷gm
|
2021-05-24 15:33:48 +08:00 |
duhui
|
96a3844ccc
|
gm公会,信息不入库处理
|
2021-05-24 15:18:04 +08:00 |
mengchengzhen
|
afda78f8e0
|
灵兽礼包
|
2021-05-24 14:38:22 +08:00 |
mengchengzhen
|
e5c6a1723a
|
福利红包
|
2021-05-24 12:01:34 +08:00 |
mengchengzhen
|
2010a1a9ce
|
Merge branch 'master_test_mcz_redpacket' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
|
2021-05-24 11:43:44 +08:00 |
xuexinpeng
|
c3034285d4
|
Merge branch 'master_test_mcz_hardstage' into master_test_gn
|
2021-05-24 11:10:47 +08:00 |
xuexinpeng
|
fe38e14a1c
|
Merge branch 'dev_dh_Practice' into master_test_mcz_hardstage
|
2021-05-24 11:06:17 +08:00 |
lvxinran
|
24e773aad9
|
无尽修改初版
|
2021-05-23 18:06:21 +08:00 |
mengchengzhen
|
4a2df26e2e
|
福利红包
|
2021-05-21 18:52:19 +08:00 |
xuexinpeng
|
30c1a61b62
|
社稷大典邮件内容修改
|
2021-05-21 18:25:03 +08:00 |
xuexinpeng
|
34cd899b6e
|
山河社稷等级限制数据初始化
|
2021-05-21 16:29:33 +08:00 |
duhui
|
9fced9ba25
|
gm.修改公会信息
|
2021-05-21 15:28:16 +08:00 |
duhui
|
eebf572d7d
|
自定义礼包码
|
2021-05-20 18:02:50 +08:00 |
xuexinpeng
|
133afbab21
|
组队类型限制
|
2021-05-20 17:08:06 +08:00 |
xuexinpeng
|
61c2b2b460
|
战斗lua脚本同步
|
2021-05-20 16:49:36 +08:00 |
xuexinpeng
|
7c7c3e6bb6
|
特权等级奖励
|
2021-05-20 15:41:33 +08:00 |
xuexinpeng
|
a0db7928bf
|
山河社稷图最小战力回放
|
2021-05-19 15:27:00 +08:00 |
mengchengzhen
|
97d32d93dd
|
福利红包
|
2021-05-19 11:18:46 +08:00 |
duhui
|
222c10252b
|
修行3.0
神印展示增加,替换神印逻辑完善
|
2021-05-19 09:35:00 +08:00 |
xuexinpeng
|
bc94b6290d
|
山河社稷图状态显示
|
2021-05-18 16:51:50 +08:00 |
xuexinpeng
|
8423d711dd
|
山河社稷图
|
2021-05-18 15:56:26 +08:00 |
xuexinpeng
|
30ebef6856
|
山河社稷图优化
|
2021-05-18 13:57:07 +08:00 |
xuexinpeng
|
9cb30eb9da
|
山河社稷图
|
2021-05-18 10:13:37 +08:00 |
lvxinran
|
78cb70af3a
|
物品数量修改
|
2021-05-17 21:09:21 +08:00 |
xuexinpeng
|
30115154eb
|
Merge branch 'dev_dh_Practice' into master_test_mcz_hardstage
|
2021-05-17 18:55:52 +08:00 |
xuexinpeng
|
bc9bb14dda
|
山河社稷技能buffer
|
2021-05-17 18:55:19 +08:00 |
duhui
|
b74e3525a7
|
修行名字颜色
|
2021-05-17 17:57:58 +08:00 |
xuexinpeng
|
c509ed8444
|
Merge branch 'dev_dh_Practice' into master_test_mcz_hardstage
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
# serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
|
2021-05-17 11:19:30 +08:00 |
xuexinpeng
|
41ba1e238c
|
山河社稷图
|
2021-05-17 10:28:37 +08:00 |
duhui
|
23d1b68080
|
修行2.0
|
2021-05-17 09:37:16 +08:00 |
xuexinpeng
|
e656ac4344
|
山河社稷
|
2021-05-15 17:04:02 +08:00 |
xuexinpeng
|
7e21e0df43
|
山河社稷
|
2021-05-15 15:05:11 +08:00 |
xuexinpeng
|
a8e76d24db
|
山河社稷图
|
2021-05-14 15:36:50 +08:00 |
lvxinran
|
d8e16aae9a
|
一键购买修改
|
2021-05-14 14:41:13 +08:00 |
lvxinran
|
89332f0d07
|
公会等级上限
|
2021-05-14 14:29:49 +08:00 |
lvxinran
|
442b550aa1
|
开服福利修改
|
2021-05-14 13:47:07 +08:00 |
duhui
|
b51cd010a3
|
修行功能1.0
|
2021-05-14 11:12:47 +08:00 |
lvxinran
|
c3749641b3
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-05-13 17:46:44 +08:00 |
lvxinran
|
e113ab430c
|
限时抽卡修改
|
2021-05-13 17:46:34 +08:00 |
xuexinpeng
|
972b6dde78
|
山河社稷
|
2021-05-13 17:33:19 +08:00 |
lvxinran
|
fc56f377a1
|
活动礼包刷新修改
|
2021-05-13 14:40:27 +08:00 |
xuexinpeng
|
885e0112ad
|
山河社稷
|
2021-05-13 14:39:44 +08:00 |
DESKTOP-98AVA47\Administrator
|
e7ea5f645e
|
工会副本修改
|
2021-05-13 01:33:12 +07:00 |
lvxinran
|
17e2d80685
|
邮件领取奖励上限
|
2021-05-17 21:34:40 +08:00 |
lvxinran
|
d3bcc1618f
|
限时抽卡的活动清除计数
|
2021-05-12 14:34:06 +08:00 |
mengchengzhen
|
8ab1fafc40
|
山河社稷图
|
2021-05-11 21:36:22 +08:00 |
mengchengzhen
|
f561f686e9
|
山河社稷图
|
2021-05-11 21:31:07 +08:00 |
duhui
|
1d8fea9f96
|
修行,未完成提交
|
2021-05-11 17:59:49 +08:00 |
mengchengzhen
|
ea4d1e03d6
|
山河社稷图
|
2021-05-11 16:25:00 +08:00 |
xuexinpeng
|
75e526697a
|
山河社稷更新星星事件
|
2021-05-11 15:48:59 +08:00 |
duhui
|
9457e48c5c
|
计算战力方法,部分注释旧逻辑删除,需要可回滚
|
2021-05-11 14:09:21 +08:00 |
xuexinpeng
|
e8a6617225
|
Merge branch 'master_test_mcz_hardstage' of http://60.1.1.230/backend/jieling_server into master_test_mcz_hardstage
|
2021-05-11 11:38:55 +08:00 |
xuexinpeng
|
b72978b56e
|
山河社稷图排行榜
|
2021-05-11 11:23:19 +08:00 |
mengchengzhen
|
fbceab8579
|
新礼包五星推送
|
2021-05-11 11:04:53 +08:00 |
mengchengzhen
|
3de5a18eb7
|
山河社稷图
|
2021-05-11 10:59:59 +08:00 |
mengchengzhen
|
79ffc31fa8
|
山河社稷图
|
2021-05-11 10:59:39 +08:00 |
duhui
|
9faf6cb267
|
等级
|
2021-05-10 16:30:45 +08:00 |
duhui
|
77c25705f9
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-05-10 16:12:50 +08:00 |
duhui
|
88f1036659
|
等级回滚
|
2021-05-10 16:12:38 +08:00 |
duhui
|
514b1205eb
|
等级
|
2021-05-10 16:11:36 +08:00 |
mengchengzhen
|
489529c827
|
取消灵兽礼包
|
2021-05-10 16:03:12 +08:00 |
duhui
|
c66939c575
|
最高等级
|
2021-05-10 14:39:38 +08:00 |
mengchengzhen
|
e0462df216
|
新礼包灵兽礼包
|
2021-05-10 09:42:51 +08:00 |
mengchengzhen
|
a8c23221a0
|
新礼包超值基金记录领取时间
|
2021-05-08 17:37:35 +08:00 |
lvxinran
|
9f0900a5a2
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-05-08 17:12:59 +08:00 |
mengchengzhen
|
8cf73a88c7
|
新礼包存储
|
2021-05-08 16:36:18 +08:00 |
mengchengzhen
|
87e02201de
|
工会排行bug
|
2021-05-13 18:29:49 +08:00 |
mengchengzhen
|
6677d92b45
|
山河社稷图
|
2021-05-08 16:35:17 +08:00 |
mengchengzhen
|
34e86ceb8d
|
Merge branch 'master_test_gn' into master_prb_gn
|
2021-05-06 21:21:17 +08:00 |
mengchengzhen
|
2d1a115cf0
|
Merge branch 'master_test_gn' into master_prb_gn
|
2021-05-08 21:03:39 +08:00 |
mengchengzhen
|
8cd82e7325
|
首冲bug防止问题方法
|
2021-05-08 21:03:29 +08:00 |
mengchengzhen
|
c32f1e8fb4
|
Merge branch 'master_test_gn' into master_prb_gn
|
2021-05-08 20:50:10 +08:00 |
mengchengzhen
|
f88c84f2dd
|
新礼包首冲bug
|
2021-05-08 20:50:00 +08:00 |
mengchengzhen
|
c9f3eaaaa6
|
新礼包首冲bug指定时间5月6日18点
|
2021-05-06 21:21:05 +08:00 |
mengchengzhen
|
acf6913dbf
|
Merge branch 'master_test_gn' into master_prb_gn
|
2021-05-06 17:11:43 +08:00 |
mengchengzhen
|
dd9bc02661
|
新礼包推送两次bug
|
2021-05-06 17:11:27 +08:00 |
mengchengzhen
|
4eff03208d
|
Merge branch 'master_test_gn' into master_prb_gn
|
2021-05-06 10:07:57 +08:00 |
mengchengzhen
|
36fc8911fc
|
新礼包indexbug修复
|
2021-05-06 10:06:12 +08:00 |
mengchengzhen
|
5363b52f2b
|
新礼包活动领取优化
|
2021-05-11 00:10:14 +08:00 |
lvxinran
|
575accafa7
|
累计充值钱数修改
|
2021-05-04 10:22:06 +08:00 |
lvxinran
|
0ac4200f7c
|
老玩家保存信息
|
2021-04-30 22:57:24 +08:00 |
mengchengzhen
|
d2e6ae8048
|
Merge branch 'master_test_gn' into master_prb_gn
|
2021-04-30 13:38:39 +08:00 |
duhui
|
6c6767d9d6
|
Merge branch 'master_test_gn' into master_prb_gn
|
2021-04-29 20:20:51 +08:00 |
lvxinran
|
66b099bb58
|
Merge branch 'master_test_gn' into master_prb_gn
|
2021-05-01 04:31:46 +08:00 |
lvxinran
|
04bfe71ebf
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-05-01 04:31:18 +08:00 |
DESKTOP-98AVA47\Administrator
|
d3bef43914
|
判空
|
2021-10-31 01:04:06 +07:00 |
mengchengzhen
|
aa086627e4
|
新礼包
|
2021-05-31 02:58:35 +08:00 |
lvxinran
|
32aed0a1b2
|
报空修改
|
2021-05-01 04:31:13 +08:00 |
lvxinran
|
8c47a17aa6
|
Merge branch 'master_test_gn' into master_prb_gn
|
2021-05-01 00:55:45 +08:00 |
mengchengzhen
|
7d41aeec3a
|
新礼包
|
2021-04-30 01:44:11 +08:00 |
mengchengzhen
|
e4f5617ddb
|
新礼包
|
2021-04-29 20:09:00 +08:00 |
mengchengzhen
|
21df5641ca
|
新礼包
|
2021-04-29 19:54:56 +08:00 |
mengchengzhen
|
19d8c11012
|
新礼包五星最后修改
|
2021-04-29 19:38:02 +08:00 |
mengchengzhen
|
76abb2383a
|
新礼包五星推送
|
2021-04-29 19:30:49 +08:00 |
mengchengzhen
|
1a1476fdf7
|
新礼包碎片合成推送
|
2021-04-29 18:51:37 +08:00 |
mengchengzhen
|
7085f15710
|
新礼包五星礼包优化
|
2021-04-29 18:09:36 +08:00 |
mengchengzhen
|
cf1b1df861
|
新礼包
|
2021-04-30 00:32:48 +08:00 |
mengchengzhen
|
95a338f07f
|
新礼包每天刷新,推送时间
|
2021-04-29 17:16:39 +08:00 |
xuexinpeng
|
e3c2f157f2
|
误操 作
|
2021-04-29 16:58:08 +08:00 |
xuexinpeng
|
6842cf869c
|
Merge branch 'master_test_gn' into master_test_gn_arean
|
2021-04-29 16:33:46 +08:00 |
xuexinpeng
|
a63900a3ec
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-04-29 16:31:29 +08:00 |
xuexinpeng
|
3b5fd18a3c
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
新赛季重置积分后 挑战后从重置的分值累加
|
2021-04-29 16:24:21 +08:00 |
xuexinpeng
|
8264a1e0ad
|
踏碎凌霄战斗
|
2021-04-28 01:19:28 +08:00 |
mengchengzhen
|
697f129301
|
新礼包
|
2021-04-28 00:35:03 +08:00 |
mengchengzhen
|
48cf68f620
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-04-28 00:16:46 +08:00 |
lvxinran
|
6c8e14ba4d
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-04-30 23:08:12 +08:00 |
lvxinran
|
f0838b269d
|
0伤害判断
|
2021-04-30 23:08:06 +08:00 |
lvxinran
|
d593a41660
|
月卡改回
|
2021-04-30 20:30:48 +08:00 |
lvxinran
|
3c3beed1cf
|
月卡开启时间0点修改
|
2021-04-30 19:48:18 +08:00 |
lvxinran
|
80882ce656
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-04-30 19:36:47 +08:00 |
lvxinran
|
8cd48d6adb
|
空奖励修改
|
2021-04-30 19:36:34 +08:00 |
mengchengzhen
|
3a5f1a07aa
|
新礼包推送
|
2021-04-28 00:16:35 +08:00 |
mengchengzhen
|
2cfe67afe4
|
新礼包推送弹出
|
2021-04-27 22:28:08 +08:00 |
mengchengzhen
|
32900d9aa9
|
新礼包
|
2021-04-27 21:37:34 +08:00 |
mengchengzhen
|
e8edb1fe95
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-04-27 21:20:19 +08:00 |
mengchengzhen
|
98b068f243
|
新礼包豪华基金
|
2021-04-27 21:18:46 +08:00 |
mengchengzhen
|
c9db588348
|
新礼包
|
2021-04-27 19:27:28 +08:00 |
mengchengzhen
|
9f00d7a855
|
新礼包豪华基金邮件
|
2021-05-01 16:43:12 +08:00 |
mengchengzhen
|
747fd9bdb0
|
豪华基金每天奖励
|
2021-05-01 16:26:13 +08:00 |
lvxinran
|
d9e5327137
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-04-27 15:53:28 +08:00 |
lvxinran
|
43e10b0ea8
|
修改入库读库错误
|
2021-04-27 15:53:23 +08:00 |
mengchengzhen
|
9b6ec67346
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-04-27 14:01:33 +08:00 |
mengchengzhen
|
b1f6fbb581
|
新礼包添加每日充值金额
|
2021-04-27 13:58:54 +08:00 |
mengchengzhen
|
3af3a725c3
|
新礼包
|
2021-04-28 00:27:43 +08:00 |
lvxinran
|
91db235c90
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-04-27 13:40:20 +08:00 |
lvxinran
|
21973c02d6
|
免费不发送邮件
|
2021-04-27 13:40:09 +08:00 |
mengchengzhen
|
c9580f6ba4
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-04-26 20:50:41 +08:00 |
mengchengzhen
|
fcff8428e9
|
新礼包
|
2021-04-26 20:50:32 +08:00 |
lvxinran
|
b7b9753b6f
|
邮件标题错误修改
|
2021-04-26 19:42:16 +08:00 |
lvxinran
|
3eb625070f
|
购买妖精双倍添加
|
2021-04-26 19:40:57 +08:00 |
lvxinran
|
2de2762b5d
|
报错修改
|
2021-04-26 19:09:36 +08:00 |
mengchengzhen
|
f0db839fab
|
Merge branch 'master_test_gn_mcz' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java
|
2021-04-26 19:04:40 +08:00 |
xuexinpeng
|
d827c0057e
|
踏碎凌霄
|
2021-04-26 18:34:58 +08:00 |
mengchengzhen
|
c0271abb3d
|
新礼包
|
2021-04-26 18:24:02 +08:00 |
mengchengzhen
|
2019129057
|
Merge branch 'master_test_gn_mcz' of http://60.1.1.230/backend/jieling_server into master_test_gn_mcz
|
2021-04-26 17:29:25 +08:00 |
mengchengzhen
|
27aa32bd23
|
新礼包
|
2021-04-26 17:27:54 +08:00 |
xuexinpeng
|
197616887a
|
Merge branch 'master_test_gn_arean' into master_test_gn
|
2021-04-26 16:27:19 +08:00 |
xuexinpeng
|
7fb75df1b6
|
踏碎凌霄
|
2021-04-26 16:25:14 +08:00 |
lvxinran
|
d1a54c7377
|
充值 发邮件 发奖修改
|
2021-04-26 15:40:51 +08:00 |
duhui
|
e9d4c76dd6
|
内部gm,跳过公会boss
|
2021-04-26 14:09:04 +08:00 |
mengchengzhen
|
972806ba8f
|
新礼包
|
2021-04-26 13:45:30 +08:00 |
mengchengzhen
|
54a3149de6
|
Merge branch 'master_test_gn_mcz' of http://60.1.1.230/backend/jieling_server into master_test_gn_mcz
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/NewRechargeInfo.java
|
2021-04-26 12:01:08 +08:00 |
lvxinran
|
ae93532942
|
大闹天宫招募节点宝物添加
|
2021-04-23 15:19:47 +08:00 |
mengchengzhen
|
fca38c08d0
|
Merge branch 'master_test_gn' into master_test_gn_mcz2
|
2021-04-22 17:46:43 +08:00 |
mengchengzhen
|
82cc2a5feb
|
Merge branch 'master_test_gn' into master_test_gn_mcz2
|
2021-04-28 18:13:51 +08:00 |
mengchengzhen
|
2cac69ffcb
|
新礼包
|
2021-04-22 17:43:30 +08:00 |
mengchengzhen
|
7d91d069aa
|
新礼包测试
|
2021-04-22 13:55:20 +08:00 |
lvxinran
|
66a0486528
|
抽卡逻辑修改
|
2021-04-21 14:44:26 +08:00 |
lvxinran
|
3f0ecd8d6f
|
判断类型修改
|
2021-04-21 14:15:51 +08:00 |
lvxinran
|
96163db7b5
|
礼包优化
|
2021-04-21 14:03:40 +08:00 |
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
|
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
|
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 |
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 |
mengchengzhen
|
d4e5a2b6a4
|
holy 37type update
|
2021-03-11 17:02:35 +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 |
mengchengzhen
|
b83f8583ec
|
danaotiangong battlenode
|
2021-03-10 15:17:47 +08:00 |