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 |