zhangshanxue
|
e1de5c8050
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-16 11:39:17 +08:00 |
zhangshanxue
|
ce8fffd10c
|
所有榜单容量不做限制
|
2019-09-16 11:39:13 +08:00 |
wangyuan
|
cd0ff0e95d
|
fix login
|
2019-09-12 18:42:44 +08:00 |
lvxinran
|
11af6398d3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-12 18:40:45 +08:00 |
lvxinran
|
f06650a72b
|
修改
|
2019-09-12 18:40:41 +08:00 |
wangyuan
|
678c06c998
|
fix reconnect
|
2019-09-12 18:15:23 +08:00 |
zhangshanxue
|
e925b88ffd
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-12 18:06:55 +08:00 |
zhangshanxue
|
258c70642c
|
cdk
|
2019-09-12 18:06:28 +08:00 |
zhangshanxue
|
63fc8dbd14
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-20 19:35:00 +08:00 |
zhangshanxue
|
01810351bb
|
招财猫回退
|
2019-09-20 19:34:42 +08:00 |
wangyuan
|
d24fce49ab
|
data report
|
2019-09-12 16:53:06 +08:00 |
wangyuan
|
70e62476f5
|
test
|
2019-09-12 13:51:19 +08:00 |
wangyuan
|
96bf9d7482
|
fix chat
|
2019-09-12 11:38:09 +08:00 |
wangyuan
|
eddd5459e0
|
fix chat
|
2019-09-12 10:55:31 +08:00 |
wangyuan
|
5a59ae0090
|
chat
|
2019-09-12 10:11:35 +08:00 |
lvxinran
|
a11a644dca
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-12 10:05:35 +08:00 |
lvxinran
|
135b9756c6
|
物品流水日志
|
2019-09-12 10:05:31 +08:00 |
wangyuan
|
001477cbb6
|
friend limit
|
2019-09-11 14:27:58 +08:00 |
lvxinran
|
c032ea2eaa
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-11 14:22:32 +08:00 |
lvxinran
|
4f84f0d815
|
无尽副本修改
|
2019-09-11 14:22:28 +08:00 |
lvxinran
|
16cbf1c5ef
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-14 12:26:04 +08:00 |
lvxinran
|
d5a202d28e
|
任务修改
|
2019-09-14 12:26:00 +08:00 |
lvxinran
|
fb8a4bcc70
|
法宝任务添加
|
2019-09-14 11:27:32 +08:00 |
lvxinran
|
e401393677
|
任务添加
|
2019-09-14 11:27:04 +08:00 |
wangyuan
|
ed379a2524
|
flushtime
|
2019-09-11 11:52:31 +08:00 |
zhangshanxue
|
521b7d062a
|
一键装备
|
2019-09-11 10:51:48 +08:00 |
zhangshanxue
|
da3ad5f06e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-11 10:23:52 +08:00 |
zhangshanxue
|
4481b5a8c0
|
gm 跑马灯
|
2019-09-11 10:10:01 +08:00 |
zhangshanxue
|
5545dec693
|
问卷重开
|
2019-09-10 21:12:26 +08:00 |
zhangshanxue
|
049975b931
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-10 20:41:57 +08:00 |
zhangshanxue
|
ba608937cc
|
装备战力
|
2019-09-10 20:41:50 +08:00 |
wangyuan
|
f7f54df716
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-09-10 20:12:30 +08:00 |
lvxinran
|
08324adb91
|
匹配时星数显示
|
2019-09-13 12:19:12 +08:00 |
lvxinran
|
d49eb6114b
|
聊天检测
|
2019-09-12 12:12:51 +08:00 |
wangyuan
|
c3dc931ea2
|
fix
|
2019-09-10 20:09:30 +08:00 |
zhangshanxue
|
952b1dd161
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-10 18:24:52 +08:00 |
lvxinran
|
3ef8b5766b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-12 18:44:50 +08:00 |
lvxinran
|
b52d314375
|
无尽修改N。。。
|
2019-09-12 18:44:46 +08:00 |
lvxinran
|
4f39ea2210
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-12 16:19:28 +08:00 |
lvxinran
|
713a0b7c04
|
无尽修改
|
2019-09-12 16:19:23 +08:00 |
zhangshanxue
|
de65f12114
|
在线人数
|
2019-09-10 18:24:46 +08:00 |
wangyuan
|
135450f507
|
fix network
|
2019-09-10 16:10:28 +08:00 |
zhangshanxue
|
dfeaf4bae0
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-10 15:55:46 +08:00 |
zhangshanxue
|
14d21eb6ec
|
移除功能开启检查
|
2019-09-10 15:55:42 +08:00 |
zhangshanxue
|
a3b84a9b2d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-10 14:30:47 +08:00 |
zhangshanxue
|
9bb332835e
|
魂印功能限制
|
2019-09-10 14:30:42 +08:00 |
wangyuan
|
2810683713
|
fix time
|
2019-09-10 14:14:32 +08:00 |
wangyuan
|
98d92373ac
|
fix table
|
2019-09-10 14:03:51 +08:00 |
wangyuan
|
5633e399e9
|
fix
|
2019-09-10 13:50:38 +08:00 |
wangyuan
|
d1efc48e47
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
|
2019-09-10 13:49:50 +08:00 |
zhangshanxue
|
abd7ebd875
|
观星开启
|
2019-09-10 13:25:53 +08:00 |
wangyuan
|
11376e12b1
|
fix map team
|
2019-09-10 12:01:05 +08:00 |
zhangshanxue
|
f36c71cada
|
问卷修改
|
2019-09-10 11:54:20 +08:00 |
lvxinran
|
30d56d2ad1
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-12 11:08:59 +08:00 |
lvxinran
|
a1e0d88052
|
无尽本报错
|
2019-09-12 11:08:55 +08:00 |
zhangshanxue
|
91582654ae
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-10 10:21:38 +08:00 |
zhangshanxue
|
33d1cf6a03
|
魂印
|
2019-09-10 10:21:01 +08:00 |
wangyuan
|
2a286218e6
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/GameApplication.java
|
2019-09-10 10:07:55 +08:00 |
wangyuan
|
4f57f75d6d
|
增加赛季开启类型
|
2019-09-10 10:05:03 +08:00 |
zhangshanxue
|
a51abcbe92
|
魂印
|
2019-09-10 10:02:59 +08:00 |
zhangshanxue
|
f8ab3f7967
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-10 00:01:38 +08:00 |
lvxinran
|
46e7fd5c23
|
血量修改
|
2019-09-11 23:29:45 +08:00 |
lvxinran
|
acbbc8ee4f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-11 22:21:06 +08:00 |
lvxinran
|
9eb7a469ff
|
法宝、公会战无尽副本修改
|
2019-09-11 22:21:02 +08:00 |
zhangshanxue
|
d04f6fe3bf
|
掉落
|
2019-09-10 00:01:17 +08:00 |
zhangshanxue
|
84104a5971
|
问卷调查优化
|
2019-09-09 20:35:00 +08:00 |
zhangshanxue
|
2aa64192a4
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-09 16:35:15 +08:00 |
zhangshanxue
|
08d29d6cce
|
更新bug
|
2019-09-09 16:35:03 +08:00 |
wangyuan
|
f5ec857e24
|
自动发现服务器
|
2019-09-09 16:07:11 +08:00 |
zhangshanxue
|
5ff27b049c
|
token验证
|
2019-09-09 15:04:39 +08:00 |
zhangshanxue
|
1b61c88da1
|
token验证
|
2019-09-09 14:23:29 +08:00 |
zhangshanxue
|
d0728bae5f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-09 14:16:28 +08:00 |
zhangshanxue
|
967a744a81
|
掉落
|
2019-09-09 14:16:23 +08:00 |
wangyuan
|
f85de0b94c
|
fix random
|
2019-09-09 12:38:21 +08:00 |
zhangshanxue
|
9e8cec3727
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-09 12:00:11 +08:00 |
zhangshanxue
|
88dc18da7b
|
问卷删除缓存
|
2019-09-09 11:59:34 +08:00 |
lvxinran
|
a533fd4c1a
|
无尽副本血量修改
|
2019-09-09 11:55:30 +08:00 |
lvxinran
|
8285f4363e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-09 11:31:57 +08:00 |
lvxinran
|
52a27ee882
|
法宝等级限制,46行为修改
|
2019-09-09 11:31:51 +08:00 |
zhangshanxue
|
8dc4700f13
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-09 11:28:52 +08:00 |
zhangshanxue
|
2e35ab977e
|
魂印临时背包掉落
|
2019-09-09 11:28:46 +08:00 |
wangyuan
|
cd38e82643
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-09-09 10:45:03 +08:00 |
wangyuan
|
fc2994c577
|
time
|
2019-09-09 10:42:13 +08:00 |
lvxinran
|
7be649a804
|
无尽副本修改,法宝修改
|
2019-09-09 10:39:59 +08:00 |
lvxinran
|
54ad281831
|
试炼精气值
|
2019-09-09 09:58:45 +08:00 |
wangyuan
|
2a5490a030
|
time
|
2019-09-07 21:40:45 +08:00 |
wangyuan
|
78154b6adc
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/config/SBloodyBattleSetting.java
|
2019-09-07 20:05:37 +08:00 |
wangyuan
|
0db40f7fde
|
bloody
|
2019-09-07 20:03:06 +08:00 |
zhangshanxue
|
47ac97d2ca
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-07 19:45:34 +08:00 |
zhangshanxue
|
5a05c80ef3
|
魂印掉落
|
2019-09-07 19:45:30 +08:00 |
lvxinran
|
8bfa9dc498
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-07 19:26:31 +08:00 |
lvxinran
|
cb95002a8f
|
血战时间限制
|
2019-09-07 19:26:27 +08:00 |
zhangshanxue
|
4f9b3404dd
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-07 17:20:46 +08:00 |
zhangshanxue
|
f5fb83d1b4
|
token验证
|
2019-09-07 17:20:41 +08:00 |
zhangshanxue
|
91c017cbd5
|
魂印掉落
|
2019-09-07 17:18:22 +08:00 |
lvxinran
|
3defe3d54c
|
法宝掉落
|
2019-09-07 16:31:19 +08:00 |
lvxinran
|
d88ed321c8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-07 15:03:56 +08:00 |
lvxinran
|
d6f2b203e0
|
公会修改、试炼修改
|
2019-09-07 15:03:33 +08:00 |
wangyuan
|
e1cbbac567
|
圣火令
|
2019-09-07 14:48:08 +08:00 |
wangyuan
|
69057cf41b
|
Merge branch 'split'
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java
|
2019-09-07 14:15:04 +08:00 |
wangyuan
|
a5a285f081
|
血战积分奖励
|
2019-09-07 14:13:25 +08:00 |
wangyuan
|
201f510e38
|
bloody
|
2019-09-07 14:12:09 +08:00 |
lvxinran
|
c7d61c098d
|
无尽本修改
|
2019-09-07 13:56:30 +08:00 |
zhangshanxue
|
5ef6a8debc
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-07 13:34:41 +08:00 |
zhangshanxue
|
c8cbfcaa43
|
魂印掉落
|
2019-09-07 13:34:36 +08:00 |
lvxinran
|
d95f112bd0
|
法宝默认
|
2019-09-06 20:46:56 +08:00 |
lvxinran
|
50c2758b5f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-06 20:41:38 +08:00 |
lvxinran
|
f16ee71a54
|
法宝
|
2019-09-06 20:41:34 +08:00 |
zhangshanxue
|
c118c195f4
|
排行榜显示
|
2019-09-06 14:54:00 +08:00 |
wangyuan
|
932a2bfe1b
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/util/StringUtil.java
|
2019-09-06 11:09:05 +08:00 |
wangyuan
|
1b09b921f9
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-09-06 11:04:28 +08:00 |
zhangshanxue
|
9406f2c28f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
|
2019-09-06 11:01:43 +08:00 |
zhangshanxue
|
0bc5d8fb90
|
魂印
|
2019-09-06 10:59:49 +08:00 |
lvxinran
|
1423c2fb3b
|
多余代码删除
|
2019-09-05 20:39:12 +08:00 |
lvxinran
|
75dec9d9b8
|
无尽修改
|
2019-09-05 20:26:26 +08:00 |
lvxinran
|
1215fdafdc
|
无尽设置跳过战斗、科技树修改
|
2019-09-05 19:51:07 +08:00 |
lvxinran
|
0d93202a6c
|
血战排行榜
|
2019-09-05 17:34:46 +08:00 |
lvxinran
|
702c7c705e
|
无尽修改
|
2019-09-05 16:57:16 +08:00 |
lvxinran
|
b45af85013
|
GM修改
|
2019-09-05 14:47:08 +08:00 |
lvxinran
|
6030413d3f
|
血战邮件
|
2019-09-05 14:15:20 +08:00 |
lvxinran
|
8129e8cb2c
|
血战排行榜
|
2019-09-05 12:01:47 +08:00 |
lvxinran
|
f823388c75
|
无尽副本血量计算
|
2019-09-05 09:56:18 +08:00 |
lvxinran
|
a960ad504c
|
无尽修改血量
|
2019-09-04 20:50:06 +08:00 |
lvxinran
|
489f906a00
|
法宝升星
|
2019-09-04 19:08:14 +08:00 |
lvxinran
|
2c4a2f2218
|
48、49行为类型修改
|
2019-09-04 16:07:13 +08:00 |
lvxinran
|
234bddfed8
|
发货修改
|
2019-09-04 15:46:49 +08:00 |
wangyuan
|
bc1c252c02
|
delete check amount
|
2019-09-04 15:42:19 +08:00 |
lvxinran
|
509878f535
|
无尽刷小怪
|
2019-09-04 15:40:50 +08:00 |
wangyuan
|
aa316cc206
|
table
|
2019-09-04 15:01:44 +08:00 |
lvxinran
|
ea6a775a3b
|
法宝gm,无尽地图小怪刷新
|
2019-09-04 15:00:25 +08:00 |
zhangshanxue
|
aaf700ca6c
|
问卷
|
2019-09-04 14:25:12 +08:00 |
zhangshanxue
|
734f47cbdb
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
|
2019-09-04 11:54:13 +08:00 |
zhangshanxue
|
14ce0d866c
|
问卷调查
|
2019-09-04 11:53:35 +08:00 |
lvxinran
|
3f0bc58b51
|
无尽副本战力显示
|
2019-09-04 11:46:18 +08:00 |
lvxinran
|
4970f48e9d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-04 11:08:51 +08:00 |
lvxinran
|
6de5deaa40
|
我要变强等级限制
|
2019-09-04 11:08:47 +08:00 |
wangyuan
|
bf9bf974c6
|
fix buygood logic
|
2019-09-04 10:37:12 +08:00 |
lvxinran
|
a04ab6ee5a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-03 20:49:18 +08:00 |
lvxinran
|
3caea6d9d2
|
我要变强
|
2019-09-03 20:49:14 +08:00 |
wangyuan
|
26ab22db56
|
activity
|
2019-09-03 20:16:44 +08:00 |
lvxinran
|
b782ee0a8a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-03 19:41:11 +08:00 |
lvxinran
|
463d63a7fb
|
法宝
|
2019-09-03 19:41:07 +08:00 |
wangyuan
|
3f16d2c1ca
|
scene
|
2019-09-03 19:30:40 +08:00 |
lvxinran
|
c770a95a09
|
修改提交
|
2019-09-03 11:18:39 +08:00 |
lvxinran
|
c5a704d494
|
法宝表对应
|
2019-09-03 11:17:52 +08:00 |
lvxinran
|
bfdfdef554
|
法宝加成
|
2019-09-03 10:47:52 +08:00 |
wangyuan
|
64afe28900
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-09-03 10:42:38 +08:00 |
wangyuan
|
def88c3daf
|
fix 法宝加成
|
2019-09-03 10:42:19 +08:00 |
zhangshanxue
|
ea47d19a4d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-03 10:39:21 +08:00 |
zhangshanxue
|
34d6559258
|
绑定手机号
|
2019-09-03 10:38:06 +08:00 |
lvxinran
|
6cd00f0f63
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/config/SEquipTalismana.java
# serverlogic/src/main/java/com/ljsd/jieling/config/SEquipTalismanaRankup.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java
|
2019-09-03 10:27:16 +08:00 |
lvxinran
|
61cfce258f
|
无尽副本、法宝
|
2019-09-03 10:24:04 +08:00 |
wangyuan
|
2ed3864e16
|
store
|
2019-09-03 10:23:51 +08:00 |
wangyuan
|
1b7fd4fb56
|
monster hp
|
2019-09-02 20:05:33 +08:00 |
wangyuan
|
e8b835207b
|
walk
|
2019-09-02 19:51:20 +08:00 |
wangyuan
|
c4a7952075
|
recovery
|
2019-09-02 16:54:14 +08:00 |
wangyuan
|
f15ecf3ba6
|
fix differdemon null
|
2019-09-02 16:12:16 +08:00 |
wangyuan
|
c785e9b813
|
fix fight
|
2019-09-02 15:05:21 +08:00 |
wangyuan
|
7b8f7e8f7e
|
fix check fight data
|
2019-09-02 14:26:21 +08:00 |
wangyuan
|
3ee89d5862
|
add bloody
|
2019-09-02 14:17:54 +08:00 |
wangyuan
|
31bbc0a27c
|
fix fight data
|
2019-09-02 14:04:53 +08:00 |
wangyuan
|
2db0ac3d10
|
delete log
|
2019-09-02 13:37:54 +08:00 |
wangyuan
|
31ffa233f1
|
fix pokenmon
|
2019-09-02 12:07:15 +08:00 |
zhangshanxue
|
e26857c2a5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-02 11:02:58 +08:00 |
zhangshanxue
|
3c2d3bad70
|
新增装备品质
|
2019-09-02 10:59:22 +08:00 |
lvxinran
|
195409ee4e
|
我要变强、公会修改
|
2019-09-01 17:47:20 +08:00 |
wangyuan
|
de2cd9a21a
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-31 13:46:04 +08:00 |
wangyuan
|
7cea36baab
|
血战&异妖战斗
|
2019-08-31 13:45:45 +08:00 |
lvxinran
|
b9f2d0d096
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-31 20:32:41 +08:00 |
lvxinran
|
2d33fbb7f9
|
公会战、公会功能修改
|
2019-08-31 20:32:37 +08:00 |
zhangshanxue
|
efe69e34b7
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-30 19:03:11 +08:00 |
zhangshanxue
|
3003546116
|
战力排行头像
|
2019-08-30 19:03:02 +08:00 |
zhangshanxue
|
9eac78b1eb
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-30 16:48:05 +08:00 |
lvxinran
|
ddd512e78e
|
上报错误修改
|
2019-09-01 15:01:22 +08:00 |
lvxinran
|
f92a9499d5
|
怪物战力显示
|
2019-09-01 14:49:49 +08:00 |
lvxinran
|
ab47c25f0c
|
公会修改、无尽本修改
|
2019-09-01 14:27:27 +08:00 |
zhangshanxue
|
716567ab68
|
绑定手机号
|
2019-08-30 13:51:50 +08:00 |
zhangshanxue
|
9c676a4c6f
|
改名推送
|
2019-08-29 16:21:50 +08:00 |
zhangshanxue
|
48d7ee726c
|
改名推送
|
2019-08-29 15:51:19 +08:00 |
zhangshanxue
|
49445bf595
|
玩家改名消耗道具
|
2019-08-29 15:13:39 +08:00 |
zhangshanxue
|
1e02099200
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-29 14:49:18 +08:00 |
zhangshanxue
|
db52e6b0be
|
gm支持
|
2019-08-29 14:49:09 +08:00 |
lvxinran
|
ca28591b48
|
生成妖灵师资质修改
|
2019-08-29 11:08:24 +08:00 |
lvxinran
|
7f801ad0b3
|
禁言解禁
|
2019-08-29 09:44:58 +08:00 |
lvxinran
|
215068ee7a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-29 09:41:15 +08:00 |
lvxinran
|
1b45fb4710
|
禁言解禁提交
|
2019-08-29 09:41:11 +08:00 |
lvxinran
|
183e4954c1
|
无尽副本提交
|
2019-08-29 05:52:36 +08:00 |
lvxinran
|
6bbd27d1f5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-29 05:13:42 +08:00 |
lvxinran
|
5d41aff570
|
function out
|
2019-08-29 05:13:38 +08:00 |
lvxinran
|
e7df45c50f
|
公会战代码重构
|
2019-08-29 03:58:45 +08:00 |
lvxinran
|
37bab876b3
|
时间工具类修改
|
2019-08-29 03:00:31 +08:00 |
lvxinran
|
caa57c1d5d
|
无尽副本信息,公户战修改
|
2019-08-29 03:00:03 +08:00 |
zhangshanxue
|
3b4bf37a8b
|
gm支持
|
2019-08-28 20:21:24 +08:00 |
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 |