Commit Graph

5829 Commits (33546f01b2f1bb1bb655c06704c584a9a710ab51)

Author SHA1 Message Date
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
yuanshuai 7c536a5c08 添加法宝碎片道具类型 2021-11-19 18:15:08 +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 79b1ac3759 Merge branch 'master_test_gn' into master_test_gn_xxp 2021-11-18 17:58:34 +08:00
xuexinpeng 4785536487 跨服灵脉秘境挑战记录新加 2021-11-18 17:57:22 +08:00
yuanshuai fbf48a1903 Merge branch 'master_test_gn' into master_test_gn_fabao 2021-11-18 17:49:27 +08:00
yuanshuai 3614aa978a 法宝聚灵技能修改 2021-11-18 17:49:18 +08:00
xuexinpeng 55c463569c 跨服灵脉秘境1.先后手问题2.记录删除问题3.排行榜自己排名问题 2021-11-18 16:33:36 +08:00
yuanshuai dfa218d8ba 添加战中属性 2021-11-18 15:09:45 +08:00
xuexinpeng 01f4d79966 跨服灵脉秘境 2021-11-18 14:50:29 +08:00
xuexinpeng 96123a6d22 跨服灵脉秘境 2021-11-18 14:45:43 +08:00
xuexinpeng f0edb6f5b0 跨服灵脉秘境 2021-11-19 11:28:35 +08:00
xuexinpeng dc98b314ae 跨服灵脉秘境 2021-11-18 21:55:20 +08:00
xuexinpeng d4daed3d65 跨服灵脉秘境 2021-11-18 21:08:32 +08:00
xuexinpeng 1acf753951 跨服灵脉秘境 2021-11-18 18:27:33 +08:00
jiahuiwen dc30ecffb7 Merge branch 'master_prb_gn' into master_test_gn 2021-11-17 17:29:32 +08:00
xuexinpeng e7e12c7228 跨服灵妙秘境 2021-11-17 16:35:43 +08:00
jiahuiwen 0da78da3da 每秒执行线程,增加延迟启动 2021-11-17 16:08:20 +08:00
yuanshuai 782d39ab2d 法宝之魂共鸣技能相关代码修改 2021-11-17 14:48:00 +08:00
yuanshuai 661594c422 添加注释 2021-11-17 13:55:25 +08:00
jiahuiwen 8a5712fdb2 Merge branch 'master_prb_gn' into master_test_gn 2021-11-17 13:24:03 +08:00
yuanshuai f8aa4e339b 法宝聚灵功能提交 2021-11-17 13:18:27 +08:00
jiahuiwen 010f1b97ff Merge branch 'master_test_gn_zf' into master_test_gn 2021-11-17 10:37:02 +08:00
jiahuiwen 30dae1d80e 宝物穿戴bug 2021-11-16 16:56:40 +08:00
jiahuiwen f8dbd74b31 Merge branch 'master_test_gn' into master_prb_gn 2021-11-12 18:58:21 +08:00
xuexinpeng 39b276f03d 森罗幻境特殊处理还原 2021-11-12 18:28:22 +08:00
xuexinpeng 3b36c250ba 森罗幻境特殊处理 2021-11-12 17:32:20 +08:00