新增lv109-115

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

@@ -108,13 +108,13 @@ id-int32,#rem,Leveltype-int32,Diamond-int32,Rollingdiamond-int32,1Layerdolls-int
 106,,0,0,0,0,0,0,0,0,0,0
 107,,0,0,0,0,0,0,0,0,0,0
 108,,0,0,0,0,0,0,0,0,0,0
-109,,1,2,0,2,0,0,0,1,0,2
-110,,2,0,5,0,0,0,0,3,2,1
-111,,2,0,5,0,0,0,0,3,2,1
-112,,1,2,0,3,0,0,0,0,2,1
-113,,1,2,0,3,0,0,0,0,2,1
-114,,1,3,0,3,0,0,0,0,2,1
-115,,2,0,2,0,0,0,2,0,0,3
+109,,0,0,0,0,0,0,0,0,0,0
+110,,0,0,0,0,0,0,0,0,0,0
+111,,0,0,0,0,0,0,0,0,0,0
+112,,0,0,0,0,0,0,0,0,0,0
+113,,0,0,0,0,0,0,0,0,0,0
+114,,0,0,0,0,0,0,0,0,0,0
+115,,0,0,0,0,0,0,0,0,0,0
 116,,2,0,2,0,0,0,3,0,0,3
 117,,1,5,0,0,0,0,0,0,4,0
 118,,2,0,2,0,2,0,0,1,0,3

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

@@ -107,4 +107,11 @@ id-int32,#rem,bzsegdistance-int32,sceneid-int32,normal_speed-int32,color-int32,b
 105,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,359,0,3,50,50,50,50,50,50
 106,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,360,0,3,50,50,50,50,50,50
 107,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,361,0,3,50,50,50,50,50,50
-108,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,362,0,3,50,50,50,50,50,50
+108,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,362,0,3,50,50,50,50,50,50
+109,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,363,0,3,50,50,50,50,50,50
+110,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,364,0,3,50,50,50,50,50,50
+111,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,365,0,3,50,50,50,50,50,50
+112,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,366,0,3,50,50,50,50,50,50
+113,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,367,0,3,50,50,50,50,50,50
+114,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,368,0,3,50,50,50,50,50,50
+115,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,369,0,3,50,50,50,50,50,50

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

@@ -107,4 +107,11 @@ id-int32,#rem,hard-int32,bosstype-int32,bossguide-int32,star1-int32,star2-int32,
 105,,2,0,0,300,24500,35000,4
 106,,2,0,0,300,24500,35000,4
 107,,2,0,0,300,24500,35000,4
-108,,2,0,0,300,24500,35000,4
+108,,2,0,0,300,24500,35000,4
+109,,2,0,0,300,24500,35000,4
+110,,2,0,0,300,24500,35000,4
+111,,2,0,0,300,24500,35000,4
+112,,2,0,0,300,24500,35000,4
+113,,2,0,0,300,24500,35000,4
+114,,2,0,0,300,24500,35000,4
+115,,2,0,0,300,24500,35000,4

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

@@ -1 +1 @@
-{"361": []}
+{"369": []}

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

@@ -1 +1 @@
-{"arsenal1PosX": 462.35302421874997, "arsenal1PosY": 834.6405917968749, "arsenal2PosX": 184.70892382812499, "arsenal2PosY": 354.85571171875, "arsenalDir": 4, "arsenalType": 1, "ballIn1Angle": 153.221923828125, "ballIn1PosX": 509.27372617187496, "ballIn1PosY": 411.76574726562495, "ballOut1Angle": 134.12359619140625, "ballOut1PosX": 125.81980161056518, "ballOut1PosY": 765.94960078124996, "levelId": 107, "pathFlipId": 0, "pathResId": 361, "pathTrackCount": 1}
+{"arsenal1PosX": 400.55248593749997, "arsenal1PosY": 825.56269374999999, "arsenalDir": 4, "arsenalType": 0, "ballIn1Angle": 270.11093139648438, "ballIn1PosX": 567.72018164062501, "ballIn1PosY": 546.194678125, "ballOut1Angle": 91.300323486328125, "ballOut1PosX": 74.623134374999992, "ballOut1PosY": 493.12829648437497, "levelId": 115, "pathFlipId": 0, "pathResId": 369, "pathTrackCount": 1}

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

