3 次代码提交 fe3e73ccf9 ... 68a5230b5b

作者 SHA1 备注 提交日期
  hyc 68a5230b5b Merge branch 'master' of http://pi.killf.info:9966/git/tetrees 1 年之前
  hyc 009f16fa8d no message 1 年之前
  hyc 29ac4a1135 燃烧的tree 1 年之前
共有 56 个文件被更改,包括 15 次插入0 次删除
  1. 15 0
      Config/DefaultEngine.ini
  2. 二进制
      Content/Maps/map007.umap
  3. 二进制
      Content/StylizedPPPack/Materials/Instances/PPMI_CelShader_6Tone.uasset
  4. 二进制
      Content/StylizedPPPack/Materials/PPM_CelShader_6Tone.uasset
  5. 二进制
      Content/StylizedPPPack/Materials/PPM_Outline.uasset
  6. 二进制
      Content/__ExternalActors__/treefall/2/0/0N/Z5HIL68TL28A16KWXVNNEV.uasset
  7. 二进制
      Content/__ExternalActors__/treefall/2/0/30/WKRIC0A3YTL370X223UKD0.uasset
  8. 二进制
      Content/__ExternalActors__/treefall/2/0/3M/3QOA8SAGHGZ1C6JX5VWCLU.uasset
  9. 二进制
      Content/__ExternalActors__/treefall/2/1/A4/E0GGSFFKI1WIZG76N4SLBS.uasset
  10. 二进制
      Content/__ExternalActors__/treefall/2/1/FE/RJ2OL4OS94LNIJ3VFXI3KS.uasset
  11. 二进制
      Content/__ExternalActors__/treefall/2/1/GO/YY0HHADH0CMYHX9NU24O5C.uasset
  12. 二进制
      Content/__ExternalActors__/treefall/2/1/GR/K0Z7KW0X412YNCZ1Q8TUFH.uasset
  13. 二进制
      Content/__ExternalActors__/treefall/2/2/42/XXCUJCWOKL6C5H6VQA9CUY.uasset
  14. 二进制
      Content/__ExternalActors__/treefall/2/2/4Z/8LAH2DFGX5WJPJHTKIG0JL.uasset
  15. 二进制
      Content/__ExternalActors__/treefall/2/2/52/VHM0CAYPP2MKCN7N9A6ON5.uasset
  16. 二进制
      Content/__ExternalActors__/treefall/2/2/5F/IFLELHM6YSXZREC5AUOFMX.uasset
  17. 二进制
      Content/__ExternalActors__/treefall/2/2/WN/2072BZK7G3TU8LZX8AF7JN.uasset
  18. 二进制
      Content/__ExternalActors__/treefall/2/3/83/7SFSL3HK0RLP93MF18F08B.uasset
  19. 二进制
      Content/__ExternalActors__/treefall/2/3/ZF/GYIBE55TRWD79L311KK587.uasset
  20. 二进制
      Content/__ExternalActors__/treefall/2/4/5E/DJDYD76ISJIBNMAF7AUP0I.uasset
  21. 二进制
      Content/__ExternalActors__/treefall/2/4/ZG/EZBEZVPF649E8OQPDZ3XY6.uasset
  22. 二进制
      Content/__ExternalActors__/treefall/2/5/6Y/3CPZN87AAJ6BXM1LGE049C.uasset
  23. 二进制
      Content/__ExternalActors__/treefall/2/5/HH/5YH3FYYFVCRUFWRDQRKAUD.uasset
  24. 二进制
      Content/__ExternalActors__/treefall/2/6/I2/QR7MGFJ5MLDOWG5GU2PSGJ.uasset
  25. 二进制
      Content/__ExternalActors__/treefall/2/6/PF/QY552212M74C1G88XULPZZ.uasset
  26. 二进制
      Content/__ExternalActors__/treefall/2/7/60/TT3DDR38GWLV9U9NUWEK8P.uasset
  27. 二进制
      Content/__ExternalActors__/treefall/2/7/7A/5BA1B5BBGZOZERUM2W6587.uasset
  28. 二进制
      Content/__ExternalActors__/treefall/2/7/ZR/LFE2BW8R38GNS9GO0Q2EXF.uasset
  29. 二进制
      Content/__ExternalActors__/treefall/2/8/BH/6ND0ZL3DVF1UICO8B05GE4.uasset
  30. 二进制
      Content/__ExternalActors__/treefall/2/8/DB/N8XOQB43K7GRZ1OHHNEMAC.uasset
  31. 二进制
      Content/__ExternalActors__/treefall/2/9/2K/823SNEVHOGAS1T1EX2QBMG.uasset
  32. 二进制
      Content/__ExternalActors__/treefall/2/9/6K/KGH9ZSISWP4M6EIK1Q82QD.uasset
  33. 二进制
      Content/__ExternalActors__/treefall/2/9/DD/V1QBN66S9EL8EWE3EAG8AH.uasset
  34. 二进制
      Content/__ExternalActors__/treefall/2/9/RK/LJ7QNEIR6RQNIZNHKQJ5NV.uasset
  35. 二进制
      Content/__ExternalActors__/treefall/2/9/YJ/S713B6DQIZP05F97CQR8UA.uasset
  36. 二进制
      Content/__ExternalActors__/treefall/2/A/8J/K8HM8MLGP1AXBHFNC021E8.uasset
  37. 二进制
      Content/__ExternalActors__/treefall/2/B/8U/TMN9DSVO5RXH7OEZE2ESHX.uasset
  38. 二进制
      Content/__ExternalActors__/treefall/2/B/I2/WFU9REAL59CO7VSTOABJWK.uasset
  39. 二进制
      Content/__ExternalActors__/treefall/2/C/2X/LFHUU3EIWGLDXYGX5HQE7N.uasset
  40. 二进制
      Content/__ExternalActors__/treefall/2/C/G5/YARVH7MJWX7AOXDMTVP7T2.uasset
  41. 二进制
      Content/__ExternalActors__/treefall/2/C/NY/084621GNUJL0NQ07O4VLHW.uasset
  42. 二进制
      Content/__ExternalActors__/treefall/2/C/UE/LDTFKKGR35PBBFB9NOQRNH.uasset
  43. 二进制
      Content/__ExternalActors__/treefall/2/D/38/8NQXNQDFHLO4W1KM56OLWV.uasset
  44. 二进制
      Content/__ExternalActors__/treefall/2/D/C7/GTE7SIIBCQQTYJ0BLUA31P.uasset
  45. 二进制
      Content/__ExternalActors__/treefall/2/D/ES/WAYZT4K6F9BHC5JZTXSOL8.uasset
  46. 二进制
      Content/__ExternalActors__/treefall/2/D/R4/J4YQYJQHWPF5DERPMRXQZ9.uasset
  47. 二进制
      Content/__ExternalActors__/treefall/2/D/UO/RE6ZCCTC16E0FPXRRILYVV.uasset
  48. 二进制
      Content/__ExternalActors__/treefall/2/E/04/H99ESR8PJQ785Z3WKQV2UG.uasset
  49. 二进制
      Content/__ExternalActors__/treefall/2/E/96/7OZXJN0TQHKEX0D4ZKLL7J.uasset
  50. 二进制
      Content/__ExternalActors__/treefall/2/E/EP/6YSB2RXLDXQX1ZNX516OKP.uasset
  51. 二进制
      Content/__ExternalActors__/treefall/2/E/HK/9IEDFKPW6NZW7A29PNRRK8.uasset
  52. 二进制
      Content/__ExternalActors__/treefall/2/E/L9/GNKSFH1X3M94IQQIEPHNLG.uasset
  53. 二进制
      Content/__ExternalActors__/treefall/2/E/V2/4RP8W5FYYH09O37U710294.uasset
  54. 二进制
      Content/__ExternalActors__/treefall/2/F/32/QKXCDT2TM45J7IFS01OBOK.uasset
  55. 二进制
      Content/treefall/2.umap
  56. 二进制
      Content/treemap/map/tree_redayroom.umap

