From b121dccc093ac6dd8a2ee8d687131a078377dab2 Mon Sep 17 00:00:00 2001
From: art_yxc <616551813@qq.com>
Date: 星期一, 24 十二月 2018 16:50:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art
---
Maps/Model/Map108_Xjmj/Material/Xjmj_shrub_00.mat | 2
Maps/Model/Map001_Sjz/Materials/Sjz_shrub_00.mat | 2
Maps/Model/Map108_Xjmj/Material/Xjmj_tree_00.mat | 2
Maps/Model/Map005_Bfhl/Material/Bfhl_shrub_00.mat | 2
Maps/Model/Map132_Plxj/Materials/Plxj_tree_00.mat | 2
/dev/null | 9
Maps/Model/Map011_Hgdg/Materal/Hgdg_building_04.mat | 2
Maps/Model/Map116_Sgzc/Material/Sgzc_tree_00.mat | 2
Maps/Model/Map007_Jyzk/materials/Jyzd_carpet_00.mat | 2
Maps/Model/Map003_Yjsz/Materials/Yjsz_shrub_00.mat | 2
Maps/Model/Map212_Zmsl_4/Material/Zmsl_4_shrub_01.mat | 2
Test_Robot.prefab | 532 ++++++++++++++++++++--------------------------------
Maps/Model/Map004_Xyc/Effect/Material/Xyc_tree_01.mat | 2
13 files changed, 218 insertions(+), 345 deletions(-)
diff --git a/Maps/Model/Map001_Sjz/Materials/Sjz_shrub_00.mat b/Maps/Model/Map001_Sjz/Materials/Sjz_shrub_00.mat
index 8d8ea33..28f0c64 100644
--- a/Maps/Model/Map001_Sjz/Materials/Sjz_shrub_00.mat
+++ b/Maps/Model/Map001_Sjz/Materials/Sjz_shrub_00.mat
@@ -12,7 +12,7 @@
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
+ m_CustomRenderQueue: 2000
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
diff --git a/Maps/Model/Map003_Yjsz/Materials/Yjsz_shrub_00.mat b/Maps/Model/Map003_Yjsz/Materials/Yjsz_shrub_00.mat
index 245a5b7..b75cae6 100644
--- a/Maps/Model/Map003_Yjsz/Materials/Yjsz_shrub_00.mat
+++ b/Maps/Model/Map003_Yjsz/Materials/Yjsz_shrub_00.mat
@@ -12,7 +12,7 @@
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
+ m_CustomRenderQueue: 2000
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
diff --git a/Maps/Model/Map004_Xyc/Effect/Material/Xyc_tree_01.mat b/Maps/Model/Map004_Xyc/Effect/Material/Xyc_tree_01.mat
index 7e4b301..a4e7627 100644
--- a/Maps/Model/Map004_Xyc/Effect/Material/Xyc_tree_01.mat
+++ b/Maps/Model/Map004_Xyc/Effect/Material/Xyc_tree_01.mat
@@ -12,7 +12,7 @@
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
+ m_CustomRenderQueue: 2000
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
diff --git a/Maps/Model/Map005_Bfhl/Material/Bfhl_shrub_00.mat b/Maps/Model/Map005_Bfhl/Material/Bfhl_shrub_00.mat
index 5c89d84..8278828 100644
--- a/Maps/Model/Map005_Bfhl/Material/Bfhl_shrub_00.mat
+++ b/Maps/Model/Map005_Bfhl/Material/Bfhl_shrub_00.mat
@@ -12,7 +12,7 @@
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
+ m_CustomRenderQueue: 2000
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
diff --git a/Maps/Model/Map007_Jyzk/materials/Jyzd_carpet_00.mat b/Maps/Model/Map007_Jyzk/materials/Jyzd_carpet_00.mat
index 3359501..20ade1e 100644
--- a/Maps/Model/Map007_Jyzk/materials/Jyzd_carpet_00.mat
+++ b/Maps/Model/Map007_Jyzk/materials/Jyzd_carpet_00.mat
@@ -12,7 +12,7 @@
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
+ m_CustomRenderQueue: 2000
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
diff --git a/Maps/Model/Map011_Hgdg/Materal/Hgdg_building_04.mat b/Maps/Model/Map011_Hgdg/Materal/Hgdg_building_04.mat
index 3d7f4e8..2c2bfd7 100644
--- a/Maps/Model/Map011_Hgdg/Materal/Hgdg_building_04.mat
+++ b/Maps/Model/Map011_Hgdg/Materal/Hgdg_building_04.mat
@@ -12,7 +12,7 @@
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
+ m_CustomRenderQueue: 2000
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
diff --git a/Maps/Model/Map108_Xjmj/Material/Xjmj_shrub_00.mat b/Maps/Model/Map108_Xjmj/Material/Xjmj_shrub_00.mat
index 7bcb769..de55d49 100644
--- a/Maps/Model/Map108_Xjmj/Material/Xjmj_shrub_00.mat
+++ b/Maps/Model/Map108_Xjmj/Material/Xjmj_shrub_00.mat
@@ -12,7 +12,7 @@
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
+ m_CustomRenderQueue: 2000
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
diff --git a/Maps/Model/Map108_Xjmj/Material/Xjmj_tree_00.mat b/Maps/Model/Map108_Xjmj/Material/Xjmj_tree_00.mat
index d3663da..7fdd746 100644
--- a/Maps/Model/Map108_Xjmj/Material/Xjmj_tree_00.mat
+++ b/Maps/Model/Map108_Xjmj/Material/Xjmj_tree_00.mat
@@ -12,7 +12,7 @@
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
+ m_CustomRenderQueue: 2000
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
diff --git a/Maps/Model/Map109_Xsjq/Materials/Mld_tree_00.mat b/Maps/Model/Map109_Xsjq/Materials/Mld_tree_00.mat
deleted file mode 100644
index 94162f7..0000000
--- a/Maps/Model/Map109_Xsjq/Materials/Mld_tree_00.mat
+++ /dev/null
@@ -1,76 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
- serializedVersion: 6
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 0}
- m_Name: Mld_tree_00
- m_Shader: {fileID: 51, guid: 0000000000000000f000000000000000, type: 0}
- m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
- m_LightmapFlags: 4
- m_EnableInstancingVariants: 0
- m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
- stringTagMap: {}
- disabledShaderPasses: []
- m_SavedProperties:
- serializedVersion: 3
- m_TexEnvs:
- - _BumpMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _DetailAlbedoMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _DetailMask:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _DetailNormalMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _EmissionMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _MainTex:
- m_Texture: {fileID: 2800000, guid: 4d41828076ad7c6488655e235894daee, type: 3}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _MetallicGlossMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _OcclusionMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _ParallaxMap:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- m_Floats:
- - _BumpScale: 1
- - _Cutoff: 0.5
- - _DetailNormalMapScale: 1
- - _DstBlend: 10
- - _GlossMapScale: 1
- - _Glossiness: 0.5
- - _GlossyReflections: 1
- - _Metallic: 0
- - _Mode: 3
- - _OcclusionStrength: 1
- - _Parallax: 0.02
- - _SmoothnessTextureChannel: 0
- - _SpecularHighlights: 1
- - _SrcBlend: 1
- - _UVSec: 0
- - _ZWrite: 0
- m_Colors:
- - _Color: {r: 0.588, g: 0.588, b: 0.588, a: 1}
- - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
diff --git a/Maps/Model/Map109_Xsjq/Materials/Mld_tree_00.mat.meta b/Maps/Model/Map109_Xsjq/Materials/Mld_tree_00.mat.meta
deleted file mode 100644
index bff2e06..0000000
--- a/Maps/Model/Map109_Xsjq/Materials/Mld_tree_00.mat.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 464a64a74963815488b9d7a361c97816
-timeCreated: 1510712636
-licenseType: Free
-NativeFormatImporter:
- mainObjectFileID: 2100000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Maps/Model/Map116_Sgzc/Material/Sgzc_tree_00.mat b/Maps/Model/Map116_Sgzc/Material/Sgzc_tree_00.mat
index e5f1cc1..d91ae08 100644
--- a/Maps/Model/Map116_Sgzc/Material/Sgzc_tree_00.mat
+++ b/Maps/Model/Map116_Sgzc/Material/Sgzc_tree_00.mat
@@ -12,7 +12,7 @@
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
+ m_CustomRenderQueue: 2000
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
diff --git a/Maps/Model/Map132_Plxj/Materials/Plxj_tree_00.mat b/Maps/Model/Map132_Plxj/Materials/Plxj_tree_00.mat
index c809e6d..cbecdea 100644
--- a/Maps/Model/Map132_Plxj/Materials/Plxj_tree_00.mat
+++ b/Maps/Model/Map132_Plxj/Materials/Plxj_tree_00.mat
@@ -12,7 +12,7 @@
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
- m_CustomRenderQueue: 2450
+ m_CustomRenderQueue: 2000
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
diff --git a/Maps/Model/Map212_Zmsl_4/Material/Zmsl_4_shrub_01.mat b/Maps/Model/Map212_Zmsl_4/Material/Zmsl_4_shrub_01.mat
index d741cdf..5c50432 100644
--- a/Maps/Model/Map212_Zmsl_4/Material/Zmsl_4_shrub_01.mat
+++ b/Maps/Model/Map212_Zmsl_4/Material/Zmsl_4_shrub_01.mat
@@ -12,7 +12,7 @@
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
+ m_CustomRenderQueue: 2000
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
diff --git a/Test_Robot.prefab b/Test_Robot.prefab
index f1336ac..02da436 100644
--- a/Test_Robot.prefab
+++ b/Test_Robot.prefab
@@ -19,7 +19,7 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4240284446529454}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bip001 L Clavicle
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -34,7 +34,7 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4068935944155454}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bip001 Head
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -52,7 +52,7 @@
- component: {fileID: 95516671779318734}
- component: {fileID: 143392104074072546}
- component: {fileID: 114182004836185046}
- m_Layer: 10
+ m_Layer: 15
m_Name: Test_Robot
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -67,7 +67,7 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4450575133972942}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bip001 R Forearm
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -82,7 +82,7 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4840107107633694}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bone012
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -97,25 +97,8 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4202215117147880}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bip001 Spine
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!1 &1105927188135420
-GameObject:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- serializedVersion: 5
- m_Component:
- - component: {fileID: 4509189018245496}
- - component: {fileID: 33631089232235002}
- - component: {fileID: 23845802596025344}
- m_Layer: 10
- m_Name: A_Zs07_Wq
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -129,7 +112,7 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4004651671847978}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bone008
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -144,7 +127,7 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4071849318520626}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bip001 R Toe0
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -159,7 +142,7 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4885772374011680}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bip001 Neck
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -174,7 +157,7 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4121537660579490}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bip001 Spine1
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -189,7 +172,7 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4670420389662834}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bone001
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -204,7 +187,7 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4426489728952704}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bip001
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -219,7 +202,7 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4233755736657892}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bip001 R Foot
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -234,7 +217,7 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4842904748583218}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bip001 R UpperArm
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -249,7 +232,7 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4418667670132768}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bip001 L Calf
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -264,7 +247,7 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4673920491519392}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bip001 R Clavicle
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -279,7 +262,7 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4734348017740118}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bip001 R Hand
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -294,23 +277,8 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4689697049666436}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bone007
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!1 &1344444479178290
-GameObject:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- serializedVersion: 5
- m_Component:
- - component: {fileID: 4565709708829552}
- m_Layer: 10
- m_Name: A_Name
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -324,7 +292,7 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4819916441263650}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bip001 L Foot
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -339,23 +307,8 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4807491193895206}
- m_Layer: 10
+ m_Layer: 15
m_Name: Dummy001
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!1 &1383001065537522
-GameObject:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- serializedVersion: 5
- m_Component:
- - component: {fileID: 4818503500170934}
- m_Layer: 10
- m_Name: A_Stun
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -369,8 +322,23 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4034129642778966}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bip001 Pelvis
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!1 &1416378582442436
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 4089936985870332}
+ m_Layer: 0
+ m_Name: A_Name
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -384,7 +352,7 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4245906936740572}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bip001 R Calf
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -399,7 +367,7 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4749816773455964}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bone006
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -414,23 +382,8 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4198690026925212}
- m_Layer: 10
+ m_Layer: 15
m_Name: Dummy002
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!1 &1486815773834570
-GameObject:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- serializedVersion: 5
- m_Component:
- - component: {fileID: 4654490270614914}
- m_Layer: 10
- m_Name: A_Down
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -444,23 +397,25 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4055433427678864}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bone003
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!1 &1589189533139082
+--- !u!1 &1574771471305480
GameObject:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- - component: {fileID: 4201340864865960}
- m_Layer: 10
- m_Name: A_Name2
+ - component: {fileID: 4561986935754128}
+ - component: {fileID: 33345136821352504}
+ - component: {fileID: 23560359042684744}
+ m_Layer: 15
+ m_Name: A_Zs09_Sb
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -474,7 +429,7 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4597530837136018}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bip001 L Forearm
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -489,7 +444,7 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4820430184025392}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bip001 L UpperArm
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -504,7 +459,7 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4675794299632812}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bone005
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -519,7 +474,7 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4231387277366254}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bip001 L Toe0
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -534,7 +489,7 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4934723776666068}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bip001 L Thigh
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -549,7 +504,7 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4181698613959634}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bone002
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -564,7 +519,7 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4808951253161972}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bone009
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -579,7 +534,7 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4626666208558038}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bip001 L Hand
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -594,8 +549,25 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4280148641852022}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bip001 Prop1
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!1 &1698039769861760
+GameObject:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 4061481930253616}
+ - component: {fileID: 33674448654227594}
+ - component: {fileID: 23533963404668576}
+ m_Layer: 15
+ m_Name: A_Zs99_Wq
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -609,7 +581,7 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4320720609255004}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bone004
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -624,7 +596,7 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4287232410532252}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bone011
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -639,41 +611,8 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4149529498397784}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bone013
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!1 &1840039587213772
-GameObject:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- serializedVersion: 5
- m_Component:
- - component: {fileID: 4993160815295692}
- - component: {fileID: 137111750291253614}
- m_Layer: 10
- m_Name: A_Zs07
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!1 &1873142350105418
-GameObject:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- serializedVersion: 5
- m_Component:
- - component: {fileID: 4553169892292242}
- - component: {fileID: 33771440234564118}
- - component: {fileID: 23694061286085806}
- m_Layer: 10
- m_Name: A_Zs07_fwq
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -687,23 +626,8 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4217151686212196}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bip001 R Thigh
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!1 &1943897237045058
-GameObject:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- serializedVersion: 5
- m_Component:
- - component: {fileID: 4255983384947322}
- m_Layer: 10
- m_Name: A_Hit
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -717,8 +641,24 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4887393978031212}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bone014
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!1 &1959177249623364
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 4563044128869694}
+ - component: {fileID: 137952519083359356}
+ m_Layer: 15
+ m_Name: A_Zs09
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -732,7 +672,7 @@
serializedVersion: 5
m_Component:
- component: {fileID: 4915061959439240}
- m_Layer: 10
+ m_Layer: 15
m_Name: Bone010
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -746,7 +686,7 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1126295756189088}
m_LocalRotation: {x: 0.0000002901947, y: -0.000000016583776, z: -0.03144439, w: 0.9995055}
- m_LocalPosition: {x: -0.1759538, y: 0, z: 0.000000019073486}
+ m_LocalPosition: {x: -0.17595379, y: -0.000000019073486, z: 0.000000023841856}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4689697049666436}
@@ -779,10 +719,23 @@
m_GameObject: {fileID: 1501330092444416}
m_LocalRotation: {x: -0.0000000020825335, y: 0.000000003606976, z: 0.059924565,
w: 0.9982029}
- m_LocalPosition: {x: -0.1164546, y: -0.000000038146972, z: 0}
+ m_LocalPosition: {x: -0.116454616, y: -0.000000038146972, z: 0}
m_LocalScale: {x: 1.0000002, y: 1.0000002, z: 1}
m_Children: []
m_Father: {fileID: 4181698613959634}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4061481930253616
+Transform:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1698039769861760}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 4280148641852022}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4068935944155454
@@ -791,9 +744,9 @@
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1032770989723654}
- m_LocalRotation: {x: 7.7817235e-14, y: 0.000000023050683, z: -0.008310051, w: 0.9999655}
- m_LocalPosition: {x: -0.028376998, y: 0.006669204, z: 0.0000000090887635}
- m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1}
+ m_LocalRotation: {x: 8.227387e-14, y: 0.00000002305095, z: -0.008310148, w: 0.9999655}
+ m_LocalPosition: {x: -0.028376846, y: 0.0066692065, z: 0.000000009088767}
+ m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4807491193895206}
- {fileID: 4198690026925212}
@@ -813,6 +766,19 @@
m_Father: {fileID: 4233755736657892}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4089936985870332
+Transform:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1416378582442436}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 1.151, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 4443859293153486}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4121537660579490
Transform:
m_ObjectHideFlags: 1
@@ -820,7 +786,7 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1143652264664656}
m_LocalRotation: {x: 4.7832845e-14, y: -0.00000016219443, z: 0.05847793, w: 0.9982887}
- m_LocalPosition: {x: -0.09935795, y: -0.00011287212, z: -3.1305716e-10}
+ m_LocalPosition: {x: -0.11680137, y: -0.00011287212, z: -3.1305716e-10}
m_LocalScale: {x: 0.9999999, y: 0.9999999, z: 1}
m_Children:
- {fileID: 4240284446529454}
@@ -836,8 +802,8 @@
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1817023951967018}
- m_LocalRotation: {x: 0.71103495, y: 0.0034254203, z: 0.014623312, w: 0.70299625}
- m_LocalPosition: {x: 0.0036659432, y: 0.00021574616, z: -0.054680366}
+ m_LocalRotation: {x: 0.71103495, y: 0.0034254303, z: 0.014623299, w: 0.70299625}
+ m_LocalPosition: {x: 0.003665981, y: 0.00021574616, z: -0.054680366}
m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
m_Children: []
m_Father: {fileID: 4842904748583218}
@@ -851,7 +817,7 @@
m_GameObject: {fileID: 1685196929804502}
m_LocalRotation: {x: -0.000000010888977, y: -0.0000000078639335, z: 0.037453927,
w: 0.9992984}
- m_LocalPosition: {x: -0.119010426, y: 0.000000076293944, z: 0.000000009536743}
+ m_LocalPosition: {x: -0.11901046, y: 0.000000114440915, z: 0.000000009536743}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4055433427678864}
@@ -865,24 +831,11 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1469469505152346}
m_LocalRotation: {x: 0.7071068, y: -0.00000045237715, z: -0.7071068, w: -0.00000045237715}
- m_LocalPosition: {x: -0.0750824, y: 0.0557413, z: 0.000000076293944}
+ m_LocalPosition: {x: -0.07061714, y: 0.04330564, z: 0.000000059394115}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4068935944155454}
m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &4201340864865960
-Transform:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1589189533139082}
- m_LocalRotation: {x: 0.50000036, y: -0.49999964, z: -0.49999967, w: 0.50000036}
- m_LocalPosition: {x: 0.050000012, y: 0, z: 0.65}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 4426489728952704}
- m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4202215117147880
Transform:
@@ -891,7 +844,7 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1101386119703620}
m_LocalRotation: {x: -0.0000020780506, y: 0.00000069125684, z: 0.0030860289, w: 0.99999523}
- m_LocalPosition: {x: -0.033294294, y: 0.0023519897, z: 0.000000039471704}
+ m_LocalPosition: {x: -0.03329422, y: 0.0023380995, z: 0.000000039490878}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4121537660579490}
@@ -946,7 +899,7 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1003778024236572}
m_LocalRotation: {x: -0.7057847, y: -0.043220077, z: 0.7058189, w: 0.04265803}
- m_LocalPosition: {x: -0.098339915, y: -0.04266138, z: 0.039948497}
+ m_LocalPosition: {x: -0.09833995, y: -0.04266139, z: 0.0399485}
m_LocalScale: {x: 1, y: 0.99999994, z: 0.9999999}
m_Children:
- {fileID: 4820430184025392}
@@ -967,19 +920,6 @@
m_Father: {fileID: 4217151686212196}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &4255983384947322
-Transform:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1943897237045058}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -0.03200001, y: 0, z: 0.16799998}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 4426489728952704}
- m_RootOrder: 4
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4280148641852022
Transform:
m_ObjectHideFlags: 1
@@ -987,10 +927,10 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1696440392484934}
m_LocalRotation: {x: -0.000000021073426, y: -0.7071068, z: -0.000000021073426, w: 0.7071068}
- m_LocalPosition: {x: 0.056925897, y: -0.34821755, z: 0.044174574}
+ m_LocalPosition: {x: 0.056706846, y: -0.35301507, z: 0.058703993}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- - {fileID: 4509189018245496}
+ - {fileID: 4061481930253616}
m_Father: {fileID: 4426489728952704}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1001,7 +941,7 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1779321012336976}
m_LocalRotation: {x: 0.24008541, y: 0.9707518, z: -0.0000016306113, w: -0.00000035825286}
- m_LocalPosition: {x: -0.0167939, y: -0.07102132, z: 0.00000019073485}
+ m_LocalPosition: {x: -0.024037322, y: -0.07102132, z: 0.00000020078005}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4840107107633694}
@@ -1015,7 +955,7 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1745799788573106}
m_LocalRotation: {x: 0.5292058, y: -0.46897906, z: 0.46897945, w: 0.52920526}
- m_LocalPosition: {x: -0.06418903, y: -0.00000012397767, z: 0.0036736296}
+ m_LocalPosition: {x: -0.06418903, y: -0.00000012397767, z: 0.017444381}
m_LocalScale: {x: 0.99999994, y: 1.0000001, z: 0.9999998}
m_Children:
- {fileID: 4675794299632812}
@@ -1049,8 +989,6 @@
- {fileID: 4034129642778966}
- {fileID: 4280148641852022}
- {fileID: 4320720609255004}
- - {fileID: 4201340864865960}
- - {fileID: 4255983384947322}
m_Father: {fileID: 4443859293153486}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1061,14 +999,12 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1046891456012414}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalPosition: {x: -1.032, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- - {fileID: 4993160815295692}
+ - {fileID: 4563044128869694}
- {fileID: 4426489728952704}
- - {fileID: 4654490270614914}
- - {fileID: 4565709708829552}
- - {fileID: 4818503500170934}
+ - {fileID: 4089936985870332}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1078,52 +1014,39 @@
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1053874613021536}
- m_LocalRotation: {x: 0.0000000028572247, y: -0.0000000446218, z: 0.043101065, w: 0.99907076}
- m_LocalPosition: {x: -0.12551197, y: 0, z: -0.000000038146972}
- m_LocalScale: {x: 1.0000001, y: 1, z: 1}
+ m_LocalRotation: {x: -2.882013e-10, y: -0.000000014927455, z: 0.043101057, w: 0.99907076}
+ m_LocalPosition: {x: -0.12551194, y: 0.0000000011920929, z: 0}
+ m_LocalScale: {x: 1.0000001, y: 1.0000002, z: 1}
m_Children:
- {fileID: 4734348017740118}
m_Father: {fileID: 4842904748583218}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &4509189018245496
+--- !u!4 &4561986935754128
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1105927188135420}
+ m_GameObject: {fileID: 1574771471305480}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 4280148641852022}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &4553169892292242
-Transform:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1873142350105418}
- m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
m_LocalPosition: {x: -0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4597530837136018}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &4565709708829552
+--- !u!4 &4563044128869694
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1344444479178290}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 1.085954, z: 0.010248017}
+ m_GameObject: {fileID: 1959177249623364}
+ m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
+ m_LocalPosition: {x: -0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4443859293153486}
- m_RootOrder: 3
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4597530837136018
Transform:
@@ -1131,13 +1054,12 @@
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1600022474349888}
- m_LocalRotation: {x: -0.0000000012845118, y: 0.000000029774629, z: 0.043101065,
- w: 0.99907076}
- m_LocalPosition: {x: -0.12551199, y: 0, z: 0.000000038146972}
- m_LocalScale: {x: 1, y: 1, z: 1}
+ m_LocalRotation: {x: 0.0000000050063402, y: -0.000000029614068, z: 0.04310106, w: 0.99907076}
+ m_LocalPosition: {x: -0.12551194, y: 0, z: 0.000000038146972}
+ m_LocalScale: {x: 0.99999994, y: 1.0000001, z: 1}
m_Children:
- {fileID: 4626666208558038}
- - {fileID: 4553169892292242}
+ - {fileID: 4561986935754128}
m_Father: {fileID: 4820430184025392}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1147,25 +1069,12 @@
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1696037206518836}
- m_LocalRotation: {x: -0.70647967, y: -0.052352693, z: -0.057394262, w: 0.7034569}
- m_LocalPosition: {x: -0.11599355, y: 0.0000000023841857, z: 0}
+ m_LocalRotation: {x: -0.70647967, y: -0.05235268, z: -0.05739425, w: 0.7034569}
+ m_LocalPosition: {x: -0.1216168, y: -0.0000000011920929, z: 0.000000038146972}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4597530837136018}
m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &4654490270614914
-Transform:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1486815773834570}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 4443859293153486}
- m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4670420389662834
Transform:
@@ -1174,7 +1083,7 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1157809411930652}
m_LocalRotation: {x: 0.2742588, y: 0.954119, z: -0.109357886, w: 0.049798388}
- m_LocalPosition: {x: -0.104782484, y: -0.091061555, z: 0.042190697}
+ m_LocalPosition: {x: -0.10478267, y: -0.09106157, z: 0.042190704}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4181698613959634}
@@ -1188,7 +1097,7 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1269500993413462}
m_LocalRotation: {x: 0.7057848, y: 0.043218117, z: 0.705819, w: 0.04265607}
- m_LocalPosition: {x: -0.098339915, y: -0.042661153, z: -0.039948735}
+ m_LocalPosition: {x: -0.09833995, y: -0.04266116, z: -0.039948735}
m_LocalScale: {x: 1, y: 1, z: 0.9999999}
m_Children:
- {fileID: 4842904748583218}
@@ -1216,7 +1125,7 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1290156177477988}
m_LocalRotation: {x: 0.21812698, y: 0.70006263, z: 0.6728649, w: -0.097907126}
- m_LocalPosition: {x: -0.009459686, y: 0.014020662, z: -0.10384745}
+ m_LocalPosition: {x: -0.041879043, y: 0.014020686, z: -0.095689505}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4004651671847978}
@@ -1229,9 +1138,9 @@
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1275808271812066}
- m_LocalRotation: {x: 0.70647967, y: 0.05235265, z: -0.05739422, w: 0.7034569}
- m_LocalPosition: {x: -0.115993574, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 0.99999994, z: 1}
+ m_LocalRotation: {x: 0.70647967, y: 0.052352663, z: -0.05739423, w: 0.7034569}
+ m_LocalPosition: {x: -0.121616855, y: 0.0000000023841857, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 0.99999994}
m_Children: []
m_Father: {fileID: 4450575133972942}
m_RootOrder: 0
@@ -1243,7 +1152,7 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1449350709966160}
m_LocalRotation: {x: -1.0213283e-14, y: -1.2526697e-16, z: 0.012264182, w: 0.99992484}
- m_LocalPosition: {x: -0.075436264, y: 0, z: -4.5474734e-15}
+ m_LocalPosition: {x: -0.07543625, y: 0, z: -4.5474734e-15}
m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
m_Children: []
m_Father: {fileID: 4675794299632812}
@@ -1256,7 +1165,7 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1371514517613634}
m_LocalRotation: {x: -0.49999976, y: 0.5000003, z: 0.49999976, w: 0.5000003}
- m_LocalPosition: {x: -0.085645676, y: 0.10659443, z: 0.00000015258789}
+ m_LocalPosition: {x: -0.07601562, y: 0.082014985, z: 0.00000011918488}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4068935944155454}
@@ -1269,24 +1178,11 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1692381087032432}
m_LocalRotation: {x: -0.097906835, y: 0.67286706, z: 0.70006096, w: 0.21812572}
- m_LocalPosition: {x: -0.009459343, y: 0.014021235, z: 0.103849955}
+ m_LocalPosition: {x: -0.041878775, y: 0.01402121, z: 0.09569002}
m_LocalScale: {x: 0.99999994, y: 1, z: 1}
m_Children:
- {fileID: 4915061959439240}
m_Father: {fileID: 4034129642778966}
- m_RootOrder: 4
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &4818503500170934
-Transform:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1383001065537522}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 2.542, z: 0.14}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 4443859293153486}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4819916441263650
@@ -1310,7 +1206,7 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1655006612020862}
m_LocalRotation: {x: 0.084612645, y: -0.26325676, z: 0.030898487, w: 0.96051127}
- m_LocalPosition: {x: -0.06600943, y: 0.000000009536743, z: -0.000000076293944}
+ m_LocalPosition: {x: -0.06600943, y: -0.000000009536743, z: -0.000000076293944}
m_LocalScale: {x: 1, y: 1.0000001, z: 1}
m_Children:
- {fileID: 4597530837136018}
@@ -1325,7 +1221,7 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1068262983777474}
m_LocalRotation: {x: 1.7758836e-15, y: 4.098839e-17, z: 0.023074418, w: 0.99973375}
- m_LocalPosition: {x: -0.16012418, y: -0.000000057220458, z: 0.0000000088974685}
+ m_LocalPosition: {x: -0.16012418, y: -0.000000057220458, z: 0.000000008897473}
m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
m_Children: []
m_Father: {fileID: 4287232410532252}
@@ -1337,9 +1233,9 @@
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1179373064612070}
- m_LocalRotation: {x: -0.08461265, y: 0.26325673, z: 0.030898483, w: 0.96051127}
- m_LocalPosition: {x: -0.066009425, y: 0.000000009536743, z: 0}
- m_LocalScale: {x: 1, y: 0.99999994, z: 1}
+ m_LocalRotation: {x: -0.08461266, y: 0.26325667, z: 0.030898485, w: 0.96051127}
+ m_LocalPosition: {x: -0.066009425, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 0.9999999, z: 1}
m_Children:
- {fileID: 4450575133972942}
- {fileID: 4149529498397784}
@@ -1352,8 +1248,8 @@
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1140768385538346}
- m_LocalRotation: {x: -4.8655168e-14, y: 0.00000014772559, z: -0.05326131, w: 0.99858063}
- m_LocalPosition: {x: -0.14097527, y: -0.04152106, z: -0.000000052854357}
+ m_LocalRotation: {x: -4.4994427e-14, y: 0.00000014772532, z: -0.05326121, w: 0.99858063}
+ m_LocalPosition: {x: -0.15523326, y: -0.043885097, z: -0.000000053613874}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4068935944155454}
@@ -1367,7 +1263,7 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1958671335058476}
m_LocalRotation: {x: 0.7029968, y: 0.014624092, z: 0.0034262545, w: 0.7110344}
- m_LocalPosition: {x: 0.0036693763, y: 0.0002154541, z: 0.054678153}
+ m_LocalPosition: {x: 0.0036694335, y: 0.0002154541, z: 0.054678075}
m_LocalScale: {x: 0.99999994, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4820430184025392}
@@ -1381,7 +1277,7 @@
m_GameObject: {fileID: 1971477353989152}
m_LocalRotation: {x: -0.0000000020960031, y: 0.0000000073883264, z: 0.03144436,
w: 0.9995055}
- m_LocalPosition: {x: -0.17595382, y: 0.000000038146972, z: 0.000000019073486}
+ m_LocalPosition: {x: -0.1759538, y: 0.000000038146972, z: 0.000000009536743}
m_LocalScale: {x: 1.0000001, y: 1, z: 0.9999998}
m_Children: []
m_Father: {fileID: 4808951253161972}
@@ -1393,7 +1289,7 @@
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1660512869829078}
- m_LocalRotation: {x: 0.057559717, y: 0.9964319, z: 0.0033715833, w: 0.06163598}
+ m_LocalRotation: {x: 0.057559717, y: 0.9964319, z: 0.0033715828, w: 0.06163598}
m_LocalPosition: {x: 0.000000076293944, y: 0.000000104904174, z: 0.06290179}
m_LocalScale: {x: 1, y: 1, z: 1.0000001}
m_Children:
@@ -1401,25 +1297,12 @@
m_Father: {fileID: 4034129642778966}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &4993160815295692
-Transform:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1840039587213772}
- m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
- m_LocalPosition: {x: -0, y: 0.3591553, z: -0.021440953}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 4443859293153486}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!23 &23694061286085806
+--- !u!23 &23533963404668576
MeshRenderer:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1873142350105418}
+ m_GameObject: {fileID: 1698039769861760}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
@@ -1427,7 +1310,7 @@
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_Materials:
- - {fileID: 2100000, guid: 6c51b1ff7d9c77e4fb25e72172388970, type: 2}
+ - {fileID: 2100000, guid: 04bbc75400974264aab4a7c6b72f8259, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -1446,12 +1329,12 @@
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
---- !u!23 &23845802596025344
+--- !u!23 &23560359042684744
MeshRenderer:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1105927188135420}
+ m_GameObject: {fileID: 1574771471305480}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
@@ -1459,7 +1342,7 @@
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_Materials:
- - {fileID: 2100000, guid: 7cb8ffed6c64a1b499c7f2de81534274, type: 2}
+ - {fileID: 2100000, guid: b9daa1826f377a4408911d1fc3fc26d5, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -1478,20 +1361,20 @@
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
---- !u!33 &33631089232235002
+--- !u!33 &33345136821352504
MeshFilter:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1105927188135420}
- m_Mesh: {fileID: 4300000, guid: 55767bb30d6488341ad7bfa2ab15154d, type: 3}
---- !u!33 &33771440234564118
+ m_GameObject: {fileID: 1574771471305480}
+ m_Mesh: {fileID: 4300000, guid: 76a76f4897a006844a00deb085c2d9e5, type: 3}
+--- !u!33 &33674448654227594
MeshFilter:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1873142350105418}
- m_Mesh: {fileID: 4300002, guid: 517ec5c1eecc585428369cb7d8562b65, type: 3}
+ m_GameObject: {fileID: 1698039769861760}
+ m_Mesh: {fileID: 4300000, guid: badf3369e7e060840b13d9a782d73d71, type: 3}
--- !u!95 &95516671779318734
Animator:
serializedVersion: 3
@@ -1500,7 +1383,7 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1046891456012414}
m_Enabled: 1
- m_Avatar: {fileID: 9000000, guid: 27ba9ab10137c204b92928d45009149d, type: 3}
+ m_Avatar: {fileID: 9000000, guid: 7f29a78210c2e1749ba7482e595ed875, type: 3}
m_Controller: {fileID: 9100000, guid: d01145d8a75367948989939f30eab448, type: 2}
m_CullingMode: 1
m_UpdateMode: 0
@@ -1521,12 +1404,12 @@
m_Name:
m_EditorClassIdentifier:
speed: 5
---- !u!137 &137111750291253614
+--- !u!137 &137952519083359356
SkinnedMeshRenderer:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1840039587213772}
+ m_GameObject: {fileID: 1959177249623364}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 0
@@ -1534,7 +1417,7 @@
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_Materials:
- - {fileID: 2100000, guid: e3027735914808744ab2e0e628aba7e7, type: 2}
+ - {fileID: 2100000, guid: 3185c14262aed484c8750c0554d1277f, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -1557,48 +1440,47 @@
m_Quality: 0
m_UpdateWhenOffscreen: 0
m_SkinnedMotionVectors: 1
- m_Mesh: {fileID: 4300000, guid: 27ba9ab10137c204b92928d45009149d, type: 3}
+ m_Mesh: {fileID: 4300000, guid: 7f29a78210c2e1749ba7482e595ed875, type: 3}
m_Bones:
- - {fileID: 4121537660579490}
- - {fileID: 4673920491519392}
- {fileID: 4842904748583218}
- - {fileID: 4280148641852022}
- - {fileID: 4202215117147880}
- {fileID: 4450575133972942}
- - {fileID: 4734348017740118}
- - {fileID: 4034129642778966}
+ - {fileID: 4202215117147880}
+ - {fileID: 4673920491519392}
+ - {fileID: 4121537660579490}
- {fileID: 4689697049666436}
- - {fileID: 4217151686212196}
+ - {fileID: 4034129642778966}
+ - {fileID: 4734348017740118}
+ - {fileID: 4149529498397784}
- {fileID: 4287232410532252}
- {fileID: 4004651671847978}
- {fileID: 4840107107633694}
- - {fileID: 4068935944155454}
+ - {fileID: 4217151686212196}
- {fileID: 4320720609255004}
- - {fileID: 4749816773455964}
- - {fileID: 4675794299632812}
- - {fileID: 4885772374011680}
- {fileID: 4245906936740572}
- {fileID: 4233755736657892}
- {fileID: 4071849318520626}
- - {fileID: 4149529498397784}
+ - {fileID: 4749816773455964}
+ - {fileID: 4675794299632812}
- {fileID: 4820430184025392}
- {fileID: 4240284446529454}
- - {fileID: 4670420389662834}
+ - {fileID: 4887393978031212}
- {fileID: 4597530837136018}
- {fileID: 4808951253161972}
- - {fileID: 4934723776666068}
- {fileID: 4915061959439240}
+ - {fileID: 4934723776666068}
- {fileID: 4418667670132768}
- {fileID: 4819916441263650}
- {fileID: 4231387277366254}
- - {fileID: 4887393978031212}
+ - {fileID: 4670420389662834}
+ - {fileID: 4068935944155454}
+ - {fileID: 4885772374011680}
- {fileID: 4807491193895206}
- {fileID: 4198690026925212}
m_BlendShapeWeights: []
m_RootBone: {fileID: 4034129642778966}
m_AABB:
- m_Center: {x: -0.08387005, y: -0.07261544, z: -0.08756009}
- m_Extent: {x: 0.51904666, y: 0.17894289, z: 0.32229128}
+ m_Center: {x: -0.07819232, y: -0.11220137, z: -0.065889165}
+ m_Extent: {x: 0.51359105, y: 0.20267072, z: 0.34291935}
m_DirtyAABB: 0
--- !u!143 &143392104074072546
CharacterController:
--
Gitblit v1.8.0