Sfoglia il codice sorgente

修改调整了112.121.126关,新增lv127-130

ML_Mela 2 anni fa
parent
commit
bbb529407c
36 ha cambiato i file con 33 aggiunte e 18 eliminazioni
  1. 4 4
      LevelTool/Resources/MarblePuzzleResources/GameData/branch1/CSV/Gems_level_element.csv
  2. 5 1
      LevelTool/Resources/MarblePuzzleResources/GameData/branch1/CSV/level_config_3.csv
  3. 5 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 1
      LevelTool/Resources/MarblePuzzleResources/GameData/branch1/Json/zuma_crown.json
  10. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch10/Json/zuma.json
  11. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch11/Json/zuma.json
  12. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch12/Json/zuma.json
  13. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch13/Json/zuma.json
  14. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch14/Json/zuma.json
  15. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch15/Json/zuma.json
  16. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch16/Json/zuma.json
  17. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch17/Json/zuma.json
  18. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch18/Json/zuma.json
  19. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch19/Json/zuma.json
  20. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch2/Json/zuma.json
  21. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch20/Json/zuma.json
  22. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch3/Json/zuma.json
  23. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch4/Json/zuma.json
  24. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch5/Json/zuma.json
  25. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch6/Json/zuma.json
  26. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch7/Json/zuma.json
  27. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch8/Json/zuma.json
  28. 0 0
      LevelTool/Resources/MarblePuzzleResources/GameData/branch9/Json/zuma.json
  29. 4 4
      LevelTool/Resources/MarblePuzzleResources/MarblePuzzle-desktop.app/Contents/Resources/Data/Number/Gems_level_element.csv
  30. 5 1
      LevelTool/Resources/MarblePuzzleResources/MarblePuzzle-desktop.app/Contents/Resources/Data/Number/level_config_3.csv
  31. 5 1
      LevelTool/Resources/MarblePuzzleResources/MarblePuzzle-desktop.app/Contents/Resources/Data/Number/level_hard_3.csv
  32. 1 1
      LevelTool/Resources/MarblePuzzleResources/MarblePuzzle-desktop.app/Contents/Resources/Data/PhotoShop/temp_level.json
  33. 1 1
      LevelTool/Resources/MarblePuzzleResources/MarblePuzzle-desktop.app/Contents/Resources/Data/PhotoShop/temp_path.json
  34. 0 0
      LevelTool/Resources/MarblePuzzleResources/MarblePuzzle-desktop.app/Contents/Resources/Data/PhotoShop/tile_level_ai3.json
  35. 0 0
      LevelTool/Resources/MarblePuzzleResources/MarblePuzzle-desktop.app/Contents/Resources/Data/PhotoShop/zuma.json
  36. 0 0
      LevelTool/Resources/MarblePuzzleResources/MarblePuzzle-desktop.app/Contents/Resources/RecordScrTest/test.json

+ 4 - 4
LevelTool/Resources/MarblePuzzleResources/GameData/branch1/CSV/Gems_level_element.csv

@@ -126,10 +126,10 @@ id-int32,#rem,Leveltype-int32,Diamond-int32,Rollingdiamond-int32,1Layerdolls-int
 124,,0,0,0,0,0,0,0,0,0,0
 125,,0,0,0,0,0,0,0,0,0,0
 126,,0,0,0,0,0,0,0,0,0,0
-127,,2,0,1,4,0,0,0,0,3,2
-128,,2,0,1,4,0,0,0,0,3,2
-129,,2,0,3,3,0,0,0,0,3,2
-130,,1,0,0,0,0,6,0,2,0,0
+127,,0,0,0,0,0,0,0,0,0,0
+128,,0,0,0,0,0,0,0,0,0,0
+129,,0,0,0,0,0,0,0,0,0,0
+130,,0,0,0,0,0,0,0,0,0,0
 131,,1,0,0,0,0,5,0,2,0,0
 132,,1,0,0,0,0,6,0,2,0,0
 133,,2,0,0,0,4,0,0,0,3,0

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

@@ -125,4 +125,8 @@ id-int32,#rem,bzsegdistance-int32,sceneid-int32,normal_speed-int32,color-int32,b
 123,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,377,0,3,50,50,50,50,50,50
 124,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,378,0,3,50,50,50,50,50,50
 125,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,379,0,3,50,50,50,50,50,50
-126,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,380,0,3,50,50,50,50,50,50
+126,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,380,0,3,50,50,50,50,50,50
+127,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,381,0,3,50,50,50,50,50,50
+128,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,382,0,3,50,50,50,50,50,50
+129,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,383,0,3,50,50,50,50,50,50
+130,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,384,0,3,50,50,50,50,50,50

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

@@ -125,4 +125,8 @@ id-int32,#rem,hard-int32,bosstype-int32,bossguide-int32,star1-int32,star2-int32,
 123,,2,0,0,300,24500,35000,4
 124,,2,0,0,300,24500,35000,4
 125,,2,0,0,300,24500,35000,4
