ML_Mela vor 2 Jahren
Ursprung
Commit
6d7dfabb25
28 geänderte Dateien mit 5 neuen und 5 gelöschten Zeilen
  1. 1 1
      LevelTool/Resources/MarblePuzzleResources/GameData/branch1/Json/temp_crown.json
  2. 1 1
      LevelTool/Resources/MarblePuzzleResources/GameData/branch1/Json/temp_level.json
  3. 1 1
      LevelTool/Resources/MarblePuzzleResources/GameData/branch1/Json/temp_path.json
  4. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch1/Json/tile_level_ai3.json
  5. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch1/Json/zuma.json
  6. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch10/Json/zuma.json
  7. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch11/Json/zuma.json
  8. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch12/Json/zuma.json
  9. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch13/Json/zuma.json
  10. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch14/Json/zuma.json
  11. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch15/Json/zuma.json
  12. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch16/Json/zuma.json
  13. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch17/Json/zuma.json
  14. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch18/Json/zuma.json
  15. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch19/Json/zuma.json
  16. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch2/Json/zuma.json
  17. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch20/Json/zuma.json
  18. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch3/Json/zuma.json
  19. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch4/Json/zuma.json
  20. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch5/Json/zuma.json
  21. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch6/Json/zuma.json
  22. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch7/Json/zuma.json
  23. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch8/Json/zuma.json
  24. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch9/Json/zuma.json
  25. 1 1
      LevelTool/Resources/MarblePuzzleResources/MarblePuzzle-desktop.app/Contents/Resources/Data/PhotoShop/temp_level.json
  26. 1 1
      LevelTool/Resources/MarblePuzzleResources/MarblePuzzle-desktop.app/Contents/Resources/Data/PhotoShop/temp_path.json
  27. 0 0
      LevelTool/Resources/MarblePuzzleResources/MarblePuzzle-desktop.app/Contents/Resources/Data/PhotoShop/tile_level_ai3.json
  28. 0 0
      LevelTool/Resources/MarblePuzzleResources/MarblePuzzle-desktop.app/Contents/Resources/Data/PhotoShop/zuma.json

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

@@ -1 +1 @@
-{"314": []}
+{"295": []}

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

@@ -1 +1 @@
-{"arsenal1PosX": 309, "arsenal1PosY": 497, "arsenalDir": 4, "arsenalType": 0, "ballIn1Angle": 346.40444946289062, "ballIn1PosX": 535, "ballIn1PosY": 926, "ballOut1Angle": 225.2044677734375, "ballOut1PosX": 557, "ballOut1PosY": 291, "levelId": 67, "pathFlipId": 0, "pathResId": 314, "pathTrackCount": 1}
+{"arsenal1PosX": 431.09338906249997, "arsenal1PosY": 748.75211406249991, "arsenalDir": 4, "arsenalType": 0, "ballIn1Angle": -49.853668212890625, "ballIn1PosX": 107, "ballIn1PosY": 645, "ballOut1Angle": 347.75848388671875, "ballOut1PosX": 86, "ballOut1PosY": 944, "levelId": 52, "pathFlipId": 0, "pathResId": 295, "pathTrackCount": 1}

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

@@ -1 +1 @@
-{"314": ["557.5642 291.4354 m\r495.9771 222.7028 444.6243 222.8746 v\r393.2715 223.0465 255.2957 406.7971 199.9325 381.6936 c\r144.5693 356.5900 246.0407 225.0100 166.6573 223.2913 c\r87.2738 221.5726 42.7437 448.6815 72.3992 527.1483 c\r102.0547 605.6151 315.2057 603.9589 290.3469 685.8995 c\r265.4882 767.8402 81.5709 616.7294 63.8630 689.4984 c\r46.1551 762.2674 189.4380 811.6203 278.2587 807.9954 c\r367.0794 804.3705 486.1181 751.5177 482.1338 645.0151 c\r478.1495 538.5126 373.7094 343.7987 465.4415 354.3193 c\r557.1736 364.8398 578.3710 565.6109 574.7460 626.3750 c\r571.1211 687.1391 547.6217 791.1313 473.3319 840.3540 c\r399.0421 889.5767 189.0265 866.1138 225.9683 934.8620 c\r262.9101 1003.6103 535.1220 926.3727 y"]}
+{"295": ["107.5963 645.9995 m\r73.9825 702.7949 75.5971 741.9971 v\r77.2117 781.1992 97.4611 833.5104 182.2142 833.2344 c\r266.9672 832.9583 289.9042 789.5844 288.6490 737.7941 c\r287.3938 686.0037 236.7337 681.4725 237.1399 623.6302 c\r237.5461 565.7879 285.6022 568.4597 330.9865 541.5907 c\r376.3708 514.7216 364.5430 414.5208 288.3209 416.5260 c\r212.0988 418.5312 168.5010 509.7945 122.5177 509.8675 c\r76.5344 509.9405 68.5556 457.0927 66.2119 440.5515 c\r63.8682 424.0102 62.1182 330.6896 63.9984 287.9928 c\r65.8786 245.2959 86.7999 223.6246 127.9968 223.9944 c\r169.1937 224.3642 208.7552 304.4663 295.3937 311.2995 c\r382.0322 318.1326 458.3147 225.0197 506.3675 224.5461 c\r554.4204 224.0726 578.6783 243.5257 576.6936 299.7035 c\r574.7089 355.8813 452.0824 386.0737 447.7076 458.9677 c\r443.3327 531.8617 523.4921 527.1587 555.1215 600.4849 c\r586.7509 673.8112 583.3656 891.6235 548.1843 932.2238 c\r513.0030 972.8241 427.6820 961.2416 395.6984 955.0595 c\r363.7149 948.8773 316.9140 914.3834 254.3426 917.9406 c\r191.7712 921.4978 86.5551 944.9243 y"]}

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch1/Json/tile_level_ai3.json


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch1/Json/zuma.json


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch10/Json/zuma.json


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch11/Json/zuma.json


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch12/Json/zuma.json


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch13/Json/zuma.json


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch14/Json/zuma.json


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch15/Json/zuma.json


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch16/Json/zuma.json


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch17/Json/zuma.json


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch18/Json/zuma.json


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch19/Json/zuma.json


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch2/Json/zuma.json


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch20/Json/zuma.json


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch3/Json/zuma.json


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch4/Json/zuma.json


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch5/Json/zuma.json


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch6/Json/zuma.json


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch7/Json/zuma.json


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch8/Json/zuma.json


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/GameData/branch9/Json/zuma.json


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

