Commit Graph

6472 Commits (4ee0f7b5f29cbd387598380981ef5a1512d0fbac)
 

Author SHA1 Message Date
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 d117d99b8a Merge branch 'master_prb_gn' of http://60.1.1.230/backend/jieling_server into master_prb_gn 2021-11-17 09:37:56 +08:00
jiahuiwen ecbed9777d Merge branch 'master_prb_gn' into master_test_gn_zf 2021-11-17 09:37:14 +08:00
duhui 457649facd Merge branch 'master_test_gn_zf' into master_prb_gn 2021-11-17 09:37:01 +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