Update some resources to 4.7

2025-10-21 19:59:48 +08:00 · 2024-06-16 17:03:13 +08:00
parent ef3c85c6d3
commit 79efb9bd51
21 changed files with 1443 additions and 12 deletions
--- a/Source/GrasscutterTools/Resources/zh-cn/Avatar.txt
+++ b/Source/GrasscutterTools/Resources/zh-cn/Avatar.txt
@@ -79,4 +79,7 @@
 1092:嘉明
 1093:闲云
 1094:千织
+1095:希格雯
 1096:阿蕾奇诺
+1097:赛索斯
+1098:克洛琳德
--- a/Source/GrasscutterTools/Resources/zh-cn/Gadget.txt
+++ b/Source/GrasscutterTools/Resources/zh-cn/Gadget.txt
@@ -271,6 +271,7 @@
 41076011:Faruzan_WindBlackHole
 41076015:Faruzan_SkillObj_WindZone_Hit
 41083009:Linette_Constellation_WindZone
+41098006:Clorinde_Constellation_1_Gadget
 42000001:钓鱼的鱼漂发射器
 42000002:钓鱼的鱼漂
 42103002:丘丘水萨满-群疗区域
@@ -790,13 +791,43 @@
 41093023:Liuyun_ElementalBurst_SmallWindHole
 41094004:Bullet_Chiori_ElementalArt_Rush_Detect
 41094006:SkillObj_Chiori_ElementalBurst_RockBomb
+41095001:Sigewinne_Extra_Bubble_Bullet
+41095002:Sigewinne_EArt_Bullet_Normal
+41095003:Sigewinne_EArt_Bullet_No_Enemy
+41095004:Sigewinne_EArt_Bullet_One_Enemy
+41095005:Sigewinne_EArt_Bullet_Normal_Shoot_NoTarget
+41095006:Sigewinne_ElementalArt_Core
+41095007:Sigewinne_Arrow_01
+41095008:Sigewinne_Arrow_02
+41095009:Sigewinne_Arrow_03
+41095010:Sigewinne_AimingArrow_WithoutWater
+41095011:Sigewinne_AimingArrow_Water
+41095012:Sigewinne_EArt_Bullet_Normal_New
+41095013:Sigewinne_Burst_Attacker
 41096003:Arlecchino_ExtraAttack_Bullet
+41097001:Sethos_Arrow_01
+41097002:Sethos_Arrow_02
+41097003:Sethos_Arrow_03
+41097004:Sethos_Arrow_04
+41097005:Sethos_AimingArrow_WithoutElec
+41097006:Sethos_AimingArrow_WithElec
+41097007:Sethos_AimingArrow_Lightning
+41097008:Sethos_AimingArrow_Lightning_Burst_01
+41097009:Sethos_AimingArrow_Lightning_Burst_02
+41097010:Sethos_AimingArrow_Lightning_Burst_03
+41097011:Sethos_AimingArrow_Lightning_Burst_04
+41098001:Clorinde_DodgeAttack_Small
+41098002:Clorinde_DodgeAttack_Medium
+41098003:Clorinde_DodgeAttack_Large
+41098004:Clorinde_ElementArt_Attack_Bullet_Penetrating
+41098005:Clorinde_ElementArt_Attack_Bullet_Standard
 42000003:Activity_Pitch_Pot_Throw_Bullet
 42000004:Activity_Pitch_Pot_Throw_Bullet_02
 42000005:BossNarzissenkreuzBattle_PlayerSkill_Bullet_1
 42000006:BossNarzissenkreuzBattle_PlayerSkill_Bullet_2
 42000007:Activity_GoalChallenge_Level03_WindZone
 42000008:Activity_GoalChallenge_Level04_RainZone
+42000010:Bullet_ActivityAbility_MVM_AvatarSkill_Asist
 42001002:史莱姆岩锥
 42001003:史莱姆气泡-弹道
 42001004:史莱姆-冰锥
@@ -925,6 +956,7 @@
 42005021:纯水精灵延迟水球生成器
 42005022:纯水松鼠水波
 42005024:纯水水流激光锁定子弹
+42005026:MvM_Frog_WaterWave
 42005101:Necalevia_RangeBullet
 42005102:Necalevia_AOERangeMulti
 42005103:Necalevia_Small_RangeBullet
@@ -954,8 +986,10 @@
 42006401:飘浮灵-冰-小雪球
 42006402:飘浮灵-冰-元素微粒
 42006403:飘浮灵-冰-大雪球
+42006407:Sylph_Ice_IceBullet_02
 42006501:飘浮灵-雷-前冲碰撞子弹
 42006601:飘浮灵-火-小火球
+42006605:MvM_Sylph_Fire_FireBullet
 42006701:飘浮灵-草-子弹
 42006702:飘浮灵-草-捕捉能量弹
 42006705:飘浮灵-草-激活亡语子弹
@@ -985,6 +1019,8 @@
 42101025:大伟丘丘人丢的大物件03
 42101026:雷弹丘丘扔的雷史莱姆
 42101027:Monster_Arrow_ShootingActivity
+42101028:MvM_Hili_Electric_Arrow
+42101029:MvM_Hili_Ice_Arrow
 42102001:火斧暴徒-横波
 42102002:火斧暴徒-纵波
 42102003:火斧暴徒-火史莱姆-着
@@ -1254,6 +1290,10 @@
 42406057:MachinaIustitia_Bradamante_Summon_Bullet
 42406059:MachinaIustitia_Bradamante_Attack02_FollowBullet2
 42406060:MachinaIustitia_Bradamante_Attack02_FollowBullet3
+42406061:MvM_MachinaIustitia_Ruggiero02_Attack02_Bullet
+42406062:MvM_MachinaIustitia_Ruggiero02_Attack02_Bullet2
+42406063:MvM_MachinaIustitia_Assimilator_NormalAttack01_Bullet
+42406064:MvM_MachinaIustitia_Assimilator_MeleeAttack01_Bullet
 42407002:MachinaIustitia_Nutcracker_Stage1_WindBullet1
 42407003:MachinaIustitia_Nutcracker_Stage1_WindBullet2
 42407004:MachinaIustitia_Nutcracker_Stage1_IceBullet
@@ -1293,6 +1333,9 @@
 42481009:FungusFighterV2_TowerPhysics_SkillBullet
 42481010:FungusFighterV2_TowerElectric_LockTarget
 42481011:FungusFighterV2_TowerWind_LockTarget
+42481012:MvM_TowerFire_FireBullet
+42481013:MvM_TowerIce_IceBullet
+42481014:MvM_TowerWindBullet
 42499001:Bullet_Alternate_01
 42501001:盗宝团投掷的飞刀
 42501002:盗宝团投掷的炸弹
@@ -1312,6 +1355,8 @@
 42501020:Thoarder_Rocky_Guitar_ElectricBottle
 42501024:Thoarder_Rocky_Guitar_ElectricBomb_Bullet
 42501026:Thoarder_ThrowingKnife_ShootingActivity
+42501027:MvM_Thoarder_MolotovCocktail
+42501028:MvM_Thoarder_Bomb_ElementalEffect_Fire
 42503001:盗宝团铲子产出的泥巴
 42503002:卡门铲子铲出的泥巴
 42504001:盗宝团投出的手斧
