From 0e16295eff7faf7c48c6616e2185c4c471eef4b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A5=BF=E7=93=9C=C2=B0?= <wxh_email@yeah.net>
Date: Tue, 13 May 2025 13:44:42 +0800
Subject: [PATCH] dev

---
 .../GF/fighter_female/nenmaster_female.py     |  60 +++---
 .../GF/fighter_female/striker_female.py       | 180 +++++++++---------
 .../GF/fighter_male/nenmaster_male.py         |   2 +-
 .../character/GF/gunner_male/mechanic_male.py |   9 +-
 4 files changed, 127 insertions(+), 124 deletions(-)

diff --git a/backend/core/character/GF/fighter_female/nenmaster_female.py b/backend/core/character/GF/fighter_female/nenmaster_female.py
index bb0446aa..ced0716b 100644
--- a/backend/core/character/GF/fighter_female/nenmaster_female.py
+++ b/backend/core/character/GF/fighter_female/nenmaster_female.py
@@ -12,7 +12,7 @@ class Skill0(PassiveSkill):
     maxLv = 1
     position = 0 #TODO
     rangeLv = 1
-    uuid = "da6e37c1e3f0e8867f70007d89c239ff"    
+    uuid = "da6e37c1e3f0e8867f70007d89c239ff"
 
     data0 = [0, 20]# noqa: E501
     hit0 = 1 #TODO
@@ -30,7 +30,7 @@ class Skill1(PassiveSkill):
     maxLv = 1
     position = 0 #TODO
     rangeLv = 1
-    uuid = "27bade584bb42fef68148d3a0b72bace"    
+    uuid = "27bade584bb42fef68148d3a0b72bace"
 
     data0 = [0, 50]# noqa: E501
     hit0 = 1 #TODO
@@ -61,7 +61,7 @@ class Skill3(ActiveSkill):
     rangeLv = 2
     cd = 7
     mp = [6, 84]
-    uuid = "f2fb27162beb0b87a7cb9af7900e95f2"    
+    uuid = "f2fb27162beb0b87a7cb9af7900e95f2"
 
     data0 = [0] + [1] * maxLv
     hit = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]# noqa: E501
@@ -81,7 +81,7 @@ class Skill4(ActiveSkill):
     rangeLv = 2
     cd = 4
     mp = [15, 154]
-    uuid = "01c3a2fb793d293a25ed8dc7a0d70c1a"    
+    uuid = "01c3a2fb793d293a25ed8dc7a0d70c1a"
 
     data0 = [0, 2151, 2370, 2590, 2807, 3028, 3239, 3462, 3681, 3890, 4114, 4329, 4548, 4766, 4987, 5206, 5422, 5643, 5862, 6071, 6289, 6506, 6727, 6945, 7164, 7380, 7601, 7815, 8038, 8254, 8472, 8687, 8907, 9121, 9342, 9561, 9779, 9996, 10216, 10438, 10651, 10865, 11084, 11302, 11521, 11744, 11962, 12176, 12393, 12609, 12827, 13046, 13266, 13487, 13699, 13918, 14138, 14354, 14573, 14794, 15010, 15224, 15443, 15663, 15880, 16098, 16315, 16533, 16751, 16968, 17187]# noqa: E501
     hit0 = 1 #TODO
@@ -108,7 +108,7 @@ class Skill5(ActiveSkill):
     rangeLv = 3
     cd = 5
     mp = [126, 1195]
-    uuid = "a6c8f69107f8c4f5d1a0c7a57d000290"    
+    uuid = "a6c8f69107f8c4f5d1a0c7a57d000290"
 
     damage = False
 
@@ -123,7 +123,7 @@ class Skill6(ActiveSkill):
     rangeLv = 2
     cd = 8
     mp = [20, 168]
-    uuid = "3fb8395ae3b81bd608e0c4223a8eb534"    
+    uuid = "3fb8395ae3b81bd608e0c4223a8eb534"
 
     data0 = [0, 966, 1056, 1158, 1253, 1352, 1448, 1542, 1637, 1736, 1834, 1928, 2033, 2125, 2222, 2317, 2417, 2513, 2606, 2701, 2807, 2900, 3000, 3094, 3194, 3288, 3392, 3483, 3578, 3680, 3776, 3869, 3971, 4061, 4165, 4253, 4362, 4456, 4551, 4648, 4743, 4842, 4942, 5039, 5136, 5226, 5336, 5423, 5522, 5620, 5714, 5812, 5904, 6008, 6103, 6196, 6302, 6390, 6499, 6588, 6695, 6780, 6875, 6982, 7074, 7179, 7271, 7359, 7465, 7560, 7662]# noqa: E501
     hit0 = 11
@@ -140,7 +140,7 @@ class Skill7(ActiveSkill):
     rangeLv = 3
     cd = 5
     mp = [194, 1502]
-    uuid = "04883563896fe1adac7505c6146b5f59"    
+    uuid = "04883563896fe1adac7505c6146b5f59"
 
     damage = False
 
@@ -153,7 +153,7 @@ class Skill8(PassiveSkill):
     maxLv = 70
     position = 4 #TODO
     rangeLv = 2
-    uuid = "f0cc2c950f3bdf4103c75fa496bcac34"    
+    uuid = "f0cc2c950f3bdf4103c75fa496bcac34"
 
     data0 = [0, 1426, 1569, 1715, 1858, 2004, 2152, 2295, 2431, 2584, 2727, 2866, 3016, 3160, 3298, 3451, 3594, 3733, 3884, 4022, 4167, 4313, 4457, 4605, 4748, 4886, 5035, 5178, 5321, 5472, 5613, 5753, 5904, 6047, 6186, 6338, 6477, 6623, 6769, 6916, 7050, 7194, 7344, 7485, 7631, 7781, 7917, 8063, 8208, 8357, 8500, 8646, 8789, 8932, 9071, 9219, 9365, 9505, 9654, 9797, 9942, 10091, 10229, 10372, 10521, 10666, 10807, 10956, 11101, 11237, 11385]# noqa: E501
 
@@ -175,7 +175,7 @@ class Skill9(PassiveSkill):
     rangeLv = 1
     cd = 3
     mp = [40, 56]
-    uuid = "c7bf7ccab413009640e65ca6f2f0263a"    
+    uuid = "c7bf7ccab413009640e65ca6f2f0263a"
 
     data0 = [0, 131, 136, 141, 146, 151, 156, 161, 166, 171, 176, 181]# noqa: E501
 
@@ -196,7 +196,7 @@ class Skill10(ActiveSkill):
     cd = 30
     mp = [60, 560]
     damage = False
-    uuid = "dc1ffbe7bfcc6dc2be737951960da9ad"    
+    uuid = "dc1ffbe7bfcc6dc2be737951960da9ad"
 
 
 # 念雷破 뇌전격
@@ -210,7 +210,7 @@ class Skill11(ActiveSkill):
     rangeLv = 2
     cd = 6
     mp = [48, 403]
-    uuid = "4c5271b0ecce120d7fc113f377fae76f"    
+    uuid = "4c5271b0ecce120d7fc113f377fae76f"
 
     data0 = [0, 10717, 11805, 12893, 13979, 15069, 16155, 17241, 18326, 19414, 20500, 21592, 22676, 23766, 24846, 25935, 27025, 28110, 29199, 30286, 31372, 32458, 33544, 34631, 35720, 36805, 37891, 38978, 40067, 41157, 42240, 43330, 44414, 45502, 46588, 47678, 48763, 49852, 50932, 52023, 53106, 54196, 55287, 56372, 57462, 58543, 59633, 60717, 61809, 62893, 63983, 65064, 66156, 67237, 68325, 69418, 70499, 71590, 72675, 73765, 74849, 75941, 77022, 78110, 79194, 80284, 81374, 82457, 83548, 84628, 85717]# noqa: E501
     hit0 = 1 #TODO
@@ -227,7 +227,7 @@ class Skill12(ActiveSkill):
     rangeLv = 2
     cd = 4
     mp = [268, 1694]
