|
@@ -5,33 +5,10 @@
|
|
|
</component>
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="19bfabb9-fe2e-4e01-a01b-df7ac5ab759f" name="更改" comment="">
|
|
<list default="true" id="19bfabb9-fe2e-4e01-a01b-df7ac5ab759f" name="更改" comment="">
|
|
|
- <change beforePath="$PROJECT_DIR$/.idea/.idea.GameClient/.idea/projectSettingsUpdater.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.GameClient/.idea/projectSettingsUpdater.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/.idea.GameClient/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.GameClient/.idea/workspace.xml" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/.idea/.idea.GameClient/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.GameClient/.idea/workspace.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/Assets/AssetBundleCollectorSetting.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/AssetBundleCollectorSetting.asset" afterDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Utils/ResPathUtil.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Utils/ResPathUtil.cs" afterDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/1.meta" beforeDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/1/FangZhengHeiTiJianTi-1.ttf" beforeDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/1/FangZhengHeiTiJianTi-1.ttf.meta" beforeDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/2.meta" beforeDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/2/FZKTJW--GB1-0.ttf" beforeDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/2/FZKTJW--GB1-0.ttf.meta" beforeDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/2/SourceHanSerifCN-Bold-2.otf" beforeDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/2/SourceHanSerifCN-Bold-2.otf.meta" beforeDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/3.meta" beforeDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/3/SourceHanSerifCN-ExtraLight-3.otf" beforeDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/3/SourceHanSerifCN-ExtraLight-3.otf.meta" beforeDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/4.meta" beforeDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/4/SourceHanSerifCN-Heavy-4.otf" beforeDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/4/SourceHanSerifCN-Heavy-4.otf.meta" beforeDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/4/SourceHanSerifCN-Light-5.otf" beforeDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/4/SourceHanSerifCN-Light-5.otf.meta" beforeDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/4/SourceHanSerifCN-Medium-6.otf" beforeDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/4/SourceHanSerifCN-Medium-6.otf.meta" beforeDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/5.meta" beforeDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/5/SourceHanSerifCN-Regular-1.otf" beforeDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/5/SourceHanSerifCN-Regular-1.otf.meta" beforeDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/5/SourceHanSerifCN-SemiBold-7.otf" beforeDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/Assets/ResIn/Font/5/SourceHanSerifCN-SemiBold-7.otf.meta" beforeDir="false" />
|
|
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Controller/GameController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Controller/GameController.cs" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/Game/HotUpdate/Platform/QDJGameManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Game/HotUpdate/Platform/QDJGameManager.cs" afterDir="false" />
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/Assets/YooAsset/Runtime/PackageSystem/ResourcePackage.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/YooAsset/Runtime/PackageSystem/ResourcePackage.cs" afterDir="false" />
|
|
|
</list>
|
|
</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" />
|
|
@@ -49,6 +26,7 @@
|
|
|
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/683a2b31bf9142429c44f02c75dbc6c913ce00/6d/b884eed9/Object.cs" root0="FORCE_HIGHLIGHTING" />
|
|
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/683a2b31bf9142429c44f02c75dbc6c913ce00/6d/b884eed9/Object.cs" root0="FORCE_HIGHLIGHTING" />
|
|
|
<setting file="file://$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/ExcelConfig/Partical/StoryLevelCfg.cs" root0="SKIP_HIGHLIGHTING" />
|
|
<setting file="file://$PROJECT_DIR$/Assets/Game/CSShare/GFG/HotUpdate/ExcelConfig/Partical/StoryLevelCfg.cs" root0="SKIP_HIGHLIGHTING" />
|
|
|
<setting file="file://$PROJECT_DIR$/Assets/Game/Launcher/Views/Alert/Alert.cs" root0="FORCE_HIGHLIGHTING" />
|
|
<setting file="file://$PROJECT_DIR$/Assets/Game/Launcher/Views/Alert/Alert.cs" root0="FORCE_HIGHLIGHTING" />
|
|
|
|
|
+ <setting file="file://$PROJECT_DIR$/Assets/Game/Launcher/Views/FullScreenTextView.cs" root0="SKIP_HIGHLIGHTING" />
|
|
|
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.unity.ugui@1.0.0/Runtime/UI/Core/InputField.cs" root0="SKIP_HIGHLIGHTING" />
|
|
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.unity.ugui@1.0.0/Runtime/UI/Core/InputField.cs" root0="SKIP_HIGHLIGHTING" />
|
|
|
</component>
|
|
</component>
|
|
|
<component name="ProjectColorInfo">{
|
|
<component name="ProjectColorInfo">{
|
|
@@ -60,24 +38,24 @@
|
|
|
<option name="hideEmptyMiddlePackages" value="true" />
|
|
<option name="hideEmptyMiddlePackages" value="true" />
|
|
|
<option name="showLibraryContents" value="true" />
|
|
<option name="showLibraryContents" value="true" />
|
|
|
</component>
|
|
</component>
|
|
|
- <component name="PropertiesComponent"><![CDATA[{
|
|
|
|
|
- "keyToString": {
|
|
|
|
|
- "ModuleVcsDetector.initialDetectionPerformed": "true",
|
|
|
|
|
- "RunOnceActivity.OpenProjectViewOnStart": "true",
|
|
|
|
|
- "RunOnceActivity.ShowReadmeOnStart": "true",
|
|
|
|
|
- "RunOnceActivity.git.unshallow": "true",
|
|
|
|
|
- "WebServerToolWindowFactoryState": "false",
|
|
|
|
|
- "XThreadsFramesViewSplitterKey": "0.6236111",
|
|
|
|
|
- "git-widget-placeholder": "H5sdk",
|
|
|
|
|
- "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",
|
|
|
|
|
- "vue.rearranger.settings.migration": "true",
|
|
|
|
|
- "附加到 Unity 编辑器.附加到 Unity 编辑器.executor": "Debug"
|
|
|
|
|
|
|
+ <component name="PropertiesComponent">{
|
|
|
|
|
+ "keyToString": {
|
|
|
|
|
+ "ModuleVcsDetector.initialDetectionPerformed": "true",
|
|
|
|
|
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
|
|
|
|
|
+ "RunOnceActivity.ShowReadmeOnStart": "true",
|
|
|
|
|
+ "RunOnceActivity.git.unshallow": "true",
|
|
|
|
|
+ "WebServerToolWindowFactoryState": "false",
|
|
|
|
|
+ "XThreadsFramesViewSplitterKey": "0.6236111",
|
|
|
|
|
+ "git-widget-placeholder": "H5sdk",
|
|
|
|
|
+ "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",
|
|
|
|
|
+ "vue.rearranger.settings.migration": "true",
|
|
|
|
|
+ "附加到 Unity 编辑器.附加到 Unity 编辑器.executor": "Debug"
|
|
|
}
|
|
}
|
|
|
-}]]></component>
|
|
|
|
|
|
|
+}</component>
|
|
|
<component name="RunManager" selected="附加到 Unity 编辑器.附加到 Unity 编辑器">
|
|
<component name="RunManager" selected="附加到 Unity 编辑器.附加到 Unity 编辑器">
|
|
|
<configuration name="启动 Unity" type="RunUnityExe" factoryName="Unity Executable">
|
|
<configuration name="启动 Unity" type="RunUnityExe" factoryName="Unity Executable">
|
|
|
<option name="EXE_PATH" value="E:\ruanJian\2020.3.33f1c2\Editor\Unity.exe" />
|
|
<option name="EXE_PATH" value="E:\ruanJian\2020.3.33f1c2\Editor\Unity.exe" />
|
|
@@ -101,13 +79,15 @@
|
|
|
<option name="PTY_MODE" value="Auto" />
|
|
<option name="PTY_MODE" value="Auto" />
|
|
|
<method v="2" />
|
|
<method v="2" />
|
|
|
</configuration>
|
|
</configuration>
|
|
|
- <configuration name="附加到 Unity 编辑器" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="Unity Debug" show_console_on_std_err="false" show_console_on_std_out="false" port="50000" address="localhost">
|
|
|
|
|
|
|
+ <configuration name="附加到 Unity 编辑器" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="Unity Debug" show_console_on_std_err="false" show_console_on_std_out="false" port="50000" address="localhost" ignored-value-for-modified-check="34176">
|
|
|
<option name="allowRunningInParallel" value="false" />
|
|
<option name="allowRunningInParallel" value="false" />
|
|
|
<option name="listenPortForConnections" value="false" />
|
|
<option name="listenPortForConnections" value="false" />
|
|
|
- <option name="pid" />
|
|
|
|
|
|
|
+ <option name="pid" value="34176" />
|
|
|
<option name="projectPathOnTarget" />
|
|
<option name="projectPathOnTarget" />
|
|
|
<option name="runtimes">
|
|
<option name="runtimes">
|
|
|
- <list />
|
|
|
|
|
|
|
+ <list>
|
|
|
|
|
+ <MonoRuntime />
|
|
|
|
|
+ </list>
|
|
|
</option>
|
|
</option>
|
|
|
<option name="selectedOptions">
|
|
<option name="selectedOptions">
|
|
|
<list />
|
|
<list />
|
|
@@ -142,7 +122,9 @@
|
|
|
<workItem from="1751382825616" duration="6005000" />
|
|
<workItem from="1751382825616" duration="6005000" />
|
|
|
<workItem from="1751703018450" duration="3653000" />
|
|
<workItem from="1751703018450" duration="3653000" />
|
|
|
<workItem from="1751735130352" duration="28306000" />
|
|
<workItem from="1751735130352" duration="28306000" />
|
|
|
- <workItem from="1751800911301" duration="700000" />
|
|
|
|
|
|
|
+ <workItem from="1751800911301" duration="2198000" />
|
|
|
|
|
+ <workItem from="1751831002680" duration="3915000" />
|
|
|
|
|
+ <workItem from="1751909374445" duration="3014000" />
|
|
|
</task>
|
|
</task>
|
|
|
<servers />
|
|
<servers />
|
|
|
</component>
|
|
</component>
|
|
@@ -201,6 +183,45 @@
|
|
|
</properties>
|
|
</properties>
|
|
|
<option name="timeStamp" value="46" />
|
|
<option name="timeStamp" value="46" />
|
|
|
</line-breakpoint>
|
|
</line-breakpoint>
|
|
|
|
|
+ <line-breakpoint enabled="true" type="DotNet Breakpoints">
|
|
|
|
|
+ <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusShowView.cs</url>
|
|
|
|
|
+ <line>473</line>
|
|
|
|
|
+ <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Views\LuckyBox\LuckyBoxBonusShowView.cs" containingFunctionPresentation="方法 'ShowTurnItem'">
|
|
|
|
|
+ <startOffsets>
|
|
|
|
|
+ <option value="17355" />
|
|
|
|
|
+ </startOffsets>
|
|
|
|
|
+ <endOffsets>
|
|
|
|
|
+ <option value="17411" />
|
|
|
|
|
+ </endOffsets>
|
|
|
|
|
+ </properties>
|
|
|
|
|
+ <option name="timeStamp" value="55" />
|
|
|
|
|
+ </line-breakpoint>
|
|
|
|
|
+ <line-breakpoint enabled="true" type="DotNet Breakpoints">
|
|
|
|
|
+ <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusShowView.cs</url>
|
|
|
|
|
+ <line>355</line>
|
|
|
|
|
+ <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Views\LuckyBox\LuckyBoxBonusShowView.cs" containingFunctionPresentation="方法 'ClickItem'">
|
|
|
|
|
+ <startOffsets>
|
|
|
|
|
+ <option value="13419" />
|
|
|
|
|
+ </startOffsets>
|
|
|
|
|
+ <endOffsets>
|
|
|
|
|
+ <option value="13476" />
|
|
|
|
|
+ </endOffsets>
|
|
|
|
|
+ </properties>
|
|
|
|
|
+ <option name="timeStamp" value="59" />
|
|
|
|
|
+ </line-breakpoint>
|
|
|
|
|
+ <line-breakpoint enabled="true" type="DotNet Breakpoints">
|
|
|
|
|
+ <url>file://$PROJECT_DIR$/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusShowView.cs</url>
|
|
|
|
|
+ <line>353</line>
|
|
|
|
|
+ <properties documentPath="D:\gfgProject\gfg_dev\0A-GFGClient\5client_webgl\Client\GameClient\Assets\Game\HotUpdate\Views\LuckyBox\LuckyBoxBonusShowView.cs" containingFunctionPresentation="方法 'ClickItem'">
|
|
|
|
|
+ <startOffsets>
|
|
|
|
|
+ <option value="13357" />
|
|
|
|
|
+ </startOffsets>
|
|
|
|
|
+ <endOffsets>
|
|
|
|
|
+ <option value="13377" />
|
|
|
|
|
+ </endOffsets>
|
|
|
|
|
+ </properties>
|
|
|
|
|
+ <option name="timeStamp" value="60" />
|
|
|
|
|
+ </line-breakpoint>
|
|
|
<breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
|
|
<breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
|
|
|
<properties exception="System.OperationCanceledException" breakIfHandledByOtherCode="false" displayValue="System.OperationCanceledException" />
|
|
<properties exception="System.OperationCanceledException" breakIfHandledByOtherCode="false" displayValue="System.OperationCanceledException" />
|
|
|
<option name="timeStamp" value="48" />
|
|
<option name="timeStamp" value="48" />
|