wangyuan
|
e1b0b71d7f
|
treasure
|
2019-07-24 15:00:26 +08:00 |
wangyuan
|
b89aa9a2a0
|
fix map
|
2019-07-24 14:43:33 +08:00 |
wangyuan
|
c1d9f8fdb0
|
fix
|
2019-07-24 14:25:48 +08:00 |
wangyuan
|
9943d08dba
|
fix hero
|
2019-07-24 14:24:07 +08:00 |
wangyuan
|
eca6706f75
|
item
|
2019-07-24 13:52:07 +08:00 |
wangyuan
|
672b7990c3
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
|
2019-07-24 13:47:27 +08:00 |
wangyuan
|
030e0f728e
|
mission & store
|
2019-07-24 13:46:40 +08:00 |
lvxinran
|
4fe6793c59
|
阵营光环当前生命值修复
|
2019-07-24 13:42:30 +08:00 |
lvxinran
|
db732001aa
|
44行为类型
|
2019-07-23 21:52:07 +08:00 |
lvxinran
|
d677a1066c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-23 21:01:46 +08:00 |
lvxinran
|
d5c4168295
|
刷新次数修改
|
2019-07-23 21:01:41 +08:00 |
wangyuan
|
26270ae6da
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-07-23 20:35:29 +08:00 |
wangyuan
|
3e6b25bb3d
|
孙龙的任务
|
2019-07-23 20:35:15 +08:00 |
lvxinran
|
f96932c50a
|
元素共鸣报错修改
|
2019-07-23 18:04:16 +08:00 |
wangyuan
|
34dac1a17f
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-07-23 18:03:01 +08:00 |
wangyuan
|
4c12b893da
|
mission
|
2019-07-23 18:00:46 +08:00 |
lvxinran
|
dda168c324
|
云梦祈福逻辑提交
|
2019-07-23 17:41:48 +08:00 |
lvxinran
|
ea89394c70
|
云梦祈福结构修改
|
2019-07-23 11:18:44 +08:00 |
wangyuan
|
060e554809
|
item fresh
|
2019-07-23 10:01:43 +08:00 |
wangyuan
|
4a9d1812af
|
storelogic
|
2019-07-22 18:18:47 +08:00 |
wangyuan
|
fbcee502b6
|
buy goods
|
2019-07-22 17:42:49 +08:00 |
wangyuan
|
f814586624
|
recharge
|
2019-07-25 07:16:34 +08:00 |
lvxinran
|
cfbc1eb00e
|
光环提交
|
2019-07-22 16:13:15 +08:00 |
lvxinran
|
3e70a0384c
|
阵营光环上线
|
2019-07-22 15:53:50 +08:00 |
lvxinran
|
b3db193d36
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-22 15:33:49 +08:00 |
wangyuan
|
869c9ec15c
|
conf
|
2019-07-25 06:08:30 +08:00 |
wangyuan
|
36acef4ac1
|
conf
|
2019-07-25 05:45:58 +08:00 |
wangyuan
|
2e49142f07
|
mision
|
2019-07-25 05:08:59 +08:00 |
wangyuan
|
c113ff4481
|
fix
|
2019-07-23 13:51:43 +08:00 |
lvxinran
|
3b386e47b5
|
设置teamId
|
2019-07-22 15:33:45 +08:00 |
wangyuan
|
e90e414522
|
buy goods
|
2019-07-22 13:45:47 +08:00 |
wangyuan
|
8ba85e72fc
|
goods
|
2019-07-22 11:58:41 +08:00 |
wangyuan
|
f6e9d89873
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-07-22 11:58:17 +08:00 |
wangyuan
|
4cac791acb
|
mail
|
2019-07-22 11:36:58 +08:00 |
lvxinran
|
352472345b
|
12点事件,头像框提交
|
2019-07-22 11:11:06 +08:00 |
wangyuan
|
a5438e7e5c
|
fix goods
|
2019-07-22 10:32:19 +08:00 |
wangyuan
|
cf00d2c7de
|
Merge branch 'online1.0'
|
2019-07-22 10:19:16 +08:00 |
wangyuan
|
a142e3d3d8
|
fix goods
|
2019-07-22 10:16:47 +08:00 |
wangyuan
|
5dde031242
|
blood fix
|
2019-07-19 16:59:35 +08:00 |
wangyuan
|
3b950da80e
|
fix conf
|
2019-07-19 15:46:09 +08:00 |
wangyuan
|
a8104095d0
|
扫荡要加个精英怪信息
|
2019-07-19 14:53:35 +08:00 |
wangyuan
|
dd612ca743
|
秘境奖励首次免费领取
|
2019-07-19 13:33:41 +08:00 |
wangyuan
|
c70999553a
|
fix activity
|
2019-07-18 19:17:36 +08:00 |
wangyuan
|
d9f193c552
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
|
2019-07-18 19:06:35 +08:00 |
wangyuan
|
416f0153b4
|
gift & battle
|
2019-07-18 19:04:04 +08:00 |
lvxinran
|
35cacefab0
|
修改
|
2019-07-18 18:43:15 +08:00 |
lvxinran
|
124b7b5e0f
|
头像框修改、初始化提交
|
2019-07-18 17:46:17 +08:00 |
lvxinran
|
a25dc800dc
|
元素类提交
|
2019-07-18 12:13:19 +08:00 |
lvxinran
|
f0e926a3f9
|
精英本功绩修改,元素共鸣代码提交
|
2019-07-17 20:15:48 +08:00 |
wangyuan
|
bed7997dcc
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-07-17 15:15:41 +08:00 |
wangyuan
|
eab4d85aa3
|
礼包 & 血战
|
2019-07-17 15:15:29 +08:00 |
lvxinran
|
a4bc032cf2
|
试炼层级奖励领取
|
2019-07-17 10:21:11 +08:00 |
lvxinran
|
8381fd8008
|
装备图鉴
|
2019-07-17 10:14:03 +08:00 |
wangyuan
|
07ddd2c06a
|
skip fight snap
|
2019-07-16 20:24:33 +08:00 |
wangyuan
|
885bdebaff
|
match & drop hero per
|
2019-07-16 18:31:32 +08:00 |
lvxinran
|
195535617e
|
商店修改、表格结构修改
|
2019-07-16 18:07:23 +08:00 |
lvxinran
|
bbf6b94cba
|
功绩类新添加、图鉴添加
|
2019-07-16 17:39:34 +08:00 |
wangyuan
|
eaa9ffcd43
|
血战
|
2019-07-16 15:21:13 +08:00 |
wangyuan
|
96bf0a392e
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-07-16 13:40:17 +08:00 |
wangyuan
|
63e131e40f
|
云游商店
|
2019-07-16 13:40:05 +08:00 |
lvxinran
|
aa5d85b68a
|
战斗逻辑错误修改
|
2019-07-16 11:26:54 +08:00 |
wangyuan
|
63d3168ffa
|
抽卡送宝箱
|
2019-07-16 10:58:11 +08:00 |
wangyuan
|
405da77bb0
|
根据数组索引就行随机
|
2019-07-15 17:41:36 +08:00 |
wangyuan
|
28914e672c
|
fix 7
|
2019-07-15 17:29:51 +08:00 |
lvxinran
|
89affcf6c1
|
位置修改
|
2019-07-15 17:20:05 +08:00 |
gaojie
|
63a9dcbf5e
|
fix
|
2019-07-15 16:59:48 +08:00 |
lvxinran
|
c919681cc2
|
无关注释删除
|
2019-07-15 16:37:43 +08:00 |
lvxinran
|
8e727965dd
|
精英本扫荡
|
2019-07-15 16:34:26 +08:00 |
wangyuan
|
bbbd5d2344
|
Merge branch 'online1.0'
|
2019-07-15 15:16:45 +08:00 |
wangyuan
|
36b1071efc
|
行为类型7
|
2019-07-15 14:35:38 +08:00 |
wangyuan
|
534886c920
|
Merge branch 'online1.0'
|
2019-07-15 11:00:49 +08:00 |
wangyuan
|
fb2b2ff379
|
修改计算
|
2019-07-15 10:41:36 +08:00 |
lvxinran
|
4dfc832ca2
|
Merge branch 'online1.0'
|
2019-07-12 18:26:07 +08:00 |
gaojie
|
6add54c66b
|
好友推送状态
|
2019-07-12 17:29:49 +08:00 |
gaojie
|
55c7f19b45
|
Merge branch 'online1.0' of http://60.1.1.230/backend/jieling_server into online1.0
|
2019-07-12 16:54:31 +08:00 |
gaojie
|
934185db65
|
删除好友保留之前赠送体力状态
|
2019-07-12 16:54:27 +08:00 |
gaojie
|
d73d77c28e
|
好友赠送体力
|
2019-07-13 11:56:36 +08:00 |
wangyuan
|
956e689396
|
mission
|
2019-07-12 16:48:38 +08:00 |
lvxinran
|
84654cb0fd
|
Merge branch 'online1.0'
|
2019-07-12 14:45:56 +08:00 |
wangyuan
|
242be06ec4
|
fix daily mission
|
2019-07-12 14:44:31 +08:00 |
lvxinran
|
6fb6390d60
|
随机数修改
|
2019-07-12 13:33:56 +08:00 |
lvxinran
|
24eca20b07
|
功绩事件类型添加
|
2019-07-12 11:21:33 +08:00 |
lvxinran
|
98e2309523
|
装备特性随机提交
|
2019-07-12 10:19:23 +08:00 |
lvxinran
|
3b2ebae2c5
|
试炼最高层处理
|
2019-07-11 17:12:11 +08:00 |
wangyuan
|
e88a8fd3b5
|
thread
|
2019-07-15 16:50:54 +08:00 |
lvxinran
|
1e572b1142
|
日志修改
|
2019-07-11 15:14:46 +08:00 |
lvxinran
|
9c1533621f
|
试炼重置修改、排行榜协议修改
|
2019-07-11 14:50:57 +08:00 |
lvxinran
|
69da7e98ca
|
试炼排行榜修改
|
2019-07-11 11:02:33 +08:00 |
wangyuan
|
71e36e025d
|
red & fix vip mission
|
2019-07-11 10:57:13 +08:00 |
lvxinran
|
628ff1a05c
|
删除无关注释
|
2019-07-11 10:36:04 +08:00 |
lvxinran
|
9b051399b6
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-11 10:06:09 +08:00 |
lvxinran
|
35c69631b2
|
试炼排行榜实现
|
2019-07-11 10:06:05 +08:00 |
gaojie
|
745ddbeadf
|
统一线程处理数据
|
2019-07-11 10:02:18 +08:00 |
wangyuan
|
2d11d1485e
|
red point
|
2019-07-10 19:48:45 +08:00 |
gaojie
|
bdc04f8046
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-10 15:21:57 +08:00 |
gaojie
|
cbd0e4d78c
|
请求所需的时间
|
2019-07-10 15:21:13 +08:00 |
lvxinran
|
f602185b16
|
buff不生效修改
|
2019-07-10 15:07:43 +08:00 |
wangyuan
|
444bcddf9b
|
red
|
2019-07-18 21:14:47 +08:00 |
wangyuan
|
aa2396aa44
|
fix upload
|
2019-07-09 20:22:16 +08:00 |
lvxinran
|
fcd3811495
|
试炼商店修改
|
2019-07-09 18:25:12 +08:00 |
wangyuan
|
eed7984934
|
data upload
|
2019-07-09 18:03:12 +08:00 |
lvxinran
|
c8965f70cd
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-09 17:57:02 +08:00 |
lvxinran
|
88eb2cb440
|
试炼商店修改
|
2019-07-09 17:56:58 +08:00 |
gaojie
|
8e7b04b6a5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-09 16:05:14 +08:00 |
gaojie
|
55bcdafa24
|
fix
|
2019-07-09 16:05:10 +08:00 |
wangyuan
|
287f00ef47
|
delete log
|
2019-07-09 16:02:44 +08:00 |
wangyuan
|
431d82b163
|
item
|
2019-07-09 16:00:46 +08:00 |
lvxinran
|
ed20d889cb
|
召唤首领修改
|
2019-07-08 19:56:25 +08:00 |
lvxinran
|
cab55a367c
|
爬塔时间修改
|
2019-07-08 19:54:57 +08:00 |
wangyuan
|
1b49020695
|
hotfix lua
|
2019-07-08 18:10:40 +08:00 |
wangyuan
|
e67bf61141
|
删除完成活动
|
2019-07-08 17:24:26 +08:00 |
gaojie
|
db5ddc0fcc
|
fix
|
2019-07-08 16:58:02 +08:00 |
wangyuan
|
96bcf70018
|
data upload
|
2019-07-08 15:26:03 +08:00 |
wangyuan
|
80bf7abc1a
|
fix time
|
2019-07-08 13:34:09 +08:00 |
wangyuan
|
bea4839821
|
fix
|
2019-07-08 13:14:40 +08:00 |
wangyuan
|
96c2665505
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-07-08 12:55:40 +08:00 |
wangyuan
|
4cd3f99c1c
|
red indition & recharge
|
2019-07-08 12:51:54 +08:00 |
gaojie
|
cadbc57677
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java
|
2019-07-08 10:48:23 +08:00 |
gaojie
|
21c50c2383
|
屏蔽敏感校验
|
2019-07-08 10:47:54 +08:00 |
wangyuan
|
f3bcc3c516
|
fix
|
2019-07-05 20:44:33 +08:00 |
wangyuan
|
002557fad1
|
数据上报
|
2019-07-05 20:44:18 +08:00 |
wangyuan
|
c333aade20
|
delete return
|
2019-07-05 18:58:46 +08:00 |
wangyuan
|
6a7d9a2ba4
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-07-05 18:19:03 +08:00 |
wangyuan
|
1108c04935
|
kt http upload
|
2019-07-05 18:18:31 +08:00 |
jiahuiwen
|
891bd568b6
|
热更表版本判断
|
2019-07-05 16:13:07 +08:00 |
jiahuiwen
|
5217601d47
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-05 15:59:00 +08:00 |
jiahuiwen
|
aeeeb61995
|
打包版本号
|
2019-07-05 15:58:53 +08:00 |
lvxinran
|
9e2cf35c4e
|
错误修改
|
2019-07-05 15:48:32 +08:00 |
lvxinran
|
50f3127f01
|
Data参数提交
|
2019-07-05 15:00:11 +08:00 |
jiahuiwen
|
269d4e0267
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-05 14:53:28 +08:00 |
jiahuiwen
|
ea12488b93
|
调用热更新
|
2019-07-05 14:52:54 +08:00 |
wangyuan
|
5b389f9b09
|
聊天不校验特殊字符
|
2019-07-05 14:41:15 +08:00 |
wangyuan
|
99d2828a6c
|
send http
|
2019-07-05 14:13:59 +08:00 |
lvxinran
|
be52cac2bb
|
登陆数据接收
|
2019-07-05 13:49:16 +08:00 |
wangyuan
|
c614a976e0
|
kt
|
2019-07-20 16:07:05 +08:00 |
wangyuan
|
ae717d5caa
|
decompase
|
2019-07-20 15:07:10 +08:00 |
wangyuan
|
4920b68b41
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/ktbeans/KtEventUtils.java
|
2019-07-20 14:51:01 +08:00 |
wangyuan
|
506e1b4277
|
日志上报动态参数
|
2019-07-19 13:43:16 +08:00 |
lvxinran
|
cec1a85669
|
代码修改提交
|
2019-07-05 10:15:02 +08:00 |
wangyuan
|
c0cf345b40
|
mail red
|
2019-07-05 03:04:24 +08:00 |
lvxinran
|
2416934b0f
|
conf
|
2019-07-05 02:14:18 +08:00 |
lvxinran
|
58c8dfc970
|
提交
|
2019-07-05 01:27:59 +08:00 |
lvxinran
|
4877b24cc8
|
conf
|
2019-07-05 01:12:53 +08:00 |
wangyuan
|
cb747e49dc
|
delete open server mail
|
2019-07-04 23:12:58 +08:00 |
wangyuan
|
b4828b943c
|
fix adventure left
|
2019-07-04 23:05:37 +08:00 |
wangyuan
|
4c799d300a
|
adventure fix
|
2019-07-04 21:54:41 +08:00 |
lvxinran
|
5238704d95
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-04 21:48:10 +08:00 |
lvxinran
|
72a7ef8a1f
|
修复重置扫荡
|
2019-07-04 21:46:21 +08:00 |
wangyuan
|
16b8210460
|
fix force
|
2019-07-04 21:44:13 +08:00 |
wangyuan
|
a4d3c653fe
|
kt
|
2019-07-04 21:27:18 +08:00 |