Commit Graph

565 Commits (06bdbf2a7855a8f52e54d381651faa8f5758bd77)

Author SHA1 Message Date
duhui 06bdbf2a78 法宝聚灵优化,添加总星级属性加成 2022-01-06 11:12:26 +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
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
duhui cbf61cfafc 身外化身提交 2021-11-17 16:47:25 +08:00
xuexinpeng 1a60f70002 跨服灵脉秘境 2021-11-25 09:22:00 +08:00
xuexinpeng 8615af222f Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-18 18:00:22 +08:00
yuanshuai 889720d392 法宝聚灵技能修改 2021-11-19 16:42:33 +08:00
xuexinpeng 1acf753951 跨服灵脉秘境 2021-11-18 18:27:33 +08:00
xuexinpeng e7e12c7228 跨服灵妙秘境 2021-11-17 16:35:43 +08:00
yuanshuai f8aa4e339b 法宝聚灵功能提交 2021-11-17 13:18:27 +08:00
xuexinpeng 0b75d24326 灵脉秘境 2021-11-12 11:54:05 +08:00
xuexinpeng b791353eb9 灵脉秘境 2021-11-12 09:39:03 +08:00
yuanshuai 8649778e5c 灵兽宝阁功能修改 2021-11-25 18:26:02 +08:00
xuexinpeng 46e112e56a 玉虚积分修改 2021-11-14 00:29:44 +08:00
xuexinpeng c92e5b1b7a 【玉虚优化】优化分数丢失规则: +新增表格内修正分数 2021-11-04 18:10:21 +08:00
xuexinpeng 3e3fb783ee 周卡表结构变化 2021-11-11 16:45:48 +08:00
yuanshuai 9e22fed4ad Merge branch 'master_test_gn_godsoul' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
2021-11-03 19:03:22 +08:00
yuanshuai 45d11881a1 漏提交 2021-11-02 10:28:26 +08:00
xuexinpeng fc2d33d4c9 周卡相关 2021-11-01 13:18:29 +08:00
duhui cdd3b6b7dd 玲珑宝阁,奖池分活动 2021-10-29 17:19:44 +08:00
yuanshuai 048adc9c64 神魂相关脚本提交 2021-10-22 16:56:32 +08:00
jiahuiwen 967d5dc035 修仙属性flot 改int 2021-10-22 14:56:16 +08:00
yuanshuai 266fd9526b 修行技能升级限制修改 2021-10-22 13:38:56 +08:00
yuanshuai cd8777c449 修行技能相关脚本修改提交 2021-10-21 14:34:21 +08:00
yuanshuai db2b1d7283 Merge branch 'master_test_gn_practiceSkill' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java
2021-10-20 18:38:33 +08:00
duhui 70b19c8beb 御剑行功能优化 2021-11-03 23:46:27 +08:00
jiahuiwen a7b02e8627 兼容策划删 RechargeCommodityConfig 表数据 2021-10-20 17:11:38 +08:00
duhui 606b22a670 御剑行合并 2021-10-20 13:44:18 +08:00
duhui 942338df7d 活动时间兼容 2021-10-19 18:25:02 +08:00
jiahuiwen 302a8a0f2d 【新功能】主角修为
【新功能】山河社稷图增加每日扫荡
2021-10-19 17:10:06 +08:00
yuanshuai 75872a85e9 Merge branch 'master_test_gn' into master_test_gn_practiceSkill 2021-10-19 15:40:38 +08:00
yuanshuai 4b3a1a1e42 修行技能逻辑提交 2021-10-19 15:40:05 +08:00
jiahuiwen 358c920cd6 修仙表增加字段 2021-10-19 12:09:30 +08:00
jiahuiwen a14a205cfa 修仙技能 2021-10-19 11:13:36 +08:00