Commit Graph

97 Commits (cbc544463436ddc0a5d3d41cfd3ceb96f535d538)

Author SHA1 Message Date
duhui 8c808d2aea 多队塔 2023-03-21 11:34:17 +08:00
xuexinpeng 293e9869b4 探索事件 2022-03-21 16:33:26 +08:00
xuexinpeng 9d893b37ad 战斗同步 2021-12-07 18:37:27 +08:00
duhui 34333c9a33 跨服数据更到最新 2021-11-03 17:35:01 +08:00
lvxinran c126a79604 合并分支 2021-06-11 14:29:54 +08:00
duhui d4dc257d0e 注释 2021-05-28 10:14:21 +08:00
lvxinran 7978510f02 分支合并 2021-05-25 11:56:06 +08:00
xuexinpeng c3034285d4 Merge branch 'master_test_mcz_hardstage' into master_test_gn 2021-05-24 11:10:47 +08:00
lvxinran aa5f611a15 NettyClient 2021-05-23 18:07:36 +08:00
lvxinran 24e773aad9 无尽修改初版 2021-05-23 18:06:21 +08:00
duhui e494248bd3 打表工具优化 2021-05-13 11:47:17 +08:00
lvxinran 39ac72688b 打表工具支持long类型 2021-05-12 09:55:54 +08:00
mengchengzhen f0db839fab Merge branch 'master_test_gn_mcz' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java
2021-04-26 19:04:40 +08:00
mengchengzhen 972806ba8f 新礼包 2021-04-26 13:45:30 +08:00
lvxinran 11bb0ec986 报错修改 2021-04-22 10:00:24 +08:00
lvxinran 47efe87f3a Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-04-21 14:17:04 +08:00
lvxinran 8d985faf56 暂时提交 2021-04-21 14:16:59 +08:00
duhui 4954417643 通用祭品 2021-04-16 10:31:51 +08:00
duhui 29bf5b17be 代码修复 2021-03-18 16:16:45 +08:00
whb e0daeb180d 大闹天宫招募2 2021-03-05 11:29:10 +08:00
zhangshanxue bfb89434cd 跨服服务器 2020-12-03 21:02:17 +08:00
zhangshanxue 360a8c51e0 跨服服务器 2020-11-19 17:24:22 +08:00
lvxinran 42c7e31723 灵兽 结构修改,部分接口修改 2020-10-19 16:36:17 +08:00
lvxinran 663b3c9723 逍遥游逻辑 2020-10-16 14:19:16 +08:00
lvxinran 2d788828d5 0消耗判断 2020-09-07 17:31:46 +08:00
jiahuiwen c3aa0b815f 替换 System.out.println 2020-09-02 16:27:26 +08:00
jiahuiwen c3be084f49 优化代码 2020-09-01 14:45:47 +08:00
lvxinran 407a161831 试炼副本提交 2020-06-01 21:03:48 +08:00
zhangshanxue 238e940beb Task【新战斗版本】公会援助 2020-05-16 10:32:50 +08:00
zhangshanxue f75b7ad1cc Task【ID1006177】【新战斗版本】宝物合成 2020-05-11 11:37:55 +08:00
zhangshanxue c4e448cb1b 打表索引检查 2020-05-09 07:06:01 +08:00
wangyuan a0d031e7d8 车轮 2020-05-07 16:31:28 +08:00
zhangshanxue 4769cadda1 Task 【ID1005460】 【玩法需求】猎妖之路 2020-02-09 19:48:55 +08:00
wangyuan cb1954d8a2 vip权限 2020-01-08 17:58:36 +08:00
wangyuan d79d7bf28c log 2019-12-31 00:05:16 +08:00
lvxinran caa48c2cd0 公会大区修改,生成消耗原因方法提交 2019-11-05 15:15:26 +08:00
wangyuan fab234e810 battle & fix export excel 2019-10-29 13:51:59 +08:00
zhangshanxue 36e7bca253 血战配置 2019-10-12 15:30:13 +08:00
wangyuan 9067ca3e07 new fight & workshoplevel & herolevel 2019-09-26 10:06:55 +08:00
wangyuan d00793e1d8 fix gm 2019-09-20 11:12:16 +08:00
wangyuan ed379a2524 flushtime 2019-09-11 11:52:31 +08:00
wangyuan 1b09b921f9 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-09-06 11:04:28 +08:00
wangyuan 1f538c8faa conf & map & ktbean 2019-07-03 20:57:47 +08:00
gaojie b4cdcb2c10 刷新好友状态 2019-06-14 10:07:29 +08:00
gaojie da4b5a36d3 好友接口测试 2019-06-11 17:26:05 +08:00
gaojie 87c2649232 好友 2019-06-06 17:24:48 +08:00
gaojie 9b10c7705b 聊天 2019-06-05 14:37:03 +08:00
wangyuan a1c4640fcf 异妖 2019-05-18 13:07:25 +08:00
wangyuan 85cceace2b 挂机 2019-05-16 19:24:32 +08:00
gaojie 56e3a60a38 fix 2019-05-11 11:44:50 +08:00