Merge branch 'newMain' of http://wolfpredator.sknt.ru/Retry/Japan_Raid into newMain

# Conflicts: # Japan_Raid/Content/MainMap.umap # Japan_Raid/Content/fireflies.uasset
1 year ago · df9c88851a
parent 541dd82a42 cd59d84e38
commit df9c88851a
37 changed files with 77 additions and 53 deletions
--- a/Japan_Raid/Content/Levels/Geometry.umap
+++ b/Japan_Raid/Content/Levels/Geometry.umap
--- a/Japan_Raid/Content/Levels/Light_night.umap
+++ b/Japan_Raid/Content/Levels/Light_night.umap
--- a/Japan_Raid/Content/MainMap.umap
+++ b/Japan_Raid/Content/MainMap.umap
--- a/Japan_Raid/Content/Material/01BaseSimple.uasset
+++ b/Japan_Raid/Content/Material/01BaseSimple.uasset
--- a/Japan_Raid/Content/Material/Blocking_material/M_paper_lamp.uasset
+++ b/Japan_Raid/Content/Material/Blocking_material/M_paper_lamp.uasset
--- a/Japan_Raid/Content/Material/Environment/M_MainHouse_Roof.uasset
+++ b/Japan_Raid/Content/Material/Environment/M_MainHouse_Roof.uasset
--- a/Japan_Raid/Content/Material/Environment/M_Pavilion_Roof.uasset
+++ b/Japan_Raid/Content/Material/Environment/M_Pavilion_Roof.uasset
--- a/Japan_Raid/Content/Material/M_paper.uasset
+++ b/Japan_Raid/Content/Material/M_paper.uasset
--- a/Japan_Raid/Content/Material/M_paper_retry_.uasset
+++ b/Japan_Raid/Content/Material/M_paper_retry_.uasset
--- a/Japan_Raid/Content/Material/Megascans/3D_Assets/Japanese_Wooden_Lamp_vcyraiyga/S_Japanese_Wooden_Lamp.uasset
+++ b/Japan_Raid/Content/Material/Megascans/3D_Assets/Japanese_Wooden_Lamp_vcyraiyga/S_Japanese_Wooden_Lamp.uasset
--- a/Japan_Raid/Content/Material/Megascans/3D_Assets/Japanese_Wooden_Lamp_vcyraiyga/S_Japanese_Wooden_Lamp_vcyraiyga_lod3_Var1.uasset
+++ b/Japan_Raid/Content/Material/Megascans/3D_Assets/Japanese_Wooden_Lamp_vcyraiyga/S_Japanese_Wooden_Lamp_vcyraiyga_lod3_Var1.uasset
--- a/Japan_Raid/Content/Material/Props/MI_WeaponRack_v1.uasset
+++ b/Japan_Raid/Content/Material/Props/MI_WeaponRack_v1.uasset
--- a/Japan_Raid/Content/Material/Props/M_Shogi.uasset
+++ b/Japan_Raid/Content/Material/Props/M_Shogi.uasset
--- a/Japan_Raid/Content/Material/Props/M_ShogiTable.uasset
+++ b/Japan_Raid/Content/Material/Props/M_ShogiTable.uasset
--- a/Japan_Raid/Content/Material/Props/f_SM_Lanp__Inst.uasset
+++ b/Japan_Raid/Content/Material/Props/f_SM_Lanp__Inst.uasset
--- a/Japan_Raid/Content/Material/SkyLattern/Sky_lather.uasset
+++ b/Japan_Raid/Content/Material/SkyLattern/Sky_lather.uasset
--- a/Japan_Raid/Content/Meshes/Environment/SM_Pavilion_VP_2.uasset
+++ b/Japan_Raid/Content/Meshes/Environment/SM_Pavilion_VP_2.uasset
--- a/Japan_Raid/Content/Meshes/Props/SM_Lamp.uasset
+++ b/Japan_Raid/Content/Meshes/Props/SM_Lamp.uasset
--- a/Japan_Raid/Content/Meshes/Props/SM_Shogi.uasset
+++ b/Japan_Raid/Content/Meshes/Props/SM_Shogi.uasset
--- a/Japan_Raid/Content/Meshes/Props/SM_ShogiTable.uasset
+++ b/Japan_Raid/Content/Meshes/Props/SM_ShogiTable.uasset
--- a/Japan_Raid/Content/Meshes/Props/SM_WeaponRack_v1.uasset
+++ b/Japan_Raid/Content/Meshes/Props/SM_WeaponRack_v1.uasset
--- a/Japan_Raid/Content/SM_MainHouse.uasset
+++ b/Japan_Raid/Content/SM_MainHouse.uasset
--- a/Japan_Raid/Content/Textures/Unique/U_MainHouse_Roof_BC.uasset
+++ b/Japan_Raid/Content/Textures/Unique/U_MainHouse_Roof_BC.uasset
--- a/Japan_Raid/Content/Textures/Unique/U_MainHouse_Roof_N.uasset
+++ b/Japan_Raid/Content/Textures/Unique/U_MainHouse_Roof_N.uasset
--- a/Japan_Raid/Content/Textures/Unique/U_MainHouse_Roof_ORM.uasset
+++ b/Japan_Raid/Content/Textures/Unique/U_MainHouse_Roof_ORM.uasset
--- a/Japan_Raid/Content/Textures/Unique/U_Pavilion_Roof_BC.uasset
+++ b/Japan_Raid/Content/Textures/Unique/U_Pavilion_Roof_BC.uasset
--- a/Japan_Raid/Content/Textures/Unique/U_ShogiTable_BaseColor.uasset
+++ b/Japan_Raid/Content/Textures/Unique/U_ShogiTable_BaseColor.uasset
--- a/Japan_Raid/Content/Textures/Unique/U_ShogiTable_Normal.uasset
+++ b/Japan_Raid/Content/Textures/Unique/U_ShogiTable_Normal.uasset
--- a/Japan_Raid/Content/Textures/Unique/U_ShogiTable_ORM.uasset
+++ b/Japan_Raid/Content/Textures/Unique/U_ShogiTable_ORM.uasset
--- a/Japan_Raid/Content/Textures/Unique/U_Shogi_BaseColor.uasset
+++ b/Japan_Raid/Content/Textures/Unique/U_Shogi_BaseColor.uasset
--- a/Japan_Raid/Content/Textures/Unique/U_Shogi_Normal.uasset
+++ b/Japan_Raid/Content/Textures/Unique/U_Shogi_Normal.uasset
--- a/Japan_Raid/Content/Textures/Unique/U_Shogi_ORM.uasset
+++ b/Japan_Raid/Content/Textures/Unique/U_Shogi_ORM.uasset
--- a/Japan_Raid/Content/U_MainHouse_Roof_BC.uasset
+++ b/Japan_Raid/Content/U_MainHouse_Roof_BC.uasset
--- a/Japan_Raid/Content/U_MainHouse_Roof_N.uasset
+++ b/Japan_Raid/Content/U_MainHouse_Roof_N.uasset
--- a/Japan_Raid/Content/U_MainHouse_Roof_ORM.uasset
+++ b/Japan_Raid/Content/U_MainHouse_Roof_ORM.uasset
--- a/Japan_Raid/Content/VFX/fireflies.uasset
+++ b/Japan_Raid/Content/VFX/fireflies.uasset
--- a/Japan_Raid/Content/fireflies.uasset
+++ b/Japan_Raid/Content/fireflies.uasset