+ 15 - 0
Config/DefaultEngine.ini

@@ -2,6 +2,20 @@
 GameName=TetreeseDemo
 
 [/Script/EngineSettings.GameMapsSettings]
+<<<<<<< HEAD
+EditorStartupMap=/Game/Maps/Map002.Map002
+LocalMapOptions=
+TransitionMap=None
+bUseSplitscreen=True
+TwoPlayerSplitscreenLayout=Horizontal
+ThreePlayerSplitscreenLayout=FavorTop
+FourPlayerSplitscreenLayout=Grid
+bOffsetPlayerGamepadIds=False
+GameInstanceClass=/Script/Engine.GameInstance
+GameDefaultMap=/Game/Maps/Map002.Map002
+ServerDefaultMap=/Engine/Maps/Entry.Entry
+GlobalDefaultGameMode=None
+=======
 EditorStartupMap=/Game/Maps/Map007.Map007
 GameDefaultMap=/Game/Maps/Map007.Map007
 TransitionMap=
@@ -9,6 +23,7 @@ bUseSplitscreen=True
 TwoPlayerSplitscreenLayout=Horizontal
 ThreePlayerSplitscreenLayout=FavorTop
 GlobalDefaultGameMode=/Game/BP/VRGameMode.VRGameMode_C
+>>>>>>> fe3e73ccf9f70de20e6a3d3c86c2ae9cd4a6adf0
 GlobalDefaultServerGameMode=None
 
 [/Script/IOSRuntimeSettings.IOSRuntimeSettings]