@@ -1322,6 +1367,8 @@
 42508001:浪人手弩发射子弹
 42508002:武士冲刺攻击摧毁创生物
 42508004:浪人冲刺子弹
+42508006:MvM_Samurai_Ronin_ShootBullet
+42508007:MvM_Samurai_RushAtk_Bullet
 42509002:傀儡将军风属性剑气1
 42509003:傀儡将军风属性剑气2
 42509006:傀儡将军风分身普攻剑气
@@ -1399,6 +1446,8 @@
 42601123:FauneAbyssale_SeaHorse_Primo_ElectronCharge_Physic
 42601125:FauneAbyssale_SeaHorse_Primo_RockGadget_Crasher
 42601128:FauneAbyssale_SeaHorse_Primo_ShuttleAttack_Bullet
+42601134:MvM_FauneAbyssale_SeaHorse_Mature_BallLightning
+42601135:MvM_FauneAbyssale_SeaHorse_Mature_WaterBullet
 42602004:急冻树-扫射子弹
 42602005:急冻树-小导弹
 42602006:急冻树-大导弹
@@ -1485,6 +1534,8 @@
 42606004:水莹—水球
 42606005:冰萤冰锥
 42606006:冰萤能量球
+42606007:MvM_Cicin_WaterBall
+42606008:MvM_Cicin_ElectricBall
 42607003:武士狗飞出去的帽子
 42607006:武士狗飞刀攻击
 42607010:武士狗远程剑气攻击
@@ -1518,6 +1569,7 @@
 42609027:Fungus_Un_Water_SuperWaterBullet
 42609028:Fungus_Trois_Ice_BlizzardPoint
 42609029:Fungus_Deux_Wind_HealingWavePoint
+42609030:MvM_Fungus_Un_Delta_Wind_BulletDecayed
 42610001:Scorpion_Sacred_SacredAttack03_Bullet
 42610002:Scorpion_Sacred_SacredAttack05_Bullet
 42610004:Scorpion_Sacred_SacredEnergy_Bullet
@@ -1890,6 +1942,12 @@
 49001023:MonsterAffix_Activity_Deathrattle_Gadget_DoomLogic
 49001025:MonsterAffix_Activity_AkaFes_RockDamage_LowWave_SingleBullet
 49001027:Activity_MultiCharacter_BulletToGround
+49001034:Gadget_RoleCombat_TracingEnergyBall
+49001036:Gadget_RoleCombat_TracingEnergyBall_Grass
+49001042:MonsterAffix_RoleCombat_DeathMatch_FieldBullet
+49001049:MonsterAffix_RoleCombat_Haunted_Bullet
+49001051:MonsterAffix_RoleCombat_Haunted_TrackGhostBullet
+49001052:MonsterAffix_RoleCombat_Backer_FieldBullet
 70220037:蜘蛛子弹
 70220053:雪山守护炮台子弹
 70220073:稻妻守护炮台子弹-雪山守护炮台子弹
@@ -1927,6 +1985,12 @@
 70291138:SceneObj_Area_Common_Property_Ani_Prop_Jamballoon_Bullet_01
 70291151:Penumbra_CannonBall_01
 70291152:Penumbra_CannonBall_02
+70291180:Penumbra_CannonBallV2_01
+70291181:Penumbra_CannonBallV2_02
+70291182:Penumbra_CannonBallV2_03
+70291185:Penumbra_CannonBallV2_04
+70291294:SceneObj_Activity_Common_Property_Ani_Prop_BulletHell_Barrage_Bullet_02
+70291295:SceneObj_Activity_Common_Property_Ani_Prop_BulletHell_Barrage_Bullet_01
 70291440:SceneObj_Activity_Common_Property_Ani_Prop_AutoTimeStop_Barrage_Bullet_03
 70291441:SceneObj_Activity_Common_Property_Ani_Prop_AutoTimeStop_Barrage_Bullet_02
 70291442:SceneObj_Activity_Common_Property_Ani_Prop_AutoTimeStop_Barrage_Bullet_01
@@ -2344,6 +2408,9 @@
 41094007:SkillObj_Chiori_Turret_Constellation
 41096001:Arlecchino_ElementalBurst_Gadget
 41096002:Arlecchino_ElementalArt_ShadowAvatar
+41098007:Clorinde_Constellation_6_Gadget
+42000011:ActivityAbility_MVM_AvatarSkill_Asist_02
+42000012:ActivityAbility_MVM_AvatarSkill_Asist_03
 42001001:史莱姆-冰锥-目标点
 42001005:史莱姆-冰雾
 42001010:史莱姆-风场虚拟体
@@ -2423,6 +2490,7 @@
 42005019:纯水精灵平台伤害
 42005023:纯水必杀空阻碍物
 42005025:纯水挑战爆裂机霸弹
+42005027:MvM_Frog_DeathExplode
 42005129:Narcissusborn_DartAttack_InitialPos
 42005130:Narcissusborn_EnhancedDartDartAttack_InitialPos
 42005131:Narzissenkreuz_DartAttack_InitialPos
@@ -2498,6 +2566,7 @@
 42103035:Shaman_FloorAttack01_Gadget
 42103036:Shaman_SuperJump_Area
 42103037:Shaman_Note_Buff_Gadget
+42103039:MvM_Shaman_Torrent_Area
 42201003:深渊巫师-火焰能量环绕
 42201007:深渊巫师-地火
 42201011:深渊巫师-冰锥区域
@@ -2619,6 +2688,7 @@
 42409014:MachinaIustitia_Gravitas_ImpactWave_01
 42481006:FungusFighterV2_TowerFire_SkillAOE
 42481008:FungusFighterV2_TowerIceWall
+42481015:MvM_TowerWater_Torrent_Area
 42501012:BoxMatch_Assistant_IceBomb_TargetPoint
 42501015:BoxMatch_Hatchet_FireWork_Lv1
 42501017:BoxMatch_Hatchet_FireWork_Lv2_Attack
@@ -3031,6 +3101,7 @@
 42910024:Nihil_Story_HelpSkillHandler
 42910026:Nihil_Story_HelpSkill_RushAtk
 42910032:Nihil_Story_HelpSkill_Bomb
+42910033:Nihil_DonimatAttack_Control
 43805005:Bullet_Animal_Electrohercules_ElectricBall_OnGround
 43805014:Animal_Electrohercules_Defend_Turorial
 44000002:飞行挑战玩法：空中冲刺 前冲
@@ -3210,6 +3281,12 @@
 44000594:HideType_A_Style_InvisibleBait_Target
 44000595:HideType_A_Style_InvisibleBait_Target
 44000596:HideType_A_Style_InvisibleBait_Target
+44000597:SkillObj_Activity_AcrobaticsBattle_Lv1
+44000598:SkillObj_Activity_AcrobaticsBattle_Lv3
+44000599:SkillObj_Activity_AcrobaticsBattle_Lv4
+44000600:SkillObj_Activity_AcrobaticsBattle_Lv7
+44000601:SkillObj_Activity_AcrobaticsBattle_Lv0
+44000602:SkillObj_Activity_AcrobaticsBattle_KillCall
 49001001:$GeneralSkill_IceDamage_Prison_Center-冰牢
 49001002:$GeneralSkill_WindDamage_Vortex_Center-旋涡
 49001003:地波发射器
