Commit Graph

3359 Commits (e94cd2d5c433fdcf313b3ec6205adedb30ebd4a3)
 

Author SHA1 Message Date
zhangshanxue ac98784ffb Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-04-30 19:57:28 +08:00
zhangshanxue 5d1ff52c3d 活动提交 2020-04-30 19:57:17 +08:00
wangyuan 2e05d68e13 屏蔽魂印 2020-04-30 18:31:54 +08:00
wangyuan 3b6008fb4a hero position 2020-05-01 15:06:57 +08:00
zhangshanxue 5c1946e7f7 异常打印 2020-04-29 18:17:13 +08:00
zhangshanxue 3540d350b9 日志 2020-04-29 14:19:59 +08:00
zhangshanxue 23334124a2 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-04-29 14:15:07 +08:00
zhangshanxue 8663faf38a 日志 2020-04-29 14:14:59 +08:00
wangyuan ee2d0ddb69 七日任务由六天变成七天 2020-04-29 11:02:35 +08:00
lvxinran 8847964740 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-04-29 06:31:25 +08:00
lvxinran ad92a9df33 特权修改接口添加 2020-04-29 06:31:20 +08:00
lvxinran 8c09de153d 战斗同步 2020-05-02 05:12:07 +08:00
lvxinran 3603493efa 宝器相关 2020-04-28 21:22:50 +08:00
wangyuan 4dc323ddc3 zero login 2020-04-28 17:37:01 +08:00
wangyuan 230e2dcaeb fix login mission & open shop 2020-04-28 17:25:02 +08:00
zhangshanxue ea09a2f3d3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-04-28 15:43:44 +08:00
zhangshanxue 92bc339987 战斗数据添加位置 2020-04-28 15:43:31 +08:00
wangyuan 3f6dadb2aa 寻宝刷新 2020-04-28 10:03:25 +08:00
wangyuan 62dca428e9 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2020-04-27 17:18:29 +08:00
wangyuan e7de571f02 fix jewl 2020-04-27 17:14:17 +08:00
zhangshanxue 109114dcef 活动bug 2020-04-27 16:48:22 +08:00
lvxinran 78f86421be Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-04-27 15:17:00 +08:00
lvxinran d4a0550657 宝器 每日副本 代码提交 2020-04-27 15:15:58 +08:00
zhangshanxue 0df73d956e gm添加角色 2020-04-27 10:41:55 +08:00
zhangshanxue 213ba2997e 配置移除 报错 2020-04-27 10:26:37 +08:00
zhangshanxue 913b1e780f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-04-27 10:07:49 +08:00
zhangshanxue a011e862f2 配置移除 报错 2020-04-27 10:07:43 +08:00
wangyuan d9d3baaa03 fix level activity 2020-04-27 09:39:48 +08:00
wangyuan f20ce8ad39 升级达人 2020-04-26 16:12:28 +08:00
wangyuan 49ff1455f0 task 2020-04-27 18:32:58 +08:00
lvxinran 47d60b8588 itemType增加 2020-04-24 10:33:38 +08:00
wangyuan 1a7e178016 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2020-04-24 09:58:00 +08:00
wangyuan cd3d831b6b 删除七天日后才能领取宝箱 2020-04-24 09:57:54 +08:00
lvxinran c0b4c7a02d EquipManager存储类型修改 2020-04-23 20:55:19 +08:00
lvxinran 840823f612 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-04-23 20:08:30 +08:00
lvxinran 00c5976c38 战斗同步 2020-04-23 20:08:25 +08:00
zhangshanxue c6d30a11fd Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-04-23 19:53:03 +08:00
zhangshanxue ab36222035 数据库对象添加深度复制 2020-04-23 19:52:54 +08:00
wangyuan 658a045270 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2020-04-22 11:28:49 +08:00
wangyuan c8fdd5b47d store 2020-04-22 11:28:35 +08:00
lvxinran 69705d3ba1 战斗同步 2020-04-21 20:51:31 +08:00
lvxinran 5b18de9941 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-04-21 17:37:48 +08:00
lvxinran d3fbbd89e8 队伍存在要分解的妖灵师修改 2020-04-21 17:37:42 +08:00
zhangshanxue c8534de2de 协议号映射 2020-04-21 17:07:44 +08:00
zhangshanxue d33638ca65 协议号映射 2020-04-21 17:05:23 +08:00
zhangshanxue 1915b19735 协议号映射 2020-04-21 17:04:20 +08:00
zhangshanxue 07fc753eed 协议号映射 2020-04-21 16:52:22 +08:00
lvxinran b0a9c5bed4 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-04-21 14:16:59 +08:00
lvxinran 1a337241ea 已上阵英雄修改 2020-04-21 14:16:55 +08:00
wangyuan 12996dc439 装备套装 2020-04-21 11:09:54 +08:00