|
|
@@ -4,7 +4,10 @@
|
|
|
<option name="autoReloadType" value="SELECTIVE" />
|
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="1f770e58-b781-4cb0-ad93-4c50994f611d" name="Changes" comment="" />
|
|
|
+ <list default="true" id="1f770e58-b781-4cb0-ad93-4c50994f611d" name="Changes" comment="">
|
|
|
+ <change beforePath="$PROJECT_DIR$/.idea/.idea.DCGO/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.DCGO/.idea/workspace.xml" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/CardEffect/EX7/Green/Pteromon_EX7_031.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/EX7/Green/Pteromon_EX7_031.cs" afterDir="false" />
|
|
|
+ </list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
|
@@ -14,37 +17,45 @@
|
|
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
|
</component>
|
|
|
<component name="HighlightingSettingsPerFile">
|
|
|
- <setting file="file://$PROJECT_DIR$/../../Student/gl-finalproj-main/Assets/_app/scripts/CharacterController.cs" root0="SKIP_HIGHLIGHTING" />
|
|
|
+ <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/5a41d6b7189842eca409fd0b1c3e3dcf17bf78/2e/fa7fef25/Enumerable.cs" root0="SKIP_HIGHLIGHTING" />
|
|
|
+ <setting file="file://$PROJECT_DIR$/Assets/Scripts/CardEffectCommons/KeyWordEffects/Vortex.cs" root0="FORCE_HIGHLIGHTING" />
|
|
|
+ <setting file="file://$PROJECT_DIR$/Assets/Scripts/CardEffectFactory/KeyWordEffects/Vortex.cs" root0="FORCE_HIGHLIGHTING" />
|
|
|
+ <setting file="file://$PROJECT_DIR$/Library/PackageCache/com.unity.render-pipelines.universal@12.1.8/Editor/AssetPostProcessors/FBXMaterialDescriptionPreprocessor.cs" root0="SKIP_HIGHLIGHTING" />
|
|
|
</component>
|
|
|
<component name="MarkdownSettingsMigration">
|
|
|
<option name="stateVersion" value="1" />
|
|
|
</component>
|
|
|
+ <component name="ProjectColorInfo">{
|
|
|
+ "customColor": "",
|
|
|
+ "associatedIndex": 6
|
|
|
+}</component>
|
|
|
<component name="ProjectId" id="2aUjfF6J92VxM63xUEftfeNMtuU" />
|
|
|
<component name="ProjectViewState">
|
|
|
<option name="hideEmptyMiddlePackages" value="true" />
|
|
|
<option name="showLibraryContents" value="true" />
|
|
|
</component>
|
|
|
- <component name="PropertiesComponent">{
|
|
|
- "keyToString": {
|
|
|
- "RunOnceActivity.OpenProjectViewOnStart": "true",
|
|
|
- "RunOnceActivity.ShowReadmeOnStart": "true",
|
|
|
- "WebServerToolWindowFactoryState": "false",
|
|
|
- "git-widget-placeholder": "Release-Updates",
|
|
|
- "node.js.detected.package.eslint": "true",
|
|
|
- "node.js.detected.package.tslint": "true",
|
|
|
- "node.js.selected.package.eslint": "(autodetect)",
|
|
|
- "node.js.selected.package.tslint": "(autodetect)",
|
|
|
- "settings.editor.selected.configurable": "preferences.fileTypes",
|
|
|
- "vue.rearranger.settings.migration": "true"
|
|
|
+ <component name="PropertiesComponent"><![CDATA[{
|
|
|
+ "keyToString": {
|
|
|
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
|
|
|
+ "RunOnceActivity.ShowReadmeOnStart": "true",
|
|
|
+ "WebServerToolWindowFactoryState": "false",
|
|
|
+ "git-widget-placeholder": "EX7-Yellow-Green",
|
|
|
+ "node.js.detected.package.eslint": "true",
|
|
|
+ "node.js.detected.package.tslint": "true",
|
|
|
+ "node.js.selected.package.eslint": "(autodetect)",
|
|
|
+ "node.js.selected.package.tslint": "(autodetect)",
|
|
|
+ "nodejs_package_manager_path": "npm",
|
|
|
+ "settings.editor.selected.configurable": "preferences.fileTypes",
|
|
|
+ "vue.rearranger.settings.migration": "true"
|
|
|
},
|
|
|
- "keyToStringList": {
|
|
|
- "rider.external.source.directories": [
|
|
|
- "C:\\Users\\wwm0n\\AppData\\Roaming\\JetBrains\\Rider2023.1\\resharper-host\\DecompilerCache",
|
|
|
- "C:\\Users\\wwm0n\\AppData\\Roaming\\JetBrains\\Rider2023.1\\resharper-host\\SourcesCache",
|
|
|
- "C:\\Users\\wwm0n\\AppData\\Local\\Symbols\\src"
|
|
|
+ "keyToStringList": {
|
|
|
+ "rider.external.source.directories": [
|
|
|
+ "C:\\Users\\Andrej\\AppData\\Roaming\\JetBrains\\Rider2024.1\\resharper-host\\DecompilerCache",
|
|
|
+ "C:\\Users\\Andrej\\AppData\\Roaming\\JetBrains\\Rider2024.1\\resharper-host\\SourcesCache",
|
|
|
+ "C:\\Users\\Andrej\\AppData\\Local\\Symbols\\src"
|
|
|
]
|
|
|
}
|
|
|
-}</component>
|
|
|
+}]]></component>
|
|
|
<component name="RunManager" selected="Attach to Unity Editor.Attach to Unity Editor">
|
|
|
<configuration name="Standalone Player" type="RunUnityExe" factoryName="Unity Executable">
|
|
|
<option name="EXE_PATH" value="$USER_HOME$/Desktop/DCGO/DCGO_Standalone_Beta/Game\DCGO.exe" />
|
|
|
@@ -105,7 +116,8 @@
|
|
|
<workItem from="1715820047500" duration="30965000" />
|
|
|
<workItem from="1719540359999" duration="395000" />
|
|
|
<workItem from="1720456596917" duration="698000" />
|
|
|
- <workItem from="1725387928890" duration="5000000" />
|
|
|
+ <workItem from="1722408646322" duration="10730000" />
|
|
|
+ <workItem from="1722421835652" duration="1365000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
@@ -113,6 +125,11 @@
|
|
|
<option name="version" value="3" />
|
|
|
</component>
|
|
|
<component name="UnityProjectConfiguration" hasMinimizedUI="true" />
|
|
|
+ <component name="UnityProjectDiscoverer">
|
|
|
+ <option name="hasUnityReference" value="true" />
|
|
|
+ <option name="unityProject" value="true" />
|
|
|
+ <option name="unityProjectFolder" value="true" />
|
|
|
+ </component>
|
|
|
<component name="UnityUnitTestConfiguration" currentTestLauncher="Both" />
|
|
|
<component name="VcsManagerConfiguration">
|
|
|
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
|