Commit Graph

1458 Commits (7ff90d3a74e7149f2e48451bd0ee660e7d26952c)
 

Author SHA1 Message Date
wangyuan f6bb11312f print log 2019-07-07 15:46:49 +08:00
wangyuan c86594a8ce delete log 2019-07-04 17:23:17 +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
lvxinran 36f163d9eb Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-04 11:48:02 +08:00
lvxinran d45ace5d7f conf 2019-07-04 11:47:38 +08:00
wangyuan bf451dd19b log 2019-07-05 22:36:07 +08:00
gaojie 3a73c47823 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-04 11:33:52 +08:00
gaojie 31988bce68 fix 2019-07-04 11:33:18 +08:00
lvxinran 49eb4570fb conf 2019-07-03 21:50:06 +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 49c738a616 conf file 2019-07-03 14:11:15 +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
wangyuan 2252704adf conf 2019-07-03 10:31:08 +08:00
lvxinran 69f2522702 日志打印修改 2019-07-03 10:00:29 +08:00
wangyuan 8ca885264d conf 2019-07-03 09:53:09 +08:00
lvxinran 57d77bea09 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-02 22:51:11 +08:00
lvxinran ec27295b72 日志修改,重置buff修改 2019-07-02 22:51:07 +08:00
wangyuan c7ef7294ff food buffer 2019-07-02 22:49:27 +08:00
wangyuan 33cd931e82 fix 2019-07-02 22:09:38 +08:00
wangyuan c5261cc9be mapmanager 2019-07-02 21:58:04 +08:00