Commit Graph

3143 Commits (7f0313a16494f5af6a227e3ec06df9a32a28d453)

Author SHA1 Message Date
lvxinran 8e5916bfff Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
2020-05-11 11:57:47 +08:00
lvxinran 3323110204 RedisKey提交 2020-05-11 11:56:18 +08:00
wangyuan c0362839a7 fix car rank 2020-05-09 17:05:00 +08:00
wangyuan 8829b678d5 fix 法宝 2020-05-09 11:59:26 +08:00
wangyuan 930669b6b3 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
2020-05-09 11:41:08 +08:00
lvxinran 3526bb12fd Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-12 05:01:38 +08:00
lvxinran e633bc3480 添加公会总次数 2020-05-12 05:01:34 +08:00
wangyuan 8ea7539cdf fix car 2020-05-09 11:39:57 +08:00
wangyuan d00b5f8499 fix 2020-05-09 10:06:24 +08:00
wangyuan 09731d81bc Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/fight/GameFightType.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java
2020-05-09 10:05:39 +08:00
wangyuan 780c56d06e car rank 2020-05-09 10:03:26 +08:00
lvxinran 6079cc96ca Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuildMyInfo.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/fight/GameFightType.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java
#	serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java
2020-05-09 09:59:29 +08:00
lvxinran d9696552ff 十绝阵提交 2020-05-09 09:53:45 +08:00
wangyuan 17751438fd fix car 2020-05-08 14:16:46 +08:00
wangyuan 48d3616061 魂印打开 2020-05-08 10:23:32 +08:00
zhangshanxue 21eeee56c8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-07 19:48:21 +08:00
zhangshanxue 4cbb76e4f7 祭祀 2020-05-07 19:47:58 +08:00
wangyuan bf845f4fbf 车轮匹配 2020-05-07 18:06:28 +08:00
zhangshanxue 964729e36e Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuildMyInfo.java
2020-05-07 16:49:06 +08:00
zhangshanxue 9660e22f9c 祭祀 2020-05-07 16:46:21 +08:00
wangyuan 25392fd49f Merge branch 'master' of 60.1.1.230:backend/jieling_server 2020-05-07 16:32:04 +08:00
wangyuan a0d031e7d8 车轮 2020-05-07 16:31:28 +08:00
lvxinran c7e7ef4f3d 技能重置 2020-05-06 15:54:22 +08:00
lvxinran a871b0444a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-06 11:53:53 +08:00
wangyuan 3d0a278fd5 暂时删除地图校验 2020-05-10 11:21:08 +08:00
lvxinran 0d59731c5c 公会技能 代码提交 2020-05-06 11:53:48 +08:00
lvxinran 3e3219fe05 宝物修改 2020-05-06 09:58:15 +08:00
zhangshanxue 3dfe572bfd BUG【ID1007351】【升级豪礼】显示剩余1,不能领取 2020-05-05 17:47:18 +08:00
wangyuan 3d90b3a15d 修复七日任务宝箱没有推状态问题 2020-05-05 10:38:30 +08:00
zhangshanxue 3918bdf0ce 注释魂印加成 2020-04-30 20:12:00 +08:00
zhangshanxue ac98784ffb Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-04-30 19:57:28 +08:00
zhangshanxue 5d1ff52c3d 活动提交 2020-04-30 19:57:17 +08:00
wangyuan 2e05d68e13 屏蔽魂印 2020-04-30 18:31:54 +08:00
wangyuan 3b6008fb4a hero position 2020-05-01 15:06:57 +08:00
zhangshanxue 5c1946e7f7 异常打印 2020-04-29 18:17:13 +08:00
zhangshanxue 3540d350b9 日志 2020-04-29 14:19:59 +08:00
zhangshanxue 23334124a2 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-04-29 14:15:07 +08:00
zhangshanxue 8663faf38a 日志 2020-04-29 14:14:59 +08:00
wangyuan ee2d0ddb69 七日任务由六天变成七天 2020-04-29 11:02:35 +08:00
lvxinran 8847964740 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-04-29 06:31:25 +08:00
lvxinran ad92a9df33 特权修改接口添加 2020-04-29 06:31:20 +08:00
lvxinran 3603493efa 宝器相关 2020-04-28 21:22:50 +08:00
wangyuan 4dc323ddc3 zero login 2020-04-28 17:37:01 +08:00
wangyuan 230e2dcaeb fix login mission & open shop 2020-04-28 17:25:02 +08:00
zhangshanxue ea09a2f3d3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-04-28 15:43:44 +08:00
zhangshanxue 92bc339987 战斗数据添加位置 2020-04-28 15:43:31 +08:00
wangyuan 3f6dadb2aa 寻宝刷新 2020-04-28 10:03:25 +08:00
wangyuan 62dca428e9 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2020-04-27 17:18:29 +08:00
wangyuan e7de571f02 fix jewl 2020-04-27 17:14:17 +08:00
zhangshanxue 109114dcef 活动bug 2020-04-27 16:48:22 +08:00
lvxinran 78f86421be Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-04-27 15:17:00 +08:00
lvxinran d4a0550657 宝器 每日副本 代码提交 2020-04-27 15:15:58 +08:00
zhangshanxue 0df73d956e gm添加角色 2020-04-27 10:41:55 +08:00
zhangshanxue 213ba2997e 配置移除 报错 2020-04-27 10:26:37 +08:00
zhangshanxue 913b1e780f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-04-27 10:07:49 +08:00
zhangshanxue a011e862f2 配置移除 报错 2020-04-27 10:07:43 +08:00
wangyuan d9d3baaa03 fix level activity 2020-04-27 09:39:48 +08:00
wangyuan f20ce8ad39 升级达人 2020-04-26 16:12:28 +08:00
wangyuan 49ff1455f0 task 2020-04-27 18:32:58 +08:00
lvxinran 47d60b8588 itemType增加 2020-04-24 10:33:38 +08:00
wangyuan 1a7e178016 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2020-04-24 09:58:00 +08:00
wangyuan cd3d831b6b 删除七天日后才能领取宝箱 2020-04-24 09:57:54 +08:00
lvxinran c0b4c7a02d EquipManager存储类型修改 2020-04-23 20:55:19 +08:00
zhangshanxue c6d30a11fd Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-04-23 19:53:03 +08:00
zhangshanxue ab36222035 数据库对象添加深度复制 2020-04-23 19:52:54 +08:00
wangyuan 658a045270 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2020-04-22 11:28:49 +08:00
wangyuan c8fdd5b47d store 2020-04-22 11:28:35 +08:00
lvxinran 5b18de9941 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-04-21 17:37:48 +08:00
lvxinran d3fbbd89e8 队伍存在要分解的妖灵师修改 2020-04-21 17:37:42 +08:00
zhangshanxue c8534de2de 协议号映射 2020-04-21 17:07:44 +08:00
zhangshanxue d33638ca65 协议号映射 2020-04-21 17:05:23 +08:00
zhangshanxue 1915b19735 协议号映射 2020-04-21 17:04:20 +08:00
zhangshanxue 07fc753eed 协议号映射 2020-04-21 16:52:22 +08:00
lvxinran b0a9c5bed4 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-04-21 14:16:59 +08:00
lvxinran 1a337241ea 已上阵英雄修改 2020-04-21 14:16:55 +08:00
wangyuan 12996dc439 装备套装 2020-04-21 11:09:54 +08:00
wangyuan e66fef396d force + fix month card mission 2020-04-20 18:22:39 +08:00
wangyuan 6ecd4fb2ff fix 2020-04-20 11:44:03 +08:00
wangyuan b50414e1d5 公式修改 2020-04-20 11:33:01 +08:00
zhangshanxue 83bd04b84b 活动系统db替换 2020-04-20 11:16:40 +08:00
zhangshanxue 00f2e2ca03 活动系统db替换 2020-04-18 14:45:18 +08:00
wangyuan 8880f655a1 修复光环重复计算问题 2020-04-17 14:47:57 +08:00
wangyuan 9a7ff84db5 fix 法宝 2020-04-17 14:22:26 +08:00
lvxinran 387a64ec88 光环修改 2020-04-17 14:09:23 +08:00
wangyuan 400a23e82f fix hero in team 2020-04-17 10:16:11 +08:00
lvxinran 7ab0a3642a 阵营光环修改 2020-04-16 19:59:12 +08:00
zhangshanxue 6058b8140e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-04-16 16:21:47 +08:00
zhangshanxue ab4d885994 合成bug 2020-04-16 16:15:27 +08:00
wangyuan 018cddf766 战斗数据修改 2020-04-16 15:43:55 +08:00
lvxinran 9fb69b69bf 战斗同步 2020-04-16 15:10:04 +08:00
lvxinran 7d40e3d2fd Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-04-16 15:09:03 +08:00
wangyuan 653579444f fix 2020-04-22 15:07:02 +08:00
wangyuan 8f247ddff2 fix item drop 2020-04-22 15:06:24 +08:00
wangyuan bbd9fe8271 team force 2020-04-16 11:52:20 +08:00
lvxinran a2b94590ef Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	tablemanager/src/main/java/config/SSpecialConfig.java
2020-04-15 17:20:23 +08:00
lvxinran 7650ddf064 编队修改 2020-04-15 17:19:23 +08:00
wangyuan 322f1735b7 修改魂印计算属性 2020-04-15 14:51:11 +08:00
wangyuan 734b7cb055 fix force 2020-04-15 14:21:26 +08:00
wangyuan 6eadad2496 fix soul equip check 2020-04-14 10:16:34 +08:00
wangyuan 0257faf2d7 fix hero passive 2020-04-13 20:02:56 +08:00
wangyuan 55019f706a check 2020-04-13 11:26:32 +08:00
wangyuan 11b28fab35 fix gamesetting 2020-04-13 11:15:24 +08:00
wangyuan 6f05bae898 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2020-04-13 11:12:00 +08:00
wangyuan 8372da1907 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	tablemanager/src/main/java/config/SEquipConfig.java
2020-04-13 11:10:52 +08:00
zhangshanxue 1d28d4e51d 测试服bug 2020-04-11 18:48:02 +08:00
lvxinran 4320ed3650 战斗修改 2020-04-10 18:04:21 +08:00
lvxinran 86f5c6a74d 删除日志 2020-04-10 15:29:47 +08:00
lvxinran bf2cfc3bcf 战斗修改 2020-04-10 14:52:41 +08:00
lvxinran 870b745e05 删除法宝职业额外加成 2020-04-10 13:39:20 +08:00
wangyuan 2c937c623e soul equip 2020-04-09 20:35:50 +08:00
lvxinran fb3c445361 英雄属性公式修改 2020-04-09 19:54:33 +08:00
zhangshanxue b1b01decdb 【ID1006916】
【月卡】只开普通月卡,到期后,金额不对
2020-05-07 20:00:46 +08:00
zhangshanxue ca6ebe6940 【ID1006878】【签到】5点刷新后还是第一天的签到奖励 2020-04-14 05:10:57 +08:00
lvxinran 47dbe898dc 法宝技能添加 2020-04-03 16:59:22 +08:00
lvxinran f08d202d70 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-01 16:15:09 +08:00
lvxinran 78b2823b14 法宝等级默认一级 2020-05-01 16:15:04 +08:00
lvxinran 586c38221d 特权时间是否可叠加修改,签到bug修改 2020-05-01 16:14:33 +08:00
zhangshanxue 64fabcd9d7 Task 【ID1006033】【新战斗版本】后端装备合成系统 2020-04-03 11:45:56 +08:00
zhangshanxue 8e8cc31b08 Task 【ID1006033】【新战斗版本】后端装备合成系统 2020-04-03 11:45:33 +08:00
wangyuan 071a6c8aa2 刪除魂印 2020-04-02 17:18:34 +08:00
lvxinran 790273b96f 删除无用方法 2020-04-02 15:23:28 +08:00
lvxinran 44f8aa82f2 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-04-02 15:14:34 +08:00
lvxinran d1cf55e9ac 法宝重做 2020-04-02 15:14:30 +08:00
zhangshanxue 1794716b5e window 虚拟机attack卡死 原因未知 2020-04-02 11:55:42 +08:00
zhangshanxue 91e20d3e4e 【ID1005921】【月卡优化】累计充值30/98分别赠送月卡/豪华月卡-后端 2020-06-30 15:51:13 +08:00
zhangshanxue 252da3274f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-04 05:07:10 +08:00
zhangshanxue f1da1afbce 【ID1005921】【月卡优化】累计充值30/98分别赠送月卡/豪华月卡-后端 2020-05-04 05:07:01 +08:00
wangyuan f0cb24a2e3 修复切换赛程没有竞猜信息 2020-03-30 18:38:41 +08:00
wangyuan 470a104809 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2020-03-30 17:48:05 +08:00
wangyuan f409c43ab6 巅峰赛时间修改 2020-03-30 17:47:54 +08:00
wangyuan b7fe433994 戒灵秘宝改成直购 2020-03-30 17:28:25 +08:00
lvxinran eb2259ac92 献祭、回溯修改 2020-03-27 15:42:18 +08:00
lvxinran 6b9ac180e8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-03-27 14:04:47 +08:00
lvxinran 1588a437b1 回溯、分解英雄 2020-03-27 14:04:42 +08:00
zhangshanxue 20a2a3c495 成就系统 2020-03-26 13:56:07 +08:00
zhangshanxue ef3bc85d6e 充值后再次签到 2020-03-25 11:21:49 +08:00
zhangshanxue 9dde66d590 充值后再次签到 2020-03-25 10:14:56 +08:00
zhangshanxue 8f981bc846 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-03-25 10:12:47 +08:00
wangyuan 52117ad434 fix recharge vip 2020-03-24 16:21:52 +08:00
zhangshanxue f8251f06cf Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-03-24 10:59:20 +08:00
zhangshanxue 91593f8fa0 奖励优化 2020-03-24 10:58:52 +08:00
wangyuan f23d6924fd 删除无效代码 2020-03-24 10:57:06 +08:00
wangyuan b119ff1ce9 fix get goods info way 2020-03-23 18:42:48 +08:00
wangyuan 23489baf4a 背包内和互动关联的道具,活动到期后道具的优化 2020-03-20 18:13:58 +08:00
wangyuan d23c8baeed fix 道具直购初始化时间 2020-03-20 18:09:05 +08:00
lvxinran bf8a3a59d7 戒灵秘宝时间剩余 2020-03-25 05:01:03 +08:00
wangyuan c208cc6bb7 fix 直购礼包结束时间计算 2020-03-20 14:53:52 +08:00
wangyuan b02f07e874 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2020-03-20 11:01:19 +08:00
wangyuan 651c7697c8 道具直购 2020-03-20 11:00:59 +08:00
lvxinran 0034193cb4 Merge branch 'project0.95' 2020-03-19 11:11:17 +08:00
lvxinran 287720f7d4 Merge branch 'project0.95' of http://60.1.1.230/backend/jieling_server into project0.95 2020-03-18 17:41:29 +08:00
lvxinran d41c1da745 系统消息修改,好友全部同意提示 2020-03-18 17:41:24 +08:00
wangyuan e7d2e52ea4 邮件提示 2020-03-18 14:40:00 +08:00
wangyuan fe37d4fb31 任务更新 2020-03-17 17:13:52 +08:00
zhangshanxue 6d4134f2b1 猎妖数据过大 2020-03-17 17:12:46 +08:00
zhangshanxue 9f8c1006e2 竞技场防御战力未更新 2020-03-17 17:10:52 +08:00
zhangshanxue abd7ba7804 线程重复 2020-03-16 11:41:58 +08:00
zhangshanxue 550ce57411 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-03-16 11:01:02 +08:00
zhangshanxue 3900141126 线程创建多个 2020-03-16 11:00:48 +08:00
lvxinran be83f871c0 关卡排行热更 2020-03-13 15:21:49 +08:00
lvxinran 288c4d627e 战力方法修改 2020-03-13 14:47:39 +08:00
wangyuan 2fa05aade5 fix mainrank 2020-03-13 14:42:35 +08:00
lvxinran 566fc26e6d 好友友情点修改 2020-03-13 14:26:45 +08:00
lvxinran 50110c8723 关卡排行榜修改 2020-03-13 11:11:29 +08:00
wangyuan 1a6b3fdd86 启动服务器加索引 2020-03-13 10:15:31 +08:00
lvxinran 082671a2d9 5点0点刷新修改 2020-03-13 05:10:37 +08:00
wangyuan 789730d3c7 view mem 2020-03-12 18:09:20 +08:00
lvxinran f268f19439 减少日志 2020-03-12 15:43:39 +08:00
lvxinran 4425bfd75b 排行榜修改 2020-03-12 14:14:36 +08:00
wangyuan b2ced29b8c fix rank 2020-03-15 21:19:05 +08:00
wangyuan c7a280108d fix indication 2020-03-10 16:56:21 +08:00
wangyuan 13b83b1050 fix indication 2020-03-10 16:54:17 +08:00
lvxinran ae294080a6 东海寻仙bug修改 2020-03-12 10:40:25 +08:00
wangyuan 0601a3d746 '商品type改成id' 2020-03-09 17:07:53 +08:00
zhangshanxue 743e54ceb5 cdk全渠道需求 2020-03-09 12:39:30 +08:00
zhangshanxue 498dbbb80f cdk全渠道需求 2020-03-09 11:31:28 +08:00
zhangshanxue 674d88210e cdk全渠道需求 2020-03-09 11:02:06 +08:00
lvxinran 435ed56a0f 特权刷新先后顺序 2020-03-03 05:04:32 +08:00
lvxinran c5d8e67d2e 敏感词 2020-02-28 16:43:24 +08:00
lvxinran 9c82a394dd 戒灵秘宝升级修改 2020-02-29 00:03:07 +08:00
lvxinran 81eedff9df 戒灵秘宝升级修改 2020-02-28 12:29:53 +08:00
lvxinran 0846bdfe2d 戒灵秘宝逻辑修改 2020-02-28 12:04:02 +08:00
lvxinran 82c102391b 东海寻仙活动 2020-02-29 00:01:33 +08:00
zhangshanxue f132f859c4 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-02-26 16:54:22 +08:00
zhangshanxue c53b6056ed Task【ID1005747】【猎妖之路优化】猎妖之路优化内容 奖励改成奖励组 2020-02-26 16:54:12 +08:00
lvxinran fb104288e5 限时抽卡 寻仙榜修改 2020-02-26 14:38:07 +08:00
wangyuan 66ea5b103f 修复设置异妖组件最大等级校验 2020-02-25 14:55:14 +08:00
wangyuan a3716c257f 巅峰赛编队有竞技场进攻变成竞技场防守 2020-02-25 11:47:10 +08:00
zhangshanxue b0ad311440 线上分支回退 改回来 2020-02-25 09:57:36 +08:00
zhangshanxue 1ce01c52e3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-02-24 21:45:51 +08:00
zhangshanxue 57fa2c6652 线上分支回退 稍后再改回来 2020-02-24 21:45:42 +08:00
wangyuan 4c327414b9 零点刷新 2020-02-24 18:26:28 +08:00
zhangshanxue 9ee9d9f2e8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-02-24 18:06:02 +08:00
zhangshanxue 49140cc3d7 Task【ID1005747】【猎妖之路优化】猎妖之路优化内容 2020-02-24 18:05:51 +08:00
lvxinran d005fbed44 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-02-24 17:14:08 +08:00
lvxinran 85a1947791 刷新充值礼包改为0点 2020-02-24 17:14:03 +08:00
wangyuan 257de4422f 修改工会战编队id可动态改 2020-02-24 16:21:10 +08:00
zhangshanxue f41cf48f3b Task【ID1005747】【猎妖之路优化】猎妖之路优化内容 去掉每日战力快照 取最大战力 2020-02-24 15:57:11 +08:00
zhangshanxue f3fca07cf2 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-02-24 15:00:43 +08:00
zhangshanxue 267f621cc0 BUG 【ID1006263】 【五星成长礼】在碎片合成时,获得五星猎妖师,偶尔没有前往的弹窗 2020-02-24 15:00:35 +08:00