-    uuid = "0ed3148658fe37b3336ccb718dc0fdb0"    
+    uuid = "0ed3148658fe37b3336ccb718dc0fdb0"
 
     data0 = [0, 984, 1081, 1178, 1282, 1382, 1482, 1578, 1678, 1776, 1880, 1977, 2077, 2174, 2278, 2377, 2474, 2574, 2672, 2773, 2868]# noqa: E501
     hit0 = 1 #TODO
@@ -255,7 +255,7 @@ class Skill13(ActiveSkill):
     rangeLv = 2
     cd = 8
     mp = [50, 420]
-    uuid = "202edb928046f4fa6dedf6337377efd5"    
+    uuid = "202edb928046f4fa6dedf6337377efd5"
 
     data0 = [0, 2391, 2632, 2876, 3120, 3360, 3602, 3847, 4088, 4330, 4573, 4816, 5056, 5301, 5544, 5784, 6031, 6274, 6516, 6757, 7000, 7244, 7487, 7728, 7970, 8213, 8458, 8698, 8940, 9184, 9424, 9668, 9912, 10154, 10394, 10640, 10882, 11122, 11367, 11608, 11852, 12095, 12336, 12578, 12826, 13066, 13308, 13552, 13796, 14036, 14280, 14522, 14762, 15008, 15250, 15492, 15735, 15978, 16220, 16460, 16704, 16946, 17189, 17432, 17674, 17916, 18160, 18402, 18644, 18888, 19128]# noqa: E501
     hit0 = 4
@@ -272,7 +272,7 @@ class Skill14(ActiveSkill):
     rangeLv = 2
     cd = 12
     mp = [96, 806]
-    uuid = "2e2b7efe778656690f9c8cb6e47c3932"    
+    uuid = "2e2b7efe778656690f9c8cb6e47c3932"
 
     data0 = [0, 2613, 2878, 3143, 3408, 3675, 3936, 4204, 4468, 4733, 4996, 5265, 5527, 5794, 6055, 6321, 6589, 6854, 7114, 7380, 7647, 7910, 8175, 8439, 8706, 8969, 9233, 9503, 9766, 10028, 10294, 10560, 10824, 11089, 11354, 11620, 11883, 12146, 12412, 12680, 12942, 13207, 13471, 13738, 14006, 14266, 14530, 14798, 15064, 15326, 15589, 15856, 16118, 16385, 16650, 16913, 17177, 17444, 17711, 17974, 18234, 18506, 18771, 19035, 19298, 19564, 19830, 20094, 20359, 20623, 20890]# noqa: E501
     hit0 = 3
@@ -293,7 +293,7 @@ class Skill15(ActiveSkill):
     cube = 1
     cd = 15
     mp = [120, 1008]
-    uuid = "9cb6f9ed646fa87f9b7680a42ce83d1a"    
+    uuid = "9cb6f9ed646fa87f9b7680a42ce83d1a"
 
     data0 = [0, 18424, 20292, 22160, 24026, 25896, 27758, 29631, 31498, 33369, 35234, 37107, 38974, 40842, 42708, 44582, 46448, 48315, 50188, 52054, 53919, 55788, 57657, 59528, 61394, 63266, 65130, 67002, 68868, 70742, 72609, 74480, 76334, 78200, 80074, 81944, 83814, 85677, 87549, 89421, 91284, 93156, 95024, 96892, 98757, 100626, 102495, 104361, 106232, 108099, 109966, 111836, 113706, 115570, 117442, 119308, 121182, 123054, 124917, 126783, 128650, 130520, 132392, 134260, 136124, 137992, 139864, 141736, 143602, 145470, 147339]# noqa: E501
     hit0 = 1 #TODO
@@ -311,7 +311,7 @@ class Skill16(ActiveSkill):
     cube = 1
     cd = 20
     mp = [170, 1428]
-    uuid = "4224f9b0b8c7c903e9a1e0f9d9f6d04d"    
+    uuid = "4224f9b0b8c7c903e9a1e0f9d9f6d04d"
 
     data0 = [0, 2057, 2262, 2467, 2677, 2882, 3092, 3294, 3502, 3716, 3917, 4129, 4336, 4539, 4746, 4958, 5164, 5371, 5579, 5784, 5994, 6202, 6410, 6618, 6821, 7031, 7241, 7447, 7654, 7864, 8072, 8274, 8481, 8689, 8902, 9108, 9315, 9519, 9725, 9933, 10138, 10355, 10564, 10771, 10973, 11182, 11391, 11597, 11805, 12012, 12218, 12426, 12636, 12844, 13047, 13255, 13462, 13670, 13879, 14087, 14292, 14499, 14707, 14910, 15125, 15327, 15537, 15744, 15954, 16160, 16368]# noqa: E501
     hit0 = 15
@@ -328,7 +328,7 @@ class Skill17(ActiveSkill):
     rangeLv = 3
     cd = 5
     mp = [550, 5217]
-    uuid = "1b1cfab062e0768bcc889e33e1f30dbf"    
+    uuid = "1b1cfab062e0768bcc889e33e1f30dbf"
 
     data0 = [0, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169]# noqa: E501
     hit0 = 1 #TODO
@@ -372,7 +372,7 @@ class Skill18(ActiveSkill):
     cube = 2
     cd = 40
     mp = [316, 2488]
-    uuid = "dbf8b30c7057032af0d68fcfa289fdae"    
+    uuid = "dbf8b30c7057032af0d68fcfa289fdae"
 
     data0 = [0, 4569, 5032, 5496, 5960, 6423, 6886, 7350, 7814, 8277, 8740, 9204, 9668, 10131, 10594, 11058, 11522, 11985, 12448, 12912, 13376, 13839, 14302, 14766, 15230, 15693, 16156, 16620, 17084, 17547, 18010, 18474, 18938, 19401, 19864, 20330, 20793, 21256, 21720, 22184, 22647, 23110, 23574, 24038, 24501, 24964, 25428, 25892, 26355, 26818, 27282, 27746, 28209, 28672, 29136, 29600, 30063, 30526, 30990, 31454, 31917, 32380, 32844, 33308, 33771, 34234, 34698, 35162, 35625, 36088, 36552]# noqa: E501
     hit0 = 11
@@ -387,7 +387,7 @@ class Skill19(PassiveSkill):
     maxLv = 50
     position = 4 #TODO
     rangeLv = 3
-    uuid = "669f1428193f61f9d92c743b72438c4d"    
+    uuid = "669f1428193f61f9d92c743b72438c4d"
 
 
     data0 = [0, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65]# noqa: E501
@@ -406,7 +406,7 @@ class Skill20(ActiveSkill):
     cube = 5
     cd = 145
     mp = [900, 7559]
-    uuid = "51a08fd0c90f0a5276cd552047fac93d"    
+    uuid = "51a08fd0c90f0a5276cd552047fac93d"
 
     data0 = [0, 14602, 17984, 21371, 24755, 28144, 31528, 34909, 38296, 41680, 45065, 48451, 51836, 55220, 58603, 61992, 65373, 68759, 72146, 75531, 78914, 82301, 85684, 89072, 92456, 95844, 99226, 102611, 105995, 109383, 112768, 116149, 119539, 122919, 126306, 129690, 133074, 136462, 139845, 143229, 146611, 150001, 153384, 156768, 160155, 163537, 166923, 170307, 173695, 177080, 180466]# noqa: E501
     hit0 = 6
@@ -422,7 +422,7 @@ class Skill21(PassiveSkill):
     maxLv = 11
     position = 2 #TODO
     rangeLv = 2
-    uuid = "2c9d9a36c8401bddff6cdb80fab8dc24"    
+    uuid = "2c9d9a36c8401bddff6cdb80fab8dc24"
 
 
 
@@ -438,7 +438,7 @@ class Skill22(ActiveSkill):
     cube = 1
     cd = 30
     mp = [450, 1260]
-    uuid = "5806440d21e7546d50007a5ba11f8024"    
+    uuid = "5806440d21e7546d50007a5ba11f8024"
 
     data0 = [0, 4900, 5398, 5896, 6392, 6885, 7382, 7881, 8376, 8874, 9374, 9861, 10364, 10862, 11354, 11852, 12352, 12846, 13342, 13844, 14338, 14834, 15327, 15819, 16318, 16816, 17314, 17806, 18310, 18802, 19300, 19796, 20296, 20786, 21290, 21784, 22281, 22772, 23280, 23769, 24266, 24760, 25260, 25758, 26252, 26756, 27242, 27746, 28240, 28734, 29230]# noqa: E501
     hit0 = 6
