Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

# Conflicts:
#	Assets/Res/Config/SkillConfig.json   resolved by origin/master(远端) version
#	Excel2Json/Excel/skill.xlsx   resolved by origin/master(远端) version

.run/Attach to Unity Editor.run.xml

@@ -1,12 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Attach to Unity Editor" 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="74044">
-    <option name="allowRunningInParallel" value="false" />
-    <option name="listenPortForConnections" value="false" />
-    <option name="pid" value="74044" />
-    <option name="projectPathOnTarget" />
-    <option name="selectedOptions">
-      <list />
-    </option>
-    <method v="2" />
-  </configuration>
-</component>

Assets/Res/Config/EventConditionConfig.json

@@ -425,6 +425,38 @@
         10002,
         100
       ]
+    },
+    {
+      "ID": 11001,
+      "LanID": [
+        1914
+      ],
+      "ConditionType": null,
+      "optionType": null
+    },
+    {
+      "ID": 11002,
+      "ConditionType": null,
+      "optionType": 2,
+      "optionPara1": [
+        100001
+      ]
+    },
+    {
+      "ID": 11003,
+      "ConditionType": null,
+      "optionType": 4,
+      "optionPara1": [
+        1001
+      ]
+    },
+    {
+      "ID": 11004,
+      "ConditionType": null,
+      "optionType": 5,
+      "optionPara1": [
+        10
+      ]
     }
   ]
 }

Assets/Res/Config/SkillConfig.json

@@ -5687,7 +5687,7 @@
       "scriptName": "S3101",
       "IDGroup": 3101,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 1,
@@ -5710,7 +5710,7 @@
       "scriptName": "S3101",
       "IDGroup": 3101,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 2,
@@ -5742,7 +5742,7 @@
       "scriptName": "S3101",
       "IDGroup": 3101,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 3,
@@ -5776,7 +5776,7 @@
       "scriptName": "S3101",
       "IDGroup": 3101,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 4,
@@ -5810,7 +5810,7 @@
       "scriptName": "S3101",
       "IDGroup": 3101,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 5,
@@ -5844,7 +5844,7 @@
       "scriptName": "S3101",
       "IDGroup": 3101,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 6,
