zhangshanxue
|
7b09870bb7
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-28 19:46:50 +08:00 |
zhangshanxue
|
bb0cdea20c
|
封号
|
2019-08-28 19:46:46 +08:00 |
dengdan
|
6f843b3a23
|
战斗改为多选称,ThreadLocal存储
|
2019-08-28 15:08:49 +08:00 |
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 |
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 |
lvxinran
|
c6321bba2f
|
公会战标志位修改
|
2019-09-02 12:54:25 +08:00 |
lvxinran
|
7797b5bfff
|
公会战
|
2019-09-02 12:13:09 +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 |
wangyuan
|
7b988d70c2
|
process openId
|
2019-08-21 20:31:29 +08:00 |
wangyuan
|
2b78ebf9ea
|
fix mail bug
|
2019-08-21 20:01:14 +08:00 |
wangyuan
|
264540e796
|
虚拟币
|
2019-08-21 19:45:04 +08:00 |
zhangshanxue
|
ce71b8a4db
|
魂晶累计
|
2019-08-26 19:35:52 +08:00 |
wangyuan
|
c19d6b2e26
|
fix mongo url
|
2019-08-21 19:07:04 +08:00 |
lvxinran
|
e38fb0f41d
|
修改
|
2019-08-21 18:59:03 +08:00 |
lvxinran
|
133e0acac7
|
修改
|
2019-08-21 18:51:34 +08:00 |
lvxinran
|
0b211bbed1
|
发送邮件,踢下线
|
2019-08-21 18:42:06 +08:00 |
wangyuan
|
6baf3711b1
|
kt new appid
|
2019-08-21 18:26:25 +08:00 |
wangyuan
|
620b055aad
|
appkey
|
2019-08-21 17:38:10 +08:00 |
lvxinran
|
51b9b1ce7e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-21 15:55:52 +08:00 |
lvxinran
|
3312b7993c
|
37敏感字校验
|
2019-08-21 15:55:47 +08:00 |
wangyuan
|
9d4473f31d
|
同步
|
2019-08-21 15:30:40 +08:00 |
lvxinran
|
0f783608d2
|
敏感字
|
2019-08-21 15:30:28 +08:00 |
wangyuan
|
b8cfc5a572
|
fight
|
2019-08-21 15:14:43 +08:00 |
zhangshanxue
|
1dc59a7af0
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-21 14:52:38 +08:00 |
zhangshanxue
|
bbc05c8c33
|
37接口数据
|
2019-08-21 14:52:08 +08:00 |
wangyuan
|
c8295ea4e7
|
mail
|
2019-08-21 14:50:37 +08:00 |
lvxinran
|
58d3b86212
|
邮件定时发送,37上报控制
|
2019-08-21 14:45:38 +08:00 |
zhangshanxue
|
f0443e1a21
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-21 14:36:54 +08:00 |
zhangshanxue
|
bb8ad768b5
|
37接口数据
|
2019-08-21 14:36:37 +08:00 |
zhangshanxue
|
5c9168607d
|
招财猫 22测试后回退
|
2019-08-24 20:20:37 +08:00 |
lvxinran
|
bcfc9a92d6
|
邮件定时检测发送,工会图腾信息,工会战绩,37敏感字检测
|
2019-08-21 14:06:02 +08:00 |
lvxinran
|
3ba8de06f2
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
|
2019-08-21 14:03:49 +08:00 |
lvxinran
|
668e58147d
|
加入图腾
|
2019-08-21 14:02:32 +08:00 |
wangyuan
|
7dbcc6e007
|
head
|
2019-08-20 20:27:55 +08:00 |
zhangshanxue
|
0f9897eeac
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-20 15:47:31 +08:00 |
zhangshanxue
|
3e00a693da
|
report
|
2019-08-20 15:47:13 +08:00 |
wangyuan
|
7fb6e6dc95
|
random
|
2019-08-20 15:46:16 +08:00 |
wangyuan
|
2df1e6b44c
|
battle
|
2019-08-20 15:38:33 +08:00 |
lvxinran
|
622d22d4a2
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-20 15:10:06 +08:00 |
lvxinran
|
785bd98be9
|
mapLogic
|
2019-08-20 15:10:02 +08:00 |
wangyuan
|
fe4e9509e5
|
fix arena
|
2019-08-20 15:00:59 +08:00 |
lvxinran
|
f52d970ea6
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-20 14:36:02 +08:00 |
lvxinran
|
d7e05f0c4d
|
试炼币修改
|
2019-08-20 14:35:56 +08:00 |
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 |
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 |
lvxinran
|
0f4ef7a59e
|
战斗血量修改
|
2019-08-16 05:03:05 +08:00 |
wangyuan
|
87c2c32a44
|
fix mission
|
2019-08-15 21:04:40 +08:00 |
lvxinran
|
ed50688201
|
公会战
|
2019-08-16 11:13:52 +08:00 |
wangyuan
|
07d68f5c69
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-15 18:30:01 +08:00 |
lvxinran
|
b7cd108b76
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-20 08:16:58 +08:00 |
lvxinran
|
ec0000e220
|
第一次十连抽
|
2019-08-20 08:16:53 +08:00 |
wangyuan
|
714599814e
|
add task
|
2019-08-15 18:29:46 +08:00 |
wangyuan
|
95e7381a2e
|
print tlog
|
2019-08-15 16:49:19 +08:00 |
wangyuan
|
94302befde
|
fix activity
|
2019-08-14 15:14:29 +08:00 |
lvxinran
|
02e214f754
|
名字修改
|
2019-08-14 11:56:54 +08:00 |
lvxinran
|
cd4ad1da3a
|
日志修改
|
2019-08-14 11:44:23 +08:00 |
lvxinran
|
2e72e3e3f6
|
名字长度
|
2019-08-14 11:31:17 +08:00 |
lvxinran
|
38715c4bfd
|
功绩修改
|
2019-08-14 13:12:54 +08:00 |
wangyuan
|
f44da1b677
|
basehandler 构造方法
|
2019-08-18 18:15:07 +08:00 |
wangyuan
|
6046207b77
|
fix mail & store num & indication user level
|
2019-08-18 17:21:25 +08:00 |
zhangshanxue
|
6631ea50f3
|
协议解析
|
2019-08-13 17:11:38 +08:00 |
wangyuan
|
4255e37558
|
reason
|
2019-08-13 14:35:27 +08:00 |
lvxinran
|
80f7c4331e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-13 14:25:27 +08:00 |
lvxinran
|
39efb51a56
|
功绩难度修改
|
2019-08-13 14:25:23 +08:00 |
zhangshanxue
|
0fac895eb7
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-13 13:18:49 +08:00 |
wangyuan
|
20a228b9b9
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-19 00:01:07 +08:00 |
zhangshanxue
|
1638c42ea1
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-13 10:36:03 +08:00 |
zhangshanxue
|
fd7b37fc4a
|
acitvity
|
2019-09-13 10:35:54 +08:00 |
wangyuan
|
c20652705b
|
fix ission
|
2019-08-19 00:00:56 +08:00 |
zhangshanxue
|
ab42fa69bf
|
活动提示
|
2019-08-13 13:18:42 +08:00 |
lvxinran
|
829e51356d
|
RedisUtil
|
2019-08-13 10:12:13 +08:00 |
lvxinran
|
9a1c002c4b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-13 10:09:37 +08:00 |
lvxinran
|
5e5832178d
|
公会战
|
2019-08-13 10:09:32 +08:00 |
lvxinran
|
d301d88bdf
|
修改名字
|
2019-08-13 10:08:49 +08:00 |
wangyuan
|
f16f1dbc99
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-13 10:08:16 +08:00 |
zhangshanxue
|
3844229238
|
acitvity
|
2019-08-13 10:07:57 +08:00 |
zhangshanxue
|
8c5e6a4cba
|
acitvity
|
2019-09-13 09:35:30 +08:00 |
zhangshanxue
|
1d01fcf712
|
acitvity
|
2019-09-12 21:54:42 +08:00 |
zhangshanxue
|
f76ce9cb43
|
acitvity
|
2019-09-12 21:39:52 +08:00 |
zhangshanxue
|
c0293bd314
|
acitvity
|
2019-09-12 21:36:54 +08:00 |
wangyuan
|
480936bdc5
|
删除无效日志
|
2019-08-13 10:07:57 +08:00 |
zhangshanxue
|
087d03e8dc
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-12 21:07:17 +08:00 |
lvxinran
|
7b62901318
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-12 20:52:58 +08:00 |
lvxinran
|
81a443322a
|
公会战
|
2019-08-12 20:52:54 +08:00 |
zhangshanxue
|
4b3435799d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-12 20:27:43 +08:00 |
zhangshanxue
|
b2d3f59164
|
活动结束补发奖励
|
2019-08-12 20:27:36 +08:00 |
wangyuan
|
4cdb969929
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-12 17:49:35 +08:00 |
wangyuan
|
db8c4d43d9
|
同步用户状态
|
2019-08-12 17:49:20 +08:00 |
lvxinran
|
f46031890a
|
上个修改
|
2019-08-12 17:32:06 +08:00 |
lvxinran
|
d8fa42b0f4
|
公会战查看对战信息
|
2019-08-12 17:31:49 +08:00 |
lvxinran
|
9497535341
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-12 17:23:42 +08:00 |
lvxinran
|
e27985bab6
|
功绩17修改
|
2019-08-12 17:23:38 +08:00 |
lvxinran
|
29c22526b5
|
增加RedisKey
|
2019-08-12 16:06:06 +08:00 |
lvxinran
|
6924500cd1
|
公会战逻辑修改
|
2019-08-12 16:05:43 +08:00 |
zhangshanxue
|
a33043d8de
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-12 16:00:58 +08:00 |
zhangshanxue
|
c0509d25f2
|
acitvity
|
2019-08-12 16:00:36 +08:00 |
wangyuan
|
a7ee427a08
|
fix limmit
|
2019-08-12 15:50:47 +08:00 |
lvxinran
|
1fe64c05cb
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-12 14:30:36 +08:00 |
lvxinran
|
9364fbda6d
|
公会战开始战斗提交
|
2019-08-12 14:30:32 +08:00 |
wangyuan
|
cbb6178449
|
delete log
|
2019-08-12 13:57:51 +08:00 |
wangyuan
|
a076812220
|
fix special
|
2019-08-12 12:16:20 +08:00 |
zhangshanxue
|
f6e25e2bae
|
acitvity
|
2019-08-12 12:03:15 +08:00 |
wangyuan
|
cff26b2110
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-12 11:15:51 +08:00 |
wangyuan
|
968cf84ebd
|
delete unuse log
|
2019-08-12 11:15:41 +08:00 |
lvxinran
|
8395912f43
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-12 11:15:25 +08:00 |
lvxinran
|
acc29668bc
|
编队ID修改
|
2019-08-12 11:15:21 +08:00 |
wangyuan
|
042f9310fe
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-12 10:29:02 +08:00 |
wangyuan
|
a4144852d3
|
mission 合并
|
2019-08-12 10:28:49 +08:00 |
lvxinran
|
f8645932db
|
计算英雄属性加入teamId
|
2019-08-12 10:28:00 +08:00 |
lvxinran
|
50606d6e24
|
0点刷新
|
2019-08-12 10:18:07 +08:00 |
wangyuan
|
e7a8d82ec3
|
fix pool
|
2019-08-16 18:38:47 +08:00 |
wangyuan
|
25df23fd53
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-16 17:46:49 +08:00 |
zhangshanxue
|
22b1156d7f
|
acitvity
|
2019-08-18 05:01:41 +08:00 |
wangyuan
|
a32e878367
|
51 task
|
2019-08-16 17:46:18 +08:00 |
wangyuan
|
725910f363
|
修改进度
|
2019-08-16 17:33:06 +08:00 |
wangyuan
|
64d7de1587
|
fix time
|
2019-08-10 17:19:30 +08:00 |
wangyuan
|
2011f1426b
|
fix take time
|
2019-08-10 17:09:25 +08:00 |
wangyuan
|
7192faf883
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-10 17:08:46 +08:00 |
lvxinran
|
eb6cdbc27b
|
名字限制
|
2019-08-10 16:36:21 +08:00 |
lvxinran
|
dcf5a3bcfa
|
名字限制
|
2019-08-10 16:09:04 +08:00 |
wangyuan
|
975cd3f045
|
refresh
|
2019-08-10 15:51:43 +08:00 |
lvxinran
|
ca477db687
|
名字限制修改
|
2019-08-10 15:34:22 +08:00 |
wangyuan
|
3719f64ec8
|
rank
|
2019-08-10 15:22:14 +08:00 |
wangyuan
|
0af7eb4a4c
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-10 14:48:20 +08:00 |
wangyuan
|
707724627c
|
guild walk
|
2019-08-10 14:47:56 +08:00 |
lvxinran
|
cfe7d058f8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-10 14:46:57 +08:00 |
lvxinran
|
6ede1219a9
|
公会战布防接口
|
2019-08-10 14:46:53 +08:00 |
zhangshanxue
|
7a275f2ae0
|
签到刷新
|
2019-08-10 14:34:18 +08:00 |
zhangshanxue
|
56017c2dee
|
签到刷新
|
2019-10-01 05:01:31 +08:00 |
wangyuan
|
dd0cab498d
|
log
|
2019-08-10 12:08:03 +08:00 |
wangyuan
|
e456ed0bd8
|
log
|
2019-08-10 11:57:18 +08:00 |
wangyuan
|
efcb80483c
|
store
|
2019-08-10 11:45:40 +08:00 |
wangyuan
|
c0f7cefaaa
|
store
|
2019-08-10 11:33:20 +08:00 |
wangyuan
|
4fd9a928b8
|
reward
|
2019-08-10 11:23:27 +08:00 |
wangyuan
|
3a2a281b81
|
progress
|
2019-08-10 11:17:03 +08:00 |
lvxinran
|
43458f5fc6
|
公会战
|
2019-08-10 10:58:30 +08:00 |
lvxinran
|
69c4b45ac3
|
公会战信息类
|
2019-08-10 10:58:12 +08:00 |
lvxinran
|
eb040c2818
|
删除无用语句
|
2019-08-10 10:54:22 +08:00 |
lvxinran
|
4ab8b5f64c
|
删除防守方法提交
|
2019-08-10 10:53:29 +08:00 |
lvxinran
|
3d76b09eaf
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-10 10:53:02 +08:00 |
lvxinran
|
24bcf89270
|
公会战修改
|
2019-08-10 10:52:58 +08:00 |
lvxinran
|
e1824e12d5
|
个人战力
|
2019-08-10 10:52:16 +08:00 |
wangyuan
|
5d79d6ac4d
|
extra add
|
2019-08-10 10:35:07 +08:00 |
zhangshanxue
|
c20d6e97c5
|
活动开启bug
|
2019-08-10 21:17:43 +08:00 |
wangyuan
|
01c7ac7c8d
|
商店增益
|
2019-08-09 17:48:54 +08:00 |
wangyuan
|
957664c498
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java
|
2019-08-09 17:17:20 +08:00 |
wangyuan
|
15ffc5a164
|
fix mission & guild walk
|
2019-08-09 17:14:45 +08:00 |
lvxinran
|
65bcc67faf
|
公会战布防修改
|
2019-08-09 15:06:00 +08:00 |
lvxinran
|
50cb1525c2
|
公会发送indication
|
2019-08-09 15:04:12 +08:00 |
lvxinran
|
e3d9585568
|
功绩14、18修改
|
2019-08-09 14:34:30 +08:00 |
lvxinran
|
6d79100c20
|
功绩18修改
|
2019-08-09 11:43:10 +08:00 |
wangyuan
|
516c45c2da
|
fix map mission
|
2019-08-09 11:14:33 +08:00 |
lvxinran
|
727cee1960
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-09 10:57:50 +08:00 |
lvxinran
|
7831d1bd16
|
公会信息
|
2019-08-09 10:57:30 +08:00 |
wangyuan
|
c7fb73040b
|
fix process
|
2019-08-09 10:56:00 +08:00 |
lvxinran
|
2c89f0782c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-09 10:44:49 +08:00 |
lvxinran
|
e0388232dd
|
RedisUtil冲突修改
|
2019-08-09 10:44:45 +08:00 |
lvxinran
|
aaa15e6f29
|
公会修改
|
2019-08-09 10:42:37 +08:00 |
lvxinran
|
da884a9773
|
功绩14修改
|
2019-08-09 10:42:09 +08:00 |
wangyuan
|
91c54cc985
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-09 10:24:35 +08:00 |
wangyuan
|
b172a2971e
|
guild
|
2019-08-09 10:24:17 +08:00 |
zhangshanxue
|
8ffaafc666
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-09 10:21:25 +08:00 |