新增lv41-44

LevelTool/Resources/MarblePuzzleResources/GameData/branch1/CSV/Gems_level_element.csv

@@ -41,9 +41,9 @@ id-int32,#rem,Leveltype-int32,Diamond-int32,Rollingdiamond-int32,1Layerdolls-int
 39,,0,0,0,0,0,0,0,0,0,0
 40,,0,0,0,0,0,0,0,0,0,0
 41,,0,0,0,0,0,0,0,0,0,0
-42,,2,0,2,0,0,2,0,0,0,0
-43,,2,0,2,0,0,2,0,0,0,0
-44,,2,0,2,0,0,3,0,0,0,0
+42,,0,0,0,0,0,0,0,0,0,0
+43,,0,0,0,0,0,0,0,0,0,0
+44,,0,0,0,0,0,0,0,0,0,0
 45,,1,3,0,0,0,2,0,0,0,0
 46,,2,0,2,2,0,0,0,0,0,0
 47,,2,0,2,1,0,1,0,0,0,0

LevelTool/Resources/MarblePuzzleResources/GameData/branch1/CSV/level_config_3.csv

@@ -39,4 +39,8 @@ id-int32,#rem,bzsegdistance-int32,sceneid-int32,normal_speed-int32,color-int32,b
 37,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,276,0,3,50,50,50,50,50,50
 38,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,277,0,3,50,50,50,50,50,50
 39,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,278,0,3,50,50,50,50,50,50
-40,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,279,0,3,50,50,50,50,50,50
+40,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,279,0,3,50,50,50,50,50,50
+41,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,281,0,3,50,50,50,50,50,50
+42,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,282,0,3,50,50,50,50,50,50
+43,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,283,0,3,50,50,50,50,50,50
+44,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,284,0,3,50,50,50,50,50,50

LevelTool/Resources/MarblePuzzleResources/GameData/branch1/CSV/level_hard_3.csv

@@ -39,4 +39,8 @@ id-int32,#rem,hard-int32,bosstype-int32,bossguide-int32,star1-int32,star2-int32,
 37,,2,0,0,300,24500,35000,4
 38,,2,0,0,300,24500,35000,4
 39,,2,0,0,300,24500,35000,4
-40,,2,0,0,300,24500,35000,4
+40,,2,0,0,300,24500,35000,4
+41,,2,0,0,300,24500,35000,4
+42,,2,0,0,300,24500,35000,4
+43,,2,0,0,300,24500,35000,4
+44,,2,0,0,300,24500,35000,4

LevelTool/Resources/MarblePuzzleResources/GameData/branch1/Json/temp_crown.json

@@ -1 +1 @@
-{"279": []}
+{"281": []}

LevelTool/Resources/MarblePuzzleResources/GameData/branch1/Json/temp_level.json

@@ -1 +1 @@
-{"arsenal1PosX": 318, "arsenal1PosY": 857, "arsenalDir": 4, "arsenalType": 0, "ballIn1Angle": 86.97967529296875, "ballIn1PosX": 77.513702367782585, "ballIn1PosY": 608.09421295471191, "ballOut1Angle": 347.679443359375, "ballOut1PosX": 105.46090507812499, "ballOut1PosY": 726.78912148437496, "levelId": 40, "pathFlipId": 0, "pathResId": 279, "pathTrackCount": 1}
+{"arsenal1PosX": 192, "arsenal1PosY": 533, "arsenalDir": 4, "arsenalType": 0, "ballIn1Angle": 270.13998413085938, "ballIn1PosX": 76, "ballIn1PosY": 387, "ballOut1Angle": 50.58935546875, "ballOut1PosX": 95, "ballOut1PosY": 241.00000000000006, "levelId": 41, "pathFlipId": 0, "pathResId": 281, "pathTrackCount": 1}

LevelTool/Resources/MarblePuzzleResources/GameData/branch1/Json/temp_path.json

