diff --git a/Content/Developers/RJ/Material/B_SJ.uasset b/Content/Developers/RJ/Material/B_SJ.uasset new file mode 100644 index 00000000..15b564bf Binary files /dev/null and b/Content/Developers/RJ/Material/B_SJ.uasset differ diff --git a/Content/Maps/hebosuo1.umap b/Content/Maps/hebosuo1.umap index e89f8a8f..a4988401 100644 Binary files a/Content/Maps/hebosuo1.umap and b/Content/Maps/hebosuo1.umap differ diff --git a/Content/Sequencer/3DText/3DText_Sequence_BP.uasset b/Content/Sequencer/3DText/3DText_Sequence_BP.uasset new file mode 100644 index 00000000..1f1ce7e2 Binary files /dev/null and b/Content/Sequencer/3DText/3DText_Sequence_BP.uasset differ diff --git a/Content/Sequencer/BP_MeasureMarkTool/BP_MeasureMarker.uasset b/Content/Sequencer/BP_MeasureMarkTool/BP_MeasureMarker.uasset new file mode 100644 index 00000000..33b36918 Binary files /dev/null and b/Content/Sequencer/BP_MeasureMarkTool/BP_MeasureMarker.uasset differ diff --git a/Content/Sequencer/BP_MeasureMarkTool/MeasureTextFont.uasset b/Content/Sequencer/BP_MeasureMarkTool/MeasureTextFont.uasset new file mode 100644 index 00000000..f054f6bd Binary files /dev/null and b/Content/Sequencer/BP_MeasureMarkTool/MeasureTextFont.uasset differ diff --git a/Content/Sequencer/BP_MeasureMarkTool/TextMaterial.uasset b/Content/Sequencer/BP_MeasureMarkTool/TextMaterial.uasset new file mode 100644 index 00000000..70c2e51a Binary files /dev/null and b/Content/Sequencer/BP_MeasureMarkTool/TextMaterial.uasset differ diff --git a/Content/Sequencer/BP_MeasureMarkTool/TextMaterial_Inst.uasset b/Content/Sequencer/BP_MeasureMarkTool/TextMaterial_Inst.uasset new file mode 100644 index 00000000..5834c64e Binary files /dev/null and b/Content/Sequencer/BP_MeasureMarkTool/TextMaterial_Inst.uasset differ diff --git a/Content/Sequencer/HeBoSuo_B_Sequence.uasset b/Content/Sequencer/HeBoSuo_B_Sequence.uasset index e2362288..e532d720 100644 Binary files a/Content/Sequencer/HeBoSuo_B_Sequence.uasset and b/Content/Sequencer/HeBoSuo_B_Sequence.uasset differ diff --git a/Content/Sequencer/HeBoSuo_DL_Sequence.uasset b/Content/Sequencer/HeBoSuo_DL_Sequence.uasset index 66f1bb63..38609fbd 100644 Binary files a/Content/Sequencer/HeBoSuo_DL_Sequence.uasset and b/Content/Sequencer/HeBoSuo_DL_Sequence.uasset differ diff --git a/Content/Sequencer/HeBoSuo_HBSYZ_Sequence.uasset b/Content/Sequencer/HeBoSuo_HBSYZ_Sequence.uasset index acc5ef41..92b03f15 100644 Binary files a/Content/Sequencer/HeBoSuo_HBSYZ_Sequence.uasset and b/Content/Sequencer/HeBoSuo_HBSYZ_Sequence.uasset differ diff --git a/Content/Sequencer/HeBoSuo_HD_Sequence.uasset b/Content/Sequencer/HeBoSuo_HD_Sequence.uasset index 69956260..f5eecb20 100644 Binary files a/Content/Sequencer/HeBoSuo_HD_Sequence.uasset and b/Content/Sequencer/HeBoSuo_HD_Sequence.uasset differ diff --git a/Content/Sequencer/HeBoSuo_HK_Sequence.uasset b/Content/Sequencer/HeBoSuo_HK_Sequence.uasset index dc924580..28f88e8b 100644 Binary files a/Content/Sequencer/HeBoSuo_HK_Sequence.uasset and b/Content/Sequencer/HeBoSuo_HK_Sequence.uasset differ diff --git a/Content/Sequencer/HeBoSuo_JZJZ_Sequence.uasset b/Content/Sequencer/HeBoSuo_JZJZ_Sequence.uasset index 5314cc5f..204ad632 100644 Binary files a/Content/Sequencer/HeBoSuo_JZJZ_Sequence.uasset and b/Content/Sequencer/HeBoSuo_JZJZ_Sequence.uasset differ diff --git a/Content/Sequencer/HeBoSuo_N_Sequence.uasset b/Content/Sequencer/HeBoSuo_N_Sequence.uasset index f580fcc5..a979f7a4 100644 Binary files a/Content/Sequencer/HeBoSuo_N_Sequence.uasset and b/Content/Sequencer/HeBoSuo_N_Sequence.uasset differ diff --git a/Content/Sequencer/HeBoSuo_SJ_Sequence.uasset b/Content/Sequencer/HeBoSuo_SJ_Sequence.uasset index 281683c7..8a6ccfac 100644 Binary files a/Content/Sequencer/HeBoSuo_SJ_Sequence.uasset and b/Content/Sequencer/HeBoSuo_SJ_Sequence.uasset differ diff --git a/Content/Sequencer/HeBoSuo_WW_Sequence.uasset b/Content/Sequencer/HeBoSuo_WW_Sequence.uasset index d2bd6a9d..8b826c7c 100644 Binary files a/Content/Sequencer/HeBoSuo_WW_Sequence.uasset and b/Content/Sequencer/HeBoSuo_WW_Sequence.uasset differ diff --git a/Content/Sequencer/HeBoSuo_X_Sequence.uasset b/Content/Sequencer/HeBoSuo_X_Sequence.uasset index a1b643fb..46024be0 100644 Binary files a/Content/Sequencer/HeBoSuo_X_Sequence.uasset and b/Content/Sequencer/HeBoSuo_X_Sequence.uasset differ diff --git a/HeBoSuo_51.uproject b/HeBoSuo_51.uproject index afd0edc2..10712d58 100644 --- a/HeBoSuo_51.uproject +++ b/HeBoSuo_51.uproject @@ -100,12 +100,17 @@ ] }, { +<<<<<<< HEAD "Name": "SteamVR", "Enabled": true, "SupportedTargetPlatforms": [ "Win64", "Linux" ] +======= + "Name": "Text3D", + "Enabled": true +>>>>>>> b2f728d9235a46ad62d5e7c7de21eb82ae37a1ca } ] } \ No newline at end of file