2024-04-04

2024-04-04 14:22:30 +08:00
parent 01537baade
commit 255dc5694a
64 changed files with 1057 additions and 998 deletions
--- a/csv/battleevent/BattleEvent
+++ b/csv/battleevent/BattleEvent
@@ -22,6 +22,6 @@ int,string,void,bool,int[],string,void,string,void,int[],string,string,string,in
 10020,BattleEvent/UnitTest_Name,部件测试,,;7;;;,BattleEvent/UnitTest_Des,协会需要你帮忙测试新研发的部件性能，如果你使用得当，就可以留下它。,BattleEvent/UnitTest_Effect,战斗开始时，随机在空位装备1个攻击部件，装载3次该部件后将在战斗结束时获得。,,,BE_UnitTest,unit_try_out,;411;;415;;512;;702;;706;;708;;710;;811;;;,;0;;1;;2;;;
 10021,BattleEvent/SimpleColor_Name,简色主义,,;7;;77;;;,BattleEvent/SimpleColor_Des,简色主义是近来颇为有名的宇宙组织，他们正在考察这场战斗的污染系数。,BattleEvent/SimpleColor_Effect,若每回合使用的手牌能量颜色不超过2种，战斗结束后，可以选择1个颜色能量原料进行移除。,,,BE_SimpleColor,simple_color,;706;;;,
 10022,BattleEvent/ExchangePower_Name,换位激荡,,;77;;;,BattleEvent/ExchangePower_Des,空间的能量要抑制不住了！,BattleEvent/ExchangePower_Effect,攻击部件换位后，获得{0}点威力。,;2;;;,,BE_ExchangePower,spatial_turbulence,,;8;;9;;10;;;
-10023,BattleEvent/ShopLocation_Name,折跃定位,,;77;;;,BattleEvent/ShopLocation_Des,一名商人将传送的折跃定位设在了你的部件上，请务必稳定住它们！,BattleEvent/ShopLocation_Effect,战斗开始时，使随机{0}个部件获得折跃定位。,;3;;;,,BE_ShopLocation,shop_location,;512;;;,;0;;1;;;
+10023,BattleEvent/ShopLocation_Name,折跃定位,,;77;;;,BattleEvent/ShopLocation_Des,一名商人将传送的折跃定位设在了你的部件上，请务必稳定住它们！,BattleEvent/ShopLocation_Effect,战斗开始时，使随机{0}个部件获得折跃定位。战斗结束时，若存在折跃定位，可以进入商店。,;3;;;,,BE_ShopLocation,shop_location,;512;;;,;0;;1;;;
 10024,BattleEvent/ExchangeToMove_Name,燃料补充,,;77;;;,BattleEvent/ExchangeToMove_Des,嗯……换位了以后能补充燃料，这很合理吧？,BattleEvent/ExchangeToMove_Effect,在第1回合中，换位后可以回复1点燃料。,,,BE_ExhcangeToMove,exchange_to_fuel,,;0;;1;;;
 10025,BattleEvent/CheckLoad_Name,协会检修,,;77;;;,BattleEvent/CheckLoad_Des,协会非要在这时候例行检查你的部件！在此期间最好不要装载能量！,BattleEvent/CheckLoad_Effect,战斗开始时，使随机部件获得协会检修。,,,BE_CheckLoad,unit_inspection,;706;;512;;;,
--- a/csv/encounterevents/EncounterEvents
+++ b/csv/encounterevents/EncounterEvents
@@ -1132,10 +1132,10 @@ int,int,string,void,int,int,bool,int[],int,string,void,int[],int,int,string,void
 2340,2330,EventName/2330,骰子能量原料,,,,,,EventDes/2340,你对着这位同胞眼巴巴的望着说你只想要一个{0}点能量原料，作为赌徒的他似乎非常挣扎，但还是同意了，并让你赶紧离开。,,,,EvenOptionDes/Close,[离开],,,,,,,,,,,,,,,,
 2341,2330,EventName/2330,骰子能量原料,,,,,,EventDes/2341,你对着这位同胞眼巴巴的望着说你只想要一个{0}能量原料，作为赌徒的他似乎非常挣扎，但还是同意了，并让你赶紧离开。,,,,EvenOptionDes/Close,[离开],,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-2350,2350,EventName/2350,攻击之力,1,3,,;7;;77;;;,,EventDes/2350,在一次飙船大赛上，一艘名叫“花”的飞船给你留下了深刻的印象，这艘装配了四个比火箭发动机还要大引擎的飞船，来自于一位身高不到一米的兽族机械师——虎。他和你相谈甚欢，决定以优惠的价格帮你改造一个攻击部件。,;10;;;,,,EvenOptionDes/2350_1,[轻度改造]<b>失去{0}星币。</b><g>选择1个攻击部件，使其在战斗中拥有1点功率。</g>,OC_StarCoinLose,;2;;;,,1,2351,OC_SlotRefit,;11;;;,,2,,,,,,,
-2350,2350,EventName/2350,攻击之力,,,,,,,,,,,EvenOptionDes/2350_2,[中度改造]<b>失去{0}星币。</b><g>选择1个攻击部件，使其在战斗中拥有2点功率。</g>,OC_StarCoinLose,;10;;;,,1,2352,OC_SlotRefit,;11;;11;;;,,2,,,,,,,
-2350,2350,EventName/2350,攻击之力,,,,,,,,,,,EvenOptionDes/2350_3,[重度改造]<b>失去{0}星币。</b><g>选择1个攻击部件，使其在战斗中拥有3点功率。</g>,OC_StarCoinLose,;20;;;,,1,2353,OC_SlotRefit,;11;;11;;11;;;,,2,,,,,,,
-2350,2350,EventName/2350,攻击之力,,,,,,,,,,4,EvenOptionDes/2350_4,[通融通融]<b>失去所有星币。</b><g>选择1个攻击部件，使其在战斗中拥有3点功率。</g><r>（树人专属）</r>,OC_LoseAllCoin,,,1,2355,OC_SlotRefit,;11;;11;;11;;;,,2,,OC_RaceLimit,;3;;;,,3,,
+2350,2350,EventName/2350,攻击之力,1,3,,;7;;77;;;,,EventDes/2350,在一次飙船大赛上，一艘名叫“花”的飞船给你留下了深刻的印象，这艘装配了四个比火箭发动机还要大引擎的飞船，来自于一位身高不到一米的兽族机械师——虎。他和你相谈甚欢，决定以优惠的价格帮你改造一个攻击部件。,;10;;;,,,EvenOptionDes/2350_1,[轻度改造]<b>失去{0}星币。</b><g>选择1个攻击部件，使其拥有1点功率。</g>,OC_StarCoinLose,;2;;;,,1,2351,OC_SlotRefit,;11;;;,,2,,,,,,,
+2350,2350,EventName/2350,攻击之力,,,,,,,,,,,EvenOptionDes/2350_2,[中度改造]<b>失去{0}星币。</b><g>选择1个攻击部件，使其拥有2点功率。</g>,OC_StarCoinLose,;10;;;,,1,2352,OC_SlotRefit,;11;;11;;;,,2,,,,,,,
+2350,2350,EventName/2350,攻击之力,,,,,,,,,,,EvenOptionDes/2350_3,[重度改造]<b>失去{0}星币。</b><g>选择1个攻击部件，使其拥有3点功率。</g>,OC_StarCoinLose,;20;;;,,1,2353,OC_SlotRefit,;11;;11;;11;;;,,2,,,,,,,
+2350,2350,EventName/2350,攻击之力,,,,,,,,,,4,EvenOptionDes/2350_4,[通融通融]<b>失去所有星币。</b><g>选择1个攻击部件，使其拥有3点功率。</g><r>（树人专属）</r>,OC_LoseAllCoin,,,1,2355,OC_SlotRefit,;11;;11;;11;;;,,2,,OC_RaceLimit,;3;;;,,3,,
 2350,2350,EventName/2350,攻击之力,,,,,,,,,,,EvenOptionDes/Close,[离开],OC_Close,,,,2354,,,,,,,,,,,
 2351,2350,EventName/2350,攻击之力,,,,,,EventDes/2351,一阵叮叮当当后，你的部件散发出了不小的威能。“男子汉就应该全力一击。”说着他在你面前握紧了他绿豆大小的拳头。你有些无奈的感谢了他，并向他告辞。,,,,EvenOptionDes/Close,[离开],,,,,,,,,,,,,,,,
 2352,2350,EventName/2350,攻击之力,,,,,,EventDes/2352,一阵叮叮当当后，你的部件散发出了强大的威能。“男子汉就应该全力一击。”说着他在你面前握紧了他绿豆大小的拳头。你有些无奈的感谢了他，并向他告辞。,,,,EvenOptionDes/Close,[离开],,,,,,,,,,,,,,,,
@@ -1303,7 +1303,7 @@ int,int,string,void,int,int,bool,int[],int,string,void,int[],int,int,string,void
 2482,2480,EventName/2480,自动升级,,,,,,,,,,,EvenOptionDes/Close,[离开],OC_Close,,,,2483,,,,,,,,,,,
 2483,2480,EventName/2480,自动升级,,,,,,EventDes/2483,等你离开工厂不久之后，一个满头大汗的工程师从机器里钻了出来...,,,,EvenOptionDes/Close,[离开],,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-2490,2490,EventName/2490,生产技能,1,2,,;7;;77;;;,,EventDes/2490,酒馆里，一个年轻的智械拉住了你，嘴里喃喃着孤星宇宙其实是一个游戏世界，所以它现在的目标是要把生产技能点满之类的你听不懂的话。\n\n无论如何，它愿意帮你改造部件，并且只收取一点成本费用，甚至可以免费。,;10;;;,,,EvenOptionDes/2490_1,[攻击部件]<b>失去{0}星币。</b><g>选择1个攻击部件，使其在战斗中拥有1点功率。</g>,OC_StarCoinLose,;3;;;,,1,2491,OC_SlotRefitByType,;1;;11;;;,,2,;2491;;2493;,,,,,,
+2490,2490,EventName/2490,生产技能,1,2,,;7;;77;;;,,EventDes/2490,酒馆里，一个年轻的智械拉住了你，嘴里喃喃着孤星宇宙其实是一个游戏世界，所以它现在的目标是要把生产技能点满之类的你听不懂的话。\n\n无论如何，它愿意帮你改造部件，并且只收取一点成本费用，甚至可以免费。,;10;;;,,,EvenOptionDes/2490_1,[攻击部件]<b>失去{0}星币。</b><g>选择1个攻击部件，使其拥有1点功率。</g>,OC_StarCoinLose,;3;;;,,1,2491,OC_SlotRefitByType,;1;;11;;;,,2,;2491;;2493;,,,,,,
 2490,2490,EventName/2490,生产技能,,,,,,,,,,,EvenOptionDes/2490_2,[辅助部件]<g>选择1个辅助部件，降低1次最高颜色槽位。</g>,OC_SlotRefitByType,;2;;7;;;,,,;2492;;2493;,,,,,,,,,,,
 2490,2490,EventName/2490,生产技能,,,,,,,,,,,EvenOptionDes/Close,[离开],OC_Close,,,,2493,,,,,,,,,,,
 2491,2490,EventName/2490,生产技能,,,,,,EventDes/2491,完成改造之后，年轻智械开心说了句“exp+3”就去找其他赏金猎人了。你虽然不懂他的想法，但你大受震撼。,,,,EvenOptionDes/Close,[离开],,,,,,,,,,,,,,,,
--- a/csv/keyword/KeyWord
+++ b/csv/keyword/KeyWord
@@ -4,29 +4,30 @@ int,string,void,string,void,string,string,string
 2,KeyWord/Win,对波胜利,KeyWordDes/Win,对波结算时，部件所在列的威力大于敌方为胜利。,#9BF37B,,
 3,KeyWord/Lose,对波失败,KeyWordDes/Lose,对波结算时，部件所在列的威力小于敌方为失败。,#A40000,,
 4,KeyWord/Equal,对波平局,KeyWordDes/Equal,对波结算时，部件所在列的威力等于敌方为平局。,#00CAFF,,