@@ -5876,13 +5876,13 @@
       "scriptName": "S3201",
       "IDGroup": 3201,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 1,
       "effectValue": [
         50.0,
-        9.0
+        12.0
       ],
       "intensifierIndex": [
         1
@@ -5900,13 +5900,13 @@
       "scriptName": "S3201",
       "IDGroup": 3201,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 2,
       "effectValue": [
         75.0,
-        9.0
+        12.0
       ],
       "intensifierIndex": [
         1
@@ -5924,13 +5924,13 @@
       "scriptName": "S3201",
       "IDGroup": 3201,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 3,
       "effectValue": [
         75.0,
-        9.0
+        12.0
       ],
       "intensifierIndex": [
         1
@@ -5957,13 +5957,13 @@
       "scriptName": "S3201",
       "IDGroup": 3201,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 4,
       "effectValue": [
         75.0,
-        9.0
+        12.0
       ],
       "intensifierIndex": [
         1
@@ -5992,13 +5992,13 @@
       "scriptName": "S3201",
       "IDGroup": 3201,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 5,
       "effectValue": [
         75.0,
-        9.0
+        12.0
       ],
       "intensifierIndex": [
         1
@@ -6027,13 +6027,13 @@
       "scriptName": "S3201",
       "IDGroup": 3201,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 6,
       "effectValue": [
         75.0,
-        9.0,
+        12.0,
         50.0
       ],
       "intensifierIndex": [
@@ -6060,14 +6060,14 @@
       "scriptName": "S3202",
       "IDGroup": 3202,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 1,
       "effectValue": [
-        10.0,
+        20.0,
         2.0,
-        12.0
+        18.0
       ],
       "intensifierIndex": [
         1
@@ -6085,14 +6085,14 @@
       "scriptName": "S3202",
       "IDGroup": 3202,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 2,
       "effectValue": [
-        10.0,
+        20.0,
         2.0,
-        12.0
+        18.0
       ],
       "intensifierIndex": [
         1
@@ -6119,14 +6119,14 @@
       "scriptName": "S3202",
       "IDGroup": 3202,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 3,
       "effectValue": [
-        10.0,
+        20.0,
         2.0,
-        12.0
+        18.0
       ],
       "intensifierIndex": [
         1
@@ -6155,14 +6155,14 @@
       "scriptName": "S3202",
       "IDGroup": 3202,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 4,
       "effectValue": [
-        10.0,
+        20.0,
         3.0,
-        12.0
+        18.0
       ],
       "intensifierIndex": [
         1
@@ -6188,14 +6188,14 @@
       "scriptName": "S3202",
       "IDGroup": 3202,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 5,
       "effectValue": [
-        10.0,
+        20.0,
         3.0,
-        12.0
+        18.0
       ],
       "intensifierIndex": [
         1
@@ -6224,14 +6224,14 @@
       "scriptName": "S3202",
       "IDGroup": 3202,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 6,
       "effectValue": [
-        10.0,
+        20.0,
         3.0,
-        12.0,
+        18.0,
         20.0
       ],
       "intensifierIndex": [
@@ -6258,14 +6258,14 @@
       "scriptName": "S3301",
       "IDGroup": 3301,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 1,
       "effectValue": [
         1.0,
-        6.0,
-        480.0
+        12.0,
+        1000.0
       ],
       "intensifierIndex": [
         2
@@ -6283,14 +6283,14 @@
       "scriptName": "S3301",
       "IDGroup": 3301,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 2,
       "effectValue": [
         2.0,
-        6.0,
-        480.0
+        12.0,
+        1000.0
       ],
       "intensifierIndex": [
         2
@@ -6308,14 +6308,14 @@
       "scriptName": "S3301",
       "IDGroup": 3301,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 3,
       "effectValue": [
         2.0,
-        6.0,
-        480.0
+        12.0,
+        1000.0
       ],
       "intensifierIndex": [
         2
@@ -6342,14 +6342,14 @@
       "scriptName": "S3301",
       "IDGroup": 3301,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 4,
       "effectValue": [
         2.0,
-        6.0,
-        480.0,
+        12.0,
+        1000.0,
         30.0
       ],
       "intensifierIndex": [
@@ -6374,14 +6374,14 @@
       "scriptName": "S3301",
       "IDGroup": 3301,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 5,
       "effectValue": [
         2.0,
-        6.0,
-        480.0,
+        12.0,
+        1000.0,
         30.0
       ],
       "intensifierIndex": [
@@ -6409,14 +6409,14 @@
       "scriptName": "S3301",
       "IDGroup": 3301,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 6,
       "effectValue": [
         2.0,
-        6.0,
-        480.0,
+        12.0,
+        1000.0,
         300.0
       ],
       "intensifierIndex": [
@@ -6441,7 +6441,7 @@
       "scriptName": "S3302",
       "IDGroup": 3302,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 1,
@@ -6461,7 +6461,7 @@
       "scriptName": "S3302",
       "IDGroup": 3302,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 2,
@@ -6481,7 +6481,7 @@
       "scriptName": "S3302",
       "IDGroup": 3302,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 3,
@@ -6501,7 +6501,7 @@
       "scriptName": "S3302",
       "IDGroup": 3302,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 4,
@@ -6521,7 +6521,7 @@
       "scriptName": "S3302",
       "IDGroup": 3302,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 5,
@@ -6541,7 +6541,7 @@
       "scriptName": "S3302",
       "IDGroup": 3302,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 6,
@@ -6561,13 +6561,13 @@
       "scriptName": "S3401",
       "IDGroup": 3401,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 1,
       "effectValue": [
         40.0,
-        9.0
+        12.0
       ],
       "intensifierIndex": [
         2
@@ -6585,13 +6585,13 @@
       "scriptName": "S3401",
       "IDGroup": 3401,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 2,
       "effectValue": [
         40.0,
-        9.0
+        12.0
       ],
       "intensifierIndex": [
         2
@@ -6618,13 +6618,13 @@
       "scriptName": "S3401",
       "IDGroup": 3401,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 3,
       "effectValue": [
         60.0,
-        9.0
+        12.0
       ],
       "intensifierIndex": [
         2
@@ -6648,13 +6648,13 @@
       "scriptName": "S3401",
       "IDGroup": 3401,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 4,
       "effectValue": [
         60.0,
-        9.0
+        12.0
       ],
       "intensifierIndex": [
         2
@@ -6683,13 +6683,13 @@
       "scriptName": "S3401",
       "IDGroup": 3401,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 5,
       "effectValue": [
         60.0,
-        9.0
+        12.0
       ],
       "intensifierIndex": [
         2
@@ -6718,13 +6718,13 @@
       "scriptName": "S3401",
       "IDGroup": 3401,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 6,
       "effectValue": [
         100.0,
-        9.0,
+        12.0,
         20.0,
         9.0
       ],
@@ -6752,7 +6752,7 @@
       "scriptName": "S3402",
       "IDGroup": 3402,
       "timelineName": "",
-      "cd": 24.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 1,
@@ -6772,7 +6772,7 @@
       "scriptName": "S3402",
       "IDGroup": 3402,
       "timelineName": "",
-      "cd": 24.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 2,
@@ -6795,7 +6795,7 @@
       "scriptName": "S3402",
       "IDGroup": 3402,
       "timelineName": "",
-      "cd": 24.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 3,
@@ -6827,7 +6827,7 @@
       "scriptName": "S3402",
       "IDGroup": 3402,
       "timelineName": "",
-      "cd": 24.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 4,
@@ -6858,7 +6858,7 @@
       "scriptName": "S3402",
       "IDGroup": 3402,
       "timelineName": "",
-      "cd": 24.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 5,
@@ -6892,13 +6892,13 @@
       "scriptName": "S3402",
       "IDGroup": 3402,
       "timelineName": "",
-      "cd": 24.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 6,
       "effectValue": [
         12.0,
-        10.0,
+        15.0,
         3.0
       ],
       "intensifierIndex": [
@@ -6925,13 +6925,13 @@
       "scriptName": "S3501",
       "IDGroup": 3501,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 1,
       "effectValue": [
         10.0,
-        9.0
+        12.0
       ],
       "intensifierIndex": [
         1
@@ -6949,13 +6949,13 @@
       "scriptName": "S3501",
       "IDGroup": 3501,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 2,
       "effectValue": [
         13.0,
-        9.0
+        12.0
       ],
       "intensifierIndex": [
         1
@@ -6973,13 +6973,13 @@
       "scriptName": "S3501",
       "IDGroup": 3501,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 3,
       "effectValue": [
         13.0,
-        9.0
+        12.0
       ],
       "intensifierIndex": [
         1
@@ -7006,13 +7006,13 @@
       "scriptName": "S3501",
       "IDGroup": 3501,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 4,
       "effectValue": [
         16.0,
-        9.0
+        12.0
       ],
       "intensifierIndex": [
         1
@@ -7036,13 +7036,13 @@
       "scriptName": "S3501",
       "IDGroup": 3501,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 5,
       "effectValue": [
         16.0,
-        9.0
+        12.0
       ],
       "intensifierIndex": [
         1
@@ -7069,13 +7069,13 @@
       "scriptName": "S3501",
       "IDGroup": 3501,
       "timelineName": "",
-      "cd": 30.0,
+      "cd": 80.0,
       "addcd": 0.0,
       "SkillType": 3,
       "level": 6,
       "effectValue": [
         20.0,
-        9.0
+        12.0
       ],
       "intensifierIndex": [
         1

Assets/Res/Config/TaskConditionConfig.json

@@ -1,7 +0,0 @@
-{
-  "configList": [
-    {},
-    {},
-    {}
-  ]
-}

Assets/Res/Config/TaskConditionConfig.json.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: Xn0etC38UHqsVuHceO72AcKjbyZ5jBWe/QQ2AUQDJ7/0ikGT3vxcfGjG2qMp
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Res/Config/TaskConfig.json

@@ -14,18 +14,7 @@
       "finishCount": 1,
       "unlockType": -1,
       "unlockLevel": 1,
-      "nextTaskID": 2,
-      "showType": 0,
-      "isInheritCount": -1,
-      "taskIcon": "asd",
-      "showCountValue": 1,
-      "startNoob2": 0,
-      "passPoint": 0,
-      "noTaskTracking": 0,
-      "notificationID": -1,
-      "triggerType": 1,
-      "loopType": 1,
-      "loopCount": 0
+      "nextTaskID": 2
     },
     {
       "ID": 2,
@@ -41,18 +30,7 @@
       "finishCount": 2,
       "unlockType": -1,
       "unlockLevel": 1,
-      "nextTaskID": 3,
-      "showType": 0,
-      "isInheritCount": -1,
-      "taskIcon": "asd",
-      "showCountValue": 1,
-      "startNoob2": 0,
-      "passPoint": 0,
-      "noTaskTracking": 0,
-      "notificationID": -1,
-      "triggerType": 1,
-      "loopType": 1,
-      "loopCount": 0
+      "nextTaskID": 3
     },
     {
       "ID": 3,
@@ -68,18 +46,7 @@
       "finishCount": 1,
       "unlockType": -1,
       "unlockLevel": 1,
-      "nextTaskID": 4,
-      "showType": 0,
-      "isInheritCount": -1,
-      "taskIcon": "asd",
-      "showCountValue": 1,
-      "startNoob2": 0,
-      "passPoint": 0,
-      "noTaskTracking": 0,
-      "notificationID": -1,
-      "triggerType": 1,
-      "loopType": 1,
-      "loopCount": 0
+      "nextTaskID": 4
     },
     {
       "ID": 4,
@@ -95,18 +62,7 @@
       "finishCount": 1,
       "unlockType": -1,
       "unlockLevel": 1,
-      "nextTaskID": 0,
-      "showType": 0,
-      "isInheritCount": -1,
-      "taskIcon": "asd",
-      "showCountValue": 1,
-      "startNoob2": 0,
-      "passPoint": 0,
-      "noTaskTracking": 0,
-      "notificationID": -1,
-      "triggerType": 1,
-      "loopType": 1,
-      "loopCount": 0
+      "nextTaskID": 0
     }
   ]
 }

Assets/Scripts/GameData/ExcelConfig/EventConditionConfig.cs

@@ -39,13 +39,13 @@ public int[] ConditionPara;
 
 
 		/// <summary>
-		///事件类型 1=提供选项 2=进入战斗 3=获得奖励
+		///事件类型 1=提供选项 2=进入战斗 3=获得奖励 4=道具检测 5=境界检查
 		/// </summary>
 public int optionType;
 
 
 		/// <summary>
-		///事件常量1 1=事件IDs 2=战斗ID 3=
+		///事件常量1 1=事件IDs 2=战斗ID 3= 4=检测道具id 5=境界ID
 		/// </summary>
 public int[] optionPara1;
 

Assets/Scripts/GameData/ExcelConfig/TaskConfig.cs

@@ -98,78 +98,6 @@ public int unlockLevel;
 public int nextTaskID;
 
 
-		/// <summary>
-		///0=激活时显示 1=前置任务领奖后显示
-		/// </summary>
-public int showType;
-
-
-		/// <summary>
-		///仅新手任务和成就任务生效 1=继承 2=不继承
-		/// </summary>
-public int isInheritCount;
-
-
-		/// <summary>
-		///完成时开启的任务
-		/// </summary>
-public int[] nextTaskId_1;
-
-
-		/// <summary>
-		///任务图标
-		/// </summary>
-public string taskIcon;
-
-
-		/// <summary>
-		///显示完成进度
-		/// </summary>
-public int showCountValue;
-
-
-		/// <summary>
-		///开启第二个新手任务
-		/// </summary>
-public int startNoob2;
-
-
-		/// <summary>
-		///通行证活动增加的点数 日常和周常任务才增加
-		/// </summary>
-public int passPoint;
-
-
-		/// <summary>
-		///任务通知不追踪进度变化
-		/// </summary>
-public int noTaskTracking;
-
-
-		/// <summary>
-		///通知描述
-		/// </summary>
-public int notificationID;
-
-
-		/// <summary>
-		///1=被动触发 2=生成触发
-		/// </summary>
-public int triggerType;
-
-
-		/// <summary>
-		///任务链循环类型 1=固定每日 2=固定每周 3=跟随活动
-		/// </summary>
-public int loopType;
-
-
-		/// <summary>
-		///循环次数 -1：无限次
-		/// </summary>
-public int loopCount;
-
-
 	}
 
 }

Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -146,8 +146,8 @@ namespace Fort23.Mono
 
 
             CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
-            AccountFileInfo.Instance.playerData.eventList.AddRange(eventLists);
-            AccountFileInfo.Instance.SavePlayerData();
+            // AccountFileInfo.Instance.playerData.eventList.AddRange(eventLists);
+            // AccountFileInfo.Instance.SavePlayerData();
             EventManager.Instance.Dispatch(CustomEventType.ShengShiOnClick, null);
         }
 

XiuXianGame.sln.DotSettings.user

@@ -1,5 +1,6 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAbstractProgressBar_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F56d039fe633a4adf8fb266a0b1797e6c17a000_003F40_003Fd60d7bd8_003FAbstractProgressBar_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AApplication_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F69_003F6bd97609_003FApplication_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAppStatusBar_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F1f63769030ae497a94b35af8517071579d5a00_003Fbc_003F8cd214f9_003FAppStatusBar_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAsyncInstantiateOperationHelper_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F3b_003F82aeb7a5_003FAsyncInstantiateOperationHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACollectionExtensions_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fde80aed0bd3646409e8bfb15c101f005e2000_003Fb3_003F5c77f01e_003FCollectionExtensions_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>