@@ -1 +1 @@
-{"361": ["125.8198 765.9496 m\r96.3726 793.1729 54.2799 837.0051 65.2900 896.2068 c\r76.3002 955.4084 151.3295 967.6581 189.8494 959.1427 c\r228.3693 950.6273 255.4155 924.5550 255.2436 861.4368 c\r255.0717 798.3186 256.0873 757.3665 256.0405 671.8009 c\r255.9936 586.2353 96.5601 636.4997 78.5085 545.8093 c\r60.4568 455.1188 60.1131 345.0539 67.0869 303.8674 c\r74.0606 262.6809 134.6477 219.8903 198.8180 225.5048 c\r262.9883 231.1192 306.2111 260.9935 308.1342 314.7895 c\r310.0573 368.5856 257.9467 464.4155 256.3634 513.2059 c\r254.7801 561.9964 381.9540 580.6001 385.6779 635.1039 c\r389.4017 689.6078 322.4867 814.7609 332.1010 867.9627 c\r341.7153 921.1645 395.0630 955.4917 439.8848 959.6635 c\r484.7065 963.8353 576.3763 950.7263 576.7669 878.0562 c\r577.1574 805.3860 583.2562 619.0106 543.5427 574.8374 c\r503.8292 530.6643 387.9955 533.4346 384.4175 481.8317 c\r380.8394 430.2288 381.5478 331.4865 383.7352 292.6958 c\r385.9226 253.9051 430.0361 223.5934 480.0870 223.4111 c\r530.1378 223.2288 572.7044 264.0090 574.8710 316.4504 c\r577.0377 368.8918 560.7724 388.3913 509.2737 411.7657 c"]}
+{"369": ["74.6231 493.1283 m\r72.6857 570.0274 72.5919 629.2343 v\r72.4982 688.4411 112.1274 722.8153 158.3242 722.9142 c\r204.5209 723.0132 246.1345 722.6278 299.9196 721.3882 c\r353.7047 720.1487 382.5113 653.4212 383.4123 629.0728 c\r384.3133 604.7245 382.6258 437.6505 383.5842 414.7605 c\r384.5425 391.8704 357.5015 382.5634 317.6431 383.0321 c\r277.7847 383.5008 176.5164 384.2925 126.4760 384.8498 c\r76.4356 385.4070 60.0245 331.4084 61.9255 297.5238 c\r63.8265 263.6392 83.6437 224.8277 132.0748 224.8121 c\r180.5059 224.7965 483.9254 222.2340 511.9872 223.9944 c\r540.0490 225.7548 569.0795 233.7285 575.4231 272.6286 c\r581.7667 311.5287 563.1318 326.4866 515.1850 358.1004 c\r467.2383 389.7142 344.9237 474.4569 294.3103 507.8727 c\r243.6970 541.2885 190.0942 557.0069 191.9431 612.8076 c\r193.7920 668.6083 190.1827 864.3273 191.9952 895.9776 c\r193.8077 927.6278 224.7913 960.2416 255.9936 959.9760 c\r287.1959 959.7104 459.4364 962.2728 503.7218 962.1843 c\r548.0071 962.0957 568.3556 928.9247 567.7202 898.1859 c\r567.0848 867.4471 567.7202 546.1947 y"]}

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

