Commit Graph

2085 Commits (d24fce49ab65559bd86cf77d77da32346f2741df)
 

Author SHA1 Message Date
zhangshanxue 1b7c67346c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-28 11:53:04 +08:00
zhangshanxue 9a5c1ec50b gm支持 2019-08-28 11:53:00 +08:00
wangyuan 7614cf3aaa fix differ 2019-08-28 11:21:35 +08:00
lvxinran 31590ea1c8 公会战代码重构 2019-08-29 00:23:54 +08:00
lvxinran eca20927e6 无尽副本部分修改 2019-08-27 21:03:46 +08:00
wangyuan 43883d4722 reconnect 2019-08-27 17:38:22 +08:00
lvxinran f05b764cfa Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-27 16:08:31 +08:00
lvxinran e9855c6eba 战斗 2019-08-27 16:08:26 +08:00
lvxinran 4475c6a233 战斗同步 2019-09-02 13:16:49 +08:00
lvxinran c6321bba2f 公会战标志位修改 2019-09-02 12:54:25 +08:00
lvxinran 7797b5bfff 公会战 2019-09-02 12:13:09 +08:00
zhangshanxue 6f1b0dcbf9 协议推送 2019-08-27 16:07:10 +08:00
zhangshanxue 3bb041a711 Merge branch 'project0.92' 2019-08-27 15:05:27 +08:00
wangyuan 5c96eb3756 fix indicaiton 2019-08-27 12:04:05 +08:00
wangyuan af97d1b74b Merge branch 'project0.92' 2019-08-27 11:30:41 +08:00
wangyuan a173bcc00d delete mail 2019-08-27 10:46:22 +08:00
wangyuan 20a8438465 fix remove store 2019-08-27 10:08:28 +08:00
zhangshanxue 689a227324 合并协议 2019-08-26 21:04:17 +08:00
wangyuan 58f9d17b8f fix mail 2019-08-26 20:53:56 +08:00
zhangshanxue 64e66e941a 背包协议同步合并 2019-08-26 17:17:15 +08:00
wangyuan 08447fdb97 Merge branch 'project0.92'
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/network/session/ISession.java
2019-08-26 15:31:15 +08:00
wangyuan c78898e0e9 add white & fix curHp 2019-08-26 15:27:50 +08:00
wangyuan 04234ab0fa user from cache 2019-08-26 15:11:09 +08:00
zhangshanxue 9f5600049d Merge branch 'project0.92' of http://60.1.1.230/backend/jieling_server into project0.92 2019-09-02 14:05:23 +08:00
zhangshanxue a1a1a8a49f bug和异常处理 2019-09-02 14:04:50 +08:00
wangyuan c0a45928ba Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-26 14:50:55 +08:00
lvxinran 447445a29f 公会战修改 2019-08-29 12:02:08 +08:00
lvxinran bf36633caf Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-31 06:24:20 +08:00
lvxinran 9c6f7c277b 公会战提交 2019-08-31 06:24:15 +08:00
wangyuan 70d2f8165a reconnect server 2019-08-26 14:50:13 +08:00
wangyuan d2b5b95463 buffer effect target 2019-08-26 13:51:30 +08:00
wangyuan cdc13a639a arena rank 2019-08-26 11:43:10 +08:00
zhangshanxue c650902fef bug和异常处理 2019-09-02 11:30:26 +08:00
wangyuan 28067420f0 不推荐自己 2019-08-23 11:31:38 +08:00
zhangshanxue 6fbb86fad2 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-30 10:26:23 +08:00
zhangshanxue 7c13d67a5c 升星 2019-08-30 10:26:15 +08:00
zhangshanxue f76a69da1a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-29 19:55:59 +08:00
zhangshanxue 3cfb6564ff 进阶妖灵师返回奖励 2019-08-29 19:53:59 +08:00
zhangshanxue 1e4275aed1 acitvity 2019-09-28 21:48:27 +08:00
zhangshanxue 72d36d633f acitvity 2019-09-28 21:38:01 +08:00
zhangshanxue a2ffa2fbfe acitvity 2019-08-26 21:14:09 +08:00
wangyuan 30afcf32b0 friend 2019-08-23 09:56:17 +08:00
wangyuan 6f2955e08f fix take 2019-08-23 09:50:53 +08:00
wangyuan cf0b06fa8c fix online 2019-08-23 09:41:13 +08:00
wangyuan 08615efd4f fix friend 2019-08-22 20:01:56 +08:00
wangyuan 3a1a415024 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-22 19:59:40 +08:00
wangyuan 1ed2fd4489 check mail 2019-08-22 19:59:23 +08:00
wangyuan 6ee1c9fc4a fix bug 2019-08-22 19:39:57 +08:00
wangyuan 9c6925a159 fix buffer 2019-08-22 18:38:12 +08:00
wangyuan 989d0a2d85 fix activity 2019-08-21 20:59:50 +08:00