update
This commit is contained in:
22
.idea/.idea.BABA_YAGA/.idea/workspace.xml
generated
22
.idea/.idea.BABA_YAGA/.idea/workspace.xml
generated
@@ -4,25 +4,7 @@
|
|||||||
<option name="autoReloadType" value="SELECTIVE" />
|
<option name="autoReloadType" value="SELECTIVE" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="d308d1cb-09fc-4331-ba20-00f7b43d1576" name="Changes" comment="">
|
<list default="true" id="d308d1cb-09fc-4331-ba20-00f7b43d1576" name="Changes" comment="" />
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/.idea.BABA_YAGA/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.BABA_YAGA/.idea/workspace.xml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Materials/Ground.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Materials/Ground.mat" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Prefabs/Item Manager/InventoryCameraPreview.prefab" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Prefabs/Item Manager/InventoryCameraPreview.prefab.meta" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Prefabs/Item Manager/Inventory_MeleeOnly.prefab" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Prefabs/Item Manager/Inventory_MeleeOnly.prefab.meta" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Prefabs/Item Manager/Inventory_ShooterMelee.prefab" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Prefabs/Item Manager/Inventory_ShooterMelee.prefab.meta" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Prefabs/Item Manager/Inventory_ShooterOnly.prefab" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Prefabs/Item Manager/Inventory_ShooterOnly.prefab.meta" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Prefabs/Item Manager/Inventory_TesteComDisplay3d.prefab" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Prefabs/Item Manager/Inventory_TesteComDisplay3d.prefab.meta" beforeDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Scenes/Main Scene.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/Main Scene.unity" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Items/Flashlight/VolumetricCone.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Items/Flashlight/VolumetricCone.mat" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Scene/Hall/HallwayFloorEmissive1.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Scene/Hall/HallwayFloorEmissive1.mat" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Prefabs/Scene/Hall/HallEnd.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Prefabs/Scene/Hall/HallEnd.prefab" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Prefabs/Scene/Hall/HallEnd.prefab.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Prefabs/Scene/Hall/HallEnd.prefab.meta" afterDir="false" />
|
|
||||||
</list>
|
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||||
@@ -134,7 +116,7 @@
|
|||||||
<workItem from="1781412609976" duration="4823000" />
|
<workItem from="1781412609976" duration="4823000" />
|
||||||
<workItem from="1781578060019" duration="4632000" />
|
<workItem from="1781578060019" duration="4632000" />
|
||||||
<workItem from="1781727437862" duration="1257000" />
|
<workItem from="1781727437862" duration="1257000" />
|
||||||
<workItem from="1781765548760" duration="8019000" />
|
<workItem from="1781765548760" duration="8210000" />
|
||||||
</task>
|
</task>
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
|
|||||||
Reference in New Issue
Block a user