Commit Graph

4235 Commits (b3222d42b352ed1db41ea86ca99ba5cd7d607564)
 

Author SHA1 Message Date
lvxinran b3222d42b3 删除无用代码 2020-11-23 21:27:47 +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
DESKTOP-98AVA47\Administrator 6141729602 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-12-28 05:05:22 +08:00
DESKTOP-98AVA47\Administrator bdd009d7cb Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-12-19 22:52:01 +08:00
DESKTOP-98AVA47\Administrator 52cbb01232 工会副本修改 2020-12-17 04:10:05 +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 5640521082 修改表数据 2020-11-23 15:18:28 +08:00
lvxinran 9de88982e2 天宫秘宝15攻击力加成 2020-11-23 14:31: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
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 ac33f41267 Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw 2020-11-11 10:58:39 +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 b2ca6c0398 特权0点到期 2020-12-15 18:07:11 +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
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
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