@@ -3223,6 +3300,23 @@
 49001020:东风快递触发区域强化版
 49001024:MonsterAffix_Activity_AkaFes_RockDamage_LowWave_Emitter
 49001028:MonsterAffix_Monster_Yunqi_Die_BroadCast
+49001029:Gadget_RoleCombat_ThunderArea
+49001030:Gadget_RoleCombat_ThunderArea_Stage1
+49001031:Gadget_RoleCombat_ThunderArea_Stage2
+49001032:Gadget_RoleCombat_ThunderArea_Stage3
+49001033:Gadget_RoleCombat_TracingEnergyBall_CreatorGadget
+49001035:Gadget_RoleCombat_TracingEnergyBall_Grass_CreatorGadget
+49001038:Gadget_RoleCombat_BulletToGround
+49001039:MonsterAffix_RoleCombat_DeathRattleCrystal_DamageGadget
+49001040:MonsterAffix_RoleCombat_BoomTime_LogicGadget
+49001041:MonsterAffix_RoleCombat_Yunqi_Die_BroadCast
+49001043:Gadget_RoleCombat_Bonus_FungusRaptor_Weak_Kill
+49001044:Gadget_RoleCombat_Bonus_MonolithStarchild_Weak_Kill
+49001045:Gadget_RoleCombat_Bonus_DrakeDeepSea_No_Revive
+49001046:Gadget_RoleCombat_Bonus_DrakeDeepSea_MagicBall_NoHit
+49001047:Gadget_RoleCombat_Bonus_HermitCrabPrimo_Weak_Kill
+49001048:Gadget_RoleCombat_Bonus_SeaHorsePrimo_Recover_Break
+49001050:MonsterAffix_RoleCombat_Haunted_FreeGhost
 70000012:测试用阔叶
 70020001:蒙德城天气
 70020002:风魔龙天气
@@ -3559,6 +3653,8 @@
 70230124:SceneObj_Area_Xm_Property_Ani_Decal_CrystalWall_01
 70230125:SceneObj_Area_Xm_Property_Ani_Decal_CrystalWall_01
 70230126:SceneObj_Area_Xm_Property_Ani_Decal_CrystalWall_01
+70230127:SceneObj_Area_Common_Property_Ani_Prop_MvM_SandTable_01
+70230128:[N/A] 3947176030
 70240001:动态挡雨物件ww01 1-动态挡雨物件
 70240002:动态挡雨物件ww01 2-动态挡雨物件
 70240003:动态挡雨物件ww02 1-动态挡雨物件
@@ -4497,8 +4593,30 @@
 70291167:SceneObj_Area_Common_Property_Ani_Prop_Jamballoon_02
 70291168:SceneObj_Penumbra_Common_Property_Ani_Prop_BladeDanceGate_01
 70291169:[N/A] 2187650446
+70291170:SceneObj_Area_Common_Property_Prop_FlightgearOperator_01
+70291171:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonV2_01
+70291172:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonV2_02
+70291186:SceneObj_Penumbra_Common_Property_Ani_Prop_BossTargetBall_01
+70291187:SceneObj_Area_Common_Property_Prop_FlightgearOperator_01
+70291188:SceneObj_Area_Common_Property_Prop_FlightgearOperator_01
+70291189:SceneObj_Area_Common_Property_Prop_FlightgearOperator_01
+70291190:SceneObj_Area_Common_Property_Prop_FlightgearOperator_01
+70291282:SceneObj_Quest_DimensionalCollapse_01
+70291283:SceneObj_Level_Common_AvatarObj_Ani_Quest_SgwMixtureBottle_01
+70291284:[N/A] 4156213838
+70291285:[N/A] 4072703862
+70291286:SceneObj_Level_Common_Property_Ani_Prop_CharAmuseBarrier_01
+70291287:SceneObj_Level_Common_Property_Ani_Prop_CharMasterEntrance_01
+70291288:SceneObj_Level_Common_Property_Ani_Prop_MarechausseeGate_01
+70291289:SceneObj_Area_Fd_TreasureEntry_Door_01
+70291290:SceneObj_Level_Common_Property_Ani_Build_Hiddendoor_01
+70291292:SceneObj_Level_Common_Property_Ani_Prop_CoinDummy_02
+70291293:SceneObj_Level_Common_Property_Ani_Prop_CoinDummy_01
 70291296:SceneObj_Area_Fd_ChioriDungeon_SoundController_01
 70291297:SceneObj_Area_Common_Property_Prop_DelucChallengeAirwall_02
+70291298:SceneObj_Level_Common_Property_Ani_Prop_LeaserWall_01
+70291299:SceneObj_Level_Common_Property_Ani_Prop_BulletHellCoin_01
+70291300:SceneObj_Level_Common_Property_Ani_Prop_BulletHellCoin_02
 70291301:SceneObj_Area_Common_Property_Prop_Catcafe_FollowmoveInteract_01
 70291302:SceneObj_Area_Fd_Property_Ani_Prop_FdCommonGate_01
 70291303:SceneObj_Area_Fd_Property_Ani_Prop_FdCommonGate_02
@@ -5612,6 +5730,16 @@
 70320135:SceneObj_Area_Common_Property_Prop_CharAmusementAirWall_07
 70320136:SceneObj_Area_Common_Property_Prop_CharAmusementAirWall_08
 70320137:SceneObj_Area_Common_Property_Prop_CharAmusementAirWall_09
+70320138:SceneObj_Area_Common_Property_Prop_MonsterVsMonster_Flag_01
+70320139:SceneObj_Area_Common_Property_Prop_MonsterVsMonster_Flag_02
+70320140:[N/A] 882392350
+70320141:SceneObj_Area_Common_Property_Prop_MonsterVsMonster_DropCard_01
+70320142:SceneObj_Area_Common_Property_Prop_MonsterVsMonster_DropCard_02
+70320143:SceneObj_Level_Common_Property_Ani_Prop_SgwTrackGate_01
+70320150:[N/A] 4078867398
+70320151:SceneObj_Level_Common_Property_Ani_Prop_SgwTrackGate_02
+70320152:SceneObj_Level_Common_Property_Ani_Prop_SgwTrackLight_01
+70320153:[N/A] 2891105062
 70330002:炼金炉领奖台
 70330003:炼金火 小
 70330004:要打的搬运元素之火-搬运元素之火
@@ -6707,9 +6835,41 @@
 70350499:SceneObj_Area_Xm_Property_Ani_Prop_ElecTrailBulletGen_02
 70350500:Activity_Gadget_AkaFesPotion_Fire_Debuff_Driver
 70350501:SceneObj_Area_Xm_Property_Ani_Prop_FloatFarr_02
+70350503:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_Podium_01
+70350504:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_Phonograph_01
+70350505:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_Divination_01
+70350506:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_MagicBook_01
+70350507:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_TeamEditor_01
+70350508:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_GuardEntity_01
+70350509:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_CityAxis_01
+70350510:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_Entry_01
+70350511:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_LoopElevator_01
 70350512:SceneObj_Level_Common_Property_Ani_Bridge_LyFloatingBridge_01
