Commit Graph

3831 Commits (3a9dd33fe90f14b68b7b3a0bf661a98662868e87)

Author SHA1 Message Date
lvxinran 95375eab26 公会副本提交 2020-08-27 19:49:57 +08:00
lilei 2cdf521ce3 探索达人替换为极速达人,增加探索次数特权逻辑 2020-08-20 14:06:48 +08:00
lilei bf1ef4c1a3 活动热更延期增加遗留数据清理 2020-08-19 20:36:18 +08:00
zhangshanxue b83687ea23 revert 错误合并 2020-08-19 11:16:28 +08:00
lvxinran ec758ee011 公会副本排行榜 2020-08-19 09:58:33 +08:00
lvxinran 41d73df618 公会副本排行 2020-08-19 09:50:37 +08:00
lilei 50f33a02c0 Merge branch 'develop_treasure' 2020-08-19 09:47:27 +08:00
lilei 2ef8972406 青龙秘宝 2020-08-19 09:47:02 +08:00
zhangshanxue bc50b90957 重连有问题 2020-08-18 22:27:30 +08:00
zhangshanxue 413f84af8a 十绝阵结算 2020-08-18 20:10:12 +08:00
lvxinran 1b70b3c73a 公会副本 2020-08-18 19:42:50 +08:00
lilei f202f73b73 青龙秘宝,工坊合成装备任务改为锻器阁合成装备 2020-08-18 17:10:06 +08:00
zhangshanxue 22aca76856 充值和数据转换 2020-08-18 16:22:38 +08:00
zhangshanxue 000b4466b3 充值和数据转换 2020-08-18 16:12:54 +08:00
lvxinran 38c3cffa54 appId加入 2020-08-21 14:22:14 +08:00
zhangshanxue cc801a8510 充值价格 2020-08-18 11:27:03 +08:00
lilei c18ac44bcf 青龙秘宝 2020-08-18 09:42:32 +08:00
zhangshanxue 024e339bc3 合服 2020-08-17 22:31:25 +08:00
zhangshanxue 90e14e4493 合服 2020-08-17 21:40:49 +08:00
lilei b797c85de6 青龙秘宝,新增任务类型 2020-08-17 19:53:26 +08:00
zhangshanxue d9bd59ea26 合服 2020-08-17 15:30:25 +08:00
lilei f73829b5d4 青龙秘宝,新增部分任务类型 2020-08-17 15:01:28 +08:00
zhangshanxue 29f85c959b 合服 2020-08-17 11:09:35 +08:00
zhangshanxue b643307e5a 合服 2020-08-17 10:26:46 +08:00
lvxinran 588e22626f 修改部分日志 2020-08-17 10:11:27 +08:00
lvxinran 237317a677 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-08-30 21:15:02 +08:00
lvxinran 8aaf2d698b 十绝阵邮件发奖修改 2020-08-30 21:14:49 +08:00
lvxinran bde18afb04 轩辕宝镜修改推送 2020-08-24 05:02:20 +08:00
zhangshanxue 2826ce87de 合服 2020-08-15 17:28:53 +08:00
zhangshanxue 05a1f88da3 合服 2020-08-15 15:47:51 +08:00
zhangshanxue 7c8743c71e Merge branch 'master_test_combin' of http://60.1.1.230/backend/jieling_server into master_test_combin 2020-08-15 15:41:50 +08:00
zhangshanxue 7c5c28d6a1 Merge branch 'master_test_hw' into master_test_combin 2020-08-15 15:40:46 +08:00
zhangshanxue 68aa9fc53d 合服 2020-08-15 15:25:55 +08:00
zhangshanxue 0a162ccce7 充值类型更换 2020-08-14 23:41:23 +08:00
zhangshanxue 47bfc8c339 充值类型更换 2020-08-14 23:19:12 +08:00
zhangshanxue 329cb6dcc2 充值类型更换 2020-08-14 23:18:18 +08:00
zhangshanxue 433ef98265 充值类型更换 2020-08-14 23:08:45 +08:00
zhangshanxue a2504adc4c 合服 2020-08-14 14:30:31 +08:00
zhangshanxue e81eeb4cf6 英雄创建类型 2020-08-14 14:10:56 +08:00
lvxinran 9a25d556a2 换层清除数据 2020-08-23 07:03:47 +08:00
lvxinran 3b384d0698 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-08-23 07:02:32 +08:00
lvxinran c0126ead43 线程加入try catch 2020-08-23 07:02:27 +08:00
lvxinran 20a0adb7fe 森罗环境 小怪计血量 2020-08-23 07:02:07 +08:00
lvxinran a8087e7b84 森罗幻境重置商人 2020-08-22 05:02:27 +08:00
lvxinran dbfb8f4110 限时兑换活动物品掉落修改 2020-08-21 11:30:47 +08:00
lilei 517f156037 每日签到宝箱 2020-08-14 09:39:38 +08:00
zhangshanxue ca65ff8689 合服 2020-08-13 21:44:36 +08:00
zhangshanxue 60abb970a9 Merge branch 'master' into master_test_combin
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
2020-08-13 19:28:39 +08:00
zhangshanxue cbde195205 合服 2020-08-13 19:26:18 +08:00
zhangshanxue c36c3abdde 英雄置换 2020-08-13 16:53:56 +08:00
lvxinran eff5b8a1f3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-08-17 06:21:36 +08:00
lvxinran 315ef31145 车迟斗法打点修改 2020-08-17 06:21:31 +08:00
lvxinran 19ee0348b9 合成英雄修改 2020-08-17 05:36:19 +08:00
zhangshanxue 31274417cd Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-08-13 15:01:33 +08:00
zhangshanxue 993ad432b2 英雄置换 2020-08-13 15:01:25 +08:00
zhangshanxue b5295969ca 英雄置换 2020-08-13 14:34:05 +08:00
lvxinran 7d298ccfbb Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-08-17 05:08:40 +08:00
lvxinran 6dfd305c73 轩辕宝镜排行发奖 2020-08-17 05:08:35 +08:00
lvxinran cf3704b456 神将合成进阶修改 2020-09-07 14:45:25 +08:00
lvxinran e371b00b38 推送修改 2020-08-26 05:58:13 +08:00
lvxinran 2ba3f2d76f 埋点报错修改 2020-08-26 05:43:23 +08:00
zhangshanxue 53993024b6 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-08-13 12:07:29 +08:00
zhangshanxue 64e4e2911b 英雄置换 2020-08-13 12:07:16 +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 1bbf5bc010 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-08-16 14:21:45 +08:00
lvxinran 9934547352 修改装备返还 2020-08-16 14:21:35 +08:00
lvxinran a05812d3e6 修复战斗被动 2020-08-16 12:38:09 +08:00
lvxinran a5d9a17b29 怪物被动修改 2020-08-16 11:27:35 +08:00
lvxinran 5dfcc37f29 判断宝镜 2020-08-15 20:24:41 +08:00
lvxinran 1af2208ab8 修改校验条件 2020-08-15 20:01:33 +08:00
lvxinran 2d92899d8f 打点修改 2020-08-15 19:17:46 +08:00
lvxinran ef2184ac99 二期打点需求 2020-08-15 18:18:32 +08:00
lvxinran d46749052d 战斗位置 2020-08-15 17:08:45 +08:00
lvxinran c3aa6aaec9 报空 修改 2020-08-15 16:25:45 +08:00
lvxinran 00198786e9 轩辕宝镜代码提交 2020-08-15 13:42:36 +08:00
lvxinran fffe477523 英雄装备掉落修改 2020-08-13 09:41:07 +08:00
lvxinran 5c23253d5e 轩辕宝镜 2020-08-13 09:37:01 +08:00
zhangshanxue 4e0dd14dce 英雄置换 2020-08-12 14:16:08 +08:00
zhangshanxue efc21ecbf3 英雄置换 2020-08-10 15:26:19 +08:00
lvxinran 424b64e6c9 挑战 扫荡 逻辑 2020-08-07 15:26:25 +08:00
lvxinran b5a0c8de0e 轩辕宝镜接口添加 2020-08-06 22:55:38 +08:00
lvxinran ee0c50242b 轩辕宝镜提交 2020-08-06 22:54:25 +08:00
lvxinran 5cd1a592e0 添加轩辕宝镜功能 2020-08-07 19:29:13 +08:00
lvxinran 96625ede21 法宝归元,秘境时间代码提交 2020-08-07 15:12:49 +08:00
lvxinran d7a98fe7fc 法宝归元 2020-08-05 16:41:42 +08:00
lvxinran 4a50b29266 上报代码提交 2020-08-04 20:37:39 +08:00
lvxinran ebe8ebed4a 暂时删除异常 2020-08-04 17:12:40 +08:00
lvxinran 233c166a8b 森罗幻境修复 2020-08-04 16:23:13 +08:00
lvxinran 7cb039e0fb 修复地图 2020-08-04 09:51:01 +08:00
lvxinran 8b402e70aa 修改部分数据 2020-08-03 21:47:59 +08:00
lvxinran 6895ec3444 Merge branch 'master_test' 2020-08-03 18:06:05 +08:00
lvxinran 52745a48b4 配置不存在,暂时修改 2020-08-03 18:05:32 +08:00
zhangshanxue e0b3889a67 公会经验bug 2020-08-16 20:28:01 +08:00
zhangshanxue 1f59c36e5e Merge branch 'master_test' of http://60.1.1.230/backend/jieling_server into master_test 2020-08-16 20:06:05 +08:00
zhangshanxue 1dee96141d 数据不一致。战斗日志,猎妖积分 2020-08-16 17:49:57 +08:00
zhangshanxue e5ae741308 Merge branch 'master_test' 2020-08-09 22:38:14 +08:00
zhangshanxue a78faa7d4b 玩家清除 和日志打印 2020-08-09 22:37:25 +08:00
lvxinran b53e2604fa 创建地图循环修改 2020-08-03 15:36:03 +08:00
lvxinran 57671563ac 升星暂时修改 2020-08-03 14:43:03 +08:00
lvxinran 62d5f5af73 代码回滚 2020-07-31 18:43:21 +08:00
lvxinran c8722e9047 装备成就修改,地图炸弹添加,全服邮件红点,装备分解归元修改,打点种类添加 2020-07-31 17:37:39 +08:00
lvxinran 400704e087 Merge branch 'master' into master_test 2020-07-30 18:27:06 +08:00
lvxinran 331c386003 车迟斗法日志打印 2020-07-30 18:26:44 +08:00
zhangshanxue 94e3477729 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-08-06 21:23:16 +08:00
zhangshanxue 4960916a72 bug 2020-08-06 21:22:54 +08:00
zhangshanxue 2268fdbf5a 热更新 2020-08-06 21:15:06 +08:00
zhangshanxue 3ab0b9c3a8 出包前bug 2020-08-02 23:44:02 +08:00
zhangshanxue 8fff0be3c3 巅峰赛 2020-08-11 21:48:46 +08:00
zhangshanxue 7020797e78 道具配的不对 放开验证 2020-07-30 10:26:01 +08:00
zhangshanxue 5be771fb3b 热更新 2020-07-29 20:04:03 +08:00
zhangshanxue e6c21d947e Merge branch 'master' into master_test 2020-08-06 21:23:44 +08:00
zhangshanxue 58bb97acab Merge branch 'master' into master_test 2020-08-06 21:19:15 +08:00
zhangshanxue 2e2b2fe401 Merge branch 'master' into master_test 2020-08-02 23:46:38 +08:00
zhangshanxue 238f0ce657 Merge branch 'master' into master_test 2020-08-02 21:14:33 +08:00
zhangshanxue 1d1d2bcd1b Merge branch 'master_test' of http://60.1.1.230/backend/jieling_server into master_test 2020-08-28 21:26:20 +08:00
zhangshanxue dcddda5777 巅峰赛提交 2020-08-28 21:25:53 +08:00
zhangshanxue de7c17e20d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-08-25 19:22:33 +08:00
zhangshanxue e99ad72a8e 清理日志 2020-08-25 19:22:24 +08:00
zhangshanxue 0f336e3bd1 Merge branch 'master' into master_test 2020-08-23 21:18:08 +08:00
zhangshanxue ace0b3356d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-08-23 21:17:47 +08:00
zhangshanxue f3b8f64957 log注释 2020-08-23 21:17:37 +08:00
zhangshanxue cbf8be6c16 Merge branch 'master' into master_test 2020-08-18 01:13:17 +08:00
zhangshanxue 45b304a551 战斗位置 2020-08-18 00:26:07 +08:00
lvxinran 8b47dc9a0e 删除世界等级 2020-08-05 21:22:59 +08:00
lvxinran cb38612620 排行榜长度修改 2020-08-05 18:08:14 +08:00
lvxinran c039722e01 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-07-29 19:11:16 +08:00
lvxinran 71d6f9ac90 登录加入设置用户名 2020-07-29 19:07:58 +08:00
lvxinran ebe7802660 注册埋点顺序修改 2020-07-28 14:18:04 +08:00
lvxinran 8d1f624561 充值上报修改 2020-07-25 20:12:39 +08:00
lvxinran 300e7e5d17 Merge branch 'master' into master_test 2020-07-25 15:14:26 +08:00
lvxinran dc3a3d8c88 Merge branch 'master' into master_test 2020-07-28 06:37:37 +08:00
lvxinran b8a630ca2d pid gid更改类型 2020-07-28 06:37:19 +08:00
lvxinran c525e3e429 英雄分解修改 提交 2020-07-29 20:11:06 +08:00
lvxinran 4c3f272357 数数打点修改 2020-07-29 20:04:00 +08:00
lvxinran 66eb4711b2 聊天后台entity对象提交 2020-07-30 02:51:09 +08:00
lvxinran abadfaece8 创角打点修改,等级提升打点修改 2020-07-30 02:50:37 +08:00
lvxinran 25f6ba0796 聊天信息管理后台代码提交 2020-07-30 02:49:32 +08:00
lvxinran 2dd2a38fe0 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-07-29 09:01:09 +08:00
lvxinran 4a7b06553a 英雄归元修改 2020-07-29 09:01:04 +08:00
zhangshanxue 5b576dac17 开天日志关闭 2020-07-28 21:01:57 +08:00
lvxinran 2e3dcc5aa0 Merge branch 'master' into master_test 2020-07-28 05:19:47 +08:00
zhangshanxue 8de9d6ad8d Merge branch 'master' into master_test 2020-07-28 21:03:45 +08:00
lvxinran b40e4a57af 删除新手打点 2020-07-25 15:14:06 +08:00
lvxinran acf58d83f3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-07-25 14:39:48 +08:00
zhangshanxue 20d9ebdd48 竞技场提交 2020-08-17 02:45:58 +08:00
lvxinran 9948be8c18 新手引导改为前端打点 2020-07-25 14:39:42 +08:00
lvxinran 4a64db267f 天宫秘宝购买刷新 2020-07-24 17:19:31 +08:00
lvxinran 4d05697aed 充值上报、新手引导埋点提交 2020-07-24 14:34:56 +08:00
lvxinran f7bdc25b3c 英雄归元、分解修改 2020-07-24 14:34:15 +08:00
lvxinran 7228d149d4 天宫秘宝时间修改 2020-07-24 14:33:37 +08:00
zhangshanxue dcfa14717c 巅峰赛提交 2020-08-14 21:24:04 +08:00
zhangshanxue 4c6fe83533 Merge branch 'master' into dev_champion
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java
2020-08-11 09:23:07 +08:00
zhangshanxue cd176b3418 巅峰赛提交 2020-08-11 09:12:09 +08:00
zhangshanxue e505a2e773 幸运探宝次数更新 2020-08-02 22:15:13 +08:00
zhangshanxue f075f592f4 Merge branch 'master' into dev_champion
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java
2020-07-25 22:04:28 +08:00
zhangshanxue 5ed7417c70 巅峰赛提交 2020-07-25 22:01:51 +08:00
lvxinran 93020b9205 tapdb上报修改 2020-07-22 10:49:36 +08:00
lvxinran 4eca4ad61d gm生成英雄 突破修改 2020-07-27 14:02:34 +08:00
lvxinran bc5255167a 试炼炸弹使用次数限制 2020-07-20 18:32:41 +08:00
lvxinran 044e43c4ce 十绝阵加入公会本次校验 2020-07-20 18:32:13 +08:00
lvxinran 7c19553f53 tapDB数据打点接入 2020-07-20 18:31:11 +08:00
lvxinran 608bb0592f Merge branch 'master' into master_test 2020-07-20 10:08:46 +08:00
zhangshanxue e5cf5a39c4 灵动sdk接入 2020-07-26 19:36:06 +08:00
lvxinran e3ef96e6ea 上报目录修改 2020-07-20 10:07:55 +08:00
lvxinran 79a223b16e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-07-17 17:43:33 +08:00
zhangshanxue 77c0597283 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-07-20 14:12:17 +08:00
zhangshanxue 61c961d073 幸运探宝次数 2020-07-20 14:12:07 +08:00
zhangshanxue 3d619ccf60 上报地址修改 2020-07-20 01:06:39 +08:00
zhangshanxue 12fd0caf99 【ID1007692】【开服狂欢】升级法宝任务不能完成 功能没做 2020-07-20 00:13:10 +08:00
zhangshanxue 663cb39c77 大闹天宫和竞技场任务bug 2020-07-18 22:01:49 +08:00
zhangshanxue fbb219b779 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-07-28 21:51:06 +08:00
zhangshanxue 0c728fd2cb 充值金额校验 2020-07-28 21:50:54 +08:00
lvxinran 9f1a42f4f6 首冲累计 2020-07-17 17:43:27 +08:00
lvxinran 54a4a54996 首冲修改 2020-07-17 11:55:07 +08:00
lvxinran 73fbcf991f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-07-16 16:31:58 +08:00
lvxinran 20f2fffb71 英雄升星修改,进阶修改 2020-07-16 16:31:53 +08:00
lvxinran a8d396021b 合并提交 2020-07-15 14:08:58 +08:00
lvxinran 919fcb252a 在线人数打点提交 2020-07-15 14:05:44 +08:00
gaoxin 95e84791cd 战斗数据构建修改 2020-07-15 12:02:03 +08:00
zhangshanxue ff2593d4de Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-07-18 21:04:12 +08:00
zhangshanxue d74dbde124 幸运转盘抽奖限制 2020-07-18 21:03:54 +08:00
lvxinran deb08dbaf7 战斗 表增加列 2020-07-14 17:24:41 +08:00
lvxinran 3d68803fd1 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-07-14 17:09:44 +08:00
lvxinran a3682f79ca 被动技能129类型添加 2020-07-14 17:09:39 +08:00
zhangshanxue edd814a97d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-07-14 15:40:16 +08:00
zhangshanxue e3d2812944 keyset 删除原有集合 2020-07-14 15:40:04 +08:00
zhangshanxue c8a9c873c9 添加公会经验 2020-07-17 21:28:26 +08:00
lvxinran f999e84929 数据上报异步处理 2020-07-14 14:21:28 +08:00
lvxinran a8a46da07b 英雄归元,被动技能战力增加 2020-07-13 18:31:42 +08:00
lvxinran 3a8d9cc527 数据基础类提交 2020-07-13 17:20:41 +08:00
lvxinran 50bc669250 归元修改,打点修改 2020-07-13 17:20:27 +08:00
lvxinran a15ae6e4bb 登录信息添加 2020-07-13 16:14:06 +08:00
lvxinran da8d764a75 抽卡活动修改,部分打点类型修改 2020-07-13 14:30:47 +08:00
lvxinran cefd6ba749 日志关联配置文件 2020-07-10 11:43:09 +08:00
lvxinran db63d5f3ae 数据上报 2020-07-09 20:21:51 +08:00
lvxinran 1c5f015c33 数据上报 提交 2020-07-09 14:50:53 +08:00
zhangshanxue 2498e48c1a Merge branch 'master' of http://60.1.1.230/backend/jieling_server into dev_champion 2020-07-08 19:27:40 +08:00
zhangshanxue 9aef38cdc7 下线清除 2020-07-08 19:27:13 +08:00
lvxinran 0854536e34 数据上报 ,限时抽卡活动修改 2020-07-08 15:21:19 +08:00
lvxinran 558c784472 穿戴宝器修改 2020-07-08 10:15:09 +08:00
lvxinran ef04e7f413 数据对接相关 2020-07-08 10:14:50 +08:00
lvxinran ac75b947d8 Merge branch 'master' into equip_develop 2020-07-07 22:01:49 +08:00
zhangshanxue 33c1de80b8 生成英雄bug 2020-07-07 23:57:15 +08:00
lvxinran bb70007bbc 远征装备修改 2020-07-07 22:01:19 +08:00
lvxinran 7acbce59c5 Merge branch 'master' into equip_develop
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
2020-07-07 19:01:08 +08:00
zhangshanxue 5043f26ac6 TASK【ID1008168】【大闹天宫】招募神将的等级,跟文档描述的不一样 2020-07-06 20:43:10 +08:00
zhangshanxue 8253bdcc6a 打点配置 2020-07-06 18:13:57 +08:00
lvxinran 4109833298 装备优化修改 2020-07-06 18:08:37 +08:00
lvxinran 3934507fe8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-07-05 05:56:07 +08:00
lvxinran 217713bbdb 副本修改 2020-07-05 05:56:01 +08:00
zhangshanxue 4459f03ce0 【ID1008162】挂机奖励bug 2020-07-04 22:54:40 +08:00
zhangshanxue 61d614eaff 五星成长礼bug 2020-07-04 22:17:32 +08:00
lvxinran db72cde86e 商店免费刷新次数注册添加 2020-07-04 06:19:05 +08:00
lvxinran 21b5709798 副本buff机制修改 2020-07-04 06:18:45 +08:00
lvxinran c715f31468 英雄穿装备错误校验删除 2020-07-04 06:18:21 +08:00
lvxinran 0d0acca185 日常本战力校验添加 2020-07-04 06:17:57 +08:00
lvxinran 4971fced7b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-07-03 12:04:26 +08:00
lvxinran 3d1aeb4e0f 挂机时常特权增加 2020-07-03 12:04:21 +08:00
lvxinran 87a619edf2 试炼副本buff修改 2020-07-03 12:04:03 +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 2c5348131d 公会援助 2020-07-02 18:18:32 +08:00
zhangshanxue bcee7dc40f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-07-02 16:17:02 +08:00
zhangshanxue 1f8108b5bb 公会援助 2020-07-02 16:16:52 +08:00
zhangshanxue cab91587d8 公会援助 2020-07-02 15:25:28 +08:00
zhangshanxue 9532f3e6a8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-07-02 11:30:23 +08:00
zhangshanxue 3e8ddecbb2 公会援助bug 2020-07-02 11:28:45 +08:00
zhangshanxue 2511018c53 Merge branch 'dev_champion' 2020-07-01 18:27:28 +08:00
zhangshanxue eba32c1b52 TASK【ID1006427】【ID1006428】【大闹天宫优化】 BUG【ID1008042】【大闹天宫】招募的四星卡,初始是五星,没技能 2020-07-01 18:25:35 +08:00
lvxinran cc1d26d842 试炼游戏等级限制修改、战斗回合数修改 2020-06-30 20:52:09 +08:00
lvxinran 10208681e5 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-29 18:11:06 +08:00
lvxinran bb7deac072 排行榜显示修改 2020-06-29 18:10:55 +08:00
lvxinran 6fbc6cd9eb 魂印分解种类修改 2020-07-05 16:20:06 +08:00
lvxinran 3fc7f6db20 天宫秘宝修改 2020-07-05 16:19:51 +08:00
lvxinran 61c1706d5c 魂印分解提交,异常添加 2020-07-05 16:19:24 +08:00
zhangshanxue a38165efef Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-29 18:10:44 +08:00
zhangshanxue 805745fdfa 添加圣物 2020-06-29 18:09:30 +08:00
zhangshanxue 0caf4ddadc 选拔赛添加竞猜阶段 2020-06-29 17:38:26 +08:00
zhangshanxue c4c03a12d8 删除远征圣物缓存 2020-07-02 16:05:49 +08:00
zhangshanxue 8f8dc0e631 TASK【ID1006424】竞猜结果赔率、显示、信息保留修改 2020-07-01 22:44:08 +08:00
zhangshanxue 12b7cc9c0e TASK【ID1006423】竞猜币获取规则和转化 2020-06-29 18:00:12 +08:00
lvxinran 0703b8ced5 加入魂印战力 2020-06-28 13:49:17 +08:00
lvxinran 54778137a2 英雄图鉴修改 2020-06-24 18:21:38 +08:00
zhangshanxue 77907afc30 重新load内存数据gm 2020-06-27 23:41:19 +08:00
zhangshanxue 798e1b4c08 错存 2020-06-27 23:39:36 +08:00
zhangshanxue 7177eb9e38 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-27 21:09:25 +08:00
zhangshanxue 7a3d99580c 猎妖英雄血量更新bug 2020-06-27 21:07:29 +08:00
lvxinran 25ff3772e9 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-24 20:27:15 +08:00
zhangshanxue 303749246e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-07-11 05:06:42 +08:00
lvxinran 52eb8e895a 挂机获得装备自动合成 2020-07-02 17:32:39 +08:00
zhangshanxue 6ab7e8beee 竞技场和猎妖之路刷新时间 2020-07-01 05:00:38 +08:00
lvxinran f42827869a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-25 22:08:01 +08:00
lvxinran a238a0b9a6 升级好礼活动修复领奖之后bug 2020-06-25 22:07:53 +08:00
lvxinran beb23ae312 日常本修改 2020-06-25 20:14:51 +08:00
lvxinran b36466de0b 战力实时排行榜提交、十绝阵无用代码修改、限时抽卡修改、试炼本炸弹小游戏修改、试炼本小游戏删除点、日常本战力限制去掉 2020-06-25 16:36:48 +08:00
lvxinran 29d97d6793 挂机修改提交 2020-06-24 20:26:44 +08:00
lvxinran 70bfdfa3d1 更新线程池修改 2020-06-24 11:06:03 +08:00
lvxinran 1fd7f1d348 实时战力排行榜抛事件提交 2020-06-25 10:52:28 +08:00
lvxinran 9153efbc62 挂机合成装备最大循环数修改提交 2020-06-25 10:51:54 +08:00
lvxinran a7346c0837 森罗环境游戏等级限制加入提交 2020-06-25 10:51:28 +08:00
zhangshanxue 1abdf0bcb7 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-23 15:35:17 +08:00
zhangshanxue 84cfe0d238 猎妖bug 2020-06-23 15:19:45 +08:00
zhangshanxue 95abc6698d 漏存 2020-06-22 20:03:11 +08:00
lvxinran d649320af8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-22 13:40:12 +08:00
lvxinran 8d1c28db85 活动判空修改 2020-06-22 13:40:03 +08:00
zhangshanxue 73b6bdaa8a 猎妖之路状态推送 2020-06-22 10:33:00 +08:00
lvxinran e190010e72 公会排名修改、抽卡必出逻辑修改 2020-06-19 19:29:18 +08:00
lvxinran 5de5f47e0e 点金金币数量修改 2020-06-19 18:17:23 +08:00
lvxinran c39f041f21 回合数修改、活动开启判断修改 2020-06-19 18:06:44 +08:00
lvxinran eb124879c8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-19 15:56:57 +08:00
lvxinran c98c5f1741 抽卡宝箱修改、十绝阵回合数限制、公会技能重置修改 2020-06-19 15:56:51 +08:00
zhangshanxue a10139ed30 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-19 14:06:11 +08:00
zhangshanxue 95d58e8ac2 gm限制 2020-06-19 14:05:50 +08:00
lvxinran ae4d30761e 关闭旧公会战 2020-06-19 13:57:45 +08:00
lvxinran f8a2ad6a32 抽卡修改 2020-06-19 13:33:19 +08:00
lvxinran 1e7bea7b90 Merge branch 'master' into develop 2020-06-19 09:49:20 +08:00
zhangshanxue 24a6f83184 活动状态 2020-06-21 02:37:16 +08:00
zhangshanxue c92cc85695 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-21 02:21:50 +08:00
zhangshanxue cd046d2d43 数据漏存和日志 2020-06-21 02:21:40 +08:00
zhangshanxue f934ae4c12 TASK【ID1006384】【活动优化】8日登录活动奖励领取机制修改 2020-06-21 00:09:13 +08:00
lvxinran af59909390 抽卡修改 2020-06-19 09:48:52 +08:00
lvxinran 06ba20787b 抽卡逻辑修改 2020-06-18 20:39:09 +08:00
lvxinran 7c0e200d18 装备任务获得更改 2020-06-18 17:04:00 +08:00
zhangshanxue 8b3cb929e2 猎妖之路 通关流程修改 2020-06-18 15:02:38 +08:00
zhangshanxue 3944abddeb 猎妖之路 通关流程修改 2020-06-18 14:54:14 +08:00
zhangshanxue 93a48fc5f7 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-18 14:07:33 +08:00
lvxinran 564e0cfc12 森罗环境表结构修改,英雄信息添加公会技能等级 2020-06-26 04:49:30 +08:00
zhangshanxue 3cbf610c92 战斗同步 2020-06-19 02:19:55 +08:00
zhangshanxue c61fb855a4 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-19 02:18:39 +08:00
lvxinran dec66f3ee5 bug修改,从第二位刷新时间开始算 2020-06-25 02:01:46 +08:00
lvxinran a07730eec9 点金活动修改 2020-06-21 09:03:27 +08:00
zhangshanxue c5e88c9d73 大闹天宫等级浮动加上配置上限 2020-06-19 02:10:12 +08:00
zhangshanxue 5ab554b662 TASK【ID1006384】【活动优化】8日登录活动奖励领取机制修改 2020-06-18 14:07:12 +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 717088c994 试炼游戏判空修改 2020-06-17 19:09:04 +08:00
lvxinran aad4c60747 寻宝首次多个任务 2020-06-17 19:08:50 +08:00
zhangshanxue cad5b5bc26 TASK【ID1006397】【活动优化】成长礼金活动邮件删除 2020-06-17 14:48:46 +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 fb1f04ea98 装备bug修改,恢复代码 2020-06-16 06:27:21 +08:00
lvxinran 014e56d37d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-15 18:20:16 +08:00
lvxinran 480259edf8 商店刷新机制修改提交 2020-06-15 18:20:03 +08:00
zhangshanxue 908fdb1d5b 猎妖之路时间和boss节点圣物取消 2020-06-15 16:11:15 +08:00
zhangshanxue 5264ddcb83 猎妖之路招募节点bug 2020-06-13 16:58:08 +08:00
zhangshanxue 344501791f 道具掉落 类型判断和返回 2020-06-13 16:57:06 +08:00
lvxinran 4bcac2e1d8 点金排行提交 2020-06-12 18:16:15 +08:00
lvxinran 724a3b0fb4 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	tablemanager/src/main/java/config/SRechargeCommodityConfig.java
2020-06-12 17:08:42 +08:00
lvxinran 2670dcd04a 等级礼包暂时提交 2020-06-12 17:04:47 +08:00
lvxinran 531770178a 森罗环境游戏代码提交 2020-06-12 17:03:59 +08:00
zhangshanxue 99a2b0f0c2 客户端新增了一个道具类型 2020-06-12 16:35:22 +08:00
zhangshanxue 0e6c65163e 客户端新增了一个道具类型 2020-06-12 16:19:01 +08:00
zhangshanxue 6ad732f6f2 去掉远征临时装备背包 2020-06-12 15:37:29 +08:00
zhangshanxue 5dd612ce1a 奖励组拼接bug 2020-06-12 10:46:32 +08:00
zhangshanxue ffee38af5b 内存检查工具 及内纯漏存 2020-06-11 15:42:18 +08:00
zhangshanxue fd7e47ff65 新增消耗道具任务类型 2020-06-11 11:23:07 +08:00
zhangshanxue c015b1ea18 属性计算 目标属性也是万分比计算 (bug多了万分比加成于同一个一级属性 只会有一个生效) 2020-06-11 10:55:25 +08:00
zhangshanxue 0f430e6a09 pvp加成没加上 因为表没配一级属性id 2020-06-10 18:11:30 +08:00
zhangshanxue 4fdf720e84 点将台任务类型更新失败 2020-06-10 17:50:10 +08:00
zhangshanxue 7d53e2c06e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-10 17:38:57 +08:00
zhangshanxue 4c9f8e4965 pvp加成没加上 2020-06-10 17:38:49 +08:00
zhangshanxue df707a8d8e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-10 15:17:40 +08:00
zhangshanxue 484a6e9445 TASK【ID1006322】【宝箱优化】增加自选宝箱 2020-06-10 15:17:30 +08:00
lvxinran 88ee5cb6ae Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-10 14:12:34 +08:00
lvxinran ea57ee2cf7 特权商城修改、点金排行榜添加 2020-06-10 14:12:28 +08:00
lvxinran 97782999d1 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-17 10:28:17 +08:00
lvxinran 3dafe6bbad 公会技能重置消耗修改 2020-06-17 10:28:13 +08:00
lvxinran 264df27d8a 宝器入库修改,判空处理 2020-06-17 10:28:00 +08:00
lvxinran 1e56edce3a 试炼buff提交 2020-06-17 10:27:20 +08:00
lvxinran f161ac1e08 车迟时间修改 2020-06-14 20:01:16 +08:00
zhangshanxue 5e550150ae Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-10 11:47:48 +08:00
zhangshanxue 3c5b576b0a TASK【ID1006322】【宝箱优化】增加自选宝箱 2020-06-10 11:47:39 +08:00
lvxinran 0f21f209d4 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-10 05:49:18 +08:00
lvxinran 3a1e16feb6 试炼本重置功能,任务提交 2020-06-10 05:49:14 +08:00
zhangshanxue 5e4368aa77 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-10 05:25:14 +08:00
lvxinran 18b2d6c57a 迷宫寻宝随机方式修改 2020-06-10 02:42:54 +08:00
lvxinran 96a44a023f 十绝阵死循环修改 2020-06-10 01:49:22 +08:00
zhangshanxue 761fb9901d 【ID1007808】【ID1007804】【ID1007810】【公会援助】公会援助报错 和猎妖之路圣物不生效 2020-06-09 15:43:19 +08:00
zhangshanxue 4b2c5f5373 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-08 16:57:33 +08:00
zhangshanxue 7f0313a164 BUG【ID1007804】【公会援助】收到的援助不领取,重启服务器就没了 2020-06-08 16:51:38 +08:00
lvxinran 979348dde1 十绝阵时间判断修改 2020-06-08 15:41:23 +08:00
zhangshanxue 30c54bead0 被动技配置bug 2020-06-08 15:35:47 +08:00
zhangshanxue 019c9e9db2 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-08 10:51:04 +08:00
zhangshanxue a71818e1b5 功能bug 2020-06-08 10:50:50 +08:00
lvxinran 50831bbee2 功能判空处理 2020-06-08 10:38:07 +08:00
zhangshanxue 0de940f9d0 功能bug 2020-06-08 10:30:58 +08:00
zhangshanxue 758817d5f3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-08 10:27:23 +08:00
zhangshanxue d66bee14fc 时间屏蔽 被动技bug 2020-06-08 10:26:22 +08:00
lvxinran ce44abc594 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-08 10:12:37 +08:00
lvxinran b3d6343f95 公会添加条件提交 2020-06-08 10:12:33 +08:00
zhangshanxue 336ec10895 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-05 20:50:12 +08:00
zhangshanxue 27a29f771b 去掉注释 2020-06-05 20:49:15 +08:00
zhangshanxue ff485d97c7 //商店刷新 2020-06-06 05:02:15 +08:00
zhangshanxue 6c9dfab0cc Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-21 05:42:29 +08:00
zhangshanxue c705182c02 bug每分钟推送道具信息 2020-06-21 05:42:18 +08:00
lvxinran 789afff18c 公会排行榜 2020-06-09 00:54:32 +08:00
lvxinran f47764b1da Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-08 22:28:33 +08:00
lvxinran 2b0607a26a 车迟发奖bug修改,排行榜第一名bug修改 2020-06-08 22:28:28 +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 177454ffed 战斗修改 点金bug 猎妖之路bug 2020-06-08 15:00:20 +08:00
zhangshanxue 78905f7b0b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-08 11:15:49 +08:00
zhangshanxue bd7e3f4749 活动类型不存在 天宫密宝逻辑待查 2020-06-08 11:15:40 +08:00
zhangshanxue bc00118998 TASK 【ID1006339】日常任务及戒灵秘宝调整 2020-06-07 19:21:41 +08:00
zhangshanxue 03b5acec1d Bug【ID1007757】【礼包】每日礼包不刷新 商店刷新时机不对 2020-06-07 16:02:46 +08:00
lvxinran f3c36df669 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-05 20:37:04 +08:00
lvxinran bcf043facc 无工会修改 2020-06-05 20:36:59 +08:00
lvxinran 886ac0c143 抽卡恢复之前逻辑 2020-06-05 16:49:00 +08:00
lvxinran b2ffa3e799 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-05 15:17:43 +08:00
lvxinran e6f8b3973d 排行榜优化,抽卡代码回滚 2020-06-05 15:17:22 +08:00
lvxinran ecdf7cebf1 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-05 10:16:15 +08:00
lvxinran 47ad4f8c1c 回春散逻辑提交 2020-06-05 10:16:09 +08:00
lvxinran f60bca059e 十绝阵时间bug修改 2020-06-05 10:13:42 +08:00
zhangshanxue 118b2156f2 任务进度获取bug 2020-06-03 20:40:32 +08:00
zhangshanxue a472f6c553 公会漏存 2020-06-03 19:49:56 +08:00
zhangshanxue ea7f866fbe Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-03 17:02:38 +08:00
zhangshanxue d28a826f38 新增任务类型 2020-06-03 17:02:26 +08:00
lvxinran 9fe73ad43e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-03 16:13:31 +08:00
lvxinran 86b864fc45 森罗幻境提交,部分任务添加 2020-06-03 16:13:26 +08:00
zhangshanxue 01e0b812e9 新增任务类型 2020-06-03 12:02:15 +08:00
zhangshanxue 4defdf8aca 新增任务类型 2020-06-03 11:12:16 +08:00
zhangshanxue 189674d9ca 新增任务类型 2020-06-03 10:25:06 +08:00
zhangshanxue 9942b4abb3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-03 09:53:13 +08:00
zhangshanxue c98f0a985b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-07-05 01:05:54 +08:00
lvxinran c012389b87 试炼副本福利层提交 2020-06-09 05:59:01 +08:00
lvxinran 7c36842867 签到优化提交 2020-06-09 05:55:56 +08:00
zhangshanxue e553272029 新增任务类型 戒灵秘宝积分 2020-06-04 19:10:32 +08:00
lvxinran 7e239b888f 错误修改 2020-06-02 11:18:40 +08:00
lvxinran c3eb254132 分支合并提交 2020-06-02 10:57:56 +08:00
lvxinran 173458590b Merge branch 'master' into develop 2020-06-01 21:10:48 +08:00
lvxinran f132000e65 vip商店调整 2020-06-01 21:09:24 +08:00
lvxinran 407a161831 试炼副本提交 2020-06-01 21:03:48 +08:00
zhangshanxue 26c1259480 任务系统梳理和注释 2020-06-01 15:26:12 +08:00
zhangshanxue 2e3a64205b 缺少判null 2020-06-01 15:19:32 +08:00
zhangshanxue 69a4ac5423 BUG【ID1007698】【成员】进阶弹了恭喜获得 2020-05-30 17:56:51 +08:00
zhangshanxue 778d1f07cf Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-29 13:40:37 +08:00
zhangshanxue 32962c32d4 猎妖和数据库检查bug 2020-05-29 13:40:21 +08:00
wangyuan 41f90ab191 对手数据判空处理 2020-05-28 11:39:03 +08:00
zhangshanxue 79daca78ee 猎妖和数据库检查bug 2020-05-28 11:28:57 +08:00
zhangshanxue 5ef80fab01 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-28 19:04:31 +08:00
zhangshanxue e20c183619 定期抽查数据 2020-05-28 18:57:30 +08:00