-126,,2,0,0,300,24500,35000,4
+126,,2,0,0,300,24500,35000,4
+127,,2,0,0,300,24500,35000,4
+128,,2,0,0,300,24500,35000,4
+129,,2,0,0,300,24500,35000,4
+130,,2,0,0,300,24500,35000,4

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

@@ -1 +1 @@
-{"375": []}
+{"383": []}

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

@@ -1 +1 @@
-{"arsenal1PosX": 210, "arsenal1PosY": 383, "arsenalDir": 4, "arsenalType": 0, "ballIn1Angle": 207.08966064453125, "ballIn1PosX": 471, "ballIn1PosY": 252, "ballOut1Angle": 51.0592041015625, "ballOut1PosX": 72.000000000000014, "ballOut1PosY": 896, "levelId": 121, "pathFlipId": 0, "pathResId": 375, "pathTrackCount": 1}
+{"arsenal1PosX": 240.1606625, "arsenal1PosY": 263.80069648437501, "arsenalDir": 4, "arsenalType": 0, "ballIn1Angle": 90.603759765625, "ballIn1PosX": 558.77769687499995, "ballIn1PosY": 493.78448938903807, "ballOut1Angle": 100.80081176757812, "ballOut1PosX": 78.461580078124982, "ballOut1PosY": 289.5135953125, "levelId": 129, "pathFlipId": 0, "pathResId": 383, "pathTrackCount": 1}

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

@@ -1 +1 @@
-{"375": ["72.4721 896.1391 m\r94.0862 935.1589 138.0799 960.0437 188.8755 960.0802 c\r239.6711 960.1166 326.9345 944.5285 318.4660 860.6087 c\r309.9975 776.6889 124.3563 781.0065 133.5956 681.4517 c\r142.8350 581.8969 387.9538 744.6376 450.0669 762.0226 c\r512.1799 779.4076 568.4858 729.4036 574.8919 692.6754 c\r581.2980 655.9471 573.2513 596.9174 516.8724 576.9131 c\r460.4934 556.9089 257.9623 566.7410 194.0108 549.9081 c\r130.0592 533.0752 90.4276 490.1495 77.4074 450.5059 c\r64.3871 410.8624 55.0471 350.6667 78.2942 305.7347 c\r101.5414 260.8028 134.0908 223.1884 219.9373 226.7290 c\r305.7838 230.2695 359.2671 273.0348 360.6889 355.3765 c\r362.1107 437.7181 419.1770 475.5350 481.9411 469.1289 c\r544.7052 462.7228 582.7302 425.1717 574.5950 360.9024 c\r566.4598 296.6332 471.1757 252.5093 y"]}
+{"383": ["78.4616 289.5136 m\r60.0089 340.4342 74.7013 417.4271 123.4813 420.4634 c\r172.2613 423.4998 198.4430 412.7761 227.6089 411.2970 c\r256.7748 409.8179 285.3262 432.9111 289.2479 473.3892 c\r293.1697 513.8673 275.5660 536.3564 241.0721 541.4864 c\r206.5781 546.6165 209.4739 543.8614 148.8349 546.9602 c\r88.1958 550.0591 63.9151 571.7617 64.2120 605.1619 c\r64.5088 638.5621 81.4511 670.7124 129.9082 672.0144 c\r178.3653 673.3165 423.6665 670.0301 414.0678 751.7572 c\r404.4691 833.4844 199.4533 757.5019 135.8820 766.6527 c\r72.3106 775.8035 58.3787 827.8231 64.0588 874.1390 c\r69.7388 920.4550 99.4819 968.5643 181.5215 960.8353 c\r263.5610 953.1064 535.9814 882.9883 569.9285 830.5990 c\r603.8755 778.2097 527.7681 688.9046 y\r490.6648 641.8121 439.4005 571.8086 v\r388.1361 501.8051 377.8759 435.5047 377.6884 375.4489 c\r377.5009 315.3931 396.0421 239.2752 468.6185 234.9212 c\r541.1948 230.5672 561.6526 317.2785 558.7777 493.7845 c"]}

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 - 1
LevelTool/Resources/MarblePuzzleResources/GameData/branch1/Json/zuma_crown.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


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

@@ -126,10 +126,10 @@ id-int32,#rem,Leveltype-int32,Diamond-int32,Rollingdiamond-int32,1Layerdolls-int
 124,,0,0,0,0,0,0,0,0,0,0
 125,,0,0,0,0,0,0,0,0,0,0
 126,,0,0,0,0,0,0,0,0,0,0
-127,,2,0,1,4,0,0,0,0,3,2
-128,,2,0,1,4,0,0,0,0,3,2
-129,,2,0,3,3,0,0,0,0,3,2
-130,,1,0,0,0,0,6,0,2,0,0
+127,,0,0,0,0,0,0,0,0,0,0
+128,,0,0,0,0,0,0,0,0,0,0
+129,,0,0,0,0,0,0,0,0,0,0
+130,,0,0,0,0,0,0,0,0,0,0
 131,,1,0,0,0,0,5,0,2,0,0
 132,,1,0,0,0,0,6,0,2,0,0
 133,,2,0,0,0,4,0,0,0,3,0

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