-5,KeyWord/LoadFull,满载,KeyWordDes/LoadFull,当部件所有槽位都被装载时，触发其效果。,#0CFF00,buff,loadfull
-6,KeyWord/Charge,充能,KeyWordDes/Charge,当装载过的总能量点数达到充能阈值时，触发其效果。随后重置充能进度。,#FFCC1F,buff,charge
-7,KeyWord/Use,发动,KeyWordDes/Use,点击部件时，触发其效果，并进入冷却。数值代表冷却回合数。,#FFB95D,buff,use
-8,KeyWord/CountDown,计时,KeyWordDes/CountDown,回合倒计时归0时，触发其效果。,#6288FF,buff,countdown
-10,KeyWord/Sleep,休眠,KeyWordDes/Sleep,该部件无法装载能量，威力失效，无法发动。,#AD1B35,buff,sleep
+5,KeyWord/LoadFull,满载,KeyWordDes/LoadFull,所有槽位都装载能量时触发。,#0CFF00,buff,loadfull
+6,KeyWord/Charge,充能,KeyWordDes/Charge,装载的能量点数之和达到阈值时触发。,#FFCC1F,buff,charge
+7,KeyWord/Use,发动,KeyWordDes/Use,冷却结束后，点击部件以触发。,#FFB95D,buff,use
+8,KeyWord/CountDown,计时,KeyWordDes/CountDown,回合倒计时归0时触发。,#6288FF,buff,countdown
+10,KeyWord/Sleep,休眠,KeyWordDes/Sleep,无法装载能量，威力失效，无法发动。,#AD1B35,buff,sleep
 11,KeyWord/Break,耐久,KeyWordDes/Break,己方对波胜利时，敌方的耐久值会被削减。当其耐久值归0时，下回合无法行动。,#87CEFA,,
 12,KeyWord/Exchange,换位,KeyWordDes/Exchange,可以在战斗中调整部件位置。,#FFE66F,,
-13,KeyWord/Overclock,超频,KeyWordDes/Overclock,该部件装载能量时，若该能量点数≥超频阈值，触发其效果。,#FF78C1,buff,overclock
-15,KeyWord/Triangle,三重,KeyWordDes/Triangle,该部件累计装载3个能量后，触发其效果。装载进度会在触发前一直保留。,#73E5AC,buff,triangle
-16,KeyWord/PowerRate,威力翻倍,KeyWordDes/PowerRate,该部件拥有的威力翻倍，持续1回合。不可叠加。,#E77531,buff,power_rate
+13,KeyWord/Overclock,超频,KeyWordDes/Overclock,装载的单个能量点数≥阈值时触发。,#FF78C1,buff,overclock
+15,KeyWord/Triangle,三重,KeyWordDes/Triangle,累计装载3个能量后触发。,#73E5AC,buff,triangle
+16,KeyWord/PowerRate,威力翻倍,KeyWordDes/PowerRate,本回合拥有双倍威力，不可叠加。,#E77531,buff,power_rate
 17,KeyWord/DestroyUnit,摧毁,KeyWordDes/DestroyUnit,在本场战斗中移除。,#904DF3,,
-101,KeyWord/Grip,钳制,KeyWordDes/Grip,在部件装载时，消耗装载能量并移除钳制，持续1回合。,#4DFFFF,buff,grip
+101,KeyWord/Grip,钳制,KeyWordDes/Grip,本回合下一个装载的能量无效。,#4DFFFF,buff,grip
 103,KeyWord/Burn,燃烧,KeyWordDes/Burn,装载能量时，受到1点伤害。,#FF5151,buff,burn
 104,KeyWord/Link,连锁,KeyWordDes/Link,装载后，其他具有连锁效果的部件会装载同样的能量。,#64B3FF,buff,link
-105,KeyWord/Mist,迷雾,KeyWordDes/Mist,在迷雾中的部件无法直接装载与选中。迷雾位置固定，不会随着飞船的移动而改变。,#FF8B25,,
-106,KeyWord/Permission,访问许可,KeyWordDes/Permission,可被敌方装载能量。,#54CF54,buff,accessible
+105,KeyWord/Mist,迷雾,KeyWordDes/Mist,在迷雾中的部件无法装载手牌能量与选中。迷雾位置固定，不会随着飞船的移动而改变。,#FF8B25,,
+106,KeyWord/Permission,访问许可,KeyWordDes/Permission,可被玩家装载能量。,#54CF54,buff,accessible
 107,KeyWord/Corrupt,腐化,KeyWordDes/Corrupt,回合开始时，受到1点伤害。,#883FCE,buff,corrupt
 201,KeyWord/SecretTreasure,秘宝,KeyWordDes/SecretTreasure,战斗结束后，获得1个随机宝物，失败：移除此状态。,#EEDD82,buff,treasure
-202,KeyWord/UnitTest,部件测试,KeyWordDes/UnitTest,装载3次该部件后，将在战斗结束时获得该部件。,#3D6DCC,buff,unittest
-203,KeyWord/ShopLocation,折跃定位,KeyWordDes/ShopLocation,战斗结束后，若还有折跃定位存在则获得1次进入商店的机会。换位后，移除所有折跃定位。,#CF4257,buff,shop_location
+202,KeyWord/UnitTest,部件测试,KeyWordDes/UnitTest,装载3个能量后，将在战斗结束时获得该部件。,#3D6DCC,buff,unittest
+203,KeyWord/ShopLocation,折跃定位,KeyWordDes/ShopLocation,参与换位后，移除所有折跃定位。,#CF4257,buff,shop_location
 204,KeyWord/CheckLoad,协会检修,KeyWordDes/CheckLoad,回合结束时，若该部件没有装载手牌能量，则获得8星币。第3回合开始时，移除此状态。,#67DEF2,buff,check_load
 1002,KeyWord/Near,相邻,,,#FF8B25,location,around
 1003,KeyWord/Device,辅助部件,,,#51FF59,,
+1003,KeyWord/X,X,,,#F4FF58,,
 1004,KeyWord/Cannon,攻击部件,,,#FF5951,,
 1007,KeyWord/Both,双方,,,#FF8B25,,
 1010,KeyWord/Front,前方,,,#FF8B25,location,front
--- a/csv/pilot/Pilot
+++ b/csv/pilot/Pilot
@@ -42,3 +42,4 @@ int,string,void,string,void,int[],string,void,int,int,int,int,bool,string,void,s
 10042,PilotTitle/10042,ESTP,PilotName/10042,乘风,;7;;77;;;,PilotDes/10042,乘风作为兽族中的SSR种——熊猫族，几乎受到所有生物的喜欢，ESTP性格的他随随便便就能交到朋友。,2,64,50042,2,,Sprites/Head/monster_panda,首领战斗结束后，获得1次固有天赋2选1的机会。,PM_10042
 10043,PilotTitle/10043,黑客,PilotName/10043,暗影,;7;;77;;;,PilotDes/10043,有一次天才黑客暗影意外黑进了一个从未见过的资料库，在随意修改了几个参数之后，她发现整个世界的规则都变了。,0,70,50043,2,,Sprites/Head/human_hacker,在第1/2/3个星系中，随机部件和宝物时，稀有度强制变为普通/稀有/传说，且没有数量限制。,PM_10043
 10044,PilotTitle/10044,意外产物,PilotName/10044,柯尔,;7;;77;;;,PilotDes/10044,柯尔曾被智械神教的极端分子改造过，被植入了一套源代码之后，时间在他身上似乎不再稳定。,2,51,50044,2,,Sprites/Head/monster_raccoon,第1回合对波结束后会额外进行1次对波。,PM_10044
+10045,PilotTitle/10045,强迫症,PilotName/10045,GR1D,;77;;;,PilotDes/10045,GR1D是名强大的赏金猎人，如果你有幸同他合作，一定记住！在离开飞船前将所有东西放回原位。原位！,1,61,50045,2,,Sprites/Head/robot_OCD,每回合额外生成2个能量，手牌能量只能装载对应颜色的槽位。,PM_10045
--- a/csv/shipunit/ShipUnit
+++ b/csv/shipunit/ShipUnit
@@ -52,20 +52,20 @@ int,string,void,int,string,void,int,int,int[],bool,int,int[],int[],int,int,int,s
 11805,Name/11805_2,能量枢纽+,2,Text/11805,能量传输,0,0,,,0,;7;;;,;1;;;,,,1,Des/11805_1,装载后，使所有相邻部件装载1个[白色{0}点]能量。,,;3;;1;;;,,,2,Support_Player/Skill_LinkPassPower,device_gear,
 11806,Name/11806_1,扩散之环,1,Text/11806,扩散,0,0,,,0,;7;;;,;2;;;,,,1,Des/11806_1,装载后，使所有攻击部件获得{0}点威力。,,;2;;;,,,2,Support_Player/Skill_LoadedAllPowerPurple,device_diffusion_ring,DiffusionRing
 11806,Name/11806_2,扩散之环+,2,Text/11806,扩散,0,0,,,0,;7;;;,;3;;2;;;,,,1,Des/11806_1,装载后，使所有攻击部件获得{0}点威力。,,;2;;;,,,2,Support_Player/Skill_LoadedAllPowerPurple,device_diffusion_ring,DiffusionRing
-11807,Name/11807_1,单次供能器,1,Text/11807,单次供能,0,0,;9;;;,,0,;7;;;,,,,1,Des/11807_1,第2回合开始时，生成1个[白色9点]能量。,,;1;;;,,,2,Support_Player/Skill_CreatePowerRound2,device_once_energy,OnceEnergy
-11807,Name/11807_2,单次供能器+,2,Text/11807,单次供能,0,0,;9;;;,,0,;7;;;,,,,1,Des/11807_2,第2回合开始时，生成1个[橙色9点]能量。,,;3;;;,,,2,Support_Player/Skill_CreatePowerRound2,device_once_energy,OnceEnergy
+11807,Name/11807_1,单次供能器,1,Text/11807,单次供能,0,0,;9;;;,,0,;7;;;,,,,1,Des/11807_1,第2回合开始时，生成1个[白色9点]能量。,,;1;;;,,,2,Support_Player/Skill_CreatePowerRound2,device_once_energy,
+11807,Name/11807_2,单次供能器+,2,Text/11807,单次供能,0,0,;9;;;,,0,;7;;;,,,,1,Des/11807_2,第2回合开始时，生成1个[橙色9点]能量。,,;3;;;,,,2,Support_Player/Skill_CreatePowerRound2,device_once_energy_2,
 11808,Name/11808_1,消减装置,1,Text/11808,消减,0,0,,,0,;7;;;,;3;;1;;;,,,1,Des/11808_1,装载后，生成1个点数降低1点的能量，并使后方攻击部件获得{0}点威力。,,;2;;;,,,2,Support_Player/Skill_ReducePointPowerUpRight,device_decrease,
 11808,Name/11808_2,消减装置+,2,Text/11808,消减,0,0,,,0,;7;;;,;1;;1;;;,,,1,Des/11808_1,装载后，生成1个点数降低1点的能量，并使后方攻击部件获得{0}点威力。,,;2;;;,,,2,Support_Player/Skill_ReducePointPowerUpRight,device_decrease,
 11809,Name/11809_1,微弱能源,1,Text/11809,微弱,0,0,,,0,;7;;;,,,,1,Des/11809_1,发动({0})：生成1个[白色{1}点]能量。,;US:1;;;,;1;;;,,,2,Support_Player/Skill_StrongGenerate,device_pure,Pure
