Commit Graph

684 Commits (d909a31e20588cafbf3b3e955817df2e2beaad90)

Author SHA1 Message Date
duhui 56e993f2a9 人民币购买时获得名望及仙晶 2022-09-16 14:33:49 +08:00
duhui 05243c0cb9 活动修改,全民福利和gm转盘 2022-09-15 14:43:55 +08:00
duhui 5bb9388894 小修改 2022-09-14 16:37:19 +08:00
duhui 31a2d5b56a 代码合并 2022-09-14 16:07:07 +08:00
duhui ad7a3184e3 bt版本2.0,gm修改器逻辑 2022-09-14 16:01:44 +08:00
duhui 8c86bb20f7 bt:新增特权 2022-09-08 15:40:52 +08:00
duhui 73a0b91d3e 送无限抽活动 2022-09-07 16:05:52 +08:00
duhui add9233993 全民福利 2022-09-07 10:36:57 +08:00
duhui 2df133f4d2 太初特权和刷冲特权用到的特权覆盖 2022-09-06 16:07:21 +08:00
duhui bfdd43d6bd 牛气冲天活动bug修改 2022-09-06 13:45:24 +08:00
duhui 7f1866406f 建木神树 2022-09-05 15:45:22 +08:00
duhui 8bf8d3c9e6 摘星阁,装备重置 2022-09-02 13:46:26 +08:00
duhui cf6b898585 摘星阁装备强化 2022-09-01 17:08:02 +08:00
duhui 609bdac818 Merge branch 'master_test_gn' into dev_equip
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
2022-08-30 16:53:03 +08:00
duhui 23e632dd30 法宝等级上限 2022-08-30 15:59:09 +08:00
duhui 844b0114cd 摘星阁装备调整初版,未联调 2022-08-19 18:12:57 +08:00
duhui 8508c685db 身外化身限制添加 2022-08-18 17:13:35 +08:00
duhui 0138170505 【摘星阁重构】增加道具消耗种类 2022-08-08 14:34:13 +08:00
duhui b07a9a1e37 热度排行榜,表补充 2022-08-04 16:44:57 +08:00
duhui bb16d01442 热度排行榜 2022-08-04 16:42:32 +08:00
duhui f3ecd4fc3f 比数小游戏 2022-07-11 15:45:42 +08:00
duhui 8848cadbd5 英雄初始被动 2022-06-15 10:57:27 +08:00
duhui 6f63f03ab0 月卡调整,暂存 2022-06-06 16:31:44 +08:00
duhui 8e3cc63702 新周卡功能 2022-05-31 17:13:59 +08:00
duhui a748d0e64d 【寻仙招募调整】 2022-05-20 14:15:34 +08:00
xuexinpeng 3715b8b869 神尊特权 2022-05-24 00:10:32 +08:00
duhui 9a8bfa15ed 队伍战力存储到mongo 2022-04-26 14:20:04 +08:00
xuexinpeng c7715e7a87 身外化身 2022-04-24 18:10:34 +08:00
duhui 6ce4c11c7d 神印功能提交 2022-04-22 18:27:17 +08:00
xuexinpeng 913af67528 身外化身 2022-04-22 17:26:59 +08:00
xuexinpeng 9a73862291 化身之力 2022-04-22 11:26:52 +08:00
xuexinpeng ed181d79ee 启动报错 2022-04-22 09:57:33 +08:00
xuexinpeng 699836479c 身外化身 2022-04-21 18:08:16 +08:00
duhui e26b1e18ae 【探索玩法增加探索商店】 2022-04-18 15:05:46 +08:00
xuexinpeng efc3368d0a 挑战副本 2022-04-15 14:52:04 +08:00
xuexinpeng a325ba0451 挑战副本 2022-04-14 18:23:30 +08:00
yuanshuai 18c2ef0b7b Merge branch 'master_test_gn' into master_test_gn_GodDevil
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java
2022-03-25 18:15:15 +08:00
yuanshuai eca27060c5 playerskill 添加字段 2022-03-21 17:14:08 +08:00
xuexinpeng 293e9869b4 探索事件 2022-03-21 16:33:26 +08:00
yuanshuai dc0c9819bd 神魔阵营功能脚本提交 2022-03-18 16:45:25 +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
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