Commit Graph

2000 Commits (404ea0708963902c380b1211633966b9ec475397)
 

Author SHA1 Message Date
zhangshanxue 919c05ae33 兽潮排行榜同波次根据时间排名 2019-08-20 14:15:49 +08:00
wangyuan 1abfb2e66d Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-19 20:12:01 +08:00
lvxinran ac1ac7a734 商店修改,公会战信息移除修改 2019-08-27 15:07:44 +08:00
lvxinran 22689acb20 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-26 22:29:12 +08:00
wangyuan 48be1a6fe6 fix activity 2019-09-19 14:15:16 +08:00
lvxinran c9179ffa5b 公会战buff修改 2019-08-26 22:29:08 +08:00
lvxinran a3908a9927 暂时注释 2019-08-21 14:56:01 +08:00
lvxinran 9b63ef108c 修改 2019-08-21 14:09:14 +08:00
lvxinran 7e7d5a2eb4 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.ja
2019-08-21 11:11:13 +08:00
lvxinran de6bee5ac6 公会战逻辑 2019-08-21 11:08:31 +08:00
wangyuan b3e7188023 session 2019-08-19 20:11:26 +08:00
wangyuan 69d72692df boss 2019-08-19 20:09:16 +08:00
wangyuan d750f4a5d4 fix days 2019-08-19 13:59:29 +08:00
wangyuan b2c5279b93 sendmail 2019-08-19 13:42:35 +08:00
wangyuan 5f7d6aec18 random 2019-08-19 11:07:51 +08:00
wangyuan cd3b06da13 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-19 10:55:23 +08:00
wangyuan afd51eb5b1 battle 2019-08-19 10:54:08 +08:00
zhangshanxue 7b8fe61d8a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-19 10:43:09 +08:00
zhangshanxue 16a60a6fc6 妖兽gm 2019-08-19 10:42:47 +08:00
zhangshanxue b5932dec2a 战力排行 日志开关 2019-08-21 05:12:50 +08:00
wangyuan 069d544420 random 2019-08-19 10:41:16 +08:00
wangyuan 0a4dc241b3 boss id 2019-08-19 10:19:25 +08:00
wangyuan e2f3dcd278 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-17 18:51:23 +08:00
wangyuan e81666ab37 add task & mail 2019-08-17 18:50:47 +08:00
wangyuan 7b94b53fd9 guild walk 2019-08-17 16:21:23 +08:00
zhangshanxue aded46d464 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-17 15:26:48 +08:00
zhangshanxue 0de3509425 异妖拍脸 2019-08-17 15:26:37 +08:00
wangyuan 4459367da4 Merge branch 'project0.9' 2019-08-17 15:25:32 +08:00
wangyuan 8005f5d2c7 fix type 2019-08-17 15:23:40 +08:00
wangyuan 37d9d36e18 fix protobean 2019-08-17 15:17:48 +08:00
zhangshanxue 9456e7a1cc Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
2019-08-17 15:04:21 +08:00
wangyuan 134c51cdfa change adventure 2019-08-17 15:02:36 +08:00
wangyuan 4c9dc4245b fxi store 2019-08-17 14:49:17 +08:00
wangyuan 299f00200d fix store 2019-08-17 14:48:06 +08:00
wangyuan 92df10cfa7 fix bug 2019-08-17 14:44:25 +08:00
zhangshanxue d48947533b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-17 14:16:56 +08:00
zhangshanxue 7e80be3a92 兽潮来袭 37数据上报 2019-08-17 14:16:52 +08:00
zhangshanxue 5ef3705a1d acitvity 2019-08-17 13:46:40 +08:00
zhangshanxue cf4a4a61ab activity bug 2019-08-16 18:29:40 +08:00
wangyuan f154488f7f fix mission 2019-08-16 16:37:57 +08:00
zhangshanxue d83a28c2b3 acitvity 2019-08-16 16:12:51 +08:00
zhangshanxue cf996208a8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
2019-08-16 10:10:21 +08:00
zhangshanxue aa102c8d29 妖兽来袭 2019-08-16 10:09:39 +08:00
zhangshanxue d6a6f25e82 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-21 08:56:11 +08:00
zhangshanxue 10470c3dc8 修复玩家活动数据 2019-08-21 08:56:02 +08:00
zhangshanxue 334083029e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-18 06:06:07 +08:00
zhangshanxue 9f5725f1ef 连续充值bug 2019-08-18 06:06:01 +08:00
wangyuan 37ea59cc50 发送全服数据 2019-08-20 19:43:45 +08:00
wangyuan 1f452b87f1 fix friend 2019-08-20 19:39:44 +08:00
wangyuan cc43c55367 工坊等级限制 2019-08-16 13:49:12 +08:00