-11809,Name/11809_2,微弱能源+,2,Text/11809,微弱,0,0,,,0,;7;;;,,,,1,Des/11809_2,发动({0})：生成1个[橙色{1}点]能量。,;US:1;;;,;1;;;,,,2,Support_Player/Skill_StrongGenerate,device_pure,Pure
+11809,Name/11809_2,微弱能源+,2,Text/11809,微弱,0,0,,,0,;7;;;,,,,1,Des/11809_2,发动({0})：生成1个[橙色{1}点]能量。,;US:1;;;,;1;;;,,,2,Support_Player/Skill_StrongGenerate,device_pure_2,Pure2
 11810,Name/11810_1,装甲熔炼器,1,Text/11810,熔炼装甲,0,0,,,0,;7;;;,,,,1,Des/11810_1,发动({0})：受到{1}点伤害，生成1个能量。,;US:1;;;,;2;;;,,,2,Support_Player/Skill_SelfDamageGenerateCore,device_armour_lighter,
 11810,Name/11810_2,装甲熔炼器+,2,Text/11810,熔炼装甲,0,0,,,0,;7;;;,,,,1,Des/11810_1,发动({0})：受到{1}点伤害，生成1个能量。,;US:1;;;,;1;;;,,,2,Support_Player/Skill_SelfDamageGenerateCore,device_armour_lighter,
 11812,Name/11812_1,增长装置,1,Text/11812,增长,0,0,,,0,;7;;;,,,,1,Des/11812_1,发动({0})：手牌中所有[白色]能量点数提升{1}点。,;US:1;;;,;1;;;,,,2,Support_Player/Skill_TurnEndPowerUp,device_turn_end_point_up,
 11812,Name/11812_2,增长装置+,2,Text/11812,增长,0,0,,,0,;7;;;,,,,1,Des/11812_1,发动({0})：手牌中所有[白色]能量点数提升{1}点。,;US:1;;;,;2;;;,,,2,Support_Player/Skill_TurnEndPowerUp,device_turn_end_point_up,
 11813,Name/11813_1,脉冲供能器,1,Text/11813,脉冲供能,0,0,,,0,;7;;;,,,,1,Des/11813_1,发动({0})：生成1个[白色{1}点]能量。,;US:3;;;,;9;;;,,,2,Support_Player/Skill_FreePurple,device_free,
-11813,Name/11813_2,脉冲供能器+,2,Text/11813,脉冲供能,0,0,,,0,;7;;;,,,,1,Des/11813_2,发动({0})：生成1个[橙色{1}点]能量。,;US:3;;;,;9;;;,,,2,Support_Player/Skill_FreePurple,device_free,
+11813,Name/11813_2,脉冲供能器+,2,Text/11813,脉冲供能,0,0,,,0,;7;;;,,,,1,Des/11813_2,发动({0})：生成1个[橙色{1}点]能量。,;US:3;;;,;9;;;,,,2,Support_Player/Skill_FreePurple,device_free_2,
 11814,Name/11814_1,回合能量装置,1,Text/11814,能量,2,0,,,0,;7;;;,,,,1,Des/11814_1,每场战斗限3次，发动({0})：生成{1}个与当前回合数相同点数的[白色]能量。,;US:0;;;,;1;;;,ExtraDes/BattleOnce,效果剩余：{0}次,2,Support_Player/Skill_TurnPower,device_round_energy_3,
-11814,Name/11814_2,回合能量装置+,2,Text/11814,能量,2,0,,,0,;7;;;,,,,1,Des/11814_2,每场战斗限3次，发动({0})：生成{1}个与当前回合数相同点数的[橙色]能量。,;US:0;;;,;1;;;,ExtraDes/BattleOnce,效果剩余：{0}次,2,Support_Player/Skill_TurnPower,device_round_energy_3,
+11814,Name/11814_2,回合能量装置+,2,Text/11814,能量,2,0,,,0,;7;;;,,,,1,Des/11814_2,每场战斗限3次，发动({0})：生成{1}个与当前回合数相同点数的[橙色]能量。,;US:0;;;,;1;;;,ExtraDes/BattleOnce,效果剩余：{0}次,2,Support_Player/Skill_TurnPower,device_round_energy_3_o,
 11815,Name/11815_1,升级装置,1,Text/11815,升级,0,1,;11;;;,,0,;7;;;,,,,1,Des/11815_1,战斗开始时，在本场战斗中升级相邻非同名部件。,,,,,2,Support_Player/Skill_AroundUnitUpgrade,device_upgrade,
 11815,Name/11815_2,升级装置+,2,Text/11815,升级,0,1,;11;;;,,0,;7;;;,,,,1,Des/11815_2,战斗开始时，在本场战斗中升级所有非同名部件。,,,,,2,Support_Player/Skill_AroundUnitUpgrade,device_upgrade,
 11816,Name/11816_1,外置油桶,1,Text/11816,临时燃料,0,1,;11;;;,,0,;7;;;,,,,1,Des/11816_1,战斗开始时，在本场战斗中获得{0}点燃料。,,;2;;;,,,2,Support_Player/Skill_LoadNextMoveFree,device_fuel,
@@ -75,17 +75,17 @@ int,string,void,int,string,void,int,int,int[],bool,int,int[],int[],int,int,int,s
 11820,Name/11820_1,动能传导器,1,Text/11820,动能传导,0,1,,,0,;7;;;,,,,1,Des/11820_1,任意部件发动时，使自身后方攻击部件获得{0}点威力。,,;3;;;,,,2,Support_Player/Skill_OtherUsePowerUp,device_use_power,UsePower
 11820,Name/11820_2,动能传导器+,2,Text/11820,动能传导,0,1,,,0,;7;;;,,,,1,Des/11820_1,任意部件发动时，使自身后方攻击部件获得{0}点威力。,,;4;;;,,,2,Support_Player/Skill_OtherUsePowerUp,device_use_power,UsePower
 11821,Name/11821_1,燃料能源,1,Text/11821,能源,0,1,,,0,;7;;;,,,,1,Des/11821_1,发动({0})：消耗1点燃料，生成1个[蓝色9点]能量。,;US:1;;;,;2;;;,,,2,Support_Player/Skill_CostMoveToCore,device_fuel_energy,
-11821,Name/11821_2,燃料能源+,2,Text/11821,能源,0,1,,,0,;7;;;,,,,1,Des/11821_2,发动({0})：消耗1点燃料，生成1个[橙色9点]能量。,;US:1;;;,;3;;;,,,2,Support_Player/Skill_CostMoveToCore,device_fuel_energy,
+11821,Name/11821_2,燃料能源+,2,Text/11821,能源,0,1,,,0,;7;;;,,,,1,Des/11821_2,发动({0})：消耗1点燃料，生成1个[橙色9点]能量。,;US:1;;;,;3;;;,,,2,Support_Player/Skill_CostMoveToCore,device_fuel_energy_2,
 11822,Name/11822_1,界限突破,1,Text/11822,界限突破,0,1,;11;;;,,0,;7;;;,,,,1,Des/11822_1,战斗开始时，使所有部件的最高级颜色槽位颜色降低。,,,,,2,Support_Player/Skill_DegradeAroundSlotColor,device_slot_color_down,
 11822,Name/11822_2,界限突破+,2,Text/11822,界限突破,0,1,;11;;;,,0,;7;;;,,,,1,Des/11822_2,战斗开始时，使所有部件的所有槽位颜色降低。,,,,,2,Support_Player/Skill_DegradeAroundSlotColor,device_slot_color_down,
 11823,Name/11823_1,四向外接口,1,Text/11823,外接,0,1,;11;;;,,0,;7;;;,,,,1,Des/11823_1,战斗开始时，使相邻攻击部件额外获得1个[橙色]槽位。,,;3;;;,,,2,Support_Player/Skill_AddPurpleSlot,device_orange_slot,
-11823,Name/11823_2,四向外接口+,2,Text/11823,外接,0,1,;11;;;,,0,;7;;;,,,,1,Des/11823_2,战斗开始时，使相邻攻击部件额外获得1个[蓝色]槽位。,,;2;;;,,,2,Support_Player/Skill_AddPurpleSlot,device_orange_slot,
+11823,Name/11823_2,四向外接口+,2,Text/11823,外接,0,1,;11;;;,,0,;7;;;,,,,1,Des/11823_2,战斗开始时，使相邻攻击部件额外获得1个[蓝色]槽位。,,;2;;;,,,2,Support_Player/Skill_AddPurpleSlot,device_orange_slot_2,
 11824,Name/11824_1,能量放大器,1,Text/11824,放大,0,2,,,0,;7;;;,;2;;;,,,1,Des/11824_1,装载后，生成1个点数翻倍的能量。,,,,,2,Support_Player/Skill_DoublePoint,device_double_point,
 11824,Name/11824_2,能量放大器+,2,Text/11824,放大,0,2,,,0,;7;;;,;3;;2;;;,,,1,Des/11824_1,装载后，生成1个点数翻倍的能量。,,,,,2,Support_Player/Skill_DoublePoint,device_double_point,
 11825,Name/11825_1,模拟器,1,Text/11825,模拟,3,2,;11;;;,,0,;7;;;,;2;;2;;;,,,1,Des/11825_1,战斗开始时，自身技能变为前方辅助部件的技能。,,,,,2,Support_Player/Skill_Imitation,device_copy,DeviceCopy
 11825,Name/11825_2,模拟器+,2,Text/11825,模拟,3,2,;11;;;,,0,;7;;;,;2;;1;;;,,,1,Des/11825_1,战斗开始时，自身技能变为前方辅助部件的技能。,,,,,2,Support_Player/Skill_Imitation,device_copy,DeviceCopy
 11826,Name/11826_1,外接槽位,1,Text/11826,外接槽位,0,2,;11;;;,,0,;7;;;,,,,1,Des/11826_1,战斗开始时，使前方部件获得1个[橙色]槽位和1个[蓝色]槽位。,,;3;;2;;;,,,2,Support_Player/Skill_CreateSlotFront,device_extra_slot,
-11826,Name/11826_2,外接槽位+,2,Text/11826,外接槽位,0,2,;11;;;,,0,;7;;;,,,,1,Des/11826_2,战斗开始时，使前方部件获得1个[蓝色]槽位和1个[白色]槽位。,,;2;;1;;;,,,2,Support_Player/Skill_CreateSlotFront,device_extra_slot,
+11826,Name/11826_2,外接槽位+,2,Text/11826,外接槽位,0,2,;11;;;,,0,;7;;;,,,,1,Des/11826_2,战斗开始时，使前方部件获得1个[蓝色]槽位和1个[白色]槽位。,,;2;;1;;;,,,2,Support_Player/Skill_CreateSlotFront,device_extra_slot_2,
 11827,Name/11827_1,重影匕首,1,Text/11827,重影,0,2,,,0,;7;;;,,,,1,Des/11827_1,使后方部件装载[白色]能量时，额外装载{0}个相同的能量。,,;1;;;,,,2,Support_Player/Skill_WhiteLoadTimes,device_phantom_dagger,
 11827,Name/11827_2,重影匕首+,2,Text/11827,重影,0,2,,,0,;7;;;,,,,1,Des/11827_1,使后方部件装载[白色]能量时，额外装载{0}个相同的能量。,,;2;;;,,,2,Support_Player/Skill_WhiteLoadTimes,device_phantom_dagger_2,
 11828,Name/11828_1,漂白装置,1,Text/11828,漂白,4,1,,,0,;7;;;,,,,1,Des/11828_1,发动({0})：手牌中所有[橙色]/[蓝色]的能量点数提升[{1}点]/[{2}点]，颜色变为[白色]。,;US:1;;;,;2;;1;;;,,,2,Support_Player/Skill_HandToWhite,device_bleach,
@@ -94,11 +94,11 @@ int,string,void,int,string,void,int,int,int[],bool,int,int[],int[],int,int,int,s
 ,,,,,,,,,,,,,,,,,,,,,,,,,
 12001,Name/12001_1,数据检测者,1,Text/12001,检测通过,0,0,,,0,;7;;;,;3;;1;;;,,,1,Des/12001_1,战斗中第1次装载某点数的能量时，获得{0}点功率。,,;1;;;,ExtraDes/12001_1,已装载：{0}。,1,Cannon_Player/Skill_LikeNewCannonNew,cannon_hate_old,Like_New
 12001,Name/12001_2,数据检测者+,2,Text/12001,检测通过,0,0,,,0,;7;;;,;1;;1;;;,,,1,Des/12001_1,战斗中第1次装载某点数的能量时，获得{0}点功率。,,;1;;;,ExtraDes/12001_1,已装载：{0}。,1,Cannon_Player/Skill_LikeNewCannonNew,cannon_hate_old,Like_New
