Commit Graph

2652 Commits (16b7479c8c420ec0f236fc69b4dbcad36df2960e)
 

Author SHA1 Message Date
zhangshanxue 9a5dd40e29 起服前检查 2019-11-05 14:58:17 +08:00
wangyuan 90d9fee405 change time hour to minute 2019-11-05 14:33:25 +08:00
lvxinran d070f16564 观星任务修改 2019-11-04 19:53:46 +08:00
lvxinran 8944b8596c 领取友情点 2019-11-04 19:15:21 +08:00
zhangshanxue 4da9bc7b7d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-11-04 18:25:51 +08:00
zhangshanxue 205481e8ab 自动开服配置 2019-11-04 18:25:48 +08:00
wangyuan 21e2a5202d guide change 2019-11-04 17:41:28 +08:00
wangyuan 3fcd003d5c fix buy store mission 2019-11-04 16:40:29 +08:00
lvxinran c07f2f2b2b 更新地图修改 2019-11-04 15:03:25 +08:00
wangyuan dda12ccfec fix gm 2019-11-04 14:40:31 +08:00
wangyuan 596a8bf291 fix 2019-11-04 12:15:48 +08:00
wangyuan c77c23c2ca backup arena season rank info 2019-11-04 12:14:40 +08:00
lvxinran 80f71c5ca7 邮件删除 2019-11-04 10:57:57 +08:00
lvxinran e2a6865f20 邮件领取 2019-11-04 10:40:56 +08:00
wangyuan 09a53abfb5 fix reward 2019-11-02 11:52:23 +08:00
lvxinran 6b28068a8e 公会战大区 2019-11-01 15:24:46 +08:00
wangyuan afa01af21b daily fresh 2019-11-01 11:03:06 +08:00
wangyuan abc9fbaec3 luafight 2019-11-03 10:40:52 +08:00
zhangshanxue 4c4c942c87 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/BaseHandler.java
2019-11-01 10:17:53 +08:00
wangyuan dca7c2fc53 fix 2019-11-03 10:07:05 +08:00
zhangshanxue 5820505d71 异常和错误提示修改 2019-11-01 10:13:50 +08:00
lvxinran 84efb610d8 加入公会任务 2019-10-31 20:47:14 +08:00
wangyuan ff3cd9a3dc fix reconnect 2019-11-02 19:04:21 +08:00
wangyuan 5dc42912c1 fix 2019-11-02 18:02:23 +08:00
wangyuan a49190f281 fix init 2019-11-02 17:19:29 +08:00
wangyuan a08d6048ba fix relogin 2019-11-02 17:13:07 +08:00
wangyuan e11257f348 delete unuse log 2019-11-02 16:54:30 +08:00
wangyuan 4c12a4c959 fix 2019-11-02 16:52:44 +08:00
zhangshanxue c304989a48 好友报错 2019-10-31 16:20:48 +08:00
lvxinran 7f9e88d0e3 战斗逻辑 2019-10-31 14:49:48 +08:00
lvxinran 8b8a89cd73 怪物战力 2019-10-31 14:18:54 +08:00
lvxinran 2fc51f01c8 初始化set 2019-10-31 11:57:33 +08:00
lvxinran 8f58c62930 第一次进副本类型 2019-10-31 11:42:47 +08:00
lvxinran b35bfe0d1e 好友申请全部同意 2019-10-31 10:45:26 +08:00
lvxinran db6dd9e9b6 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-30 20:46:51 +08:00
wangyuan ef408a0d4c fix fight type 2019-11-01 19:35:43 +08:00
lvxinran 4133c142c5 好友申请 2019-10-30 20:46:46 +08:00
wangyuan c73dc313df update 2019-10-30 19:08:29 +08:00
wangyuan ecfed62e5d fix fight 2019-10-30 19:05:21 +08:00
lvxinran fb67d6253a 战斗逻辑 2019-10-30 18:59:11 +08:00
wangyuan 6a302847f0 Merge branch 'project_0.94_v2' 2019-10-30 17:51:26 +08:00
wangyuan 0dbbcd8456 fix robot pokemon skill data 2019-10-30 17:49:05 +08:00
lvxinran 46d1d8b00c 战斗逻辑 2019-10-30 15:59:45 +08:00
zhangshanxue e5d58a9f32 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-30 15:25:25 +08:00
zhangshanxue 203c5c8f2c 活动排行榜 2019-10-30 15:25:21 +08:00
wangyuan 436ca6ba7c fix exp 2019-10-30 14:57:49 +08:00
lvxinran dcc2aa541f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-11-02 17:27:54 +08:00
lvxinran e6e27f722c 加入公会任务 2019-11-02 17:27:06 +08:00
zhangshanxue 6d14df0625 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-30 14:18:51 +08:00
zhangshanxue e0eca47ef0 活动配置检查 2019-10-30 14:18:22 +08:00