PC-202302260912\Administrator
|
6372ce36a7
|
战力扩充为long
|
2023-09-05 14:40:34 +08:00 |
duhui
|
f1e45eaa70
|
maven镜像
|
2023-01-09 16:02:39 +08:00 |
duhui
|
fd21726937
|
送十万真充活动初版
|
2022-11-18 15:09:30 +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 |
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 |
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 |
xuexinpeng
|
95820f7f10
|
跨服新加战斗属性
|
2021-10-21 10:46:02 +08:00 |
xuexinpeng
|
c441a1f25b
|
跨服rpc四灵试炼等级
|
2021-10-19 16:34:03 +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 |
lvxinran
|
f6ec9c2f4b
|
无用代码删除
|
2021-07-10 01:01:01 +08:00 |
lvxinran
|
d265432e5a
|
无用代码注释
|
2021-07-10 01:00:06 +08:00 |
lvxinran
|
c4d6ee097b
|
跨服修改
|
2021-06-16 18:11:23 +08:00 |
lvxinran
|
feb641028c
|
配置提交
|
2021-01-21 16:00:44 +08:00 |
lvxinran
|
b37c3146c9
|
gradle配置提交
|
2020-01-05 00:09:45 +08:00 |
zhangshanxue
|
4bce4b8e96
|
跨服服务器
|
2020-12-07 14:44:12 +08:00 |
zhangshanxue
|
bfb89434cd
|
跨服服务器
|
2020-12-03 21:02:17 +08:00 |
zhangshanxue
|
6b4d5296db
|
Merge branch 'master_test_hw_server_arena' of http://60.1.1.230/backend/jieling_server into master_test_hw_server_arena
|
2020-11-27 15:27:06 +08:00 |
zhangshanxue
|
b27f4e489c
|
初步提交
|
2020-11-27 15:26:55 +08:00 |
lvxinran
|
3107bf3254
|
修改分组
|
2020-11-23 14:00:50 +08:00 |
lvxinran
|
8ed8485114
|
服务器分组修改
|
2020-11-23 13:58:32 +08:00 |
lvxinran
|
416beb8d33
|
分组提交
|
2020-12-01 10:55:37 +08:00 |
lvxinran
|
88c481126f
|
Merge branch 'master_test_hw_server_arena' of http://60.1.1.230/backend/jieling_server into master_test_hw_server_arena
|
2020-12-01 10:25:10 +08:00 |
lvxinran
|
b89e6988fe
|
工具类添加
|
2020-12-01 10:24:46 +08:00 |
zhangshanxue
|
b9fd7bfdf7
|
跨服服务器通信初版完成
|
2020-11-20 10:23:16 +08:00 |
zhangshanxue
|
4d9a185be5
|
跨服服务器通信初版完成
|
2020-11-19 20:33:41 +08:00 |
zhangshanxue
|
360a8c51e0
|
跨服服务器
|
2020-11-19 17:24:22 +08:00 |