-12003,Name/12003_1,青铜核心,1,Text/Empty,,0,0,,,0,;7;;;,;1;;;,-1,-30,1,Des/12003_1,在战斗中拥有{0}点功率，可升级{1}次。,;PA:2;;;,;4;;;,,,1,Cannon_Player/Skill_Null,cannon_upgrade_1,
-12003,Name/12003_2,白银核心,2,Text/Empty,,0,0,,,0,;7;;;,;1;;1;;;,-1,-30,1,Des/12003_1,在战斗中拥有{0}点功率，可升级{1}次。,;PA:4;;;,;3;;;,,,1,Cannon_Player/Skill_Null,cannon_upgrade_2,
-12003,Name/12003_3,黄金核心,3,Text/Empty,,0,0,,,0,;7;;;,;1;;1;;1;;;,-1,-30,1,Des/12003_1,在战斗中拥有{0}点功率，可升级{1}次。,;PA:7;;;,;2;;;,,,1,Cannon_Player/Skill_Null,cannon_upgrade_3,
-12003,Name/12003_4,白金核心,4,Text/Empty,,0,0,,,0,;7;;;,;1;;1;;1;;1;;;,-1,-30,1,Des/12003_1,在战斗中拥有{0}点功率，可升级{1}次。,;PA:11;;;,;1;;;,,,1,Cannon_Player/Skill_Null,cannon_upgrade_4,
-12003,Name/12003_5,钻石核心,5,Text/Empty,,0,0,,,0,;7;;;,;1;;1;;1;;1;;1;;;,-1,-30,1,Des/12003_2,在战斗中拥有{0}点功率，不可升级。,;PA:16;;;,,,,1,Cannon_Player/Skill_Null,cannon_upgrade_5,
+12003,Name/12003_1,青铜核心,1,Text/Empty,,0,0,,,0,;7;;;,;1;;;,-1,-30,1,Des/12003_1,拥有{0}点功率，可升级{1}次。,;PA:2;;;,;4;;;,,,1,Cannon_Player/Skill_Null,cannon_upgrade_1,
+12003,Name/12003_2,白银核心,2,Text/Empty,,0,0,,,0,;7;;;,;1;;1;;;,-1,-30,1,Des/12003_1,拥有{0}点功率，可升级{1}次。,;PA:4;;;,;3;;;,,,1,Cannon_Player/Skill_Null,cannon_upgrade_2,
+12003,Name/12003_3,黄金核心,3,Text/Empty,,0,0,,,0,;7;;;,;1;;1;;1;;;,-1,-30,1,Des/12003_1,拥有{0}点功率，可升级{1}次。,;PA:7;;;,;2;;;,,,1,Cannon_Player/Skill_Null,cannon_upgrade_3,
+12003,Name/12003_4,白金核心,4,Text/Empty,,0,0,,,0,;7;;;,;1;;1;;1;;1;;;,-1,-30,1,Des/12003_1,拥有{0}点功率，可升级{1}次。,;PA:11;;;,;1;;;,,,1,Cannon_Player/Skill_Null,cannon_upgrade_4,
+12003,Name/12003_5,钻石核心,5,Text/Empty,,0,0,,,0,;7;;;,;1;;1;;1;;1;;1;;;,-1,-30,1,Des/12003_2,拥有{0}点功率，不可升级。,;PA:16;;;,,,,1,Cannon_Player/Skill_Null,cannon_upgrade_5,
 12004,Name/12004_1,动能核心,1,Text/12004,动能,0,1,,,0,;7;;;,;2;;;,,,1,Des/12004_1,任意部件发动时，获得1点功率。,,,,,1,Cannon_Player/Skill_OtherUseAdded,cannon_use_poweradd,UsePoweradd
 12004,Name/12004_2,动能核心+,2,Text/12004,动能,0,1,,,0,;7;;;,;1;;;,,,1,Des/12004_1,任意部件发动时，获得1点功率。,,,,,1,Cannon_Player/Skill_OtherUseAdded,cannon_use_poweradd,UsePoweradd
 12005,Name/12005_1,提升核心,1,Text/12005,提升,0,0,,,0,;7;;;,;1;;;,,,1,Des/12005_1,发动({0})：获得{1}点功率。,;US:2;;;,;2;;;,,,1,Cannon_Player/Skill_TurnPowerOnce,cannon_promote,Promote
@@ -107,10 +107,10 @@ int,string,void,int,string,void,int,int,int[],bool,int,int[],int[],int,int,int,s
 12007,Name/12007_2,集气核心+,2,Text/12007,集气,0,0,,,0,;7;;;,;1;;;,,,1,Des/12007_2,任意部件生成能量时，自身获得{0}点威力。,,;1;;;,,,1,Cannon_Player/Skill_CreatePowerSelfPower,cannon_vitality,
 12008,Name/12008_1,双刃战斧,1,Text/12008,双刃,0,2,,,0,;7;;;,;1;;;,,,1,Des/12008_1,获得的功率翻倍。,,,,,1,Cannon_Player/Skill_AddedDouble,cannon_axe,
 12008,Name/12008_2,双刃战斧+,2,Text/12008,双刃,0,2,,,0,;7;;;,;1;;1;;;,,,1,Des/12008_1,获得的功率翻倍。,,,,,1,Cannon_Player/Skill_AddedDouble,cannon_axe,
-12009,Name/12009_1,增殖核心,1,Text/12009,增殖,5,1,,,0,;7;;;,;1;;;,,,1,Des/12009_1,在战斗中拥有{0}点功率，装载后，在相邻空位装备增殖核心。,;PA:1;;;,,,,1,Cannon_Player/Skill_OpenFlower,cannon_proliferation,
-12009,Name/12009_2,增殖核心+,2,Text/12009,增殖,5,1,,,0,;7;;;,;1;;;,,,1,Des/12009_2,在战斗中拥有{0}点功率，装载后，在相邻空位装备增殖核心+。,;PA:2;;;,,,,1,Cannon_Player/Skill_OpenFlower,cannon_proliferation,
+12009,Name/12009_1,增殖核心,1,Text/12009,增殖,5,1,,,0,;7;;;,;1;;;,,,1,Des/12009_1,拥有{0}点功率，装载后，在相邻空位装备增殖核心。,;PA:1;;;,,,,1,Cannon_Player/Skill_OpenFlower,cannon_proliferation,
+12009,Name/12009_2,增殖核心+,2,Text/12009,增殖,5,1,,,0,;7;;;,;1;;;,,,1,Des/12009_2,拥有{0}点功率，装载后，在相邻空位装备增殖核心+。,;PA:2;;;,,,,1,Cannon_Player/Skill_OpenFlower,cannon_proliferation,
 12010,Name/12010_1,利刃,1,Text/12010,利刃,0,1,,,0,;7;;;,;1;;1;;;,,,1,Des/12010_1,装载的每个能量都能触发功率加成。,,,,,1,Cannon_Player/Skill_AddedEveryOne,cannon_blade,
-12010,Name/12010_2,利刃+,2,Text/12010,利刃,0,1,,,0,;7;;;,;2;;1;;1;;;,,,1,Des/12010_1,装载的每个能量都能触发功率加成。,,,,,1,Cannon_Player/Skill_AddedEveryOne,cannon_blade,
+12010,Name/12010_2,利刃+,2,Text/12010,利刃,0,1,,,0,;7;;;,;2;;1;;1;;;,,,1,Des/12010_1,装载的每个能量都能触发功率加成。,,,,,1,Cannon_Player/Skill_AddedEveryOne,cannon_blade_2,
 ,,,,,,,,,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,,,,,,,
 12801,Name/12801_1,供电模组,1,Text/12801,供电,0,0,;11;;;,,0,;7;;;,,,,1,Des/12801_1,战斗开始时，使前方攻击部件获得{0}点功率。,,;3;;;,,,2,Support_Player/Skill_FrontAddedPowerBattleStart,device_poweradd_module,
@@ -161,8 +161,8 @@ int,string,void,int,string,void,int,int,int[],bool,int,int[],int[],int,int,int,s
 14002,Name/14002_2,三棱核心+,2,Text/14002,三棱,0,1,;8;;;,,0,;7;;;,;2;;1;;;,,,1,Des/14002_1,三重：获得{0}点功率。,,;4;;;,,,1,Cannon_Player/Skill_TrianglePowerCannon,cannon_triangle,
 14004,Name/14004_1,核能聚集器,1,Text/14004,核能聚集,0,2,;8;;;,,0,;7;;;,;3;;1;;;,,,1,Des/14004_1,三重：获得威力翻倍。,,,,,1,Cannon_Player/Skill_TriangleDoublePowerCannon,cannon_trebling_double,TreblingDouble
 14004,Name/14004_2,核能聚集器+,2,Text/14004,核能聚集,0,2,;8;;;,,0,;7;;;,;1;;1;;;,,,1,Des/14004_1,三重：获得威力翻倍。,,,,,1,Cannon_Player/Skill_TriangleDoublePowerCannon,cannon_trebling_double,TreblingDouble
-14005,Name/14005_1,过载核心,1,Text/14005,过载,0,2,;8;;;,FALSE,0,;7;;;,;1;;;,,,1,Des/14005_1,在战斗中拥有{0}点功率，三重：使自身功率翻倍，每场战斗仅生效1次。,;PA:2;;;,,,,1,Cannon_Player/Skill_TriangleOncePowerAddedDouble,cannon_overload,Overload
-14005,Name/14005_2,过载核心+,2,Text/14005,过载,0,2,;8;;;,FALSE,0,;7;;;,;1;;;,,,1,Des/14005_1,在战斗中拥有{0}点功率，三重：使自身功率翻倍，每场战斗仅生效1次。,;PA:3;;;,,,,1,Cannon_Player/Skill_TriangleOncePowerAddedDouble,cannon_overload,Overload
+14005,Name/14005_1,过载核心,1,Text/14005,过载,0,2,;8;;;,FALSE,0,;7;;;,;1;;;,,,1,Des/14005_1,拥有{0}点功率，三重：使自身功率翻倍，每场战斗仅生效1次。,;PA:2;;;,,,,1,Cannon_Player/Skill_TriangleOncePowerAddedDouble,cannon_overload,Overload
+14005,Name/14005_2,过载核心+,2,Text/14005,过载,0,2,;8;;;,FALSE,0,;7;;;,;1;;;,,,1,Des/14005_1,拥有{0}点功率，三重：使自身功率翻倍，每场战斗仅生效1次。,;PA:3;;;,,,,1,Cannon_Player/Skill_TriangleOncePowerAddedDouble,cannon_overload,Overload
 14006,Name/14006_1,契约核心,1,Text/14006,契约,5,2,;8;;;,,0,;7;;;,;3;;2;;1;;;,,,1,Des/14006_1,三重：本回合接下来自身装载的所有能量点数将视为9点。,,,,,1,Cannon_Player/Skill_TriangleAsNineLoad,cannon_contract,Contract
 14006,Name/14006_2,契约核心+,2,Text/14006,契约,5,2,;8;;;,,0,;7;;;,;2;;1;;1;;;,,,1,Des/14006_1,三重：本回合接下来自身装载的所有能量点数将视为9点。,,,,,1,Cannon_Player/Skill_TriangleAsNineLoad,cannon_contract,Contract
 14007,Name/14007_1,进化核心,1,Text/14007,进化,0,0,;8;;;,,0,;7;;;,;3;;1;;1;;;,,,1,Des/14007_1,装载后，获得{0}点威力。三重：该效果获得的威力提升{1}点。,;DY:1;;;,;1;;;,,,1,Cannon_Player/Skill_TriangleAddedAsHandCount,cannon_evolve,CannonEvolve