二进制
Content/Maps/map007.umap


二进制
Content/StylizedPPPack/Materials/Instances/PPMI_CelShader_6Tone.uasset


二进制
Content/StylizedPPPack/Materials/PPM_CelShader_6Tone.uasset


二进制
Content/StylizedPPPack/Materials/PPM_Outline.uasset


二进制
Content/__ExternalActors__/treefall/2/0/0N/Z5HIL68TL28A16KWXVNNEV.uasset


二进制
Content/__ExternalActors__/treefall/2/0/30/WKRIC0A3YTL370X223UKD0.uasset


二进制
Content/__ExternalActors__/treefall/2/0/3M/3QOA8SAGHGZ1C6JX5VWCLU.uasset


二进制
Content/__ExternalActors__/treefall/2/1/A4/E0GGSFFKI1WIZG76N4SLBS.uasset


二进制
Content/__ExternalActors__/treefall/2/1/FE/RJ2OL4OS94LNIJ3VFXI3KS.uasset


二进制
Content/__ExternalActors__/treefall/2/1/GO/YY0HHADH0CMYHX9NU24O5C.uasset


二进制
Content/__ExternalActors__/treefall/2/1/GR/K0Z7KW0X412YNCZ1Q8TUFH.uasset


二进制
Content/__ExternalActors__/treefall/2/2/42/XXCUJCWOKL6C5H6VQA9CUY.uasset


二进制
Content/__ExternalActors__/treefall/2/2/4Z/8LAH2DFGX5WJPJHTKIG0JL.uasset


二进制
Content/__ExternalActors__/treefall/2/2/52/VHM0CAYPP2MKCN7N9A6ON5.uasset


二进制
Content/__ExternalActors__/treefall/2/2/5F/IFLELHM6YSXZREC5AUOFMX.uasset


二进制
Content/__ExternalActors__/treefall/2/2/WN/2072BZK7G3TU8LZX8AF7JN.uasset


二进制
Content/__ExternalActors__/treefall/2/3/83/7SFSL3HK0RLP93MF18F08B.uasset


二进制
Content/__ExternalActors__/treefall/2/3/ZF/GYIBE55TRWD79L311KK587.uasset


二进制
Content/__ExternalActors__/treefall/2/4/5E/DJDYD76ISJIBNMAF7AUP0I.uasset


二进制
Content/__ExternalActors__/treefall/2/4/ZG/EZBEZVPF649E8OQPDZ3XY6.uasset


二进制
Content/__ExternalActors__/treefall/2/5/6Y/3CPZN87AAJ6BXM1LGE049C.uasset


二进制
Content/__ExternalActors__/treefall/2/5/HH/5YH3FYYFVCRUFWRDQRKAUD.uasset


二进制
Content/__ExternalActors__/treefall/2/6/I2/QR7MGFJ5MLDOWG5GU2PSGJ.uasset


