Merge branch 'main' of http://10.30.3.219:3000/MengJunBo/ChangChunM1

# Conflicts: # Content/BP/UIPawn.uasset
2024-04-12 10:08:21 +08:00 · 2024-04-12 10:08:21 +08:00 · a5475405fb
parent ea4c503bb1 fe9b7eb15d
commit a5475405fb
26 changed files with 0 additions and 0 deletions
--- a/Content/BP/BP_DynamicMatControl.uasset
+++ b/Content/BP/BP_DynamicMatControl.uasset
--- a/Content/BP/ScenarioContext_Actors.uasset
+++ b/Content/BP/ScenarioContext_Actors.uasset
--- a/Content/BP/ScenarioHUD.uasset
+++ b/Content/BP/ScenarioHUD.uasset
--- a/Content/BP/UIPawn.uasset
+++ b/Content/BP/UIPawn.uasset
--- a/Content/Developers/RJ/BP/BP_Spline_Once.uasset
+++ b/Content/Developers/RJ/BP/BP_Spline_Once.uasset
--- a/Content/Widget/ArchaeologicalExcavation/WBP_ExcavationDesk.uasset
+++ b/Content/Widget/ArchaeologicalExcavation/WBP_ExcavationDesk.uasset
--- a/Content/Widget/ArchaeologicalExcavation/WBP_ExcavationFront.uasset
+++ b/Content/Widget/ArchaeologicalExcavation/WBP_ExcavationFront.uasset
--- a/Content/Widget/Discover/Discover.uasset
+++ b/Content/Widget/Discover/Discover.uasset
--- a/Content/Widget/Discover/Discover1.uasset
+++ b/Content/Widget/Discover/Discover1.uasset
--- a/Content/Widget/Discover/Discover2.uasset
+++ b/Content/Widget/Discover/Discover2.uasset
--- a/Content/Widget/EditorWidget.uasset
+++ b/Content/Widget/EditorWidget.uasset
--- a/Content/Widget/LayingExploration/WBP_LayingExplorFront.uasset
+++ b/Content/Widget/LayingExploration/WBP_LayingExplorFront.uasset
--- a/Content/Widget/Uti/CAVETipsElement.uasset
+++ b/Content/Widget/Uti/CAVETipsElement.uasset
--- a/Content/WidgetPic/Discover/1_1.uasset
+++ b/Content/WidgetPic/Discover/1_1.uasset
--- a/Content/WidgetPic/Discover/1_2.uasset
+++ b/Content/WidgetPic/Discover/1_2.uasset
--- a/Content/WidgetPic/Discover/1_3.uasset
+++ b/Content/WidgetPic/Discover/1_3.uasset
--- a/Content/WidgetPic/Discover/1_4.uasset
+++ b/Content/WidgetPic/Discover/1_4.uasset
--- a/Content/WidgetPic/Discover/2_1.uasset
+++ b/Content/WidgetPic/Discover/2_1.uasset
--- a/Content/WidgetPic/Discover/2_2.uasset
+++ b/Content/WidgetPic/Discover/2_2.uasset
--- a/Content/WidgetPic/Discover/2_3.uasset
+++ b/Content/WidgetPic/Discover/2_3.uasset
--- a/Content/WidgetPic/Discover/2_4.uasset
+++ b/Content/WidgetPic/Discover/2_4.uasset
--- a/Content/WidgetPic/Discover/3_1.uasset
+++ b/Content/WidgetPic/Discover/3_1.uasset
--- a/Content/WidgetPic/Discover/发现嵌蚌饰骨器1件.uasset
+++ b/Content/WidgetPic/Discover/发现嵌蚌饰骨器1件.uasset
--- a/Content/WidgetPic/Discover/发现陶器4件.uasset
+++ b/Content/WidgetPic/Discover/发现陶器4件.uasset
--- a/Content/WidgetPic/Discover/效果.uasset
+++ b/Content/WidgetPic/Discover/效果.uasset
--- a/Content/map/wts1.umap
+++ b/Content/map/wts1.umap