Skip to content

Commit d6691d2

Browse files
committed
Fix frame
1 parent 93f1995 commit d6691d2

File tree

4 files changed

+83
-98
lines changed

4 files changed

+83
-98
lines changed

Cargo.lock

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "majsoul_max_rs"
3-
version = "0.3.7"
3+
version = "0.3.8"
44
edition = "2021"
55

66
[lib]

liqi_config/settings.mod.json

+77-95
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,96 @@
11
{
2-
"mainChar": 200001,
2+
"mainChar": 200005,
33
"charSkin": {
4-
"200087": 408701,
5-
"200040": 404001,
6-
"200067": 406701,
7-
"200090": 409001,
8-
"200070": 407001,
9-
"200052": 405201,
10-
"200028": 402801,
11-
"200079": 407901,
12-
"200060": 406001,
13-
"200016": 401601,
14-
"200068": 406801,
15-
"200051": 405101,
16-
"200043": 404301,
17-
"200019": 401901,
18-
"200082": 408201,
19-
"200005": 400501,
20-
"200065": 406501,
21-
"200085": 408501,
4+
"200020": 402001,
225
"200029": 402901,
23-
"200012": 401201,
24-
"200022": 402201,
25-
"200042": 404201,
6+
"200014": 401401,
7+
"200058": 405801,
8+
"200039": 403901,
269
"200064": 406401,
2710
"200001": 400101,
28-
"200061": 406101,
29-
"200071": 407101,
30-
"200056": 405601,
31-
"200084": 408401,
32-
"200054": 405401,
11+
"200021": 402101,
12+
"200055": 405501,
13+
"200030": 403001,
3314
"200006": 400601,
34-
"200063": 406301,
35-
"200041": 404101,
36-
"200077": 407701,
37-
"200013": 401301,
38-
"200020": 402001,
39-
"200046": 404601,
15+
"200081": 408101,
16+
"200042": 404201,
17+
"200043": 404301,
18+
"200025": 402501,
19+
"200068": 406801,
20+
"200012": 401201,
4021
"200050": 405001,
41-
"200023": 402301,
22+
"200022": 402201,
23+
"200078": 407801,
4224
"200072": 407201,
25+
"200054": 405401,
26+
"200057": 405701,
27+
"200005": 400506,
28+
"200069": 406901,
4329
"200017": 401701,
44-
"200021": 402101,
45-
"200011": 401101,
46-
"200047": 404701,
30+
"200032": 403201,
31+
"200031": 403101,
32+
"200063": 406301,
4733
"200044": 404401,
48-
"200004": 400401,
49-
"200010": 401001,
50-
"200033": 403301,
51-
"200002": 400201,
52-
"200049": 404901,
53-
"200037": 403701,
54-
"200045": 404501,
55-
"200038": 403801,
56-
"200083": 408301,
57-
"200088": 408801,
58-
"200081": 408101,
5934
"200034": 403401,
35+
"200035": 403501,
36+
"200087": 408701,
37+
"200008": 400801,
38+
"200040": 404001,
39+
"200002": 400201,
6040
"200074": 407401,
61-
"200026": 402601,
62-
"200018": 401801,
63-
"200032": 403201,
64-
"200059": 405901,
65-
"200014": 401401,
6641
"200027": 402701,
67-
"200057": 405701,
68-
"200066": 406601,
69-
"200025": 402501,
70-
"200069": 406901,
71-
"200003": 400301,
72-
"200008": 400801,
42+
"200015": 401501,
43+
"200089": 408901,
44+
"200033": 403301,
45+
"200013": 401301,
46+
"200071": 407101,
7347
"200007": 400701,
74-
"200086": 408601,
75-
"200055": 405501,
76-
"200009": 400901,
77-
"200078": 407801,
78-
"200080": 408001,
48+
"200003": 400301,
49+
"200070": 407001,
7950
"200073": 407301,
80-
"200058": 405801,
81-
"200076": 407601,
82-
"200036": 403601,
83-
"200024": 402401,
51+
"200060": 406001,
8452
"200053": 405301,
53+
"200086": 408601,
54+
"200062": 406201,
55+
"200052": 405201,
56+
"200056": 405601,
57+
"200041": 404101,
58+
"200066": 406601,
59+
"200026": 402601,
60+
"200036": 403601,
8561
"200075": 407501,
86-
"200031": 403101,
62+
"200018": 401801,
63+
"200038": 403801,
8764
"200048": 404801,
88-
"200015": 401501,
89-
"200030": 403001,
90-
"200035": 403501,
91-
"200062": 406201,
92-
"200039": 403901,
93-
"200089": 408901
65+
"200045": 404501,
66+
"200067": 406701,
67+
"200004": 400401,
68+
"200009": 400901,
69+
"200076": 407601,
70+
"200083": 408301,
71+
"200037": 403701,
72+
"200082": 408201,
73+
"200085": 408501,
74+
"200024": 402401,
75+
"200065": 406501,
76+
"200023": 402301,
77+
"200080": 408001,
78+
"200084": 408401,
79+
"200051": 405101,
80+
"200090": 409001,
81+
"200046": 404601,
82+
"200059": 405901,
83+
"200061": 406101,
84+
"200088": 408801,
85+
"200079": 407901,
86+
"200019": 401901,
87+
"200011": 401101,
88+
"200077": 407701,
89+
"200049": 404901,
90+
"200016": 401601,
91+
"200028": 402801,
92+
"200047": 404701,
93+
"200010": 401001
9494
},
9595
"nickname": "",
9696
"starCharacter": [],
@@ -101,26 +101,8 @@
101101
"viewsPresets": [
102102
[
103103
{
104-
"slot": 0,
105-
"item_id": 305001,
106-
"type": 0,
107-
"item_id_list": []
108-
},
109-
{
110-
"slot": 1,
111-
"item_id": 305007,
112-
"type": 0,
113-
"item_id_list": []
114-
},
115-
{
116-
"slot": 2,
117-
"item_id": 305010,
118-
"type": 0,
119-
"item_id_list": []
120-
},
121-
{
122-
"slot": 3,
123-
"item_id": 305011,
104+
"slot": 5,
105+
"item_id": 305500,
124106
"type": 0,
125107
"item_id_list": []
126108
}

src/modder.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,6 @@ impl Modder {
237237
for p in &mut msg.players {
238238
self.change_player(p).await;
239239
}
240-
info!("Respond authGame: {:?}", msg);
241240
modified_data = Some(msg.encode_to_vec());
242241
}
243242
".lq.Lobby.fetchTitleList" => {
@@ -398,6 +397,10 @@ impl Modder {
398397
[MOD_SETTINGS.read().await.preset_index as usize]
399398
.clone(),
400399
);
400+
// avatar_frame id is view.item_id which view.slot is 5
401+
if let Some(frame) = p.views.iter().find(|v| v.slot == 5) {
402+
p.avatar_frame = frame.item_id;
403+
}
401404
}
402405
}
403406
if MOD_SETTINGS.read().await.show_server() {

0 commit comments

Comments
 (0)