Commit Graph

3525 Commits (445f0a4965127f67ce8c1ba289c099330ae1c333)

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