@@ -1 +1 @@
-{"279": ["105.4609 726.7891 m\r145.3505 734.4816 184.0475 679.9934 209.0807 680.4008 c\r234.1140 680.8083 250.8323 687.4568 258.7175 700.6596 c\r266.6027 713.8624 273.2900 734.9556 256.5153 754.3328 c\r239.7405 773.7100 159.9960 799.9800 y\r127.5489 810.8912 127.9968 863.9784 v\r128.4447 917.0656 166.7458 934.2631 184.8131 940.1119 c\r202.8804 945.9607 242.4679 960.3354 319.9920 959.9760 c\r397.5161 959.6166 448.1763 951.5647 464.1707 945.3670 c\r480.1651 939.1692 516.6225 902.4983 511.9872 863.9784 c\r507.3519 825.4585 494.5918 812.7870 479.9880 799.9800 c\r465.3842 787.1730 404.8493 768.2308 387.8393 755.2519 c\r370.8293 742.2731 363.4545 721.1382 372.0167 701.6908 c\r380.5790 682.2434 410.1356 670.1603 432.2228 678.6222 c\r454.3101 687.0841 483.8994 722.6538 522.9973 727.0808 c\r562.0953 731.5078 561.6318 669.2749 y\r576.2460 281.7325 559.1683 250.0615 v\r542.0906 218.3904 479.4828 211.1718 455.5876 253.2488 c\r431.6924 295.3258 543.2989 581.1573 447.3899 590.0633 c\r351.4809 598.9693 384.9539 375.4698 382.4488 347.0642 c\r379.9436 318.6587 356.8296 288.0449 319.8305 288.1178 c\r282.8314 288.1907 254.8895 317.5858 256.5144 346.8403 c\r258.1394 376.0948 280.7534 604.6203 191.3963 590.0633 c\r102.0392 575.5064 202.5938 299.2634 186.3339 256.8269 c\r170.0739 214.3904 98.7163 213.2030 79.5293 251.3687 c\r60.3422 289.5344 77.5137 608.0942 y"]}
+{"281": ["95.9976 241.9315 m\r139.7517 305.2684 191.9952 305.9299 v\r244.2387 306.5913 262.8997 272.0974 319.9920 273.9307 c\r377.0843 275.7639 455.6032 241.2908 481.8161 241.2440 c\r508.0290 241.1971 560.6579 259.9883 562.3401 300.1696 c\r564.0224 340.3509 561.4235 848.2600 561.5485 877.4989 c\r561.6735 906.7377 551.3716 958.9604 510.8779 959.4083 c\r470.3842 959.8562 159.6835 958.8458 126.8875 959.4083 c\r94.0914 959.9708 76.2793 904.8003 73.9929 886.3476 c\r71.7065 867.8950 72.3107 795.9541 80.1490 776.4233 c\r87.9874 756.8925 109.6535 736.0962 151.8243 736.2785 c\r193.9951 736.4608 224.2913 786.0741 289.0084 803.0112 c\r353.7255 819.9482 402.5004 805.2142 420.6978 777.4181 c\r438.8953 749.6219 448.1086 726.5704 447.9680 703.0658 c\r447.8273 679.5611 447.9367 420.6353 447.9888 397.3234 c\r448.0409 374.0115 428.4216 347.0069 383.1727 346.8299 c\r337.9238 346.6528 319.1274 376.6625 318.9451 396.5109 c\r318.7627 416.3594 319.9712 569.7930 319.7003 595.3289 c\r319.4294 620.8648 302.9872 657.7023 253.2489 658.6867 c\r203.5105 659.6710 175.6258 658.1138 149.8504 658.1867 c\r124.0750 658.2596 76.1023 635.5362 76.0866 600.3079 c\r76.0709 565.0796 76.5085 387.3028 y"]}

LevelTool/Resources/MarblePuzzleResources/GameData/branch1/Json/zuma_crown.json