@@ -237,8 +237,8 @@ int,string,void,int,string,void,int,int,int[],bool,int,int[],int[],int,int,int,s
 21028,Name/21028_2,吞噬者+,2,Text/21028,吞噬,0,1,,,0,;77;;;,;2;;2;;;,,,1,Des/21028_1,装载后，摧毁前方部件。任意部件被摧毁后，获得{0}点功率。,,;3;;;,,,1,Cannon_Player/Skill_DestroyFronAdded,cannon_devourer,CannonDevourer
 21029,Name/21029_1,橙之双匕,1,Text/21029,橙之双匕,0,2,,,0,;77;;;,;1;;1;;1;;;,,,1,Des/21029_1,装载[橙色]能量时，额外装载1个相同的能量。,,,,,1,Cannon_Player/Skill_OrangeBlade,cannon_orange_dagger,OrangeDagger
 21029,Name/21029_2,橙之双匕+,2,Text/21029,橙之双匕,0,2,,,0,;77;;;,;1;;1;;1;;1;;;,,,1,Des/21029_1,装载[橙色]能量时，额外装载1个相同的能量。,,,,,1,Cannon_Player/Skill_OrangeBlade,cannon_orange_dagger,OrangeDagger
-21030,Name/21030_1,无尽核心,1,Text/21030,无尽,0,1,,,0,;77;;;,;1;;;,,,1,Des/21030_1,当手牌中最后1个能量被装载时，获得{0}点威力。,,;2;;;,,,1,Cannon_Player/Skill_InfCannon,cannon_void,Void
-21030,Name/21030_2,无尽核心+,2,Text/21030,无尽,0,1,,,0,;77;;;,;1;;;,,,1,Des/21030_1,当手牌中最后1个能量被装载时，获得{0}点威力。,,;3;;;,,,1,Cannon_Player/Skill_InfCannon,cannon_void,Void
+21030,Name/21030_1,无尽核心,1,Text/21030,无尽,0,1,,,0,;77;;;,;1;;;,,,1,Des/21030_1,当手牌中最后1个能量被装载至任意部件时，获得{0}点威力。,,;2;;;,,,1,Cannon_Player/Skill_InfCannon,cannon_void,Void
+21030,Name/21030_2,无尽核心+,2,Text/21030,无尽,0,1,,,0,;77;;;,;1;;;,,,1,Des/21030_1,当手牌中最后1个能量被装载至任意部件时，获得{0}点威力。,,;3;;;,,,1,Cannon_Player/Skill_InfCannon,cannon_void,Void
 21031,Name/21031_1,兼容核心,1,Text/21031,兼容,0,0,,,0,;77;;;,;1;;1;;;,,,1,Des/21031_1,装载[1点]/[橙色]能量时，获得{0}点威力。,,;2;;;,,,1,Cannon_Player/Skill_OneOrPupleCannon,cannon_debris_swirl,DebrisSwirl
 21031,Name/21031_2,兼容核心+,2,Text/21031,兼容,0,0,,,0,;77;;;,;1;;1;;1;;;,,,1,Des/21031_1,装载[1点]/[橙色]能量时，获得{0}点威力。,,;2;;;,,,1,Cannon_Player/Skill_OneOrPupleCannon,cannon_debris_swirl,DebrisSwirl
 21032,Name/21032_1,复刻核心,1,Text/21032,复刻,0,1,,,0,;77;;;,;3;;3;;;,,,1,Des/21032_1,非同名攻击部件装载≥{0}的能量时，自身装载1个相同的能量。,,;5;;;,,,1,Cannon_Player/Skill_CopyHigherCannonLoad,cannon_clone,
@@ -286,13 +286,13 @@ int,string,void,int,string,void,int,int,int[],bool,int,int[],int[],int,int,int,s
 21845,Name/21845_1,槽位同化器,1,Text/21845,同化,0,1,,,0,;77;;;,;3;;1;;;,,,0,Des/21845_1,回合开始时，使后方部件的槽位变成与自身一致。,,,,,2,Support_Player/Skill_SetSlotSame,device_replace_slot,
 21845,Name/21845_2,槽位同化器+,2,Text/21845,同化,0,1,,,0,;77;;;,;1;;1;;;,,,0,Des/21845_1,回合开始时，使后方部件的槽位变成与自身一致。,,,,,2,Support_Player/Skill_SetSlotSame,device_replace_slot,
 21846,Name/21846_1,爆破手雷,1,Text/21846,爆破,3,0,,,0,;77;;;,,-1,,0,Des/21846_1,换位时，摧毁与自身换位的部件，并生成1个[白色6点]能量。,,;1;;;,,,2,Support_Player/Skill_ExchangeDestroyCreate,device_front_explode,
-21846,Name/21846_2,爆破手雷+,2,Text/21846,爆破,3,0,,,0,;77;;;,,-1,,0,Des/21846_2,换位时，摧毁与自身换位的部件，并生成1个[橙色6点]能量。,,;3;;;,,,2,Support_Player/Skill_ExchangeDestroyCreate,device_front_explode,
+21846,Name/21846_2,爆破手雷+,2,Text/21846,爆破,3,0,,,0,;77;;;,,-1,,0,Des/21846_2,换位时，摧毁与自身换位的部件，并生成1个[橙色6点]能量。,,;3;;;,,,2,Support_Player/Skill_ExchangeDestroyCreate,device_front_explode_2,
 21848,Name/21848_1,导流装置,1,Text/21848,导流,0,0,,,0,;77;;;,;1;;1;;;,-1,,0,Des/21848_1,装载后，使后方攻击部件获得相同点数的威力。 ,,,,,2,Support_Player/Skill_LoadAddBackPower,device_back_power,
 21848,Name/21848_2,导流装置+,2,Text/21848,导流,0,0,,,0,;77;;;,;1;;1;;1;;;,-1,,0,Des/21848_1,装载后，使后方攻击部件获得相同点数的威力。 ,,,,,2,Support_Player/Skill_LoadAddBackPower,device_back_power,
 21849,Name/21849_1,配装机,1,Text/21849,配装,0,1,,,0,;77;;;,,,,1,Des/21849_1,回合开始时，在后方空位装备1个未升级攻击部件。,,,,,2,Support_Player/Skill_EquiptLoseUnit,device_assemble_lose_unit,
 21849,Name/21849_2,配装机+,2,Text/21849,配装,0,1,,,0,;77;;;,,,,1,Des/21849_2,回合开始时，在后方空位装备1个已升级攻击部件。,,,,,2,Support_Player/Skill_EquiptLoseUnit,device_assemble_lose_unit,
 21851,Name/21851_1,双重能源,1,Text/21851,双重能源,0,0,,,0,;77;;;,,,,1,Des/21851_1,战斗开始时，生成{0}个[白色]能量。,,;2;;1;;;,,,2,Support_Player/Skill_BattleStartExtraPower,device_prepare,
-21851,Name/21851_2,双重能源+,2,Text/21851,双重能源,0,0,,,0,;77;;;,,,,1,Des/21851_2,战斗开始时，生成{0}个[橙色]能量。,,;2;;3;;;,,,2,Support_Player/Skill_BattleStartExtraPower,device_prepare,
+21851,Name/21851_2,双重能源+,2,Text/21851,双重能源,0,0,,,0,;77;;;,,,,1,Des/21851_2,战斗开始时，生成{0}个[橙色]能量。,,;2;;3;;;,,,2,Support_Player/Skill_BattleStartExtraPower,device_prepare_2,
 21852,Name/21852_1,碎裂装置,1,Text/21852,碎裂,0,1,,,0,;77;;;,;1;;;,,,1,Des/21852_1,装载后，生成与装载能量点数相同个数的[白色1点]能量，并摧毁自身。,,;1;;;,,,2,Support_Player/Skill_LoadSplitDestroy,device_fragment,Fragment
 21852,Name/21852_2,碎裂装置+,2,Text/21852,碎裂,0,1,,,0,;77;;;,;1;;;,,,1,Des/21852_2,装载后，生成与装载能量点数相同个数的[橙色1点]能量，并摧毁自身。,,;3;;;,,,2,Support_Player/Skill_LoadSplitDestroy,device_fragment,Fragment
 21853,Name/21853_1,中继器,1,Text/Empty,,5,1,,,0,;77;;;,,,,1,Des/21853_1,当作为带有方位效果的目标时，使目标变为自身上方和下方部件。,,;2;;;,,,2,Support_Player/Skill_WIFI,device_repeater,
@@ -313,10 +313,10 @@ int,string,void,int,string,void,int,int,int[],bool,int,int[],int[],int,int,int,s
 21860,Name/21860_2,跃迁装置+,2,Text/21860,跃迁,1,2,,,0,;77;;;,,,,1,Des/21860_1,后方攻击部件装载能量时，该能量点数提升{0}点。,,;3;;;,,,2,Support_Player/Skill_BackLoadPush,device_behind_plus,
 ,,,,,,,,,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,,,,,,,
-22002,Name/22002_1,残渣核心,1,Text/22002,塞入残渣,0,0,,,0,;77;;;,;1;;;,,,1,Des/22002_1,在战斗中拥有{0}点功率，战斗开始时，在本场战斗中增加1个[1点]能量原料。,;PA:4;;;,,,,1,Cannon_Player/Skill_BattleStartAddCoreOne,cannon_slag,Slag
-22002,Name/22002_2,残渣核心+,2,Text/22002,塞入残渣,0,0,,,0,;77;;;,;1;;;,,,1,Des/22002_1,在战斗中拥有{0}点功率，战斗开始时，在本场战斗中增加1个[1点]能量原料。,;PA:6;;;,,,,1,Cannon_Player/Skill_BattleStartAddCoreOne,cannon_slag,Slag
-22003,Name/22003_1,弱点透析,1,Text/22003,弱点锁定,0,0,,,0,;77;;;,;1;;;,,,1,Des/22003_1,在战斗中拥有{0}点功率，在敌方耐久归0时，功率翻倍。,;PA:2;;;,,,,1,Cannon_Player/Skill_BreakPowerUp,cannon_seek_weak,
-22003,Name/22003_2,弱点透析+,2,Text/22003,弱点锁定,0,0,,,0,;77;;;,;1;;;,,,1,Des/22003_1,在战斗中拥有{0}点功率，在敌方耐久归0时，功率翻倍。,;PA:3;;;,,,,1,Cannon_Player/Skill_BreakPowerUp,cannon_seek_weak,
+22002,Name/22002_1,残渣核心,1,Text/22002,塞入残渣,0,0,,,0,;77;;;,;1;;;,,,1,Des/22002_1,拥有{0}点功率，战斗开始时，在本场战斗中增加1个[1点]能量原料。,;PA:4;;;,,,,1,Cannon_Player/Skill_BattleStartAddCoreOne,cannon_slag,Slag
+22002,Name/22002_2,残渣核心+,2,Text/22002,塞入残渣,0,0,,,0,;77;;;,;1;;;,,,1,Des/22002_1,拥有{0}点功率，战斗开始时，在本场战斗中增加1个[1点]能量原料。,;PA:6;;;,,,,1,Cannon_Player/Skill_BattleStartAddCoreOne,cannon_slag,Slag
+22003,Name/22003_1,弱点透析,1,Text/22003,弱点锁定,0,0,,,0,;77;;;,;1;;;,,,1,Des/22003_1,拥有{0}点功率，在敌方耐久归0时，功率翻倍。,;PA:2;;;,,,,1,Cannon_Player/Skill_BreakPowerUp,cannon_seek_weak,
+22003,Name/22003_2,弱点透析+,2,Text/22003,弱点锁定,0,0,,,0,;77;;;,;1;;;,,,1,Des/22003_1,拥有{0}点功率，在敌方耐久归0时，功率翻倍。,;PA:3;;;,,,,1,Cannon_Player/Skill_BreakPowerUp,cannon_seek_weak,
 22004,Name/22004_1,橙色原核+,1,Text/22004,橙色,0,0,,,0,;77;;;,;1;;1;;;,,,1,Des/22004_1,装载[橙色]能量时，获得{0}点功率。,,;1;;;,,,1,Cannon_Player/Skill_PurpleSence,cannon_orange_poweradd,
 22004,Name/22004_2,橙色原核+,2,Text/22004,橙色,0,0,,,0,;77;;;,;1;;1;;1;;;,,,1,Des/22004_1,装载[橙色]能量时，获得{0}点功率。,,;1;;;,,,1,Cannon_Player/Skill_PurpleSence,cannon_orange_poweradd,
 22010,Name/22010_1,自增幅核心,1,Text/22010,自增幅,0,2,,,0,;77;;;,;1;;;,,,1,Des/22010_1,自身获得功率时，额外获得{0}点功率。,,;2;;;,,,1,Cannon_Player/Skill_SelfAddedExtra,cannon_self_poweradd,SelfPoweradd
