tried to solve merge conflicts with the thing

This commit is contained in:
Ji Yoon Rhee
2025-02-02 00:15:55 +09:00
parent 7077da1397
commit 38b2151bb3
294 changed files with 0 additions and 16816 deletions

View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.02.00">
<object class="EncodableAsset" id="{1b856cb2-adc2-4b9a-bf94-82a4367fb566}">
<property name="assetPath">
<value>Music/</value>
</property>
<relationship name="masterAssetFolder">
<destination>{4f34473d-1e56-44db-8dd1-60284d90f95e}</destination>
</relationship>
</object>
</objects>

View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.02.00">
<object class="EncodableAsset" id="{38a59ef0-1dba-4f32-bc39-52a161cc27e4}">
<property name="assetPath">
<value>Combat/</value>
</property>
<relationship name="masterAssetFolder">
<destination>{4f34473d-1e56-44db-8dd1-60284d90f95e}</destination>
</relationship>
</object>
</objects>

View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.02.00">
<object class="EncodableAsset" id="{3c31f7b9-f2f2-4071-aebb-5a570bd7b5b9}">
<property name="assetPath">
<value>UI/</value>
</property>
<relationship name="masterAssetFolder">
<destination>{4f34473d-1e56-44db-8dd1-60284d90f95e}</destination>
</relationship>
</object>
</objects>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.02.00">
<object class="MasterAssetFolder" id="{4f34473d-1e56-44db-8dd1-60284d90f95e}" />
</objects>

View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.02.00">
<object class="EncodableAsset" id="{938c2496-ebae-4d3d-9231-e35f74c71494}">
<property name="assetPath">
<value>Combat/Buff Sword/</value>
</property>
<relationship name="masterAssetFolder">
<destination>{4f34473d-1e56-44db-8dd1-60284d90f95e}</destination>
</relationship>
</object>
</objects>