@@ -1 +1 @@
-{"1": [], "100": [], "102": [], "103": [], "105": [], "107": [], "112": [], "114": [], "131": [], "132": [], "134": [], "135": [], "138": [], "144": [], "145": [], "152": [], "158": [], "159": [], "162": [], "163": [], "166": [], "167": [], "171": [], "172": [], "176": [], "177": [], "187": [], "189": [], "190": [], "197": [], "199": [], "200": [], "202": [], "204": [], "206": [], "207": [], "208": [], "209": [], "212": [], "213": [], "214": [], "22": [], "220": [], "224": [], "230": [], "232": [], "238": [], "24": [], "248": [], "250": [], "252": [], "258": [], "259": [], "261": [], "262": [], "265": [], "266": [], "267": [], "268": [], "269": [], "270": [], "271": [], "272": [], "273": [], "274": [], "275": [], "276": [], "277": [], "278": [], "279": [], "280": [], "281": [], "36": [], "37": [], "42": [], "43": [], "45": [], "46": [], "51": [], "66": [], "70": [], "73": [], "8": [], "81": [], "82": [], "89": []}
+{"1": [], "100": [], "102": [], "103": [], "105": [], "107": [], "112": [], "114": [], "131": [], "132": [], "134": [], "135": [], "138": [], "144": [], "145": [], "152": [], "158": [], "159": [], "162": [], "163": [], "166": [], "167": [], "171": [], "172": [], "176": [], "177": [], "187": [], "189": [], "190": [], "197": [], "199": [], "200": [], "202": [], "204": [], "206": [], "207": [], "208": [], "209": [], "212": [], "213": [], "214": [], "22": [], "220": [], "224": [], "230": [], "232": [], "238": [], "24": [], "248": [], "250": [], "252": [], "258": [], "259": [], "261": [], "262": [], "265": [], "266": [], "267": [], "268": [], "269": [], "270": [], "271": [], "272": [], "273": [], "274": [], "275": [], "276": [], "277": [], "278": [], "279": [], "280": [], "281": [], "282": [], "283": [], "284": [], "36": [], "37": [], "42": [], "43": [], "45": [], "46": [], "51": [], "66": [], "70": [], "73": [], "8": [], "81": [], "82": [], "89": []}

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

@@ -41,9 +41,9 @@ id-int32,#rem,Leveltype-int32,Diamond-int32,Rollingdiamond-int32,1Layerdolls-int
 39,,0,0,0,0,0,0,0,0,0,0
 40,,0,0,0,0,0,0,0,0,0,0
 41,,0,0,0,0,0,0,0,0,0,0
-42,,2,0,2,0,0,2,0,0,0,0
-43,,2,0,2,0,0,2,0,0,0,0
-44,,2,0,2,0,0,3,0,0,0,0
+42,,0,0,0,0,0,0,0,0,0,0
+43,,0,0,0,0,0,0,0,0,0,0
+44,,0,0,0,0,0,0,0,0,0,0
 45,,1,3,0,0,0,2,0,0,0,0
 46,,2,0,2,2,0,0,0,0,0,0
 47,,2,0,2,1,0,1,0,0,0,0

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

@@ -39,4 +39,8 @@ id-int32,#rem,bzsegdistance-int32,sceneid-int32,normal_speed-int32,color-int32,b
 37,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,276,0,3,50,50,50,50,50,50
 38,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,277,0,3,50,50,50,50,50,50
 39,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,278,0,3,50,50,50,50,50,50
-40,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,279,0,3,50,50,50,50,50,50
+40,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,279,0,3,50,50,50,50,50,50
+41,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,281,0,3,50,50,50,50,50,50
+42,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,282,0,3,50,50,50,50,50,50
+43,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,283,0,3,50,50,50,50,50,50
+44,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,284,0,3,50,50,50,50,50,50

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

@@ -39,4 +39,8 @@ id-int32,#rem,hard-int32,bosstype-int32,bossguide-int32,star1-int32,star2-int32,
 37,,2,0,0,300,24500,35000,4
 38,,2,0,0,300,24500,35000,4
 39,,2,0,0,300,24500,35000,4
-40,,2,0,0,300,24500,35000,4
+40,,2,0,0,300,24500,35000,4
+41,,2,0,0,300,24500,35000,4
+42,,2,0,0,300,24500,35000,4
+43,,2,0,0,300,24500,35000,4
+44,,2,0,0,300,24500,35000,4

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

@@ -1 +1 @@
-{"arsenal1PosX": 276.37329882812497, "arsenal1PosY": 842.119571484375, "arsenalDir": 4, "arsenalType": 0, "ballIn1Angle": 269.67132568359375, "ballIn1PosX": 568.10558867187501, "ballIn1PosY": 509.55496914062496, "ballOut1Angle": 180.26715087890625, "ballOut1PosX": 536.59075156249992, "ballOut1PosY": 951.11684648437495, "levelId": 38, "pathFlipId": 0, "pathResId": 277, "pathTrackCount": 1}
+{"arsenal1PosX": 337.48635429687499, "arsenal1PosY": 748.32504140624997, "arsenalDir": 4, "arsenalType": 0, "ballIn1Angle": 207.44815063476562, "ballIn1PosX": 159.334558203125, "ballIn1PosY": 630.09362226562507, "ballOut1Angle": 319.94903564453125, "ballOut1PosX": 318.40870624999997, "ballOut1PosY": 594.05806484375, "levelId": 44, "pathFlipId": 0, "pathResId": 284, "pathTrackCount": 1}

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

