瀏覽代碼

修改了50关的路径线错误

ML_Mela 3 年之前
父節點
當前提交
1148756443
共有 34 個文件被更改,包括 11 次插入13 次删除
  1. 二進制
      LevelTool/.DS_Store
  2. 1 1
      LevelTool/Resources/MarblePuzzleResources/GameData/branch1/CSV/level_config_3.csv
  3. 1 1
      LevelTool/Resources/MarblePuzzleResources/GameData/branch1/CSV/level_hard_3.csv
  4. 1 1
      LevelTool/Resources/MarblePuzzleResources/GameData/branch1/Json/temp_crown.json
  5. 1 1
      LevelTool/Resources/MarblePuzzleResources/GameData/branch1/Json/temp_level.json
  6. 1 1
      LevelTool/Resources/MarblePuzzleResources/GameData/branch1/Json/temp_path.json
  7. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch1/Json/tile_level_ai3.json
  8. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch1/Json/zuma.json
  9. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch10/Json/zuma.json
  10. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch11/Json/zuma.json
  11. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch12/Json/zuma.json
  12. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch13/Json/zuma.json
  13. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch14/Json/zuma.json
  14. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch15/Json/zuma.json
  15. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch16/Json/zuma.json
  16. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch17/Json/zuma.json
  17. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch18/Json/zuma.json
  18. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch19/Json/zuma.json
  19. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch2/Json/zuma.json
  20. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch20/Json/zuma.json
  21. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch3/Json/zuma.json
  22. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch4/Json/zuma.json
  23. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch5/Json/zuma.json
  24. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch6/Json/zuma.json
  25. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch7/Json/zuma.json
  26. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch8/Json/zuma.json
  27. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch9/Json/zuma.json
  28. 1 1
      LevelTool/Resources/MarblePuzzleResources/MarblePuzzle-desktop.app/Contents/Resources/Data/Number/Gems_level_element.csv
  29. 2 3
      LevelTool/Resources/MarblePuzzleResources/MarblePuzzle-desktop.app/Contents/Resources/Data/Number/level_config_3.csv
  30. 1 2
      LevelTool/Resources/MarblePuzzleResources/MarblePuzzle-desktop.app/Contents/Resources/Data/Number/level_hard_3.csv
  31. 1 1
      LevelTool/Resources/MarblePuzzleResources/MarblePuzzle-desktop.app/Contents/Resources/Data/PhotoShop/temp_level.json
  32. 1 1
      LevelTool/Resources/MarblePuzzleResources/MarblePuzzle-desktop.app/Contents/Resources/Data/PhotoShop/temp_path.json
  33. 0 0
      LevelTool/Resources/MarblePuzzleResources/MarblePuzzle-desktop.app/Contents/Resources/Data/PhotoShop/tile_level_ai3.json
  34. 0 0
      LevelTool/Resources/MarblePuzzleResources/MarblePuzzle-desktop.app/Contents/Resources/Data/PhotoShop/zuma.json

二進制
LevelTool/.DS_Store


+ 1 - 1
LevelTool/Resources/MarblePuzzleResources/GameData/branch1/CSV/level_config_3.csv

@@ -49,4 +49,4 @@ id-int32,#rem,bzsegdistance-int32,sceneid-int32,normal_speed-int32,color-int32,b
 47,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,287,0,3,50,50,50,50,50,50
 48,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,288,0,3,50,50,50,50,50,50
 49,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,292,0,3,50,50,50,50,50,50
-50,,10,1,67,3,50,2,1A1D1C,4,2,99,99,99,99,40,50,16,88,293,0,3,50,50,50,50,50,50
+50,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,293,0,3,50,50,50,50,50,50

+ 1 - 1
LevelTool/Resources/MarblePuzzleResources/GameData/branch1/CSV/level_hard_3.csv

@@ -49,4 +49,4 @@ id-int32,#rem,hard-int32,bosstype-int32,bossguide-int32,star1-int32,star2-int32,
 47,,2,0,0,300,24500,35000,4
 48,,2,0,0,300,24500,35000,4
 49,,2,0,0,300,24500,35000,4
-50,,1,0,0,200,8575,12250,6
+50,,2,0,0,300,24500,35000,4

+ 1 - 1
LevelTool/Resources/MarblePuzzleResources/GameData/branch1/Json/temp_crown.json

@@ -1 +1 @@
-{"0": []}
+{"293": []}

+ 1 - 1
LevelTool/Resources/MarblePuzzleResources/GameData/branch1/Json/temp_level.json

