Commit Graph

1458 Commits (7ff90d3a74e7149f2e48451bd0ee660e7d26952c)
 

Author SHA1 Message Date
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
lvxinran 50f3127f01 Data参数提交 2019-07-05 15:00:11 +08:00
jiahuiwen 269d4e0267 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-05 14:53:28 +08:00
jiahuiwen ea12488b93 调用热更新 2019-07-05 14:52:54 +08:00
wangyuan 5b389f9b09 聊天不校验特殊字符 2019-07-05 14:41:15 +08:00
wangyuan 99d2828a6c send http 2019-07-05 14:13:59 +08:00
lvxinran be52cac2bb 登陆数据接收 2019-07-05 13:49:16 +08:00
wangyuan 1ca1559554 conf 2019-07-20 16:16:20 +08:00
wangyuan c614a976e0 kt 2019-07-20 16:07:05 +08:00
wangyuan ae717d5caa decompase 2019-07-20 15:07:10 +08:00
wangyuan 4920b68b41 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/ktbeans/KtEventUtils.java
2019-07-20 14:51:01 +08:00
wangyuan 506e1b4277 日志上报动态参数 2019-07-19 13:43:16 +08:00
lvxinran cec1a85669 代码修改提交 2019-07-05 10:15:02 +08:00
wangyuan c0cf345b40 mail red 2019-07-05 03:04:24 +08:00
lvxinran 2416934b0f conf 2019-07-05 02:14:18 +08:00
lvxinran 58c8dfc970 提交 2019-07-05 01:27:59 +08:00
lvxinran 98985cd12d xx 2019-07-05 01:26:09 +08:00
lvxinran 4877b24cc8 conf 2019-07-05 01:12:53 +08:00
lvxinran 088cb89b6b 外网表提交 2019-07-04 23:21:36 +08:00
wangyuan cb747e49dc delete open server mail 2019-07-04 23:12:58 +08:00
wangyuan b4828b943c fix adventure left 2019-07-04 23:05:37 +08:00
wangyuan 4c799d300a adventure fix 2019-07-04 21:54:41 +08:00
lvxinran 5238704d95 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-04 21:48:10 +08:00
lvxinran 72a7ef8a1f 修复重置扫荡 2019-07-04 21:46:21 +08:00
wangyuan 16b8210460 fix force 2019-07-04 21:44:13 +08:00
wangyuan da392b4eb9 kt 2019-07-04 21:31:02 +08:00
wangyuan a4d3c653fe kt 2019-07-04 21:27:18 +08:00
lvxinran 22093fa81e 配置表更新 2019-07-04 21:04:33 +08:00
lvxinran 3870c87694 字段修改 2019-07-04 20:26:26 +08:00
lvxinran 232159bf22 BIReason修改,副本难度暂存修改 2019-07-04 20:19:44 +08:00
lvxinran 1d17e074d1 精英副本难度记录实现 2019-07-04 17:58:37 +08:00
wangyuan 9e74d3dbc4 delete http pool 2019-07-04 17:46:59 +08:00
gaojie 3946bdc27b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-04 17:27:20 +08:00
gaojie 9547d08080 使用道具 2019-07-04 17:27:16 +08:00