From 55909b35937c90d09e52de3cc4f68c526687f9d9 Mon Sep 17 00:00:00 2001
From: jajkosim <blesk@DESKTOP-U62K5IC.localdomain>
Date: Sun, 15 Nov 2020 12:56:38 +0100
Subject: [PATCH] character prefabs
---
Assets/Characters/Captain/char_captain.prefab | 6 +-
.../Captain/temp_captain.controller | 2 +-
.../Main Character/Char_Main.prefab | 269 +++++++++++--
.../Materials/Characters/NPC/Guards/Body.mat | 2 +-
Assets/Scenes/les.unity | 84 -----
Assets/Scenes/namnesti.unity | 356 ++++++++++++++++--
Assets/Textures/DryWall/NewLayer.terrainlayer | 6 +-
7 files changed, 585 insertions(+), 140 deletions(-)
diff --git a/Assets/Characters/Captain/char_captain.prefab b/Assets/Characters/Captain/char_captain.prefab
index ba6c317..c96dd4e 100644
--- a/Assets/Characters/Captain/char_captain.prefab
+++ b/Assets/Characters/Captain/char_captain.prefab
@@ -10410,10 +10410,10 @@ CapsuleCollider:
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
- m_Radius: 0.0021290814
- m_Height: 0.006750846
+ m_Radius: 0.002412129
+ m_Height: 0.007197737
m_Direction: 1
- m_Center: {x: -0.000057316694, y: -0.0018843345, z: -0.00036578832}
+ m_Center: {x: -0.000052001513, y: -0.0011735135, z: 0.0002299472}
--- !u!1 &4088967726450963684
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Characters/Captain/temp_captain.controller b/Assets/Characters/Captain/temp_captain.controller
index 3ee855b..0b41be3 100644
--- a/Assets/Characters/Captain/temp_captain.controller
+++ b/Assets/Characters/Captain/temp_captain.controller
@@ -8,7 +8,7 @@ AnimatorState:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Idle
- m_Speed: 300
+ m_Speed: 200
m_CycleOffset: 0
m_Transitions:
- {fileID: 7855364328609837969}
diff --git a/Assets/Characters/Main Character/Char_Main.prefab b/Assets/Characters/Main Character/Char_Main.prefab
index 3479fbb..146da7e 100644
--- a/Assets/Characters/Main Character/Char_Main.prefab
+++ b/Assets/Characters/Main Character/Char_Main.prefab
@@ -213,6 +213,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 3004446725008940012}
+ - component: {fileID: 172876413}
m_Layer: 0
m_Name: Hand IK.L
m_TagString: Untagged
@@ -240,6 +241,20 @@ Transform:
m_Father: {fileID: 2757648174188959079}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!136 &172876413
+CapsuleCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 146716845696523924}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ m_Radius: 0.00047793088
+ m_Height: 0.0019581798
+ m_Direction: 1
+ m_Center: {x: -0.0000000027501181, y: 0.00078041916, z: -0.0002885909}
--- !u!1 &183303483993656005
GameObject:
m_ObjectHideFlags: 0
@@ -403,6 +418,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4027023911879213813}
+ - component: {fileID: 1423155724}
m_Layer: 0
m_Name: Forearm.L
m_TagString: Untagged
@@ -427,6 +443,19 @@ Transform:
m_Father: {fileID: 2886596229915476640}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!135 &1423155724
+SphereCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 318899440634774611}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Radius: 0.0005
+ m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &366674327894427239
GameObject:
m_ObjectHideFlags: 0
@@ -560,6 +589,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4233857292160407379}
+ - component: {fileID: 1075451277}
m_Layer: 0
m_Name: Leg Position.L
m_TagString: Untagged
@@ -586,6 +616,19 @@ Transform:
m_Father: {fileID: 4502178029653838132}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!135 &1075451277
+SphereCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 469096443271303368}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Radius: 0.001
+ m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &491448504666955903
GameObject:
m_ObjectHideFlags: 0
@@ -687,6 +730,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8646899549432401979}
+ - component: {fileID: 1448646786}
m_Layer: 0
m_Name: Shin.L
m_TagString: Untagged
@@ -710,6 +754,19 @@ Transform:
m_Father: {fileID: 1294070885173187521}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!135 &1448646786
+SphereCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 583322056756287647}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Radius: 0.0006
+ m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &599000018665860095
GameObject:
m_ObjectHideFlags: 0
@@ -1485,6 +1542,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1027482530665588620}
+ - component: {fileID: 640614488}
m_Layer: 0
m_Name: Ankle.L
m_TagString: Untagged
@@ -1507,6 +1565,19 @@ Transform:
m_Father: {fileID: 8646899549432401979}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!135 &640614488
+SphereCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1072986481234477030}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Radius: 0.0006
+ m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &1123151195140956658
GameObject:
m_ObjectHideFlags: 0
@@ -1857,6 +1928,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 7824874511534655465}
+ - component: {fileID: 1104407578}
m_Layer: 0
m_Name: Shoulders
m_TagString: Untagged
@@ -1879,6 +1951,19 @@ Transform:
m_Father: {fileID: 3871955772970556627}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!135 &1104407578
+SphereCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1455746637326106233}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Radius: 0.0010708033
+ m_Center: {x: -0.0011625197, y: -0.0005950314, z: -0.00024847133}
--- !u!1 &1462700623656284086
GameObject:
m_ObjectHideFlags: 0
@@ -3156,6 +3241,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 3871955772970556627}
+ - component: {fileID: 841818652}
m_Layer: 0
m_Name: Thorax
m_TagString: Untagged
@@ -3178,6 +3264,20 @@ Transform:
m_Father: {fileID: 8155745389578197460}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!136 &841818652
+CapsuleCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2073393987135246182}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ m_Radius: 0.0022329937
+ m_Height: 0.005849855
+ m_Direction: 1
+ m_Center: {x: 0.000051658313, y: -0.0013698484, z: -0.0006851656}
--- !u!1 &2079586382697553143
GameObject:
m_ObjectHideFlags: 0
@@ -3680,6 +3780,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 798668714161897781}
+ - component: {fileID: 105671449}
m_Layer: 0
m_Name: Ankle.R
m_TagString: Untagged
@@ -3702,6 +3803,19 @@ Transform:
m_Father: {fileID: 7058848174971864466}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!135 &105671449
+SphereCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2513477895751142656}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Radius: 0.0006
+ m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &2673702355015103454
GameObject:
m_ObjectHideFlags: 0
@@ -5314,6 +5428,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4583967198909707375}
+ - component: {fileID: 1866542150}
m_Layer: 0
m_Name: Leg Position.R
m_TagString: Untagged
@@ -5340,6 +5455,19 @@ Transform:
m_Father: {fileID: 4502178029653838132}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!135 &1866542150
+SphereCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3512749400464500749}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Radius: 0.001
+ m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &3533079408296503133
GameObject:
m_ObjectHideFlags: 0
@@ -11561,28 +11689,26 @@ Cloth:
- maxDistance: 0
collisionSphereDistance: 3.4028235e+38
m_CapsuleColliders:
- - {fileID: 0}
+ - {fileID: 841818652}
+ - {fileID: 2119674168}
+ - {fileID: 172876413}
m_SphereColliders:
- - first: {fileID: 0}
- second: {fileID: 0}
- - first: {fileID: 0}
- second: {fileID: 0}
- - first: {fileID: 0}
- second: {fileID: 0}
- - first: {fileID: 0}
- second: {fileID: 0}
- - first: {fileID: 0}
- second: {fileID: 0}
- - first: {fileID: 0}
- second: {fileID: 0}
- - first: {fileID: 0}
- second: {fileID: 0}
- - first: {fileID: 0}
- second: {fileID: 0}
- - first: {fileID: 0}
- second: {fileID: 0}
- - first: {fileID: 0}
- second: {fileID: 0}
+ - first: {fileID: 1075451277}
+ second: {fileID: 1448646786}
+ - first: {fileID: 1866542150}
+ second: {fileID: 523720010}
+ - first: {fileID: 1448646786}
+ second: {fileID: 640614488}
+ - first: {fileID: 523720010}
+ second: {fileID: 105671449}
+ - first: {fileID: 2094595876}
+ second: {fileID: 1423155724}
+ - first: {fileID: 263400631}
+ second: {fileID: 844762358}
+ - first: {fileID: 1423155724}
+ second: {fileID: 257038439}
+ - first: {fileID: 844762358}
+ second: {fileID: 2048013526}
m_SelfCollisionDistance: 0
m_SelfCollisionStiffness: 0.2
m_SelfAndInterCollisionIndices: 010000000200000006000000070000000a0000000b0000000d0000000e000000120000001500000017000000190000001b0000001e0000001f00000020000000230000002400000028000000290000002a0000002b0000002f00000031000000320000003300000036000000370000003f00000040000000410000004200000043000000440000004f00000050000000510000005200000054000000560000005a0000005c0000005f00000060000000620000006400000066000000670000006a0000006b0000006d0000006e0000006f0000007000000072000000730000007400000075000000760000007700000078000000790000007a0000007b0000007c0000007d0000007e0000007f0000008000000081000000820000008a0000008b0000008c000000900000009200000094000000950000009600000098000000990000009a0000009c0000009e0000009f000000a0000000a1000000a3000000a5000000a6000000a8000000a9000000ab000000ac000000ad000000af000000b1000000b2000000b4000000b6000000b8000000b9000000ba000000be000000c0000000c2000000c4000000c6000000ca000000cd000000cf000000d1000000d2000000d6000000d8000000d9000000da000000db000000dd000000de000000e0000000e1000000e2000000e3000000e7000000e8000000ea000000ec000000ed000000ee000000ef000000f0000000f1000000f2000000f3000000f4000000f9000000fa000000fb000000fd000000000100000201000004010000050100000601000008010000090100000c0100000d0100000f01000010010000110100001501000016010000190100001a0100001b0100001d0100001e0100001f01000022010000230100002c010000330100003501000036010000390100003a0100003b0100003c0100003d0100003f01000040010000410100004201000043010000440100004601000048010000490100004a0100004b0100004c0100004d0100004e0100004f010000500100005101000052010000530100005401000055010000560100005701000058010000590100005a0100005b0100005c0100005d0100005e0100005f01000060010000610100006301000065010000660100006c0100006e0100006f0100007001000075010000760100007701000078010000790100007b0100007d0100007e0100007f01000080010000810100008201000083010000840100008501000086010000890100008a0100008b0100008c0100008e0100009101000092010000950100009601000097010000990100009a0100009b0100009c0100009d0100009e0100009f010000a0010000a1010000a2010000a3010000a4010000a5010000a6010000a7010000a8010000a9010000aa010000ab010000ac010000ad010000ae010000af010000b0010000b1010000b2010000b3010000b4010000b5010000b6010000b7010000b8010000b9010000ba010000bb010000bc010000bd010000c5010000c7010000c9010000cb010000cc010000ce010000d0010000d3010000d5010000d7010000d9010000da010000db010000dc010000dd010000de010000df010000e0010000e1010000e2010000e3010000e4010000e5010000e6010000e7010000e8010000e9010000ea010000eb010000ec010000ed010000ee010000ef010000f0010000f3010000f4010000f5010000f6010000f7010000f8010000f9010000fa010000fc010000fd010000fe010000ff010000000200000102000002020000030200000402000005020000060200000702000008020000090200000a0200000b0200000d0200000e0200000f0200001002000011020000120200001a0200001d0200001e0200002202000023020000240200002602000027020000280200002a0200002b0200002c0200002d0200002f0200003102000033020000350200003b0200003d0200003f0200004102000043020000440200004502000048020000490200004a0200004c0200004d0200004f02000050020000520200005402000057020000590200005c0200005e0200006002000062020000660200006702000068020000690200006b0200006d020000740200007702000078020000790200007b0200007c0200007d0200007f020000810200008202000083020000850200008602000087020000890200008b0200008c0200008d0200008e0200008f020000900200009102000092020000930200009402000095020000960200009702000098020000990200009c0200009d0200009e0200009f020000a0020000a2020000a3020000a4020000a5020000a6020000a7020000a8020000a9020000aa020000ab020000ac020000ad020000ae020000c7020000c8020000c9020000cc020000cd020000ce020000cf020000d0020000d1020000d2020000d3020000d4020000d5020000d6020000d7020000d8020000d9020000da020000db020000dc020000dd020000de020000df020000e0020000e1020000e2020000e3020000e7020000e8020000ea020000ec020000ed020000ef020000f0020000f1020000f2020000f6020000f7020000f8020000f9020000fa020000fb020000fc020000fd020000fe020000ff020000000300000103000002030000030300000403000005030000060300000703000008030000090300000b0300000c0300000e0300001403000015030000160300001703000018030000190300001a0300001b0300001c0300001d0300001e0300001f0300002103000023030000260300002703000028030000290300002c0300002d0300002e030000330300003403000035030000370300003a0300003b0300003c0300003d0300003e0300003f0300004003000041030000430300004403000047030000480300004c0300004d0300005103000052030000530300005403000055030000560300005703000058030000590300005a0300005b0300005c0300005d0300005e0300005f03000060030000610300006203000064030000650300006703000068030000690300006a0300006b0300006c0300006d0300006e0300006f030000700300007103000072030000730300007403000075030000760300007703000078030000790300007a0300007b0300007c0300007d0300007e0300007f0300008003000081030000820300008303000084030000850300008603000088030000890300008a0300008b0300008c0300008d0300008e0300008f03000092030000930300009503000096030000970300009803000099030000a8030000a9030000ab030000af030000b0030000b1030000b5030000cb030000cc030000ce030000cf030000d6030000d7030000d8030000d9030000da030000db030000dd030000de030000df030000e0030000e1030000e2030000e8030000e903000004040000090400000a0400000b0400000d0400000e0400000f0400001004000012040000130400001404000015040000160400001704000018040000190400001a0400001b0400001c0400001f040000200400002104000022040000230400002504000026040000280400002c0400002d04000031040000320400004104000042040000430400004404000045040000460400004b040000560400007f0400008b0400008d0400008f040000910400009304000096040000980400009c040000ab040000c7040000c8040000ce040000d0040000d1040000d2040000d3040000d40400000d050000200500002105000022050000230500002405000025050000260500002705000028050000290500002a0500002b0500002d0500002e0500002f050000300500003105000032050000330500003405000035050000490500005d0500005e0500005f050000600500006105000062050000630500006405000065050000660500006705000068050000690500006a0500006b0500006c0500006d0500006e0500006f050000700500007105000072050000730500007505000077050000780500008305000085050000860500008705000088050000890500008a0500008b0500008c0500008d0500008e0500008f050000900500009105000092050000930500009405000095050000960500009705000098050000990500009a0500009b0500009c0500009d0500009e0500009f050000a0050000a1050000a2050000a3050000a4050000af050000b0050000b5050000b6050000bb050000c1050000c4050000c5050000d6050000d7050000dc050000de050000f5050000f7050000f9050000fa05000002060000030600000f0600001a0600001b0600001c0600001d0600002a0600002b0600002d0600002f060000370600003a0600003b0600003c0600003f0600004006000045060000460600005b0600005d0600005e0600005f060000600600006306000065060000660600006706000068060000690600006d0600006e0600006f06000071060000720600007e060000860600009e060000a1060000a2060000a3060000a4060000a5060000b7060000bb060000bc060000bd060000be060000c4060000c7060000c8060000cb060000ce060000cf060000d1060000f0060000f2060000f3060000f6060000f8060000f906000001070000020700000e0700001007000013070000140700001607000018070000190700001a07000023070000270700002b0700002c0700002d0700002e0700002f0700003007000031070000360700003707000038070000390700003a0700003b0700003c0700003d0700003e07000042070000460700005407000055070000560700005707000058070000590700005a0700005b0700005c0700005d0700005e0700005f0700006107000062070000630700006407000065070000660700006707000068070000740700007507000078070000790700007a0700007b0700007c0700007e0700007f070000800700008107000082070000830700008407000085070000860700008707000088070000890700008a0700008f0700009207000094070000990700009c0700009d070000a2070000a5070000a7070000b5070000b6070000b9070000ba070000be070000bf070000c0070000c1070000c2070000c5070000c6070000c7070000c8070000c9070000ca070000cc070000d6070000d7070000da070000dc070000dd070000de070000e0070000e1070000e2070000e4070000e5070000e6070000e7070000e8070000eb070000ec070000ed070000ef070000f1070000f3070000f4070000f7070000f8070000f9070000fa070000fb070000fc070000fd07000000080000010800000408000005080000060800000708000008080000090800000a0800000b0800000c0800000d0800000e0800000f080000100800001108000012080000130800001408000015080000160800001708000018080000190800001a0800001b0800001c0800001d0800001e0800001f080000200800002108000022080000230800002408000025080000260800002708000028080000290800002a0800002b0800002c0800002d0800002e0800002f0800003008000031080000320800003308000034080000350800003708000038080000390800003c0800003d0800003e0800003f080000400800004108000042080000430800004408000045080000460800004708000048080000490800004e0800004f0800005008000052080000530800005508000058080000590800005a0800005e080000620800006408000065080000660800006708000068080000690800006a0800006c0800006d0800006e0800006f0800007008000075080000760800007708000078080000790800007a0800007b0800007c0800007d0800007e0800007f080000800800008108000082080000830800008408000085080000860800008708000088080000890800008a0800008b0800008c0800008d0800008e0800008f0800009008000091080000920800009308000094080000950800009608000097080000980800009a0800009c0800009d0800009f080000a3080000a6080000a9080000aa080000ac080000ad080000af080000b2080000b3080000b6080000b8080000b9080000ba080000bc080000bd080000bf080000c0080000c3080000c6080000
@@ -11600,6 +11726,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8337385450143369261}
+ - component: {fileID: 2094595876}
m_Layer: 0
m_Name: Shoulder.L
m_TagString: Untagged
@@ -11623,6 +11750,19 @@ Transform:
m_Father: {fileID: 4172495654553830203}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!135 &2094595876
+SphereCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4329899633192639167}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Radius: 0.0007
+ m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &4376411627539321413
GameObject:
m_ObjectHideFlags: 0
@@ -12956,6 +13096,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4898576349830633989}
+ - component: {fileID: 257038439}
m_Layer: 0
m_Name: Wrist.L
m_TagString: Untagged
@@ -12990,6 +13131,19 @@ Transform:
m_Father: {fileID: 4027023911879213813}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!135 &257038439
+SphereCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5343771894384097856}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Radius: 0.0004
+ m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &5404669862018941827
GameObject:
m_ObjectHideFlags: 0
@@ -13060,6 +13214,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 2980969816603131815}
+ - component: {fileID: 2119674168}
m_Layer: 0
m_Name: Hand IK.R
m_TagString: Untagged
@@ -13087,6 +13242,20 @@ Transform:
m_Father: {fileID: 678037444842310082}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!136 &2119674168
+CapsuleCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5413195915284070644}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ m_Radius: 0.0005077663
+ m_Height: 0.0019078708
+ m_Direction: 1
+ m_Center: {x: -0.000038703914, y: 0.00081346935, z: -0.00030148483}
--- !u!1 &5428172626715530586
GameObject:
m_ObjectHideFlags: 0
@@ -14859,6 +15028,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 7058848174971864466}
+ - component: {fileID: 523720010}
m_Layer: 0
m_Name: Shin.R
m_TagString: Untagged
@@ -14882,6 +15052,19 @@ Transform:
m_Father: {fileID: 805739015942586063}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!135 &523720010
+SphereCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6641115406659521587}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Radius: 0.0006
+ m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &6659989930522190709
GameObject:
m_ObjectHideFlags: 0
@@ -15569,6 +15752,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1234196075077959717}
+ - component: {fileID: 2048013526}
m_Layer: 0
m_Name: Wrist.R
m_TagString: Untagged
@@ -15603,6 +15787,19 @@ Transform:
m_Father: {fileID: 6437100434880819831}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!135 &2048013526
+SphereCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7067781738517428361}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Radius: 0.0004
+ m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &7079226221776980318
GameObject:
m_ObjectHideFlags: 0
@@ -17339,6 +17536,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 2329195219863681165}
+ - component: {fileID: 263400631}
m_Layer: 0
m_Name: Shoulder.R
m_TagString: Untagged
@@ -17362,6 +17560,19 @@ Transform:
m_Father: {fileID: 4172495654553830203}
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!135 &263400631
+SphereCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8753563660521077238}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Radius: 0.0007
+ m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &8795488175895764547
GameObject:
m_ObjectHideFlags: 0
@@ -17401,6 +17612,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 6437100434880819831}
+ - component: {fileID: 844762358}
m_Layer: 0
m_Name: Forearm.R
m_TagString: Untagged
@@ -17425,6 +17637,19 @@ Transform:
m_Father: {fileID: 5483950599796573671}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!135 &844762358
+SphereCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8798238830723565619}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Radius: 0.0005
+ m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &8834128783439577161
GameObject:
m_ObjectHideFlags: 0
@@ -17449,7 +17674,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8834128783439577161}
- m_LocalRotation: {x: -0, y: 0.9652495, z: -0, w: 0.2613302}
+ m_LocalRotation: {x: 0, y: 0.9652495, z: 0, w: 0.2613302}
m_LocalPosition: {x: -5.6634655, y: 12.030663, z: -1.1153578}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
diff --git a/Assets/Materials/Characters/NPC/Guards/Body.mat b/Assets/Materials/Characters/NPC/Guards/Body.mat
index 2af0e5b..0952e02 100644
--- a/Assets/Materials/Characters/NPC/Guards/Body.mat
+++ b/Assets/Materials/Characters/NPC/Guards/Body.mat
@@ -73,6 +73,6 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- - _Color: {r: 0.6038274, g: 0.6038274, b: 0.6038274, a: 1}
+ - _Color: {r: 1, g: 0.8784314, b: 0.7411765, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
diff --git a/Assets/Scenes/les.unity b/Assets/Scenes/les.unity
index c0c443a..7c9ead2 100644
--- a/Assets/Scenes/les.unity
+++ b/Assets/Scenes/les.unity
@@ -18419,90 +18419,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- - target: {fileID: 4304182589420944174, guid: 68f83a139b62b2c4c87ca53d0de053ad, type: 3}
- propertyPath: m_CapsuleColliders.Array.data[0]
- value:
- objectReference: {fileID: 3286995988530850210}
- - target: {fileID: 4304182589420944174, guid: 68f83a139b62b2c4c87ca53d0de053ad, type: 3}
- propertyPath: m_SphereColliders.Array.data[0].first
- value:
- objectReference: {fileID: 5799547039857603693}
- - target: {fileID: 4304182589420944174, guid: 68f83a139b62b2c4c87ca53d0de053ad, type: 3}
- propertyPath: m_SphereColliders.Array.data[0].second
- value:
- objectReference: {fileID: 4126297706051714649}
- - target: {fileID: 4304182589420944174, guid: 68f83a139b62b2c4c87ca53d0de053ad, type: 3}
- propertyPath: m_SphereColliders.Array.data[1].first
- value:
- objectReference: {fileID: 8642762440541809723}
- - target: {fileID: 4304182589420944174, guid: 68f83a139b62b2c4c87ca53d0de053ad, type: 3}
- propertyPath: m_SphereColliders.Array.data[1].second
- value:
- objectReference: {fileID: 7886391124346268405}
- - target: {fileID: 4304182589420944174, guid: 68f83a139b62b2c4c87ca53d0de053ad, type: 3}
- propertyPath: m_SphereColliders.Array.data[2].first
- value:
- objectReference: {fileID: 4126297706051714649}
- - target: {fileID: 4304182589420944174, guid: 68f83a139b62b2c4c87ca53d0de053ad, type: 3}
- propertyPath: m_SphereColliders.Array.data[2].second
- value:
- objectReference: {fileID: 8048955696864121541}
- - target: {fileID: 4304182589420944174, guid: 68f83a139b62b2c4c87ca53d0de053ad, type: 3}
- propertyPath: m_SphereColliders.Array.data[3].first
- value:
- objectReference: {fileID: 7886391124346268405}
- - target: {fileID: 4304182589420944174, guid: 68f83a139b62b2c4c87ca53d0de053ad, type: 3}
- propertyPath: m_SphereColliders.Array.data[3].second
- value:
- objectReference: {fileID: 5688017156623897232}
- - target: {fileID: 4304182589420944174, guid: 68f83a139b62b2c4c87ca53d0de053ad, type: 3}
- propertyPath: m_SphereColliders.Array.data[4].first
- value:
- objectReference: {fileID: 958432679549336697}
- - target: {fileID: 4304182589420944174, guid: 68f83a139b62b2c4c87ca53d0de053ad, type: 3}
- propertyPath: m_SphereColliders.Array.data[4].second
- value:
- objectReference: {fileID: 3834561014556795541}
- - target: {fileID: 4304182589420944174, guid: 68f83a139b62b2c4c87ca53d0de053ad, type: 3}
- propertyPath: m_SphereColliders.Array.data[5].first
- value:
- objectReference: {fileID: 5197446931718283058}
- - target: {fileID: 4304182589420944174, guid: 68f83a139b62b2c4c87ca53d0de053ad, type: 3}
- propertyPath: m_SphereColliders.Array.data[5].second
- value:
- objectReference: {fileID: 5423022446866394869}
- - target: {fileID: 4304182589420944174, guid: 68f83a139b62b2c4c87ca53d0de053ad, type: 3}
- propertyPath: m_SphereColliders.Array.data[6].first
- value:
- objectReference: {fileID: 3834561014556795541}
- - target: {fileID: 4304182589420944174, guid: 68f83a139b62b2c4c87ca53d0de053ad, type: 3}
- propertyPath: m_SphereColliders.Array.data[6].second
- value:
- objectReference: {fileID: 8895464196982545544}
- - target: {fileID: 4304182589420944174, guid: 68f83a139b62b2c4c87ca53d0de053ad, type: 3}
- propertyPath: m_SphereColliders.Array.data[7].first
- value:
- objectReference: {fileID: 5197446931718283058}
- - target: {fileID: 4304182589420944174, guid: 68f83a139b62b2c4c87ca53d0de053ad, type: 3}
- propertyPath: m_SphereColliders.Array.data[7].second
- value:
- objectReference: {fileID: 6002774644807016015}
- - target: {fileID: 4304182589420944174, guid: 68f83a139b62b2c4c87ca53d0de053ad, type: 3}
- propertyPath: m_SphereColliders.Array.data[8].first
- value:
- objectReference: {fileID: 8895464196982545544}
- - target: {fileID: 4304182589420944174, guid: 68f83a139b62b2c4c87ca53d0de053ad, type: 3}
- propertyPath: m_SphereColliders.Array.data[8].second
- value:
- objectReference: {fileID: 6531891161645348129}
- - target: {fileID: 4304182589420944174, guid: 68f83a139b62b2c4c87ca53d0de053ad, type: 3}
- propertyPath: m_SphereColliders.Array.data[9].first
- value:
- objectReference: {fileID: 6002774644807016015}
- - target: {fileID: 4304182589420944174, guid: 68f83a139b62b2c4c87ca53d0de053ad, type: 3}
- propertyPath: m_SphereColliders.Array.data[9].second
- value:
- objectReference: {fileID: 5908235244566410371}
- target: {fileID: 8201883946200865523, guid: 68f83a139b62b2c4c87ca53d0de053ad, type: 3}
propertyPath: m_LocalPosition.x
value: -5.6634655
diff --git a/Assets/Scenes/namnesti.unity b/Assets/Scenes/namnesti.unity
index 167c148..bc12e27 100644
--- a/Assets/Scenes/namnesti.unity
+++ b/Assets/Scenes/namnesti.unity
@@ -165,7 +165,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 26
+ m_RootOrder: 30
m_LocalEulerAnglesHint: {x: 0, y: 22.784, z: 0}
--- !u!4 &11530759 stripped
Transform:
@@ -302,7 +302,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 192294369846045554, guid: 6b14981bff1e2f841ae7e1218971a320, type: 3}
propertyPath: m_RootOrder
- value: 7
+ value: 11
objectReference: {fileID: 0}
- target: {fileID: 192294369846045554, guid: 6b14981bff1e2f841ae7e1218971a320, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -438,7 +438,7 @@ Transform:
m_LocalScale: {x: 5.5944777, y: 0.89727, z: 0.14411}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 15
+ m_RootOrder: 22
m_LocalEulerAnglesHint: {x: 0, y: 80.133, z: 0}
--- !u!1 &131510796
GameObject:
@@ -472,7 +472,7 @@ Transform:
- {fileID: 1309976568}
- {fileID: 762742072}
m_Father: {fileID: 0}
- m_RootOrder: 27
+ m_RootOrder: 31
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &235024459
PrefabInstance:
@@ -511,7 +511,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 03d07971b42795e46af9be9e12610ef5, type: 3}
propertyPath: m_RootOrder
- value: 14
+ value: 17
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 03d07971b42795e46af9be9e12610ef5, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -571,7 +571,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 10
+ m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &241402814
PrefabInstance:
@@ -759,7 +759,7 @@ Transform:
m_LocalScale: {x: 12.027679, y: 0.89727, z: 0.14411}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 17
+ m_RootOrder: 24
m_LocalEulerAnglesHint: {x: 0, y: 91.552, z: 0}
--- !u!1 &356089031
GameObject:
@@ -854,7 +854,7 @@ Transform:
m_LocalScale: {x: 10.595, y: 0.89727, z: 0.14411}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 11
+ m_RootOrder: 19
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &391495754 stripped
GameObject:
@@ -995,7 +995,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 03d07971b42795e46af9be9e12610ef5, type: 3}
propertyPath: m_RootOrder
- value: 13
+ value: 15
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 03d07971b42795e46af9be9e12610ef5, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -1120,7 +1120,7 @@ Transform:
m_LocalScale: {x: 10.739097, y: 2.0855248, z: 0.14411}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 22
+ m_RootOrder: 26
m_LocalEulerAnglesHint: {x: 0, y: 14.715, z: 0}
--- !u!1 &719574948
GameObject:
@@ -1262,7 +1262,7 @@ Transform:
m_LocalScale: {x: 6.6101146, y: 2.0855248, z: 0.14411}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 21
+ m_RootOrder: 25
m_LocalEulerAnglesHint: {x: 0, y: 4.311, z: 0}
--- !u!1 &762742071
GameObject:
@@ -1401,7 +1401,7 @@ Transform:
m_LocalScale: {x: 6.6101146, y: 2.0855248, z: 0.14411}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 23
+ m_RootOrder: 27
m_LocalEulerAnglesHint: {x: 0, y: 14.715, z: 0}
--- !u!1001 &808171390
PrefabInstance:
@@ -1440,7 +1440,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 6ee1862b36af7ae40bf55b304fdde681, type: 3}
propertyPath: m_RootOrder
- value: 4
+ value: 7
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 6ee1862b36af7ae40bf55b304fdde681, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -1472,6 +1472,156 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6ee1862b36af7ae40bf55b304fdde681, type: 3}
+--- !u!1001 &826121261
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 1669144703694622508, guid: 465efa9d0eaf9894a863432703fe7a85, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 15.957
+ objectReference: {fileID: 0}
+ - target: {fileID: 1669144703694622508, guid: 465efa9d0eaf9894a863432703fe7a85, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.000010728836
+ objectReference: {fileID: 0}
+ - target: {fileID: 1669144703694622508, guid: 465efa9d0eaf9894a863432703fe7a85, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 11.299
+ objectReference: {fileID: 0}
+ - target: {fileID: 1669144703694622508, guid: 465efa9d0eaf9894a863432703fe7a85, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1669144703694622508, guid: 465efa9d0eaf9894a863432703fe7a85, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.8991648
+ objectReference: {fileID: 0}
+ - target: {fileID: 1669144703694622508, guid: 465efa9d0eaf9894a863432703fe7a85, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1669144703694622508, guid: 465efa9d0eaf9894a863432703fe7a85, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.4376102
+ objectReference: {fileID: 0}
+ - target: {fileID: 1669144703694622508, guid: 465efa9d0eaf9894a863432703fe7a85, type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1669144703694622508, guid: 465efa9d0eaf9894a863432703fe7a85, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1669144703694622508, guid: 465efa9d0eaf9894a863432703fe7a85, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 128.097
+ objectReference: {fileID: 0}
+ - target: {fileID: 1669144703694622508, guid: 465efa9d0eaf9894a863432703fe7a85, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2045248785562539414, guid: 465efa9d0eaf9894a863432703fe7a85, type: 3}
+ propertyPath: m_Name
+ value: char_beggar
+ objectReference: {fileID: 0}
+ - target: {fileID: 2541695702423168443, guid: 465efa9d0eaf9894a863432703fe7a85, type: 3}
+ propertyPath: m_AABB.m_Center.x
+ value: -0.000000014901161
+ objectReference: {fileID: 0}
+ - target: {fileID: 2541695702423168443, guid: 465efa9d0eaf9894a863432703fe7a85, type: 3}
+ propertyPath: m_AABB.m_Extent.x
+ value: 0.09108223
+ objectReference: {fileID: 0}
+ - target: {fileID: 2541695702423168443, guid: 465efa9d0eaf9894a863432703fe7a85, type: 3}
+ propertyPath: m_AABB.m_Extent.y
+ value: 0.09816149
+ objectReference: {fileID: 0}
+ - target: {fileID: 2541695702423168443, guid: 465efa9d0eaf9894a863432703fe7a85, type: 3}
+ propertyPath: m_AABB.m_Extent.z
+ value: 0.20181672
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 465efa9d0eaf9894a863432703fe7a85, type: 3}
+--- !u!1001 &842078322
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 1338947247841733316, guid: b0a2f0162764b714ba667e21326f1ac8, type: 3}
+ propertyPath: m_Name
+ value: char_captain
+ objectReference: {fileID: 0}
+ - target: {fileID: 1864267874104225918, guid: b0a2f0162764b714ba667e21326f1ac8, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 36.70445
+ objectReference: {fileID: 0}
+ - target: {fileID: 1864267874104225918, guid: b0a2f0162764b714ba667e21326f1ac8, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.00001335144
+ objectReference: {fileID: 0}
+ - target: {fileID: 1864267874104225918, guid: b0a2f0162764b714ba667e21326f1ac8, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -4.2567053
+ objectReference: {fileID: 0}
+ - target: {fileID: 1864267874104225918, guid: b0a2f0162764b714ba667e21326f1ac8, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1864267874104225918, guid: b0a2f0162764b714ba667e21326f1ac8, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.9991884
+ objectReference: {fileID: 0}
+ - target: {fileID: 1864267874104225918, guid: b0a2f0162764b714ba667e21326f1ac8, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1864267874104225918, guid: b0a2f0162764b714ba667e21326f1ac8, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.040280305
+ objectReference: {fileID: 0}
+ - target: {fileID: 1864267874104225918, guid: b0a2f0162764b714ba667e21326f1ac8, type: 3}
+ propertyPath: m_RootOrder
+ value: 4
+ objectReference: {fileID: 0}
+ - target: {fileID: 1864267874104225918, guid: b0a2f0162764b714ba667e21326f1ac8, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1864267874104225918, guid: b0a2f0162764b714ba667e21326f1ac8, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 175.383
+ objectReference: {fileID: 0}
+ - target: {fileID: 1864267874104225918, guid: b0a2f0162764b714ba667e21326f1ac8, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4920672364025714173, guid: b0a2f0162764b714ba667e21326f1ac8, type: 3}
+ propertyPath: m_AABB.m_Center.x
+ value: 0.0037437081
+ objectReference: {fileID: 0}
+ - target: {fileID: 4920672364025714173, guid: b0a2f0162764b714ba667e21326f1ac8, type: 3}
+ propertyPath: m_AABB.m_Center.z
+ value: 0.093868315
+ objectReference: {fileID: 0}
+ - target: {fileID: 4920672364025714173, guid: b0a2f0162764b714ba667e21326f1ac8, type: 3}
+ propertyPath: m_AABB.m_Extent.x
+ value: 0.38801914
+ objectReference: {fileID: 0}
+ - target: {fileID: 4920672364025714173, guid: b0a2f0162764b714ba667e21326f1ac8, type: 3}
+ propertyPath: m_AABB.m_Extent.y
+ value: 0.6358011
+ objectReference: {fileID: 0}
+ - target: {fileID: 4920672364025714173, guid: b0a2f0162764b714ba667e21326f1ac8, type: 3}
+ propertyPath: m_AABB.m_Extent.z
+ value: 0.23325035
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: b0a2f0162764b714ba667e21326f1ac8, type: 3}
--- !u!1001 &915619602
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1702,8 +1852,85 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 8
+ m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!1001 &1104869011
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 3435085559324929702, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3731622723851247730, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5664164928312391962, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6491702294407979254, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8191878156371283512, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8466466507605988960, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -1.734
+ objectReference: {fileID: 0}
+ - target: {fileID: 8466466507605988960, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.0000019073486
+ objectReference: {fileID: 0}
+ - target: {fileID: 8466466507605988960, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 6.366
+ objectReference: {fileID: 0}
+ - target: {fileID: 8466466507605988960, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8466466507605988960, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.88942033
+ objectReference: {fileID: 0}
+ - target: {fileID: 8466466507605988960, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8466466507605988960, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.4570903
+ objectReference: {fileID: 0}
+ - target: {fileID: 8466466507605988960, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_RootOrder
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 8466466507605988960, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8466466507605988960, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 125.601
+ objectReference: {fileID: 0}
+ - target: {fileID: 8466466507605988960, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9094244029417688282, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_Name
+ value: npc_guards
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
--- !u!1001 &1164565663
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1741,7 +1968,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 6ee1862b36af7ae40bf55b304fdde681, type: 3}
propertyPath: m_RootOrder
- value: 20
+ value: 23
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 6ee1862b36af7ae40bf55b304fdde681, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -1847,7 +2074,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 9
+ m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1259869913 stripped
GameObject:
@@ -1949,7 +2176,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 6ee1862b36af7ae40bf55b304fdde681, type: 3}
propertyPath: m_RootOrder
- value: 19
+ value: 21
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 6ee1862b36af7ae40bf55b304fdde681, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -2018,7 +2245,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 75ac9acbf3a0d4249ba0cc5bf144b27a, type: 3}
propertyPath: m_RootOrder
- value: 3
+ value: 6
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 75ac9acbf3a0d4249ba0cc5bf144b27a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -2087,7 +2314,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 03d07971b42795e46af9be9e12610ef5, type: 3}
propertyPath: m_RootOrder
- value: 18
+ value: 20
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 03d07971b42795e46af9be9e12610ef5, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -2300,7 +2527,7 @@ Transform:
m_LocalScale: {x: 9.861664, y: 2.0855248, z: 0.14411}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 24
+ m_RootOrder: 28
m_LocalEulerAnglesHint: {x: 0, y: 14.715, z: 0}
--- !u!1 &1498846257 stripped
GameObject:
@@ -2484,7 +2711,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0dc8eb562f59e6748a143082cbe83a23, type: 3}
propertyPath: m_RootOrder
- value: 5
+ value: 8
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0dc8eb562f59e6748a143082cbe83a23, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -2609,7 +2836,7 @@ Transform:
m_LocalScale: {x: 17.04983, y: 2.0855248, z: 0.14411}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 25
+ m_RootOrder: 29
m_LocalEulerAnglesHint: {x: 0, y: 101.931, z: 0}
--- !u!1 &1858285344 stripped
GameObject:
@@ -2779,7 +3006,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f3e3340fa93a0ef41bd284e4220e3f81, type: 3}
propertyPath: m_RootOrder
- value: 2
+ value: 5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: f3e3340fa93a0ef41bd284e4220e3f81, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -2941,7 +3168,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 6ee1862b36af7ae40bf55b304fdde681, type: 3}
propertyPath: m_RootOrder
- value: 16
+ value: 18
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 6ee1862b36af7ae40bf55b304fdde681, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -3029,7 +3256,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 03d07971b42795e46af9be9e12610ef5, type: 3}
propertyPath: m_RootOrder
- value: 6
+ value: 10
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 03d07971b42795e46af9be9e12610ef5, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -3193,7 +3420,7 @@ Transform:
- {fileID: 1993202447020789001}
- {fileID: 8164213336902126824}
m_Father: {fileID: 0}
- m_RootOrder: 1
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &4178538327331072041
MeshRenderer:
@@ -3236,6 +3463,83 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
+--- !u!1001 &4360405376536246096
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 1355477272815891894, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1441888914011160652, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5664164928312391962, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6491702294407979254, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6855471467165346791, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8466466507605988960, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.716
+ objectReference: {fileID: 0}
+ - target: {fileID: 8466466507605988960, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.000012516975
+ objectReference: {fileID: 0}
+ - target: {fileID: 8466466507605988960, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 7.498
+ objectReference: {fileID: 0}
+ - target: {fileID: 8466466507605988960, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8466466507605988960, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.95721036
+ objectReference: {fileID: 0}
+ - target: {fileID: 8466466507605988960, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8466466507605988960, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.28939313
+ objectReference: {fileID: 0}
+ - target: {fileID: 8466466507605988960, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_RootOrder
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 8466466507605988960, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8466466507605988960, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 146.357
+ objectReference: {fileID: 0}
+ - target: {fileID: 8466466507605988960, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9094244029417688282, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
+ propertyPath: m_Name
+ value: npc_guards2
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: d3ad964f964e8754c93a437b28fb3f8f, type: 3}
--- !u!23 &5369876097400245933
MeshRenderer:
m_ObjectHideFlags: 0
diff --git a/Assets/Textures/DryWall/NewLayer.terrainlayer b/Assets/Textures/DryWall/NewLayer.terrainlayer
index b8914a4..cc452b7 100644
--- a/Assets/Textures/DryWall/NewLayer.terrainlayer
+++ b/Assets/Textures/DryWall/NewLayer.terrainlayer
@@ -7,10 +7,10 @@ TerrainLayer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: NewLayer
- m_DiffuseTexture: {fileID: 2800000, guid: 350eeadaf4d5c3e4aa26b6b49246ff7e, type: 3}
- m_NormalMapTexture: {fileID: 2800000, guid: 46f8977f1fe2d95478454dd41331df1b, type: 3}
+ m_DiffuseTexture: {fileID: 2800000, guid: 31531b1d47918f74ca8cc0a384b1dde8, type: 3}
+ m_NormalMapTexture: {fileID: 2800000, guid: 9021737c68ad57d46bcfc47e728f9795, type: 3}
m_MaskMapTexture: {fileID: 0}
- m_TileSize: {x: 20, y: 20}
+ m_TileSize: {x: 2, y: 2}
m_TileOffset: {x: 0, y: 0}
m_Specular: {r: 0, g: 0, b: 0, a: 0}
m_Metallic: 0
--
GitLab