Merge branch 'master' of http://10.30.1.254:3000/MengJunBo/SXDarchaeological53

Conflicts: Content/AAA_UMG/WBP_IEnd.uasset Content/Developers/RJ/FX/BP/UMG_FloatingChar.uasset
添加音频、全流程自动化--
2025-09-27 19:58:52 +08:00 · 2025-09-27 19:42:16 +08:00
126 changed files with 5 additions and 2 deletions
--- a/Config/DefaultGame.ini
+++ b/Config/DefaultGame.ini
@ -17,7 +17,7 @@ IncludeDebugFiles=False
 BlueprintNativizationMethod=Disabled
 bIncludeNativizedAssetsInProjectGeneration=False
 bExcludeMonolithicEngineHeadersInNativizedCode=False
-UsePakFile=False
+UsePakFile=True
 bUseIoStore=False
 bUseZenStore=False
 bMakeBinaryConfig=False
--- a/Config/DefaultGameplayTags.ini
+++ b/Config/DefaultGameplayTags.ini
@ -12,7 +12,9 @@ NumBitsForContainerSize=6
 NetIndexFirstBitSegment=16
 +GameplayTagList=(Tag="AutoGoThrough",DevComment="")
 +GameplayTagList=(Tag="AutoGoThrough.ChuShiSanXingDui",DevComment="")
-+GameplayTagList=(Tag="AutoHitButton",DevComment="")
+GameplayTagList=(Tag="AutoGoThrough.GeneralSkip",DevComment="")
 +GameplayTagList=(Tag="AutoGoThrough.KanTanFaJue",DevComment="")
 +GameplayTagList=(Tag="AutoGoThrough.KanTanFaJue.CaiJi.Disable",DevComment="")
 +GameplayTagList=(Tag="NeverCameback",DevComment="")
 +GameplayTagList=(Tag="NeverCameback.ChuShiSanXingDui",DevComment="")
 +GameplayTagList=(Tag="NeverCameback.ChuShiSanXingDui.Next",DevComment="")
@ -71,4 +73,5 @@ NetIndexFirstBitSegment=16
 +GameplayTagList=(Tag="UMGMessage.TextInfo",DevComment="")
 +GameplayTagList=(Tag="UMGMessage.TextInfo.PopDialogue",DevComment="")
 +GameplayTagList=(Tag="UMGMessage.TextInfo.PushDialogue",DevComment="")
 +GameplayTagList=(Tag="UMGMessage.TextInfo.PushNextDialogue",DevComment="")
