Merge branch 'main' of gitea.bywaystudios.com:wuminzhe/docs

# Conflicts:
#	config/MergeData.xlsx

tool/cfg/cfg_xlsx.json

@@ -73,6 +73,20 @@
             "sheet_name" :"StartOrder",
             "fields" :["Id", "merge_id_list", "appear", "reward","preview"]
         },
+        {
+            "in_file": "OrderData.xlsx",
+            "out_file": "OrderConst.json",
+            "key": "Key",
+            "sheet_name" :"Const",
+            "fields" :["Key", "Value"]
+        },
+        {
+            "in_file": "OrderData.xlsx",
+            "out_file": "OrderScene.json",
+            "key": "Sence",
+            "sheet_name" :"OrderScene",
+            "fields" :["Factor"]
+        },
         {
             "in_file": "UserData.xlsx",
             "out_file": "UserData.json",