二进制
Content/__ExternalActors__/treefall/2/6/PF/QY552212M74C1G88XULPZZ.uasset


二进制
Content/__ExternalActors__/treefall/2/7/60/TT3DDR38GWLV9U9NUWEK8P.uasset


二进制
Content/__ExternalActors__/treefall/2/7/7A/5BA1B5BBGZOZERUM2W6587.uasset


二进制
Content/__ExternalActors__/treefall/2/7/ZR/LFE2BW8R38GNS9GO0Q2EXF.uasset


二进制
Content/__ExternalActors__/treefall/2/8/BH/6ND0ZL3DVF1UICO8B05GE4.uasset


二进制
Content/__ExternalActors__/treefall/2/8/DB/N8XOQB43K7GRZ1OHHNEMAC.uasset


二进制
Content/__ExternalActors__/treefall/2/9/2K/823SNEVHOGAS1T1EX2QBMG.uasset


二进制
Content/__ExternalActors__/treefall/2/9/6K/KGH9ZSISWP4M6EIK1Q82QD.uasset


二进制
Content/__ExternalActors__/treefall/2/9/DD/V1QBN66S9EL8EWE3EAG8AH.uasset


二进制
Content/__ExternalActors__/treefall/2/9/RK/LJ7QNEIR6RQNIZNHKQJ5NV.uasset


二进制
Content/__ExternalActors__/treefall/2/9/YJ/S713B6DQIZP05F97CQR8UA.uasset


二进制
Content/__ExternalActors__/treefall/2/A/8J/K8HM8MLGP1AXBHFNC021E8.uasset


二进制
Content/__ExternalActors__/treefall/2/B/8U/TMN9DSVO5RXH7OEZE2ESHX.uasset


二进制
Content/__ExternalActors__/treefall/2/B/I2/WFU9REAL59CO7VSTOABJWK.uasset


二进制
Content/__ExternalActors__/treefall/2/C/2X/LFHUU3EIWGLDXYGX5HQE7N.uasset


二进制
Content/__ExternalActors__/treefall/2/C/G5/YARVH7MJWX7AOXDMTVP7T2.uasset


二进制
Content/__ExternalActors__/treefall/2/C/NY/084621GNUJL0NQ07O4VLHW.uasset


二进制
Content/__ExternalActors__/treefall/2/C/UE/LDTFKKGR35PBBFB9NOQRNH.uasset


二进制
Content/__ExternalActors__/treefall/2/D/38/8NQXNQDFHLO4W1KM56OLWV.uasset


二进制
Content/__ExternalActors__/treefall/2/D/C7/GTE7SIIBCQQTYJ0BLUA31P.uasset


二进制
Content/__ExternalActors__/treefall/2/D/ES/WAYZT4K6F9BHC5JZTXSOL8.uasset


二进制
Content/__ExternalActors__/treefall/2/D/R4/J4YQYJQHWPF5DERPMRXQZ9.uasset


二进制
Content/__ExternalActors__/treefall/2/D/UO/RE6ZCCTC16E0FPXRRILYVV.uasset


二进制
Content/__ExternalActors__/treefall/2/E/04/H99ESR8PJQ785Z3WKQV2UG.uasset


二进制
Content/__ExternalActors__/treefall/2/E/96/7OZXJN0TQHKEX0D4ZKLL7J.uasset


二进制
Content/__ExternalActors__/treefall/2/E/EP/6YSB2RXLDXQX1ZNX516OKP.uasset


二进制
Content/__ExternalActors__/treefall/2/E/HK/9IEDFKPW6NZW7A29PNRRK8.uasset


二进制
Content/__ExternalActors__/treefall/2/E/L9/GNKSFH1X3M94IQQIEPHNLG.uasset


二进制
Content/__ExternalActors__/treefall/2/E/V2/4RP8W5FYYH09O37U710294.uasset


二进制
Content/__ExternalActors__/treefall/2/F/32/QKXCDT2TM45J7IFS01OBOK.uasset


二进制
Content/treefall/2.umap


二进制
Content/treemap/map/tree_redayroom.umap