@@ -1 +1 @@
-{"arsenal1PosX": 367.05332343749996, "arsenal1PosY": 592.40185624999992, "arsenalDir": 4, "arsenalType": 0, "ballIn1Angle": 178.2818603515625, "ballIn1PosX": 75.784599274826036, "ballIn1PosY": 319.6846956710815, "ballOut1Angle": 0.259185791015625, "ballOut1PosX": 85.492694985961904, "ballOut1PosY": 951.04913984374991, "levelId": 50, "pathFlipId": 0, "pathResId": 0, "pathTrackCount": 1}
+{"arsenal1PosX": 360.29828398437496, "arsenal1PosY": 590.21441093750002, "arsenalDir": 4, "arsenalType": 0, "ballIn1Angle": 180.25918579101562, "ballIn1PosX": 85.492694985961904, "ballIn1PosY": 951.04913984374991, "ballOut1Angle": 358.2818603515625, "ballOut1PosX": 75.78459927482605, "ballOut1PosY": 319.6846956710815, "levelId": 50, "pathFlipId": 0, "pathResId": 293, "pathTrackCount": 1}

+ 1 - 1
LevelTool/Resources/MarblePuzzleResources/GameData/branch1/Json/temp_path.json

@@ -1 +1 @@
-{"0": ["85.4927 951.0491 m\r363.5638 952.3512 415.1667 951.4189 v\r466.7696 950.4866 480.2015 914.4615 480.4828 892.6496 c\r480.7640 870.8376 479.3370 859.9525 480.1442 827.8751 c\r480.9515 795.7978 458.6917 767.1423 414.6928 766.8871 c\r370.6939 766.6319 165.7511 766.8506 127.3770 766.9704 c\r89.0030 767.0902 72.8784 734.4973 72.6857 703.9720 c\r72.4931 673.4467 73.1909 492.9200 74.0606 467.2019 c\r74.9304 441.4838 96.1017 416.6302 128.8978 415.2292 c\r161.6938 413.8282 367.8606 415.9219 413.9792 415.8177 c\r460.0979 415.7136 481.6702 392.0058 480.9828 362.6263 c\r480.2954 333.2468 480.6546 311.6224 480.4619 295.1280 c\r480.2692 278.6337 481.4932 234.9941 421.0936 235.3483 c\r360.6941 235.7024 239.6763 234.4889 218.3591 235.5618 c\r197.0419 236.6347 158.7721 258.3842 159.3346 292.3469 c\r159.8970 326.3095 159.3241 764.6267 160.7668 798.0790 c\r162.2095 831.5313 190.9327 863.4680 221.0309 864.4419 c\r251.1291 865.4159 462.3322 862.9680 495.1022 863.7232 c\r527.8722 864.4784 564.8609 831.3230 564.8453 799.2821 c\r564.8296 767.2412 565.1786 540.5334 y\r565.7619 408.8960 565.4442 378.7405 v\r565.1265 348.5850 529.3513 317.7525 499.4615 318.9399 c\r469.5716 320.1274 76.1596 319.0910 y\r75.7846 319.6847 l"]}
+{"293": ["85.4927 951.0491 m\r363.5638 952.3512 415.1667 951.4189 v\r466.7696 950.4866 480.2015 914.4615 480.4828 892.6496 c\r480.7640 870.8376 479.3370 859.9525 480.1442 827.8751 c\r480.9515 795.7978 458.6917 767.1423 414.6928 766.8871 c\r370.6939 766.6319 165.7511 766.8506 127.3770 766.9704 c\r89.0030 767.0902 72.8784 734.4973 72.6857 703.9720 c\r72.4931 673.4467 73.1909 492.9200 74.0606 467.2019 c\r74.9304 441.4838 96.1017 416.6302 128.8978 415.2292 c\r161.6938 413.8282 367.8606 415.9219 413.9792 415.8177 c\r460.0979 415.7136 481.6702 392.0058 480.9828 362.6263 c\r480.2954 333.2468 480.6546 311.6224 480.4619 295.1280 c\r480.2692 278.6337 481.4932 234.9941 421.0936 235.3483 c\r360.6941 235.7024 239.6763 234.4889 218.3591 235.5618 c\r197.0419 236.6347 158.7721 258.3842 159.3346 292.3469 c\r159.8970 326.3095 159.3241 764.6267 160.7668 798.0790 c\r162.2095 831.5313 190.9327 863.4680 221.0309 864.4419 c\r251.1291 865.4159 462.3322 862.9680 495.1022 863.7232 c\r527.8722 864.4784 564.8609 831.3230 564.8453 799.2821 c\r564.8296 767.2412 565.1786 540.5334 y\r565.7619 408.8960 565.4442 378.7405 v\r565.1265 348.5850 529.3513 317.7525 499.4615 318.9399 c\r469.5716 320.1274 76.1596 319.0910 y\r75.7846 319.6847 l"]}

