Commit Graph

2573 Commits (e1fc69d05cc13443868d16e25ab933d80d7ec625)
 

Author SHA1 Message Date
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
wangyuan d6e2822724 fix fight time 2019-10-30 14:18:05 +08:00
zhangshanxue f93bfc4ea3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-30 10:46:58 +08:00
zhangshanxue ca6a2a2658 排行榜结算标题 2019-10-30 10:46:24 +08:00
wangyuan af304a8d85 fix usermission & guild 2019-10-29 17:17:40 +08:00
wangyuan b564b7ae7d componts add 2019-10-29 14:56:37 +08:00
wangyuan fab234e810 battle & fix export excel 2019-10-29 13:51:59 +08:00
lvxinran b1ebb94ab9 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-31 14:47:57 +08:00
lvxinran 5bb8e95aa1 公会申请数据修改 2019-10-31 14:47:52 +08:00
lvxinran 3f6113ca9f 工会申请保留时间 2019-10-31 14:36:52 +08:00
lvxinran 156456a98e 领取邮件判断 2019-10-30 13:59:56 +08:00
lvxinran d1b82a3879 戒灵秘宝奖励修改 2019-10-29 21:07:35 +08:00
zhangshanxue 121f54fff3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-29 11:33:32 +08:00
zhangshanxue 6189cec63c 异常和错误提示修改 2019-10-29 11:33:26 +08:00
wangyuan 2fea6f9a36 fix itemutil 2019-10-28 15:23:00 +08:00
wangyuan fa9e192375 fix item view 2019-10-28 14:36:19 +08:00
zhangshanxue 6178eb72a5 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-28 13:51:34 +08:00
zhangshanxue 09bc84ebcc 重置活动 补发全部奖励 2019-10-28 13:51:22 +08:00
zhangshanxue 5338c735b1 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-11-28 11:47:11 +08:00
zhangshanxue 452d1a84b9 重置活动 补发全部奖励 2019-11-28 11:46:45 +08:00
lvxinran 23ee57749c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-28 12:05:53 +08:00
lvxinran a35eefefac 战斗同步 2019-10-28 12:05:04 +08:00
wangyuan 70dcd12c42 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-10-28 11:36:08 +08:00
wangyuan 520950456d fix rank 2019-10-28 11:35:35 +08:00
wangyuan 6dca605039 挂机奖励预览 2019-10-30 11:04:59 +08:00
lvxinran 6abcb5ce6b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-28 11:23:17 +08:00
lvxinran f8174bddc1 法宝加成判断,公会职位推送修改 2019-10-28 11:23:13 +08:00
wangyuan 93643930c6 fixc resend 2019-10-27 17:35:16 +08:00
wangyuan b0ef60d864 filter 0 2019-10-27 16:37:24 +08:00
wangyuan 3df321bc11 hero 2019-10-27 16:18:08 +08:00