Commit Graph

6356 Commits (357a95568933bc217fa94960e924e2ea5f636170)

Author SHA1 Message Date
duhui 8946f22d57 【法宝聚灵&跨服rpc】
1、聚灵表添加新列
2、rpc方法添加catch,简化log
2022-01-06 14:59:08 +08:00
duhui c82267c4ea 【法宝聚灵】
1、添加总星级属性
2022-01-06 13:45:37 +08:00
duhui 91c2a4bf0c Merge branch 'master_test_gn' into 开发/dev_dh 2022-01-06 11:20:07 +08:00
duhui 06bdbf2a78 法宝聚灵优化,添加总星级属性加成 2022-01-06 11:12:26 +08:00
xuexinpeng a1fbed11b2 单笔充值领奖活动 2022-01-05 18:34:53 +08:00
duhui 0689f52cbe 【家园功能1.1.16】
1、建筑升级,解决特权加速时间bug2
2022-01-05 16:07:50 +08:00
duhui ff205bd900 【家园功能1.1.15】
1、建筑升级,解决特权加速时间bug
2022-01-05 15:46:22 +08:00
duhui a0de4fd484 【家园功能1.1.14】
1、处理装备强化逻辑bug2
2022-01-05 15:03:28 +08:00
duhui 1e11b909fc 【家园功能1.1.13】
1、处理装备强化逻辑bug
2022-01-05 14:28:35 +08:00
duhui e912f389ca 【家园功能1.1.12】
1、代码优化,防止空指针
2022-01-05 13:38:55 +08:00
duhui fb9f074c17 Merge branch 'master_test_gn' into 开发/dev_dh 2022-01-05 10:18:43 +08:00
duhui 215cc76897 【家园功能1.1.11】
1、装备升级优化
2022-01-05 10:15:17 +08:00
duhui 2707c018f0 【家园功能1.1.10】
1、zhuang bei sheng ji
2022-01-04 18:34:57 +08:00
duhui bd9c2e002a 【家园功能1.1.9】
1、特权收益加成修改
2022-01-04 15:55:50 +08:00
jiahuiwen 567a46b4ad Merge branch 'master_prb_gn' into master_test_gn 2022-01-04 14:33:01 +08:00
jiahuiwen 5e51e9c8dc 删除多余代码 2022-01-04 14:27:28 +08:00
duhui 6870645ea4 代码格式处理,不影响逻辑 2022-01-04 11:50:35 +08:00
duhui a6595b054e Merge branch 'master_test_gn_zf' of http://60.1.1.230/backend/jieling_server into master_test_gn_zf 2022-01-04 11:45:13 +08:00
duhui e9b526e61b 大闹天宫机器人,星级问题处理 2022-01-04 11:44:43 +08:00
jiahuiwen e4e4715543 竞技试炼发奖励bug 2022-01-04 11:44:43 +08:00
DESKTOP-98AVA47\Administrator 29dc23ed4e 跨服战斗,身外化身技能 2022-01-04 11:44:42 +08:00
jiahuiwen 6074368c60 删除多余代码 2022-01-04 11:44:42 +08:00
jiahuiwen 925b9688c0 神将回退突破等级归 0 2022-01-04 11:44:41 +08:00
jiahuiwen 71ecc1510a 超值返利删除容错代码 2022-01-04 11:44:40 +08:00
jiahuiwen 454388b731 神将回退卸下魂印bug 2022-01-04 11:44:40 +08:00
jiahuiwen 70ce7e3446 神将回退bug 2022-01-04 11:44:39 +08:00
jiahuiwen 812f8ac7d1 神将回退bug 2022-01-04 11:44:39 +08:00
jiahuiwen 7642a5b5fb 神将回退增加上报 2022-01-04 11:44:38 +08:00
jiahuiwen 8d014c2269 减少玩家数据在内存时间 2022-01-04 11:44:38 +08:00
jiahuiwen 9284eb0e48 删除无用代码 2022-01-04 11:44:37 +08:00
yuanshuai 352a586ae2 超值返利网页支付重复购买礼包问题修改 2022-01-04 11:44:36 +08:00
yuanshuai b870b9afa2 命石快速合成bug修改 2022-01-04 11:44:36 +08:00
jiahuiwen 61b3a6113e 逐胜商店刷新错误 2022-01-04 11:44:35 +08:00
yuanshuai c8f9014741 命石一键合成bug修改 2022-01-04 11:44:34 +08:00
yuanshuai b8de92f98c 添加批量删除道具GM 2022-01-04 11:44:12 +08:00
yuanshuai 93555c633d 命石快速合成脚本修改提交 2022-01-04 11:43:23 +08:00
yuanshuai 0414793568 命石快速合成脚本优化 2022-01-04 11:43:23 +08:00
yuanshuai d17c6cdec9 命格脚本修改 2022-01-04 11:43:22 +08:00
yuanshuai 2028b3cfe2 命格脚本优化 2022-01-04 11:43:22 +08:00
yuanshuai f06acc6801 命格脚本优化 2022-01-04 11:43:21 +08:00
yuanshuai 946d97a7d4 脚本优化 2022-01-04 11:43:20 +08:00
yuanshuai 4a2f7fc95e 整理代码 2022-01-04 11:43:16 +08:00
yuanshuai a66ff0d2ba 添加命格计算战斗力逻辑 2022-01-04 11:43:16 +08:00
yuanshuai 487722d6ac 命格脚本提交 2022-01-04 11:43:05 +08:00
yuanshuai a58adbbb18 超值返利网页支付bug修改 2022-01-04 11:41:54 +08:00
jiahuiwen 7c21b147a0 返还道具bug 2022-01-04 11:41:54 +08:00
xuexinpeng ebae30feef 战斗星级 2022-01-04 11:41:54 +08:00
jiahuiwen 64f4f644de int NEW_WELFARE = 42;//萌新福利 这个活动未开启需要记录进度 2022-01-04 11:41:54 +08:00
DESKTOP-98AVA47\Administrator 30111415c0 补充 2022-01-04 11:41:54 +08:00
jiahuiwen eb504fd20c 2021-12-22 09:00:00 之后开的服,首充不显示累充满100元任务 2022-01-04 11:41:54 +08:00
DESKTOP-98AVA47\Administrator 17242edf01 获取活动开启时间 2022-01-04 11:41:53 +08:00
jiahuiwen 6e3b1b5be9 升星配方调整补偿 2022-01-04 11:41:53 +08:00
duhui 5312fc728c 大闹天宫机器人,星级问题处理 2022-01-04 11:40:52 +08:00
jiahuiwen 458b8a8165 Merge branch 'master_test_gn_zf' into master_test_gn 2022-01-04 11:05:02 +08:00
jiahuiwen affe194539 竞技试炼发奖励bug 2022-01-04 11:02:41 +08:00
xuexinpeng f6ac2a88bd 探索时间戳进位 2021-12-31 17:33:31 +08:00
xuexinpeng 3b14b27161 探索 2021-12-31 14:03:07 +08:00
xuexinpeng 64df199aee 探索 2021-12-31 13:49:24 +08:00
duhui a56918a674 【家园功能1.1.8】
1、装备强化增加战力修改
2021-12-31 13:39:41 +08:00
jiahuiwen 50d5195692 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-31 10:49:12 +08:00
jiahuiwen ffb0488e50 赠送好友友情点bug 2021-12-31 10:49:04 +08:00
xuexinpeng 82dde4cdb8 森罗幻境自动挂机奖励展示 2021-12-31 10:36:32 +08:00
duhui b1c4e0ba35 【家园功能1.1.7】
1、装备方法bug修改
2021-12-31 10:22:49 +08:00
duhui 3dab8bf18c 【家园功能1.1.6】
1、家园装备强化展示
2021-12-30 18:34:43 +08:00
xuexinpeng 188ea389e6 森罗幻境自动挂机奖励展示 2021-12-30 18:19:24 +08:00
yuanshuai c3553579e2 新增被动技能注释 2021-12-30 17:40:47 +08:00
duhui 6cbd8104e7 云游商人,装备升级逻辑修改 2021-12-30 17:09:45 +08:00
yuanshuai 8ac39917af 牛魔王4火不生效bug修改(添加了一个被动技能) 2021-12-30 16:23:13 +08:00
duhui 9e433e1969 【家园功能1.1.5】
1、家园特权功能添加
2021-12-30 16:09:24 +08:00
duhui a61999d664 【家园功能1.1.4(特殊)】
1、删除栖云阁一键领取代码,之后有需要可以从本次提交找回
2021-12-30 15:21:27 +08:00
duhui 6b139b482e 【家园功能1.1.3】
1、装备强化验证bug修改
2021-12-30 13:51:29 +08:00
xuexinpeng 16fc0ffbbb 离线探索 2021-12-30 13:34:34 +08:00
xuexinpeng bb1bea214f 探索 2021-12-30 10:26:22 +08:00
xuexinpeng f4f027c40c 探索 2021-12-29 18:24:24 +08:00
duhui 7c19af673d 【家园功能1.1.2】
1、装备强化表数据修改
2021-12-29 18:20:43 +08:00
xuexinpeng 35c2547c89 探索 2021-12-29 17:44:51 +08:00
xuexinpeng b816997e38 探索 2021-12-29 19:16:02 +08:00
xuexinpeng dae028d07f 探索 2021-12-29 19:05:13 +08:00
xuexinpeng 28e984d9e9 探索 2021-12-29 19:01:26 +08:00
xuexinpeng 4ea6f544cb 探索 2021-12-29 17:26:42 +08:00
duhui dc71d70ad2 【家园功能1.1.1】
1、建筑解锁修改
2021-12-29 17:08:18 +08:00
yuanshuai e8fd75b925 Merge branch 'master_test_gn' into master_test_gn_feisheng 2021-12-29 15:17:19 +08:00
duhui 07dfc01d30 【家园功能1.1.0】
1、任务功能完善
2、添加装备突破功能
3、装备强化信息添加到英雄信息
4、跨服添加家园装备强化信息
2021-12-29 15:12:02 +08:00
yuanshuai 455cccd059 飞升跑马灯脚本提交 2021-12-29 14:55:38 +08:00
xuexinpeng 5e811fb9aa 探索血量更新 2021-12-28 18:25:41 +08:00
xuexinpeng eab1eb0b89 探索 2021-12-28 18:02:46 +08:00
duhui e5fc1ea28c 【家园功能1.0.9】建筑升级只允许一次升级一个建筑,装备强化bug优化 2021-12-28 17:39:20 +08:00
xuexinpeng 705e81c629 探索 2021-12-28 16:32:49 +08:00
jiahuiwen 973c2b9ce8 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-28 15:24:45 +08:00
jiahuiwen bf85dfec3c 超值返利删除容错代码 2021-12-28 15:24:37 +08:00
DESKTOP-98AVA47\Administrator 97bd55af89 跨服战斗,身外化身技能 2021-12-28 15:21:14 +08:00
yuanshuai 9b31eeadc9 飞升脚本修改提交 2021-12-28 15:07:39 +08:00
duhui ee97a40004 【家园功能1.0.8】建筑解锁推送修改,只推送解锁的建筑 2021-12-28 14:59:59 +08:00
xuexinpeng 3c5f29e2e5 探索 测试 不扣消耗 2021-12-28 14:33:23 +08:00
ZhangBiao 304d1da7ef [家园功能1.0.7]建筑解锁Indication修改 2021-12-28 11:52:54 +08:00
ZhangBiao c7a22e0787 [家园功能1.0.6]建筑收益bug修改 2021-12-28 11:12:31 +08:00
xuexinpeng 6b07593757 探索 2021-12-27 18:36:31 +08:00
jiahuiwen 71eb51d017 Merge branch 'master_test_gn_zf' into master_test_gn 2021-12-27 17:18:57 +08:00
jiahuiwen 89f4eae73e 删除多余代码 2021-12-27 17:18:31 +08:00
jiahuiwen 313053ed5d 神将回退突破等级归 0 2021-12-27 17:17:56 +08:00
jiahuiwen 811d67c536 Merge branch 'master_test_gn_zf' into master_test_gn 2021-12-27 17:00:18 +08:00
duhui 937c740ebd 【家园功能1.0.5】建筑升级前置条件判断,添加长度验证 2021-12-27 16:56:32 +08:00
jiahuiwen 7ebd8878de 神将回退卸下魂印bug 2021-12-27 16:55:11 +08:00
xuexinpeng 87bcc6d5d7 探索 2021-12-27 16:33:32 +08:00
yuanshuai 6faac1d034 超值返利网页支付bug修改 2021-12-27 16:24:46 +08:00
jiahuiwen ac30e70c2e 神将回退bug 2021-12-27 16:11:51 +08:00
jiahuiwen 5f04e68e3d 神将回退bug 2021-12-27 16:09:56 +08:00
jiahuiwen 9c998b86e6 Merge branch 'master_test_gn_zf' into master_test_gn 2021-12-27 16:01:30 +08:00
jiahuiwen 4ee0f7b5f2 神将回退bug 2021-12-27 15:57:09 +08:00
duhui bee333690e 【家园功能1.0.4】无用代码删除,不影响原有逻辑 2021-12-27 14:57:24 +08:00
jiahuiwen ecd017281d 神将回退增加上报 2021-12-27 14:25:21 +08:00
duhui fed5fcf59b 【家园功能1.0.4】日志完善内容 2021-12-27 14:01:55 +08:00
duhui ad1cf08eae 【家园功能1.0.3】建筑升级添加前置建筑等级验证,建筑解锁逻辑优化 2021-12-27 13:45:47 +08:00
duhui 4e852db95b 【家园功能1.0.2】生产建筑存储总上限修改,部分建筑生产无总上限,只有领取上限 2021-12-27 11:47:40 +08:00
jiahuiwen b88a69ef3a 减少玩家数据在内存时间 2021-12-27 10:25:35 +08:00
xuexinpeng 8f0010b1be Merge branch 'master_test_gn' into master_test_gn_xxp
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
2021-12-27 10:04:54 +08:00
xuexinpeng 6a6cbaca50 探索 2021-12-27 10:02:59 +08:00
duhui 20b1c958e5 【家园功能1.0.1】任务优化,添加升级取消功能 2021-12-24 18:20:10 +08:00
jiahuiwen c6d13b6685 Merge branch 'master_test_gn' into master_prb_gn 2021-12-24 17:52:59 +08:00
jiahuiwen 4132cd1f80 删除无用代码 2021-12-24 17:52:09 +08:00
duhui 6f3c8768bf 【家园功能1.0】待联调 2021-12-24 17:07:57 +08:00
jiahuiwen 8f47418546 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-24 13:55:10 +08:00
jiahuiwen 0602b9f003 逐胜商店刷新错误 2021-12-24 13:55:03 +08:00
xuexinpeng b9cc3dec5f 探索 2021-12-24 11:29:51 +08:00
yuanshuai 93596965dd 超值返利网页支付重复购买礼包问题修改 2021-12-24 09:49:28 +08:00
yuanshuai 540e61d512 超值返利网页支付bug修改 2021-12-23 16:05:15 +08:00
yuanshuai 5cedfa6e4e 命石快速合成bug修改 2021-12-23 15:14:43 +08:00
yuanshuai 9b545e5eea Merge branch 'master_test_gn' into master_test_gn_lifeGrid
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java
2021-12-23 09:53:52 +08:00
yuanshuai 4de94d16ea 飞升脚本提交 2021-12-23 09:51:48 +08:00
xuexinpeng 503ef57f57 探索 2021-12-22 18:04:05 +08:00
jiahuiwen a9df7aa7e0 返还道具bug 2021-12-22 10:54:44 +08:00
xuexinpeng 49811877fa 战斗星级 2021-12-21 19:07:26 +08:00
xuexinpeng e683d993d5 探索 战斗 2021-12-21 19:04:56 +08:00
jiahuiwen 90e98f6355 int NEW_WELFARE = 42;//萌新福利 这个活动未开启需要记录进度 2021-12-21 17:48:01 +08:00
xuexinpeng 9253e775f0 探索 2021-12-21 16:46:24 +08:00
xuexinpeng db7dbb84c2 探索 2021-12-23 17:19:54 +08:00
jiahuiwen d3b35d55d0 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-21 10:50:52 +08:00
DESKTOP-98AVA47\Administrator 8aba14dbe2 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-23 19:13:48 +08:00
DESKTOP-98AVA47\Administrator 5421882672 补充 2021-12-23 19:13:39 +08:00
DESKTOP-98AVA47\Administrator 9b6f5a8e0c 获取活动开启时间 2021-12-23 19:01:57 +08:00
jiahuiwen bd15f69616 2021-12-22 09:00:00 之后开的服,首充不显示累充满100元任务 2021-12-21 10:50:43 +08:00
jiahuiwen cf91ff167b Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-21 09:55:23 +08:00
jiahuiwen a97bca5c9b 升星配方调整补偿 2021-12-21 09:55:12 +08:00
yuanshuai b473c1a6ca 旧版积天豪礼bug修改 2021-12-20 18:52:08 +08:00
xuexinpeng 048c240cb4 礼包刷新 2021-12-23 17:21:26 +08:00
jiahuiwen fb5036ea29 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-20 11:51:23 +08:00
xuexinpeng a7ff90e6a7 规范代码 2021-12-29 00:03:50 +08:00
jiahuiwen 2596eb08b9 2021-12-22 09:00:00 之后开的服,首充不显示累充满100元任务 2021-12-20 11:51:13 +08:00
xuexinpeng d9e9f378ef Merge branch 'master_test_gn' into master_test_gn_xxp 2021-12-20 11:31:19 +08:00
jiahuiwen 7ea5e79269 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-20 11:12:59 +08:00
yuanshuai 9d7058bec8 新版天天尊降世bug修改 2021-12-23 11:04:02 +08:00
yuanshuai 652caf6b5b 旧版积天豪礼代码兼容 2021-12-31 00:02:41 +08:00
jiahuiwen 58311e37df 心愿抽奖 400 次后不重置剩余保底次数 2021-12-20 11:12:47 +08:00
jiahuiwen fc01267f37 每日豪礼 活动类型 13 不再更新,补发奖励 2021-12-20 10:20:31 +08:00
jiahuiwen 78bf408e42 积天豪礼活动已被替换,未参与的玩家不再累计 2021-12-17 18:31:52 +08:00
jiahuiwen 80f48b3f42 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-17 17:19:57 +08:00
jiahuiwen 7012d6c647 灵兽宝阁特殊使用 2021-12-17 17:19:40 +08:00
yuanshuai f473965b9d Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-17 16:13:59 +08:00
yuanshuai df0059632a 新版积天豪礼活动提交 2021-12-17 16:13:50 +08:00
yuanshuai d814ecb635 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java
2022-01-03 11:48:04 +08:00
yuanshuai b3d5dfc0e6 新积天豪礼活动脚本修改提交 2022-01-03 11:46:33 +08:00
jiahuiwen ebc1106e3c Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-17 15:05:08 +08:00
jiahuiwen 847efbe252 原有罗浮货币登录时转化为逐胜徽章 2021-12-17 15:05:01 +08:00
jiahuiwen 87f073bb89 新人商城活动 2021-12-17 10:52:19 +08:00
xuexinpeng e54a1c6243 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-29 00:22:01 +08:00
xuexinpeng 70d147e593 新特惠 2021-12-29 00:20:38 +08:00
xuexinpeng 652097f613 新每日特惠 2021-12-17 17:58:55 +08:00
xuexinpeng 956c9cc2fe 新特惠礼包 2021-12-23 00:17:13 +08:00
jiahuiwen 2715ea64a3 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-16 18:19:21 +08:00
jiahuiwen 5ef7afe587 功能开启关闭 2021-12-16 18:19:13 +08:00
yuanshuai d96dc3a63d 新版天尊降世代码提交 2021-12-16 16:39:02 +08:00
jiahuiwen d56b0b6a08 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-16 16:30:06 +08:00
jiahuiwen 701d32c31f 回退bug 2021-12-16 16:29:55 +08:00
yuanshuai 83c72f95ba 道具添加使用等级限制 2021-12-16 15:28:08 +08:00
yuanshuai 93993d8150 挂机收益道具逻辑修改 2021-12-16 11:14:48 +08:00
yuanshuai db39942231 使用资源包道具逻辑完善 2021-12-16 10:44:32 +08:00
jiahuiwen 4ae13de871 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-15 18:42:17 +08:00
jiahuiwen 6f38da5b27 回退修复 2021-12-15 18:42:12 +08:00
yuanshuai 1c3a458869 漏提交关卡限制条件脚本 2021-12-15 13:07:39 +08:00
yuanshuai a5762d9aa9 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-15 13:01:53 +08:00
yuanshuai ce4d17763f 新增道具类型 2021-12-15 13:01:44 +08:00
jiahuiwen 3b112b0dff 回退不飘字 2021-12-15 10:57:50 +08:00
jiahuiwen 1f08ca2f33 回退所得神将不更新任务或活动 2021-12-15 09:45:00 +08:00
jiahuiwen edf251cd1f Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-14 17:58:42 +08:00
jiahuiwen 53b29d606e 神将回退 2021-12-14 17:58:31 +08:00
yuanshuai 9a02fbc459 使用资源包道具修改脚本提交 2021-12-14 17:40:30 +08:00
yuanshuai b865fac770 新增经验和金币收益道具脚本提交 2021-12-14 17:37:27 +08:00
yuanshuai 23b2c9285e 命石一键合成bug修改 2021-12-14 16:06:41 +08:00
yuanshuai 2fcf50d33e 添加批量删除道具GM 2021-12-14 14:55:59 +08:00
xuexinpeng 8313116aa3 御剑行活动配置 2021-12-14 13:45:12 +08:00
xuexinpeng 0117de31fc 探索地图 2021-12-14 11:45:17 +08:00
yuanshuai 1ee2a60fc0 命石快速合成脚本修改提交 2021-12-13 18:41:46 +08:00
yuanshuai 9a2bf80a9b 脚本优化 2021-12-13 17:34:19 +08:00
yuanshuai 69607c3c66 命石快速合成脚本优化 2021-12-13 16:23:32 +08:00
jiahuiwen bdc1aa723a Merge branch 'master_test_gn_zf' into master_test_gn 2021-12-13 16:10:24 +08:00
jiahuiwen 9d232a7783 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-13 16:07:02 +08:00
jiahuiwen aa4341c12b 无尽秘宝,英雄升星需要增加数量 2021-12-13 16:06:55 +08:00
yuanshuai ce6b4d239b 关卡限制脚本优化 2021-12-13 14:55:23 +08:00
jiahuiwen 08ca89a90f 开商店 2021-12-13 14:44:08 +08:00
jiahuiwen 586945be2c 删除报错 2021-12-13 14:05:11 +08:00
jiahuiwen 1f952efa98 Merge branch 'master_test_gn_zf' of http://60.1.1.230/backend/jieling_server into master_test_gn_zf 2021-12-13 14:04:18 +08:00
jiahuiwen bbc555db7c 删活动 2021-12-13 14:04:12 +08:00
yuanshuai 312ad1cd58 主线关卡限制条件增加 2021-12-13 12:04:33 +08:00
jiahuiwen ea6ebeb278 Merge branch 'master_test_gn_zf' into master_test_gn 2021-12-13 11:56:42 +08:00
jiahuiwen 8a5b72f0fa 消除编译错误 2021-12-13 11:55:29 +08:00
jiahuiwen 450ab39a7e Merge branch 'master_test_gn_zf' into master_test_gn 2021-12-13 11:38:56 +08:00
jiahuiwen 308f406daa Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-13 11:38:23 +08:00
jiahuiwen 292b395dfe 优化 2021-12-13 11:38:12 +08:00
jiahuiwen a19352578e 登录检测已开启的活动,商店是否开启 2021-12-13 11:30:53 +08:00
yuanshuai 0b34d98e99 Merge branch 'master_test_gn' into master_test_gn_lifeGrid
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
2021-12-13 10:49:37 +08:00
yuanshuai ea545c50ac 主线关卡限制条件增加 2021-12-13 10:12:29 +08:00
yuanshuai 8a77b7c2d5 添加关卡附加条件功能提交 2021-12-10 18:43:49 +08:00
duhui 9a7a6f71f5 公会boss伤害超上限 2021-12-10 18:27:30 +08:00
duhui 8d7394d1ac 公会boss伤害超上限 2021-12-10 16:44:38 +08:00
duhui 1af8836d72 注释修改 2021-12-10 16:24:53 +08:00
duhui 143c7a5230 招募秘宝 2021-12-10 14:24:47 +08:00
yuanshuai 72637c0ec5 命格脚本修改 2021-12-10 14:03:45 +08:00
yuanshuai 09cd66d6ca 命格脚本优化 2021-12-10 11:03:32 +08:00
yuanshuai 9060e00553 命格脚本优化 2021-12-10 09:55:51 +08:00
jiahuiwen 02807f9c49 关闭 云梦祈福 2021-12-09 16:22:35 +08:00
jiahuiwen 50118efe42 优化打印 2021-12-09 15:34:45 +08:00
jiahuiwen 33546f01b2 增加保存 2021-12-09 15:26:51 +08:00
jiahuiwen 3ba82851fd Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-09 14:14:51 +08:00
jiahuiwen afa8040533 竞技试炼 2021-12-09 14:14:39 +08:00
duhui 32a5f49782 连续礼包补充 2021-12-09 11:44:19 +08:00
duhui c555ca977f 连续礼包,礼包id重复问题处理 2021-12-09 11:32:58 +08:00
yuanshuai b8de907745 脚本优化 2021-12-09 10:11:14 +08:00
yuanshuai be54f4627d 整理代码 2021-12-08 17:13:16 +08:00
yuanshuai 1455339b03 添加命格计算战斗力逻辑 2021-12-08 17:03:28 +08:00
yuanshuai 204eb5f959 命格脚本提交 2021-12-08 16:50:41 +08:00
xuexinpeng d69aca969f 删除部分无用log 2021-12-08 13:28:06 +08:00
jiahuiwen e754405dfe Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-08 13:20:02 +08:00
jiahuiwen ad85622fe3 竞技试炼 2021-12-08 13:19:21 +08:00
xuexinpeng ca60360b64 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-07 18:38:06 +08:00
xuexinpeng 9d893b37ad 战斗同步 2021-12-07 18:37:27 +08:00
jiahuiwen e6d3b7a85c Merge branch 'master_prb_gn' into master_test_gn 2021-12-07 17:59:54 +08:00
jiahuiwen 426b23d23f Merge branch 'master_prb_gn' into master_test_gn_zf 2021-12-07 17:58:45 +08:00
xuexinpeng c6fc2fd87a 李海洋-gm降关卡 2021-12-07 17:02:43 +08:00
duhui 0914af5631 活动非空判断 2021-12-07 16:08:00 +08:00
duhui 946ae79b7c 补充 2021-12-07 15:24:37 +08:00
duhui aedf20d453 计算机器人星级 2021-12-07 15:24:03 +08:00
duhui 43e355c242 计算机器人星级 2021-12-07 15:04:02 +08:00
xuexinpeng 595735ff93 超值基金加判空操作 2021-12-07 10:28:41 +08:00
duhui 147a3a2368 计算星级 2021-12-06 18:31:53 +08:00
duhui 2c549257e0 机器人星级修改 2021-12-06 17:38:38 +08:00
duhui 92a1305eaf 大闹天宫优化 2021-12-06 15:35:18 +08:00
duhui 0cf8bb430b 连续礼包优化 2021-12-10 00:29:26 +08:00
duhui 257a5afaf8 Merge branch 'master_test_gn' into 开发/dev_dh 2021-12-03 10:05:46 +08:00
jiahuiwen 8157f05b32 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java
2021-12-03 10:03:01 +08:00
jiahuiwen bde0bb4ed2 重置天宫商店 2021-12-03 10:01:07 +08:00
duhui 910670c66c 连续礼包优化,bug修改提交 2021-12-02 16:44:17 +08:00
duhui f0b55b5ffb 四灵试炼,层数刷新日志 2021-12-02 16:16:23 +08:00
duhui 1dc148d469 Merge branch 'master_test_gn' into 开发/dev_dh
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java
2021-12-02 15:17:41 +08:00
duhui 2717cdefec 连续礼包优化 2021-12-02 15:16:02 +08:00
duhui b418a8e53c 日志管理 2021-12-02 10:20:55 +08:00
jiahuiwen 275426aadc Merge branch 'master_prb_gn' into master_test_gn 2021-12-01 18:49:01 +08:00
jiahuiwen 5c4874ab9e 重置天宫商店 2021-12-01 17:55:46 +08:00
duhui 4e4ed641ca 方寸寻宝活动 2021-12-01 15:25:19 +08:00
duhui c4e252a3ed 礼包活动报错 2021-12-01 07:14:08 +08:00
duhui 345b573ddc 战斗报错 2021-12-01 06:58:13 +08:00
yuanshuai 40ae47feb0 修改异常飘字 2021-11-30 11:25:01 +08:00
duhui d6f16d1f61 变身卡激活消耗道具 2021-11-30 10:09:44 +08:00
yuanshuai d97164a2db 天地洪炉选择up添加限制 2021-12-05 15:05:28 +08:00
duhui c91b204bdc 活动改版,初版 2021-11-29 18:32:14 +08:00
jiahuiwen 1fc0a0a4d3 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-27 17:35:16 +08:00
jiahuiwen cff11e010c 剧情关不需要战斗 2021-11-27 17:35:07 +08:00
duhui f119b88123 连续礼包活动 2021-11-27 16:07:55 +08:00
jiahuiwen f929ea69db Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-27 15:43:34 +08:00
yuanshuai e84a1463c4 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-02 17:35:31 +08:00
DESKTOP-98AVA47\Administrator 9873a26fff 身外化身战斗 2021-12-09 15:19:21 +08:00
DESKTOP-98AVA47\Administrator aab2103698 技能修改 2021-12-09 02:36:39 +08:00
yuanshuai 7709b634fd 天地洪炉活动脚本提交 2021-12-02 17:35:25 +08:00
jiahuiwen 8c359f8e44 每月礼包刷新时间改每天0点 2021-11-27 15:43:26 +08:00
xuexinpeng e944250fb8 Merge branch 'master_prb_gn' into master_test_gn 2021-11-26 13:14:58 +08:00
duhui 0402d633a0 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-26 10:34:34 +08:00
duhui 3c85141eab 多活动 2021-11-26 10:34:22 +08:00
jiahuiwen 287f295530 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-25 19:28:04 +08:00
jiahuiwen c11813b44e 月礼包特殊处理,可每日都刷新购买次数 2021-11-25 19:27:52 +08:00
yuanshuai 609bea38bd 活动类型整理 2021-11-25 17:49:29 +08:00
jiahuiwen af0b9547c5 支持删 RechargeCommodityConfig 2021-11-25 17:41:32 +08:00
yuanshuai 31859110b4 Merge branch 'master_prb_gn' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java
2021-11-25 16:59:54 +08:00
yuanshuai f850101322 灵兽宝阁bug 2021-11-25 16:56:36 +08:00
yuanshuai fad0cadb25 Merge branch 'master_prb_gn' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java
2021-11-25 16:49:34 +08:00
yuanshuai 17e32849ae 灵兽宝阁领取bug修改 2021-11-25 16:39:23 +08:00
xuexinpeng 4c11a6db16 log 2021-11-25 16:34:50 +08:00
duhui 9c45649824 【优化】限时招募,乾坤宝盒,灵兽宝阁整体包装 2021-11-25 16:29:08 +08:00
jiahuiwen 188bf0bf25 Merge branch 'master_prb_gn' into master_test_gn 2021-11-25 16:27:11 +08:00
yuanshuai 4c462a99dc 灵兽抽奖替换bug修改 2021-11-25 16:20:46 +08:00
yuanshuai b8267cba0b 灵兽抽奖替换bug修改 2021-11-25 16:19:59 +08:00
xuexinpeng 80603a4de5 跨服灵脉 2021-11-25 16:06:31 +08:00
xuexinpeng a9cbf7a046 日志 2021-11-25 15:39:09 +08:00
yuanshuai 150742a64d 灵兽宝阁bug修改 2021-11-25 15:23:09 +08:00
yuanshuai fca3f6510c 灵兽宝阁bug修改 2021-11-25 15:21:59 +08:00
xuexinpeng 4bfbad8254 跨服灵脉 2021-11-25 15:15:33 +08:00
xuexinpeng edb39cf2af 跨服灵脉bug 2021-11-25 14:53:18 +08:00
xuexinpeng 4722b7a07c 灵兽bug 2021-11-25 14:24:23 +08:00
jiahuiwen 0074c35de4 公会技能,一次性掉落100亿金币 2021-11-25 14:07:43 +08:00
duhui 1893a900ff Merge branch '开发/dev_dh' into master_test_gn
# Conflicts:
#	globalidserver/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java
#	globalidserver/src/main/java/com/global/thrift/idl/InnerResult.java
#	globalidserver/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java
#	serverlogic/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java
#	serverlogic/src/main/java/com/global/thrift/idl/InnerResult.java
#	serverlogic/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java
#	serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java
#	serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java
#	serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/InvalidOperException.java
#	serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Pokemon.java
#	serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PropertyItem.java
#	serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java
#	serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java
#	serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RechargeResult.java
#	serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Result.java
#	serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java
#	serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java
#	serverlogic/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java
#	serverlogic/src/main/java/com/world/thrift/idl/InnerResult.java
#	serverlogic/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java
#	serverlogic/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java
#	serverlogic/src/main/thrift/idl/core.thrift
#	serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerInvalidOperException.java
#	serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerResult.java
#	serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/RPCgTGRequestIFace.java
#	serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java
#	serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java
#	serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/InvalidOperException.java
#	serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Pokemon.java
#	serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PropertyItem.java
#	serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java
#	serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java
#	serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RechargeResult.java
#	serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Result.java
#	serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java
#	serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerInvalidOperException.java
#	serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerResult.java
#	serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCgTwRequestIFace.java
#	serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCwTgRequestIFace.java
#	tablemanager/src/main/java/config/SLodeRankReward.java
#	tablemanager/src/main/java/config/STrumpBook.java
#	worldserver/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java
#	worldserver/src/main/java/com/world/thrift/idl/InnerResult.java
#	worldserver/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java
#	worldserver/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java
2021-11-26 09:41:35 +08:00
duhui a8a85512a0 灵兽限时抽卡跨周重置 2021-11-25 18:13:17 +08:00
duhui 8260b6fd83 限时招募进度条重置 2021-11-25 17:45:26 +08:00
xuexinpeng 15f2f5d6ed 代码优化 2021-11-25 11:09:12 +08:00
xuexinpeng 3566a3a665 跨服灵脉代码优化 2021-11-25 11:02:27 +08:00
xuexinpeng ce85c5e94f 跨服灵脉 2021-11-25 20:42:11 +08:00
xuexinpeng 7a6e9b1a26 跨服灵脉 2021-11-25 19:25:33 +08:00
xuexinpeng 64b5e819da 跨服灵脉 2021-11-25 19:17:21 +08:00
xuexinpeng 3b091987e9 跨服灵脉秘境 2021-11-25 18:37:14 +08:00
xuexinpeng e4aec66ae1 注释清空数据操作 2021-11-25 17:46:20 +08:00
jiahuiwen a2fc1eda05 Merge branch 'master_prb_gn' into master_test_gn 2021-11-24 13:59:25 +08:00
yuanshuai 858be0cc77 消耗道具数量long int类型转换报错 2021-11-24 13:54:09 +08:00
jiahuiwen a42a12ef79 删除日志 2021-11-24 13:53:48 +08:00
jiahuiwen 294bae6c89 修仙修改 2021-11-24 11:30:48 +08:00
xuexinpeng a4027f9f0f 日志 2021-11-23 18:09:57 +08:00
xuexinpeng 4af6f1bffa 服务器挂掉 停服 期间内的也算收益 2021-11-23 17:37:48 +08:00
xuexinpeng 8a1e4fe26a Merge branch 'master_test_gn' into master_prb_gn 2021-11-23 16:07:15 +08:00
xuexinpeng 7f5d453b4b 跨服灵脉rpc红点 2021-11-23 15:58:54 +08:00
yuanshuai e235a796de 法宝聚灵bug修改 2021-11-23 15:55:27 +08:00
xuexinpeng 80f0a0364b 红点log 2021-11-23 15:05:43 +08:00
xuexinpeng c8da24671b pvp的超回合按伤害算胜负 2021-11-23 14:17:57 +08:00
DESKTOP-98AVA47\Administrator 13101fbdee 公会技能bug修改 2021-12-04 16:10:54 +08:00
yuanshuai f5ab60c286 法宝聚灵bug修改 2021-11-23 10:33:41 +08:00
xuexinpeng 8e65c6b752 跨服灵脉积分优化 2021-11-23 10:29:10 +08:00
xuexinpeng a122652d60 跨服灵妙计分 2021-11-23 10:13:43 +08:00
duhui 056986bede 删除无用注释 2021-11-18 17:48:35 +08:00
duhui afe97f00e7 修改 2021-11-18 11:49:40 +08:00
duhui 5911e2dc8f Merge branch 'master_test_gn_zf' into 开发/dev_dh 2021-11-17 18:20:14 +08:00
duhui 1eff1588bc rpc协议提交 2021-11-17 17:28:19 +08:00
jiahuiwen 7961a40690 宝物分解bug 2021-11-17 17:24:30 +08:00
jiahuiwen daa339ee54 脱装备bug 2021-11-17 17:16:28 +08:00
duhui cbf61cfafc 身外化身提交 2021-11-17 16:47:25 +08:00
yuanshuai 7dd2521295 修行刷新排行榜战斗力脚本添加 2021-11-26 14:14:49 +08:00
jiahuiwen 252208e6fb 合成宝物bug 2021-11-17 13:11:48 +08:00
jiahuiwen 9d90b6b6bf 获取服务器id错误 2021-11-17 10:32:17 +08:00
jiahuiwen ecbed9777d Merge branch 'master_prb_gn' into master_test_gn_zf 2021-11-17 09:37:14 +08:00
jiahuiwen dbfd1588c4 增加null判断 2021-11-17 09:34:39 +08:00
duhui e6bafcd98b Merge branch 'master_test_gn' into master_prb_gn 2021-11-30 15:47:05 +08:00
duhui c5de1c8ce5 Receive类型礼包购买条件类型修改 2021-11-30 15:46:46 +08:00
duhui 849f0d4d52 报错 2021-11-17 08:59:12 +08:00
duhui a52e39292d 魂宝灵宝二改 2021-11-17 08:52:43 +08:00
duhui fbb977b360 魂宝灵宝强转问题 2021-11-17 08:31:25 +08:00
duhui 1e166894d2 跨服旧数据兼容 2021-11-15 10:20:30 +08:00
DESKTOP-98AVA47\Administrator e341f52da6 车迟斗法挑战记录bug修改 2021-11-14 15:21:49 +08:00
xuexinpeng 9d4bfa19a5 跨服灵脉秘境 2021-11-23 19:06:17 +08:00
xuexinpeng d7c548f248 跨服灵脉秘境积分计算 2021-11-23 18:46:46 +08:00
xuexinpeng 0fd3f53795 跨服灵妙秘境 2021-11-22 17:59:49 +08:00
xuexinpeng 9e8a57674c 跨服灵脉秘境 2021-11-22 17:50:17 +08:00
xuexinpeng 1a60f70002 跨服灵脉秘境 2021-11-25 09:22:00 +08:00
jiahuiwen 33d8fd7746 优化日志 2021-11-22 14:40:11 +08:00
jiahuiwen 1c28ff4797 道具数量改long 2021-11-22 14:23:18 +08:00
jiahuiwen ad0654545b 7天未登录玩家,竞技场,不发奖励 2021-11-22 10:17:26 +08:00
duhui 7cda83d0f0 公会技能升级修改,道具数量改long 2021-11-22 09:52:24 +08:00