Merge branch 'master' of http://10.30.3.90:3001/Tianzhaohui/HeBoSuoCAVE_51

2024-07-02 10:02:27 +08:00 · 2024-07-02 10:02:27 +08:00 · d38fdb3623
parent 24cf0e801a 64d2ab61aa
commit d38fdb3623
14 changed files with 1 additions and 0 deletions
--- a/Config/DefaultEngine.ini
+++ b/Config/DefaultEngine.ini
@ -3,6 +3,7 @@
 [/Script/EngineSettings.GameMapsSettings]
 GameDefaultMap=/Game/Maps/GansuCAVEMaster.GansuCAVEMaster
 GameInstanceClass=/NewCAVESystem/GameplayFramework/CAVECore/CAVEGameInstance.CAVEGameInstance_C
 EditorStartupMap=/Game/Maps/hebosuo1.hebosuo1
 [/Script/WindowsTargetPlatform.WindowsTargetSettings]
 DefaultGraphicsRHI=DefaultGraphicsRHI_DX12
--- a/Content/Sequencer/3DText/3DText_Sequence_BP.uasset
+++ b/Content/Sequencer/3DText/3DText_Sequence_BP.uasset
--- a/Content/Sequencer/BP_MeasureMarkTool/BP_MeasureMarker.uasset
+++ b/Content/Sequencer/BP_MeasureMarkTool/BP_MeasureMarker.uasset
--- a/Content/Sequencer/HeBoSuo_B_Sequence.uasset
+++ b/Content/Sequencer/HeBoSuo_B_Sequence.uasset
--- a/Content/Sequencer/HeBoSuo_DL_Sequence.uasset
+++ b/Content/Sequencer/HeBoSuo_DL_Sequence.uasset
--- a/Content/Sequencer/HeBoSuo_HBSYZ_Sequence.uasset
+++ b/Content/Sequencer/HeBoSuo_HBSYZ_Sequence.uasset
--- a/Content/Sequencer/HeBoSuo_HD_Sequence.uasset
+++ b/Content/Sequencer/HeBoSuo_HD_Sequence.uasset
--- a/Content/Sequencer/HeBoSuo_HK_Sequence.uasset
+++ b/Content/Sequencer/HeBoSuo_HK_Sequence.uasset
--- a/Content/Sequencer/HeBoSuo_JZJZ_Sequence.uasset
+++ b/Content/Sequencer/HeBoSuo_JZJZ_Sequence.uasset
--- a/Content/Sequencer/HeBoSuo_N_Sequence.uasset
+++ b/Content/Sequencer/HeBoSuo_N_Sequence.uasset
--- a/Content/Sequencer/HeBoSuo_SJ_Sequence.uasset
+++ b/Content/Sequencer/HeBoSuo_SJ_Sequence.uasset
--- a/Content/Sequencer/HeBoSuo_Totality_Sequence.uasset
+++ b/Content/Sequencer/HeBoSuo_Totality_Sequence.uasset
--- a/Content/Sequencer/HeBoSuo_WW_Sequence.uasset
+++ b/Content/Sequencer/HeBoSuo_WW_Sequence.uasset
--- a/Content/Sequencer/HeBoSuo_X_Sequence.uasset
+++ b/Content/Sequencer/HeBoSuo_X_Sequence.uasset