HonkaiSlopRail/jingliu-sr
HonkaiSlopRail/jingliu-sr
2
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

update v2, fix /sync and some bugs

Browse source
This commit is contained in:
HuLiNap 2025-05-27 23:19:15 +07:00
parent bddd05a7c3
commit 3af20a7dfa
8 changed files with 450037 additions and 424181 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -9,9 +9,9 @@
## Running
### Replacing mhybase.dll
### Replacing mhypbase.dll
Replace [mhybase.dll](https://git.xeondev.com/HonkaiSlopRail/jingliu-sr/raw/branch/main/mhybase.dll) file in your game folder.
Replace [mhypbase.dll](https://git.xeondev.com/HonkaiSlopRail/jingliu-sr/raw/branch/main/mhypbase.dll) file in your game folder.
### From source

353
config.json
View file

@ -9,7 +9,7 @@
"promotion": 6,
"rank": 0,
"lightcone": {
"id": 23014,
"id": 23016,
"rank": 1,
"level": 80,
"promotion": 6
@ -72,6 +72,78 @@
],
"use_technique": false
},
{
"name": "Acheron",
"id": 1308,
"hp": 100,
"sp": 50,
"level": 80,
"promotion": 6,
"rank": 0,
"lightcone": {
"id": 23024,
"rank": 1,
"level": 80,
"promotion": 6
},
"relics": [
"61171,15,1,4,5:2:4,8:4:4,9:2:2,12:1:1",
"61172,15,1,4,5:3:3,9:2:2,8:2:2,10:2:2",
"61173,15,5,4,1:3:3,2:1:1,3:1:1,8:4:4",
"61174,15,2,4,8:1:1,9:4:4,3:2:2,1:2:2",
"63145,15,2,4,8:3:3,6:1:1,9:3:3,11:2:2",
"63146,15,4,4,8:4:4,9:2:4,6:1:1,10:2:2"
],
"use_technique": true
},
{
"name": "Jiaoqiu",
"id": 1218,
"hp": 100,
"sp": 50,
"level": 80,
"promotion": 6,
"rank": 0,
"lightcone": {
"id": 22000,
"rank": 5,
"level": 80,
"promotion": 6
},
"relics": [
"61101,15,1,4,7:3:3,5:3:3,12:2:2,11:1:1",
"61102,15,1,4,7:3:0,10:2:2,3:2:2,9:2:2",
"61103,15,7,4,2:2:2,5:3:6,6:2:2,3:2:2",
"61104,15,4,4,5:1:2,10:2:0,2:4:4,6:2:2",
"63175,15,6,4,7:2:0,2:2:2,9:3:3,1:2:2",
"63176,15,2,4,10:2:2,4:2:2,3:3:3,11:2:2"
],
"use_technique": true
},
{
"name": "Sparkle",
"id": 1306,
"hp": 100,
"sp": 50,
"level": 80,
"promotion": 6,
"rank": 0,
"lightcone": {
"id": 23003,
"rank": 1,
"level": 80,
"promotion": 6
},
"relics": [
"61141,15,1,4,9:4:4,4:1:1,7:3:3,11:1:1",
"61142,15,1,4,9:4:4,4:1:1,7:3:3,11:1:1",
"61213,15,5,4,7:6:6,4:1:1,11:1:1,6:1:1",
"61214,15,4,4,9:6:6,11:1:1,4:1:1,6:1:1",
"63175,15,1,4,9:6:6,6:1:1,7:1:1,11:1:1",
"63176,15,2,4,7:6:6,9:1:1,11:1:1,4:1:1"
],
"use_technique": true
},
{
"name": "Saber",
"id": 1014,
@ -79,20 +151,44 @@
"sp": 50,
"level": 80,
"promotion": 6,
"rank": 6,
"rank": 0,
"lightcone": {
"id": 23045,
"rank": 5,
"rank": 1,
"level": 80,
"promotion": 6
},
"relics": [
"61261,15,1,4,5:2:2,7:1:1,8:3:3,9:3:3",
"61262,15,1,4,9:1:1,7:3:3,5:3:3,8:2:2",
"61263,15,5,4,7:2:2,8:3:3,5:3:3,4:1:1",
"61264,15,4,4,8:2:2,9:3:3,5:2:2,4:2:2",
"63095,15,8,4,9:2:2,8:1:1,5:3:3,7:3:3",
"63096,15,4,4,9:2:2,8:2:2,7:3:3,4:2:2"
"61261,15,1,4,9:2:2,4:2:2,7:2:2,6:3:3",
"61262,15,1,4,9:3:3,10:2:2,11:2:2,7:2:2",
"61263,15,4,4,5:1:1,9:4:4,6:3:3,4:1:1",
"61264,15,4,4,9:1:1,8:3:3,11:2:2,10:3:3",
"63095,15,2,4,4:3:3,8:3:3,7:2:2,11:1:1",
"63096,15,4,4,4:1:1,1:3:3,9:3:3,8:2:2"
],
"use_technique": true
},
{
"name": "Yukong",
"id": 1207,
"hp": 100,
"sp": 50,
"level": 80,
"promotion": 6,
"rank": 6,
"lightcone": {
"id": 23003,
"rank": 1,
"level": 80,
"promotion": 6
},
"relics": [
"61211,15,1,4,5:1:1,7:3:3,4:3:3,6:2:2",
"61212,15,1,4,5:1:1,7:4:4,6:1:1,9:1:1",
"61213,15,1,4,5:1:1,7:3:3,3:1:1,2:4:4",
"61214,15,4,4,9:4:4,5:2:2,1:1:1,8:2:2",
"63175,15,3,4,7:3:3,3:1:1,12:1:1,2:4:4",
"63176,15,2,4,7:2:2,5:2:2,8:2:2,3:3:3"
],
"use_technique": true
},
@ -111,12 +207,60 @@
"promotion": 6
},
"relics": [
"61261,15,1,4,8:2:2,2:3:3,4:1:1,12:3:3",
"61262,15,1,4,10:2:2,11:3:3,12:3:3,6:1:1",
"61263,15,5,4,4:2:2,10:3:3,11:2:2,12:2:2",
"61264,15,2,4,10:2:2,6:2:2,9:4:4,2:1:1",
"63145,15,9,4,4:1:1,6:4:4,9:1:1,5:3:3",
"63146,15,4,4,1:3:3,10:3:3,9:1:1,11:2:2"
"61081,15,1,4,9:6:12,8:1:2,5:1:2,2:1:2",
"61082,15,1,4,9:6:12,8:1:2,7:1:2,5:1:2",
"61083,15,5,4,8:6:12,5:1:2,2:1:2,7:1:2",
"61084,15,2,4,2:1:2,8:1:2,9:6:12,7:1:2",
"63095,15,9,4,8:1:2,9:6:12,5:1:2,2:1:2",
"63096,15,4,4,9:6:12,8:1:2,7:1:2,2:1:2"
],
"use_technique": true
},
{
"name": "Cipher",
"id": 1406,
"hp": 100,
"sp": 50,
"level": 80,
"promotion": 6,
"rank": 0,
"lightcone": {
"id": 23043,
"rank": 1,
"level": 80,
"promotion": 6
},
"relics": [
"61201,15,1,4,5:1:2,8:2:4,7:4:0,12:1:1",
"61212,15,1,4,6:1:1,9:2:2,8:1:1,7:3:3",
"61203,15,5,4,1:1:1,11:2:2,8:3:3,7:2:2",
"61214,15,4,4,6:2:2,11:2:2,8:2:2,5:3:3",
"63065,15,9,4,5:2:2,6:3:3,7:1:1,9:2:2",
"63066,15,4,4,4:3:3,7:2:4,9:2:4,8:2:4"
],
"use_technique": true
},
{
"name": "Tingyun",
"id": 1202,
"hp": 100,
"sp": 50,
"level": 80,
"promotion": 6,
"rank": 6,
"lightcone": {
"id": 22002,
"rank": 1,
"level": 80,
"promotion": 6
},
"relics": [
"61101,15,1,4,5:2:2,7:2:2,4:3:3,6:2:2",
"61102,15,1,4,5:3:3,7:2:2,6:1:1,9:2:2",
"61103,15,1,4,5:3:3,7:2:2,3:2:2,2:2:2",
"61104,15,4,4,9:4:4,5:2:2,1:1:1,8:2:2",
"63175,15,3,4,7:3:3,3:1:1,12:3:3,5:2:2",
"63176,15,2,4,7:2:2,5:2:2,8:2:2,3:3:3"
],
"use_technique": true
},
@ -192,30 +336,6 @@
],
"use_technique": false
},
{
"name": "Traiblazer",
"id": 8008,
"hp": 100,
"sp": 50,
"level": 80,
"promotion": 6,
"rank": 6,
"lightcone": {
"id": 24005,
"rank": 5,
"level": 80,
"promotion": 6
},
"relics": [
"61231,15,1,4,3:1:0,7:2:4,9:2:4,10:3:1",
"61232,15,1,4,7:2:1,9:4:2,10:1:1,11:1:2",
"61233,15,5,4,4:2:2,7:4:1,10:1:1,12:2:1",
"61234,15,4,4,3:1:8,4:2:2,9:3:2,11:2:1",
"63085,15,1,4,1:1:2,5:3:1,7:2:1,9:2:2",
"63086,15,2,4,1:3:4,2:2:2,9:1:1,10:2:3"
],
"use_technique": false
},
{
"name": "March 7th",
"id": 1224,
@ -279,12 +399,36 @@
"promotion": 6
},
"relics": [
"61211,15,1,4,5:3:3,7:3:3,8:1:1,9:2:2",
"61212,15,1,4,9:4:4,7:2:2,5:2:2,8:1:1",
"61213,15,5,4,7:2:2,8:1:1,5:4:4,4:2:2",
"61214,15,4,4,8:3:3,9:2:2,5:2:2,4:2:2",
"63175,15,1,4,9:2:2,8:1:1,5:3:3,7:3:3",
"63176,15,2,4,9:4:4,8:1:1,7:2:2,4:2:2"
"61211,15,1,4,9:4:4,4:1:1,7:3:3,11:1:1",
"61212,15,1,4,9:4:4,4:1:1,7:3:3,11:1:1",
"61213,15,5,4,7:6:6,4:1:1,11:1:1,6:1:1",
"61214,15,4,4,9:6:6,11:1:1,4:1:1,6:1:1",
"63175,15,1,4,9:6:6,6:1:1,7:1:1,11:1:1",
"63176,15,2,4,7:6:6,9:1:1,11:1:1,4:1:1"
],
"use_technique": true
},
{
"name": "Robin",
"id": 1309,
"hp": 100,
"sp": 50,
"level": 80,
"promotion": 6,
"rank": 1,
"lightcone": {
"id": 23003,
"rank": 1,
"level": 80,
"promotion": 6
},
"relics": [
"61231,15,1,4,5:5:10,4:1:1,7:1:1,6:1:1",
"61232,15,1,4,5:2:2,10:1:1,11:1:1,7:4:0",
"61163,15,2,4,1:1:1,11:3:3,12:3:3,7:1:1",
"61164,15,2,4,6:3:3,10:2:2,3:1:1,4:3:3",
"63085,15,2,4,4:2:2,6:3:3,7:1:1,9:2:2",
"63086,15,2,4,4:3:3,5:2:2,6:1:1,8:2:2"
],
"use_technique": true
},
@ -297,29 +441,130 @@
"promotion": 6,
"rank": 0,
"lightcone": {
"id": 23038,
"id": 21018,
"rank": 5,
"level": 80,
"promotion": 6
},
"relics": [
"61241,15,1,4,9:4:4,4:3:3,3:1:1,11:1:1",
"61242,15,1,4,9:4:4,4:3:3,11:1:1,1:1:1",
"61243,15,5,4,1:1:1,4:6:6,11:1:1,6:1:1",
"61244,15,1,4,9:6:6,11:1:1,1:1:1,6:1:1",
"63175,15,1,4,9:6:6,1:1:1,6:1:1,11:1:1",
"63176,15,2,4,1:1:1,9:4:4,11:1:1,4:3:3"
],
"use_technique": true
},
{
"name": "Gallagher",
"id": 1301,
"hp": 100,
"sp": 50,
"level": 80,
"promotion": 6,
"rank": 6,
"lightcone": {
"id": 21021,
"rank": 5,
"level": 80,
"promotion": 6
},
"relics": [
"61181,15,1,4,5:4:8,4:1:1,7:2:2,12:1:1",
"61182,15,1,4,5:1:1,10:1:1,11:1:1,7:6:0",
"61183,15,6,4,1:1:1,11:2:2,12:2:2,7:4:0",
"61184,15,4,4,9:3:3,11:2:2,8:1:1,5:3:3",
"63165,15,3,4,4:2:2,6:2:2,7:2:2,9:2:2",
"63166,15,2,4,4:3:3,7:2:2,6:1:1,8:2:2"
],
"use_technique": false
},
{
"name": "Bronya",
"id": 1101,
"hp": 100,
"sp": 50,
"level": 80,
"promotion": 6,
"rank": 1,
"lightcone": {
"id": 23003,
"rank": 1,
"level": 80,
"promotion": 6
},
"relics": [
"61241,15,1,4,8:2:1,9:2:4,11:2:2,12:2:2",
"61242,15,1,4,3:1:0,4:2:0,6:1:8,9:3:2",
"61243,15,5,4,3:2:4,8:3:2,10:1:0,11:2:3",
"61244,15,1,4,1:2:3,3:2:2,8:2:2,9:2:2",
"63195,15,1,4,1:2:4,5:1:1,8:4:4,9:1:1",
"63196,15,2,4,4:1:1,8:3:5,9:1:2,12:3:3"
"61221,15,1,4,8:3:3,4:2:2,7:2:2,6:2:2",
"61062,15,1,4,9:5:5,10:1:1,11:1:1,7:2:2",
"61143,15,5,4,5:2:2,7:2:2,6:3:3,4:2:2",
"61214,15,4,4,9:2:2,8:3:3,11:2:2,10:2:2",
"63175,15,3,4,4:1:1,5:2:2,12:3:3,8:3:3",
"63176,15,2,4,4:2:2,1:2:2,9:3:3,8:2:2"
],
"use_technique": true
},
{
"name": "Hanya",
"id": 1215,
"hp": 100,
"sp": 50,
"level": 80,
"promotion": 6,
"rank": 6,
"lightcone": {
"id": 21018,
"rank": 5,
"level": 80,
"promotion": 6
},
"relics": [
"61141,15,1,4,9:1:2,3:2:4,7:4:0,5:1:1",
"61212,15,1,4,3:1:1,12:2:2,5:1:1,7:4:4",
"61143,15,1,4,10:1:1,2:2:2,9:2:2,7:3:3",
"61214,15,4,4,12:2:2,3:2:2,8:2:2,4:3:3",
"63175,15,9,4,5:2:2,6:1:1,7:3:3,9:2:2",
"63176,15,2,4,4:2:2,7:3:6,9:1:2,8:2:4"
],
"use_technique": true
},
{
"name": "Trailblazer",
"id": 8008,
"hp": 100,
"sp": 50,
"level": 80,
"promotion": 6,
"rank": 0,
"lightcone": {
"id": 24005,
"rank": 1,
"level": 80,
"promotion": 6
},
"relics": [
"61231,15,1,4,5:5:10,4:1:1,7:1:1,6:1:1",
"61232,15,1,4,5:2:2,10:1:1,11:1:1,7:4:0",
"61163,15,2,4,1:1:1,11:3:3,12:3:3,7:1:1",
"61164,15,2,4,6:3:3,10:2:2,3:1:1,4:3:3",
"63085,15,2,4,4:2:2,6:3:3,7:1:1,9:2:2",
"63086,15,2,4,4:3:3,5:2:2,6:1:1,8:2:2"
],
"use_technique": true
}
],
"battle_config": {
"battle_id": 1,
"stage_id": 201012311,
"stage_id": 30114121,
"cycle_count": 30,
"monster_wave": [
[
4015011
402302001,
4013010
],
[
802401107,
402302001
]
],
"monster_level": 95,

7
gameserver/src/commands/sync.zig
View file

@ -23,6 +23,7 @@ fn isInList(id: u32, list: []const u32) bool {
}
pub var max_avatar_list: u32 = 0;
pub var initial_uid: u32 = 0;
fn syncItems(session: *Session, allocator: Allocator, equip_avatar: bool) !void {
resetGlobalUidGens();
@ -61,6 +62,10 @@ fn syncItems(session: *Session, allocator: Allocator, equip_avatar: bool) !void
try sync.relic_list.append(r);
}
}
if (!equip_avatar) {
const getcurrent_uid = getCurrentGlobalId();
initial_uid = getcurrent_uid;
}
try session.send(CmdID.CmdPlayerSyncScNotify, sync);
}
@ -232,7 +237,7 @@ pub fn onSyncMultiPath(session: *Session, _: []const u8, allocator: Allocator) E
pub var global_uid_gen: UidGenerator = undefined;
fn resetGlobalUidGens() void {
global_uid_gen = UidGenerator.init(0);
global_uid_gen = UidGenerator.init(initial_uid);
}
pub fn nextGlobalId() u32 {

2
gameserver/src/manager/scene_mgr.zig
View file

@ -73,7 +73,7 @@ pub const SceneManager = struct {
.entityCase_ = .{ .Prop = prop_info },
.GroupId = scene_group.group_id,
.InstId = propConf.instId,
.EntityId = generator.nextId(),
.EntityId = 1000 + generator.nextId(),
.Motion = .{
.pos = .{ .x = propConf.pos.x, .y = propConf.pos.y, .z = propConf.pos.z },
.rot = .{ .x = propConf.rot.x, .y = propConf.rot.y, .z = propConf.rot.z },

7
gameserver/src/services/battle.zig
View file

@ -78,8 +78,9 @@ pub fn onSceneCastSkill(session: *Session, packet: *const Packet, allocator: All
});
var battle_info: ?protocol.SceneBattleInfo = null;
if (req.assist_monster_entity_id_list.items.len > 0 or
for (req.assist_monster_entity_id_list.items) |id| {
std.debug.print("ASSIST ID: {}\n", .{id});
if ((req.assist_monster_entity_id_list.items.len > 0 and id < 1000) or
(req.attacked_by_entity_id >= 1 and req.attacked_by_entity_id <= 99))
{
if (ChallengeData.on_challenge) {
@ -89,7 +90,7 @@ pub fn onSceneCastSkill(session: *Session, packet: *const Packet, allocator: All
on_battle = true;
}
}
}
try session.send(CmdID.CmdSceneCastSkillScRsp, protocol.SceneCastSkillScRsp{
.retcode = 0,
.cast_entity_id = req.cast_entity_id,

8
hotfix.json
View file

@ -30,5 +30,13 @@
"ifix_version": "0",
"lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_10434495_6bff50432edd_1641e3e19f1244",
"lua_version": ""
},
"CNBETAWin3.3.52": {
"asset_bundle_url": "https://autopatchcn.bhsr.com/asb/BetaLive/output_10478982_243ce40577bf_000895ae562404",
"ex_resource_url": "https://autopatchcn.bhsr.com/design_data/BetaLive/output_10508366_85ea4f1c9748_5776e81f3bf4f2",
"ifix_url": "https://autopatchcn.bhsr.com/ifix/BetaLive/output_10489293_ba258955cec6_d8347bc2994eab",
"ifix_version": "0",
"lua_url": "https://autopatchcn.bhsr.com/lua/BetaLive/output_10506685_892409531f16_67592aefeb2f2b",
"lua_version": ""
}
}

BIN
mhypbase.dll
View file

Binary file not shown.

873239
resources/res.json
View file

File diff suppressed because it is too large Load diff