Commit Graph

596 Commits (eca27060c5c531cb72d297bdafd1bc3686423618)

Author SHA1 Message Date
yuanshuai eca27060c5 playerskill 添加字段 2022-03-21 17:14:08 +08:00
xuexinpeng 293e9869b4 探索事件 2022-03-21 16:33:26 +08:00
xuexinpeng 738ef9c1e2 探索事件 2022-03-18 11:50:59 +08:00
duhui f7848be28d 东海寻仙活动:初版未测试 2022-03-16 14:35:28 +08:00
xuexinpeng 4ce354caa5 战力冲刺排行榜调整 2022-02-25 11:52:23 +08:00
duhui 1210a30798 【补充】升星操作增加鸿蒙阵等级限制 2022-02-17 14:43:08 +08:00
duhui 0b1295cb61 【优化】升星操作增加鸿蒙阵等级限制 2022-02-17 14:14:19 +08:00
jiahuiwen 802a85021e 神将可控制进入版本时间优化 2022-02-15 11:34:25 +08:00
jiahuiwen 6053cf9db9 神将可控制进入版本时间 2022-02-10 11:28:33 +08:00
duhui 121bd7924f 超值基金活动修改 2022-01-24 17:10:11 +08:00
yuanshuai 19ab726801 Merge branch 'master_test_gn' into master_test_gn_feisheng 2022-01-19 16:31:10 +08:00
yuanshuai 925b06352f Merge branch 'master_test_gn' into master_test_gn_feisheng
# Conflicts:
#	tablemanager/src/main/java/config/SSpecialConfig.java
2022-01-22 11:14:33 +08:00
duhui 3e3e5ee1bf 牛气冲天任务优化 2022-01-18 10:06:09 +08:00
jiahuiwen fc6bf6f613 家园任务bug 2022-01-17 18:58:56 +08:00
duhui 718ca61a46 Merge branch '开发/dev_dh' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	tablemanager/src/main/java/config/SHomeLand.java
#	tablemanager/src/main/java/config/SHomeLandLevel.java
#	tablemanager/src/main/java/config/SSpecialConfig.java
2022-01-06 16:15:00 +08:00
xuexinpeng 5031f7d9e8 Merge branch 'master_test_gn' into master_test_gn_xxp 2022-01-06 16:08:27 +08:00
duhui 8946f22d57 【法宝聚灵&跨服rpc】
1、聚灵表添加新列
2、rpc方法添加catch,简化log
2022-01-06 14:59:08 +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
duhui 9e433e1969 【家园功能1.1.5】
1、家园特权功能添加
2021-12-30 16:09:24 +08:00
yuanshuai bf8386326b 飞升技能相关修改 2021-12-29 18:23:17 +08:00
xuexinpeng 4ea6f544cb 探索 2021-12-29 17:26:42 +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 3c5f29e2e5 探索 测试 不扣消耗 2021-12-28 14:33:23 +08:00
duhui bee333690e 【家园功能1.0.4】无用代码删除,不影响原有逻辑 2021-12-27 14:57:24 +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 6f3c8768bf 【家园功能1.0】待联调 2021-12-24 17:07:57 +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 9253e775f0 探索 2021-12-21 16:46:24 +08:00
jiahuiwen a97bca5c9b 升星配方调整补偿 2021-12-21 09:55:12 +08:00
yuanshuai 8c7c2c00cc 漏提交 2021-12-16 16:26:09 +08:00
jiahuiwen 6f38da5b27 回退修复 2021-12-15 18:42:12 +08:00
jiahuiwen 81f4241511 神将回退漏提 2021-12-14 17:59:06 +08:00
yuanshuai b865fac770 新增经验和金币收益道具脚本提交 2021-12-14 17:37:27 +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 8a77b7c2d5 添加关卡附加条件功能提交 2021-12-10 18:43:49 +08:00
duhui 143c7a5230 招募秘宝 2021-12-10 14:24:47 +08:00
jiahuiwen 50118efe42 优化打印 2021-12-09 15:34:45 +08:00
yuanshuai 204eb5f959 命格脚本提交 2021-12-08 16:50:41 +08:00
duhui 92a1305eaf 大闹天宫优化 2021-12-06 15:35:18 +08:00
duhui 2717cdefec 连续礼包优化 2021-12-02 15:16:02 +08:00
yuanshuai d97164a2db 天地洪炉选择up添加限制 2021-12-05 15:05:28 +08:00
jiahuiwen 81e10b1e8c 消除报错 2021-11-29 14:00:40 +08:00
jiahuiwen cff11e010c 剧情关不需要战斗 2021-11-27 17:35:07 +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
jiahuiwen 294bae6c89 修仙修改 2021-11-24 11:30:48 +08:00