Bladeren bron

Merge branch 'master' of http://pi.killf.info:9966/git/tetrees

killf 9 maanden geleden
bovenliggende
commit
1dc854e5ac
63 gewijzigde bestanden met toevoegingen van 0 en 5 verwijderingen
  1. BIN
      Content/GrimzaFX_Explosions/._MeteorCrashEffect
  2. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/._.DS_Store
  3. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/._NIAGARA
  4. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/._caizhi
  5. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/._mode
  6. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/NIAGARA/._Emitters
  7. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/NIAGARA/._huoguang.uasset
  8. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/NIAGARA/._suipian.uasset
  9. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/NIAGARA/Emitters/._fashe.uasset
  10. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/NIAGARA/Emitters/fashe.uasset
  11. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/NIAGARA/huoguang.uasset
  12. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/NIAGARA/suipian.uasset
  13. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/._.DS_Store
  14. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/._M_Master_EmissiveMeshCloud.uasset
  15. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/._caizhi_fun
  16. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/._tietu
  17. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/M_Master_EmissiveMeshCloud.uasset
  18. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/._.DS_Store
  19. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/._Function_Textures
  20. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/._MF_sA_CenterFres.uasset
  21. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/._MF_sA_Curv.uasset
  22. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/._MF_sA_EzDissolver.uasset
  23. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/._MF_sA_EzMaskTo2Color.uasset
  24. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/._MF_sA_EzPanner.uasset
  25. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/._MF_sA_EzPannerr.uasset
  26. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/._MF_sA_EzUvDistorter.uasset
  27. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/._MF_sA_GradMasker.uasset
  28. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/._MF_sA_NiceFresnel.uasset
  29. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/._MF_sA_RadialDistortion.uasset
  30. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/._MF_sA_RefractDistortion.uasset
  31. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/Function_Textures/._T_Noise_1.uasset
  32. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/Function_Textures/._T_Noise_4.uasset
  33. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/Function_Textures/._T_Refract_Normal.uasset
  34. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/Function_Textures/._T_Strrr_2.uasset
  35. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/Function_Textures/T_Noise_1.uasset
  36. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/Function_Textures/T_Noise_4.uasset
  37. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/Function_Textures/T_Refract_Normal.uasset
  38. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/Function_Textures/T_Strrr_2.uasset
  39. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/MF_sA_CenterFres.uasset
  40. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/MF_sA_Curv.uasset
  41. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/MF_sA_EzDissolver.uasset
  42. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/MF_sA_EzMaskTo2Color.uasset
  43. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/MF_sA_EzPanner.uasset
  44. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/MF_sA_EzPannerr.uasset
  45. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/MF_sA_EzUvDistorter.uasset
  46. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/MF_sA_GradMasker.uasset
  47. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/MF_sA_NiceFresnel.uasset
  48. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/MF_sA_RadialDistortion.uasset
  49. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/MF_sA_RefractDistortion.uasset
  50. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/tietu/._noise.uasset
  51. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/tietu/noise.uasset
  52. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/mode/._yun.uasset
  53. BIN
      Content/GrimzaFX_Explosions/MeteorCrashEffect/mode/yun.uasset
  54. BIN
      Content/Maps/Map010.umap
  55. BIN
      Content/PillarRise/PillarRise.uasset
  56. BIN
      Content/treemap/model/changjing/DoomFrame.uasset
  57. BIN
      Content/treemap/model/changjing/SeatPlatform_down.uasset
  58. BIN
      Content/treemap/model/changjing/SeatPlatform_up.uasset
  59. BIN
      Content/treemap/model/changjing/door/door_Cube_017.uasset
  60. BIN
      Content/treemap/model/changjing/场景_23_6_21__Cylinder_012.uasset
  61. BIN
      Content/treemap/model/changjing/场景_23_6_21__Cylinder_013.uasset
  62. BIN
      Content/treemap/model/changjing/场景_23_6_21__Sphere_001.uasset
  63. 0 5
      TetreeseDemo.uproject

BIN
Content/GrimzaFX_Explosions/._MeteorCrashEffect


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/._.DS_Store


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/._NIAGARA


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/._caizhi


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/._mode


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/NIAGARA/._Emitters


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/NIAGARA/._huoguang.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/NIAGARA/._suipian.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/NIAGARA/Emitters/._fashe.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/NIAGARA/Emitters/fashe.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/NIAGARA/huoguang.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/NIAGARA/suipian.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/._.DS_Store


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/._M_Master_EmissiveMeshCloud.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/._caizhi_fun


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/._tietu


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/M_Master_EmissiveMeshCloud.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/._.DS_Store


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/._Function_Textures


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/._MF_sA_CenterFres.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/._MF_sA_Curv.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/._MF_sA_EzDissolver.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/._MF_sA_EzMaskTo2Color.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/._MF_sA_EzPanner.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/._MF_sA_EzPannerr.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/._MF_sA_EzUvDistorter.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/._MF_sA_GradMasker.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/._MF_sA_NiceFresnel.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/._MF_sA_RadialDistortion.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/._MF_sA_RefractDistortion.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/Function_Textures/._T_Noise_1.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/Function_Textures/._T_Noise_4.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/Function_Textures/._T_Refract_Normal.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/Function_Textures/._T_Strrr_2.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/Function_Textures/T_Noise_1.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/Function_Textures/T_Noise_4.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/Function_Textures/T_Refract_Normal.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/Function_Textures/T_Strrr_2.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/MF_sA_CenterFres.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/MF_sA_Curv.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/MF_sA_EzDissolver.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/MF_sA_EzMaskTo2Color.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/MF_sA_EzPanner.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/MF_sA_EzPannerr.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/MF_sA_EzUvDistorter.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/MF_sA_GradMasker.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/MF_sA_NiceFresnel.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/MF_sA_RadialDistortion.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/caizhi_fun/MF_sA_RefractDistortion.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/tietu/._noise.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/caizhi/tietu/noise.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/mode/._yun.uasset


BIN
Content/GrimzaFX_Explosions/MeteorCrashEffect/mode/yun.uasset


BIN
Content/Maps/Map010.umap


BIN
Content/PillarRise/PillarRise.uasset


BIN
Content/treemap/model/changjing/DoomFrame.uasset


BIN
Content/treemap/model/changjing/SeatPlatform_down.uasset


BIN
Content/treemap/model/changjing/SeatPlatform_up.uasset


BIN
Content/treemap/model/changjing/door/door_Cube_017.uasset


BIN
Content/treemap/model/changjing/场景_23_6_21__Cylinder_012.uasset


BIN
Content/treemap/model/changjing/场景_23_6_21__Cylinder_013.uasset


BIN
Content/treemap/model/changjing/场景_23_6_21__Sphere_001.uasset


+ 0 - 5
TetreeseDemo.uproject

@@ -18,11 +18,6 @@
 		{
 			"Name": "ModelingToolsEditorMode",
 			"Enabled": true
-		},
-		{
-			"Name": "AsyncLoadingScreen",
-			"Enabled": true,
-			"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/01f39767dc6b4290877f38365787cbf8"
 		}
 	]
 }