@@ -460,7 +460,7 @@ class Skill23(ActiveSkill):
     cube = 2
     cd = 30
     mp = [800, 1680]
-    uuid = "7cf17936a039b418660424125dc968d7"    
+    uuid = "7cf17936a039b418660424125dc968d7"
 
     data0 = [0, 11584, 12759, 13930, 15106, 16284, 17452, 18628, 19798, 20978, 22152, 23325, 24495, 25672, 26846, 28018, 29194, 30369, 31540, 32718, 33898, 35068, 36240, 37422, 38595, 39765, 40940, 42117, 43287, 44463, 45640, 46812, 47985, 49161, 50337, 51510, 52683, 53854, 55034, 56208, 57381, 58557, 59728, 60904, 62079, 63252, 64425, 65602, 66778, 67950, 69124]# noqa: E501
     hit0 = 5
@@ -477,7 +477,7 @@ class Skill24(PassiveSkill):
     maxLv = 50
     position = 3 #TODO
     rangeLv = 3
-    uuid = "547ab2b2bd860d3e37355a9cfbc1077c"    
+    uuid = "547ab2b2bd860d3e37355a9cfbc1077c"
 
     data0 = [0, 27, 30, 33, 36, 39, 42, 45, 48, 51, 54, 57, 60, 63, 66, 69, 72, 75, 78, 81, 84, 87, 90, 93, 96, 99, 102, 105, 108, 111, 114, 117, 120, 123, 126, 129, 132, 135, 138, 141, 144, 147, 150, 153, 156, 159, 162, 165, 168, 171, 174]# noqa: E501
 
@@ -498,7 +498,7 @@ class Skill25(ActiveSkill):
     cube = 3
     cd = 40
     mp = [580, 4500]
-    uuid = "a5fa08f5d509e6ff2ebc68856a470b5a"    
+    uuid = "a5fa08f5d509e6ff2ebc68856a470b5a"
 
     data0 = [0, 21631, 23827, 26026, 28220, 30412, 32607, 34802, 36995, 39193, 41387, 43581, 45778, 47969, 50166, 52363, 54553, 56747, 58944, 61140, 63331, 65523, 67719, 69915, 72112, 74305, 76498, 78692, 80888, 83083, 85275, 87471, 89666, 91865, 94057, 96250, 98445, 100640, 102835, 105032, 107225, 109416, 111611, 113805, 116000, 118194, 120390, 122582, 124777, 126971, 129169]# noqa: E501
     hit0 = 4
@@ -516,7 +516,7 @@ class Skill26(ActiveSkill):
     cube = 5
     cd = 45
     mp = [800, 6000]
-    uuid = "506e7ed77d517419a6e1c437a2cedb17"    
+    uuid = "506e7ed77d517419a6e1c437a2cedb17"
 
     data0 = [0, 20821, 22935, 25045, 27158, 29269, 31383, 33493, 35605, 37717, 39832, 41944, 44050, 46169, 48278, 50390, 52499, 54613, 56723, 58837, 60946, 63058, 65170, 67282, 69394, 71504, 73619, 75732, 77843, 79957, 82066, 84179, 86288, 88403, 90515, 92627, 94738, 96852, 98966, 101076, 103189, 105300, 107414, 109522, 111636, 113744, 115861, 117970, 120083, 122195, 124308]# noqa: E501
     hit0 = 5
@@ -534,7 +534,7 @@ class Skill27(ActiveSkill):
     cube = 10
     cd = 180
     mp = [2500, 5000]
-    uuid = "5dc7008b12a459325b548b0715c6b73c"    
+    uuid = "5dc7008b12a459325b548b0715c6b73c"
 
     data0 = [0, 233033, 287068, 341106, 395142, 449179, 503215, 557252, 611287, 665322, 719361, 773398, 827435, 881469, 935504, 989537, 1043574, 1097610, 1151645, 1205683, 1259718, 1313757, 1367795, 1421829, 1475866, 1529905, 1583939, 1637974, 1692010, 1746048, 1800083, 1854117, 1908152, 1962186, 2016230, 2070264, 2124298, 2178334, 2232371, 2286405, 2340445, 2394480, 2448516, 2502552, 2556586, 2610626, 2664664, 2718700, 2772734, 2826769, 2880802]# noqa: E501
     hit0 = 1 #TODO
@@ -548,7 +548,7 @@ class Skill28(PassiveSkill):
     maxLv = 50
     position = 5 #TODO
     rangeLv = 3
-    uuid = "5cac3411ccef1af333953e0ded5e942d"    
+    uuid = "5cac3411ccef1af333953e0ded5e942d"
 
     data0 = [0, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 94, 96, 98, 100, 102, 104, 106, 108, 110, 112, 114, 116, 118]# noqa: E501
 
@@ -569,7 +569,7 @@ class Skill29(ActiveSkill):
     cube = 7
     cd = 60
     mp = [833, 1667]
-    uuid = "85f7c810ad503790e8626439fe936d56"    
+    uuid = "85f7c810ad503790e8626439fe936d56"
 
     data0 = [0, 36589, 40302, 44012, 47722, 51435, 55147, 58860, 62571, 66282, 69992, 73704, 77417, 81128, 84840, 88550, 92264, 95976, 99688, 103398, 107108, 110821, 114533, 118244, 121956, 125666, 129378, 133093, 136804, 140515, 144226, 147939, 151650, 155362, 159073, 162784, 166496, 170208, 173920, 177631, 181343, 185055, 188768, 192477, 196188, 199900, 203612, 207326, 211035, 214748, 218459]# noqa: E501
     hit0 = 1 #TODO
@@ -593,7 +593,7 @@ class Skill30(ActiveSkill):
     cube = 15
     cd = 290
     mp = [4028, 4028]
-    uuid = "002cbdd9bfd0f0b970451ae8d48d029e"    
+    uuid = "002cbdd9bfd0f0b970451ae8d48d029e"
 
     data0 = [0, 11942, 14712, 17480, 20248, 23017, 25789, 28557, 31325, 34094, 36861, 39631, 42402, 45169, 47938, 50710, 53477, 56246, 59015, 61781, 64551, 67318, 70089, 72858, 75626, 78396, 81166, 83934, 86704, 89472, 92240, 95008, 97777, 100546, 103315, 106085, 108853, 111624, 114392, 117160, 119928, 122696, 125466, 128235, 131002, 133773, 136543, 139312, 142081, 144850, 147617]# noqa: E501
     hit0 = 5
diff --git a/backend/core/character/GF/fighter_female/striker_female.py b/backend/core/character/GF/fighter_female/striker_female.py
index 3595abbf..3946cf5d 100644
--- a/backend/core/character/GF/fighter_female/striker_female.py
+++ b/backend/core/character/GF/fighter_female/striker_female.py
@@ -9,10 +9,10 @@ class Skill0(ActiveSkill):
     learnLv = 1
     masterLv = 10
     maxLv = 20
-    position = 0 #TODO
+    position = 3 #TODO
     rangeLv = 3
     cd = 2
-
+    uuid = "eb71e1d82d92c7e1d40500a0dcd77aa6"
     data0 = [0, 175, 203, 231, 259, 287, 315, 343, 371, 399, 427, 455, 482, 510, 538, 566, 594, 622, 650, 678, 706]# noqa: E501
     hit0 = 1 #TODO
 
@@ -33,11 +33,11 @@ class Skill1(ActiveSkill):
     learnLv = 1
     masterLv = 60
     maxLv = 70
-    position = 0 #TODO
+    position = 5 #TODO
     rangeLv = 2
     cd = 3
     mp = [10, 112]
