PC-202302260912\Administrator
|
6d8b910c28
|
热更
|
2023-08-07 16:09:00 +08:00 |
PC-202302260912\Administrator
|
d909a31e20
|
热更
|
2023-08-07 14:42:05 +08:00 |
PC-202302260912\Administrator
|
b96c008047
|
熱更
|
2023-08-07 14:01:18 +08:00 |
PC-202302260912\Administrator
|
3e70166697
|
熱更
|
2023-08-07 13:04:54 +08:00 |
PC-202302260912\Administrator
|
fb0cee1d06
|
战斗同步
|
2023-06-25 18:18:32 +08:00 |
duhui
|
32b5f8d8fd
|
Merge branch 'master_test_hw' into master_test_hw_hongmeng
|
2021-02-19 11:06:29 +08:00 |
lvxinran
|
9a5d7ba469
|
战斗同步
|
2021-01-22 18:11:30 +08:00 |
lvxinran
|
b7f10ac10e
|
战斗同步
|
2021-01-14 17:18:41 +08:00 |
zhangshanxue
|
c35dbf7dbe
|
恢复榜单
|
2020-11-25 20:28:11 +08:00 |
zhangshanxue
|
adc51d3942
|
战斗日志打印
|
2020-11-07 01:43:58 +08:00 |
zhangshanxue
|
03dd7f0804
|
打linux包时会复制过去
|
2020-06-13 18:00:32 +08:00 |
zhangshanxue
|
344501791f
|
道具掉落 类型判断和返回
|
2020-06-13 16:57:06 +08:00 |
wangyuan
|
9335201d5e
|
fix battlemain
|
2020-05-09 17:24:43 +08:00 |
wangyuan
|
17751438fd
|
fix car
|
2020-05-08 14:16:46 +08:00 |
wangyuan
|
25392fd49f
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-05-07 16:32:04 +08:00 |
wangyuan
|
a0d031e7d8
|
车轮
|
2020-05-07 16:31:28 +08:00 |
lvxinran
|
824c8239c5
|
战斗逻辑
|
2020-05-06 19:51:54 +08:00 |
lvxinran
|
754bdf965b
|
战斗逻辑
|
2020-05-06 16:49:24 +08:00 |
lvxinran
|
331e8849ff
|
battlemain修改
|
2020-04-10 18:31:32 +08:00 |
wangyuan
|
cb1954d8a2
|
vip权限
|
2020-01-08 17:58:36 +08:00 |
wangyuan
|
ec9b9a67e4
|
battlemain 异妖
|
2019-12-26 17:39:02 +08:00 |
wangyuan
|
3b52fbfa63
|
fix globaldata & champion in redis
|
2019-12-12 11:42:56 +08:00 |
wangyuan
|
b28d31d8ae
|
巅峰赛
|
2019-12-06 20:25:52 +08:00 |
wangyuan
|
20e9b0f8ec
|
new fight
|
2019-09-25 09:58:02 +08:00 |
wangyuan
|
f9263ece0b
|
conf
|
2019-09-09 16:23:09 +08:00 |
wangyuan
|
f1f8d67076
|
conf
|
2019-09-09 16:22:43 +08:00 |
wangyuan
|
1b09b921f9
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-09-06 11:04:28 +08:00 |
wangyuan
|
7cea36baab
|
血战&异妖战斗
|
2019-08-31 13:45:45 +08:00 |
wangyuan
|
72ac6a9749
|
删除配置表
|
2019-08-05 11:29:31 +08:00 |
lvxinran
|
741a182c9a
|
表格修改
|
2019-08-03 17:14:19 +08:00 |
lvxinran
|
00a2089e6f
|
vip权限修改
|
2019-08-03 17:05:41 +08:00 |
lvxinran
|
a055b20adf
|
提交
|
2019-08-03 17:05:14 +08:00 |
lvxinran
|
13c0173345
|
配置提交
|
2019-08-03 16:52:16 +08:00 |
wangyuan
|
4c12b893da
|
mission
|
2019-07-23 18:00:46 +08:00 |
wangyuan
|
36acef4ac1
|
conf
|
2019-07-25 05:45:58 +08:00 |
wangyuan
|
885bdebaff
|
match & drop hero per
|
2019-07-16 18:31:32 +08:00 |
lvxinran
|
b0aceefb4a
|
外网表格更新
|
2019-07-12 18:55:09 +08:00 |
lvxinran
|
ed6afd9539
|
表格数据提交
|
2019-07-11 14:54:58 +08:00 |
wangyuan
|
2d11d1485e
|
red point
|
2019-07-10 19:48:45 +08:00 |
lvxinran
|
88eb2cb440
|
试炼商店修改
|
2019-07-09 17:56:58 +08:00 |
wangyuan
|
1b49020695
|
hotfix lua
|
2019-07-08 18:10:40 +08:00 |
wangyuan
|
4cd3f99c1c
|
red indition & recharge
|
2019-07-08 12:51:54 +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
|
1ca1559554
|
conf
|
2019-07-20 16:16:20 +08:00 |
lvxinran
|
2416934b0f
|
conf
|
2019-07-05 02:14:18 +08:00 |
lvxinran
|
4877b24cc8
|
conf
|
2019-07-05 01:12:53 +08:00 |
lvxinran
|
088cb89b6b
|
外网表提交
|
2019-07-04 23:21:36 +08:00 |
lvxinran
|
22093fa81e
|
配置表更新
|
2019-07-04 21:04:33 +08:00 |
wangyuan
|
c86594a8ce
|
delete log
|
2019-07-04 17:23:17 +08:00 |
wangyuan
|
0c11ff2e4d
|
conf & test lua & mission
|
2019-07-04 17:11:08 +08:00 |
lvxinran
|
d45ace5d7f
|
conf
|
2019-07-04 11:47:38 +08:00 |
lvxinran
|
49eb4570fb
|
conf
|
2019-07-03 21:50:06 +08:00 |
wangyuan
|
1f538c8faa
|
conf & map & ktbean
|
2019-07-03 20:57:47 +08:00 |
wangyuan
|
49c738a616
|
conf file
|
2019-07-03 14:11:15 +08:00 |
wangyuan
|
2252704adf
|
conf
|
2019-07-03 10:31:08 +08:00 |
wangyuan
|
8ca885264d
|
conf
|
2019-07-03 09:53:09 +08:00 |
lvxinran
|
8b5daa805d
|
时间修改
|
2019-07-02 21:10:42 +08:00 |
wangyuan
|
b449d4166e
|
fix daily mission
|
2019-07-12 15:14:11 +08:00 |
wangyuan
|
68af966f42
|
conf
|
2019-07-11 09:57:03 +08:00 |
wangyuan
|
608d7dbb9f
|
delete log
|
2019-07-06 18:05:02 +08:00 |
wangyuan
|
c0e6246a04
|
battlemain
|
2019-07-06 15:08:04 +08:00 |
wangyuan
|
6c69715840
|
conf
|
2019-07-02 13:41:30 +08:00 |
wangyuan
|
6e71bccd2a
|
conf
|
2019-07-02 13:01:43 +08:00 |
lvxinran
|
de2b8cf853
|
试炼副本相关提交
|
2019-06-29 16:29:28 +08:00 |
lvxinran
|
4dd64f4237
|
试炼爬塔副本相关提交
|
2019-06-29 10:11:52 +08:00 |
wangyuan
|
eaa72f5efa
|
conf
|
2019-06-28 17:58:42 +08:00 |
wangyuan
|
f979eb10a2
|
任务
|
2019-06-30 19:24:45 +08:00 |
wangyuan
|
cdda69bad3
|
conf
|
2019-06-24 19:48:53 +08:00 |
wangyuan
|
0e8da41f9c
|
任务合并
|
2019-06-21 18:01:22 +08:00 |
wangyuan
|
9c30a38abe
|
conf
|
2019-06-21 14:27:08 +08:00 |
wangyuan
|
fb1dc92445
|
conf
|
2019-06-21 13:27:51 +08:00 |
wangyuan
|
49c5ac8bc1
|
conf
|
2019-06-21 10:34:12 +08:00 |
wangyuan
|
f1ac732b56
|
conf
|
2019-06-20 21:03:59 +08:00 |
wangyuan
|
9836927645
|
fight
|
2019-06-20 15:47:36 +08:00 |
wangyuan
|
7b38c5206c
|
科技树重置
|
2019-06-19 17:27:55 +08:00 |
wangyuan
|
72bbe0d046
|
跑马灯 & 工坊科技树
|
2019-06-19 14:48:51 +08:00 |
gaojie
|
359c250098
|
跑马灯
|
2019-06-18 20:06:37 +08:00 |
wangyuan
|
d4f86e3d0a
|
五点刷新
|
2019-06-15 17:02:34 +08:00 |
wangyuan
|
10f745f37f
|
修复重启服务器自动清档
|
2019-06-13 14:27:55 +08:00 |
wangyuan
|
3eacdc5e9f
|
uid string -> int & 增加天赋异妖
|
2019-06-12 20:59:00 +08:00 |
wangyuan
|
a5d006e619
|
indication回复
|
2019-06-11 20:56:31 +08:00 |
wangyuan
|
5a4308ddb2
|
data
|
2019-06-11 14:17:46 +08:00 |
wangyuan
|
acdf29d390
|
data
|
2019-06-06 15:33:27 +08:00 |
wangyuan
|
62bb1ebb3c
|
data
|
2019-06-06 14:25:51 +08:00 |
wangyuan
|
0b4ff12894
|
竞技场
|
2019-06-05 16:29:48 +08:00 |
wangyuan
|
c16ce68134
|
data
|
2019-06-05 13:38:33 +08:00 |
wangyuan
|
36461a5521
|
fix equip
|
2019-06-05 11:19:56 +08:00 |
wangyuan
|
e354951bf7
|
充值活动
|
2019-06-04 10:12:11 +08:00 |
wangyuan
|
90de216e64
|
关卡数据
|
2019-06-03 17:26:20 +08:00 |
wangyuan
|
d9e33c228a
|
data
|
2019-06-02 16:19:12 +08:00 |
wangyuan
|
5afccd1843
|
data
|
2019-06-02 15:25:21 +08:00 |
wangyuan
|
53aa7109e4
|
cost
|
2019-05-31 12:30:07 +08:00 |
wangyuan
|
55ba2bde19
|
data
|
2019-05-30 17:54:16 +08:00 |
wangyuan
|
ae910bd0a9
|
mission reward
|
2019-05-30 10:42:44 +08:00 |
wangyuan
|
84bcbd902c
|
fix 血量
|
2019-05-30 10:21:32 +08:00 |
wangyuan
|
fed01f8cf5
|
data
|
2019-05-29 19:11:18 +08:00 |
wangyuan
|
0c21ef4ad6
|
data
|
2019-05-29 14:36:50 +08:00 |
wangyuan
|
48251b75a8
|
data
|
2019-05-28 13:48:06 +08:00 |
wangyuan
|
672121e598
|
任务初版
|
2019-05-27 15:30:56 +08:00 |
gaojie
|
86858a8c25
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-05-20 14:07:39 +08:00 |
gaojie
|
ea594dfaa7
|
商店购买
|
2019-05-20 14:07:35 +08:00 |
wangyuan
|
a1c4640fcf
|
异妖
|
2019-05-18 13:07:25 +08:00 |
wangyuan
|
a9de0f5425
|
挂机初版
|
2019-05-16 14:51:05 +08:00 |
wangyuan
|
f6a633724a
|
conf
|
2019-05-14 18:20:59 +08:00 |
wangyuan
|
b25d7067ba
|
time control
|
2019-05-14 16:41:21 +08:00 |
wangyuan
|
6b34c37eaa
|
时间控制功能
|
2019-05-14 14:28:47 +08:00 |
wangyuan
|
69d2ba019d
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-05-13 15:33:29 +08:00 |
wangyuan
|
1ebb90b31b
|
竞技场
|
2019-05-13 15:28:03 +08:00 |
gaojie
|
04de59ded6
|
商店刷新
|
2019-05-13 15:01:38 +08:00 |
gaojie
|
93beaecf89
|
获取商店信息
|
2019-05-11 17:23:31 +08:00 |
wangyuan
|
4eb0121eef
|
竞技场初版
|
2019-05-10 17:44:44 +08:00 |
wangyuan
|
7aa786221b
|
fight
|
2019-05-09 17:49:23 +08:00 |
wangyuan
|
936406315c
|
数据提交
|
2019-04-30 11:55:51 +08:00 |
gaojie
|
62ab9068a5
|
装备背包达上限 邮件发送
|
2019-04-30 11:41:19 +08:00 |
gaojie
|
a00a5f4597
|
一次合成碎片上限处理
|
2019-04-29 20:45:41 +08:00 |
gaojie
|
37bb6046df
|
fix
|
2019-04-29 20:31:12 +08:00 |
gaojie
|
0bae114cc9
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# conf/server/ItemConfig.txt
|
2019-04-29 20:23:43 +08:00 |
gaojie
|
22b68a1bf2
|
道具上限
|
2019-04-29 20:21:30 +08:00 |
jiahuiwen
|
2d5fe1aa50
|
配置表
|
2019-04-29 18:39:47 +08:00 |
jiahuiwen
|
6e8b4b0b5d
|
配置表提交
|
2019-04-29 16:17:36 +08:00 |
wangyuan
|
a699b4e4dd
|
挂机
|
2019-04-25 17:04:36 +08:00 |
gaojie
|
aa89c05d4f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# conf/server/OptionConfig.txt
# conf/server/RewardGroup.txt
|
2019-04-25 14:55:58 +08:00 |
gaojie
|
b09ba9646e
|
随机名字
|
2019-04-25 14:55:06 +08:00 |
jiahuiwen
|
aa3c588b87
|
配置表提交
|
2019-04-25 10:16:33 +08:00 |
wangyuan
|
185467d2fa
|
提交数据
|
2019-04-25 14:38:00 +08:00 |
gaojie
|
a4815854e0
|
静态表数据
|
2019-04-24 13:45:46 +08:00 |
gaojie
|
2ad5e17afb
|
道具分解
|
2019-04-24 10:44:08 +08:00 |
wangyuan
|
88595a257a
|
table
|
2019-04-23 18:30:39 +08:00 |
jiahuiwen
|
ef2b6dc136
|
配置表提交
|
2019-04-23 09:47:24 +08:00 |
gaojie
|
fbc7c719e2
|
英雄合成
|
2019-04-22 17:39:06 +08:00 |
jiahuiwen
|
6fef8b2297
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
|
2019-04-19 19:18:19 +08:00 |
jiahuiwen
|
a8cbb93ccb
|
快速战斗
|
2019-04-19 19:17:23 +08:00 |
gaojie
|
46ff11b41d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-19 18:21:22 +08:00 |
gaojie
|
9e00bc05f9
|
物品分解
|
2019-04-19 18:21:18 +08:00 |
jiahuiwen
|
ea8fde820e
|
配置表提交
|
2019-04-19 15:21:59 +08:00 |
gaojie
|
986c064908
|
首通奖励
|
2019-04-19 10:32:27 +08:00 |
mashiyu
|
a69680944a
|
提交
|
2019-04-18 09:56:18 +08:00 |
jiahuiwen
|
d4de27130e
|
配置表提交
|
2019-04-17 20:37:31 +08:00 |
jiahuiwen
|
29024fae3e
|
配置表提交
|
2019-04-17 19:06:44 +08:00 |
wangyuan
|
36f85848af
|
探索度
|
2019-04-17 15:02:23 +08:00 |
gaojie
|
fc76607c69
|
恢复体力
|
2019-04-16 17:34:32 +08:00 |
wangyuan
|
226a50f33d
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-04-16 10:26:17 +08:00 |
wangyuan
|
ae9a7bc1ee
|
挂机
|
2019-04-16 10:25:45 +08:00 |
jiahuiwen
|
8e39b783f1
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# conf/server/RewardGroup.txt
# conf/server/RewardItemConfig.txt
|
2019-04-15 20:36:06 +08:00 |
jiahuiwen
|
9a7f180663
|
配置表提交
|
2019-04-15 20:35:40 +08:00 |
gaojie
|
4a35cfa272
|
体力
|
2019-04-15 20:35:15 +08:00 |
gaojie
|
7a0690f520
|
扫荡
|
2019-04-15 16:07:48 +08:00 |
jiahuiwen
|
e65f633023
|
探索修改
|
2019-04-12 20:57:15 +08:00 |
jiahuiwen
|
4ba216f2e3
|
探索修改
|
2019-04-12 19:42:32 +08:00 |