Merge branch 'develop' of http://8.134.253.64:3000/huangjinghao/FishConfig into develop

.gitignore

@@ -8,4 +8,3 @@
 /GameConfig/ts
 /GameConfig/Xml
 /GameConfig/Code
-/.idea

.idea/.gitignore

@@ -0,0 +1,10 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Environment-dependent path to Maven home directory
+/mavenHomeManager.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

.idea/FishConfig.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/encodings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
+    <file url="file://$PROJECT_DIR$/protocol/client2center_msg_type.proto" charset="GBK" />
+  </component>
+</project>

.idea/git_toolbox_prj.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitToolBoxProjectSettings">
+    <option name="commitMessageIssueKeyValidationOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+    <option name="commitMessageValidationEnabledOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+  </component>
+</project>

.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-17" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/FishConfig.iml" filepath="$PROJECT_DIR$/.idea/FishConfig.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

GameConfig/CFG.check

@@ -1,6 +1,6 @@
 D:\git\newWork\Config\GameConfig\M_game_battle_field.xls:-1668593709
 D:\git\newWork\Config\GameConfig\M_monster.xls:-1235680395
-D:\git\newWork\Config\GameConfig\M_i18n.xls:1797769440
+D:\git\newWork\Config\GameConfig\M_i18n.xls:435805162
 D:\git\newWork\Config\GameConfig\M_un_lock_battle.xls:84348074
 D:\git\newWork\Config\GameConfig\M_everyday_task.xls:949185213
 D:\git\newWork\Config\GameConfig\M_vip_config.xls:1878630432
@@ -8,10 +8,10 @@ D:\git\newWork\Config\GameConfig\M_equipment.xls:32694818
 D:\git\newWork\Config\GameConfig\M_game_level_config.xls:-610292667
 D:\git\newWork\Config\GameConfig\M_magic_array_config.xls:-124973679
 D:\git\newWork\Config\GameConfig\M_shop.xls:-598498963
-D:\git\newWork\Config\GameConfig\M_item.xls:2021392483
+D:\git\newWork\Config\GameConfig\M_item.xls:1206281347
 D:\git\newWork\Config\GameConfig\M_fish_scheme.xls:435403286
 D:\git\newWork\Config\GameConfig\M_Global_Config.xls:-1360155821
-D:\git\newWork\Config\GameConfig\M_hero.xls:-182339952
+D:\git\newWork\Config\GameConfig\M_hero.xls:-1988414807
 D:\git\newWork\Config\GameConfig\SensitiveWordCFG.xls:-583314849
 D:\git\newWork\Config\GameConfig\M_skill.xls:1915571819
 D:\git\newWork\Config\GameConfig\M_test.xls:444037689