-
+    uuid = "fc7a3f4c2852c832a2f20af63d5d212f"
     data0 = [0, 2448, 2698, 2945, 3193, 3441, 3691, 3938, 4186, 4439, 4686, 4934, 5182, 5432, 5678, 5928, 6175, 6423, 6676, 6923, 7171, 7418, 7669, 7916, 8164, 8414, 8662, 8910, 9158, 9408, 9658, 9906, 10155, 10401, 10653, 10899, 11147, 11394, 11644, 11895, 12142, 12392, 12638, 12888, 13136, 13383, 13629, 13881, 14129, 14376, 14626, 14875, 15124, 15372, 15620, 15870, 16118, 16366, 16613, 16861, 17111, 17361, 17607, 17857, 18107, 18354, 18604, 18850, 19100, 19350, 19596]# noqa: E501
     hit0 = 1 #TODO
 
@@ -52,21 +52,23 @@ class Skill2(ActiveSkill):
     learnLv = 1
     masterLv = 1
     maxLv = 1
-    position = 0 #TODO
+    position = 3 #TODO
     rangeLv = 1
     mp = [1, 1]
-
+    uuid = "7822d6d52e10964a6755f142c666b494"
 
 # 基础精通 기본기 숙련
 # https://api.neople.co.kr/df/skills/a7a059ebe9e6054c0644b40ef316d6e9/5a56514f35cf0270ae8d6c65f8fefd78?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0
 class Skill3(PassiveSkill):
     name = "基础精通"
     learnLv = 1
-    masterLv = 115
+    masterLv = 190
     maxLv = 200
-    position = 0 #TODO
+    position = 1 #TODO
     rangeLv = 1
-
+    uuid = "5a56514f35cf0270ae8d6c65f8fefd78"
+    icon = "$common/$uuid"
+    
     data0 = [0, 150, 158.7, 167.3, 176, 184.5, 193.2, 201.8, 210.5, 219.2, 227.7, 236.4, 245, 253.7, 262.2, 270.9, 284.3, 297.6, 311, 324.3, 337.7, 350.9, 364.2, 377.6, 390.9, 404.3, 417.6, 431, 444.3, 457.7, 471, 484.2, 497.6, 510.9, 524.3, 537.6, 551, 564.3, 577.7, 591, 604.4, 617.7, 630.9, 644.3, 657.6, 671, 684.3, 697.7, 711, 724.4, 737.7, 751.1, 764.3, 777.6, 791, 804.3, 817.7, 831, 844.4, 857.7, 871.1, 884.4, 897.8, 911, 924.3, 937.7, 951, 964.4, 977.7, 991.1, 1004.4, 1017.8, 1031.1, 1044.5, 1057.7, 1071, 1084.4, 1097.7, 1111.1, 1124.4, 1137.8, 1151.1, 1164.5, 1177.8, 1191, 1204.4, 1217.7, 1231.1, 1244.4, 1257.8, 1271.1, 1284.5, 1297.8, 1311.2, 1324.5, 1337.7, 1351.1, 1364.4, 1377.8, 1391.1, 1404.5, 1417.8, 1431.2, 1444.5, 1457.9, 1471.2, 1484.6, 1497.9, 1511.3, 1524.6, 1538, 1551.3, 1564.7, 1578, 1591.4, 1604.7, 1618.1, 1631.4, 1644.8, 1658.1, 1671.5, 1684.8, 1698.2, 1711.5, 1724.9, 1738.2, 1751.6, 1764.9, 1778.3, 1791.6, 1805, 1818.3, 1831.7, 1845, 1858.4, 1871.7, 1885.1, 1898.4, 1911.8, 1925.1, 1938.5, 1951.8, 1965.2, 1978.5, 1991.9, 2005.2, 2018.6, 2031.9, 2045.3, 2058.6, 2072, 2085.3, 2098.7, 2112, 2125.4, 2138.7, 2152.1, 2165.4, 2178.8, 2192.1, 2205.5, 2218.8, 2232.2, 2245.5, 2258.9, 2272.2, 2285.6, 2298.9, 2312.3, 2325.6, 2339, 2352.3, 2365.7, 2379, 2392.4, 2405.7, 2419.1, 2432.4, 2445.8, 2459.1, 2472.5, 2485.8, 2499.2, 2512.5, 2525.9, 2539.2, 2552.6, 2565.9, 2579.3, 2592.6, 2606, 2619.3, 2632.7, 2646, 2659.4, 2672.7, 2686.1, 2699.4, 2712.8, 2726.1, 2739.5]# noqa: E501
     hit0 = 1 #TODO
 
@@ -84,11 +86,11 @@ class Skill4(ActiveSkill):
     learnLv = 1
     masterLv = 10
     maxLv = 20
-    position = 0 #TODO
+    position = 2 #TODO
     rangeLv = 1
     cd = 5
     mp = [1, 1]
-
+    uuid = "ce26c6b69d02a440a81b552bec94f03b"
     data0 = [0, 0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 0.3]# noqa: E501
     hit0 = 1 #TODO
 
@@ -108,7 +110,7 @@ class Skill5(PassiveSkill):
     maxLv = 1
     position = 0 #TODO
     rangeLv = 1
-
+    uuid = "892ef624d8bf3d7fc045f84825fd6104"
 
 # 下段踢 로킥
 # https://api.neople.co.kr/df/skills/a7a059ebe9e6054c0644b40ef316d6e9/4655101518604f874721b3cc249aae10?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0
@@ -117,11 +119,11 @@ class Skill6(ActiveSkill):
     learnLv = 5
     masterLv = 60
     maxLv = 70
-    position = 0 #TODO
+    position = 2 #TODO
     rangeLv = 2
     cd = 2
     mp = [10, 112]
-
+    uuid = "4655101518604f874721b3cc249aae10"
     data0 = [0, 2349, 2589, 2825, 3067, 3307, 3545, 3783, 4019, 4259, 4498, 4735, 4976, 5216, 5454, 5690, 5926, 6166, 6406, 6642, 6883, 7123, 7361, 7599, 7839, 8075, 8315, 8553, 8792, 9032, 9270, 9506, 9746, 9982, 10222, 10462, 10700, 10940, 11178, 11416, 11655, 11892, 12131, 12371, 12609, 12849, 13088, 13323, 13563, 13801, 14039, 14278, 14516, 14756, 14996, 15232, 15472, 15710, 15948, 16191, 16425, 16665, 16905, 17139, 17379, 17619, 17857, 18098, 18333, 18573, 18812]# noqa: E501
     hit0 = 1 #TODO
 
@@ -142,11 +144,11 @@ class Skill7(ActiveSkill):
     learnLv = 5
     masterLv = 10
     maxLv = 20
-    position = 0 #TODO
+    position = 4 #TODO
     rangeLv = 2
     cd = 7
     mp = [6, 84]
-
+    uuid = "f2fb27162beb0b87a7cb9af7900e95f2"
     data0 = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]# noqa: E501
     hit0 = 1 #TODO
 
@@ -164,11 +166,11 @@ class Skill8(ActiveSkill):
     learnLv = 5
     masterLv = 60
     maxLv = 70
-    position = 0 #TODO
+    position = 6 #TODO
     rangeLv = 2
     cd = 5
     mp = [20, 168]
-
+    uuid = "cfacda0647b9a0f595df2c2aad30c18d"
     data0 = [0, 5103, 5634, 6147, 6654, 7171, 7698, 8214, 8724, 9245, 9767, 10280, 10792, 11314, 11832, 12361, 12878, 13388, 13903, 14426, 14950, 15455, 15980, 16497, 17020, 17532, 18051, 18567, 19093, 19611, 20116, 20643, 21158, 21677, 22187, 22712, 23231, 23758, 24259, 24779, 25299, 25821, 26328, 26850, 27375, 27892, 28417, 28924, 29442, 29957, 30484, 30996, 31506, 32037, 32553, 33057, 33577, 34102, 34621, 35149, 35658, 36171, 36689, 37213, 37728, 38240, 38769, 39285, 39794, 40321, 40834]# noqa: E501
     hit0 = 1 #TODO
 
@@ -192,11 +194,11 @@ class Skill9(ActiveSkill):
     learnLv = 10
     masterLv = 1
     maxLv = 11
-    position = 0 #TODO
+    position = 6 #TODO
     rangeLv = 1
     cd = 3
     mp = [3, 4]
-
+    uuid = "9dda3f4a849dba1a288dd65e116860f2"
     data0 = [0, 2, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9, 3]# noqa: E501
     hit0 = 1 #TODO
 
