Commit Graph

3792 Commits (c6a0354f8112faee913f164156768a198abf8f8f)
 

Author SHA1 Message Date
zhangshanxue 54e8854bc4 配置忽略 2020-07-03 10:29:15 +08:00
zhangshanxue 1505163dd0 配置忽略 2020-07-03 10:18:42 +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 3e3b82ffb7 装备配置修改 2020-07-02 17:32:59 +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