@@ -1 +1 @@
-{"277": ["536.5907 951.1168 m\r163.2095 949.3461 134.9445 950.2887 v\r106.6796 951.2314 74.5450 931.5184 73.0294 878.6343 c\r71.5138 825.7502 69.1858 322.5336 69.6337 293.3833 c\r70.0816 264.2330 93.1123 233.7389 135.1737 233.1556 c\r177.2352 232.5723 199.7763 263.7434 199.2606 293.1541 c\r198.7450 322.5649 203.2605 368.8918 194.9170 391.7454 c\r186.5735 414.5990 165.7927 423.6196 166.6990 464.4415 c\r167.6052 505.2634 220.0674 543.6635 272.0297 543.3041 c\r323.9919 542.9448 367.0117 500.2271 367.3502 463.8686 c\r367.6887 427.5101 354.2620 407.6669 342.5956 388.4486 c\r330.9292 369.2304 337.5332 313.9349 337.3249 291.9354 c\r337.1166 269.9360 355.1786 233.0306 406.4742 232.6088 c\r457.7698 232.1869 472.5767 264.2903 472.4257 294.6020 c\r472.2746 324.9138 472.6236 526.5077 471.3684 567.7306 c\r470.1132 608.9535 442.3691 632.4634 410.1825 632.6821 c\r377.9958 632.9008 261.0612 634.0519 231.1869 633.1977 c\r201.3127 632.3436 167.2146 642.3016 168.1781 684.9256 c\r169.1416 727.5495 214.3436 736.7837 231.4109 739.7159 c\r248.4782 742.6481 277.7431 741.1742 324.0752 740.9502 c\r370.4074 740.7263 382.7717 740.4711 407.6044 740.5544 c\r432.4371 740.6377 472.9830 737.1274 473.0611 761.6216 c\r473.1392 786.1158 473.5871 798.5738 473.7225 823.7815 c\r473.8579 848.9892 492.2898 868.0043 522.9713 868.7022 c\r553.6528 869.4001 569.7149 856.4057 569.7201 823.7815 c\r569.7253 791.1573 568.1056 509.5550 y"]}
+{"284": ["318.4087 594.0581 m\r370.3501 589.5426 356.7515 469.9049 348.7361 454.0980 c\r340.7206 438.2911 291.8625 415.7761 280.1961 414.5365 c\r268.5297 413.2970 222.4111 402.1202 222.4684 352.9183 c\r222.5257 303.7164 267.7068 290.1907 284.3314 289.0084 c\r300.9560 287.8261 376.1989 286.9250 412.4636 288.3417 c\r448.7283 289.7583 448.2284 347.5017 448.2284 379.1988 c\r448.2284 410.8960 448.8846 645.6453 448.6971 673.0092 c\r448.5096 700.3731 462.8895 735.6274 514.1174 735.8670 c\r565.3452 736.1066 577.0585 699.3523 576.5950 673.5144 c\r576.1314 647.6765 575.7773 316.7265 575.8867 281.0815 c\r575.9960 245.4366 555.5174 222.6403 512.4351 221.7653 c\r469.3529 220.8903 173.4123 219.9529 132.4134 220.9476 c\r91.4144 221.9424 62.6703 257.9259 64.1547 282.8211 c\r65.6390 307.7163 62.7016 860.7597 63.9984 895.9776 c\r65.2952 931.1955 78.9720 959.5333 127.9968 959.9760 c\r177.0216 960.4187 462.9259 959.8302 511.9872 959.9760 c\r561.0485 960.1218 577.0689 941.4713 576.4075 913.7688 c\r575.7460 886.0664 546.2051 862.8430 515.2944 863.1138 c\r484.3837 863.3847 315.9296 864.8898 293.0864 864.0565 c\r270.2432 863.2232 206.4740 867.9627 189.7869 857.1764 c\r173.0998 846.3904 151.5171 827.5887 158.1315 789.6365 c\r164.7459 751.6843 230.4786 740.9346 226.0152 698.1180 c\r221.5518 655.3013 182.3392 642.9891 159.3346 630.0936 c"]}