Skip to content

Commit 9066a30

Browse files
committed
Merge branch 'dev' of github.com:small18/the_killer-nvgt into dev
2 parents 09546ed + 0c8b26a commit 9066a30

3 files changed

Lines changed: 34 additions & 2 deletions

File tree

changelog

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
2026年7月5日
2+
1·加入了antibiotic_pack
13
2026年5月3日
24
1·修复登录时客户端反复获取网络信息的bug。
35
2·使用string_deflate和string_inflate方法压缩数据包。

server/chars_encrypt.nvgt

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
void main ()
2+
{
3+
string[] chars=find_files("chars/*");
4+
for (uint i=0; i<chars.length(); i++)
5+
{
6+
change (chars[i]);
7+
}
8+
alert ("success",chars.length());
9+
}
10+
11+
void change (string dir)
12+
{
13+
14+
json_object js;
15+
file f;
16+
17+
f.open ("chars/"+dir,"rb");
18+
string _file=f.read();
19+
f.close();
20+
f.open ("chars/"+dir,"wb");
21+
f.write (string_aes_encrypt(_file,"jslkdjvoigvrvklsdfnkjfsklsdjlfkawejioejgiksrdfnhkjzskldjfklejgkivjkgjtjtestestejkij"));
22+
f.close ();
23+
}

server/tkserver.nvgt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ tempbanloop();
164164
}
165165
catch
166166
{
167-
167+
log ("error",get_exception_info()+":"+get_exception_line());
168168
}
169169
//loops();
170170
if(key_pressed(KEY_ESCAPE) || s_quit)
@@ -2840,6 +2840,13 @@ players[index].give("antibiotic",50);
28402840
play("gift",players[index].x,players[index].y,players[index].z,players[index].map);
28412841
players[index].give("empty_pack", 1);
28422842
}
2843+
else if(wname=="antibiotic_pack")
2844+
{
2845+
takeobj = true;
2846+
players[index].give("antibiotic",20);
2847+
play("gift",players[index].x,players[index].y,players[index].z,players[index].map);
2848+
players[index].give("empty_pack", 1);
2849+
}
28432850
else if(wname=="gas_mask")
28442851
{
28452852
takeobj=false;
@@ -7962,7 +7969,7 @@ send_reliable(id, "loggedin", 0);
79627969
}
79637970
catch
79647971
{
7965-
alert (get_exception_info(),get_exception_line());
7972+
//alert (get_exception_info(),get_exception_line());
79667973
}
79677974
}
79687975
}

0 commit comments

Comments
 (0)