Auto stash before merge of "main" and "origin/main"
This commit is contained in:
@ -0,0 +1,11 @@
|
||||
<?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>
|
@ -0,0 +1,11 @@
|
||||
<?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>
|
@ -0,0 +1,11 @@
|
||||
<?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>
|
@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<objects serializationModel="Studio.02.02.00">
|
||||
<object class="MasterAssetFolder" id="{4f34473d-1e56-44db-8dd1-60284d90f95e}" />
|
||||
</objects>
|
@ -0,0 +1,11 @@
|
||||
<?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>
|
Reference in New Issue
Block a user