lvxinran
|
8916a76543
|
法宝最大等级校验
|
2020-12-15 14:44:37 +08:00 |
zhangshanxue
|
fa6e6bcad5
|
Merge branch 'master_test_hw_server_arena' of http://60.1.1.230/backend/jieling_server into master_test_hw_server_arena
# Conflicts:
# gamecommon/src/main/java/rpc/protocols/ActivityProto.java
# gamecommon/src/main/java/rpc/protocols/ArenaInfoProto.java
# gamecommon/src/main/java/rpc/protocols/ChatProto.java
# gamecommon/src/main/java/rpc/protocols/CommonProto.java
# gamecommon/src/main/java/rpc/protocols/Family.java
# gamecommon/src/main/java/rpc/protocols/HeroInfoProto.java
# gamecommon/src/main/java/rpc/protocols/MessageTypeProto.java
# gamecommon/src/main/java/rpc/protocols/PlayerInfoProto.java
# gamecommon/src/main/java/rpc/world/WorldProto.java
# worldserver/src/main/java/com/world/redis/RedisUtil.java
|
2020-12-15 14:01:24 +08:00 |
lvxinran
|
dff49eded3
|
rediskey修改
|
2021-01-06 10:12:22 +08:00 |
lvxinran
|
e086fd1e97
|
十绝阵删除信息修改
|
2020-12-25 10:19:50 +08:00 |
lvxinran
|
5cd2499af6
|
跨服十绝阵第二版
|
2020-12-17 20:07:30 +08:00 |
zhangshanxue
|
6ef71dc4b5
|
跨服服务器
|
2020-12-15 14:00:20 +08:00 |
lvxinran
|
2e240b33d0
|
打点修改提交
|
2020-12-14 11:07:37 +08:00 |
lvxinran
|
1272ae01f8
|
宝物错误数据修改
|
2020-12-12 18:09:46 +08:00 |
lvxinran
|
1f0f27727b
|
宝物分解bug,竞猜打点提交
|
2020-12-12 17:51:29 +08:00 |
lvxinran
|
9784aa4c3f
|
公会排行榜
|
2020-12-20 06:09:08 +08:00 |
lvxinran
|
3c636a42be
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-12-18 05:03:08 +08:00 |
lvxinran
|
874fc8f2c5
|
森罗bug修改
|
2020-12-18 05:03:02 +08:00 |
lvxinran
|
fb5da8c93b
|
Merge branch 'master_test_hw_server_arena' of http://60.1.1.230/backend/jieling_server into master_test_hw_server_arena
# Conflicts:
# gamecommon/src/main/java/rpc/protocols/CommonProto.java
# gamecommon/src/main/java/rpc/protocols/MessageTypeProto.java
# gamecommon/src/main/java/rpc/world/WorldProto.java
# worldserver/build.gradle
# worldserver/src/main/java/com/world/handler/GetWorldArenaChallengeRequestHandler.java
# worldserver/src/main/java/com/world/handler/GetWorldArenaRecordInfoRequestHandler.java
# worldserver/src/main/java/com/world/redis/RedisKey.java
|
2020-12-12 15:06:17 +08:00 |
lvxinran
|
ac40a91389
|
跨服十绝阵代码提交
|
2020-12-12 15:03:54 +08:00 |
lvxinran
|
543cca1864
|
大闹天宫皮肤添加
|
2020-12-12 14:45:49 +08:00 |
duhui
|
813ff75cfb
|
套装优化
|
2020-12-11 17:17:12 +08:00 |
zhangshanxue
|
95870b74d5
|
跨服服务器
|
2020-12-11 13:57:47 +08:00 |
zhangshanxue
|
64700c9190
|
社稷积分
|
2020-12-10 16:37:14 +08:00 |
DESKTOP-98AVA47\Administrator
|
13849ac7b8
|
社稷大典积分恢复
|
2020-12-11 02:07:22 +08:00 |
duhui
|
86aee0e6ce
|
战斗同步
|
2020-12-10 16:32:17 +08:00 |
duhui
|
97077d9557
|
新将来袭活动文件补充
|
2020-12-09 14:01:59 +08:00 |
lvxinran
|
3e4b27fa9d
|
竞技场修改
|
2020-12-08 21:10:15 +08:00 |
zhangshanxue
|
5e0c455469
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-12-08 16:58:46 +08:00 |
zhangshanxue
|
220d2b802d
|
巅峰赛 记录bug
|
2020-12-08 16:58:38 +08:00 |
duhui
|
2ae47522f3
|
Merge branch 'dev_dh_xinjiang' into master_test_hw
|
2020-12-08 11:36:41 +08:00 |
lvxinran
|
a2a1edb290
|
战斗覆盖技能
|
2020-12-08 11:32:59 +08:00 |
duhui
|
d7b5a22965
|
竞技场积分加减1问题
|
2020-12-08 11:12:09 +08:00 |
duhui
|
39505c9d24
|
竞技场分数+-1问题
|
2020-12-08 10:40:42 +08:00 |
zhangshanxue
|
3c16dbe91c
|
Merge branch 'master_online_hw' into master_test_hw
|
2020-12-07 21:14:37 +08:00 |
DESKTOP-98AVA47\Administrator
|
951e54fb0b
|
社稷大典跨期刷新
|
2020-12-15 21:38:46 +08:00 |
zhangshanxue
|
d73a2b6122
|
Merge branch 'master_test_hw_server_arena' of http://60.1.1.230/backend/jieling_server into master_test_hw_server_arena
|
2020-12-07 15:31:37 +08:00 |
zhangshanxue
|
49b043606f
|
跨服服务器
|
2020-12-07 15:31:30 +08:00 |
lvxinran
|
4a2114de4e
|
Merge branch 'master_test_hw_server_arena' of http://60.1.1.230/backend/jieling_server into master_test_hw_server_arena
|
2020-12-07 15:07:29 +08:00 |
lvxinran
|
7aac58c962
|
跨服key添加
|
2020-12-07 15:07:23 +08:00 |
zhangshanxue
|
4bce4b8e96
|
跨服服务器
|
2020-12-07 14:44:12 +08:00 |
duhui
|
c1fcfcf3a2
|
新将活动应策划需求改版,掉落比例重新计算
|
2020-12-07 13:53:25 +08:00 |
zhangshanxue
|
bfb89434cd
|
跨服服务器
|
2020-12-03 21:02:17 +08:00 |
zhangshanxue
|
92e5c50e24
|
大闹天宫圣物效果
|
2020-12-03 19:32:28 +08:00 |
zhangshanxue
|
08b85eb654
|
大闹天宫圣物效果
|
2020-12-03 16:23:56 +08:00 |
duhui
|
686596375d
|
新将来袭初版
|
2020-12-03 10:27:55 +08:00 |
lvxinran
|
b217c19431
|
竞技场排名优化
|
2020-12-03 10:06:22 +08:00 |
duhui
|
e31d779762
|
ID1007542
|
2020-12-02 14:17:04 +08:00 |
duhui
|
e0c2c51303
|
no message
|
2020-12-02 14:13:11 +08:00 |
duhui
|
21aec6d252
|
竞技场修改
|
2020-12-02 10:42:23 +08:00 |
duhui
|
ed7d883cce
|
临时提交2
|
2020-12-02 10:29:51 +08:00 |
zhangshanxue
|
904d77814f
|
Merge branch 'master_online_hw' into master_test_hw
|
2020-11-30 11:56:35 +08:00 |
zhangshanxue
|
93b394ce7e
|
【模块】大闹天宫-战斗后圣物刷新种类不正确
|
2020-11-30 11:55:29 +08:00 |
lvxinran
|
e1bae5947d
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-28 08:55:56 +08:00 |
lvxinran
|
2476e457af
|
挂机预览修改
|
2020-11-28 08:55:46 +08:00 |
lvxinran
|
f275342e67
|
物品上限添加
|
2020-11-27 18:49:25 +08:00 |