@@ -369,8 +369,8 @@ int,string,void,int,string,void,int,int,int[],bool,int,int[],int[],int,int,int,s
 23808,Name/23808_1,逸散能量,1,Text/23808,逸散,0,2,;1;;;,,0,;77;;;,;2;;2;;1;;;,,,1,Des/23808_1,满载：使所有部件的[白色]空槽位装载1个[白色1点]能量。,,,,,2,Support_Player/Skill_LoadFullAllWhiteSlot,device_escape_energy,EscapeEnergy
 23808,Name/23808_2,逸散能量+,2,Text/23808,逸散,0,2,;1;;;,,0,;77;;;,;1;;1;;1;;;,,,1,Des/23808_1,满载：使所有部件的[白色]空槽位装载1个[白色1点]能量。,,,,,2,Support_Player/Skill_LoadFullAllWhiteSlot,device_escape_energy,EscapeEnergy
 ,,,,,,,,,,,,,,,,,,,,,,,,,
-24002,Name/24002_1,磁暴,1,Text/24002,磁暴,0,0,;2;;;,,0,;77;;;,;2;;1;;;,,,1,Des/24002_1,在战斗中拥有{0}点功率，充能({1})：获得当前功率的威力。,;PA:2;;CH:6;;;,,,,1,Cannon_Player/Skill_ChargePowerNowPowerAdded,cannon_double_spine,
-24002,Name/24002_2,磁暴+,2,Text/24002,磁暴,0,0,;2;;;,,0,;77;;;,;2;;1;;;,,,1,Des/24002_1,在战斗中拥有{0}点功率，充能({1})：获得当前功率的威力。,;PA:3;;CH:6;;;,,,,1,Cannon_Player/Skill_ChargePowerNowPowerAdded,cannon_double_spine,
+24002,Name/24002_1,磁暴,1,Text/24002,磁暴,0,0,;2;;;,,0,;77;;;,;2;;1;;;,,,1,Des/24002_1,拥有{0}点功率，充能({1})：获得当前功率的威力。,;PA:2;;CH:6;;;,,,,1,Cannon_Player/Skill_ChargePowerNowPowerAdded,cannon_double_spine,
+24002,Name/24002_2,磁暴+,2,Text/24002,磁暴,0,0,;2;;;,,0,;77;;;,;2;;1;;;,,,1,Des/24002_1,拥有{0}点功率，充能({1})：获得当前功率的威力。,;PA:3;;CH:6;;;,,,,1,Cannon_Player/Skill_ChargePowerNowPowerAdded,cannon_double_spine,
 24003,Name/24003_1,电光核心,1,Text/24003,电光,0,1,;2;;;,,0,;77;;;,;3;;1;;;,,,1,Des/24003_1,充能({0})：获得威力翻倍。,;CH:13;;;,,,,1,Cannon_Player/Skill_CriticalByTurn,cannon_electricity,Electricity
 24003,Name/24003_2,电光核心+,2,Text/24003,电光,0,1,;2;;;,,0,;77;;;,;3;;1;;;,,,1,Des/24003_1,充能({0})：获得威力翻倍。,;CH:11;;;,,,,1,Cannon_Player/Skill_CriticalByTurn,cannon_electricity,Electricity
 24004,Name/24004_1,电流激发核心,1,Text/24004,电流激发,0,0,;2;;;,,0,;77;;;,;2;;1;;;,,,1,Des/24004_1,充能({0})：获得{1}点威力。,;CH:12;;;,;10;;;,,,1,Cannon_Player/Skill_PowerUpByCharge,cannon_electric_green,Electric_green
@@ -415,16 +415,16 @@ int,string,void,int,string,void,int,int,int[],bool,int,int[],int[],int,int,int,s
 80003,Name/80003_2,劣质超频核心+,2,Text/80003,超频,0,0,,,2,;7;;;,;2;;1;;;,,,1,Des/80003_1,超频({0})：获得{1}点威力。,;OC:4;;;,;3;;;,,,1,Cannon_Player/Skill_OverclockPowerOverLimitLow,cannon_inferior_overclock,
 80004,Name/80004_1,反击核心,1,Text/80004,反击,0,1,,,3,;7;;77;;;,;1;;;,,,0,Des/80004_1,回合开始时，获得与上回合本列所受到伤害相同的威力。,,,,,1,Cannon_Player/Skill_StrikeBackPlayer,cannon_strike_back,CannonStrikeBackPlayer
 80004,Name/80004_2,反击核心+,2,Text/80004,反击,0,1,,,3,;7;;77;;;,;1;;1;;;,,,0,Des/80004_1,回合开始时，获得与上回合本列所受到伤害相同的威力。,,,,,1,Cannon_Player/Skill_StrikeBackPlayer,cannon_strike_back,CannonStrikeBackPlayer
-80005,Name/80005_1,跳蛙核心,1,Text/80005,跳蛙,0,1,,,3,;7;;77;;;,;1;;;,,,1,Des/80005_1,在战斗中拥有{0}点功率，对波失败：若自身为最前方的部件，则使自身功率翻倍并随机转移至1个攻击部件，并摧毁自身。,;PA:2;;;,,,,1,Cannon_Player/Skill_JumpFrogPlayer,cannon_frog,Frog
-80005,Name/80005_2,跳蛙核心+,2,Text/80005,跳蛙,0,1,,,3,;7;;77;;;,;1;;;,,,1,Des/80005_1,在战斗中拥有{0}点功率，对波失败：若自身为最前方的部件，则使自身功率翻倍并随机转移至1个攻击部件，并摧毁自身。,;PA:3;;;,,,,1,Cannon_Player/Skill_JumpFrogPlayer,cannon_frog,Frog
+80005,Name/80005_1,跳蛙核心,1,Text/80005,跳蛙,0,1,,,3,;7;;77;;;,;1;;;,,,1,Des/80005_1,拥有{0}点功率，对波失败：若自身为最前方的部件，则使自身功率翻倍并随机转移至1个攻击部件，并摧毁自身。,;PA:2;;;,,,,1,Cannon_Player/Skill_JumpFrogPlayer,cannon_frog,Frog
+80005,Name/80005_2,跳蛙核心+,2,Text/80005,跳蛙,0,1,,,3,;7;;77;;;,;1;;;,,,1,Des/80005_1,拥有{0}点功率，对波失败：若自身为最前方的部件，则使自身功率翻倍并随机转移至1个攻击部件，并摧毁自身。,;PA:3;;;,,,,1,Cannon_Player/Skill_JumpFrogPlayer,cannon_frog,Frog
 80006,Name/80006_1,连胜核心,1,Text/80006,连胜,0,1,,,3,;7;;77;;;,;1;;;,,,1,Des/80006_1,对波胜利：获得{0}点功率。,,;1;;;,,,1,Cannon_Player/Skill_PowerUpByWin,cannon_win_poweradd,
 80006,Name/80006_2,连胜核心,2,Text/80006,连胜,0,1,,,3,;7;;77;;;,;1;;;,,,1,Des/80006_1,对波胜利：获得{0}点功率。,,;2;;;,,,1,Cannon_Player/Skill_PowerUpByWin,cannon_win_poweradd,
 80007,Name/80007_1,终结者,1,Text/80007,终结,0,2,,,3,;7;;77;;;,;1;;;,,,1,Des/80007_1,当终结者为唯一一种存在的部件时，额外拥有{0}点威力。,,;77;;;,,,1,Cannon_Player/Skill_SnapLastPlayer,cannon_terminator,
 80007,Name/80007_2,终结者+,2,Text/80007,终结,0,2,,,3,;7;;77;;;,;1;;;,,,1,Des/80007_1,当终结者为唯一一种存在的部件时，额外拥有{0}点威力。,,;99;;;,,,1,Cannon_Player/Skill_SnapLastPlayer,cannon_terminator,
 80008,Name/80008_1,狂暴核心,1,Text/80008,狂暴,0,1,,,3,;7;;77;;;,;1;;1;;;,,,1,Des/80008_1,计时({0})：获得威力翻倍。,;CD:3;;;,,,,1,Cannon_Player/Skill_CriticalCannonPlayer,cannon_crit,
 80008,Name/80008_2,狂暴核心+,2,Text/80008,狂暴,0,1,,,3,;7;;77;;;,;1;;1;;;,,,1,Des/80008_1,计时({0})：获得威力翻倍。,;CD:2;;;,,,,1,Cannon_Player/Skill_CriticalCannonPlayer,cannon_crit,
-80009,Name/80009_1,受损的恐怖骨刺,1,Text/80009,恐怖,0,2,,,3,;7;;77;;;,;3;;;,,,1,Des/80009_1,在战斗中拥有{0}点功率，对波失败：若本回合自身装载过能量，自身功率翻倍。,;PA:1;;;,,,,1,Cannon_Player/Skill_LoseDoubleAddedPlayer,cannon_fishbone,
-80009,Name/80009_2,受损的恐怖骨刺+,2,Text/80009,恐怖,0,2,,,3,;7;;77;;;,;1;;;,,,1,Des/80009_1,在战斗中拥有{0}点功率，对波失败：若本回合自身装载过能量，自身功率翻倍。,;PA:1;;;,,,,1,Cannon_Player/Skill_LoseDoubleAddedPlayer,cannon_fishbone,
+80009,Name/80009_1,受损的恐怖骨刺,1,Text/80009,恐怖,0,2,,,3,;7;;77;;;,;3;;;,,,1,Des/80009_1,拥有{0}点功率，对波失败：若本回合自身装载过能量，自身功率翻倍。,;PA:1;;;,,,,1,Cannon_Player/Skill_LoseDoubleAddedPlayer,cannon_fishbone,
+80009,Name/80009_2,受损的恐怖骨刺+,2,Text/80009,恐怖,0,2,,,3,;7;;77;;;,;1;;;,,,1,Des/80009_1,拥有{0}点功率，对波失败：若本回合自身装载过能量，自身功率翻倍。,;PA:1;;;,,,,1,Cannon_Player/Skill_LoseDoubleAddedPlayer,cannon_fishbone,
 80010,Name/80010_1,观者之眼,1,Text/Empty,,0,2,,,3,;7;;77;;;,;1;;;,,,1,Des/80010_1,同列敌我双方所有攻击部件拥有威力翻倍。,,,,,1,Cannon_Player/Skill_LineAllDouble,cannon_viewer_eye,
 80010,Name/80010_2,观者之眼+,2,Text/Empty,,0,2,,,3,;7;;77;;;,;1;;1;;;,,,1,Des/80010_1,同列敌我双方所有攻击部件拥有威力翻倍。,,,,,1,Cannon_Player/Skill_LineAllDouble,cannon_viewer_eye,
 ,,,,,,,,,,,,,,,,,,,,,,,,,
@@ -534,27 +534,27 @@ int,string,void,int,string,void,int,int,int[],bool,int,int[],int[],int,int,int,s
 91037,Name/91037_1,复制核心,1,Text/91037,复制,0,2,,FALSE,5,,;3;;2;;1;;;,,,1,Des/91037_1,当敌方装载能量时，自身装载相同能量。,,,,,1,Cannon_Enemy/Skill_CopyEnemyLoad,cannon_copy,Copy
 91039,Name/91039_1,黄金核心,1,Text/Empty,,0,2,,FALSE,5,,;1;;1;;;,,,1,Des/91039_1,若敌方威力为0，则拥有{0}点威力。,,;2;;;,,,1,Cannon_Enemy/Skill_PowerDoubleWhenEnemyNoPower,cannon_gold,
 91041,Name/91041_1,纵斩核心,1,Text/91041,纵斩,0,2,,FALSE,5,,;1;;1;;1;;;,,,1,Des/91041_1,仅在纵斩模式下激活。,,,,,1,Cannon_Enemy/Skill_TransferTrueCannon,cannon_slash_vertical,Slash_vertical
