新增lv45-50

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

@@ -44,12 +44,12 @@ id-int32,#rem,Leveltype-int32,Diamond-int32,Rollingdiamond-int32,1Layerdolls-int
 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
-48,,2,0,3,1,0,2,0,0,0,0
-49,,2,0,2,0,0,2,0,0,0,0
-50,,1,0,0,0,4,0,0,0,0,0
+45,,0,0,0,0,0,0,0,0,0,0
+46,,0,0,0,0,0,0,0,0,0,0
+47,,0,0,0,0,0,0,0,0,0,0
+48,,0,0,0,0,0,0,0,0,0,0
+49,,0,0,0,0,0,0,0,0,0,0
+50,,0,0,0,0,0,0,0,0,0,0
 51,,1,0,0,0,4,0,0,0,0,0
 52,,2,0,0,0,4,0,0,0,0,0
 53,,2,0,0,0,4,0,0,0,0,0

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

@@ -43,4 +43,10 @@ id-int32,#rem,bzsegdistance-int32,sceneid-int32,normal_speed-int32,color-int32,b
 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
+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
+45,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,285,0,3,50,50,50,50,50,50
+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

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

@@ -43,4 +43,10 @@ id-int32,#rem,hard-int32,bosstype-int32,bossguide-int32,star1-int32,star2-int32,
 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
+44,,2,0,0,300,24500,35000,4
+45,,2,0,0,300,24500,35000,4
+46,,2,0,0,300,24500,35000,4
+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

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

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

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

@@ -1 +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}
+{"arsenal1PosX": 349.1579375, "arsenal1PosY": 595.91218515624996, "arsenalDir": 4, "arsenalType": 0, "ballIn1Angle": 178.27716064453125, "ballIn1PosX": 75.784563671875006, "ballIn1PosY": 319.68471601562493, "ballOut1Angle": 0.259185791015625, "ballOut1PosX": 85.492694985961904, "ballOut1PosY": 951.04913984374991, "levelId": 50, "pathFlipId": 0, "pathResId": 289, "pathTrackCount": 1}

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

@@ -1 +1 @@
-{"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"]}
+{"289": ["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"]}

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": [], "282": [], "283": [], "284": [], "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": [], "285": [], "286": [], "287": [], "288": [], "289": [], "290": [], "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

@@ -44,12 +44,12 @@ id-int32,#rem,Leveltype-int32,Diamond-int32,Rollingdiamond-int32,1Layerdolls-int
 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
-48,,2,0,3,1,0,2,0,0,0,0
-49,,2,0,2,0,0,2,0,0,0,0
-50,,1,0,0,0,4,0,0,0,0,0
+45,,0,0,0,0,0,0,0,0,0,0
+46,,0,0,0,0,0,0,0,0,0,0
+47,,0,0,0,0,0,0,0,0,0,0
+48,,0,0,0,0,0,0,0,0,0,0
+49,,0,0,0,0,0,0,0,0,0,0
+50,,0,0,0,0,0,0,0,0,0,0
 51,,1,0,0,0,4,0,0,0,0,0
 52,,2,0,0,0,4,0,0,0,0,0
 53,,2,0,0,0,4,0,0,0,0,0

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

@@ -43,4 +43,10 @@ id-int32,#rem,bzsegdistance-int32,sceneid-int32,normal_speed-int32,color-int32,b
 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
+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
+45,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,285,0,3,50,50,50,50,50,50
+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

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

@@ -43,4 +43,10 @@ id-int32,#rem,hard-int32,bosstype-int32,bossguide-int32,star1-int32,star2-int32,
 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
+44,,2,0,0,300,24500,35000,4
+45,,2,0,0,300,24500,35000,4
+46,,2,0,0,300,24500,35000,4
+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

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

@@ -1 +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}
+{"arsenal1PosX": 349.1579375, "arsenal1PosY": 595.91218515624996, "arsenalDir": 4, "arsenalType": 0, "ballIn1Angle": 178.27716064453125, "ballIn1PosX": 75.784563671875006, "ballIn1PosY": 319.68471601562493, "ballOut1Angle": 0.259185791015625, "ballOut1PosX": 85.492694985961904, "ballOut1PosY": 951.04913984374991, "levelId": 50, "pathFlipId": 0, "pathResId": 289, "pathTrackCount": 1}

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

@@ -1 +1 @@
-{"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"]}
+{"289": ["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"]}