@@ -211,9 +213,9 @@ class Skill10(PassiveSkill):
     learnLv = 10
     masterLv = 50
     maxLv = 60
-    position = 0 #TODO
+    position = 5 #TODO
     rangeLv = 3
-
+    uuid = "c9664191611af31142e052dfaef84530"
     data0 = [0, 192, 264, 347, 442, 548, 666, 795, 935, 1086, 1249, 1424, 1609, 1806, 2015, 2235, 2466, 2708, 2962, 3227, 3504, 3792, 4091, 4402, 4724, 5058, 5403, 5759, 6126, 6505, 6896, 7297, 7710, 8135, 8571, 9018, 9476, 9946, 10427, 10920, 11424, 11939, 12466, 13004, 13554, 14115, 14687, 15270, 15865, 16472, 17089, 15206, 15551, 15896, 16240, 16585, 16930, 17275, 17620, 17965, 18309]# noqa: E501
     hit0 = 1 #TODO
 
@@ -231,11 +233,11 @@ class Skill11(ActiveSkill):
     learnLv = 10
     masterLv = 60
     maxLv = 70
-    position = 0 #TODO
+    position = 3 #TODO
     rangeLv = 2
     cd = 3
     mp = [15, 154]
-
+    uuid = "8f73f243041c2d27739fe7696f02bf9b"
     data0 = [0, 1394, 1535, 1677, 1818, 1960, 2101, 2243, 2384, 2525, 2667, 2808, 2950, 3091, 3233, 3374, 3515, 3657, 3798, 3940, 4081, 4222, 4364, 4505, 4647, 4788, 4930, 5071, 5212, 5354, 5495, 5637, 5778, 5920, 6061, 6202, 6344, 6485, 6627, 6768, 6910, 7051, 7192, 7334, 7475, 7617, 7758, 7899, 8041, 8182, 8324, 8465, 8607, 8748, 8889, 9031, 9172, 9314, 9455, 9597, 9738, 9879, 10021, 10162, 10304, 10445, 10586, 10728, 10869, 11011, 11152]# noqa: E501
     hit0 = 1 #TODO
 
@@ -265,11 +267,11 @@ class Skill12(ActiveSkill):
     learnLv = 10
     masterLv = 60
     maxLv = 70
-    position = 0 #TODO
+    position = 7 #TODO
     rangeLv = 2
     cd = 7
     mp = [10, 97]
-
+    uuid = "78bd107acd474518b606be1e4fd38239"
     data0 = [0, 605, 667, 728, 789, 851, 912, 974, 1035, 1096, 1158, 1219, 1281, 1342, 1403, 1465, 1526, 1588, 1649, 1710, 1772, 1833, 1895, 1956, 2017, 2079, 2140, 2202, 2263, 2324, 2386, 2447, 2509, 2570, 2631, 2693, 2754, 2816, 2877, 2938, 3000, 3061, 3123, 3184, 3245, 3307, 3368, 3430, 3491, 3552, 3614, 3675, 3737, 3798, 3859, 3921, 3982, 4044, 4105, 4166, 4228, 4289, 4351, 4412, 4473, 4535, 4596, 4658, 4719, 4780, 4842]# noqa: E501
     hit0 = 1 #TODO
 
@@ -287,11 +289,11 @@ class Skill13(ActiveSkill):
     learnLv = 10
     masterLv = 60
     maxLv = 70
-    position = 0 #TODO
+    position = 9 #TODO
     rangeLv = 2
     cd = 2
     mp = [8, 67]
-
+    uuid = "dcb31a63ef58954f44ff2070c42a9a98"
     data0 = [0, 558, 614, 671, 728, 784, 841, 897, 954, 1011, 1067, 1124, 1180, 1237, 1294, 1350, 1407, 1463, 1520, 1577, 1633, 1690, 1746, 1803, 1860, 1916, 1973, 2029, 2086, 2143, 2199, 2256, 2312, 2369, 2426, 2482, 2539, 2595, 2652, 2709, 2765, 2822, 2878, 2935, 2992, 3048, 3105, 3161, 3218, 3275, 3331, 3388, 3444, 3501, 3558, 3614, 3671, 3727, 3784, 3841, 3897, 3954, 4010, 4067, 4124, 4180, 4237, 4293, 4350, 4407, 4463]# noqa: E501
     hit0 = 1 #TODO
 
@@ -312,11 +314,11 @@ class Skill14(ActiveSkill):
     learnLv = 10
     masterLv = 60
     maxLv = 70
-    position = 0 #TODO
+    position = 1 #TODO
     rangeLv = 2
     cd = 5
     mp = [20, 238]
-
+    uuid = "4f2e001e9a19eb7bae50ad1840dfb329"
     data0 = [0, 5313, 5851, 6389, 6931, 7468, 8009, 8546, 9083, 9627, 10166, 10702, 11244, 11781, 12320, 12859, 13396, 13938, 14479, 15014, 15552, 16097, 16633, 17172, 17709, 18253, 18790, 19326, 19866, 20407, 20946, 21483, 22025, 22564, 23101, 23639, 24179, 24721, 25257, 25798, 26338, 26875, 27416, 27953, 28490, 29034, 29570, 30109, 30649, 31190, 31725, 32268, 32803, 33347, 33884, 34423, 34962, 35506, 36040, 36579, 37118, 37660, 38197, 38735, 39275, 39817, 40353, 40894, 41432, 41975, 42510]# noqa: E501
     hit0 = 1 #TODO
 
@@ -337,10 +339,10 @@ class Skill15(PassiveSkill):
     learnLv = 10
     masterLv = 1
     maxLv = 1
-    position = 0 #TODO
+    position = 4 #TODO
     rangeLv = 1
     cd = 30
-
+    uuid = "2b340542e776818b78f3212af184bd6b"
     data0 = [0, 40]# noqa: E501
     hit0 = 1 #TODO
 
@@ -355,11 +357,11 @@ class Skill16(ActiveSkill):
     learnLv = 10
     masterLv = 1
     maxLv = 1
-    position = 0 #TODO
+    position = 6 #TODO
     rangeLv = 3
     cd = 5
     mp = [13, 13]
-
+    uuid = "1fea5a626f15230237946a11a9d11582"
     data0 = [0, 20]# noqa: E501
     hit0 = 1 #TODO
 
@@ -371,11 +373,11 @@ class Skill17(ActiveSkill):
     learnLv = 15
     masterLv = 60
     maxLv = 70
-    position = 0 #TODO
+    position = 10 #TODO
     rangeLv = 2
     cd = 1
     mp = [15, 154]
-
+    uuid = "01c3a2fb793d293a25ed8dc7a0d70c1a"
     data0 = [0, 2151, 2370, 2590, 2807, 3028, 3239, 3462, 3681, 3890, 4114, 4329, 4548, 4766, 4987, 5206, 5422, 5643, 5862, 6071, 6289, 6506, 6727, 6945, 7164, 7380, 7601, 7815, 8038, 8254, 8472, 8687, 8907, 9121, 9342, 9561, 9779, 9996, 10216, 10438, 10651, 10865, 11084, 11302, 11521, 11744, 11962, 12176, 12393, 12609, 12827, 13046, 13266, 13487, 13699, 13918, 14138, 14354, 14573, 14794, 15010, 15224, 15443, 15663, 15880, 16098, 16315, 16533, 16751, 16968, 17187]# noqa: E501
     hit0 = 1 #TODO
 
@@ -408,9 +410,9 @@ class Skill18(PassiveSkill):
     learnLv = 15
     masterLv = 1
     maxLv = 10
-    position = 0 #TODO
+    position = 1 #TODO
     rangeLv = 3
-
+    uuid = "1dad88963abdc96b091fcab185a8820d"
     data0 = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]# noqa: E501
     hit0 = 1 #TODO
 
@@ -422,11 +424,11 @@ class Skill19(ActiveSkill):
     learnLv = 15
     masterLv = 20
     maxLv = 30
-    position = 0 #TODO
+    position = 5 #TODO
     rangeLv = 3
     cd = 5
     mp = [126, 1195]