-91041,Name/91041_2,纵斩核心+,2,Text/91041,纵斩,0,2,,FALSE,5,,;1;;1;;1;;1;;;,,,1,Des/91041_2,在战斗中拥有{0}点功率，仅在纵斩模式下激活。,;PA:30;;;,,,,1,Cannon_Enemy/Skill_TransferTrueCannon,cannon_slash_vertical,Slash_vertical
+91041,Name/91041_2,纵斩核心+,2,Text/91041,纵斩,0,2,,FALSE,5,,;1;;1;;1;;1;;;,,,1,Des/91041_2,拥有{0}点功率，仅在纵斩模式下激活。,;PA:30;;;,,,,1,Cannon_Enemy/Skill_TransferTrueCannon,cannon_slash_vertical,Slash_vertical
 91042,Name/91042_1,甲壳吸收核心,1,Text/91042,吸收,0,1,,FALSE,5,,;1;;1;;1;;;,,,1,Des/91042_1,对波结束时，敌方同列部件每有1个钳制，自身获得{0}点功率。,,;1;;;,,,1,Cannon_Enemy/Skill_DoubleDamageCannon,cannon_crab,
 91042,Name/91042_2,甲壳吸收核心+,2,Text/91042,吸收,0,1,,FALSE,5,,;1;;1;;1;;;,,,1,Des/91042_1,对波结束时，敌方同列部件每有1个钳制，自身获得{0}点功率。,,;2;;;,,,1,Cannon_Enemy/Skill_DoubleDamageCannon,cannon_crab,
 91044,Name/91044_1,横斩核心,1,Text/91044,横斩,0,2,,FALSE,5,,;1;;1;;;,,,1,Des/91044_1,仅在横斩模式下激活。,,;1;;;,,,1,Cannon_Enemy/Skill_TransferFalseCannon,cannon_slash_horizontal_1,Slash_horizontal_1
-91044,Name/91044_2,横斩核心+,2,Text/91044,横斩,0,2,,FALSE,5,,;1;;1;;1;;;,,,1,Des/91044_2,在战斗中拥有{0}点功率，仅在横斩模式下激活。,;PA:10;;;,;1;;;,,,1,Cannon_Enemy/Skill_TransferFalseCannon,cannon_slash_horizontal_1,Slash_horizontal_1
+91044,Name/91044_2,横斩核心+,2,Text/91044,横斩,0,2,,FALSE,5,,;1;;1;;1;;;,,,1,Des/91044_2,拥有{0}点功率，仅在横斩模式下激活。,;PA:10;;;,;1;;;,,,1,Cannon_Enemy/Skill_TransferFalseCannon,cannon_slash_horizontal_1,Slash_horizontal_1
 91045,Name/91045_1,横斩核心,1,Text/91045,横斩,0,2,,FALSE,5,,;1;;1;;;,,,1,Des/91044_1,仅在横斩模式下激活。,,;2;;;,,,1,Cannon_Enemy/Skill_TransferFalseCannon,cannon_slash_horizontal_2,Slash_horizontal_2
-91045,Name/91045_2,横斩核心+,2,Text/91045,横斩,0,2,,FALSE,5,,;1;;1;;1;;;,,,1,Des/91044_2,在战斗中拥有{0}点功率，仅在横斩模式下激活。,;PA:10;;;,;2;;;,,,1,Cannon_Enemy/Skill_TransferFalseCannon,cannon_slash_horizontal_2,Slash_horizontal_2
+91045,Name/91045_2,横斩核心+,2,Text/91045,横斩,0,2,,FALSE,5,,;1;;1;;1;;;,,,1,Des/91044_2,拥有{0}点功率，仅在横斩模式下激活。,;PA:10;;;,;2;;;,,,1,Cannon_Enemy/Skill_TransferFalseCannon,cannon_slash_horizontal_2,Slash_horizontal_2
 91046,Name/91046_1,横斩核心,1,Text/91046,横斩,0,2,,FALSE,5,,;1;;1;;;,,,1,Des/91044_1,仅在横斩模式下激活。,,;3;;;,,,1,Cannon_Enemy/Skill_TransferFalseCannon,cannon_slash_horizontal_3,Slash_horizontal_3
-91046,Name/91046_2,横斩核心+,2,Text/91046,横斩,0,2,,FALSE,5,,;1;;1;;1;;;,,,1,Des/91044_2,在战斗中拥有{0}点功率，仅在横斩模式下激活。,;PA:10;;;,;3;;;,,,1,Cannon_Enemy/Skill_TransferFalseCannon,cannon_slash_horizontal_3,Slash_horizontal_3
+91046,Name/91046_2,横斩核心+,2,Text/91046,横斩,0,2,,FALSE,5,,;1;;1;;1;;;,,,1,Des/91044_2,拥有{0}点功率，仅在横斩模式下激活。,;PA:10;;;,;3;;;,,,1,Cannon_Enemy/Skill_TransferFalseCannon,cannon_slash_horizontal_3,Slash_horizontal_3
 91047,Name/91047_1,横斩核心,1,Text/91047,横斩,0,2,,FALSE,5,,;1;;1;;;,,,1,Des/91044_1,仅在横斩模式下激活。,,;4;;;,,,1,Cannon_Enemy/Skill_TransferFalseCannon,cannon_slash_horizontal_4,Slash_horizontal_4
-91047,Name/91047_2,横斩核心+,2,Text/91047,横斩,0,2,,FALSE,5,,;1;;1;;1;;;,,,1,Des/91044_2,在战斗中拥有{0}点功率，仅在横斩模式下激活。,;PA:10;;;,;4;;;,,,1,Cannon_Enemy/Skill_TransferFalseCannon,cannon_slash_horizontal_4,Slash_horizontal_4
+91047,Name/91047_2,横斩核心+,2,Text/91047,横斩,0,2,,FALSE,5,,;1;;1;;1;;;,,,1,Des/91044_2,拥有{0}点功率，仅在横斩模式下激活。,;PA:10;;;,;4;;;,,,1,Cannon_Enemy/Skill_TransferFalseCannon,cannon_slash_horizontal_4,Slash_horizontal_4
 91048,Name/91048_1,横斩核心,1,Text/91048,横斩,0,2,,FALSE,5,,;1;;1;;;,,,1,Des/91044_1,仅在横斩模式下激活。,,;5;;;,,,1,Cannon_Enemy/Skill_TransferFalseCannon,cannon_slash_horizontal_5,Slash_horizontal_5
-91048,Name/91048_2,横斩核心+,2,Text/91048,横斩,0,2,,FALSE,5,,;1;;1;;1;;;,,,1,Des/91044_2,在战斗中拥有{0}点功率，仅在横斩模式下激活。,;PA:10;;;,;5;;;,,,1,Cannon_Enemy/Skill_TransferFalseCannon,cannon_slash_horizontal_5,Slash_horizontal_5
-91049,Name/91049_1,恐怖骨刺,1,Text/91049,恐怖,0,2,,FALSE,5,,;1;;1;;;,,,1,Des/91049_1,在战斗中拥有{0}点功率，对波失败：自身功率翻倍。,;PA:1;;;,,,,1,Cannon_Enemy/Skill_LoseDoubleAdded,cannon_fishbone,
+91048,Name/91048_2,横斩核心+,2,Text/91048,横斩,0,2,,FALSE,5,,;1;;1;;1;;;,,,1,Des/91044_2,拥有{0}点功率，仅在横斩模式下激活。,;PA:10;;;,;5;;;,,,1,Cannon_Enemy/Skill_TransferFalseCannon,cannon_slash_horizontal_5,Slash_horizontal_5
+91049,Name/91049_1,恐怖骨刺,1,Text/91049,恐怖,0,2,,FALSE,5,,;1;;1;;;,,,1,Des/91049_1,拥有{0}点功率，对波失败：自身功率翻倍。,;PA:1;;;,,,,1,Cannon_Enemy/Skill_LoseDoubleAdded,cannon_fishbone,
 91050,Name/91050_1,宝石核心,1,Text/91050,增幅,0,1,,FALSE,5,,;1;;1;;;,,,1,Des/91050_1,当被摧毁时，使其余宝石核心获得{0}点功率。,,;2;;;,,,1,Cannon_Enemy/Skill_SnapCannon,cannon_gem,
 91050,Name/91050_2,宝石核心+,2,Text/91050,增幅,0,1,,FALSE,5,,;1;;1;;;,,,1,Des/91050_1,当被摧毁时，使其余宝石核心获得{0}点功率。,,;3;;;,,,1,Cannon_Enemy/Skill_SnapCannon,cannon_gem,
 91050,Name/91050_3,宝石核心++,3,Text/91050,增幅,0,1,,FALSE,5,,;1;;1;;1;;;,,,1,Des/91050_1,当被摧毁时，使其余宝石核心获得{0}点功率。,,;4;;;,,,1,Cannon_Enemy/Skill_SnapCannon,cannon_gem,
 91051,Name/91051_1,终结者,1,Text/91051,终结,0,2,,FALSE,5,,;1;;;,,,1,Des/91051_1,当终结者为唯一一种存在的部件时，额外拥有{0}点威力。,,;77;;;,,,1,Cannon_Enemy/Skill_SnapLast,cannon_terminator,
 91051,Name/91051_2,终结者+,2,Text/91051,终结,0,2,,FALSE,5,,;1;;;,,,1,Des/91051_1,当终结者为唯一一种存在的部件时，额外拥有{0}点威力。,,;99;;;,,,1,Cannon_Enemy/Skill_SnapLast,cannon_terminator,
-91053,Name/91053_1,跳蛙核心,1,Text/91053,跳蛙,0,1,,FALSE,5,,;1;;;,,,1,Des/91053_1,在战斗中拥有{0}点功率，对波失败：若自身为最前方的部件，则使自身功率翻倍并随机转移至1个攻击部件，并摧毁自身。,;PA:2;;;,,,,1,Cannon_Enemy/Skill_JumpFrog,cannon_frog,Frog
-91053,Name/91053_2,跳蛙核心+,2,Text/91053,跳蛙,0,1,,FALSE,5,,;1;;;,,,1,Des/91053_1,在战斗中拥有{0}点功率，对波失败：若自身为最前方的部件，则使自身功率翻倍并随机转移至1个攻击部件，并摧毁自身。,;PA:3;;;,,,,1,Cannon_Enemy/Skill_JumpFrog,cannon_frog,Frog
+91053,Name/91053_1,跳蛙核心,1,Text/91053,跳蛙,0,1,,FALSE,5,,;1;;;,,,1,Des/91053_1,拥有{0}点功率，对波失败：若自身为最前方的部件，则使自身功率翻倍并随机转移至1个攻击部件，并摧毁自身。,;PA:2;;;,,,,1,Cannon_Enemy/Skill_JumpFrog,cannon_frog,Frog
+91053,Name/91053_2,跳蛙核心+,2,Text/91053,跳蛙,0,1,,FALSE,5,,;1;;;,,,1,Des/91053_1,拥有{0}点功率，对波失败：若自身为最前方的部件，则使自身功率翻倍并随机转移至1个攻击部件，并摧毁自身。,;PA:3;;;,,,,1,Cannon_Enemy/Skill_JumpFrog,cannon_frog,Frog
 91055,Name/91055_1,滑轮核心-前排,1,Text/91055,换位,0,1,,FALSE,5,,;1;;;,,,1,Des/91055_1,敌方前排部件装载后，自身换位至同列。,,,,,1,Cannon_Enemy/Skill_Tramcar,cannon_pulley_1,Pulley1
 91056,Name/91056_1,滑轮核心-中排,1,Text/91056,换位,0,1,,FALSE,5,,;1;;;,,,1,Des/91056_1,敌方中排部件装载后，自身换位至同列。,,,,,1,Cannon_Enemy/Skill_Tramcar,cannon_pulley_2,Pulley2
 91057,Name/91057_1,滑轮核心-后排,1,Text/91057,换位,0,1,,FALSE,5,,;1;;;,,,1,Des/91057_1,敌方后排部件装载后，自身换位至同列。,,,,,1,Cannon_Enemy/Skill_Tramcar,cannon_pulley_3,Pulley3
