Merge branch 'main' of https://scove-vault.duckdns.org/scove/HALLUCINATION
This commit is contained in:
13
.idea/.idea.HALLUCINATE/.idea/workspace.xml
generated
13
.idea/.idea.HALLUCINATE/.idea/workspace.xml
generated
@@ -6,15 +6,7 @@
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="f9183c68-daf0-43b8-be4c-fad79983f91b" name="Changes" comment="">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/.idea.HALLUCINATE/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.HALLUCINATE/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/POLY STYLE - Fantasy Treasure Chest/Fantasy Treasure Chest_URP/Settings/UniversalRP-HighQuality.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/POLY STYLE - Fantasy Treasure Chest/Fantasy Treasure Chest_URP/Settings/UniversalRP-HighQuality.asset" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/POLY STYLE - Fantasy Treasure Chest/Fantasy Treasure Chest_URP/Settings/UniversalRP-LowQuality.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/POLY STYLE - Fantasy Treasure Chest/Fantasy Treasure Chest_URP/Settings/UniversalRP-LowQuality.asset" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/POLY STYLE - Fantasy Treasure Chest/Fantasy Treasure Chest_URP/Settings/UniversalRP-MediumQuality.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/POLY STYLE - Fantasy Treasure Chest/Fantasy Treasure Chest_URP/Settings/UniversalRP-MediumQuality.asset" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/FinishGate.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/FinishGate.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/PlayerInventory.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/PlayerInventory.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/TreasureItem.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/TreasureItem.cs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Third Parties/Invector-3rdPersonController/Basic Locomotion/Scripts/Generic/Utils/Editor/Resources/EntityPreview/EntityPreview.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/Invector-3rdPersonController/Basic Locomotion/Scripts/Generic/Utils/Editor/Resources/EntityPreview/EntityPreview.mat" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Third Parties/Invector-3rdPersonController/ItemManager/Textures/New UI/InventoryCamera.renderTexture" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/Invector-3rdPersonController/ItemManager/Textures/New UI/InventoryCamera.renderTexture" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Third Parties/Invector-3rdPersonController/Shooter/Scripts/ThrowSystem/UI/CustomProjector/RangeIndicator.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/Invector-3rdPersonController/Shooter/Scripts/ThrowSystem/UI/CustomProjector/RangeIndicator.mat" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Scenes/Cho môn AI/Only AI.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/Cho môn AI/Only AI.unity" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Assets/Third Parties/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/ProjectSettings/EditorBuildSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/EditorBuildSettings.asset" afterDir="false" />
|
||||
</list>
|
||||
@@ -185,7 +177,8 @@
|
||||
<workItem from="1780141455151" duration="159000" />
|
||||
<workItem from="1780141729457" duration="9450000" />
|
||||
<workItem from="1780364354282" duration="4357000" />
|
||||
<workItem from="1780409218377" duration="9423000" />
|
||||
<workItem from="1780409218377" duration="9852000" />
|
||||
<workItem from="1780494322686" duration="643000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
@@ -5,15 +5,15 @@ EditorBuildSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Scenes:
|
||||
- enabled: 1
|
||||
path: "Assets/Scenes/Cho m\xF4n AI/Only AI.unity"
|
||||
guid: ce9b0298cc4351c4e82ac9f2339113de
|
||||
- enabled: 1
|
||||
path: Assets/Scenes/UI.unity
|
||||
guid: 9feda3fec581ecb4aa311e4a937c625a
|
||||
- enabled: 1
|
||||
path: Assets/Scenes/Main Scene.unity
|
||||
guid: f6f338855ad36644f8143c150efa4089
|
||||
- enabled: 1
|
||||
path: "Assets/Scenes/Cho m\xF4n AI/Only AI.unity"
|
||||
guid: ce9b0298cc4351c4e82ac9f2339113de
|
||||
m_configObjects:
|
||||
com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3}
|
||||
m_UseUCBPForAssetBundles: 0
|
||||
|
||||
Reference in New Issue
Block a user