File diff suppressed because it is too large
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch1/Json/tile_level_ai3.json


File diff suppressed because it is too large
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch1/Json/zuma.json


File diff suppressed because it is too large
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch10/Json/zuma.json


File diff suppressed because it is too large
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch11/Json/zuma.json


File diff suppressed because it is too large
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch12/Json/zuma.json


File diff suppressed because it is too large
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch13/Json/zuma.json


File diff suppressed because it is too large
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch14/Json/zuma.json


File diff suppressed because it is too large
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch15/Json/zuma.json


File diff suppressed because it is too large
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch16/Json/zuma.json


File diff suppressed because it is too large
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch17/Json/zuma.json


File diff suppressed because it is too large
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch18/Json/zuma.json


File diff suppressed because it is too large
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch19/Json/zuma.json


File diff suppressed because it is too large
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch2/Json/zuma.json


File diff suppressed because it is too large
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch20/Json/zuma.json


File diff suppressed because it is too large
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch3/Json/zuma.json


File diff suppressed because it is too large
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch4/Json/zuma.json


File diff suppressed because it is too large
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch5/Json/zuma.json


File diff suppressed because it is too large
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch6/Json/zuma.json


File diff suppressed because it is too large
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch7/Json/zuma.json


File diff suppressed because it is too large
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch8/Json/zuma.json


File diff suppressed because it is too large
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch9/Json/zuma.json


+ 1 - 1
LevelTool/Resources/MarblePuzzleResources/MarblePuzzle-desktop.app/Contents/Resources/Data/Number/Gems_level_element.csv

@@ -51,7 +51,7 @@ id-int32,#rem,Leveltype-int32,Diamond-int32,Rollingdiamond-int32,1Layerdolls-int
 49,,0,0,0,0,0,0,0,0,0,0
 50,,0,0,0,0,0,0,0,0,0,0
 51,,0,0,0,0,0,0,0,0,0,0
-52,,2,0,0,0,4,0,0,0,0,0
+52,,0,0,0,0,0,0,0,0,0,0
 53,,2,0,0,0,4,0,0,0,0,0
 54,,1,2,0,0,3,0,0,0,0,0
 55,,1,2,0,0,3,0,0,0,0,0

+ 2 - 3
LevelTool/Resources/MarblePuzzleResources/MarblePuzzle-desktop.app/Contents/Resources/Data/Number/level_config_3.csv

@@ -48,6 +48,5 @@ id-int32,#rem,bzsegdistance-int32,sceneid-int32,normal_speed-int32,color-int32,b
 46,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,286,0,3,50,50,50,50,50,50
 47,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,287,0,3,50,50,50,50,50,50
 48,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,288,0,3,50,50,50,50,50,50
-49,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,289,0,3,50,50,50,50,50,50
-50,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,289,0,3,50,50,50,50,50,50
-51,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,290,0,3,50,50,50,50,50,50
+49,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,292,0,3,50,50,50,50,50,50
+50,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,293,0,3,50,50,50,50,50,50

+ 1 - 2
LevelTool/Resources/MarblePuzzleResources/MarblePuzzle-desktop.app/Contents/Resources/Data/Number/level_hard_3.csv

@@ -49,5 +49,4 @@ id-int32,#rem,hard-int32,bosstype-int32,bossguide-int32,star1-int32,star2-int32,
 47,,2,0,0,300,24500,35000,4
 48,,2,0,0,300,24500,35000,4
 49,,2,0,0,300,24500,35000,4
-50,,2,0,0,300,24500,35000,4
-51,,2,0,0,300,24500,35000,4
+50,,2,0,0,300,24500,35000,4

+ 1 - 1
LevelTool/Resources/MarblePuzzleResources/MarblePuzzle-desktop.app/Contents/Resources/Data/PhotoShop/temp_level.json

@@ -1 +1 @@
-{"arsenal1PosX": 206.90628554687498, "arsenal1PosY": 849.79125468749999, "arsenalDir": 4, "arsenalType": 0, "ballIn1Angle": 179.5318603515625, "ballIn1PosX": 95.997599999999991, "ballIn1PosY": 447.98879999999997, "ballOut1Angle": 90.1705322265625, "ballOut1PosX": 448.27525117187497, "ballOut1PosY": 533.36687382812499, "levelId": 51, "pathFlipId": 0, "pathResId": 290, "pathTrackCount": 1}
+{"arsenal1PosX": 360.29828398437496, "arsenal1PosY": 590.21441093750002, "arsenalDir": 4, "arsenalType": 0, "ballIn1Angle": 180.25918579101562, "ballIn1PosX": 85.492694985961904, "ballIn1PosY": 951.04913984374991, "ballOut1Angle": 358.2818603515625, "ballOut1PosX": 75.78459927482605, "ballOut1PosY": 319.6846956710815, "levelId": 50, "pathFlipId": 0, "pathResId": 293, "pathTrackCount": 1}

