Commit Graph

548 Commits (1d72eeb54d6354e86e64f13f11a667554576cd95)

Author SHA1 Message Date
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
xuexinpeng ecba1854dd Merge branch 'master_test_gn' into master_test_gn_xxp
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java
2021-10-16 11:44:24 +08:00
jiahuiwen f9eda6dfe0 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
# Conflicts:
#	tablemanager/src/main/java/config/SAchievementConfig.java
2021-10-15 18:21:48 +08:00
jiahuiwen 7c0c66be39 【成就优化】根据开服时间决定服务器内的成就 2021-10-15 18:20:59 +08:00
duhui 2f4715b599 Merge branch 'dh_dev_cow' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2021-10-15 17:18:43 +08:00
duhui 6d8a430fab 牛气冲天兼容 2021-10-15 17:16:17 +08:00
yuanshuai 82dd1bd33e Merge branch 'master_test_gn_push' into master_test_gn 2021-10-15 16:52:58 +08:00
yuanshuai bf0652a4ad 二期推送需求修改提交 2021-10-15 10:54:06 +08:00
jiahuiwen 09591d21e0 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-10-14 19:38:11 +08:00
jiahuiwen 44ffcea125 坐骑技能 2021-10-14 19:38:02 +08:00
xuexinpeng e5736e509e yxld10/14 2021-10-14 17:27:59 +08:00
yuanshuai 92b027d90c 根据充值金额推送礼包代码修改 2021-10-14 16:44:14 +08:00
duhui bfc5667bb8 Merge branch 'master_test_gn' into dh_dev_ridingsward
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
2021-10-14 16:18:26 +08:00
duhui 7ab321cc75 成就任务优化,兼容开服时间条件 2021-10-14 15:36:48 +08:00
yuanshuai 8dceb89111 白金装备提交 2021-10-14 13:47:14 +08:00
duhui 1e7cc6dea2 御剑飞行 2021-10-14 11:12:23 +08:00
xuexinpeng 433e651a6c Merge branch 'master_test_gn' into master_test_gn_xxp
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
2021-10-13 19:58:49 +08:00
xuexinpeng c6d45cbecf yx10.13测试bug 2021-10-13 19:52:46 +08:00