-
+    uuid = "dcd536f1674630f01fc9667bb202b851"
     data0 = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]# noqa: E501
     hit0 = 1 #TODO
 
@@ -447,11 +449,11 @@ class Skill20(ActiveSkill):
     learnLv = 15
     masterLv = 60
     maxLv = 70
-    position = 0 #TODO
+    position = 4 #TODO
     rangeLv = 2
     cd = 6
     mp = [30, 252]
-
+    uuid = "c77a417c43de80c4ce32c1ed405d174a"
     data0 = [0, 6904, 7603, 8303, 9005, 9704, 10408, 11107, 11805, 12507, 13209, 13908, 14610, 15312, 16008, 16710, 17408, 18112, 18813, 19510, 20212, 20914, 21613, 22315, 23017, 23715, 24414, 25115, 25817, 26517, 27216, 27920, 28620, 29315, 30017, 30719, 31420, 32120, 32822, 33521, 34221, 34922, 35624, 36324, 37021, 37722, 38424, 39124, 39825, 40527, 41227, 41928, 42626, 43328, 44029, 44729, 45430, 46130, 46829, 47529, 48231, 48932, 49632, 50336, 51031, 51731, 52434, 53134, 53834, 54536, 55233]# noqa: E501
     hit0 = 1 #TODO
 
@@ -472,11 +474,11 @@ class Skill21(ActiveSkill):
     learnLv = 20
     masterLv = 20
     maxLv = 30
-    position = 0 #TODO
+    position = 3 #TODO
     rangeLv = 3
     cd = 30
     mp = [40, 336]
-
+    uuid = "3d8f3d438405d79f8d3ed68072674d1e"
     data0 = [0, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60]# noqa: E501
     hit0 = 1 #TODO
 
@@ -494,9 +496,9 @@ class Skill22(PassiveSkill):
     learnLv = 20
     masterLv = 1
     maxLv = 1
-    position = 0 #TODO
+    position = 9 #TODO
     rangeLv = 1
-
+    uuid = "8572675ec6a1f50b6eff6a867376c2de"
 
 # 暴击 크리티컬 히트
 # https://api.neople.co.kr/df/skills/a7a059ebe9e6054c0644b40ef316d6e9/fc1262c19f3d0477ee8eda47b8db8696?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0
@@ -505,9 +507,9 @@ class Skill23(PassiveSkill):
     learnLv = 20
     masterLv = 10
     maxLv = 20
-    position = 0 #TODO
+    position = 5 #TODO
     rangeLv = 3
-
+    uuid = "fc1262c19f3d0477ee8eda47b8db8696"
     data0 = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]# noqa: E501
     hit0 = 1 #TODO
 
@@ -519,11 +521,11 @@ class Skill24(ActiveSkill):
     learnLv = 25
     masterLv = 60
     maxLv = 70
-    position = 0 #TODO
+    position = 3 #TODO
     rangeLv = 2
     cd = 7
     mp = [50, 420]
-
+    uuid = "3c5604bdbb0240b8f130f59ab40509c3"
     data0 = [0, 9928, 10935, 11941, 12951, 13954, 14964, 15970, 16977, 17983, 18991, 19998, 21007, 22014, 23020, 24028, 25036, 26041, 27049, 28057, 29064, 30068, 31078, 32083, 33091, 34101, 35105, 36115, 37122, 38128, 39134, 40143, 41152, 42155, 43163, 44170, 45178, 46183, 47192, 48201, 49209, 50215, 51220, 52230, 53236, 54242, 55250, 56257, 57265, 58270, 59278, 60284, 61294, 62302, 63307, 64315, 65323, 66328, 67336, 68344, 69347, 70357, 71365, 72369, 73379, 74386, 75395, 76402, 77408, 78416, 79421]# noqa: E501
     hit0 = 1 #TODO
 
@@ -538,11 +540,11 @@ class Skill25(ActiveSkill):
     learnLv = 25
     masterLv = 60
     maxLv = 70
-    position = 0 #TODO
+    position = 2 #TODO
     rangeLv = 2
     cd = 7
     mp = [50, 420]
-
+    uuid = "717f1e2104fe4b796f800352fa143ecc"
     data0 = [0, 10153, 11186, 12215, 13247, 14275, 15306, 16337, 17369, 18396, 19428, 20460, 21490, 22520, 23551, 24579, 25611, 26645, 27671, 28703, 29733, 30762, 31792, 32824, 33853, 34884, 35913, 36943, 37975, 39005, 40035, 41067, 42094, 43128, 44158, 45188, 46217, 47249, 48277, 49311, 50339, 51369, 52400, 53431, 54457, 55490, 56522, 57551, 58582, 59611, 60643, 61673, 62705, 63732, 64764, 65796, 66826, 67854, 68884, 69915, 70948, 71977, 73007, 74037, 75067, 76098, 77129, 78158, 79190, 80218, 81247]# noqa: E501
     hit0 = 1 #TODO
 
@@ -575,9 +577,9 @@ class Skill26(PassiveSkill):
     learnLv = 30
     masterLv = 10
     maxLv = 20
-    position = 0 #TODO
+    position = 5 #TODO
     rangeLv = 3
-
+    uuid = "23a5e0fba03283cb1b324a847b3fe370"
     data0 = [0, 17.6, 19.2, 20.8, 22.4, 24, 25.6, 27.2, 28.8, 30.4, 32, 33.6, 35.2, 36.8, 38.4, 40, 41.6, 43.2, 44.8, 46.4, 48]# noqa: E501
     hit0 = 1 #TODO
 
@@ -595,11 +597,11 @@ class Skill27(ActiveSkill):
     learnLv = 30
     masterLv = 60
     maxLv = 70
-    position = 0 #TODO
+    position = 7 #TODO
     rangeLv = 2
     cd = 8
     mp = [50, 420]
-
+    uuid = "202edb928046f4fa6dedf6337377efd5"
     data0 = [0, 2391, 2632, 2876, 3120, 3360, 3602, 3847, 4088, 4330, 4573, 4816, 5056, 5301, 5544, 5784, 6031, 6274, 6516, 6757, 7000, 7244, 7487, 7728, 7970, 8213, 8458, 8698, 8940, 9184, 9424, 9668, 9912, 10154, 10394, 10640, 10882, 11122, 11367, 11608, 11852, 12095, 12336, 12578, 12826, 13066, 13308, 13552, 13796, 14036, 14280, 14522, 14762, 15008, 15250, 15492, 15735, 15978, 16220, 16460, 16704, 16946, 17189, 17432, 17674, 17916, 18160, 18402, 18644, 18888, 19128]# noqa: E501
     hit0 = 1 #TODO
 
@@ -614,9 +616,9 @@ class Skill28(PassiveSkill):
     learnLv = 30
     masterLv = 5
     maxLv = 15
-    position = 0 #TODO
+    position = 3 #TODO
     rangeLv = 5
-
+    uuid = "5152480fdde81362575a488d4cec4af9"
     data0 = [0, 14, 15.5, 17, 18.5, 20, 21.5, 23, 24.5, 26, 27.5, 29, 30.5, 32, 33.5, 35]# noqa: E501
     hit0 = 1 #TODO
 
@@ -640,12 +642,12 @@ class Skill29(ActiveSkill):
     learnLv = 35
     masterLv = 60
     maxLv = 70
-    position = 0 #TODO
+    position = 4 #TODO
     rangeLv = 2
     cube = 1
     cd = 15
     mp = [130, 1092]
-
+    uuid = "42c82812f86ff6704ae9952a2e6093a4"
     data0 = [0, 0, 2, 3, 5, 6, 8, 9, 11, 13, 14, 16, 17, 19, 21, 22, 24, 25, 27, 28, 30, 32, 33, 35, 36, 38, 39, 41, 43, 44, 46, 47, 49, 51, 52, 54, 55, 57, 58, 60, 62, 63, 65, 66, 68, 69, 71, 73, 74, 76, 77, 79, 81, 82, 84, 85, 87, 88, 90, 92, 93, 95, 96, 98, 99, 101, 103, 104, 106, 107, 109]# noqa: E501
     hit0 = 1 #TODO
 
