Commit Graph

155 Commits (f91f20484813020923a8b31eafced2055a469049)

Author SHA1 Message Date
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
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