@@ -125,4 +125,8 @@ id-int32,#rem,bzsegdistance-int32,sceneid-int32,normal_speed-int32,color-int32,b
 123,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,377,0,3,50,50,50,50,50,50
 124,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,378,0,3,50,50,50,50,50,50
 125,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,379,0,3,50,50,50,50,50,50
-126,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,380,0,3,50,50,50,50,50,50
+126,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,380,0,3,50,50,50,50,50,50
+127,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,381,0,3,50,50,50,50,50,50
+128,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,382,0,3,50,50,50,50,50,50
+129,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,383,0,3,50,50,50,50,50,50
+130,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,384,0,3,50,50,50,50,50,50

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

@@ -125,4 +125,8 @@ id-int32,#rem,hard-int32,bosstype-int32,bossguide-int32,star1-int32,star2-int32,
 123,,2,0,0,300,24500,35000,4
 124,,2,0,0,300,24500,35000,4
 125,,2,0,0,300,24500,35000,4
-126,,2,0,0,300,24500,35000,4
+126,,2,0,0,300,24500,35000,4
+127,,2,0,0,300,24500,35000,4
+128,,2,0,0,300,24500,35000,4
+129,,2,0,0,300,24500,35000,4
+130,,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": 293.23746054687496, "arsenal1PosY": 340.46544648437498, "arsenalDir": 4, "arsenalType": 0, "ballIn1Angle": 212.89822387695312, "ballIn1PosX": 352.15320840920424, "ballIn1PosY": 797.96944550227147, "ballOut1Angle": 420.75567626953125, "ballOut1PosX": 531.79692609863275, "ballOut1PosY": 283.05196486511227, "levelId": 126, "pathFlipId": 0, "pathResId": 380, "pathTrackCount": 1}
+{"arsenal1PosX": 574.74604765624997, "arsenal1PosY": 591.26646796875002, "arsenalDir": 3, "arsenalType": 2, "ballIn1Angle": 480.09912109375, "ballIn1PosX": 84.873836617571527, "ballIn1PosY": 287.7137598325175, "ballOut1Angle": 495.3370361328125, "ballOut1PosX": 355.22549414062496, "ballOut1PosY": 274.21710273437498, "levelId": 128, "pathFlipId": 0, "pathResId": 382, "pathTrackCount": 1}

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

@@ -1 +1 @@
-{"380": ["352.1532 797.9694 m\r392.3486 806.4513 431.2646 876.8198 400.2877 923.1221 c\r369.3109 969.4244 219.6778 984.4198 209.8001 884.6322 c\r199.9224 784.8446 318.4592 651.9549 349.3496 559.1832 c\r380.2401 466.4116 228.7666 424.5267 191.8633 492.0903 c\r154.9599 559.6538 187.1307 779.9336 118.3248 785.1663 c\r49.5189 790.3990 63.5115 643.8755 63.9919 620.4968 c\r64.4723 597.1180 74.3106 401.2973 109.0705 327.3706 c\r143.8303 253.4439 186.2337 224.0096 293.5143 223.5190 c\r400.7949 223.0284 459.9145 309.2355 466.7485 383.7032 c\r473.5824 458.1708 449.9715 513.9740 418.9308 630.1413 c\r387.8901 746.3086 503.9072 798.1415 550.9789 726.5977 c\r598.0505 655.0539 570.6597 415.6951 y\r562.8226 328.1361 531.7969 283.0520 v"]}
+{"382": ["84.8738 287.7138 m\r135.9709 170.5126 242.5096 231.2130 199.0077 313.6791 c\r155.5058 396.1452 117.3408 431.6350 80.0188 495.3730 c\r42.6968 559.1110 77.4512 603.6307 131.3978 604.2297 c\r185.3443 604.8286 220.7393 611.9847 244.3897 633.1144 c\r268.0402 654.2441 283.0190 724.6954 277.7795 767.7100 c\r272.5401 810.7245 251.3687 851.5568 205.9532 844.7758 c\r160.5377 837.9947 158.8814 790.8552 158.9965 759.8700 c\r159.1116 728.8847 146.5120 700.9304 114.9919 700.1596 c\r83.4719 699.3888 65.1755 716.5185 63.5245 753.2051 c\r61.8735 789.8917 62.9463 847.0413 62.9776 891.2381 c\r63.0088 935.4349 97.4090 958.8458 127.9239 960.1166 c\r158.4387 961.3874 247.5615 925.7477 294.7635 935.8776 c\r341.9654 946.0076 374.1104 979.1734 407.0992 950.4294 c\r440.0880 921.6853 362.4389 724.4298 383.9956 651.5775 c\r405.5524 578.7251 404.1618 506.5915 335.4968 500.8260 c\r266.8319 495.0605 233.7442 497.3157 230.5047 449.4940 c\r227.2652 401.6722 339.3613 289.1334 355.2255 274.2171 c"]}

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


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


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