@@ -666,12 +668,12 @@ class Skill30(ActiveSkill):
     learnLv = 35
     masterLv = 60
     maxLv = 70
-    position = 0 #TODO
+    position = 5 #TODO
     rangeLv = 2
     cube = 1
     cd = 20
     mp = [170, 1428]
-
+    uuid = "852f8ad797db4dca1405cb3e77198401"
     data0 = [0, 4503, 4959, 5417, 5874, 6332, 6786, 7242, 7700, 8157, 8615, 9069, 9527, 9984, 10442, 10899, 11354, 11811, 12267, 12725, 13179, 13637, 14094, 14552, 15009, 15464, 15921, 16379, 16836, 17292, 17748, 18206, 18663, 19118, 19575, 20033, 20489, 20946, 21402, 21860, 22317, 22773, 23229, 23687, 24144, 24602, 25058, 25514, 25971, 26429, 26886, 27341, 27798, 28256, 28713, 29171, 29625, 30083, 30540, 30998, 31455, 31910, 32367, 32823, 33279, 33734, 34191, 34649, 35106, 35562, 36020]# noqa: E501
     hit0 = 1 #TODO
 
@@ -695,12 +697,12 @@ class Skill31(ActiveSkill):
     learnLv = 40
     masterLv = 60
     maxLv = 70
-    position = 0 #TODO
+    position = 2 #TODO
     rangeLv = 2
     cube = 1
     cd = 20
     mp = [180, 1512]
-
+    uuid = "28b583c75a49103a1d8aabf799c000a4"
     data0 = [0, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12]# noqa: E501
     hit0 = 1 #TODO
 
@@ -718,12 +720,12 @@ class Skill32(ActiveSkill):
     learnLv = 45
     masterLv = 60
     maxLv = 70
-    position = 0 #TODO
+    position = 2 #TODO
     rangeLv = 2
     cube = 2
     cd = 40
     mp = [400, 3360]
-
+    uuid = "0b8db1e10b3abbd24d38564e708675d5"
     data0 = [0, 1887, 2079, 2271, 2463, 2654, 2846, 3036, 3228, 3420, 3612, 3803, 3995, 4185, 4376, 4568, 4761, 4952, 5144, 5334, 5526, 5718, 5910, 6099, 6291, 6483, 6675, 6866, 7059, 7250, 7442, 7632, 7824, 8015, 8207, 8397, 8589, 8781, 8973, 9164, 9354, 9548, 9740, 9930, 10122, 10313, 10505, 10697, 10887, 11078, 11270, 11460, 11652, 11843, 12036, 12228, 12420, 12611, 12803, 12993, 13185, 13376, 13568, 13758, 13952, 14142, 14333, 14526, 14717, 14909, 15099]# noqa: E501
     hit0 = 1 #TODO
 
@@ -744,9 +746,9 @@ class Skill33(PassiveSkill):
     learnLv = 48
     masterLv = 40
     maxLv = 50
-    position = 0 #TODO
+    position = 6 #TODO
     rangeLv = 3
-
+    uuid = "147d005ac868e0de52b1f255eea35d62"
     data0 = [0, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 61, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, 89, 91, 93, 95, 97, 99, 101, 103, 105]# noqa: E501
     hit0 = 1 #TODO
 
@@ -761,12 +763,12 @@ class Skill34(ActiveSkill):
     learnLv = 50
     masterLv = 40
     maxLv = 50
-    position = 0 #TODO
+    position = 2 #TODO
     rangeLv = 5
     cube = 5
     cd = 145
     mp = [900, 7559]
-
+    uuid = "47bd4871f29defc2a0021ee9261d7a5b"
     data0 = [0, 82775, 101967, 121160, 140357, 159551, 178745, 197941, 217136, 236327, 255522, 274715, 293910, 313102, 332296, 351492, 370686, 389881, 409077, 428271, 447462, 466656, 485852, 505047, 524238, 543433, 562628, 581822, 601017, 620210, 639406, 658599, 677791, 696989, 716181, 735373, 754569, 773762, 792957, 812151, 831346, 850540, 869734, 888929, 908122, 927319, 946508, 965704, 984899, 1004093, 1023286]# noqa: E501
     hit0 = 1 #TODO
 
@@ -790,12 +792,12 @@ class Skill35(ActiveSkill):
     learnLv = 60
     masterLv = 40
     maxLv = 50
-    position = 0 #TODO
+    position = 4 #TODO
     rangeLv = 2
     cube = 1
     cd = 30
     mp = [450, 1260]
-
+    uuid = "e5c09f9132a48dc1d695968592cc5878"
     data0 = [0, 46911, 51666, 56426, 61185, 65942, 70701, 75461, 80220, 84980, 89736, 94496, 99257, 104015, 108774, 113532, 118290, 123051, 127809, 132569, 137328, 142085, 146847, 151604, 156362, 161121, 165879, 170640, 175400, 180156, 184916, 189675, 194435, 199194, 203954, 208710, 213470, 218229, 222989, 227748, 232506, 237264, 242025, 246782, 251541, 256301, 261059, 265818, 270576, 275336, 280095]# noqa: E501
     hit0 = 1 #TODO
 
@@ -816,12 +818,12 @@ class Skill36(ActiveSkill):
     learnLv = 70
     masterLv = 40
     maxLv = 50
-    position = 0 #TODO
+    position = 4 #TODO
     rangeLv = 2
     cube = 2
     cd = 50
     mp = [935, 1960]
-
+    uuid = "e0daa922b19cdc35de879e938361464e"
     data0 = [0, 7185, 7916, 8646, 9374, 10103, 10833, 11561, 12291, 13020, 13748, 14477, 15207, 15935, 16665, 17393, 18122, 18851, 19581, 20309, 21039, 21767, 22497, 23225, 23957, 24683, 25416, 26142, 26874, 27602, 28332, 29060, 29789, 30518, 31248, 31976, 32706, 33434, 34163, 34892, 35622, 36350, 37080, 37806, 38537, 39266, 39998, 40724, 41456, 42182, 42912]# noqa: E501
     hit0 = 1 #TODO
 
@@ -860,9 +862,9 @@ class Skill37(PassiveSkill):
     learnLv = 75
     masterLv = 40
     maxLv = 50
-    position = 0 #TODO
+    position = 3 #TODO
     rangeLv = 3
-
+    uuid = "8ee0099656df08a0b39225f8a21d514b"
     data0 = [0, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 94, 96, 98, 100, 102, 104, 106, 108, 110, 112, 114, 116, 118, 120, 122]# noqa: E501
     hit0 = 1 #TODO
 
@@ -886,12 +888,12 @@ class Skill38(ActiveSkill):
     learnLv = 75
     masterLv = 40
     maxLv = 50
-    position = 0 #TODO
+    position = 5 #TODO
     rangeLv = 2
     cube = 3
     cd = 40
     mp = [580, 4500]
-
+    uuid = "128b9ddef2262f40723deae4407bdb42"
     data0 = [0, 2698, 2971, 3244, 3520, 3792, 4067, 4338, 4614, 4888, 5161, 5437, 5708, 5983, 6255, 6531, 6805, 7077, 7352, 7625, 7899, 8171, 8447, 8721, 8994, 9269, 9541, 9815, 10090, 10363, 10638, 10909, 11185, 11457, 11732, 12006, 12279, 12554, 12826, 13101, 13376, 13648, 13922, 14195, 14470, 14743, 15016, 15292, 15564, 15839, 16110]# noqa: E501
     hit0 = 1 #TODO
 
@@ -909,12 +911,12 @@ class Skill39(ActiveSkill):
     learnLv = 80
     masterLv = 40
     maxLv = 50
-    position = 0 #TODO
+    position = 3 #TODO
     rangeLv = 2
     cube = 5
     cd = 45
     mp = [800, 6000]
-
+    uuid = "9bff7f2559e003766fee2853dca00631"
     data0 = [0, 8499, 9361, 10223, 11084, 11946, 12809, 13670, 14532, 15395, 16257, 17119, 17984, 18846, 19706, 20568, 21432, 22294, 23155, 24020, 24880, 25741, 26606, 27468, 28328, 29191, 30053, 30915, 31777, 32639, 33501, 34363, 35230, 36091, 36953, 37815, 38678, 39537, 40401, 41261, 42123, 42986, 43850, 44712, 45575, 46436, 47298, 48160, 49023, 49883, 50745]# noqa: E501
     hit0 = 1 #TODO
 