+ 1 - 1
LevelTool/Resources/MarblePuzzleResources/MarblePuzzle-desktop.app/Contents/Resources/Data/PhotoShop/temp_path.json

@@ -1 +1 @@
-{"290": ["448.2752 533.3669 m\r447.2440 871.2334 447.9888 895.9776 v\r448.7336 920.7218 463.9780 960.4291 511.9872 959.9760 c\r559.9964 959.5229 576.8345 926.3310 575.9856 895.9776 c\r575.1367 865.6242 577.5220 324.0231 576.4543 286.6126 c\r575.3867 249.2021 557.4756 225.3485 511.5028 225.1246 c\r465.5300 224.9006 158.1575 224.0621 126.2625 224.5569 c\r94.3674 225.0517 62.7120 240.1607 63.1911 292.3156 c\r63.6703 344.4706 106.1276 351.6006 127.3926 351.5173 c\r148.6577 351.4339 254.7228 350.7048 287.3209 351.6579 c\r319.9191 352.6110 350.5694 380.5217 351.4548 413.9740 c\r352.3401 447.4263 352.2985 867.9314 352.2412 897.4151 c\r352.1839 926.8987 331.6115 959.0698 286.6543 960.1427 c\r241.6971 961.2155 167.6677 959.5958 128.2989 959.9864 c\r88.9301 960.3770 64.2953 935.9141 63.9255 897.7744 c\r63.5557 859.6348 62.0818 833.2656 63.2484 797.8394 c\r64.4151 762.4132 80.1230 736.7316 126.8458 735.5545 c\r173.5686 734.3775 147.1369 734.9243 191.6150 735.0754 c\r236.0931 735.2264 255.2592 708.9979 256.2176 670.0353 c\r257.1759 631.0728 254.9572 531.6482 255.1342 508.7269 c\r255.3113 485.8056 228.0360 448.4367 194.2972 447.9107 c\r160.5585 447.3846 95.9976 447.9888 y"]}
+{"293": ["85.4927 951.0491 m\r363.5638 952.3512 415.1667 951.4189 v\r466.7696 950.4866 480.2015 914.4615 480.4828 892.6496 c\r480.7640 870.8376 479.3370 859.9525 480.1442 827.8751 c\r480.9515 795.7978 458.6917 767.1423 414.6928 766.8871 c\r370.6939 766.6319 165.7511 766.8506 127.3770 766.9704 c\r89.0030 767.0902 72.8784 734.4973 72.6857 703.9720 c\r72.4931 673.4467 73.1909 492.9200 74.0606 467.2019 c\r74.9304 441.4838 96.1017 416.6302 128.8978 415.2292 c\r161.6938 413.8282 367.8606 415.9219 413.9792 415.8177 c\r460.0979 415.7136 481.6702 392.0058 480.9828 362.6263 c\r480.2954 333.2468 480.6546 311.6224 480.4619 295.1280 c\r480.2692 278.6337 481.4932 234.9941 421.0936 235.3483 c\r360.6941 235.7024 239.6763 234.4889 218.3591 235.5618 c\r197.0419 236.6347 158.7721 258.3842 159.3346 292.3469 c\r159.8970 326.3095 159.3241 764.6267 160.7668 798.0790 c\r162.2095 831.5313 190.9327 863.4680 221.0309 864.4419 c\r251.1291 865.4159 462.3322 862.9680 495.1022 863.7232 c\r527.8722 864.4784 564.8609 831.3230 564.8453 799.2821 c\r564.8296 767.2412 565.1786 540.5334 y\r565.7619 408.8960 565.4442 378.7405 v\r565.1265 348.5850 529.3513 317.7525 499.4615 318.9399 c\r469.5716 320.1274 76.1596 319.0910 y\r75.7846 319.6847 l"]}

File diff suppressed because it is too large
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/MarblePuzzle-desktop.app/Contents/Resources/Data/PhotoShop/tile_level_ai3.json


File diff suppressed because it is too large
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/MarblePuzzle-desktop.app/Contents/Resources/Data/PhotoShop/zuma.json


Some files were not shown because too many files changed in this diff