Commit Graph

1226 Commits (dd612ca7435e71a6f2d83c255db6eeed3f56681d)

Author SHA1 Message Date
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 431d82b163 item 2019-07-09 16:00:46 +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
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 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 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 4877b24cc8 conf 2019-07-05 01:12:53 +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 a4d3c653fe kt 2019-07-04 21:27:18 +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
wangyuan f6bb11312f print log 2019-07-07 15:46:49 +08:00
wangyuan 0c11ff2e4d conf & test lua & mission 2019-07-04 17:11:08 +08:00
gaojie ea2353bb06 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-04 15:43:16 +08:00
gaojie ea09857a64 好友信息 2019-07-04 15:42:57 +08:00
lvxinran a2d5ecd93a 试炼掉出地图重置修改 2019-07-04 15:38:01 +08:00
gaojie 6fafd9c49b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-04 14:41:52 +08:00
gaojie 788c92b0e8 httppool fix 2019-07-04 14:41:47 +08:00
lvxinran 39825d03cd 开天接数据方法提交 2019-07-04 14:40:01 +08:00
wangyuan 14983f6ccb log 2019-07-06 14:11:52 +08:00
wangyuan a76bfb8249 skip new player 2019-07-06 13:51:13 +08:00
wangyuan f9b7f8b7c2 mail 2019-07-06 12:24:38 +08:00
gaojie 3a73c47823 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-04 11:33:52 +08:00
wangyuan bf451dd19b log 2019-07-05 22:36:07 +08:00
gaojie 31988bce68 fix 2019-07-04 11:33:18 +08:00
lvxinran 85b0837e31 战斗buff修复 2019-07-03 21:48:06 +08:00
lvxinran 997a6edb3e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-03 21:47:37 +08:00
lvxinran 1d994ccee2 GM外敌 2019-07-03 21:15:47 +08:00
wangyuan 1f538c8faa conf & map & ktbean 2019-07-03 20:57:47 +08:00
gaojie 19c2e880ee Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java
2019-07-03 19:16:48 +08:00
gaojie 134c779373 同步数据 2019-07-03 19:15:54 +08:00
lvxinran 63107c3af7 41行为类型添加 2019-07-03 18:28:04 +08:00
lvxinran 4d4a47dd0f 爬塔奖励第一层修改 2019-07-03 17:00:05 +08:00
lvxinran 24b4080062 扫荡修改 2019-07-03 16:25:25 +08:00
lvxinran 181649ee07 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-03 16:16:20 +08:00
lvxinran 12bb758a38 试炼奖励修复 2019-07-03 16:16:16 +08:00
wangyuan becff88ad7 kill reward 2019-07-03 14:22:54 +08:00
wangyuan 46e9d4c318 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-03 14:08:59 +08:00
wangyuan bd763bcb1c fix map sweep 2019-07-03 14:08:51 +08:00
lvxinran 78d14781c8 服务器报错修改 2019-07-03 12:14:03 +08:00
gaojie d6079d0964 fix 2019-07-03 11:59:35 +08:00
gaojie 5781cad3f8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-03 11:53:35 +08:00
gaojie 6ef92b7d2d 上报数据 2019-07-03 11:53:30 +08:00
lvxinran 5cf515aa1a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-03 11:41:03 +08:00
lvxinran 309069c622 试炼精气值修改 2019-07-03 11:40:59 +08:00
gaojie 4bd4b07f88 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-03 11:32:48 +08:00
gaojie c76141c21e fix 2019-07-03 11:31:59 +08:00
lvxinran 3e3de9e38d 试炼重置修改 2019-07-03 11:17:41 +08:00