Commit Graph

1979 Commits (5ef6a8debc9efc896a93102be6acb300f39ed6a3)
 

Author SHA1 Message Date
zhangshanxue 1638c42ea1 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-13 10:36:03 +08:00
zhangshanxue fd7b37fc4a acitvity 2019-09-13 10:35:54 +08:00
wangyuan c20652705b fix ission 2019-08-19 00:00:56 +08:00
zhangshanxue ab42fa69bf 活动提示 2019-08-13 13:18:42 +08:00
lvxinran 829e51356d RedisUtil 2019-08-13 10:12:13 +08:00
lvxinran 9a1c002c4b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-13 10:09:37 +08:00
lvxinran 5e5832178d 公会战 2019-08-13 10:09:32 +08:00
lvxinran d301d88bdf 修改名字 2019-08-13 10:08:49 +08:00
wangyuan f16f1dbc99 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-13 10:08:16 +08:00
zhangshanxue 3844229238 acitvity 2019-08-13 10:07:57 +08:00
zhangshanxue 8c5e6a4cba acitvity 2019-09-13 09:35:30 +08:00
zhangshanxue 1d01fcf712 acitvity 2019-09-12 21:54:42 +08:00
zhangshanxue f76ce9cb43 acitvity 2019-09-12 21:39:52 +08:00
zhangshanxue c0293bd314 acitvity 2019-09-12 21:36:54 +08:00
wangyuan 480936bdc5 删除无效日志 2019-08-13 10:07:57 +08:00
zhangshanxue 087d03e8dc Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-12 21:07:17 +08:00
lvxinran 7b62901318 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-12 20:52:58 +08:00
lvxinran 81a443322a 公会战 2019-08-12 20:52:54 +08:00
zhangshanxue 4b3435799d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-12 20:27:43 +08:00
zhangshanxue b2d3f59164 活动结束补发奖励 2019-08-12 20:27:36 +08:00
wangyuan 4cdb969929 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-12 17:49:35 +08:00
wangyuan db8c4d43d9 同步用户状态 2019-08-12 17:49:20 +08:00
lvxinran f46031890a 上个修改 2019-08-12 17:32:06 +08:00
lvxinran d8fa42b0f4 公会战查看对战信息 2019-08-12 17:31:49 +08:00
lvxinran 9497535341 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-12 17:23:42 +08:00
lvxinran e27985bab6 功绩17修改 2019-08-12 17:23:38 +08:00
lvxinran 29c22526b5 增加RedisKey 2019-08-12 16:06:06 +08:00
lvxinran 6924500cd1 公会战逻辑修改 2019-08-12 16:05:43 +08:00
zhangshanxue a33043d8de Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-12 16:00:58 +08:00
zhangshanxue c0509d25f2 acitvity 2019-08-12 16:00:36 +08:00
wangyuan a7ee427a08 fix limmit 2019-08-12 15:50:47 +08:00
lvxinran 1fe64c05cb Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-12 14:30:36 +08:00
lvxinran 9364fbda6d 公会战开始战斗提交 2019-08-12 14:30:32 +08:00
wangyuan cbb6178449 delete log 2019-08-12 13:57:51 +08:00
wangyuan a076812220 fix special 2019-08-12 12:16:20 +08:00
zhangshanxue f6e25e2bae acitvity 2019-08-12 12:03:15 +08:00
wangyuan cff26b2110 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-12 11:15:51 +08:00
wangyuan 968cf84ebd delete unuse log 2019-08-12 11:15:41 +08:00
lvxinran 8395912f43 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-12 11:15:25 +08:00
lvxinran acc29668bc 编队ID修改 2019-08-12 11:15:21 +08:00
wangyuan 042f9310fe Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-12 10:29:02 +08:00
wangyuan a4144852d3 mission 合并 2019-08-12 10:28:49 +08:00
lvxinran f8645932db 计算英雄属性加入teamId 2019-08-12 10:28:00 +08:00
lvxinran 50606d6e24 0点刷新 2019-08-12 10:18:07 +08:00
wangyuan e7a8d82ec3 fix pool 2019-08-16 18:38:47 +08:00
wangyuan 25df23fd53 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-16 17:46:49 +08:00
zhangshanxue 22b1156d7f acitvity 2019-08-18 05:01:41 +08:00
wangyuan a32e878367 51 task 2019-08-16 17:46:18 +08:00
wangyuan 725910f363 修改进度 2019-08-16 17:33:06 +08:00
wangyuan 64d7de1587 fix time 2019-08-10 17:19:30 +08:00