Commit Graph

3335 Commits (dc3a3d8c8866d7e3fcef51be496df027204a88fb)

Author SHA1 Message Date
lvxinran db63d5f3ae 数据上报 2020-07-09 20:21:51 +08:00
lvxinran 1c5f015c33 数据上报 提交 2020-07-09 14:50:53 +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