@@ -1 +1 @@
-{"0": [], "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": [], "292": [], "293": [], "294": [], "295": [], "296": [], "297": [], "298": [], "299": [], "300": [], "301": [], "302": [], "303": [], "304": [], "305": [], "306": [], "307": [], "308": [], "309": [], "311": [], "312": [], "313": [], "314": [], "315": [], "316": [], "317": [], "318": [], "319": [], "320": [], "321": [], "322": [], "323": [], "325": [], "326": [], "328": [], "329": [], "330": [], "331": [], "332": [], "333": [], "334": [], "335": [], "337": [], "338": [], "339": [], "340": [], "341": [], "342": [], "343": [], "344": [], "345": [], "346": [], "347": [], "348": [], "349": [], "350": [], "351": [], "352": [], "353": [], "354": [], "355": [], "356": [], "357": [], "358": [], "359": [], "36": [], "360": [], "361": [], "362": [], "37": [], "42": [], "43": [], "45": [], "46": [], "51": [], "66": [], "70": [], "73": [], "8": [], "81": [], "82": [], "89": []}
+{"0": [], "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": [], "292": [], "293": [], "294": [], "295": [], "296": [], "297": [], "298": [], "299": [], "300": [], "301": [], "302": [], "303": [], "304": [], "305": [], "306": [], "307": [], "308": [], "309": [], "311": [], "312": [], "313": [], "314": [], "315": [], "316": [], "317": [], "318": [], "319": [], "320": [], "321": [], "322": [], "323": [], "325": [], "326": [], "328": [], "329": [], "330": [], "331": [], "332": [], "333": [], "334": [], "335": [], "337": [], "338": [], "339": [], "340": [], "341": [], "342": [], "343": [], "344": [], "345": [], "346": [], "347": [], "348": [], "349": [], "350": [], "351": [], "352": [], "353": [], "354": [], "355": [], "356": [], "357": [], "358": [], "359": [], "36": [], "360": [], "361": [], "362": [], "363": [], "364": [], "365": [], "366": [], "367": [], "368": [], "369": [], "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

@@ -108,12 +108,12 @@ id-int32,#rem,Leveltype-int32,Diamond-int32,Rollingdiamond-int32,1Layerdolls-int
 106,,0,0,0,0,0,0,0,0,0,0
 107,,0,0,0,0,0,0,0,0,0,0
 108,,0,0,0,0,0,0,0,0,0,0
-109,,1,2,0,2,0,0,0,1,0,2
-110,,2,0,5,0,0,0,0,3,2,1
-111,,2,0,5,0,0,0,0,3,2,1
-112,,1,2,0,3,0,0,0,0,2,1
-113,,1,2,0,3,0,0,0,0,2,1
-114,,1,3,0,3,0,0,0,0,2,1
+109,,0,0,0,0,0,0,0,0,0,0
+110,,0,0,0,0,0,0,0,0,0,0
+111,,0,0,0,0,0,0,0,0,0,0
+112,,0,0,0,0,0,0,0,0,0,0
+113,,0,0,0,0,0,0,0,0,0,0
+114,,0,0,0,0,0,0,0,0,0,0
 115,,2,0,2,0,0,0,2,0,0,3
 116,,2,0,2,0,0,0,3,0,0,3
 117,,1,5,0,0,0,0,0,0,4,0

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

@@ -107,4 +107,10 @@ id-int32,#rem,bzsegdistance-int32,sceneid-int32,normal_speed-int32,color-int32,b
 105,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,359,0,3,50,50,50,50,50,50
 106,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,360,0,3,50,50,50,50,50,50
 107,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,361,0,3,50,50,50,50,50,50
-108,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,362,0,3,50,50,50,50,50,50
+108,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,362,0,3,50,50,50,50,50,50
+109,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,363,0,3,50,50,50,50,50,50
+110,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,364,0,3,50,50,50,50,50,50
+111,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,365,0,3,50,50,50,50,50,50
+112,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,366,0,3,50,50,50,50,50,50
+113,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,367,0,3,50,50,50,50,50,50
+114,,10,2,87,4,100,1,3A4B4C3A4C,3,1,10,50,5,65,40,40,16,89,368,0,3,50,50,50,50,50,50

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

@@ -107,4 +107,10 @@ id-int32,#rem,hard-int32,bosstype-int32,bossguide-int32,star1-int32,star2-int32,
 105,,2,0,0,300,24500,35000,4
 106,,2,0,0,300,24500,35000,4
 107,,2,0,0,300,24500,35000,4
-108,,2,0,0,300,24500,35000,4
+108,,2,0,0,300,24500,35000,4
+109,,2,0,0,300,24500,35000,4
+110,,2,0,0,300,24500,35000,4
+111,,2,0,0,300,24500,35000,4
+112,,2,0,0,300,24500,35000,4
+113,,2,0,0,300,24500,35000,4
+114,,2,0,0,300,24500,35000,4

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

@@ -1 +1 @@
-{"arsenal1PosX": 462.35302421874997, "arsenal1PosY": 834.6405917968749, "arsenal2PosX": 184.70892382812499, "arsenal2PosY": 354.85571171875, "arsenalDir": 4, "arsenalType": 1, "ballIn1Angle": 153.221923828125, "ballIn1PosX": 509.27372617187496, "ballIn1PosY": 411.76574726562495, "ballOut1Angle": 134.12359619140625, "ballOut1PosX": 125.81980161056518, "ballOut1PosY": 765.94960078124996, "levelId": 107, "pathFlipId": 0, "pathResId": 361, "pathTrackCount": 1}
+{"arsenal1PosX": 425, "arsenal1PosY": 679, "arsenalDir": 4, "arsenalType": 0, "ballIn1Angle": 256.53945922851562, "ballIn1PosX": 205.00000000000003, "ballIn1PosY": 388, "ballOut1Angle": 113.0113525390625, "ballOut1PosX": 97, "ballOut1PosY": 734, "levelId": 111, "pathFlipId": 0, "pathResId": 365, "pathTrackCount": 1}

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

@@ -1 +1 @@
-{"361": ["125.8198 765.9496 m\r96.3726 793.1729 54.2799 837.0051 65.2900 896.2068 c\r76.3002 955.4084 151.3295 967.6581 189.8494 959.1427 c\r228.3693 950.6273 255.4155 924.5550 255.2436 861.4368 c\r255.0717 798.3186 256.0873 757.3665 256.0405 671.8009 c\r255.9936 586.2353 96.5601 636.4997 78.5085 545.8093 c\r60.4568 455.1188 60.1131 345.0539 67.0869 303.8674 c\r74.0606 262.6809 134.6477 219.8903 198.8180 225.5048 c\r262.9883 231.1192 306.2111 260.9935 308.1342 314.7895 c\r310.0573 368.5856 257.9467 464.4155 256.3634 513.2059 c\r254.7801 561.9964 381.9540 580.6001 385.6779 635.1039 c\r389.4017 689.6078 322.4867 814.7609 332.1010 867.9627 c\r341.7153 921.1645 395.0630 955.4917 439.8848 959.6635 c\r484.7065 963.8353 576.3763 950.7263 576.7669 878.0562 c\r577.1574 805.3860 583.2562 619.0106 543.5427 574.8374 c\r503.8292 530.6643 387.9955 533.4346 384.4175 481.8317 c\r380.8394 430.2288 381.5478 331.4865 383.7352 292.6958 c\r385.9226 253.9051 430.0361 223.5934 480.0870 223.4111 c\r530.1378 223.2288 572.7044 264.0090 574.8710 316.4504 c\r577.0377 368.8918 560.7724 388.3913 509.2737 411.7657 c"]}
+{"365": ["97.3257 734.5650 m\r62.8682 808.6569 64.0193 853.6505 v\r65.1703 898.6442 66.0713 950.7731 142.3141 959.5125 c\r218.5570 968.2518 275.1442 933.9923 247.0771 837.4843 c\r219.0101 740.9763 110.3045 484.3993 80.5397 406.0420 c\r50.7749 327.6846 61.5714 268.1443 117.5804 239.4523 c\r173.5894 210.7603 258.7123 250.3062 274.7431 291.2011 c\r290.7739 332.0959 313.6901 412.9793 325.1794 447.5357 c\r336.6687 482.0921 377.9593 516.5652 422.3071 491.8158 c\r466.6549 467.0664 440.9369 394.0058 436.2183 368.1835 c\r431.4996 342.3612 424.2811 293.5187 429.7757 274.9723 c\r435.2703 256.4258 462.2593 224.3850 511.0809 226.8276 c\r559.9026 229.2702 573.7357 276.7535 574.1002 298.1332 c\r574.4648 319.5128 591.8862 939.3932 467.3685 953.4605 c\r342.8508 967.5279 205.3959 388.2403 y"]}