|
|
|
|
@@ -5,20 +5,16 @@
|
|
|
|
|
</component>
|
|
|
|
|
<component name="ChangeListManager">
|
|
|
|
|
<list default="true" id="daf2f20f-cec5-4df6-9f50-2b8f79af7b7d" name="Changes" comment="">
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/.idea.TowerCraneVisualization_HDRP_master/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.TowerCraneVisualization_HDRP_master/.idea/workspace.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/Assets/LRC/Material/HDRP_Material/unify/TowerAppearance_Mat.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/LRC/Material/HDRP_Material/unify/TowerAppearance_Mat.mat" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/Assets/LRC/Prefab/TowerCrane/TowerCrane_1.5.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/LRC/Prefab/TowerCrane/TowerCrane_1.5.prefab" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/Assets/LRC/Prefab/TowerCrane/TowerCrane_1.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/LRC/Prefab/TowerCrane/TowerCrane_1.prefab" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/Assets/LRC/Scripts/TowerCrane/TowerCraneControlManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/LRC/Scripts/TowerCrane/TowerCraneControlManager.cs" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/Packages/com.lrss3.debugdimensiondrawindicator/Runtime/Script/Draw/IndicatorRayTrace.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/com.lrss3.debugdimensiondrawindicator/Runtime/Script/Draw/IndicatorRayTrace.cs" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/Packages/com.lrss3.xericlibrary/Runtime/CustomDrawer/GroupAttribute.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/com.lrss3.xericlibrary/Runtime/CustomDrawer/GroupAttribute.cs" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/Packages/com.lrss3.xericlibrary/Runtime/MicroLibrary/MacroList.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/com.lrss3.xericlibrary/Runtime/MicroLibrary/MacroList.cs" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/Packages/com.lrss3.xericlibrary/Runtime/MicroLibrary/MacroSmooth.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/com.lrss3.xericlibrary/Runtime/MicroLibrary/MacroSmooth.cs" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/Packages/com.lrss3.xericlibrary/Runtime/Type/Base/Bool1.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/com.lrss3.xericlibrary/Runtime/Type/Base/Bool1.cs" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/Packages/com.lrss3.xericlibrary/Runtime/Type/Base/Bool3.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/com.lrss3.xericlibrary/Runtime/Type/Base/Bool3.cs" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/Packages/com.lrss3.xericlibrary/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/com.lrss3.xericlibrary/package.json" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/ProjectSettings/EditorBuildSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/EditorBuildSettings.asset" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/ProjectSettings/ProjectSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/ProjectSettings.asset" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/Packages/com.lrss3.debugdimensiondrawindicator/Runtime/Shader/HDRP/BoxIndicator/BoxCrisperding_SG.shadergraph" beforeDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/Packages/com.lrss3.debugdimensiondrawindicator/Runtime/Shader/HDRP/BoxIndicator/BoxCrisperding_SG.shadergraph.meta" beforeDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/Packages/com.lrss3.debugdimensiondrawindicator/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/com.lrss3.debugdimensiondrawindicator/package.json" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/Packages/com.lrss3.xericlibrary/Runtime/Type/Screen/CanvasZoomAdjustmentBase.cs" beforeDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/Packages/com.lrss3.xericlibrary/Runtime/Type/Screen/CanvasZoomAdjustmentBase.cs.meta" beforeDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/Packages/com.lrss3.xericlibrary/Runtime/Type/Screen/CanvasZoomStart.cs" beforeDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/Packages/com.lrss3.xericlibrary/Runtime/Type/Screen/CanvasZoomStart.cs.meta" beforeDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/Packages/com.lrss3.xericlibrary/Runtime/Visual/ShaderFunc/Color/Desaturate.shadersubgraph" beforeDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/Packages/com.lrss3.xericlibrary/Runtime/Visual/ShaderFunc/Color/Desaturate.shadersubgraph.meta" beforeDir="false" />
|
|
|
|
|
</list>
|
|
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
|
|
@@ -26,14 +22,17 @@
|
|
|
|
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
|
|
|
|
</component>
|
|
|
|
|
<component name="Git.Settings">
|
|
|
|
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
|
|
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/Packages/com.lrss3.debugdimensiondrawindicator" />
|
|
|
|
|
<option name="ROOT_SYNC" value="DONT_SYNC" />
|
|
|
|
|
</component>
|
|
|
|
|
<component name="HighlightingSettingsPerFile">
|
|
|
|
|
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/3b18519be5f3486abcce4fd34ea6dcd915d800/9e/b464fa63/Screen.cs" root0="SKIP_HIGHLIGHTING" />
|
|
|
|
|
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/3b18519be5f3486abcce4fd34ea6dcd915d800/cc/42676668/ShimManager.cs" root0="SKIP_HIGHLIGHTING" />
|
|
|
|
|
<setting file="file://$PROJECT_DIR$/../CloudPointTest/Packages/com.lrss3.longrangecloudpoint/Runtime/Flie/Ply3dFlie.cs" root0="SKIP_HIGHLIGHTING" />
|
|
|
|
|
<setting file="file://$PROJECT_DIR$/Assets/LRC/Material/HDRP_Shader/effect2d/Decal_CircleWave_SD.shader" root0="SKIP_HIGHLIGHTING" />
|
|
|
|
|
<setting file="file://$PROJECT_DIR$/Assets/LRC/Scripts/UI/element/SamplePanle/SpPointCarSet.cs" root0="FORCE_HIGHLIGHTING" />
|
|
|
|
|
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.unity.render-pipelines.high-definition@13.1.9/Editor/BuildProcessors/HDRPPreprocessBuild.cs" root0="SKIP_HIGHLIGHTING" />
|
|
|
|
|
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.unity.render-pipelines.high-definition@13.1.9/Runtime/Material/Lit/Lit.shader" root0="SKIP_HIGHLIGHTING" />
|
|
|
|
|
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.unity.textmeshpro@3.0.6/Scripts/Runtime/TMP_Settings.cs" root0="SKIP_HIGHLIGHTING" />
|
|
|
|
|
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.unity.visualeffectgraph@13.1.9/Editor/Models/VFXGraph.cs" root0="SKIP_HIGHLIGHTING" />
|
|
|
|
|
</component>
|
|
|
|
|
<component name="MarkdownSettingsMigration">
|
|
|
|
|
<option name="stateVersion" value="1" />
|
|
|
|
|
@@ -53,12 +52,12 @@
|
|
|
|
|
"RunOnceActivity.OpenProjectViewOnStart": "true",
|
|
|
|
|
"RunOnceActivity.ShowReadmeOnStart": "true",
|
|
|
|
|
"WebServerToolWindowFactoryState": "false",
|
|
|
|
|
"git-widget-placeholder": "LRC",
|
|
|
|
|
"git-widget-placeholder": "master",
|
|
|
|
|
"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": "power.mode.ii",
|
|
|
|
|
"settings.editor.selected.configurable": "preferences.build.unityPlugin",
|
|
|
|
|
"vue.rearranger.settings.migration": "true"
|
|
|
|
|
},
|
|
|
|
|
"keyToStringList": {
|
|
|
|
|
@@ -145,7 +144,9 @@
|
|
|
|
|
<workItem from="1701937463287" duration="729000" />
|
|
|
|
|
<workItem from="1701938735746" duration="10996000" />
|
|
|
|
|
<workItem from="1701994002953" duration="2924000" />
|
|
|
|
|
<workItem from="1702001579232" duration="1228000" />
|
|
|
|
|
<workItem from="1702001579232" duration="7040000" />
|
|
|
|
|
<workItem from="1702018845051" duration="2426000" />
|
|
|
|
|
<workItem from="1702103746735" duration="3094000" />
|
|
|
|
|
</task>
|
|
|
|
|
<servers />
|
|
|
|
|
</component>
|
|
|
|
|
|