Commit Graph

260 Commits (aa94e3bc5b7c19196be29565eb596f0110ec6c99)

Author SHA1 Message Date
zhangshanxue 329cb6dcc2 充值类型更换 2020-08-14 23:18:18 +08:00
zhangshanxue 433ef98265 充值类型更换 2020-08-14 23:08:45 +08:00
lvxinran 7c9a366149 限时兑换修改 2020-08-21 11:42:31 +08:00
lvxinran 6dfd305c73 轩辕宝镜排行发奖 2020-08-17 05:08:35 +08:00
zhangshanxue 2b33f18c05 Merge branch 'equip_develop'
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java
#	tablemanager/src/main/java/config/SSpecialConfig.java
2020-08-12 15:20:22 +08:00
lvxinran 00198786e9 轩辕宝镜代码提交 2020-08-15 13:42:36 +08:00
zhangshanxue 4e0dd14dce 英雄置换 2020-08-12 14:16:08 +08:00
zhangshanxue efc21ecbf3 英雄置换 2020-08-10 15:26:19 +08:00
lvxinran b5a0c8de0e 轩辕宝镜接口添加 2020-08-06 22:55:38 +08:00
lvxinran ee0c50242b 轩辕宝镜提交 2020-08-06 22:54:25 +08:00
lvxinran c8722e9047 装备成就修改,地图炸弹添加,全服邮件红点,装备分解归元修改,打点种类添加 2020-07-31 17:37:39 +08:00
zhangshanxue 3ab0b9c3a8 出包前bug 2020-08-02 23:44:02 +08:00
lvxinran f7bdc25b3c 英雄归元、分解修改 2020-07-24 14:34:15 +08:00
lvxinran c525e3e429 英雄分解修改 提交 2020-07-29 20:11:06 +08:00
zhangshanxue 61c961d073 幸运探宝次数 2020-07-20 14:12:07 +08:00
lvxinran deb08dbaf7 战斗 表增加列 2020-07-14 17:24:41 +08:00
lvxinran a8a46da07b 英雄归元,被动技能战力增加 2020-07-13 18:31:42 +08:00
lvxinran 50bc669250 归元修改,打点修改 2020-07-13 17:20:27 +08:00
lvxinran da8d764a75 抽卡活动修改,部分打点类型修改 2020-07-13 14:30:47 +08:00
zhangshanxue e76c60958d Merge branch 'dev_champion'
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2020-07-03 09:56:32 +08:00
zhangshanxue 47595e498f 竞技场奖励 2020-07-03 09:54:09 +08:00
zhangshanxue 2511018c53 Merge branch 'dev_champion' 2020-07-01 18:27:28 +08:00
lvxinran 0d0acca185 日常本战力校验添加 2020-07-04 06:17:57 +08:00
zhangshanxue eba32c1b52 TASK【ID1006427】【ID1006428】【大闹天宫优化】 BUG【ID1008042】【大闹天宫】招募的四星卡,初始是五星,没技能 2020-07-01 18:25:35 +08:00
lvxinran a7346c0837 森罗环境游戏等级限制加入提交 2020-06-25 10:51:28 +08:00
lvxinran 3e3b82ffb7 装备配置修改 2020-07-02 17:32:59 +08:00
lvxinran beb23ae312 日常本修改 2020-06-25 20:14:51 +08:00
lvxinran ae4d30761e 关闭旧公会战 2020-06-19 13:57:45 +08:00
lvxinran f8a2ad6a32 抽卡修改 2020-06-19 13:33:19 +08:00
lvxinran 06ba20787b 抽卡逻辑修改 2020-06-18 20:39:09 +08:00
lvxinran 564e0cfc12 森罗环境表结构修改,英雄信息添加公会技能等级 2020-06-26 04:49:30 +08:00
lvxinran bc08a7f1e5 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-17 19:09:16 +08:00
lvxinran aad4c60747 寻宝首次多个任务 2020-06-17 19:08:50 +08:00
zhangshanxue 6519567756 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-17 09:40:45 +08:00
zhangshanxue 7225ca8ab4 TASK 【ID1006352】【活动需求】升级礼包推送 2020-06-17 09:40:33 +08:00
lvxinran 480259edf8 商店刷新机制修改提交 2020-06-15 18:20:03 +08:00
lvxinran f25e6a5980 冲突修改 2020-06-12 17:09:03 +08:00
lvxinran 2670dcd04a 等级礼包暂时提交 2020-06-12 17:04:47 +08:00
lvxinran 531770178a 森罗环境游戏代码提交 2020-06-12 17:03:59 +08:00
zhangshanxue 5e550150ae Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-10 11:47:48 +08:00
lvxinran 1e56edce3a 试炼buff提交 2020-06-17 10:27:20 +08:00
zhangshanxue 3c5b576b0a TASK【ID1006322】【宝箱优化】增加自选宝箱 2020-06-10 11:47:39 +08:00
lvxinran 3a1e16feb6 试炼本重置功能,任务提交 2020-06-10 05:49:14 +08:00
lvxinran 18b2d6c57a 迷宫寻宝随机方式修改 2020-06-10 02:42:54 +08:00
zhangshanxue cdacaa402a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-08 16:59:12 +08:00
zhangshanxue dc5792aa0f BUG【ID1007767】【特权】迷宫寻宝未解锁,刷新迷宫寻宝任务完成 2020-06-08 16:59:02 +08:00
zhangshanxue bc00118998 TASK 【ID1006339】日常任务及戒灵秘宝调整 2020-06-07 19:21:41 +08:00
lvxinran e6f8b3973d 排行榜优化,抽卡代码回滚 2020-06-05 15:17:22 +08:00
zhangshanxue a472f6c553 公会漏存 2020-06-03 19:49:56 +08:00
lvxinran 86b864fc45 森罗幻境提交,部分任务添加 2020-06-03 16:13:26 +08:00
lvxinran c012389b87 试炼副本福利层提交 2020-06-09 05:59:01 +08:00
lvxinran 7c36842867 签到优化提交 2020-06-09 05:55:56 +08:00
lvxinran c3eb254132 分支合并提交 2020-06-02 10:57:56 +08:00
lvxinran 0f2bb15952 商店条件添加 2020-06-01 21:11:15 +08:00
lvxinran 407a161831 试炼副本提交 2020-06-01 21:03:48 +08:00
zhangshanxue 094d64f8ad Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-22 05:13:25 +08:00
zhangshanxue a6767eb7bf Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-21 14:07:46 +08:00
wangyuan f48920d5bc 1.修复活动关闭没有推送新活动开始 2.猎妖之路加被动技能 3.删除无效领取抽卡宝箱奖励 2020-05-16 18:46:14 +08:00
wangyuan 7ad319cd7e random card 2020-05-16 16:56:15 +08:00
zhangshanxue feaa5fb4f5 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-16 10:33:02 +08:00
zhangshanxue 238e940beb Task【新战斗版本】公会援助 2020-05-16 10:32:50 +08:00
lvxinran b302bd3601 删除无用代码 2020-05-22 16:20:39 +08:00
lvxinran 886474443e 十绝阵奖励随机提交 2020-05-22 15:51:17 +08:00
lvxinran bab6d9a004 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-18 22:39:22 +08:00
lvxinran 4408cd4a17 十绝阵奖励相关 2020-05-18 22:39:17 +08:00
wangyuan e82caddb52 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2020-05-12 16:06:33 +08:00
wangyuan 73e7d662aa 开活动送充值购买权 2020-05-12 16:02:37 +08:00
lvxinran e60facdc36 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-15 00:08:14 +08:00
lvxinran 633cf81ee6 十绝阵 时间 阶段修改 2020-05-15 00:07:41 +08:00
zhangshanxue f75b7ad1cc Task【ID1006177】【新战斗版本】宝物合成 2020-05-11 11:37:55 +08:00
wangyuan 8ea7539cdf fix car 2020-05-09 11:39:57 +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
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 a0d031e7d8 车轮 2020-05-07 16:31:28 +08:00
lvxinran 0d59731c5c 公会技能 代码提交 2020-05-06 11:53:48 +08:00
zhangshanxue 5d1ff52c3d 活动提交 2020-04-30 19:57:17 +08:00
lvxinran 3603493efa 宝器相关 2020-04-28 21:22:50 +08:00
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