Skip to content

Commit ee7b357

Browse files
committed
support TuanjieWebData
1 parent a15c51f commit ee7b357

2 files changed

Lines changed: 33 additions & 30 deletions

File tree

‎UnityPy/files/WebFile.py‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def __init__(self, reader: EndianBinaryReader, parent: File, name=None, **kwargs
3838

3939
# signature check
4040
signature = reader.read_string_to_null()
41-
if signature != "UnityWebData1.0":
41+
if not signature.startswith(("UnityWebData", "TuanjieWebData")):
4242
return
4343
self.signature = signature
4444

@@ -79,16 +79,14 @@ def save(
7979
writer.write_string_to_null(signature)
8080

8181
# data offset
82-
offset = sum(
83-
[
84-
writer.Position, # signature
85-
sum(
86-
len(path.encode("utf-8")) for path in files.keys()
87-
), # path of each file
88-
4 * 3 * len(files), # 3 ints per file
89-
4, # offset int
90-
]
91-
)
82+
offset = sum([
83+
writer.Position, # signature
84+
sum(
85+
len(path.encode("utf-8")) for path in files.keys()
86+
), # path of each file
87+
4 * 3 * len(files), # 3 ints per file
88+
4, # offset int
89+
])
9290

9391
writer.write_int(offset)
9492

‎UnityPy/helpers/ImportHelper.py‎

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
FileSourceType = Union[str, bytes, bytearray, io.IOBase]
1313

14+
1415
def file_name_without_extension(file_name: str) -> str:
1516
return os.path.join(
1617
os.path.dirname(file_name), os.path.splitext(os.path.basename(file_name))[0]
@@ -45,7 +46,9 @@ def find_all_files(directory: str, search_str: str) -> List[str]:
4546
]
4647

4748

48-
def check_file_type(input_: FileSourceType) -> Tuple[Optional[FileType], Optional[EndianBinaryReader]]:
49+
def check_file_type(
50+
input_: FileSourceType,
51+
) -> Tuple[Optional[FileType], Optional[EndianBinaryReader]]:
4952
if isinstance(input_, str) and os.path.isfile(input_):
5053
reader = EndianBinaryReader(open(input_, "rb"))
5154
elif isinstance(input_, EndianBinaryReader):
@@ -65,11 +68,11 @@ def check_file_type(input_: FileSourceType) -> Tuple[Optional[FileType], Optiona
6568
if signature in [
6669
"UnityWeb",
6770
"UnityRaw",
68-
"\xFA\xFA\xFA\xFA\xFA\xFA\xFA\xFA",
71+
"\xfa\xfa\xfa\xfa\xfa\xfa\xfa\xfa",
6972
"UnityFS",
7073
]:
7174
return FileType.BundleFile, reader
72-
elif signature == "UnityWebData1.0":
75+
elif signature.startswith(("UnityWebData", "TuanjieWebData")):
7376
return FileType.WebFile, reader
7477
elif signature == "PK\x03\x04":
7578
return FileType.ZIP, reader
@@ -109,18 +112,16 @@ def check_file_type(input_: FileSourceType) -> Tuple[Optional[FileType], Optiona
109112
reader.endian = old_endian
110113
reader.Position = 0
111114
# check info
112-
if any(
113-
(
114-
version < 0,
115-
version > 100,
116-
*[
117-
x < 0 or x > reader.Length
118-
for x in [file_size, metadata_size, version, data_offset]
119-
],
120-
file_size < metadata_size,
121-
file_size < data_offset,
122-
)
123-
):
115+
if any((
116+
version < 0,
117+
version > 100,
118+
*[
119+
x < 0 or x > reader.Length
120+
for x in [file_size, metadata_size, version, data_offset]
121+
],
122+
file_size < metadata_size,
123+
file_size < data_offset,
124+
)):
124125
return FileType.ResourceFile, reader
125126
else:
126127
return FileType.AssetsFile, reader
@@ -131,13 +132,17 @@ def parse_file(
131132
parent: files.File,
132133
name: str,
133134
typ: Optional[FileType] = None,
134-
is_dependency: bool = False
135+
is_dependency: bool = False,
135136
) -> Union[files.File, EndianBinaryReader]:
136137
if typ is None:
137138
typ, _ = check_file_type(reader)
138-
if typ == FileType.AssetsFile and not name.endswith(
139-
(".resS", ".resource", ".config", ".xml", ".dat")
140-
):
139+
if typ == FileType.AssetsFile and not name.endswith((
140+
".resS",
141+
".resource",
142+
".config",
143+
".xml",
144+
".dat",
145+
)):
141146
f = files.SerializedFile(reader, parent, name=name, is_dependency=is_dependency)
142147
elif typ == FileType.BundleFile:
143148
f = files.BundleFile(reader, parent, name=name, is_dependency=is_dependency)

0 commit comments

Comments
 (0)