Commit Graph

231 Commits (d1eccf88b929047287838270e8f22984ccc243cf)

Author SHA1 Message Date
lvxinran d4a0550657 宝器 每日副本 代码提交 2020-04-27 15:15:58 +08:00
wangyuan c8fdd5b47d store 2020-04-22 11:28:35 +08:00
wangyuan 12996dc439 装备套装 2020-04-21 11:09:54 +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
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 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
lvxinran bf2cfc3bcf 战斗修改 2020-04-10 14:52:41 +08:00
wangyuan 2c937c623e soul equip 2020-04-09 20:35:50 +08:00
lvxinran fb3c445361 英雄属性公式修改 2020-04-09 19:54:33 +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 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
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 f1da1afbce 【ID1005921】【月卡优化】累计充值30/98分别赠送月卡/豪华月卡-后端 2020-05-04 05:07:01 +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 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 651c7697c8 道具直购 2020-03-20 11:00:59 +08:00
wangyuan 978bee312b fix guildbossreward table bug 2020-03-11 17:15:57 +08:00
zhangshanxue 74ee4537ee 远征优化 2020-03-06 13:23:57 +08:00
lvxinran 0846bdfe2d 戒灵秘宝逻辑修改 2020-02-28 12:04:02 +08:00
zhangshanxue c53b6056ed Task【ID1005747】【猎妖之路优化】猎妖之路优化内容 奖励改成奖励组 2020-02-26 16:54:12 +08:00
wangyuan 6a27656717 fix name 2020-02-21 18:04:10 +08:00
wangyuan d9b592cc81 修复功能按类型开 2020-02-21 17:54:41 +08:00
wangyuan d3a84ad2a8 商店刷新 & 工会行走 2020-03-26 00:02:26 +08:00
zhangshanxue 4e5542393c Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
2020-02-09 19:53:28 +08:00
zhangshanxue 4769cadda1 Task 【ID1005460】 【玩法需求】猎妖之路 2020-02-09 19:48:55 +08:00
wangyuan 0d64c47eb1 表时间修改 2020-01-16 17:53:38 +08:00
wangyuan fe4f9c64e5 工会boss奖励 2020-01-15 10:23:18 +08:00
lvxinran 27a48fac95 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-01-09 17:02:03 +08:00
lvxinran 50093c8c58 特权时间修改,点赞物品添加 2020-01-09 17:01:53 +08:00
wangyuan 2596295a30 商品购买和刷新 2020-01-09 16:43:47 +08:00
wangyuan f16f86c7ee Merge branch 'master' of 60.1.1.230:backend/jieling_server 2020-01-08 17:58:46 +08:00
wangyuan cb1954d8a2 vip权限 2020-01-08 17:58:36 +08:00
lvxinran 101d1bcdf3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-01-08 17:19:28 +08:00
lvxinran 403364b2fd 公会红包提交 2020-01-08 17:19:23 +08:00
wangyuan a0fe74fa22 vip校验方法名称修改 2020-01-07 19:24:55 +08:00
wangyuan e67f511a4b 2020-01-07 13:57:23 +08:00
lvxinran 2c6eccad1a 排行榜,特权修改 2020-01-03 15:02:54 +08:00
lvxinran 99496504fb 权限修改 2020-01-02 16:57:25 +08:00
zhangshanxue 50e9aee159 Task 【ID1005360】 【达人活动】新增寻宝达人等4项达人活动 2019-12-29 17:24:30 +08:00
lvxinran c6788d47e8 特权表修改 2019-12-27 10:26:20 +08:00
lvxinran 5380c3cc23 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-12-27 10:24:26 +08:00
zhangshanxue 2c72864fa5 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-12-28 15:38:55 +08:00
lvxinran bcf27e16f9 商店表 2019-12-27 10:22:15 +08:00
wangyuan dc80e9b288 format champion mail content 2019-12-26 10:19:20 +08:00
zhangshanxue 069da0c108 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-12-26 10:09:12 +08:00
zhangshanxue bb75dfbcfa 【ID1005331】【星级成长礼】 2019-12-26 10:09:06 +08:00
wangyuan a1f98bdc00 add 2019-12-25 17:49:52 +08:00
lvxinran 42d27f48cd 限时抽卡免费次数 2019-12-25 14:07:48 +08:00
lvxinran f0863ffbb8 建号迷宫寻宝任务 2019-12-24 16:00:58 +08:00
wangyuan 8b81a3b77a Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-12-24 14:23:28 +08:00
wangyuan 6b38f4f77e 修改战斗计算结果 2019-12-24 14:23:23 +08:00
lvxinran 5e817c87ff 异妖上阵修改 2019-12-23 18:04:13 +08:00
lvxinran 46a12c155c 抽卡修改 2019-12-21 10:19:18 +08:00
lvxinran 790a0916db 上限修改 2019-12-19 14:48:14 +08:00
zhangshanxue 23b617fcde Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-12-19 10:36:47 +08:00
zhangshanxue 31c5e9184d Task【ID1005229】【特权调整】 2019-12-19 10:36:35 +08:00
lvxinran 628902282d 迷宫寻宝 2019-12-18 14:06:07 +08:00
lvxinran 3f40a3cedf 英雄限制,关卡排行榜修改 2019-12-17 15:32:41 +08:00
lvxinran 73d07c8754 刷新必出 2019-12-17 09:54:32 +08:00
lvxinran c6e4fb21d4 迷宫寻宝、表格提交 2019-12-16 10:37:42 +08:00
lvxinran 462a035592 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-12-13 13:44:15 +08:00
lvxinran 2a62f39194 迷宫寻宝提交 2019-12-13 13:44:11 +08:00
wangyuan f90796f702 推送巅峰赛进度信息 2019-12-12 18:32:54 +08:00
wangyuan 4b2d619df6 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-12-12 11:43:01 +08:00
wangyuan 3b52fbfa63 fix globaldata & champion in redis 2019-12-12 11:42:56 +08:00
zhangshanxue efb20d445e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-12-12 11:04:10 +08:00
lvxinran aa56fb73b7 限时抽卡预告 2019-12-13 17:19:26 +08:00
zhangshanxue 530fc08267 Task【ID1005229】【特权调整】 2019-12-12 10:59:33 +08:00
lvxinran 0d19b9d141 限时抽卡 2019-12-09 17:10:23 +08:00
wangyuan 206aae7aa3 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
2019-12-06 20:26:50 +08:00
lvxinran 4d4ccd4703 Merge branch 'online_1121'
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
2019-12-08 01:28:38 +08:00
wangyuan b28d31d8ae 巅峰赛 2019-12-06 20:25:52 +08:00
lvxinran 8b0f5aa9c5 配置 2019-12-17 00:09:23 +08:00
wangyuan aaead3ecdb fix stable 2019-11-28 15:50:06 +08:00
lvxinran 2c5148e1ed Merge branch 'online_1121'
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2019-11-27 16:10:41 +08:00
lvxinran 3eddd7610c 战力排行榜 2019-11-27 15:43:24 +08:00
wangyuan 4f8bc6ba15 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-11-26 17:42:38 +08:00
wangyuan ad4a55b2ce fight opti 2019-11-26 17:41:38 +08:00
lvxinran 300e03d91a S表初始化修改 2019-11-26 10:59:33 +08:00
zhangshanxue 27d7504a0e Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121 2019-11-25 20:19:12 +08:00
zhangshanxue 28cb6035d4 五星英雄成长礼 2019-11-25 20:17:30 +08:00
lvxinran 2c35bf1b38 部分表字段初始化代码修改 2019-11-25 17:11:21 +08:00
wangyuan 8807cc06ea 保底 2019-11-25 12:10:05 +08:00
lvxinran 0e18ea70da 字段添加 2019-11-25 11:42:07 +08:00
lvxinran 3c59042b88 合并online分支 2019-11-23 14:11:20 +08:00
wangyuan bda2d610f0 activity 2019-11-24 19:42:22 +08:00
lvxinran 7cd52a347a 巅峰赛类型修改,坐骑升级修改 2019-12-17 02:30:07 +08:00
lvxinran fc7ed5bde3 坐骑、装饰代码提交 2019-11-26 00:12:32 +08:00
wangyuan bbbd0d60d7 Merge branch 'online_1121' of 60.1.1.230:backend/jieling_server into online_1121 2019-11-22 16:41:13 +08:00
lvxinran b00ab56b99 公会改名提交 2019-12-17 22:15:06 +08:00
wangyuan db8aeac335 元素招募 & 新活动(新手福利) 2019-11-22 16:39:54 +08:00
lvxinran d786c79bf7 公会战战斗时长修改 2019-11-19 17:58:06 +08:00
lvxinran 48abd97de8 jackson修改 2019-12-10 04:01:38 +08:00
wangyuan 40611e8205 fix arena & fix mainlevel 2019-11-18 17:26:39 +08:00
zhangshanxue 203c5c8f2c 活动排行榜 2019-10-30 15:25:21 +08:00
zhangshanxue e0eca47ef0 活动配置检查 2019-10-30 14:18:22 +08:00
wangyuan b564b7ae7d componts add 2019-10-29 14:56:37 +08:00
wangyuan 6ce050cbe8 fix rank 2019-10-27 15:28:58 +08:00
wangyuan 8b0480c652 fix fight rank 2019-10-27 12:03:07 +08:00
wangyuan d1f50fddf7 fix fight hero passskill 2019-10-27 11:33:27 +08:00
lvxinran 3fad81a218 公会战安慰奖励 2019-10-24 00:11:43 +08:00
zhangshanxue bfdddc8158 异常和错误提示修改 2019-10-22 11:59:23 +08:00
wangyuan e74583c539 change hero table 2019-10-18 10:13:39 +08:00
wangyuan 8b01d62c24 fix bug 2019-10-17 16:29:14 +08:00
wangyuan 29c503412b fix mainlevel 2019-10-17 13:47:04 +08:00
zhangshanxue aa2d6d0648 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-16 11:25:07 +08:00
zhangshanxue a2ac1eaf28 跑马灯 2019-10-16 11:25:03 +08:00
lvxinran 164a3cb45f 头像提交 2019-10-17 01:00:57 +08:00
wangyuan 8f34ad884a fix activity 2019-10-15 10:22:08 +08:00
wangyuan 8a4efef55c fix open 2019-10-14 20:00:27 +08:00
wangyuan 2acbce61b4 fix store 2019-10-14 16:32:30 +08:00
wangyuan 94ac2788df change classloader 2019-10-14 15:30:13 +08:00
zhangshanxue fb33d6bdb6 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/config/SRechargeCommodityConfig.java
#	serverlogic/src/main/java/com/ljsd/jieling/config/SSpecialConfig.java
#	serverlogic/src/main/java/com/ljsd/jieling/config/STreasureTaskConfig.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/UserLevelEventHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java
2019-10-11 16:55:39 +08:00
zhangshanxue 85996ead41 工具模块 配置模块提取 热更新优化 2019-10-11 16:32:20 +08:00
wangyuan 1b09b921f9 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-09-06 11:04:28 +08:00