@@ -577,8 +577,8 @@ int,string,void,int,string,void,int,int,int[],bool,int,int[],int[],int,int,int,s
 91071,Name/91071_1,白色利斧,1,Text/91071,白色,0,1,,FALSE,5,,;1;;1;;;,,,1,Des/91071_1,当敌方手牌中没有[白色]能量时，拥有威力翻倍。,,;1;;;,,,1,Cannon_Enemy/Skill_NoColorAddRate,cannon_axe_white,
 91072,Name/91072_1,蓝色利斧,1,Text/91072,蓝色,0,1,,FALSE,5,,;1;;1;;;,,,1,Des/91072_1,当敌方手牌中没有[蓝色]能量时，拥有威力翻倍。,,;2;;;,,,1,Cannon_Enemy/Skill_NoColorAddRate,cannon_axe_blue,
 91073,Name/91073_1,橙色利斧,1,Text/91073,橙色,0,1,,FALSE,5,,;1;;1;;;,,,1,Des/91073_1,当敌方手牌中没有[橙色]能量时，拥有威力翻倍。,,;3;;;,,,1,Cannon_Enemy/Skill_NoColorAddRate,cannon_axe_orange,
-91074,Name/91074_1,破坏性核心,1,Text/91074,破坏,0,1,,FALSE,5,,;3;;2;;1;;;,,,1,Des/91074_1,可被敌方装载能量。\n被敌方装载时，摧毁相邻部件。,,,,,1,Cannon_Enemy/Skill_EnemyLoadSelfDestroy,cannon_fragment,CannonFragment
-91075,Name/91075_1,无防核心,1,Text/Empty,,0,1,,FALSE,5,,;3;;2;;1;;;,,,1,Des/91075_1,可被敌方装载能量。,,,,,1,Cannon_Enemy/Skill_EnemyLoadEmpty,cannon_no_defence,
+91074,Name/91074_1,破坏性核心,1,Text/91074,破坏,0,1,,FALSE,5,,;3;;2;;1;;;,,,1,Des/91074_1,可被玩家装载能量。\n被玩家装载时，摧毁相邻部件。,,,,,1,Cannon_Enemy/Skill_EnemyLoadSelfDestroy,cannon_fragment,CannonFragment
+91075,Name/91075_1,无防核心,1,Text/Empty,,0,1,,FALSE,5,,;3;;2;;1;;;,,,1,Des/91075_1,可被玩家装载能量。,,,,,1,Cannon_Enemy/Skill_EnemyLoadEmpty,cannon_no_defence,
 91077,Name/91077_1,耐久齿轮,1,Text/91077,耐久,0,1,,FALSE,5,,;1;;1;;;,,,1,Des/91077_1,战斗中拥有与耐久值相等的功率。,,,,,1,Cannon_Enemy/Skill_SameBreakAdded,cannon_1st,
 91078,Name/91078_1,上等马,1,Text/91078,寻找下等马,0,1,,FALSE,5,,;1;;1;;1;;;,,,1,Des/91078_1,敌方装载后，自身换位至敌方威力最小的那一列。,,,,,1,Cannon_Enemy/Skill_GoodHorse,cannon_top_horse,
 ,,,,,,,,,,,,,,,,,,,,,,,,,
--- a/csv/talent/Talent
+++ b/csv/talent/Talent
@@ -83,7 +83,7 @@ int,int,int[],int,bool,string,void,string,void,int[],int,string,string,bool,int[
 50030,2,;7;;77;;;,52,,Talent/talent_rollcoin_name,/roll 50,Talent/talent_rollcoin_des,战斗结束后，星币将在1-50范围内随机变化。,,,TA_RollCoin,roll_dice,,;50009;;50011;;;,
 50031,2,;7;;;,58,,Talent/talent_burnslot_name,腐化之源,Talent/talent_burnslot_des,初始获得专属部件：<UNIT>80809|1</UNIT>。,;80809;;1;;;,,TA_Init_AddUnit,corrupt_source,,,
 50032,2,;77;;;,56,,Talent/talent_linedouble_name,观者之眼,Talent/talent_linedouble_des,初始获得专属部件：<UNIT>80010|1</UNIT>。,;80010;;1;;;,,TA_Init_AddUnit,viewer,,,
-50033,2,;7;;77;;;,62,,Talent/talent_limittimer_name,青铜沙漏,Talent/talent_limittimer_des,每回合额外生成{0}个能量，但在{1}秒后自动结束回合。,;1;;15;;;,,TA_LimitTimer,sand_clock,,,
+50033,2,;7;;77;;;,62,,Talent/talent_limittimer_name,青铜沙漏,Talent/talent_limittimer_des,每回合额外生成{0}个能量，但在{1}秒后自动结束回合。,;1;;15;;;,,TA_LimitTimer,sand_clock,,,;411;;;
 50034,2,;7;;77;;;,50,,Talent/talent_drawacircle_name,画个圈圈去度假,Talent/talent_drawacircle_des,经历度假事件会使其周围圆形区域的其他度假事件消耗天数减少1天。,,,TA_DrawACircle,draw_circle,,;50025;;;,
 50035,2,;7;;77;;;,20,,Talent/talent_resonate_name,共振,Talent/talent_resonate_des,连续装载点数和颜色都相同的手牌能量时，飞船中心的攻击部件获得{0}点威力。,;3;;;,,TA_Resonate,resonance,,,
 50036,2,;7;;77;;;,16,,Talent/talent_biggership_name,大船长,Talent/talent_biggership_des,飞船替换为拥有更多位置的大船号。,,,TA_BiggerShip,mega_ship,,,;208;;511;;905;;906;;;
@@ -94,3 +94,4 @@ int,int,int[],int,bool,string,void,string,void,int[],int,string,string,bool,int[
 50042,2,;7;;77;;;,64,,Talent/talent_makefriends_name,交个朋友,Talent/talent_makefriends_des,前2场精英战斗结束后，获得1次固有天赋2选1的机会。,,,TA_MakeFriends,make_friends,,,
 50043,2,;7;;77;;;,70,,Talent/talent_rareorder_name,错乱规则,Talent/talent_rareorder_des,在第1/2/3个星系中，随机部件和宝物时，稀有度强制变为普通/稀有/传说，且没有数量限制。,,,TA_RareOrder,disorder_rule,,;10016;;;,
 50044,2,;7;;77;;;,51,,Talent/talent_bobo_name,重叠时间,Talent/talent_bobo_des,初始获得专属部件：<UNIT>80821|2</UNIT>。,;80821;;2;;;,,TA_Init_AddUnit,overlapping_time,,,
+50045,2,;77;;;,61,,Talent/talent_colorequal_name,强迫症,Talent/talent_colorequal_des,每回合额外生成2个能量，手牌能量只能装载对应颜色的槽位。,,,TA_ColorEqual,OCD,,;50039;;;,;411;;;
--- a/csv/treasure/Treasure
+++ b/csv/treasure/Treasure
@@ -66,8 +66,8 @@ int,string,void,int,bool,int,int[],int,int,int[],int,bool,string,void,int[],stri
 910,TreasureName/910,邪恶投影,1,,0,;7;;77;;;,,1,,,,TreasureDes/910,当攻击部件获得功率时，获得与功率增加点数相同的威力。,,TS_PowerAddedAddPower,Sprites/Treasures/evil_projection,0,0
 912,TreasureName/912,音波,1,,0,;7;;77;;;,,0,;9;;;,,,TreasureDes/912,第3回合开始时，所有攻击部件获得{0}点临时功率。,;4;;;,TS_3rdTurnAddedTemp,Sprites/Treasures/sound_wave,0,0
 913,TreasureName/913,流光宝石,0,,0,;7;;77;;;,,0,,,,TreasureDes/913,战斗开始时，槽位数量最多的攻击部件获得1点功率。,,TS_StartSlotMostAdded,Sprites/Treasures/gem_poweradd,0,0
-914,TreasureName/914,功率购物卡,0,,0,;7;;77;;;,,0,,,FALSE,TreasureDes/914,在商店中获得攻击部件时，使其获得改造：在战斗中拥有2点功率。,,TS_ShopCannonAdded,Sprites/Treasures/card_poweradd,0,0
-915,TreasureName/915,功率改造机,1,,1,;7;;77;;;,,0,,,FALSE,TreasureDes/915,获得时，使拥有的所有攻击部件获得改造：在战斗中拥有1点功率。,,TS_AllCannonAdded,Sprites/Treasures/poweradd_mechine,0,0
+914,TreasureName/914,功率购物卡,0,,0,;7;;77;;;,,0,,,FALSE,TreasureDes/914,在商店中获得攻击部件时，使其获得改造：拥有2点功率。,,TS_ShopCannonAdded,Sprites/Treasures/card_poweradd,0,0
+915,TreasureName/915,功率改造机,1,,1,;7;;77;;;,,0,,,FALSE,TreasureDes/915,获得时，使拥有的所有攻击部件获得改造：拥有1点功率。,,TS_AllCannonAdded,Sprites/Treasures/poweradd_mechine,0,0
 916,TreasureName/916,先锋勋章,1,,0,;7;;77;;;,,0,,,,TreasureDes/916,战斗过程中，第1个装载手牌能量的攻击部件获得{0}点功率。,;2;;;,TS_LoadFirstCannonAdded,Sprites/Treasures/poweradd_metal,0,0
 917,TreasureName/917,虚空力场,1,,0,;77;;;,,0,,,,TreasureDes/917,战斗开始时，所有攻击部件获得与飞船未使用的负载相同的功率。,,TS_UnloadLimitAdded,Sprites/Treasures/void_field,0,0
 ,,,,,,,,,,,,,,,,,,
@@ -200,7 +200,7 @@ int,string,void,int,bool,int,int[],int,int,int[],int,bool,string,void,int[],stri
 5028,TreasureName/5028,大圈圈,1,,0,;7;;77;;;,50034,0,,,FALSE,TreasureDes/5028,<TALENT>50034</TALENT>天赋的半径扩大{1}%。,;50034;;30;;;,TS_Circle,Sprites/Treasures/big_circle,0,0
 5029,TreasureName/5029,共振增幅器,1,,0,;7;;77;;;,50035,0,,,,TreasureDes/5029,<TALENT>50035</TALENT>天赋效果变为获得{1}点威力。,;50035;;4;;;,TS_SetTalentValue,Sprites/Treasures/resonance_amplifier,0,0
 5030,TreasureName/5030,补位礼包,1,,0,;77;;;,50036,0,,,FALSE,TreasureDes/5030,获得{0}个负载为0的部件。,;2;;;,TS_GetLimitZero,Sprites/Treasures/two_units,0,0
-5031,TreasureName/5031,功率部件,1,,0,;7;;77;;;,50010,0,,,FALSE,TreasureDes/5031,获得1个随机攻击部件，使其获得改造：在战斗中拥有{0}点功率。,;2;;;,TS_CrazyMan,Sprites/Treasures/power_unit,0,0
+5031,TreasureName/5031,功率部件,1,,0,;7;;77;;;,50010,0,,,FALSE,TreasureDes/5031,获得1个随机攻击部件，使其获得改造：拥有{0}点功率。,;2;;;,TS_CrazyMan,Sprites/Treasures/power_unit,0,0
 5032,TreasureName/5032,融合能量,1,,0,;7;;77;;;,50026,0,,,,TreasureDes/5032,战斗开始时，生成1个原料库中最高点数和颜色结合的能量。,,TS_WashHand,Sprites/Treasures/energy_mix,0,0
 5033,TreasureName/5033,白色槽位,1,,0,;7;;;,50031,0,,,,TreasureDes/5033,通过腐化槽位获得的槽位颜色变为[白色]。,,TS_WhiteRoot,Sprites/Treasures/white_slot,0,0
 5034,TreasureName/5034,升级模组,0,,0,;7;;77;;;,50038,0,,,FALSE,TreasureDes/5034,获得该宝物时，随机升级{0}个部件。,;2;;;,TS_UpgradeRandom,Sprites/Treasures/upgrade_module,0,0