@@ -938,12 +940,12 @@ class Skill40(ActiveSkill):
     learnLv = 85
     masterLv = 40
     maxLv = 50
-    position = 0 #TODO
+    position = 4 #TODO
     rangeLv = 5
     cube = 10
     cd = 180
     mp = [2500, 5000]
-
+    uuid = "78be08a3f8c834d3b06fa20c6a08c5a5"
     data0 = [0, 169618, 208949, 248279, 287613, 326944, 366276, 405607, 444940, 484271, 523604, 562934, 602268, 641600, 680930, 720262, 759594, 798927, 838258, 877589, 916920, 956254, 995586, 1034917, 1074249, 1113580, 1152913, 1192244, 1231575, 1270906, 1310241, 1349572, 1388903, 1428235, 1467567, 1506900, 1546231, 1585562, 1624892, 1664223, 1703556, 1742887, 1782218, 1821551, 1860884, 1900214, 1939547, 1978879, 2018210, 2057543, 2096874]# noqa: E501
     hit0 = 1 #TODO
 
@@ -958,9 +960,9 @@ class Skill41(PassiveSkill):
     learnLv = 95
     masterLv = 40
     maxLv = 50
-    position = 0 #TODO
+    position = 5 #TODO
     rangeLv = 3
-
+    uuid = "31823197cc0b04d4c5dcf8f928d9220c"
     data0 = [0, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 94, 96, 98, 100, 102, 104, 106, 108, 110, 112, 114, 116, 118]# noqa: E501
     hit0 = 1 #TODO
 
@@ -972,12 +974,12 @@ class Skill42(ActiveSkill):
     learnLv = 95
     masterLv = 40
     maxLv = 50
-    position = 0 #TODO
+    position = 7 #TODO
     rangeLv = 2
     cube = 7
     cd = 60
     mp = [870, 6750]
-
+    uuid = "dac8d8207618150c162e4c6f9e168527"
     data0 = [0, 16542, 18220, 19896, 21576, 23253, 24932, 26609, 28289, 29965, 31644, 33324, 35001, 36680, 38358, 40037, 41713, 43392, 45070, 46748, 48426, 50105, 51782, 53460, 55138, 56817, 58494, 60172, 61852, 63530, 65208, 66887, 68565, 70243, 71922, 73598, 75277, 76954, 78634, 80311, 81989, 83666, 85345, 87025, 88702, 90382, 92058, 93737, 95415, 97093, 98771]# noqa: E501
     hit0 = 1 #TODO
 
@@ -998,12 +1000,12 @@ class Skill43(ActiveSkill):
     learnLv = 100
     masterLv = 40
     maxLv = 50
-    position = 0 #TODO
+    position = 5 #TODO
     rangeLv = 5
     cube = 15
     cd = 290
     mp = [4028, 8056]
-
+    uuid = "8e358ecf99ac9df31a6132aeafe378a9"
     data0 = [0, 51726, 63721, 75715, 87708, 99703, 111697, 123691, 135687, 147681, 159675, 171670, 183663, 195658, 207652, 219646, 231642, 243636, 255630, 267625, 279618, 291614, 303608, 315601, 327596, 339590, 351585, 363580, 375573, 387567, 399562, 411556, 423552, 435545, 447540, 459535, 471528, 483523, 495517, 507511, 519506, 531501, 543496, 555488, 567482, 579477, 591472, 603466, 615460, 627455, 639450]# noqa: E501
     hit0 = 1 #TODO
 
@@ -1019,4 +1021,4 @@ class Skill43(ActiveSkill):
     data4 = [0, 258629, 318593, 378566, 438540, 498511, 558485, 618454, 678427, 738401, 798372, 858344, 918317, 978286, 1038260, 1098231, 1158205, 1218177, 1278148, 1338122, 1398093, 1458064, 1518037, 1578004, 1637977, 1697949, 1757920, 1817894, 1877864, 1937837, 1997808, 2057782, 2117754, 2177724, 2237697, 2297670, 2357642, 2417615, 2477584, 2537557, 2597530, 2657502, 2717475, 2777440, 2837412, 2897386, 2957357, 3017331, 3077301, 3137274, 3197247]# noqa: E501
     hit4 = 1 #TODO
 
-                
\ No newline at end of file
+
diff --git a/backend/core/character/GF/fighter_male/nenmaster_male.py b/backend/core/character/GF/fighter_male/nenmaster_male.py
index 6751bc8f..d5a0b88a 100644
--- a/backend/core/character/GF/fighter_male/nenmaster_male.py
+++ b/backend/core/character/GF/fighter_male/nenmaster_male.py
@@ -286,7 +286,7 @@ class Skill31(PassiveSkill):
 
     associate = [
         {"type": "*skillRation","data":data0,"skills":["分身"],"ratio":1},
-        {"type": "+cd","data":[0]+[3]*maxLv,"skills":["分身"],"ratio":1}
+        {"type": "+cd","data":[0]+[5]*maxLv,"skills":["分身"],"ratio":1}
     ]
 
 
diff --git a/backend/core/character/GF/gunner_male/mechanic_male.py b/backend/core/character/GF/gunner_male/mechanic_male.py
index 0e2f71a9..c206583f 100644
--- a/backend/core/character/GF/gunner_male/mechanic_male.py
+++ b/backend/core/character/GF/gunner_male/mechanic_male.py
@@ -68,7 +68,11 @@ class Skill6(ActiveSkill):
 
     data1 = [0, 132, 134, 136, 138, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140]# noqa: E501
     
-    associate = [{"data":[i-100 if i > 100 else i for i in data1],"skills":["RX-78追击者","Ez-8自爆者","RX-60陷阱追击者",'空投支援', '拦截机工厂', 'EZ-10反击者', 'TX-45特攻队']}]
+    associate = [
+        {"data":[i-100 if i > 100 else i for i in data1],"skills":["RX-78追击者","Ez-8自爆者","RX-60陷阱追击者","空投支援", "EZ-10反击者", "TX-45特攻队"]},
+        # 光能不享受引爆
+        {"type":"*power1","data":[i-100 if i > 100 else i for i in data1],"skills":["拦截机工厂"]}
+    ]
 
 
 # G-14手雷 G-14 파열류탄
@@ -369,7 +373,6 @@ class Skill23(ActiveSkill):
     data5 = [0, 54239, 59742, 65244, 70748, 76253, 81755, 87257, 92760, 98262, 103764, 109268, 114770, 120272, 125775, 131277, 136781, 142284, 147786, 153288, 158793, 164295, 169797, 175299, 180801, 186303, 191807, 197309, 202811, 208316, 213818, 219320, 224823, 230325, 235827, 241331, 246833, 252335, 257838, 263340, 268845, 274349, 279851, 285353, 290856, 296358, 301860, 307364, 312866, 318368, 323871, 329373, 334877, 340380, 345882, 351384, 356889, 362391, 367893, 373391, 378896, 384398, 389900, 395403, 400905, 406410, 411914, 417414, 422916, 428420, 433922]# noqa: E501
     hit5 = 0
 
-
 # 光反应能量模块 솔라 모듈 시스템
 # https://api.neople.co.kr/df/skills/afdf3b989339de478e85b614d274d1ef/56aa7844a2da23f5bea9b585aea5ae45?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0
 class Skill24(PassiveSkill):
@@ -382,8 +385,6 @@ class Skill24(PassiveSkill):
     uuid = "56aa7844a2da23f5bea9b585aea5ae45"    
 
     associate = [{"type":"+hit1","data":[0,-8],"ratio":1,"skills":["拦截机工厂"]},{"type":"+hit5","data":[0,1],"ratio":1,"skills":["拦截机工厂"]}]
-
-
 # 斗志之歌 최후의 투지
 # https://api.neople.co.kr/df/skills/afdf3b989339de478e85b614d274d1ef/28b583c75a49103a1d8aabf799c000a4?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0
 class Skill25(PassiveSkill):