@@ -1 +1 @@
-{"arsenal1PosX": 309, "arsenal1PosY": 497, "arsenalDir": 4, "arsenalType": 0, "ballIn1Angle": 346.40444946289062, "ballIn1PosX": 535, "ballIn1PosY": 926, "ballOut1Angle": 225.2044677734375, "ballOut1PosX": 557, "ballOut1PosY": 291, "levelId": 67, "pathFlipId": 0, "pathResId": 314, "pathTrackCount": 1}
+{"arsenal1PosX": 431.09338906249997, "arsenal1PosY": 748.75211406249991, "arsenalDir": 4, "arsenalType": 0, "ballIn1Angle": -49.853668212890625, "ballIn1PosX": 107, "ballIn1PosY": 645, "ballOut1Angle": 347.75848388671875, "ballOut1PosX": 86, "ballOut1PosY": 944, "levelId": 52, "pathFlipId": 0, "pathResId": 295, "pathTrackCount": 1}

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

@@ -1 +1 @@
-{"314": ["557.5642 291.4354 m\r495.9771 222.7028 444.6243 222.8746 v\r393.2715 223.0465 255.2957 406.7971 199.9325 381.6936 c\r144.5693 356.5900 246.0407 225.0100 166.6573 223.2913 c\r87.2738 221.5726 42.7437 448.6815 72.3992 527.1483 c\r102.0547 605.6151 315.2057 603.9589 290.3469 685.8995 c\r265.4882 767.8402 81.5709 616.7294 63.8630 689.4984 c\r46.1551 762.2674 189.4380 811.6203 278.2587 807.9954 c\r367.0794 804.3705 486.1181 751.5177 482.1338 645.0151 c\r478.1495 538.5126 373.7094 343.7987 465.4415 354.3193 c\r557.1736 364.8398 578.3710 565.6109 574.7460 626.3750 c\r571.1211 687.1391 547.6217 791.1313 473.3319 840.3540 c\r399.0421 889.5767 189.0265 866.1138 225.9683 934.8620 c\r262.9101 1003.6103 535.1220 926.3727 y"]}
+{"295": ["107.5963 645.9995 m\r73.9825 702.7949 75.5971 741.9971 v\r77.2117 781.1992 97.4611 833.5104 182.2142 833.2344 c\r266.9672 832.9583 289.9042 789.5844 288.6490 737.7941 c\r287.3938 686.0037 236.7337 681.4725 237.1399 623.6302 c\r237.5461 565.7879 285.6022 568.4597 330.9865 541.5907 c\r376.3708 514.7216 364.5430 414.5208 288.3209 416.5260 c\r212.0988 418.5312 168.5010 509.7945 122.5177 509.8675 c\r76.5344 509.9405 68.5556 457.0927 66.2119 440.5515 c\r63.8682 424.0102 62.1182 330.6896 63.9984 287.9928 c\r65.8786 245.2959 86.7999 223.6246 127.9968 223.9944 c\r169.1937 224.3642 208.7552 304.4663 295.3937 311.2995 c\r382.0322 318.1326 458.3147 225.0197 506.3675 224.5461 c\r554.4204 224.0726 578.6783 243.5257 576.6936 299.7035 c\r574.7089 355.8813 452.0824 386.0737 447.7076 458.9677 c\r443.3327 531.8617 523.4921 527.1587 555.1215 600.4849 c\r586.7509 673.8112 583.3656 891.6235 548.1843 932.2238 c\r513.0030 972.8241 427.6820 961.2416 395.6984 955.0595 c\r363.7149 948.8773 316.9140 914.3834 254.3426 917.9406 c\r191.7712 921.4978 86.5551 944.9243 y"]}

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/MarblePuzzle-desktop.app/Contents/Resources/Data/PhotoShop/tile_level_ai3.json


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
LevelTool/Resources/MarblePuzzleResources/MarblePuzzle-desktop.app/Contents/Resources/Data/PhotoShop/zuma.json


Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.