Commit Graph

1741 Commits (02e214f754d52f394a11db8a2f546aa753a7ab72)
 

Author SHA1 Message Date
lvxinran 1e572b1142 日志修改 2019-07-11 15:14:46 +08:00
lvxinran ed6afd9539 表格数据提交 2019-07-11 14:54:58 +08:00
lvxinran 9c1533621f 试炼重置修改、排行榜协议修改 2019-07-11 14:50:57 +08:00
lvxinran 69da7e98ca 试炼排行榜修改 2019-07-11 11:02:33 +08:00
wangyuan 71e36e025d red & fix vip mission 2019-07-11 10:57:13 +08:00
lvxinran 628ff1a05c 删除无关注释 2019-07-11 10:36:04 +08:00
lvxinran 9b051399b6 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-11 10:06:09 +08:00
lvxinran 35c69631b2 试炼排行榜实现 2019-07-11 10:06:05 +08:00
gaojie 745ddbeadf 统一线程处理数据 2019-07-11 10:02:18 +08:00
wangyuan 2d11d1485e red point 2019-07-10 19:48:45 +08:00
gaojie bdc04f8046 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-10 15:21:57 +08:00
gaojie cbd0e4d78c 请求所需的时间 2019-07-10 15:21:13 +08:00
lvxinran f602185b16 buff不生效修改 2019-07-10 15:07:43 +08:00
wangyuan 444bcddf9b red 2019-07-18 21:14:47 +08:00
wangyuan aa2396aa44 fix upload 2019-07-09 20:22:16 +08:00
lvxinran fcd3811495 试炼商店修改 2019-07-09 18:25:12 +08:00
wangyuan eed7984934 data upload 2019-07-09 18:03:12 +08:00
lvxinran c8965f70cd Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-09 17:57:02 +08:00
lvxinran 88eb2cb440 试炼商店修改 2019-07-09 17:56:58 +08:00
gaojie 8e7b04b6a5 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-09 16:05:14 +08:00
gaojie 55bcdafa24 fix 2019-07-09 16:05:10 +08:00
wangyuan 287f00ef47 delete log 2019-07-09 16:02:44 +08:00
wangyuan e93972a159 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-09 16:01:17 +08:00
wangyuan 431d82b163 item 2019-07-09 16:00:46 +08:00
lvxinran c946d3d106 战斗提交 2019-07-09 11:28:55 +08:00
lvxinran 4d0a4d312d 五点刷新白名单 2019-07-09 05:06:41 +08:00
lvxinran ed20d889cb 召唤首领修改 2019-07-08 19:56:25 +08:00
lvxinran cab55a367c 爬塔时间修改 2019-07-08 19:54:57 +08:00
wangyuan 1b49020695 hotfix lua 2019-07-08 18:10:40 +08:00
wangyuan e67bf61141 删除完成活动 2019-07-08 17:24:26 +08:00
gaojie db5ddc0fcc fix 2019-07-08 16:58:02 +08:00
wangyuan 96bcf70018 data upload 2019-07-08 15:26:03 +08:00
wangyuan 80bf7abc1a fix time 2019-07-08 13:34:09 +08:00
wangyuan bea4839821 fix 2019-07-08 13:14:40 +08:00
wangyuan 96c2665505 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-08 12:55:40 +08:00
wangyuan 4cd3f99c1c red indition & recharge 2019-07-08 12:51:54 +08:00
gaojie cadbc57677 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java
2019-07-08 10:48:23 +08:00
gaojie 21c50c2383 屏蔽敏感校验 2019-07-08 10:47:54 +08:00
lvxinran 0eb96961a8 战斗修改 2019-07-08 10:25:43 +08:00
wangyuan f3bcc3c516 fix 2019-07-05 20:44:33 +08:00
wangyuan 002557fad1 数据上报 2019-07-05 20:44:18 +08:00
wangyuan c333aade20 delete return 2019-07-05 18:58:46 +08:00
wangyuan 6a7d9a2ba4 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-05 18:19:03 +08:00
wangyuan 1108c04935 kt http upload 2019-07-05 18:18:31 +08:00
jiahuiwen 891bd568b6 热更表版本判断 2019-07-05 16:13:07 +08:00
jiahuiwen 5b84b17e4f 删除版本号 2019-07-05 16:07:07 +08:00
jiahuiwen d85f7facf5 删除版本号 2019-07-05 16:05:02 +08:00
jiahuiwen 5217601d47 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-05 15:59:00 +08:00
jiahuiwen aeeeb61995 打包版本号 2019-07-05 15:58:53 +08:00
lvxinran 9e2cf35c4e 错误修改 2019-07-05 15:48:32 +08:00