+70350513:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_TeamEditor_02
+70350514:[N/A] 3284301342
+70350515:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_RageController_01
+70350516:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_RestQuitPoint_01
+70350517:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_CamearAdjust_01
+70350518:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_ESPManager_01
+70350520:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_AirwallAuditorium
+70350521:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_SitPointController_01
+70350522:SceneObj_Level_Common_Property_Ani_Prop_TurntableGearGate_01
+70350523:SceneObj_Level_Common_Property_Ani_Prop_TurntableGearGate_02
+70350525:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_AuditoriumEnd_01
+70350526:SceneObj_Level_Common_Property_Ani_Prop_TurntableGearGate_03
+70350527:SceneObj_Level_Common_Property_Ani_Prop_TurntableGearGate_01
 70350528:SceneObj_Area_Ly_Property_Ani_Prop_GreatFestivalV2_GuidePoint_01
 70350529:SceneObj_Area_Ly_Property_Ani_Prop_GreatFestivalV2_GuidePoint_02
+70350530:SceneObj_Level_Common_Property_Ani_Prop_LightGuideGear_01
+70350531:SceneObj_Level_Common_Property_Ani_Prop_FloorGateGear_01
+70350532:SceneObj_Level_Common_Property_Ani_Prop_TurntableGearGate_04
+70350533:SceneObj_Level_Common_Property_Ani_Prop_TurntableGearDoor_01
+70350534:SceneObj_Gear_MvM_Trap
+70350535:SceneObj_Level_Common_Property_Prop_TowerRepelV3
+70350536:SceneObj_Gear_MvM_Mine
+70350537:SceneObj_Gear_Operator_MvM_Mamolu
+70350538:SceneObj_Level_Common_Property_Ani_Prop_RoleCombat_AuditorSound
+70350539:SceneObj_Gear_Operator_MvM_Mamolu_02
 70360011:膨膨果终点-气球终点(1.1markflag版本）
 70360012:膨膨果终点2-气球终点
 70360013:膨膨果终点3-气球终点
@@ -8297,6 +8457,8 @@
 70711494:[N/A] 1130721848
 70711495:[N/A] 2735899096
 70711496:[N/A] 454832160
+70711497:[N/A] 2950885832
+70711498:[N/A] 505742752
 70711499:[N/A] 894963696
 70711500:[N/A] 230712120
 70711501:[N/A] 245820744
@@ -8319,11 +8481,66 @@
 70711518:[N/A] 2253302248
 70711519:[N/A] 2953437496
 70711521:[N/A] 3889181896
+70711524:[N/A] 505671616
 70711525:[N/A] 3664702656
+70711526:SceneObj_Eff_Quest_FdHotelTea_02
 70711532:[N/A] 3770495576
 70711534:[N/A] 1937340752
 70711535:[N/A] 3566751808
+70711536:[N/A] 1559943344
+70711537:[N/A] 4005836184
+70711538:[N/A] 1443263448
+70711539:[N/A] 3264946752
+70711540:[N/A] 2774305888
+70711541:[N/A] 467487816
+70711542:[N/A] 191718648
+70711543:[N/A] 379289088
+70711544:[N/A] 3265146368
+70711545:[N/A] 3112380536
+70711546:[N/A] 3293241152
+70711547:[N/A] 1649036848
+70711548:[N/A] 3579505024
+70711549:[N/A] 137682824
+70711550:[N/A] 574660032
+70711551:[N/A] 3832895152
+70711552:[N/A] 4137990640
+70711553:[N/A] 92502520
+70711554:[N/A] 1521413072
+70711555:[N/A] 1463601392
+70711556:[N/A] 3383584096
+70711557:[N/A] 205557824
+70711558:[N/A] 1171982400
+70711560:[N/A] 2051742328
+70711561:SceneObj_Item_Default_Item
+70711563:[N/A] 451175824
+70711564:[N/A] 154356784
+70711565:[N/A] 1820895784
+70711566:[N/A] 4209996104
+70711567:[N/A] 3336031008
 70711568:(test)巴慕恩的日记
+70711569:SceneObj_Area_Fd_Property_Prop_XgwRoom
+70711570:SceneObj_Quest_SimpleGadgetTalk
+70711571:[N/A] 2286571232
+70711572:[N/A] 79054456
+70711573:SceneObj_Quest_SimpleGadgetTalk05
+70711574:SceneObj_Item_Default_Item
+70711575:SceneObj_Item_Default_Item
+70711576:[N/A] 94595696
+70711577:[N/A] 2592892600
+70711578:[N/A] 3616900488
+70711579:SceneObj_Quest_Property_Ani_Prop_EnergyCaster_Operator_05
+70711580:[N/A] 2097752928
+70711581:SceneObj_Item_Default_Item
+70711582:[N/A] 2478379936
+70711583:[N/A] 2035742872
+70711584:[N/A] 2758548224
+70711585:SceneObj_Item_Default_Item
+70711592:SceneObj_Area_Fd_Property_Ani_Prop_ElderQuilt_02
+70711593:[N/A] 2996193296
+70711594:[N/A] 22295480
+70711595:SceneObj_SigewinneSmoke_01
+70711597:[N/A] 362532096
+70711598:[N/A] 2140889768
 70720216:火仙灵脚印-仙灵脚印
 70720219:发光仙灵脚印
 70800002:MsgBoard
@@ -9217,6 +9434,7 @@
 70950206:开启
 70950207:解锁
 70950208:组装
+70950214:[N/A] 1320639990
 71000004:岩琥珀
 71000005:射击点-射击点状态1
 71000006:射击点-射击点状态2
@@ -9565,6 +9783,14 @@
 71700751:[N/A] 233005080
 71700752:[N/A] 3608415800
 71700753:[N/A] 946830120
+71700754:SceneObj_Area_Common_Prop_Common_Twins_Dungeonportal_01
+71700755:SceneObj_Area_Common_Prop_Common_Twins_Butterfly_01
+71700756:[N/A] 1320471632
+71700757:[N/A] 3261253664
+71700758:[N/A] 3555596624
+71700759:[N/A] 1521717744
+71700760:SceneObj_Environment_Bulletin94
+71700761:SceneObj_Environment_Bulletin95
 72000001:群玉阁-海底古神-PA
 72000002:群玉阁-海底古神-PB
 72000003:群玉阁-海底古神-PC
@@ -10178,6 +10404,7 @@
 77111013:饭店地毯-「平等对谈」
 77111014:饭店地毯-「如沐风中」
 77111015:枫丹地毯-「平允方正」
+77111016:[N/A] 3138406544
 77112001:圆形的木质盾牌-家园物件
 77112002:有棱角的木质盾牌-家园物件
 77112003:特制的宝剑-家园物件
@@ -10778,6 +11005,8 @@
 77204226:「粼粼的荣彩」
 77204227:「灵感的纯白」
 77204228:「健疗的醇芳」
+77204229:[N/A] 3763891128
+77204230:[N/A] 2588701016
 77205001:木质长椅-家园物件
 77205002:石质的长椅-家园物件
 77205003:谷歌椅子-家园物件
@@ -11120,6 +11349,8 @@
 77215099:奇景铜像-「悠古金面」
 77215100:好梦留影神机
 77215101:慢悠悠仙像
+77215102:[N/A] 950928056
+77215103:[N/A] 2479535064
 77216001:家园路面01-家园物件
 77216002:家园路面02-家园物件
 77216003:家园路面03-家园物件
@@ -12177,6 +12408,21 @@
 71700729:北境秘史·卷三
 71700747:鹿野院平藏的留言
 71700748:「小狗商会」的收治明细
+71700762:[N/A] 976481484
+71700763:[N/A] 1459849724
+71700764:[N/A] 524159380
+71700765:[N/A] 1496186356
+71700766:[N/A] 1649628252
+71700767:[N/A] 3370696724
+71700768:[N/A] 2053389412
+71700769:[N/A] 3448013372
+71700770:[N/A] 3218519604
+71700771:[N/A] 4203305580
+71700772:[N/A] 2790292388
+71700773:[N/A] 969093148
+71700774:[N/A] 1702828196
+71700775:[N/A] 476652700
+71700776:[N/A] 1144681508
 77304001:霓裳花-2.0 家园采集物
 77304002:甜甜花-2.0 家园采集物
 77304003:塞西莉亚花-2.0 家园采集物
@@ -12234,6 +12480,7 @@
 49001017:东风快递触发区域
 49001019:东风快递触发区域强化版
 49001026:Activity_MultiCharacter_DangerArea
+49001037:Gadget_RoleCombat_DangerArea
 70220054:雪山守护机关
 70220074:稻妻守护机关-雪山守护机关
 70220113:莫娜地城移动水片-dungeon地城
@@ -12322,6 +12569,16 @@
 70291148:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTarget_05
 70291149:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTarget_06
 70291150:SceneObj_Penumbra_Common_Property_Ani_Prop_BossTarget_01
+70291173:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTargetV2_01
+70291174:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTargetV2_02
+70291175:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTargetV2_03
+70291176:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTargetV2_04
+70291177:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTargetV2_05
+70291178:SceneObj_Penumbra_Common_Property_Ani_Prop_CannonTargetV2_06
+70291179:SceneObj_Penumbra_Common_Property_Ani_Prop_BossTarget_02
+70291183:SceneObj_Penumbra_Common_Property_Ani_Prop_BossTargetWeak_01
+70291184:SceneObj_Penumbra_Common_Property_Ani_Prop_BossTargetBall_02
+70291291:SceneObj_Level_Common_Property_Ani_Prop_BulletHell_StaticBullet_01
 70291428:SceneObj_Area_Fd_Property_Ani_Prop_ShopRobot_01
 70291429:SceneObj_Area_Fd_Property_Ani_Prop_TrapFittingRoom_01
 70291477:SceneObj_Area_Common_Property_Ani_SpriteEffect_01
@@ -12423,6 +12680,9 @@
 70320104:SceneObj_Area_Fd_Property_Ani_Prop_GearPipe_Gear_03
 70320117:SceneObj_Level_Common_Property_Ani_Prop_CharAmuseBasket_01
 70320118:SceneObj_Level_Common_Property_Ani_Prop_CharAmuseBasket_02
+70320146:SceneObj_Level_Common_Property_Ani_Prop_SgwDungeonTruck_01
+70320147:SceneObj_Level_Common_Property_Ani_Prop_SgwDungeonTruck_02
+70320148:SceneObj_Level_Common_Property_Ani_Prop_SgwTrackSwitcher_02
 70330081:雷导立方
 70330083:雷导立方（不可旋转）
 70330118:鹤观 雷导立方（不可旋转）
@@ -12956,6 +13216,8 @@
 50004102:MonEquip_Axe_Electric_02
 50004103:MonEquip_Crossbow_01
 50004104:MonEquip_Thoarder_Rocky_Guitar
+50004105:MonEquip_Axe_01
+50004111:MonEquip_WoodenClub_01

 // 装备
 50010002:(test)穿模测试-Equip_Sword_Template
@@ -13015,6 +13277,7 @@
 50011512:Weapon_Sword_Metal
 50011513:Weapon_Sword_Metal
 50011514:Weapon_Sword_Metal
+50011515:Weapon_Sword_Metal
 50012101:训练大剑-Equip_Claymore_Aniki
 50012201:佣兵重剑-Equip_Claymore_Oyaji
 50012301:铁影阔剑-Equip_Claymore_Glaive
@@ -13159,6 +13422,7 @@
 50015419:Weapon_Bow_Metal
 50015424:Weapon_Bow_Metal
 50015425:Weapon_Bow_Metal
+50015426:Weapon_Bow_Metal
 50015427:Weapon_Bow_Metal
 50015501:天空之翼-Equip_Bow_Dvalin
 50015502:阿莫斯之弓-Equip_Bow_Amos
@@ -13171,6 +13435,7 @@
 50015509:飞雷之弦振-Equip_Bow_Narukami
 50015511:猎人之径-Equip_Bow_Ayus
 50015512:Weapon_Bow_Metal
+50015513:Weapon_Bow_Metal
 50100001:绯烟-副武器-杆秤

 // 副装备
@@ -13620,6 +13885,8 @@
 70320095:SceneObj_Area_Fd_Property_Ani_Prop_FactoryJukebox_01
 70320100:SceneObj_Area_Fd_Property_Ani_Prop_ResearchConsole_01
 70320105:SceneObj_Area_Fd_Property_Ani_Prop_FDFacPipeValve_01
+70320144:SceneObj_Level_Common_Property_Ani_Prop_SgwTrackSwitcher_01
+70320145:SceneObj_Level_Common_Property_Ani_Prop_SgwDungeonTruck_03
 70330001:炼金初始化
 70330019:岩片吸收器
 70330024:炼金炉-搬运元素之力地基
@@ -13734,6 +14001,8 @@
 70350486:SceneObj_Area_Xm_Property_Prop_CipherSwitch_04
 70350493:SceneObj_Level_Xm_Property_Ani_Prop_SlushaShellOperator_01
 70350502:SceneObj_Area_Xm_Property_Prop_CipherSwitch_05
+70350519:SceneObj_Gear_Operator_Mamolu_RoleCombat
+70350524:SceneObj_Level_Common_Property_Ani_Prop_TurntableOperator_01
 70360001:大世界隐形操作台-隐形操作台
 70360002:机关操作台
 70360003:调查线索-封印线索
--- a/Source/GrasscutterTools/Resources/zh-cn/Monsters.txt
+++ b/Source/GrasscutterTools/Resources/zh-cn/Monsters.txt
@@ -14,6 +14,7 @@
 20010503:Slime_Electric_02_SimpleStick - [N/A] 1834387465
 20010504:Slime_Electric_02 - [N/A] 2297127161
 20010581:Slime_Electric_02 - [N/A] 3442560241
+20010590:Slime_Electric_04 - [N/A] 3609489745
 20010601:大型雷史莱姆
 20010602:大型雷史莱姆（塔防）
 20010604:大型雷史莱姆-强攻强化
@@ -49,6 +50,7 @@
 20011205:Slime_Fire_02_SimpleStick - [N/A] 453720297
 20011207:Slime_Fire_02 - [N/A] 1709031969
 20011281:Slime_Fire_02 - [N/A] 1865400017
+20011290:Slime_Fire_06 - [N/A] 759614481
 20011301:大型火史莱姆
 20011302:大型火史莱姆（塔防）
 20011304:大型火史莱姆-强攻强化
@@ -86,6 +88,7 @@
 20050501:纯水之雀
 20050502:纯水之雀（无脚底特效）
 20050581:Monster_Oceanid_Tit - [N/A] 2975528057
+20050590:Monster_Oceanid_Tit_02 - [N/A] 3906620841
 20050601:纯水之鸭
 20050602:纯水之鸭(陆地行走版）
 20050603:纯水之鸭(陆地行走版，无脚底特效）
@@ -116,10 +119,12 @@
 20060382:Sylph_Wind_01 - [N/A] 2626651433
 20060401:冰飘浮灵
 20060481:Sylph_Ice_01 - [N/A] 3638534065
+20060490:Sylph_Ice_02 - [N/A] 1165765169
 20060501:雷飘浮灵
 20060581:Sylph_Electric_01 - [N/A] 1346991849
 20060601:火飘浮灵
 20060681:Sylph_Fire_01 - [N/A] 2020892233
+20060690:Sylph_Fire_02 - [N/A] 242072433
 20060701:草飘浮灵
 20060781:Sylph_Grass_01 - [N/A] 1523065297
 21010101:丘丘人
@@ -131,6 +136,7 @@
 21010201:打手丘丘人
 21010202:Hili_None_01_Club - [N/A] 518903577
 21010281:Hili_None_01_Club - [N/A] 148649137
+21010290:Hili_None_02_Club - [N/A] 2282353529
 21010299:Hili_None_01_Club_NoAI - [N/A] 1500968553
 21010301:木盾丘丘人
 21010302:木盾丘丘人（塔防）
@@ -156,10 +162,12 @@
 21010902:冰箭丘丘人-强攻强化
 21010981:Hili_Ice_Range - [N/A] 1716558393
 21010982:Hili_Ice_Range_Multi - [N/A] 1237213681
+21010990:Hili_Ice_Range_03 - [N/A] 2345480137
 21011001:雷箭丘丘人
 21011002:雷箭丘丘人-强攻强化
 21011081:Hili_Electric_Range - [N/A] 2022453977
 21011082:Hili_Electric_Range_Multi - [N/A] 3012953161
+21011090:Hili_Electric_Range_03 - [N/A] 4254195473
 21011201:岩盾丘丘人
 21011202:岩盾丘丘人（塔防）
 21011281:Hili_None_01_RockShield - [N/A] 2602064417
@@ -184,6 +192,7 @@
 21020204:Brute_None_Axe - [N/A] 1119958809
 21020281:Brute_None_Axe - [N/A] 741150761
 21020282:Brute_None_Axe - [N/A] 1576743033
+21020290:Brute_None_Axe_01 - [N/A] 2024375625
 21020299:Brute_None_Axe_NoAI - [N/A] 4081842953
 21020301:岩盾丘丘暴徒
 21020302:岩盾丘丘暴徒（塔防）
@@ -214,6 +223,7 @@
 21030103:水丘丘萨满-支援强化
 21030104:Shaman_Water_01_LostSamachurl - [N/A] 1713314673
 21030181:Shaman_Water_01 - [N/A] 3149869785
+21030190:Shaman_Water_02 - [N/A] 1877774473
 21030201:草丘丘萨满
 21030202:草丘丘萨满（塔防）
 21030203:草丘丘萨满-支援强化
@@ -324,6 +334,7 @@
 24010109:遗迹木桩2.0
 24010181:Defender_None_01 - [N/A] 1482848121
 24010182:Defender_None_01 - [N/A] 3806686089
+24010190:Defender_None_03 - [N/A] 1203739089
 24010201:遗迹猎者
 24010202:遗迹猎者（塔防）
 24010281:Formathr_None - [N/A] 2103947025
@@ -380,6 +391,7 @@
 24060901:MachinaIustitia_Ruggiero_01 - [N/A] 2598421161
 24060902:MachinaIustitia_Ruggiero_02 - [N/A] 1178238353
 24060903:MachinaIustitia_Ruggiero_01 - [N/A] 4091306801
+24060990:MachinaIustitia_Ruggiero_04 - [N/A] 2442754929
 24061001:MachinaIustitia_Bradamante_01 - [N/A] 3820417257
 24061002:MachinaIustitia_Bradamante_02 - [N/A] 2286290561
 24061101:MachinaIustitia_LengthShifter_01 - [N/A] 3147408705
@@ -409,6 +421,7 @@
 24065602:MachinaIustitia_Frigate_04 - [N/A] 1620120737
 24065701:MachinaIustitia_Assimilator_03 - [N/A] 4222863585
 24065702:MachinaIustitia_Assimilator_04 - [N/A] 3834516417
+24065790:MachinaIustitia_Assimilator_90 - [N/A] 410434241
 24065801:MachinaIustitia_Ruggiero_03 - [N/A] 3392589561
 24065802:MachinaIustitia_Ruggiero_04 - [N/A] 2337120689
 24065803:MachinaIustitia_Ruggiero_05 - [N/A] 1989788129
@@ -438,14 +451,24 @@
 24069101:MachinaIustitia_LengthShifter_Codex - [N/A] 306536801
 24069201:MachinaIustitia_Excavator_Codex - [N/A] 4236769177
 24810101:防御塔火低级
+24810190:MvM_TowerFire_01 - [N/A] 3268380201
+24810191:MvM_TowerFire_02 - [N/A] 2853693193
 24810201:防御塔火高级
 24810301:防御塔雷低级
+24810390:MvM_TowerElectric_01 - [N/A] 3800466761
+24810391:MvM_TowerElectric_02 - [N/A] 4010007481
 24810401:防御塔雷高级
 24810501:防御塔水低级
+24810590:MvM_TowerWater_01 - [N/A] 3065011249
+24810591:MvM_TowerWater_02 - [N/A] 2040948281
 24810601:防御塔水高级
 24810701:防御塔冰低级
+24810790:MvM_TowerIce_01 - [N/A] 2546590705
+24810791:MvM_TowerIce_02 - [N/A] 1891908609
 24810801:防御塔冰高级
 24810901:防御塔风低级
+24810990:MvM_TowerWind_01 - [N/A] 3672283377
+24810991:MvM_TowerWind_02 - [N/A] 750672833
 24811001:防御塔风高级
 24811101:防御塔物理
 24920101:自律机关-小史莱姆气球
@@ -494,6 +517,7 @@
 25010303:NPC_Quest_Male_Standard_Oppo_13715 - [N/A] 724448633
 25010304:NPC_Quest_Male_Standard_Oppo_13777 - [N/A] 2201891417
 25010381:Thoarder_Male_Standard_NoWeapon_Fire_01 - [N/A] 933629753
+25010390:Thoarder_Male_Standard_NoWeapon_Fire_02 - [N/A] 4261880345
 25010401:盗宝团·水之药剂师
 25010402:Thoarder_Male_Standard_NoWeapon_Water_01_02 - [N/A] 3452436881
 25010403:Thoarder_Male_Standard_NoWeapon_Water_01_02 - [N/A] 4146453193
@@ -503,12 +527,15 @@
 25010501:盗宝团·雷之药剂师
 25010502:NPC_Quest_Male_Standard_Colter_13709 - [N/A] 1419015937
 25010503:NPC_Quest_Male_Standard_Oppo_13711 - [N/A] 3201328753
+25010504:NPC_Quest_Male_Standard_Gaston_14054 - [N/A] 2066425721
+25010505:NPC_Quest_Male_Standard_Florian_14132 - [N/A] 4179062537
 25010581:Thoarder_Male_Standard_NoWeapon_Electric_01 - [N/A] 624542921
 25010601:盗宝团·冰之药剂师
 25010602:Thoarder_Male_Standard_NoWeapon_Ice_02 - [N/A] 726418097
 25010603:Thoarder_Male_Standard_NoWeapon_Ice_03 - [N/A] 2398565441
 25010604:NPC_Quest_Male_Standard_Oppo_13714 - [N/A] 50560321
 25010605:NPC_Fontaine_Male_Standard_RobberB_21418 - [N/A] 859928713
+25010606:NPC_Quest_Male_Standard_Enri_14055 - [N/A] 42107321
 25010681:Thoarder_Male_Standard_NoWeapon_Ice_01 - [N/A] 3749122441
 25010701:盗宝团空手胖
 25010702:NPC_Quest_Male_Fat_Oppo_13873 - [N/A] 2169448041
@@ -520,6 +547,7 @@
 25020104:NPC_Quest_Male_Standard_Truand_13335 - [N/A] 2313699185
 25020105:Thoarder_Male_Crossbow_01_05 - [N/A] 2794240153
 25020106:NPC_Fontaine_Male_Standard_RobberLeader_21417 - [N/A] 3178123705
+25020107:NPC_Quest_Male_Standard_Lazare_14056 - [N/A] 3978033681
 25020201:盗宝团神射手
 25020204:盗宝团神射手（行秋线）
 25020205:Thoarder_Male_Standard_Crossbow_02_04 - [N/A] 763791561
@@ -588,6 +616,7 @@
 25080281:Samurai_Ronin_02 - [N/A] 4200211249
 25080301:野伏·机巧番
 25080381:Samurai_Ronin_03 - [N/A] 2465854769
+25080390:Samurai_Ronin_05 - [N/A] 1736584545
 25080401:寄骑武士
 25080402:幕府武士（剑道）
 25080403:幕府武士（一二阶段）
@@ -598,11 +627,13 @@
 25100181:Samurai_Kairagi_01 - [N/A] 77071577
 25100182:Samurai_Kairagi_01 - [N/A] 391115545
 25100183:Samurai_Kairagi_01 - [N/A] 222568409
+25100190:Samurai_Kairagi_07 - [N/A] 2745601001
 25100201:海乱鬼-火
 25100202:Samurai_Kairagi_07 - [EN] - Pyro Kairagi
 25100281:Samurai_Kairagi_02 - [N/A] 3882445073
 25100282:Samurai_Kairagi_02 - [N/A] 753240097
 25100283:Samurai_Kairagi_02 - [N/A] 3828251937
+25100290:Samurai_Kairagi_08 - [N/A] 1886860641
 25100301:海乱鬼-雷幽灵
 25100302:海乱鬼-雷幽灵
 25100401:海乱鬼-火幽灵
@@ -674,10 +705,12 @@
 25310102:Eremite_Female_Slim_PushDagger_02 - [N/A] 1936242505
 25310181:Eremite_Female_Slim_PushDagger_01 - [N/A] 1365735873
 25310182:Eremite_Female_Slim_PushDagger_01 - [N/A] 1430105225
+25310190:Eremite_Female_Slim_PushDagger_03 - [N/A] 2670641129
 25310201:镀金旅团_双刀_冰
 25310202:镀金NPC - 萨梅尔
 25310281:Eremite_Male_Standard_Glaive_01 - [N/A] 3981952521
 25310282:Eremite_Male_Standard_Glaive_01 - [N/A] 411301145
+25310290:Eremite_Male_Standard_Glaive_03 - [N/A] 423708617
 25310301:镀金旅团_战斧_雷
 25310381:Eremite_Male_Standard_Polearm_01 - [N/A] 3592293337
 25310382:Eremite_Male_Standard_Polearm_01 - [N/A] 1324855129
@@ -702,6 +735,7 @@
 26010301:雷骗骗花
 26030101:幼岩龙蜥
 26030181:Wyrm_Rock - [N/A] 3059435841
+26030190:Wyrm_Rock_02 - [N/A] 557038713
 26040101:岩龙蜥-水
 26040102:岩龙蜥-火
 26040103:岩龙蜥-冰
@@ -734,7 +768,9 @@
 26051201:Drake_DeepSea_Water_03 - [N/A] 1100113145
 26051202:Drake_DeepSea_Water_04 - [N/A] 1628565665
 26060101:雷萤
+26060190:Cicin_Thunder_02 - [N/A] 1457632377
 26060201:水萤
+26060290:Cicin_Water_02 - [N/A] 3625213961
 26060301:冰萤
 26090101:蕈兽-小-飞-水
 26090181:Fungus_Un_Gamma_Water_01 - [N/A] 1665501025
@@ -749,6 +785,7 @@
 26090381:Fungus_Un_Delta_Wind_01 - [N/A] 2441732177
 26090390:Fungus_Un_Delta_Wind_Enemy - [N/A] 3376055609
 26090391:Fungus_Un_Delta_Wind_01_Capture - [N/A] 1573739513
+26090393:Fungus_Un_Delta_Wind_02 - [N/A] 2743236449
 26090401:蕈兽-小-转-雷
 26090481:Fungus_Trois_Epsilon_Electric_01 - [N/A] 4151812377
 26090490:Fungus_Trois_Epsilon_Electric_Enemy - [N/A] 783524481
@@ -822,6 +859,7 @@
 26160202:Aplysia_Mature_01_Land - [N/A] 2244040649
 26160301:SeaHorse_Mature_01_Sea - [N/A] 1544112625
 26160302:SeaHorse_Mature_01_Land - [N/A] 3992435993
+26160390:SeaHorse_Mature_02 - [N/A] 4085486801
 26162101:HermitCrab_Mature_02 - [N/A] 3832936073
 26162201:MantaRay_Larva_03 - [N/A] 1943296953
 26162301:Seal_Larva_02 - [N/A] 1874832521
@@ -1430,18 +1468,42 @@
 28041105:Fishable_Maritime_MachinaIustitia_05 - [N/A] 1211691881

 // 友军
+30010590:Partner_Slime_Electric_04 - [N/A] 1360704329
+30011290:Partner_Slime_Fire_06 - [N/A] 1945956961
 30050501:Partner_Oceanid_Tit - [N/A] 2294162793
+30050590:Partner_Monster_Oceanid_Tit_02 - [N/A] 1992834649
 30050601:Partner_Oceanid_Wigeon_02 - [N/A] 903450313
 30050701:Partner_Oceanid_Squirrel - [N/A] 2642015873
+30060490:Partner_Sylph_Ice_02 - [N/A] 3052301665
+30060690:Partner_Sylph_Fire_02 - [N/A] 2606395609
+31010290:Partner_Hili_None_02_Club - [N/A] 1348459489
+31010990:Partner_Hili_Ice_Range_03 - [N/A] 318427833
+31011090:Partner_Hili_Electric_Range_03 - [N/A] 2029584281
+31020290:Partner_Brute_None_Axe_01 - [N/A] 208842305
+31030190:Partner_Shaman_Water_02 - [N/A] 3800190729
 31040101:Partner_Hilistray_Wind_01 - [N/A] 1924270545
 32110201:Ovacua_Order_02 - [N/A] 569946161
+34010190:Partner_Defender_None_03 - [N/A] 2666244393
 34060101:Partner_MachinaIustitia_Sentry_01 - [N/A] 68219401
 34060102:Partner_MachinaIustitia_Sentry_01 - [N/A] 1581798833
 34060901:Partner_MachinaIustitia_Ruggiero_02 - [N/A] 2221802481
+34060990:Partner_MachinaIustitia_Ruggiero_04 - [N/A] 1146147913
+34065790:Partner_MachinaIustitia_Assimilator_90 - [N/A] 3382698241
+34810190:Partner_MvM_TowerFire_01 - [N/A] 2504772937
+34810191:Partner_MvM_TowerFire_02 - [N/A] 3028471225
+34810390:Partner_MvM_TowerElectric_01 - [N/A] 2883808873
+34810391:Partner_MvM_TowerElectric_02 - [N/A] 1973294081
+34810590:Partner_MvM_TowerWater_01 - [N/A] 3115241505
+34810591:Partner_MvM_TowerWater_02 - [N/A] 3145296577
+34810790:Partner_MvM_TowerIce_01 - [N/A] 941724737
+34810791:Partner_MvM_TowerIce_02 - [N/A] 766759905
+34810990:Partner_MvM_TowerWind_01 - [N/A] 98234177
+34810991:Partner_MvM_TowerWind_02 - [N/A] 1166709913
 35010201:NPC_Fontaine_Male_Standard_Sonny_5132 - [N/A] 2270561153
 35010202:NPC_Quest_Male_Standard_Rouge_21274 - [N/A] 802259057
 35010203:NPC_Quest_Male_Standard_Rocher_21161 - [N/A] 1589132441
 35010204:NPC_Quest_Male_Standard_TieChuaner_21362 - [N/A] 1978991089
+35010390:Partner_Thoarder_Male_Standard_NoWeapon_Fire_02 - [N/A] 642225153
 35010602:Thoarder_Male_Standard_NoWeapon_Ice_02 - [N/A] 2367366025
 35020201:NPC_Fontaine_Male_Standard_Blanc_5233 - [N/A] 295013961
 35020202:NPC_Fontaine_Male_Standard_Bleu_5232 - [N/A] 2091883585
@@ -1450,6 +1512,9 @@
 35060102:NPC_Fontaine_MuscleMan_Standard_Chaussivert_5273 - [N/A] 2070327977
 35060103:NPC_Quest_Muscleman_Standard_Valberry_21163 - [N/A] 2883132241
 35070101:NPC_Quest_MuscleMan_Standard_TieMing_21298 - [N/A] 1105845961
+35080390:Partner_Samurai_Ronin_05 - [N/A] 1710869545
+35100190:Partner_Samurai_Kairagi_07 - [N/A] 1725122433
+35100290:Partner_Samurai_Kairagi_08 - [N/A] 3265297905
 35110101:NPC_Fontaine_Female_Standard_Genevieve_5260 - [N/A] 465377969
 35110102:NPC_Fontaine_Female_Standard_Genevieve_5260 - [N/A] 4203920553
 35110103:NPC_Fontaine_Female_Standard_Genevieve_5260 - [N/A] 387141537
@@ -1471,10 +1536,15 @@
 35210501:NPC - Habachi哈巴奇
 35210502:NPC_Quest_MuscleMan_Standard_Bashar_13107 - [N/A] 4266344825
 35310101:镀金旅团·沙中净水（黄金梦乡）
+35310190:Partner_Eremite_Female_Slim_PushDagger_03 - [N/A] 3316783769
+35310290:Partner_Eremite_Male_Standard_Glaive_03 - [N/A] 2388024745
 35310301:镀金旅团·白日鸣雷（黄金梦乡）
 35410101:Partner_Eremite_Male_Strong_Katar_01 - [N/A] 843060329
 35410201:Partner_Eremite_Female_Standard_Longbow_01 - [N/A] 2996340361
+36030190:Partner_Wyrm_Rock_02 - [N/A] 4078935249
 36050601:Drake_DeepSea_Water_01 - [N/A] 478535833
+36060190:Partner_Cicin_Thunder_02 - [N/A] 90474689
+36060290:Partner_Cicin_Water_02 - [N/A] 4196823585
 36090190:活动-友方飞行水
 36090191:Partner_Fumgus_Un_Gamma_Water - [N/A] 3593336553
 36090192:Partner_Fumgus_Un_Gamma_Water - [N/A] 2780786345
@@ -1484,6 +1554,7 @@
 36090390:活动-友方飞行风
 36090391:Partner_Fumgus_Un_Delta_Wind - [N/A] 637837089
 36090392:Partner_Fumgus_Un_Delta_Wind - [N/A] 2589779561
+36090393:Partner_Fungus_Un_Delta_Wind_02 - [N/A] 2231278801
 36090490:活动-友方旋转雷
 36090491:Partner_Fumgus_Trois_Epsilon_Electric - [N/A] 4089561145
 36090492:Partner_Fumgus_Trois_Epsilon_Electric - [N/A] 2409750417
@@ -1505,6 +1576,7 @@
 36091090:活动-友方伸展雷
 36091091:Partner_Fumgus_Deux_Delta_Electric - [N/A] 2177474001
 36091092:Partner_Fumgus_Deux_Delta_Electric - [N/A] 1670919961
+36160390:Partner_SeaHorse_Mature_02 - [N/A] 2198861673
 38050590:Partner_Animal_Electrohercules_01 - [N/A] 2442210649
 38050591:Partner_Animal_Electrohercules_02 - [N/A] 1954661401
 38060502:Partner_Animal_Megamoth_Jungle_01 - [N/A] 113674993
--- a/Source/GrasscutterTools/Resources/zh-cn/Weapon.txt
+++ b/Source/GrasscutterTools/Resources/zh-cn/Weapon.txt
@@ -44,6 +44,7 @@
 11512:裁叶萃光
 11513:静水流涌之辉
 11514:有乐御簾切
+11515:赦罪
 12101:训练大剑
 12201:佣兵重剑
 12301:铁影阔剑
@@ -179,6 +180,7 @@
 15419:鹮穿之喙
 15424:烈阳之嗣
 15425:静谧之曲
+15426:筑云
 15427:测距规
 15501:天空之翼
 15502:阿莫斯之弓
@@ -188,3 +190,4 @@
 15509:飞雷之弦振
 15511:猎人之径
 15512:最初的大魔术
+15513:白雨心弦