push before merge
This commit is contained in:
benroshio
parent
8a16a189df
commit
dafcf19ad4
hwanyoung2
Content
FMOD/Desktop
Hwanyoung
Character/PlayerCharacter/Playables/Haesol/Animations
Levels
Illusions
.cache
buildrecords/Desktop
fsbcache/Desktop
1CA6CC10.fobj2BE87DD4.fobj2CBF1416.fobj46CD53C6.fobj5033A088.fobj71B27784.fobjB59CCC19.fobjCD803ABE.fobjE69665D7.fobjEF371689.fobjF6958427.fobj
{1398de11-cb1d-4f33-8375-570ac31aa133}.pdc{14837715-a9d5-4db7-b6f1-a43d0e9e453c}.pdc{32fb788c-9449-4ab8-afb8-4565e44c1877}.pdc{7193869a-af7a-4abf-ac2e-d663b6b44edd}.pdc{77947158-2d26-4632-97d4-48b1fb13eff9}.pdc{7b317089-ccca-48ae-9f1a-6b8308200c06}.pdc{8f1e7d26-73b7-4fd0-b70d-d621062ebc01}.pdc{9320f236-2680-4849-a8b0-e89d8e97eb9b}.pdc{c907e405-b074-4509-a611-e558b6236d99}.pdc{d6fa3d66-6061-46d9-a4a9-b2b12b49d71b}.pdc{eb42c67b-328e-4f48-9cf4-86f7f8606e26}.pdc{f08f8278-b9e0-4c6e-adb2-26d38eb751d4}.pdc{f4661c20-951a-4c8b-8886-b59aba783988}.pdc{f48ef6b7-3953-4d2f-9430-de1d318a7cc7}.pdc.unsaved/.user/Metadata
.user/Metadata
Metadata/Event
Intermediate/ReimportCache
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/ABP_Haesol1.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/ABP_Haesol1.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Levels/Textures/Near_Water.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/Levels/Textures/Near_Water.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Levels/Textures/Near_Water_Ground_LayerInfo.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Levels/Textures/Near_Water_Ground_LayerInfo.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Levels/Textures/Rock.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/Hwanyoung/Levels/Textures/Rock.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Levels/Textures/Rock_LayerInfo.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Levels/Textures/Rock_LayerInfo.uasset
(Stored with Git LFS)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -13,7 +13,7 @@
|
||||
<value>Event Editor 1</value>
|
||||
</property>
|
||||
<property name="windowLayout">
|
||||
<value>AAAACQAAABQAUAByAG8AZgBpAGwAZQByACAAMQAAAEIB2dDLAAMAAP/////////4AAAKAAAABXgAAAMOAAABpQAABy0AAATVAAAAAAIAAAAKAAAAAAAAAAAXAAAJ/wAABXcAAAAgAFAAcgBlAHMAZQB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAAAAAzHAAADIAAADlgAAAYPAAAMyAAAAz8AAA5XAAAGDgAAAAEAAAAACgAAAAzIAAADPwAADlcAAAYOAAAAHgBNAGkAeABlAHIAIABSAG8AdQB0AGkAbgBnACAAMQAAAEIB2dDLAAMAAAAABDcAAAE1AAAFyAAABCQAAAQ4AAABVAAABccAAAQjAAAAAAAAAAAKAAAABDgAAAFUAAAFxwAABCMAAAAOAE0AaQB4AGUAcgAgADIAAABCAdnQywADAAAAAAI+AAABHgAABs0AAAT9AAACPwAAAT0AAAbMAAAE/AAAAAAAAAAACgAAAAI/AAABPQAABswAAAT8AAAADgBNAGkAeABlAHIAIAAxAAAAQgHZ0MsAAwAA///6lgAAAJL///8lAAADgf//+pcAAACx////JAAAA4AAAAABAAAAAAeA///6lwAAALH///8kAAADgAAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAyAAAAQgHZ0MsAAwAA//////////gAAAeAAAAEEAAAAicAAAEoAAAGRgAAAssAAAAAAgAAAAeAAAAAAAAAABcAAAd/AAAEDwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAA///4fwAAAAIAAAAAAAAEGv//+7IAAACU////0QAAA4IAAAABAgAAAAeA///4gAAAACH/////AAAEGQAAAB4ARQB2AGUAbgB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAD///t4AAAAgf///QkAAANw///7eQAAAKD///0IAAADbwAAAAEAAAAAB4D///t5AAAAoP///QgAAANvAAAAFgBBAHUAZABpAG8AIABCAGkAbgAgADEAAABCAdnQywADAAAAAAQ3AAABNQAABcgAAAQkAAAEOAAAAVQAAAXHAAAEIwAAAAAAAAAACgAAAAQ4AAABVAAABccAAAQj</value>
|
||||
<value>AAAACQAAABQAUAByAG8AZgBpAGwAZQByACAAMQAAAEIB2dDLAAMAAP/////////4AAAKAAAABXgAAAMOAAABpQAABy0AAATVAAAAAAIAAAAKAAAAAAAAAAAXAAAJ/wAABXcAAAAgAFAAcgBlAHMAZQB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAAAAAzHAAADIAAADlgAAAYPAAAMyAAAAz8AAA5XAAAGDgAAAAEAAAAACgAAAAzIAAADPwAADlcAAAYOAAAAHgBNAGkAeABlAHIAIABSAG8AdQB0AGkAbgBnACAAMQAAAEIB2dDLAAMAAAAABDcAAAE1AAAFyAAABCQAAAQ4AAABVAAABccAAAQjAAAAAAAAAAAKAAAABDgAAAFUAAAFxwAABCMAAAAOAE0AaQB4AGUAcgAgADIAAABCAdnQywADAAAAAAI+AAABHgAABs0AAAT9AAACPwAAAT0AAAbMAAAE/AAAAAAAAAAACgAAAAI/AAABPQAABswAAAT8AAAADgBNAGkAeABlAHIAIAAxAAAAQgHZ0MsAAwAAAAAAhQAAAaEAAAUUAAAEkAAAAIYAAAHAAAAFEwAABI8AAAAAAAAAAAoAAAAAhgAAAcAAAAUTAAAEjwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAyAAAAQgHZ0MsAAwAA//////////gAAAeAAAAEEAAAAicAAAEoAAAGRgAAAssAAAAAAgAAAAeAAAAAAAAAABcAAAd/AAAEDwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAAAAAAAAAAAAAAAAT/AAAFdwAAAAEAAAAfAAAE/gAABXYAAAAAAAAAAAoAAAAAAQAAAB8AAAT+AAAFdgAAAB4ARQB2AGUAbgB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAD///t4AAAAgf///QkAAANw///7eQAAAKD///0IAAADbwAAAAEAAAAAB4D///t5AAAAoP///QgAAANvAAAAFgBBAHUAZABpAG8AIABCAGkAbgAgADEAAABCAdnQywADAAAAAAQ3AAABNQAABcgAAAQkAAAEOAAAAVQAAAXHAAAEIwAAAAAAAAAACgAAAAQ4AAABVAAABccAAAQj</value>
|
||||
</property>
|
||||
<relationship name="activePlatform">
|
||||
<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
<value>Event Editor 1</value>
|
||||
</property>
|
||||
<property name="windowLayout">
|
||||
<value>AAAACQAAABQAUAByAG8AZgBpAGwAZQByACAAMQAAAEIB2dDLAAMAAP/////////4AAAKAAAABXgAAAMOAAABpQAABy0AAATVAAAAAAIAAAAKAAAAAAAAAAAXAAAJ/wAABXcAAAAgAFAAcgBlAHMAZQB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAAAAAzHAAADIAAADlgAAAYPAAAMyAAAAz8AAA5XAAAGDgAAAAEAAAAACgAAAAzIAAADPwAADlcAAAYOAAAAHgBNAGkAeABlAHIAIABSAG8AdQB0AGkAbgBnACAAMQAAAEIB2dDLAAMAAAAABDcAAAE1AAAFyAAABCQAAAQ4AAABVAAABccAAAQjAAAAAAAAAAAKAAAABDgAAAFUAAAFxwAABCMAAAAOAE0AaQB4AGUAcgAgADIAAABCAdnQywADAAAAAAI+AAABHgAABs0AAAT9AAACPwAAAT0AAAbMAAAE/AAAAAAAAAAACgAAAAI/AAABPQAABswAAAT8AAAADgBNAGkAeABlAHIAIAAxAAAAQgHZ0MsAAwAA///6lgAAAJL///8lAAADgf//+pcAAACx////JAAAA4AAAAABAAAAAAeA///6lwAAALH///8kAAADgAAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAyAAAAQgHZ0MsAAwAA//////////gAAAeAAAAEEAAAAicAAAEoAAAGRgAAAssAAAAAAgAAAAeAAAAAAAAAABcAAAd/AAAEDwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAA///4fwAAAAIAAAAAAAAEGv//+7IAAACU////0QAAA4IAAAABAgAAAAeA///4gAAAACH/////AAAEGQAAAB4ARQB2AGUAbgB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAD///t4AAAAgf///QkAAANw///7eQAAAKD///0IAAADbwAAAAEAAAAAB4D///t5AAAAoP///QgAAANvAAAAFgBBAHUAZABpAG8AIABCAGkAbgAgADEAAABCAdnQywADAAAAAAQ3AAABNQAABcgAAAQkAAAEOAAAAVQAAAXHAAAEIwAAAAAAAAAACgAAAAQ4AAABVAAABccAAAQj</value>
|
||||
<value>AAAACQAAABQAUAByAG8AZgBpAGwAZQByACAAMQAAAEIB2dDLAAMAAP/////////4AAAKAAAABXgAAAMOAAABpQAABy0AAATVAAAAAAIAAAAKAAAAAAAAAAAXAAAJ/wAABXcAAAAgAFAAcgBlAHMAZQB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAAAAAzHAAADIAAADlgAAAYPAAAMyAAAAz8AAA5XAAAGDgAAAAEAAAAACgAAAAzIAAADPwAADlcAAAYOAAAAHgBNAGkAeABlAHIAIABSAG8AdQB0AGkAbgBnACAAMQAAAEIB2dDLAAMAAAAABDcAAAE1AAAFyAAABCQAAAQ4AAABVAAABccAAAQjAAAAAAAAAAAKAAAABDgAAAFUAAAFxwAABCMAAAAOAE0AaQB4AGUAcgAgADIAAABCAdnQywADAAAAAAI+AAABHgAABs0AAAT9AAACPwAAAT0AAAbMAAAE/AAAAAAAAAAACgAAAAI/AAABPQAABswAAAT8AAAADgBNAGkAeABlAHIAIAAxAAAAQgHZ0MsAAwAAAAAAhQAAAaEAAAUUAAAEkAAAAIYAAAHAAAAFEwAABI8AAAAAAAAAAAoAAAAAhgAAAcAAAAUTAAAEjwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAyAAAAQgHZ0MsAAwAA//////////gAAAeAAAAEEAAAAicAAAEoAAAGRgAAAssAAAAAAgAAAAeAAAAAAAAAABcAAAd/AAAEDwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAAAAAAAAAAAAAAAAT/AAAFdwAAAAEAAAAfAAAE/gAABXYAAAAAAAAAAAoAAAAAAQAAAB8AAAT+AAAFdgAAAB4ARQB2AGUAbgB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAD///t4AAAAgf///QkAAANw///7eQAAAKD///0IAAADbwAAAAEAAAAAB4D///t5AAAAoP///QgAAANvAAAAFgBBAHUAZABpAG8AIABCAGkAbgAgADEAAABCAdnQywADAAAAAAQ3AAABNQAABcgAAAQkAAAEOAAAAVQAAAXHAAAEIwAAAAAAAAAACgAAAAQ4AAABVAAABccAAAQj</value>
|
||||
</property>
|
||||
<relationship name="activePlatform">
|
||||
<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>
|
||||
|
||||
@ -56,7 +56,11 @@
|
||||
<destination>{93fb17f3-d0a1-44d7-b7e3-9f060d84622a}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="EventAutomatableProperties" id="{f35d5548-f9b3-45f8-be48-19d78423b626}" />
|
||||
<object class="EventAutomatableProperties" id="{f35d5548-f9b3-45f8-be48-19d78423b626}">
|
||||
<property name="maximumDistance">
|
||||
<value>200</value>
|
||||
</property>
|
||||
</object>
|
||||
<object class="MarkerTrack" id="{5fe8a501-1cdc-4491-be9b-ffb3286183e6}" />
|
||||
<object class="GroupTrack" id="{5ebb2df9-41d2-4c51-919a-322e37175abc}">
|
||||
<relationship name="modules">
|
||||
|
||||
@ -118,6 +118,9 @@
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="EventMixerGroup" id="{c534fed0-9e1a-4596-b51c-732d3da20085}">
|
||||
<property name="volume">
|
||||
<value>-6.5</value>
|
||||
</property>
|
||||
<property name="name">
|
||||
<value>Audio 1</value>
|
||||
</property>
|
||||
@ -164,16 +167,13 @@
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="SingleSound" id="{06bd91c0-1045-437b-bb2d-0a371a31d753}">
|
||||
<property name="volume">
|
||||
<value>-11</value>
|
||||
</property>
|
||||
<relationship name="audioFile">
|
||||
<destination>{f4661c20-951a-4c8b-8886-b59aba783988}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="SingleSound" id="{350fb2a5-bb08-40d3-a3be-7ea683fa2bf5}">
|
||||
<property name="volume">
|
||||
<value>-13.5</value>
|
||||
<value>-3.5</value>
|
||||
</property>
|
||||
<relationship name="audioFile">
|
||||
<destination>{f08f8278-b9e0-4c6e-adb2-26d38eb751d4}</destination>
|
||||
@ -189,7 +189,7 @@
|
||||
</object>
|
||||
<object class="SingleSound" id="{ad7b4967-02e0-44b9-8629-ce6449861aeb}">
|
||||
<property name="volume">
|
||||
<value>-14</value>
|
||||
<value>-6</value>
|
||||
</property>
|
||||
<relationship name="audioFile">
|
||||
<destination>{77947158-2d26-4632-97d4-48b1fb13eff9}</destination>
|
||||
@ -197,7 +197,7 @@
|
||||
</object>
|
||||
<object class="SingleSound" id="{fabdb011-5b6b-44dc-b748-9ed8a19671dd}">
|
||||
<property name="volume">
|
||||
<value>-11</value>
|
||||
<value>-2.5</value>
|
||||
</property>
|
||||
<relationship name="audioFile">
|
||||
<destination>{f4661c20-951a-4c8b-8886-b59aba783988}</destination>
|
||||
|
||||
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user