From b2dc16746a499f6a4551683898601f8304790d33 Mon Sep 17 00:00:00 2001 From: dddushesss <37773701+dddushesss@users.noreply.github.com> Date: Mon, 14 Feb 2022 01:45:11 +0300 Subject: [PATCH] Item Fixed --- .../Character/StandartAttack_NEW.anim | 4 +- .../1/Animation/Character/Super_Attack.anim | 4 +- .../1/Character/Prefab/Ariost.prefab | 168 ++++++++--------- .../1/Character/Prefab/Asvald.prefab | 178 ++++++++++-------- .../Resources/1/Character/Prefab/Emir.prefab | 178 ++++++++++-------- .../Resources/1/Character/Prefab/Mats.prefab | 178 ++++++++++-------- .../1/Character/Prefab/Ragnar.prefab | 178 ++++++++++-------- .../Data/Items/SwitchingPlaces.asset | 17 ++ .../Data/Items/SwitchingPlaces.asset.meta | 8 + Assets/Resources/Data/Level 1/ItemData.asset | 2 + Assets/Scripts/AI/AIManager.cs | 2 +- Assets/Scripts/Data/Data.cs | 6 +- Assets/Scripts/Editor/LevelSettings.cs | 59 +++--- Assets/Scripts/GameUI/PlayerInventoryView.cs | 24 ++- Assets/Scripts/Items/Bonus.cs | 12 +- Assets/Scripts/Items/Building.cs | 13 +- Assets/Scripts/Items/CaptureAbility.cs | 21 ++- Assets/Scripts/Items/Item.cs | 6 +- Assets/Scripts/Items/SpecialWeapon.cs | 21 ++- Assets/Scripts/Items/SwitchingPlaces.cs | 56 ++++++ Assets/Scripts/Items/SwitchingPlaces.cs.meta | 3 + Assets/Scripts/Units/PlayerControl.cs | 27 +-- Assets/Scripts/Units/Unit.cs | 5 +- Assets/Scripts/Units/Views/UnitView.cs | 12 +- ProjectSettings/TagManager.asset | 2 +- 25 files changed, 664 insertions(+), 520 deletions(-) create mode 100644 Assets/Resources/Data/Items/SwitchingPlaces.asset create mode 100644 Assets/Resources/Data/Items/SwitchingPlaces.asset.meta create mode 100644 Assets/Scripts/Items/SwitchingPlaces.cs create mode 100644 Assets/Scripts/Items/SwitchingPlaces.cs.meta diff --git a/Assets/Resources/1/Animation/Character/StandartAttack_NEW.anim b/Assets/Resources/1/Animation/Character/StandartAttack_NEW.anim index 79f71d94..22b0ad35 100644 --- a/Assets/Resources/1/Animation/Character/StandartAttack_NEW.anim +++ b/Assets/Resources/1/Animation/Character/StandartAttack_NEW.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f44aaf8615eb575e1e07c0440bfacc1112eacf7f5f2d026f3df880dc3d18a1b -size 2985047 +oid sha256:77efa292962e7c9134f6443fff06c8a491818d38d8439dcd7193ef833f6c8200 +size 2888474 diff --git a/Assets/Resources/1/Animation/Character/Super_Attack.anim b/Assets/Resources/1/Animation/Character/Super_Attack.anim index 6b108d19..be51792c 100644 --- a/Assets/Resources/1/Animation/Character/Super_Attack.anim +++ b/Assets/Resources/1/Animation/Character/Super_Attack.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f41e6134daef2d77e52bf440ee35e2a71d3808b404fdc8a1ac578efd65565fcf -size 7307994 +oid sha256:4ae762d7eb5bbdce76b58a8624288993b369df87c1e8a839944e31d2193844a2 +size 7305108 diff --git a/Assets/Resources/1/Character/Prefab/Ariost.prefab b/Assets/Resources/1/Character/Prefab/Ariost.prefab index df24223d..ea51dd18 100644 --- a/Assets/Resources/1/Character/Prefab/Ariost.prefab +++ b/Assets/Resources/1/Character/Prefab/Ariost.prefab @@ -10,7 +10,7 @@ GameObject: m_Component: - component: {fileID: 6883204351958096366} - component: {fileID: 4912662343870396594} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Knee_Armor_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -97,7 +97,7 @@ GameObject: m_Component: - component: {fileID: 4694339321759696670} - component: {fileID: 5765518534334543026} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Armor_Helmet m_TagString: Untagged m_Icon: {fileID: 0} @@ -180,7 +180,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8101866393354964994} - m_Layer: 0 + m_Layer: 8 m_Name: Base Human m_TagString: Untagged m_Icon: {fileID: 0} @@ -210,7 +210,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6129107727045909686} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail1 2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -241,7 +241,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6223960416660679492} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanSpine1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -272,7 +272,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4147899449959775710} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail3 1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -303,7 +303,7 @@ GameObject: m_Component: - component: {fileID: 4810413504699114589} - component: {fileID: 1077460698320737771} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Helmet_Feather_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -391,7 +391,7 @@ GameObject: - component: {fileID: 6989892133322348515} - component: {fileID: 1151013997447876763} - component: {fileID: 4295594247418136330} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Shoulder_Armor_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -470,7 +470,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5485370121544134095} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRCalf m_TagString: Untagged m_Icon: {fileID: 0} @@ -501,7 +501,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 9053943096523890608} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail2 3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -534,7 +534,7 @@ GameObject: - component: {fileID: 4693052747127179675} - component: {fileID: 3835930957209703811} - component: {fileID: 3577004492532616777} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Elbow_Armor_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -613,7 +613,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6498573141486745310} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRForearm m_TagString: Untagged m_Icon: {fileID: 0} @@ -646,7 +646,7 @@ GameObject: m_Component: - component: {fileID: 1344818660100231224} - component: {fileID: 2297900912476730123} - m_Layer: 0 + m_Layer: 8 m_Name: Directional Light m_TagString: Untagged m_Icon: {fileID: 0} @@ -738,7 +738,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5730789211467925678} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLForearm m_TagString: Untagged m_Icon: {fileID: 0} @@ -772,7 +772,7 @@ GameObject: - component: {fileID: 6419830883034921660} - component: {fileID: 1652879115138484420} - component: {fileID: 412170632032752802} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Torso_Armor m_TagString: Untagged m_Icon: {fileID: 0} @@ -851,7 +851,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 291931098456033719} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit31 m_TagString: Untagged m_Icon: {fileID: 0} @@ -882,7 +882,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 40913154517571792} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit51 m_TagString: Untagged m_Icon: {fileID: 0} @@ -913,7 +913,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2934709259592088156} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit41 m_TagString: Untagged m_Icon: {fileID: 0} @@ -944,7 +944,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7708733371814815158} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail1 1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -975,7 +975,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7029266487065042928} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLCalf m_TagString: Untagged m_Icon: {fileID: 0} @@ -1006,7 +1006,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4314582740373244620} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail4 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1037,7 +1037,7 @@ GameObject: m_Component: - component: {fileID: 60928819828032385} - component: {fileID: 5758144497826521225} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Hand_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1131,7 +1131,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1812580337790182187} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit41 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1162,7 +1162,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 29058939785393810} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRPlatform m_TagString: Untagged m_Icon: {fileID: 0} @@ -1192,7 +1192,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6070854171053054256} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanSpine3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1224,7 +1224,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4616575071514606721} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRibcage m_TagString: Untagged m_Icon: {fileID: 0} @@ -1259,7 +1259,7 @@ GameObject: - component: {fileID: 1415716814518304140} - component: {fileID: 4992813178723686171} - component: {fileID: 5085038826234871392} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Elbow_Armor_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1338,7 +1338,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1047862607229261681} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRUpperarm m_TagString: Untagged m_Icon: {fileID: 0} @@ -1370,7 +1370,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2443218752502911074} - m_Layer: 0 + m_Layer: 8 m_Name: _DONT_Base HumanNeck1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1401,7 +1401,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7448340748400257096} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit52 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1432,7 +1432,7 @@ GameObject: m_Component: - component: {fileID: 6431979180504154335} - component: {fileID: 529592062793113924} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Foot_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1518,7 +1518,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5225103412838541829} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanSpine2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1550,7 +1550,7 @@ GameObject: m_Component: - component: {fileID: 5575541791979349489} - component: {fileID: 2884541352540552726} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Hand_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1644,7 +1644,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 932443298053135914} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit52 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1674,7 +1674,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6907791976229352723} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit11 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1708,7 +1708,7 @@ GameObject: - component: {fileID: 4105327572543419563} - component: {fileID: 1900872271281143359} - component: {fileID: 5890376687783205851} - m_Layer: 0 + m_Layer: 8 m_Name: Ariost m_TagString: Untagged m_Icon: {fileID: 0} @@ -1806,7 +1806,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2916097436652464378} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit12 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1837,7 +1837,7 @@ GameObject: m_Component: - component: {fileID: 4049110387097277270} - component: {fileID: 1983015544488362856} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Arm_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1923,7 +1923,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2404878111580272877} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRFoot m_TagString: Untagged m_Icon: {fileID: 0} @@ -1954,7 +1954,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1844239241033167845} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRPalm m_TagString: Untagged m_Icon: {fileID: 0} @@ -1990,7 +1990,7 @@ GameObject: m_Component: - component: {fileID: 5547982286779426624} - component: {fileID: 6498218744713055762} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Knee_Armor_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2076,7 +2076,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 23085436065403136} - m_Layer: 0 + m_Layer: 8 m_Name: _DONT_Base HumanSpine4 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2107,7 +2107,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5674357787673701230} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail3 3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2139,7 +2139,7 @@ GameObject: m_Component: - component: {fileID: 5211903670733777762} - component: {fileID: 6765341491546692835} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Legs m_TagString: Untagged m_Icon: {fileID: 0} @@ -2234,7 +2234,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 160441042877684212} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit31 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2265,7 +2265,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6001384968312822696} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail1 3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2296,7 +2296,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 861917020943285037} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit32 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2326,7 +2326,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5445926476408986273} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit22 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2356,7 +2356,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 121783794865617796} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail2 1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2387,7 +2387,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 815149691631705453} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail4 1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2418,7 +2418,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8088790849113165327} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2449,7 +2449,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5723024736760908226} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanFootBone001 1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2479,7 +2479,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 910872765131509817} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail2 2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2510,7 +2510,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 208908627841483678} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2541,7 +2541,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 205343715156658265} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail5 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2572,7 +2572,7 @@ GameObject: m_Component: - component: {fileID: 7420991364686402344} - component: {fileID: 5261007101627874884} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Foot_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2658,7 +2658,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4610339647413663920} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRThigh m_TagString: Untagged m_Icon: {fileID: 0} @@ -2689,7 +2689,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 9146071027887699499} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLUpperarm m_TagString: Untagged m_Icon: {fileID: 0} @@ -2722,7 +2722,7 @@ GameObject: m_Component: - component: {fileID: 6029119786723386553} - component: {fileID: 3485271364007879237} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Helmet_Feather_03 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2808,7 +2808,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7290641135589554342} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit42 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2838,7 +2838,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 755508916434296962} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit21 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2869,7 +2869,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6872272955445742526} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit21 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2900,7 +2900,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7712909136472922434} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2931,7 +2931,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4392720579971765264} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit51 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2963,7 +2963,7 @@ GameObject: m_Component: - component: {fileID: 1823674947342043885} - component: {fileID: 5945613682891009746} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Helmet_Feather_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3049,7 +3049,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6815287241018412103} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit42 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3079,7 +3079,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5824056655462286518} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLThigh m_TagString: Untagged m_Icon: {fileID: 0} @@ -3110,7 +3110,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 311488669084522645} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanFootBone001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3141,7 +3141,7 @@ GameObject: m_Component: - component: {fileID: 762334722203785836} - component: {fileID: 8983723231154842395} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Arm_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3227,7 +3227,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 121234972051077202} - m_Layer: 0 + m_Layer: 8 m_Name: _DONT_Base HumanNeck2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3258,7 +3258,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1763380401724276970} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanPelvis m_TagString: Untagged m_Icon: {fileID: 0} @@ -3294,7 +3294,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2208569388986898819} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail3 2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3326,7 +3326,7 @@ GameObject: - component: {fileID: 5150456170022715053} - component: {fileID: 2780832568181477116} - component: {fileID: 3295840723795373478} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Shoulder_Armor_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3405,7 +3405,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 767085373646631961} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLFoot m_TagString: Untagged m_Icon: {fileID: 0} @@ -3436,7 +3436,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4598887309813658657} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit12 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3466,7 +3466,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1964187253938685733} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit22 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3497,7 +3497,7 @@ GameObject: m_Component: - component: {fileID: 3524705131327862984} - component: {fileID: 6541130630822603112} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Torso m_TagString: Untagged m_Icon: {fileID: 0} @@ -3598,7 +3598,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3334382005798018682} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit32 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3628,7 +3628,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4672659128853226903} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLPalm m_TagString: Untagged m_Icon: {fileID: 0} @@ -3663,7 +3663,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 623508205329552522} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanHead m_TagString: Untagged m_Icon: {fileID: 0} @@ -3694,7 +3694,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4123498391059465386} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLPlatform m_TagString: Untagged m_Icon: {fileID: 0} @@ -3724,7 +3724,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 118756096065048111} - m_Layer: 0 + m_Layer: 8 m_Name: _DONT_Base HumanLCollarbone m_TagString: Untagged m_Icon: {fileID: 0} @@ -3755,7 +3755,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6682341636979740279} - m_Layer: 0 + m_Layer: 8 m_Name: _DONT_Base HumanRCollarbone m_TagString: Untagged m_Icon: {fileID: 0} @@ -3786,7 +3786,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8440724430656586639} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit11 m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Resources/1/Character/Prefab/Asvald.prefab b/Assets/Resources/1/Character/Prefab/Asvald.prefab index 47f8dd8d..f2ae9994 100644 --- a/Assets/Resources/1/Character/Prefab/Asvald.prefab +++ b/Assets/Resources/1/Character/Prefab/Asvald.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4135075174020579949} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit42 m_TagString: Untagged m_Icon: {fileID: 0} @@ -39,7 +39,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6211353189725641289} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit21 m_TagString: Untagged m_Icon: {fileID: 0} @@ -70,7 +70,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 220681183388561781} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit21 m_TagString: Untagged m_Icon: {fileID: 0} @@ -101,7 +101,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3983137504193127305} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -132,7 +132,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6969645408136015579} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit51 m_TagString: Untagged m_Icon: {fileID: 0} @@ -164,7 +164,7 @@ GameObject: m_Component: - component: {fileID: 1145197482520600178} - component: {fileID: 7787032016551483534} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Helmet_Feather_03 m_TagString: Untagged m_Icon: {fileID: 0} @@ -250,7 +250,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7184372742947291771} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRThigh m_TagString: Untagged m_Icon: {fileID: 0} @@ -281,7 +281,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2495676639155719392} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLUpperarm m_TagString: Untagged m_Icon: {fileID: 0} @@ -313,7 +313,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5830792068693175026} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail2 2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -344,7 +344,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6820986134917773653} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -375,7 +375,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6815833613190787730} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail5 m_TagString: Untagged m_Icon: {fileID: 0} @@ -406,7 +406,7 @@ GameObject: m_Component: - component: {fileID: 4229895833790523875} - component: {fileID: 1535139920634758287} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Foot_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -492,7 +492,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6269237013406869414} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail4 1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -523,7 +523,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3174505443400676548} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -554,7 +554,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1379076922302706441} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanFootBone001 1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -584,7 +584,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1719498526366523498} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit22 m_TagString: Untagged m_Icon: {fileID: 0} @@ -614,7 +614,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6773301952261374287} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail2 1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -645,7 +645,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6806403368018043711} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit31 m_TagString: Untagged m_Icon: {fileID: 0} @@ -676,7 +676,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1082553166572380515} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail1 3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -707,7 +707,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6321109376279839206} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit32 m_TagString: Untagged m_Icon: {fileID: 0} @@ -738,7 +738,7 @@ GameObject: m_Component: - component: {fileID: 1448845491059478953} - component: {fileID: 120578717624362536} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Legs m_TagString: Untagged m_Icon: {fileID: 0} @@ -833,7 +833,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6767462733492024548} - m_Layer: 0 + m_Layer: 8 m_Name: _DONT_Base HumanLCollarbone m_TagString: Untagged m_Icon: {fileID: 0} @@ -864,7 +864,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 68470824425239740} - m_Layer: 0 + m_Layer: 8 m_Name: _DONT_Base HumanRCollarbone m_TagString: Untagged m_Icon: {fileID: 0} @@ -895,7 +895,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2984841658079492420} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit11 m_TagString: Untagged m_Icon: {fileID: 0} @@ -927,7 +927,7 @@ GameObject: m_Component: - component: {fileID: 7828794566813270531} - component: {fileID: 471171710276162467} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Torso m_TagString: Untagged m_Icon: {fileID: 0} @@ -1028,7 +1028,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8217144414219887793} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit32 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1058,7 +1058,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2060305788687785820} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLPalm m_TagString: Untagged m_Icon: {fileID: 0} @@ -1093,7 +1093,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6118165256546512449} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanHead m_TagString: Untagged m_Icon: {fileID: 0} @@ -1124,7 +1124,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7311216287330106977} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLPlatform m_TagString: Untagged m_Icon: {fileID: 0} @@ -1154,7 +1154,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6262835407993966290} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLFoot m_TagString: Untagged m_Icon: {fileID: 0} @@ -1185,7 +1185,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7178091490824703722} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit12 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1215,7 +1215,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5119751018497670638} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit22 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1247,7 +1247,7 @@ GameObject: - component: {fileID: 1960520574498161766} - component: {fileID: 8852022940278567991} - component: {fileID: 8210658225493907309} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Shoulder_Armor_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1326,7 +1326,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4915673133262551585} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanPelvis m_TagString: Untagged m_Icon: {fileID: 0} @@ -1362,7 +1362,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6764834466295153305} - m_Layer: 0 + m_Layer: 8 m_Name: _DONT_Base HumanNeck2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1393,7 +1393,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4821483428547355464} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail3 2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1424,7 +1424,7 @@ GameObject: m_Component: - component: {fileID: 6258711480188133543} - component: {fileID: 2369926001070854608} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Arm_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1510,7 +1510,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6349392408311325278} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanFootBone001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1540,7 +1540,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 908609065959472765} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLThigh m_TagString: Untagged m_Icon: {fileID: 0} @@ -1572,7 +1572,7 @@ GameObject: m_Component: - component: {fileID: 4972481111020597286} - component: {fileID: 1066266445648319513} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Helmet_Feather_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1658,7 +1658,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 206022268730832524} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit42 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1688,7 +1688,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4450624242143405371} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLCalf m_TagString: Untagged m_Icon: {fileID: 0} @@ -1719,7 +1719,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7471271322351857671} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail4 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1750,7 +1750,7 @@ GameObject: m_Component: - component: {fileID: 6671878314003396938} - component: {fileID: 1415883333001484866} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Hand_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1844,7 +1844,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6691902397407289883} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit51 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1875,7 +1875,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3942302939394760573} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail1 1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1906,7 +1906,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8427674231003398295} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit41 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1939,7 +1939,7 @@ GameObject: - component: {fileID: 385305874605932663} - component: {fileID: 5386031677373886991} - component: {fileID: 6482756342523883113} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Torso_Armor m_TagString: Untagged m_Icon: {fileID: 0} @@ -2018,7 +2018,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6359670104627508092} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit31 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2049,7 +2049,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1425646459009446501} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLForearm m_TagString: Untagged m_Icon: {fileID: 0} @@ -2081,7 +2081,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1175651272423839492} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRCalf m_TagString: Untagged m_Icon: {fileID: 0} @@ -2112,7 +2112,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2443522535217358203} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail2 3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2145,7 +2145,7 @@ GameObject: - component: {fileID: 2120668834591224656} - component: {fileID: 7598915537515212616} - component: {fileID: 7920460826245395586} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Elbow_Armor_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2224,7 +2224,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 459545683139283989} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRForearm m_TagString: Untagged m_Icon: {fileID: 0} @@ -2256,7 +2256,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3179733774094822089} - m_Layer: 0 + m_Layer: 8 m_Name: Base Human m_TagString: Untagged m_Icon: {fileID: 0} @@ -2286,7 +2286,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 725291262827303311} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanSpine1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2317,7 +2317,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 667030322987050621} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail1 2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2348,7 +2348,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7340725662220617493} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail3 1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2379,7 +2379,7 @@ GameObject: m_Component: - component: {fileID: 2201475247666355862} - component: {fileID: 5961881081274232608} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Helmet_Feather_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2467,7 +2467,7 @@ GameObject: - component: {fileID: 4417510435647597864} - component: {fileID: 6032020482843273808} - component: {fileID: 7481103228456877505} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Shoulder_Armor_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2547,7 +2547,7 @@ GameObject: m_Component: - component: {fileID: 272817876451222309} - component: {fileID: 1757102963672203897} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Knee_Armor_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2634,7 +2634,7 @@ GameObject: m_Component: - component: {fileID: 2119672840264383957} - component: {fileID: 886099741712191097} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Armor_Helmet m_TagString: Untagged m_Icon: {fileID: 0} @@ -2717,7 +2717,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6637522580184705995} - m_Layer: 0 + m_Layer: 8 m_Name: _DONT_Base HumanSpine4 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2748,7 +2748,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1364711437588615589} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail3 3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2779,7 +2779,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 9011954010306396710} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRFoot m_TagString: Untagged m_Icon: {fileID: 0} @@ -2810,7 +2810,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5032559673035508014} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRPalm m_TagString: Untagged m_Icon: {fileID: 0} @@ -2846,7 +2846,7 @@ GameObject: m_Component: - component: {fileID: 1202839283703438731} - component: {fileID: 459785038751003865} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Knee_Armor_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2935,7 +2935,7 @@ GameObject: - component: {fileID: -4568693640035559416} - component: {fileID: 8911891366586862002} - component: {fileID: 3288245434296440335} - m_Layer: 0 + m_Layer: 8 m_Name: Asvald m_TagString: Untagged m_Icon: {fileID: 0} @@ -3033,7 +3033,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8374228695626945073} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit12 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3064,7 +3064,7 @@ GameObject: m_Component: - component: {fileID: 7241339582013630877} - component: {fileID: 5172988542483986851} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Arm_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -3151,7 +3151,7 @@ GameObject: m_Component: - component: {fileID: 1238347177003376442} - component: {fileID: 8379158873016648925} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Hand_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3245,7 +3245,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5818518464389997793} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit52 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3275,7 +3275,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 257369001956691928} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit11 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3306,7 +3306,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1498705081003856078} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanSpine2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3339,7 +3339,7 @@ GameObject: - component: {fileID: 5758575032276862791} - component: {fileID: 1802911720790044112} - component: {fileID: 1936156776662467755} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Elbow_Armor_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -3418,7 +3418,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5964440424762469818} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRUpperarm m_TagString: Untagged m_Icon: {fileID: 0} @@ -3450,7 +3450,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 9054272684029946537} - m_Layer: 0 + m_Layer: 8 m_Name: _DONT_Base HumanNeck1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3481,7 +3481,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4256713057227772547} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit52 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3512,7 +3512,7 @@ GameObject: m_Component: - component: {fileID: 364168657758747156} - component: {fileID: 6563519984864369551} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Foot_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3598,7 +3598,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5001431815655102944} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit41 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3629,7 +3629,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6640574666343173209} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRPlatform m_TagString: Untagged m_Icon: {fileID: 0} @@ -3659,7 +3659,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 580738119904666619} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanSpine3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3691,7 +3691,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2044191243808785994} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRibcage m_TagString: Untagged m_Icon: {fileID: 0} @@ -3766,10 +3766,22 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5327400453591611590, guid: 04efd775509c00144993f7b46ecc2812, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 5327400453591614774, guid: 04efd775509c00144993f7b46ecc2812, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} - target: {fileID: 5327400453591714386, guid: 04efd775509c00144993f7b46ecc2812, type: 3} propertyPath: m_Name value: OpponentAura objectReference: {fileID: 0} + - target: {fileID: 5327400453591714386, guid: 04efd775509c00144993f7b46ecc2812, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 04efd775509c00144993f7b46ecc2812, type: 3} --- !u!4 &6357826002191603761 stripped diff --git a/Assets/Resources/1/Character/Prefab/Emir.prefab b/Assets/Resources/1/Character/Prefab/Emir.prefab index fe96f34a..d579149a 100644 --- a/Assets/Resources/1/Character/Prefab/Emir.prefab +++ b/Assets/Resources/1/Character/Prefab/Emir.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4477717238050342063} - m_Layer: 0 + m_Layer: 8 m_Name: _DONT_Base HumanSpine4 m_TagString: Untagged m_Icon: {fileID: 0} @@ -40,7 +40,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8127121931348000449} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail3 3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -71,7 +71,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2245572080811715906} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRFoot m_TagString: Untagged m_Icon: {fileID: 0} @@ -102,7 +102,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2877243670897469002} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRPalm m_TagString: Untagged m_Icon: {fileID: 0} @@ -138,7 +138,7 @@ GameObject: m_Component: - component: {fileID: 8252965548085621487} - component: {fileID: 7230607862960200637} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Knee_Armor_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -225,7 +225,7 @@ GameObject: m_Component: - component: {fileID: 452431992228447993} - component: {fileID: 2734562589375010503} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Arm_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -314,7 +314,7 @@ GameObject: - component: {fileID: -4047225411828250527} - component: {fileID: 1571523103774403885} - component: {fileID: 8290923392032443996} - m_Layer: 0 + m_Layer: 8 m_Name: Emir m_TagString: Untagged m_Icon: {fileID: 0} @@ -412,7 +412,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1589215575892262229} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit12 m_TagString: Untagged m_Icon: {fileID: 0} @@ -442,7 +442,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7037824646531129532} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit11 m_TagString: Untagged m_Icon: {fileID: 0} @@ -474,7 +474,7 @@ GameObject: m_Component: - component: {fileID: 8292892413845680222} - component: {fileID: 1617349845600775097} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Hand_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -568,7 +568,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3640804276326697861} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit52 m_TagString: Untagged m_Icon: {fileID: 0} @@ -598,7 +598,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8571832028925247402} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanSpine2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -629,7 +629,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6425469522857000423} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit52 m_TagString: Untagged m_Icon: {fileID: 0} @@ -660,7 +660,7 @@ GameObject: m_Component: - component: {fileID: 7436836009148618096} - component: {fileID: 4120640975241344235} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Foot_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -748,7 +748,7 @@ GameObject: - component: {fileID: 3302170965955487779} - component: {fileID: 8879973855255151284} - component: {fileID: 8712116519058271183} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Elbow_Armor_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -827,7 +827,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2278265663770969549} - m_Layer: 0 + m_Layer: 8 m_Name: _DONT_Base HumanNeck1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -858,7 +858,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3529917704244495070} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRUpperarm m_TagString: Untagged m_Icon: {fileID: 0} @@ -890,7 +890,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7653315313351216287} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanSpine3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -922,7 +922,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 9108344013119203630} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRibcage m_TagString: Untagged m_Icon: {fileID: 0} @@ -955,7 +955,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2833217408856815236} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit41 m_TagString: Untagged m_Icon: {fileID: 0} @@ -986,7 +986,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4472414170314089277} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRPlatform m_TagString: Untagged m_Icon: {fileID: 0} @@ -1016,7 +1016,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 402634745092054883} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail4 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1046,7 +1046,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6916104811311680095} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLCalf m_TagString: Untagged m_Icon: {fileID: 0} @@ -1078,7 +1078,7 @@ GameObject: m_Component: - component: {fileID: 4516686556012254766} - component: {fileID: 8187264743474099494} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Hand_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1172,7 +1172,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6092495251639054361} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail1 1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1203,7 +1203,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1642730344866295795} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit41 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1234,7 +1234,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4532681994653568383} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit51 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1267,7 +1267,7 @@ GameObject: - component: {fileID: 7449475102370656019} - component: {fileID: 2920088212602248555} - component: {fileID: 4309482017174749453} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Torso_Armor m_TagString: Untagged m_Icon: {fileID: 0} @@ -1346,7 +1346,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4214012212762057752} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit31 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1377,7 +1377,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8210574916481998081} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLForearm m_TagString: Untagged m_Icon: {fileID: 0} @@ -1409,7 +1409,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4886433395248433695} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail2 3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1442,7 +1442,7 @@ GameObject: - component: {fileID: 9175831995226545204} - component: {fileID: 814587412589248556} - component: {fileID: 1140002981914713062} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Elbow_Armor_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1521,7 +1521,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7230979834271081329} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRForearm m_TagString: Untagged m_Icon: {fileID: 0} @@ -1553,7 +1553,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8244396700331309152} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRCalf m_TagString: Untagged m_Icon: {fileID: 0} @@ -1585,7 +1585,7 @@ GameObject: m_Component: - component: {fileID: 8985822098045710834} - component: {fileID: 3496447825461477444} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Helmet_Feather_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1673,7 +1673,7 @@ GameObject: - component: {fileID: 6878999744324190796} - component: {fileID: 3571127110479742260} - component: {fileID: 426448040784188069} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Shoulder_Armor_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1752,7 +1752,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5627692493212648877} - m_Layer: 0 + m_Layer: 8 m_Name: Base Human m_TagString: Untagged m_Icon: {fileID: 0} @@ -1782,7 +1782,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7505806281633791723} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanSpine1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1813,7 +1813,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7744220000464390425} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail1 2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1844,7 +1844,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 569217843680798833} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail3 1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1875,7 +1875,7 @@ GameObject: m_Component: - component: {fileID: 7057147135722589249} - component: {fileID: 8816711415388613917} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Knee_Armor_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1962,7 +1962,7 @@ GameObject: m_Component: - component: {fileID: 9174866752866685617} - component: {fileID: 7959325645278503197} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Armor_Helmet m_TagString: Untagged m_Icon: {fileID: 0} @@ -2045,7 +2045,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5428370443242624544} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit11 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2076,7 +2076,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4599265952701684608} - m_Layer: 0 + m_Layer: 8 m_Name: _DONT_Base HumanLCollarbone m_TagString: Untagged m_Icon: {fileID: 0} @@ -2107,7 +2107,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7118636705719081944} - m_Layer: 0 + m_Layer: 8 m_Name: _DONT_Base HumanRCollarbone m_TagString: Untagged m_Icon: {fileID: 0} @@ -2138,7 +2138,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 526802401302483205} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLPlatform m_TagString: Untagged m_Icon: {fileID: 0} @@ -2168,7 +2168,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3949988266836361509} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanHead m_TagString: Untagged m_Icon: {fileID: 0} @@ -2200,7 +2200,7 @@ GameObject: m_Component: - component: {fileID: 1052800706869767527} - component: {fileID: 7255522925012335815} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Torso m_TagString: Untagged m_Icon: {fileID: 0} @@ -2301,7 +2301,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 9128399206799896632} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLPalm m_TagString: Untagged m_Icon: {fileID: 0} @@ -2336,7 +2336,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1166452965695818709} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit32 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2366,7 +2366,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 118377451565162894} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit12 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2396,7 +2396,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2680831350106624650} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit22 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2426,7 +2426,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3806443401064309174} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLFoot m_TagString: Untagged m_Icon: {fileID: 0} @@ -2459,7 +2459,7 @@ GameObject: - component: {fileID: 8722364821181803266} - component: {fileID: 1792864153849879379} - component: {fileID: 1426275090221070345} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Shoulder_Armor_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2538,7 +2538,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2364497720637787180} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail3 2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2568,7 +2568,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2742341633443026245} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanPelvis m_TagString: Untagged m_Icon: {fileID: 0} @@ -2604,7 +2604,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4600636608427781629} - m_Layer: 0 + m_Layer: 8 m_Name: _DONT_Base HumanNeck2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2636,7 +2636,7 @@ GameObject: m_Component: - component: {fileID: 3810699951024672707} - component: {fileID: 4817321768360558260} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Arm_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2722,7 +2722,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4189659667227217210} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanFootBone001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2752,7 +2752,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7972845397215269145} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLThigh m_TagString: Untagged m_Icon: {fileID: 0} @@ -2784,7 +2784,7 @@ GameObject: m_Component: - component: {fileID: 2826280060411027266} - component: {fileID: 7851208097931475837} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Helmet_Feather_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2870,7 +2870,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6981366317637704168} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit42 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2900,7 +2900,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 180174867323699647} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit51 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2931,7 +2931,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6160864851701714157} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2962,7 +2962,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6583004205859073289} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit42 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2992,7 +2992,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3749830896039982381} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit21 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3023,7 +3023,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7001197300292099601} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit21 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3055,7 +3055,7 @@ GameObject: m_Component: - component: {fileID: 7916682245344506134} - component: {fileID: 1020104729156155370} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Helmet_Feather_03 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3141,7 +3141,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4655410477738189700} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLUpperarm m_TagString: Untagged m_Icon: {fileID: 0} @@ -3173,7 +3173,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 111815340777155871} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRThigh m_TagString: Untagged m_Icon: {fileID: 0} @@ -3204,7 +3204,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4364051003604604465} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3235,7 +3235,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4372871040813899254} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail5 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3266,7 +3266,7 @@ GameObject: m_Component: - component: {fileID: 6380088146366056071} - component: {fileID: 8607735805242092523} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Foot_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -3352,7 +3352,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3662018010211042710} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail2 2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3383,7 +3383,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8149910739883383917} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanFootBone001 1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3413,7 +3413,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3835367437829769410} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail4 1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3444,7 +3444,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5636009079346928544} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3475,7 +3475,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8495435177945403150} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit22 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3505,7 +3505,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4595538285901033003} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail2 1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3536,7 +3536,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3855130727136128642} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit32 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3566,7 +3566,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7872076484077948423} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail1 3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3597,7 +3597,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4344856850577329243} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit31 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3629,7 +3629,7 @@ GameObject: m_Component: - component: {fileID: 8512488051009633997} - component: {fileID: 7175740744853981516} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Legs m_TagString: Untagged m_Icon: {fileID: 0} @@ -3766,10 +3766,22 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5327400453591611590, guid: 04efd775509c00144993f7b46ecc2812, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 5327400453591614774, guid: 04efd775509c00144993f7b46ecc2812, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} - target: {fileID: 5327400453591714386, guid: 04efd775509c00144993f7b46ecc2812, type: 3} propertyPath: m_Name value: OpponentAura objectReference: {fileID: 0} + - target: {fileID: 5327400453591714386, guid: 04efd775509c00144993f7b46ecc2812, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 04efd775509c00144993f7b46ecc2812, type: 3} --- !u!4 &3042908496708137954 stripped diff --git a/Assets/Resources/1/Character/Prefab/Mats.prefab b/Assets/Resources/1/Character/Prefab/Mats.prefab index 3c42ac73..4f34f102 100644 --- a/Assets/Resources/1/Character/Prefab/Mats.prefab +++ b/Assets/Resources/1/Character/Prefab/Mats.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3498261247662470} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanFootBone001 1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -39,7 +39,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4548918613507432011} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -70,7 +70,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4913382491742391593} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail4 1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -101,7 +101,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5679180675757566912} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail2 1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -132,7 +132,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 356901808223242981} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit22 m_TagString: Untagged m_Icon: {fileID: 0} @@ -162,7 +162,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4942153024361999209} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit32 m_TagString: Untagged m_Icon: {fileID: 0} @@ -192,7 +192,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2029182654555900908} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail1 3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -223,7 +223,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5573812896183994800} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit31 m_TagString: Untagged m_Icon: {fileID: 0} @@ -255,7 +255,7 @@ GameObject: m_Component: - component: {fileID: 519127599481617190} - component: {fileID: 1334045384112983207} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Legs m_TagString: Untagged m_Icon: {fileID: 0} @@ -350,7 +350,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2623884400135407878} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -381,7 +381,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8328911714683978836} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit51 m_TagString: Untagged m_Icon: {fileID: 0} @@ -412,7 +412,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4979910608169414854} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit21 m_TagString: Untagged m_Icon: {fileID: 0} @@ -443,7 +443,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1170688362228079610} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit21 m_TagString: Untagged m_Icon: {fileID: 0} @@ -474,7 +474,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3048275554143676642} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit42 m_TagString: Untagged m_Icon: {fileID: 0} @@ -505,7 +505,7 @@ GameObject: m_Component: - component: {fileID: 2074916481501164797} - component: {fileID: 9168769041933808129} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Helmet_Feather_03 m_TagString: Untagged m_Icon: {fileID: 0} @@ -591,7 +591,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3570640024383465071} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLUpperarm m_TagString: Untagged m_Icon: {fileID: 0} @@ -623,7 +623,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8114112623788321012} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRThigh m_TagString: Untagged m_Icon: {fileID: 0} @@ -654,7 +654,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5600698987558623261} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail5 m_TagString: Untagged m_Icon: {fileID: 0} @@ -685,7 +685,7 @@ GameObject: m_Component: - component: {fileID: 2998413669240931180} - component: {fileID: 460197425555041792} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Foot_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -771,7 +771,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5586179056200995802} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -802,7 +802,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4883090564929159293} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail2 2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -833,7 +833,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5892470980429367751} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail3 2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -863,7 +863,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6276012553902395566} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanPelvis m_TagString: Untagged m_Icon: {fileID: 0} @@ -899,7 +899,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5678651672036026390} - m_Layer: 0 + m_Layer: 8 m_Name: _DONT_Base HumanNeck2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -931,7 +931,7 @@ GameObject: m_Component: - component: {fileID: 5040779706105907752} - component: {fileID: 3732553513964632927} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Arm_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1017,7 +1017,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5418543110705662161} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanFootBone001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1047,7 +1047,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2284202012075857138} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLThigh m_TagString: Untagged m_Icon: {fileID: 0} @@ -1078,7 +1078,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1293917002161740803} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit42 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1109,7 +1109,7 @@ GameObject: m_Component: - component: {fileID: 6210138124678191785} - component: {fileID: 2153627924161134230} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Helmet_Feather_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1195,7 +1195,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4198290732150723531} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit11 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1226,7 +1226,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5676155116370615915} - m_Layer: 0 + m_Layer: 8 m_Name: _DONT_Base HumanLCollarbone m_TagString: Untagged m_Icon: {fileID: 0} @@ -1257,7 +1257,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1431119228037832243} - m_Layer: 0 + m_Layer: 8 m_Name: _DONT_Base HumanRCollarbone m_TagString: Untagged m_Icon: {fileID: 0} @@ -1288,7 +1288,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5172116319430132942} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanHead m_TagString: Untagged m_Icon: {fileID: 0} @@ -1319,7 +1319,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8528044160767841518} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLPlatform m_TagString: Untagged m_Icon: {fileID: 0} @@ -1350,7 +1350,7 @@ GameObject: m_Component: - component: {fileID: 9190278588448696460} - component: {fileID: 1560192352063879468} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Torso m_TagString: Untagged m_Icon: {fileID: 0} @@ -1451,7 +1451,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1132857289911285203} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLPalm m_TagString: Untagged m_Icon: {fileID: 0} @@ -1486,7 +1486,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7000339638847819326} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit32 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1516,7 +1516,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6062435458452445025} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit22 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1546,7 +1546,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8120745145263547493} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit12 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1576,7 +1576,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5027447778579391581} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLFoot m_TagString: Untagged m_Icon: {fileID: 0} @@ -1609,7 +1609,7 @@ GameObject: - component: {fileID: 583833606392901353} - component: {fileID: 7635758025283509944} - component: {fileID: 7123855298384707042} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Shoulder_Armor_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1688,7 +1688,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 65288346308974826} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLForearm m_TagString: Untagged m_Icon: {fileID: 0} @@ -1720,7 +1720,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1535649253737752218} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRForearm m_TagString: Untagged m_Icon: {fileID: 0} @@ -1752,7 +1752,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3658673653693796340} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail2 3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1785,7 +1785,7 @@ GameObject: - component: {fileID: 1027167682383321567} - component: {fileID: 8816886894693402055} - component: {fileID: 9134491541936922125} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Elbow_Armor_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1864,7 +1864,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 252159915361713547} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRCalf m_TagString: Untagged m_Icon: {fileID: 0} @@ -1897,7 +1897,7 @@ GameObject: - component: {fileID: 3342019292759459751} - component: {fileID: 4654769464870813919} - component: {fileID: 8429943825862367054} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Shoulder_Armor_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1977,7 +1977,7 @@ GameObject: m_Component: - component: {fileID: 982396682815861785} - component: {fileID: 4725333466958120367} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Helmet_Feather_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2063,7 +2063,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8570461802170953114} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail3 1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2093,7 +2093,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4544050129057792070} - m_Layer: 0 + m_Layer: 8 m_Name: Base Human m_TagString: Untagged m_Icon: {fileID: 0} @@ -2123,7 +2123,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1819412530606455552} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanSpine1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2154,7 +2154,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1904703828787956978} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail1 2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2186,7 +2186,7 @@ GameObject: m_Component: - component: {fileID: 1028383905452218202} - component: {fileID: 2261675095244612854} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Armor_Helmet m_TagString: Untagged m_Icon: {fileID: 0} @@ -2270,7 +2270,7 @@ GameObject: m_Component: - component: {fileID: 1217701331783207338} - component: {fileID: 814414124825110774} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Knee_Armor_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2357,7 +2357,7 @@ GameObject: m_Component: - component: {fileID: 5744446307267302341} - component: {fileID: 38598230598365389} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Hand_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2451,7 +2451,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8394801170915089032} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail4 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2481,7 +2481,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3381307956519112628} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLCalf m_TagString: Untagged m_Icon: {fileID: 0} @@ -2512,7 +2512,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2709694883264689650} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail1 1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2543,7 +2543,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7483302040125237784} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit41 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2574,7 +2574,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5760512148912392340} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit51 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2607,7 +2607,7 @@ GameObject: - component: {fileID: 1619038739558247160} - component: {fileID: 6453691007428597888} - component: {fileID: 5393194741384791270} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Torso_Armor m_TagString: Untagged m_Icon: {fileID: 0} @@ -2686,7 +2686,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5435014356960762355} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit31 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2717,7 +2717,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 568406647991171649} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanSpine2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2748,7 +2748,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2899750236163487756} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit52 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2779,7 +2779,7 @@ GameObject: m_Component: - component: {fileID: 1595070279631982747} - component: {fileID: 5204283373755937024} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Foot_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2865,7 +2865,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7964659413759131686} - m_Layer: 0 + m_Layer: 8 m_Name: _DONT_Base HumanNeck1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2896,7 +2896,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4749864351539087157} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRUpperarm m_TagString: Untagged m_Icon: {fileID: 0} @@ -2930,7 +2930,7 @@ GameObject: - component: {fileID: 6684903129210613192} - component: {fileID: 732433251915859807} - component: {fileID: 716502067721252388} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Elbow_Armor_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -3009,7 +3009,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1954607040647596404} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanSpine3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3041,7 +3041,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1112802086532869317} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRibcage m_TagString: Untagged m_Icon: {fileID: 0} @@ -3074,7 +3074,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6217145883675374447} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit41 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3105,7 +3105,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5694544412334548694} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRPlatform m_TagString: Untagged m_Icon: {fileID: 0} @@ -3135,7 +3135,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5706673291175788868} - m_Layer: 0 + m_Layer: 8 m_Name: _DONT_Base HumanSpine4 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3166,7 +3166,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 134957714212453162} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail3 3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3197,7 +3197,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6266799404419244961} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRPalm m_TagString: Untagged m_Icon: {fileID: 0} @@ -3233,7 +3233,7 @@ GameObject: m_Component: - component: {fileID: 260730996531558148} - component: {fileID: 1535277290013843030} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Knee_Armor_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3319,7 +3319,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7944348565077059753} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRFoot m_TagString: Untagged m_Icon: {fileID: 0} @@ -3351,7 +3351,7 @@ GameObject: m_Component: - component: {fileID: 8597791130170475282} - component: {fileID: 6117365122380419884} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Arm_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -3440,7 +3440,7 @@ GameObject: - component: {fileID: -1510388322638865353} - component: {fileID: 2198464067484123790} - component: {fileID: 5657146932405139005} - m_Layer: 0 + m_Layer: 8 m_Name: Mats m_TagString: Untagged m_Icon: {fileID: 0} @@ -3538,7 +3538,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7428729505630337214} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit12 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3568,7 +3568,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1206192016139380055} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit11 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3599,7 +3599,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4868564053249838702} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit52 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3630,7 +3630,7 @@ GameObject: m_Component: - component: {fileID: 144225909460825525} - component: {fileID: 7451163908134235730} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Hand_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -3766,10 +3766,22 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5327400453591611590, guid: 04efd775509c00144993f7b46ecc2812, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 5327400453591614774, guid: 04efd775509c00144993f7b46ecc2812, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} - target: {fileID: 5327400453591714386, guid: 04efd775509c00144993f7b46ecc2812, type: 3} propertyPath: m_Name value: OpponentAura objectReference: {fileID: 0} + - target: {fileID: 5327400453591714386, guid: 04efd775509c00144993f7b46ecc2812, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 04efd775509c00144993f7b46ecc2812, type: 3} --- !u!4 &5471074635269416062 stripped diff --git a/Assets/Resources/1/Character/Prefab/Ragnar.prefab b/Assets/Resources/1/Character/Prefab/Ragnar.prefab index ba1e789f..f743117a 100644 --- a/Assets/Resources/1/Character/Prefab/Ragnar.prefab +++ b/Assets/Resources/1/Character/Prefab/Ragnar.prefab @@ -10,7 +10,7 @@ GameObject: m_Component: - component: {fileID: 1096128071457673076} - component: {fileID: 3207258909871447882} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Arm_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -99,7 +99,7 @@ GameObject: - component: {fileID: -1148229131982139879} - component: {fileID: 6373024555497604353} - component: {fileID: 3412540945423151583} - m_Layer: 0 + m_Layer: 8 m_Name: Ragnar m_TagString: Untagged m_Icon: {fileID: 0} @@ -197,7 +197,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2269640450213049560} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit12 m_TagString: Untagged m_Icon: {fileID: 0} @@ -227,7 +227,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7555358926114859313} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit11 m_TagString: Untagged m_Icon: {fileID: 0} @@ -258,7 +258,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4321163025264411144} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit52 m_TagString: Untagged m_Icon: {fileID: 0} @@ -289,7 +289,7 @@ GameObject: m_Component: - component: {fileID: 8820057315778542035} - component: {fileID: 2233958923311522356} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Hand_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -383,7 +383,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3987210457449450786} - m_Layer: 0 + m_Layer: 8 m_Name: _DONT_Base HumanSpine4 m_TagString: Untagged m_Icon: {fileID: 0} @@ -414,7 +414,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8770813625416136524} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail3 3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -445,7 +445,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3359512751478714311} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRPalm m_TagString: Untagged m_Icon: {fileID: 0} @@ -481,7 +481,7 @@ GameObject: m_Component: - component: {fileID: 8933183031321246562} - component: {fileID: 7865854891116106288} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Knee_Armor_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -567,7 +567,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1610240531450569935} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRFoot m_TagString: Untagged m_Icon: {fileID: 0} @@ -598,7 +598,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7153809033823405330} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanSpine3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -630,7 +630,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8581099245667066019} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRibcage m_TagString: Untagged m_Icon: {fileID: 0} @@ -663,7 +663,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3323932414237081353} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit41 m_TagString: Untagged m_Icon: {fileID: 0} @@ -694,7 +694,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3990279629111012016} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRPlatform m_TagString: Untagged m_Icon: {fileID: 0} @@ -724,7 +724,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 9188509834628740647} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanSpine2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -755,7 +755,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5790147732263957610} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit52 m_TagString: Untagged m_Icon: {fileID: 0} @@ -786,7 +786,7 @@ GameObject: m_Component: - component: {fileID: 7945919988370382077} - component: {fileID: 3485245087883001190} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Foot_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -872,7 +872,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4147163935982095187} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRUpperarm m_TagString: Untagged m_Icon: {fileID: 0} @@ -904,7 +904,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1652645551475575872} - m_Layer: 0 + m_Layer: 8 m_Name: _DONT_Base HumanNeck1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -937,7 +937,7 @@ GameObject: - component: {fileID: 2639896824822866350} - component: {fileID: 8236353641856912185} - component: {fileID: 8184941592127922754} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Elbow_Armor_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1018,7 +1018,7 @@ GameObject: - component: {fileID: 7931046688779036318} - component: {fileID: 2447523953752364262} - component: {fileID: 3656709438858823808} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Torso_Armor m_TagString: Untagged m_Icon: {fileID: 0} @@ -1097,7 +1097,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3677834596290532757} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit31 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1129,7 +1129,7 @@ GameObject: m_Component: - component: {fileID: 4025963725729669027} - component: {fileID: 8714015803898821803} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Hand_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1223,7 +1223,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6236243574145893330} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLCalf m_TagString: Untagged m_Icon: {fileID: 0} @@ -1254,7 +1254,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 929734908982335214} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail4 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1284,7 +1284,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2287054932909467262} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit41 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1315,7 +1315,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6772713405425793428} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail1 1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1346,7 +1346,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4005446719616550130} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit51 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1379,7 +1379,7 @@ GameObject: - component: {fileID: 6198777184437357505} - component: {fileID: 4106816650617326777} - component: {fileID: 908155820611951400} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Shoulder_Armor_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1459,7 +1459,7 @@ GameObject: m_Component: - component: {fileID: 8486307018196629631} - component: {fileID: 4176110184165050825} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Helmet_Feather_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1545,7 +1545,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1051346762829488636} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail3 1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1575,7 +1575,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5145629012186336288} - m_Layer: 0 + m_Layer: 8 m_Name: Base Human m_TagString: Untagged m_Icon: {fileID: 0} @@ -1605,7 +1605,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7064346664378220692} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail1 2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1636,7 +1636,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7014529971271006054} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanSpine1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1668,7 +1668,7 @@ GameObject: m_Component: - component: {fileID: 8512588759625374524} - component: {fileID: 7423148600506869904} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Armor_Helmet m_TagString: Untagged m_Icon: {fileID: 0} @@ -1752,7 +1752,7 @@ GameObject: m_Component: - component: {fileID: 7530409171661096396} - component: {fileID: 8298487604563911824} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Knee_Armor_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1838,7 +1838,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8683138753888867468} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLForearm m_TagString: Untagged m_Icon: {fileID: 0} @@ -1870,7 +1870,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7865817170266073852} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRForearm m_TagString: Untagged m_Icon: {fileID: 0} @@ -1902,7 +1902,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5377719733824947090} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail2 3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1935,7 +1935,7 @@ GameObject: - component: {fileID: 8513628785956443577} - component: {fileID: 161171070273849761} - component: {fileID: 478362872912843371} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Elbow_Armor_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2014,7 +2014,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8870012973473296877} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRCalf m_TagString: Untagged m_Icon: {fileID: 0} @@ -2045,7 +2045,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3190060619538307847} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit22 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2075,7 +2075,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 636671631190140931} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit12 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2105,7 +2105,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4441203203774375995} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLFoot m_TagString: Untagged m_Icon: {fileID: 0} @@ -2138,7 +2138,7 @@ GameObject: - component: {fileID: 8105764942755046031} - component: {fileID: 1265773872672527070} - component: {fileID: 1925925942639751556} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Shoulder_Armor_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2217,7 +2217,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4765957377573380013} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit11 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2248,7 +2248,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3936857284533555725} - m_Layer: 0 + m_Layer: 8 m_Name: _DONT_Base HumanLCollarbone m_TagString: Untagged m_Icon: {fileID: 0} @@ -2279,7 +2279,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7762829777625174613} - m_Layer: 0 + m_Layer: 8 m_Name: _DONT_Base HumanRCollarbone m_TagString: Untagged m_Icon: {fileID: 0} @@ -2310,7 +2310,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4584747661523093672} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanHead m_TagString: Untagged m_Icon: {fileID: 0} @@ -2341,7 +2341,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1026527341899683976} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLPlatform m_TagString: Untagged m_Icon: {fileID: 0} @@ -2372,7 +2372,7 @@ GameObject: m_Component: - component: {fileID: 571159429779399914} - component: {fileID: 7908793165493908810} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Torso m_TagString: Untagged m_Icon: {fileID: 0} @@ -2473,7 +2473,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1819863376665051736} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit32 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2503,7 +2503,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8637886928162585013} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLPalm m_TagString: Untagged m_Icon: {fileID: 0} @@ -2538,7 +2538,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7481704343893366932} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLThigh m_TagString: Untagged m_Icon: {fileID: 0} @@ -2569,7 +2569,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3699090914531148983} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanFootBone001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2599,7 +2599,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7607614955523739749} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit42 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2630,7 +2630,7 @@ GameObject: m_Component: - component: {fileID: 3335355801413654223} - component: {fileID: 7315111304627041008} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Helmet_Feather_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2716,7 +2716,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2999684279879533985} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail3 2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2746,7 +2746,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3938917175739540592} - m_Layer: 0 + m_Layer: 8 m_Name: _DONT_Base HumanNeck2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2777,7 +2777,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3422638943412149448} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanPelvis m_TagString: Untagged m_Icon: {fileID: 0} @@ -2814,7 +2814,7 @@ GameObject: m_Component: - component: {fileID: 4436949130001090126} - component: {fileID: 5452722750088951609} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Arm_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2900,7 +2900,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5326124457308875273} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLUpperarm m_TagString: Untagged m_Icon: {fileID: 0} @@ -2932,7 +2932,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 647491017295733906} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRThigh m_TagString: Untagged m_Icon: {fileID: 0} @@ -2963,7 +2963,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3881797045414204539} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail5 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2994,7 +2994,7 @@ GameObject: m_Component: - component: {fileID: 5907533650446601994} - component: {fileID: 9080862996854514278} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Foot_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -3080,7 +3080,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3882489458227355580} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3111,7 +3111,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4297418287570701339} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail2 2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3142,7 +3142,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6633431867909719392} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3173,7 +3173,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 860603993654904882} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit51 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3204,7 +3204,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4430263879190346912} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit21 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3235,7 +3235,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7518857478789437340} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanRDigit21 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3266,7 +3266,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5920792746024297604} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit42 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3297,7 +3297,7 @@ GameObject: m_Component: - component: {fileID: 7254404398191458459} - component: {fileID: 529530345768451687} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Helmet_Feather_03 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3383,7 +3383,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7227816746226354058} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail1 3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3414,7 +3414,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4391372660273669903} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit32 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3444,7 +3444,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3836344067588392406} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit31 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3476,7 +3476,7 @@ GameObject: m_Component: - component: {fileID: 9174685780381185856} - component: {fileID: 7702348211638010049} - m_Layer: 0 + m_Layer: 8 m_Name: _My_Knight_Legs m_TagString: Untagged m_Icon: {fileID: 0} @@ -3571,7 +3571,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8677075771270813152} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanFootBone001 1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3601,7 +3601,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5135870172678361645} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3632,7 +3632,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4343880782854259023} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail4 1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3663,7 +3663,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3942839259425908646} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanTail2 1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3694,7 +3694,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8977010629891458691} - m_Layer: 0 + m_Layer: 8 m_Name: Base HumanLDigit22 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3766,10 +3766,22 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5327400453591611590, guid: 04efd775509c00144993f7b46ecc2812, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 5327400453591614774, guid: 04efd775509c00144993f7b46ecc2812, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} - target: {fileID: 5327400453591714386, guid: 04efd775509c00144993f7b46ecc2812, type: 3} propertyPath: m_Name value: OpponentAura objectReference: {fileID: 0} + - target: {fileID: 5327400453591714386, guid: 04efd775509c00144993f7b46ecc2812, type: 3} + propertyPath: m_Layer + value: 8 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 04efd775509c00144993f7b46ecc2812, type: 3} --- !u!4 &7668449275196278194 stripped diff --git a/Assets/Resources/Data/Items/SwitchingPlaces.asset b/Assets/Resources/Data/Items/SwitchingPlaces.asset new file mode 100644 index 00000000..b7bc4862 --- /dev/null +++ b/Assets/Resources/Data/Items/SwitchingPlaces.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f9d99aa6a656431c98bbf98460ff38a1, type: 3} + m_Name: SwitchingPlaces + m_EditorClassIdentifier: + icon: {fileID: 21300000, guid: d199e42b29875f641b7670cd48338056, type: 3} + type: 0 + aimCanvas: {fileID: 2273039178377770117, guid: 09a0317cbdff9fa479a18c9e20743a8e, type: 3} diff --git a/Assets/Resources/Data/Items/SwitchingPlaces.asset.meta b/Assets/Resources/Data/Items/SwitchingPlaces.asset.meta new file mode 100644 index 00000000..4cf2fc62 --- /dev/null +++ b/Assets/Resources/Data/Items/SwitchingPlaces.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 464ee9ed5747d0b45828b8d9eaa33dea +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Data/Level 1/ItemData.asset b/Assets/Resources/Data/Level 1/ItemData.asset index cbce688f..20679c62 100644 --- a/Assets/Resources/Data/Level 1/ItemData.asset +++ b/Assets/Resources/Data/Level 1/ItemData.asset @@ -25,6 +25,8 @@ MonoBehaviour: _spawnChance: 0.64 - item: {fileID: 11400000, guid: 7605998bd1a481543a96857fa015169b, type: 2} _spawnChance: 0.848 + - item: {fileID: 11400000, guid: 464ee9ed5747d0b45828b8d9eaa33dea, type: 2} + _spawnChance: 0.698 - item: {fileID: 11400000, guid: 133e523fdd159754e8bf8927faec5b0f, type: 2} _spawnChance: 0.833 - item: {fileID: 11400000, guid: 133e523fdd159754e8bf8927faec5b0f, type: 2} diff --git a/Assets/Scripts/AI/AIManager.cs b/Assets/Scripts/AI/AIManager.cs index b748529f..7f779747 100644 --- a/Assets/Scripts/AI/AIManager.cs +++ b/Assets/Scripts/AI/AIManager.cs @@ -186,7 +186,7 @@ namespace AI return; } - ((Bonus)attack.First()).Invoke(); + ((Bonus)attack.First()).Invoke(agent.Unit); } private void Retreet(AIAgent agent) diff --git a/Assets/Scripts/Data/Data.cs b/Assets/Scripts/Data/Data.cs index dd9ed900..72f40c4a 100644 --- a/Assets/Scripts/Data/Data.cs +++ b/Assets/Scripts/Data/Data.cs @@ -138,11 +138,7 @@ namespace Data return _unitData; } } - - public void UnLoadData() - { - Resources.UnloadAsset(_fieldData); - } + private static T Load(string resourcesPath) where T : Object => Resources.Load(Path.ChangeExtension(resourcesPath, null)); diff --git a/Assets/Scripts/Editor/LevelSettings.cs b/Assets/Scripts/Editor/LevelSettings.cs index fa8ceb2e..65c22bea 100644 --- a/Assets/Scripts/Editor/LevelSettings.cs +++ b/Assets/Scripts/Editor/LevelSettings.cs @@ -37,29 +37,27 @@ namespace Editor protected override void OnBeginDrawEditors() { - OdinMenuTreeSelection selection = this.MenuTree.Selection; - if(selection.SelectedValue == null) + var selection = this.MenuTree.Selection; + if (selection.SelectedValue != null) return; + SirenixEditorGUI.BeginHorizontalToolbar(); { - SirenixEditorGUI.BeginHorizontalToolbar(); + GUILayout.FlexibleSpace(); + if (SirenixEditorGUI.ToolbarButton("Delete")) { - GUILayout.FlexibleSpace(); - if (SirenixEditorGUI.ToolbarButton("Delete")) + + string levelName = selection[0].Name; + var data = new List(); + Resources.LoadAll($"Data/{levelName}").ForEach(x => { + data.Add(AssetDatabase.GetAssetPath(x)); + }); + data.ToArray().ForEach(x => AssetDatabase.DeleteAsset(x)); - string levelName = selection[0].Name; - var data = new List(); - Resources.LoadAll($"Data/{levelName}").ForEach(x => - { - data.Add(AssetDatabase.GetAssetPath(x)); - }); - data.ToArray().ForEach(x => AssetDatabase.DeleteAsset(x)); - - Directory.Delete($"Assets/Resources/Data/{levelName}"); - AssetDatabase.SaveAssets(); - } + Directory.Delete($"Assets/Resources/Data/{levelName}"); + AssetDatabase.SaveAssets(); } - SirenixEditorGUI.EndHorizontalToolbar(); } + SirenixEditorGUI.EndHorizontalToolbar(); } protected override OdinMenuTree BuildMenuTree() @@ -81,8 +79,7 @@ namespace Editor } - - private class ItemList + internal class ItemList { public ItemList() { @@ -96,9 +93,9 @@ namespace Editor private void RemoveItem(Item item) { var path = AssetDatabase.GetAssetPath(item); - var metaPath = path.Replace(".asset", ".asset.meta"); + File.Delete(path); - File.Delete(metaPath); + File.Delete($"{path}.meta"); AssetDatabase.Refresh(); } @@ -132,21 +129,21 @@ namespace Editor } } } - private class CreateNewLevel + internal class CreateNewLevel { public CreateNewLevel() { - data = ScriptableObject.CreateInstance(); + data = CreateInstance(); datas = new List { - ScriptableObject.CreateInstance(), - ScriptableObject.CreateInstance(), - ScriptableObject.CreateInstance(), - ScriptableObject.CreateInstance(), - ScriptableObject.CreateInstance(), - ScriptableObject.CreateInstance(), - ScriptableObject.CreateInstance(), - ScriptableObject.CreateInstance() + CreateInstance(), + CreateInstance(), + CreateInstance(), + CreateInstance(), + CreateInstance(), + CreateInstance(), + CreateInstance(), + CreateInstance() }; } diff --git a/Assets/Scripts/GameUI/PlayerInventoryView.cs b/Assets/Scripts/GameUI/PlayerInventoryView.cs index 0ffd6930..85609322 100644 --- a/Assets/Scripts/GameUI/PlayerInventoryView.cs +++ b/Assets/Scripts/GameUI/PlayerInventoryView.cs @@ -13,20 +13,22 @@ namespace GameUI [SerializeField] private GameObject item; [SerializeField] private GameObject grid; - public event Action OnBuildingInvoked; + public event Action OnBuildingInvoked; private List itemsGo; private List