--- a/Content/AAA_Data/DT_VodMaps.uasset
+++ b/Content/AAA_Data/DT_VodMaps.uasset
--- a/Content/AAA_Data/KengZhongData/BP_KengZhongWenWu.uasset
+++ b/Content/AAA_Data/KengZhongData/BP_KengZhongWenWu.uasset
--- a/Content/AAA_Scenarios/SceanrioContexts/SC_FJ_YiJiFenBu.uasset
+++ b/Content/AAA_Scenarios/SceanrioContexts/SC_FJ_YiJiFenBu.uasset
--- a/Content/AAA_Scenarios/SceanrioContexts/SC_KTFJ_caiji.uasset
+++ b/Content/AAA_Scenarios/SceanrioContexts/SC_KTFJ_caiji.uasset
--- a/Content/AAA_Scenarios/SceanrioContexts/SC_KTFJ_qingli.uasset
+++ b/Content/AAA_Scenarios/SceanrioContexts/SC_KTFJ_qingli.uasset
--- a/Content/AAA_Scenarios/SceanrioContexts/SC_SkipDirectly.uasset
+++ b/Content/AAA_Scenarios/SceanrioContexts/SC_SkipDirectly.uasset
--- a/Content/AAA_Scenarios/SceanrioContexts/SC_SkipSeqGT.uasset
+++ b/Content/AAA_Scenarios/SceanrioContexts/SC_SkipSeqGT.uasset
--- a/Content/AAA_Scenarios/SceanrioContexts/SC_UI_ThenGoNext.uasset
+++ b/Content/AAA_Scenarios/SceanrioContexts/SC_UI_ThenGoNext.uasset
--- a/Content/AAA_Scenarios/SceanrioContexts/SC_WaKeng.uasset
+++ b/Content/AAA_Scenarios/SceanrioContexts/SC_WaKeng.uasset
--- a/Content/AAA_Scenarios/ScenarioSequencer_GT.uasset
+++ b/Content/AAA_Scenarios/ScenarioSequencer_GT.uasset
--- a/Content/AAA_Scenarios/Supports/BP_SeqWorldHelper.uasset
+++ b/Content/AAA_Scenarios/Supports/BP_SeqWorldHelper.uasset
--- a/Content/AAA_UMG/MainUMG_ForTable.uasset
+++ b/Content/AAA_UMG/MainUMG_ForTable.uasset
--- a/Content/AAA_UMG/ScreenItems/WBP_ScreenStepInfo.uasset
+++ b/Content/AAA_UMG/ScreenItems/WBP_ScreenStepInfo.uasset
--- a/Content/AAA_UMG/ScreenItems/WBP_ScreenTextIntroduce.uasset
+++ b/Content/AAA_UMG/ScreenItems/WBP_ScreenTextIntroduce.uasset
--- a/Content/AAA_UMG/ScreenItems/WBP_ScreenVodTiQu.uasset
+++ b/Content/AAA_UMG/ScreenItems/WBP_ScreenVodTiQu.uasset
--- a/Content/AAA_UMG/ScreenItems/WBP_ScreenYiJiFenBuVod.uasset
+++ b/Content/AAA_UMG/ScreenItems/WBP_ScreenYiJiFenBuVod.uasset
--- a/Content/AAA_UMG/SlateButton.uasset
+++ b/Content/AAA_UMG/SlateButton.uasset
--- a/Content/AAA_UMG/WBP_ScreenIdle.uasset
+++ b/Content/AAA_UMG/WBP_ScreenIdle.uasset
--- a/Content/AAA_UMG/WBP_TableIdle.uasset
+++ b/Content/AAA_UMG/WBP_TableIdle.uasset
--- a/Content/AAA_UMG/WBP_TableNext.uasset
+++ b/Content/AAA_UMG/WBP_TableNext.uasset
--- a/Content/BP/FloorData.uasset
+++ b/Content/BP/FloorData.uasset
--- a/Content/BP/SceneComponentFloor.uasset
+++ b/Content/BP/SceneComponentFloor.uasset
--- a/Content/Maps/Main.umap
+++ b/Content/Maps/Main.umap
--- a/Content/Sequencer_Out/Seq_KongJianWeiZhi.uasset
+++ b/Content/Sequencer_Out/Seq_KongJianWeiZhi.uasset
--- a/Content/Sound/general/bgm.uasset
+++ b/Content/Sound/general/bgm.uasset
--- a/Content/Sound/general/bgm.wav
+++ b/Content/Sound/general/bgm.wav
--- a/Content/Sound/general/tongzu.uasset
+++ b/Content/Sound/general/tongzu.uasset
--- a/Content/Sound/general/tongzu.wav
+++ b/Content/Sound/general/tongzu.wav
--- a/Content/Sound/general/划过.uasset
+++ b/Content/Sound/general/划过.uasset
--- a/Content/Sound/general/划过.wav
+++ b/Content/Sound/general/划过.wav
--- a/Content/Sound/general/删除.uasset
+++ b/Content/Sound/general/删除.uasset
--- a/Content/Sound/general/删除.wav
+++ b/Content/Sound/general/删除.wav
--- a/Content/Sound/general/大自然bgm.uasset
+++ b/Content/Sound/general/大自然bgm.uasset
--- a/Content/Sound/general/大自然bgm.wav
+++ b/Content/Sound/general/大自然bgm.wav
--- a/Content/Sound/general/恭喜完成.uasset
+++ b/Content/Sound/general/恭喜完成.uasset
--- a/Content/Sound/general/恭喜完成.wav
+++ b/Content/Sound/general/恭喜完成.wav
--- a/Content/Sound/general/抓取.uasset
+++ b/Content/Sound/general/抓取.uasset
--- a/Content/Sound/general/抓取.wav
+++ b/Content/Sound/general/抓取.wav
--- a/Content/Sound/general/拍照.uasset
+++ b/Content/Sound/general/拍照.uasset
--- a/Content/Sound/general/拍照.wav
+++ b/Content/Sound/general/拍照.wav
--- a/Content/Sound/general/按钮按键-很酷-用户界面-游戏提示音_系统提示音(Cool
+++ b/Content/Sound/general/按钮按键-很酷-用户界面-游戏提示音_系统提示音(Cool
--- a/Content/Sound/general/按钮按键.uasset
+++ b/Content/Sound/general/按钮按键.uasset
--- a/Content/Sound/general/撤销.uasset
+++ b/Content/Sound/general/撤销.uasset
--- a/Content/Sound/general/撤销.wav
+++ b/Content/Sound/general/撤销.wav
--- a/Content/Sound/general/替换.uasset
+++ b/Content/Sound/general/替换.uasset
--- a/Content/Sound/general/替换.wav
+++ b/Content/Sound/general/替换.wav
--- a/Content/Sound/general/格式工厂音频合并
+++ b/Content/Sound/general/格式工厂音频合并
--- a/Content/Sound/general/正确-正确-系统提示游戏提示_爱给网_aigei_com.wav
+++ b/Content/Sound/general/正确-正确-系统提示游戏提示_爱给网_aigei_com.wav
--- a/Content/Sound/general/正确.uasset
+++ b/Content/Sound/general/正确.uasset
--- a/Content/Sound/general/点击.uasset
+++ b/Content/Sound/general/点击.uasset
--- a/Content/Sound/general/点击.wav
+++ b/Content/Sound/general/点击.wav
--- a/Content/Sound/general/点击1.uasset
+++ b/Content/Sound/general/点击1.uasset
--- a/Content/Sound/general/点击1.wav
+++ b/Content/Sound/general/点击1.wav
--- a/Content/Sound/general/点击2.uasset
+++ b/Content/Sound/general/点击2.uasset
--- a/Content/Sound/general/点击2.wav
+++ b/Content/Sound/general/点击2.wav
--- a/Content/Sound/general/点击3.uasset
+++ b/Content/Sound/general/点击3.uasset
--- a/Content/Sound/general/点击3.wav
+++ b/Content/Sound/general/点击3.wav
--- a/Content/Sound/general/点击4.uasset
+++ b/Content/Sound/general/点击4.uasset
--- a/Content/Sound/general/点击4.wav
+++ b/Content/Sound/general/点击4.wav
--- a/Content/Sound/general/生成.uasset
+++ b/Content/Sound/general/生成.uasset
--- a/Content/Sound/general/生成.wav
+++ b/Content/Sound/general/生成.wav
--- a/Content/Sound/general/笔触.uasset
+++ b/Content/Sound/general/笔触.uasset
--- a/Content/Sound/general/笔触.wav
+++ b/Content/Sound/general/笔触.wav
--- a/Content/Sound/general/笔触xin.uasset
+++ b/Content/Sound/general/笔触xin.uasset
--- a/Content/Sound/general/笔触xin.wav
+++ b/Content/Sound/general/笔触xin.wav
--- a/Content/Sound/general/背景音乐
+++ b/Content/Sound/general/背景音乐
--- a/Content/Sound/general/背景音乐_8.uasset
+++ b/Content/Sound/general/背景音乐_8.uasset
--- a/Content/Sound/general/背景音乐_8_Cue.uasset
+++ b/Content/Sound/general/背景音乐_8_Cue.uasset
--- a/Content/Sound/general/自然-海鸥.uasset
+++ b/Content/Sound/general/自然-海鸥.uasset
--- a/Content/Sound/general/自然-海鸥.wav
+++ b/Content/Sound/general/自然-海鸥.wav
--- a/Content/Sound/general/自然-鸟鸣.uasset
+++ b/Content/Sound/general/自然-鸟鸣.uasset
--- a/Content/Sound/general/自然-鸟鸣.wav
+++ b/Content/Sound/general/自然-鸟鸣.wav
--- a/Content/Sound/general/自然-鸟鸣_Cue.uasset
+++ b/Content/Sound/general/自然-鸟鸣_Cue.uasset
--- a/Content/Sound/general/节点.uasset
+++ b/Content/Sound/general/节点.uasset
--- a/Content/Sound/general/节点.wav
+++ b/Content/Sound/general/节点.wav
--- a/Content/Sound/general/警告-系统警告回答错误-游戏提示_爱给网_aigei_com.wav
+++ b/Content/Sound/general/警告-系统警告回答错误-游戏提示_爱给网_aigei_com.wav
--- a/Content/Sound/general/警告.uasset
+++ b/Content/Sound/general/警告.uasset
--- a/Content/Sound/general/警告.wav
+++ b/Content/Sound/general/警告.wav
--- a/Content/Sound/general/铅笔书写10(Pencil
+++ b/Content/Sound/general/铅笔书写10(Pencil
--- a/Content/Sound/general/铅笔书写10.uasset
+++ b/Content/Sound/general/铅笔书写10.uasset
--- a/Content/Sound/general/长笔触.uasset
+++ b/Content/Sound/general/长笔触.uasset
--- a/Content/Sound/general/长笔触.wav
+++ b/Content/Sound/general/长笔触.wav
--- a/Content/Sound/general/长笔触2.uasset
+++ b/Content/Sound/general/长笔触2.uasset
--- a/Content/Sound/general/长笔触2.wav
+++ b/Content/Sound/general/长笔触2.wav
--- a/Content/Sound/general/鸟鸣.uasset
+++ b/Content/Sound/general/鸟鸣.uasset
--- a/Content/Sound/general/鸟鸣.wav
+++ b/Content/Sound/general/鸟鸣.wav
--- a/Content/UI/Resource/D-初识三星堆-解锁.png
+++ b/Content/UI/Resource/D-初识三星堆-解锁.png
--- a/Content/UI/Resource/D-初识三星堆-解锁.uasset
+++ b/Content/UI/Resource/D-初识三星堆-解锁.uasset
--- a/Content/UI/Resource/D-初识三星堆-默认为解锁状态.png
+++ b/Content/UI/Resource/D-初识三星堆-默认为解锁状态.png
--- a/Content/UI/Resource/D-初识三星堆-默认为解锁状态.uasset
+++ b/Content/UI/Resource/D-初识三星堆-默认为解锁状态.uasset
--- a/Content/UI/Resource/D-考古祭祀坑-未解锁.png
+++ b/Content/UI/Resource/D-考古祭祀坑-未解锁.png
--- a/Content/UI/Resource/D-考古祭祀坑-未解锁.uasset
+++ b/Content/UI/Resource/D-考古祭祀坑-未解锁.uasset
--- a/Content/UI/Resource/D-考古祭祀坑-解锁.png
+++ b/Content/UI/Resource/D-考古祭祀坑-解锁.png
--- a/Content/UI/Resource/D-考古祭祀坑-解锁.uasset
+++ b/Content/UI/Resource/D-考古祭祀坑-解锁.uasset
--- a/Content/UI/Resource/发掘结束/发掘结束.png
+++ b/Content/UI/Resource/发掘结束/发掘结束.png
--- a/Content/UI/Resource/发掘结束/发掘结束.uasset
+++ b/Content/UI/Resource/发掘结束/发掘结束.uasset
--- a/Content/UI/Resource/大屏切图/bg-无光New.jpg
+++ b/Content/UI/Resource/大屏切图/bg-无光New.jpg
--- a/Content/UI/Resource/大屏切图/bg-无光New.uasset
+++ b/Content/UI/Resource/大屏切图/bg-无光New.uasset
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
zhangmiao	7c7b3abebf	Merge branch 'master' of http://10.30.1.254:3000/MengJunBo/SXDarchaeological53 Conflicts: Content/AAA_UMG/WBP_IEnd.uasset Content/Developers/RJ/FX/BP/UMG_FloatingChar.uasset	2025-09-27 19:58:52 +08:00
zhangmiao	516bbe4be1	添加音频、全流程自动化--	2025-09-27 19:42:16 +08:00