PC-202302260912\Administrator
|
6372ce36a7
|
战力扩充为long
|
2023-09-05 14:40:34 +08:00 |
duhui
|
7f1866406f
|
建木神树
|
2022-09-05 15:45:22 +08:00 |
duhui
|
844b0114cd
|
摘星阁装备调整初版,未联调
|
2022-08-19 18:12:57 +08:00 |
xuexinpeng
|
b3d35a15a3
|
身外化身
|
2022-04-24 13:54:31 +08:00 |
duhui
|
6ce4c11c7d
|
神印功能提交
|
2022-04-22 18:27:17 +08:00 |
jiahuiwen
|
676f4c9c17
|
公会援助
|
2022-04-20 10:44:01 +08:00 |
jiahuiwen
|
bdf6666064
|
跨服公会
|
2022-04-19 16:05:10 +08:00 |
jiahuiwen
|
360e6c846d
|
Revert "跨服加公会"
This reverts commit 122d7836f7 .
|
2022-04-18 09:50:03 +08:00 |
jiahuiwen
|
122d7836f7
|
跨服加公会
|
2022-04-15 10:37:23 +08:00 |
duhui
|
6f805a716f
|
协议去除无用参数
|
2022-04-08 10:56:41 +08:00 |
duhui
|
16a1f881dd
|
爱玩信息上报
|
2022-04-08 10:45:13 +08:00 |
yuanshuai
|
dc0c9819bd
|
神魔阵营功能脚本提交
|
2022-03-18 16:45:25 +08:00 |
xuexinpeng
|
315083312d
|
【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息
|
2022-01-15 16:38:31 +08:00 |
xuexinpeng
|
8aa8865f42
|
【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息
|
2022-01-14 11:41:57 +08:00 |
xuexinpeng
|
8dd658edc5
|
【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息
|
2022-01-13 18:32:39 +08:00 |
duhui
|
3dab8bf18c
|
【家园功能1.1.6】
1、家园装备强化展示
|
2021-12-30 18:34:43 +08:00 |
duhui
|
07dfc01d30
|
【家园功能1.1.0】
1、任务功能完善
2、添加装备突破功能
3、装备强化信息添加到英雄信息
4、跨服添加家园装备强化信息
|
2021-12-29 15:12:02 +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 |
xuexinpeng
|
7f5d453b4b
|
跨服灵脉rpc红点
|
2021-11-23 15:58:54 +08:00 |
duhui
|
1eff1588bc
|
rpc协议提交
|
2021-11-17 17:28:19 +08:00 |
duhui
|
cbf61cfafc
|
身外化身提交
|
2021-11-17 16:47:25 +08:00 |
yuanshuai
|
782d39ab2d
|
法宝之魂共鸣技能相关代码修改
|
2021-11-17 14:48:00 +08:00 |
jiahuiwen
|
f7baeed51e
|
rpc获取user
|
2021-11-10 18:53:42 +08:00 |
yuanshuai
|
b0d4de5917
|
添加跨服相关神将神魂信息
|
2021-10-28 15:32:36 +08:00 |
jiahuiwen
|
72b4a36e9e
|
Merge branch 'master_test_gn' into master_test_mingan
|
2021-10-22 10:07:48 +08:00 |
jiahuiwen
|
ce1db905a9
|
通过rpc调用 敏感字检测
|
2021-10-21 16:10:40 +08:00 |
yuanshuai
|
93974b5c1b
|
跨服相关添加数据结构
|
2021-10-21 15:19:32 +08:00 |
yuanshuai
|
5469ead809
|
跨服数据添加历史最高战力字段
|
2021-10-21 14:19:19 +08:00 |
xuexinpeng
|
ffc6d76a84
|
跨服修行技能数据
|
2021-10-21 11:15:35 +08:00 |
xuexinpeng
|
fef9428f5d
|
跨服数据新加修行技能数据
|
2021-10-21 11:07:36 +08:00 |
xuexinpeng
|
95820f7f10
|
跨服新加战斗属性
|
2021-10-21 10:46:02 +08:00 |
xuexinpeng
|
c441a1f25b
|
跨服rpc四灵试炼等级
|
2021-10-19 16:34:03 +08:00 |
xuexinpeng
|
375951b7d5
|
yx跨服打架灵兽,段位重置1000
|
2021-10-18 15:10:18 +08:00 |
xuexinpeng
|
b21cb8f45a
|
跨服白金套装技能,坐骑技能
|
2021-10-30 01:00:06 +08:00 |
xuexinpeng
|
f2c43c9042
|
yxld 积分 英雄属性 查看英雄
|
2021-10-15 17:31:16 +08:00 |
xuexinpeng
|
e5736e509e
|
yxld10/14
|
2021-10-14 17:27:59 +08:00 |
xuexinpeng
|
c6d45cbecf
|
yx10.13测试bug
|
2021-10-13 19:52:46 +08:00 |
xuexinpeng
|
8ec8e3a0df
|
跨服rpc 玉虚论道
|
2021-09-23 15:56:07 +08:00 |
xuexinpeng
|
3434799eda
|
跨服rpc
|
2021-09-17 19:13:53 +08:00 |
zhangshanxue
|
b27f4e489c
|
初步提交
|
2020-11-27 15:26:55 +08:00 |
zhangshanxue
|
360a8c51e0
|
跨服服务器
|
2020-11-19 17:24:22 +08:00 |
zhangshanxue
|
048d00080e
|
网页支付玩家商品信息获取
|
2020-09-14 17:52:00 +08:00 |
zhangshanxue
|
3ef43a64a7
|
灵动网页支付
|
2020-08-21 20:31:30 +08:00 |
wangyuan
|
201f510e38
|
bloody
|
2019-09-07 14:12:09 +08:00 |
wangyuan
|
1b09b921f9
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-09-06 11:04:28 +08:00 |