qianzhuqing 3 years ago
parent
commit
1cec617a40
100 changed files with 83986 additions and 246 deletions
  1. 0 14
      Assets/DOTween/Editor/DOTweenUpgradeManager.XML
  2. BIN
      Assets/DOTween/Editor/DOTweenUpgradeManager.dll
  3. BIN
      Assets/DOTween/Editor/DOTweenUpgradeManager.dll.mdb
  4. 0 33
      Assets/DOTween/Editor/DOTweenUpgradeManager.dll.meta
  5. 1 0
      Assets/GameFramework/Scripts/Runtime/DataTable/DefaultDataTableHelper.cs
  6. 5 4
      Assets/GameMain/Configs/ResourceBuilder.xml
  7. 109 13
      Assets/GameMain/Configs/ResourceCollection.xml
  8. BIN
      Assets/GameMain/DataTables/CustomBody.bytes
  9. BIN
      Assets/GameMain/DataTables/CustomBody.txt
  10. 1 1
      Assets/HumanoidEditor.meta
  11. 2 3
      Assets/HumanoidEditor/HE_Readme.pdf.meta
  12. BIN
      Assets/GameMain/Meshes/Animator/mary-head/Eye_d.png
  13. 88 0
      Assets/GameMain/Meshes/Animator/mary-head/Eye_d.png.meta
  14. BIN
      Assets/GameMain/Meshes/Animator/mary-head/Eye_e.png
  15. 19 7
      Assets/HumanoidEditor/HumanoidEditorGUI/xUp_Icon.png.meta
  16. BIN
      Assets/GameMain/Meshes/Animator/mary-head/PSSLookupDirect.png
  17. 28 8
      Assets/HumanoidEditor/HumanoidEditorGUI/yUp_Icon.png.meta
  18. BIN
      Assets/GameMain/Meshes/Animator/mary-head/PSSLookupDirectSM2.png
  19. 28 8
      Assets/HumanoidEditor/HumanoidEditorGUI/zUp_Icon.png.meta
  20. BIN
      Assets/GameMain/Meshes/Animator/mary-head/PSSLookupSH.png
  21. 88 0
      Assets/GameMain/Meshes/Animator/mary-head/PSSLookupSH.png.meta
  22. BIN
      Assets/GameMain/Meshes/Animator/mary-head/PSSLookupSpecAO.png
  23. 88 0
      Assets/GameMain/Meshes/Animator/mary-head/PSSLookupSpecAO.png.meta
  24. BIN
      Assets/GameMain/Meshes/Animator/mary-head/YaChi_d 1.png
  25. 88 0
      Assets/GameMain/Meshes/Animator/mary-head/YaChi_d 1.png.meta
  26. 77 0
      Assets/GameMain/Meshes/Animator/mary-head/diy-face07.mat
  27. 3 3
      Assets/HumanoidEditor/HumanoidEditorGUI/PolybayEditorSkin.guiskin.meta
  28. BIN
      Assets/GameMain/Meshes/Animator/mary-head/eye_shadows_d_a.png
  29. 88 0
      Assets/GameMain/Meshes/Animator/mary-head/eye_shadows_d_a.png.meta
  30. 78 0
      Assets/GameMain/Meshes/Animator/mary-head/face-eyes1.mat
  31. 8 0
      Assets/GameMain/Meshes/Animator/mary-head/face-eyes1.mat.meta
  32. 78 0
      Assets/GameMain/Meshes/Animator/mary-head/face-eyes2.mat
  33. 8 0
      Assets/GameMain/Meshes/Animator/mary-head/face-eyes2.mat.meta
  34. 78 0
      Assets/GameMain/Meshes/Animator/mary-head/face-eyes3.mat
  35. 8 0
      Assets/GameMain/Meshes/Animator/mary-head/face-eyes3.mat.meta
  36. 78 0
      Assets/GameMain/Meshes/Animator/mary-head/face-eyes4.mat
  37. 8 0
      Assets/GameMain/Meshes/Animator/mary-head/face-eyes4.mat.meta
  38. 78 0
      Assets/GameMain/Meshes/Animator/mary-head/face-jiemao.mat
  39. 8 0
      Assets/GameMain/Meshes/Animator/mary-head/face-jiemao.mat.meta
  40. BIN
      Assets/GameMain/Meshes/Animator/mary-head/face-jiemao.png
  41. 88 0
      Assets/GameMain/Meshes/Animator/mary-head/face-jiemao.png.meta
  42. 78 0
      Assets/GameMain/Meshes/Animator/mary-head/face-meimao.mat
  43. 8 0
      Assets/GameMain/Meshes/Animator/mary-head/face-meimao.mat.meta
  44. BIN
      Assets/GameMain/Meshes/Animator/mary-head/face-meimao.png
  45. 88 0
      Assets/GameMain/Meshes/Animator/mary-head/face-meimao.png.meta
  46. 78 0
      Assets/GameMain/Meshes/Animator/mary-head/face-nothing.mat
  47. 8 0
      Assets/GameMain/Meshes/Animator/mary-head/face-nothing.mat.meta
  48. BIN
      Assets/GameMain/Meshes/Animator/mary-head/face07-n.png
  49. 92 0
      Assets/GameMain/Meshes/Animator/mary-head/face07-n.png.meta
  50. 78 0
      Assets/GameMain/Meshes/Animator/mary-head/face_tooth_mat 1.mat
  51. 8 0
      Assets/GameMain/Meshes/Animator/mary-head/face_tooth_mat 1.mat.meta
  52. BIN
      Assets/GameMain/Meshes/Animator/mary-head/head-sgo.png
  53. 92 0
      Assets/GameMain/Meshes/Animator/mary-head/head-sgo.png.meta
  54. 82 0
      Assets/GameMain/Meshes/Animator/mary-head/head.mat
  55. 8 0
      Assets/GameMain/Meshes/Animator/mary-head/head.mat.meta
  56. BIN
      Assets/GameMain/Meshes/Animator/mary-head/head01-d.png
  57. 25 28
      Assets/HumanoidEditor/HumanoidEditorGUI/HumanoidEditorLogo.png.meta
  58. BIN
      Assets/GameMain/Meshes/Animator/mary-head/mary-head.fbx
  59. 133 0
      Assets/GameMain/Meshes/Animator/mary-head/mary-head.fbx.meta
  60. BIN
      Assets/GameMain/Meshes/Animator/mary-head/referenceTexture.png
  61. 88 0
      Assets/GameMain/Meshes/Animator/mary-head/referenceTexture.png.meta
  62. 26180 0
      Assets/GameMain/Meshes/Animator/mary-head/z1.obj
  63. 123 0
      Assets/GameMain/Meshes/Animator/mary-head/z1.obj.meta
  64. 26180 0
      Assets/GameMain/Meshes/Animator/mary-head/z2.obj
  65. 123 0
      Assets/GameMain/Meshes/Animator/mary-head/z2.obj.meta
  66. 8 0
      Assets/GameMain/Meshes/Mary.meta
  67. 436 0
      Assets/GameMain/Meshes/Mary/mary.prefab
  68. 2 2
      Assets/DOTween/Editor/DOTweenUpgradeManager.XML.meta
  69. 5 5
      Assets/GameMain/Meshes/Player/baseani.controller
  70. BIN
      Assets/GameMain/Meshes/Player/qita_2.FBX
  71. 100 0
      Assets/GameMain/Meshes/Player/qita_2.FBX.meta
  72. 26391 0
      Assets/GameMain/Meshes/z Body .001.obj
  73. 97 0
      Assets/GameMain/Meshes/z Body .001.obj.meta
  74. 8 0
      Assets/GameMain/Model.meta
  75. BIN
      Assets/GameMain/Model/4.FBX
  76. 957 0
      Assets/GameMain/Model/4.FBX.meta
  77. 704 6
      Assets/GameMain/Scenes/CustomRole.unity
  78. 1 1
      Assets/GameMain/Scripts/DataTable/DRAircraft.cs
  79. 1 1
      Assets/GameMain/Scripts/DataTable/DRArmor.cs
  80. 1 1
      Assets/GameMain/Scripts/DataTable/DRAsteroid.cs
  81. 34 12
      Assets/GameMain/Scripts/DataTable/DRCustomBody.cs
  82. 1 1
      Assets/GameMain/Scripts/DataTable/DREntity.cs
  83. 1 1
      Assets/GameMain/Scripts/DataTable/DRMusic.cs
  84. 1 1
      Assets/GameMain/Scripts/DataTable/DRScene.cs
  85. 1 1
      Assets/GameMain/Scripts/DataTable/DRSound.cs
  86. 1 1
      Assets/GameMain/Scripts/DataTable/DRThruster.cs
  87. 1 1
      Assets/GameMain/Scripts/DataTable/DRUIForm.cs
  88. 1 1
      Assets/GameMain/Scripts/DataTable/DRUISound.cs
  89. 1 1
      Assets/GameMain/Scripts/DataTable/DRWeapon.cs
  90. 23 4
      Assets/GameMain/Scripts/Entity/EntityData/RoleCustomBoneData.cs
  91. 109 60
      Assets/GameMain/Scripts/Game/CustomRole/CustomManager.cs
  92. 47 0
      Assets/GameMain/Scripts/Game/CustomRole/CustomRoleController.cs
  93. 2 0
      Assets/GameMain/Scripts/Procedure/ProcedureCustomRole.cs
  94. 5 0
      Assets/GameMain/Scripts/UI/UICustom.cs
  95. 100 0
      Assets/GameMain/Scripts/Utility/AvatarTool.cs
  96. 11 0
      Assets/GameMain/Scripts/Utility/AvatarTool.cs.meta
  97. 17 17
      Assets/GameMain/Scripts/Utility/CustomRoleUtility.cs
  98. 216 7
      Assets/GameMain/UI/UIForms/CustomRole.prefab
  99. BIN
      Assets/HumanoidEditor/HE_Readme.pdf
  100. 0 0
      Assets/HumanoidEditor/HumanoidEditor.dll

+ 0 - 14
Assets/DOTween/Editor/DOTweenUpgradeManager.XML

@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>DOTweenUpgradeManager</name>
-    </assembly>
-    <members>
-        <member name="T:DG.DOTweenUpgradeManager.Autorun">
-            <summary>
-            This class and its whole library are deleted the first time DOTween's setup is run after an upgrade (or after a new install).
-            NOTE: DidReloadScripts doesn't work on first install so it's useless, InitializeOnLoad is the only way
-            </summary>
-        </member>
-    </members>
-</doc>

BIN
Assets/DOTween/Editor/DOTweenUpgradeManager.dll


BIN
Assets/DOTween/Editor/DOTweenUpgradeManager.dll.mdb


+ 0 - 33
Assets/DOTween/Editor/DOTweenUpgradeManager.dll.meta

@@ -1,33 +0,0 @@
-fileFormatVersion: 2
-guid: 63124eea720c818458cedd876b85bc2f
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 1
-      settings:
-        DefaultValueInitialized: true
-  - first:
-      Windows Store Apps: WindowsStoreApps
-    second:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 1 - 0
Assets/GameFramework/Scripts/Runtime/DataTable/DefaultDataTableHelper.cs

@@ -36,6 +36,7 @@ namespace UnityGameFramework.Runtime
             TextAsset dataTableTextAsset = dataTableAsset as TextAsset;
             if (dataTableTextAsset != null)
             {
+                Log.Warning(dataTableTextAsset.text);
                 if (dataTableAssetName.EndsWith(BytesAssetExtension, StringComparison.Ordinal))
                 {
                     return dataTable.ParseData(dataTableTextAsset.bytes, userData);

+ 5 - 4
Assets/GameMain/Configs/ResourceBuilder.xml

@@ -2,14 +2,15 @@
 <UnityGameFramework>
   <ResourceBuilder>
     <Settings>
-      <InternalResourceVersion>0</InternalResourceVersion>
-      <Platforms>1</Platforms>
+      <InternalResourceVersion>4</InternalResourceVersion>
+      <Platforms>32</Platforms>
       <AssetBundleCompression>1</AssetBundleCompression>
       <CompressionHelperTypeName>UnityGameFramework.Runtime.DefaultCompressionHelper</CompressionHelperTypeName>
       <AdditionalCompressionSelected>True</AdditionalCompressionSelected>
       <ForceRebuildAssetBundleSelected>False</ForceRebuildAssetBundleSelected>
-      <BuildEventHandlerTypeName>StarForce.Editor.StarForceBuildEventHandler</BuildEventHandlerTypeName>
-      <OutputDirectory></OutputDirectory>
+      <BuildEventHandlerTypeName>
+      </BuildEventHandlerTypeName>
+      <OutputDirectory>E:/output/Meta</OutputDirectory>
       <OutputPackageSelected>True</OutputPackageSelected>
       <OutputFullSelected>True</OutputFullSelected>
       <OutputPackedSelected>True</OutputPackedSelected>

+ 109 - 13
Assets/GameMain/Configs/ResourceCollection.xml

@@ -12,6 +12,7 @@
       <Resource Name="Localization/Dictionaries" Variant="zh-tw" FileSystem="UI" LoadType="0" Packed="True" ResourceGroups="Base" />
       <Resource Name="Materials" FileSystem="Resources" LoadType="0" Packed="True" />
       <Resource Name="Meshes" FileSystem="Resources" LoadType="0" Packed="True" />
+      <Resource Name="metasprite" LoadType="0" Packed="False" />
       <Resource Name="Music/About" FileSystem="Resources" LoadType="0" Packed="True" ResourceGroups="Music" />
       <Resource Name="Music/Background" FileSystem="Resources" LoadType="0" Packed="True" ResourceGroups="Music" />
       <Resource Name="Music/Menu" FileSystem="Resources" LoadType="0" Packed="True" ResourceGroups="Music" />
@@ -25,134 +26,229 @@
       <Resource Name="UI/UISprites/Logos" FileSystem="UI" LoadType="0" Packed="True" />
     </Resources>
     <Assets>
+      <Asset Guid="00fb74125b3f6cb4586e3f17b5389562" ResourceName="metasprite" />
+      <Asset Guid="011a24e787d1b484b9f52f178e67581c" ResourceName="metasprite" />
       <Asset Guid="0179316b5fc7c2946a67c5877c02fc30" ResourceName="UI/UISprites/Common" />
       <Asset Guid="04d7dde7615d71b4db1a0c8d67a62e95" ResourceName="UI/UIForms" />
       <Asset Guid="04dbc0581071c254ea6564b2ff06ff9b" ResourceName="Textures" />
+      <Asset Guid="05c40c8d2412b1f4ba033e6f1cc8c73c" ResourceName="metasprite" />
+      <Asset Guid="06dc87bd90de28e4c86ea1476f8e38c3" ResourceName="metasprite" />
       <Asset Guid="093f8873cfe371d41b854ed9fb6bff69" ResourceName="Music/About" />
       <Asset Guid="0963e6c65b2b1f74d9f455e21901e2dc" ResourceName="Textures" />
-      <Asset Guid="0992f89f84d762f478fd32f8225168b0" ResourceName="Entities" />
       <Asset Guid="09966b19e546cc94aa84d0743cb2a83d" ResourceName="UI/UIForms" />
+      <Asset Guid="0a1fa08fa3d4899459c305017d9f7a30" ResourceName="metasprite" />
       <Asset Guid="0a65a68c01a76ea4b8b574827a6467aa" ResourceName="UI/UISprites/Common" />
+      <Asset Guid="0c9331c5f63a4174a94fdeb28c5a2276" ResourceName="metasprite" />
       <Asset Guid="0ed73dc47f4cb38489020d05e9f02c99" ResourceName="Materials" />
       <Asset Guid="0f995b3145e0e7247a42da6cef1dbf23" ResourceName="Materials" />
+      <Asset Guid="1021feb529175094093c76247934e422" ResourceName="metasprite" />
       <Asset Guid="1053b0070685be347ab58587156842dc" ResourceName="Localization/Dictionaries" ResourceVariant="zh-tw" />
-      <Asset Guid="11e27c26ac87b40f0a62ec40d7261989" ResourceName="Entities" />
+      <Asset Guid="1108590e681998042b48076d7d60ef61" ResourceName="metasprite" />
+      <Asset Guid="11cb5c81f9e062e4285602f571b2fca8" ResourceName="metasprite" />
+      <Asset Guid="12bad035587d7444ea7e97aa31ce4ed7" ResourceName="metasprite" />
       <Asset Guid="1478894bc9a1ed241b05b0862a7b8bce" ResourceName="Textures" />
       <Asset Guid="14869ac0d4433f04db1704e39d03412e" ResourceName="Localization/Dictionaries" ResourceVariant="en-us" />
       <Asset Guid="156d241f796508c4da4fc354a7fbf5a8" ResourceName="UI/UISprites/Common" />
-      <Asset Guid="160925a6fe2664f2a978566b819f0af0" ResourceName="Entities" />
+      <Asset Guid="17503f9303574294bb34c41cc4e7abbf" ResourceName="metasprite" />
       <Asset Guid="185f97f18bd603a478461ce9c08bd039" ResourceName="Materials" />
+      <Asset Guid="188aa591a021e464ea437bbcfa9e0251" ResourceName="metasprite" />
       <Asset Guid="1b4bad6cea5a94611b21f9757fe41444" ResourceName="Materials" />
+      <Asset Guid="1be38a19390f10a49ad9e2a3b0e3c64f" ResourceName="metasprite" />
       <Asset Guid="1be4472894949437694aead55c6da60f" ResourceName="Sounds" />
+      <Asset Guid="1be83576f4195314e97dd52e3fbfd00e" ResourceName="metasprite" />
       <Asset Guid="1c89236d45255234ebd1d39657ff7e02" ResourceName="Textures" />
       <Asset Guid="1cfe02ffd0b74854ea5bcd1a3c63ac3c" ResourceName="Materials" />
       <Asset Guid="1d46a17a95a444c08830612bc1146d1d" ResourceName="Materials" />
+      <Asset Guid="1df639e182407a54193deca376347c55" ResourceName="DataTables" />
       <Asset Guid="1e0350b97c61bfb4a91c62d756d01727" ResourceName="Materials" />
+      <Asset Guid="1ead258f71f0d884e913087590ece730" ResourceName="metasprite" />
+      <Asset Guid="20cfd8b7ea61a1941aefa438b87ce633" ResourceName="metasprite" />
       <Asset Guid="236433a27ce40a7429b87d14d8fa3035" ResourceName="UI/UISprites/Common" />
       <Asset Guid="239366f83979ffa48a45dac2f0f1e8cb" ResourceName="DataTables" />
+      <Asset Guid="23d3422dfe6276f419de91f64f82f5b3" ResourceName="metasprite" />
+      <Asset Guid="244566cb4d97c5745bd1406fe246e67b" ResourceName="metasprite" />
       <Asset Guid="24ca310f92a6796408f1db7647ec4e55" ResourceName="UI/UISprites/Common" />
+      <Asset Guid="25f16f148afc7c14da16dc6fd256ed04" ResourceName="metasprite" />
+      <Asset Guid="26102f644156262428df087fb69bbad1" ResourceName="metasprite" />
       <Asset Guid="2768a9a4c8d289840918dcb879705893" ResourceName="Meshes" />
+      <Asset Guid="297c14ae21a0a294ab37504c0a5d6a94" ResourceName="DataTables" />
+      <Asset Guid="2a9cdeeabcad10448bed32f28f0f9cd9" ResourceName="metasprite" />
+      <Asset Guid="2b3297969840cdd4c8282de4c32c63c1" ResourceName="metasprite" />
+      <Asset Guid="2b85adb3ae0810749a8a7a0917a0eab4" ResourceName="metasprite" />
       <Asset Guid="2cb5eef4d7d7bf6459dd13a3f8d90246" ResourceName="Textures" />
+      <Asset Guid="2e6582224f30cba438be0850c053766e" ResourceName="metasprite" />
       <Asset Guid="315e8ed2db27c254cb3366ff0793cd90" ResourceName="DataTables" />
-      <Asset Guid="3455fe69f7ddc4604b95bf9b0a1e88d7" ResourceName="Entities" />
       <Asset Guid="352da872791696c48af3b21132e3e3c3" ResourceName="DataTables" />
+      <Asset Guid="36bd34f59b194604b84605b33c5e470c" ResourceName="metasprite" />
       <Asset Guid="372a8b1e52bedc64b9207b12d167afaa" ResourceName="DataTables" />
+      <Asset Guid="384c714394619bd40a66b8715f4c424e" ResourceName="metasprite" />
       <Asset Guid="3aa539b1e46111d4299a83c73ebe762c" ResourceName="UI/UIForms" />
       <Asset Guid="3be3fac3611f4584695662c4889f722d" ResourceName="UI/UISprites/Common" />
+      <Asset Guid="3bf4ad7f5300adc4f82fb12314563fa3" ResourceName="metasprite" />
+      <Asset Guid="3cc64d9268a1c214ba8e0ee7e77ac9bc" ResourceName="metasprite" />
       <Asset Guid="3dc7455402dfa462b89a4bbd513955e9" ResourceName="Sounds" />
       <Asset Guid="3e504a46a8fcec34db3c4776530c6eb2" ResourceName="Textures" />
       <Asset Guid="3f54fcfdac53aec42ae18a6a1c6d8cb1" ResourceName="UI/UISprites/Common" />
       <Asset Guid="4473d81b14ddb0143addf0e6050d8491" ResourceName="Scenes" />
       <Asset Guid="44c8db52241385c45bbb14a1718f17bf" ResourceName="Configs" />
       <Asset Guid="4a17d2c656f5c6b44a31e3ee547a76b0" ResourceName="DataTables" />
+      <Asset Guid="4ad0dfa60082c8e468583584242210df" ResourceName="metasprite" />
+      <Asset Guid="4b62c0d98288d2540a5529d15ea6bde2" ResourceName="metasprite" />
       <Asset Guid="4c3865b2ac420cd46a9cde6ab468d016" ResourceName="Materials" />
+      <Asset Guid="4c885fe5b2267de4cbdc7e01a4580597" ResourceName="metasprite" />
+      <Asset Guid="4d35cf464dbd0be438017301e8c08f10" ResourceName="metasprite" />
       <Asset Guid="4db6a299939bfe94893585eb387f577a" ResourceName="DataTables" />
       <Asset Guid="4f688097e85071841a2c3ba165000c20" ResourceName="Textures" />
       <Asset Guid="5282f20eba4d44213820e21af8481932" ResourceName="Meshes" />
+      <Asset Guid="541cbd87f61ca3b44a01ce2e313c452d" ResourceName="metasprite" />
       <Asset Guid="56b8df63bbad60749a69e38bc687fadf" ResourceName="UI/UISprites/Common" />
       <Asset Guid="578af1667322bab45b652b79a40bb4fb" ResourceName="Materials" />
       <Asset Guid="583ff7026dac91849b7c7b2468ba456b" ResourceName="Materials" />
+      <Asset Guid="5cf6cfde166d4d249a1748fbe3dfa141" ResourceName="metasprite" />
       <Asset Guid="5dcd89912e222bf4c87f76db4044bc5e" ResourceName="Localization/Dictionaries" ResourceVariant="ko-kr" />
       <Asset Guid="62af9e5c8f39cfa49af9e10ccf42f1da" ResourceName="UI/UISprites/Common" />
       <Asset Guid="638ff8ae4a0d15047839cd265d3bc296" ResourceName="Music/Background" />
       <Asset Guid="63fe6ff9ab9e1433f8db4ebd940f2442" ResourceName="Materials" />
       <Asset Guid="64f3bb52c6a54854688fcc656af2b1c9" ResourceName="DataTables" />
+      <Asset Guid="66de9fe7ca5a92846a2768b2f690e306" ResourceName="metasprite" />
+      <Asset Guid="6a4b82edcf27b7e4d9ce8a39136614f1" ResourceName="metasprite" />
+      <Asset Guid="6c5b34db153732c4195bfb2e1def71f5" ResourceName="metasprite" />
       <Asset Guid="6cbc2c323b77f804fb958fa4eca33998" ResourceName="UI/UISprites/Common" />
       <Asset Guid="6d9b42ac01f24bf4d98923573f103575" ResourceName="Textures" />
       <Asset Guid="6db0c8354d868834abf29840037591b1" ResourceName="Textures" />
       <Asset Guid="6e023ca4283b3a7469cd61d24c83048c" ResourceName="Textures" />
       <Asset Guid="6e3730451fa077346abd4ac642ea71d8" ResourceName="Textures" />
       <Asset Guid="6e5d026bf0652ed4380f6a66f4aa26c5" ResourceName="Textures" />
+      <Asset Guid="6e814a81b97303041aae97a746bfcb8d" ResourceName="metasprite" />
       <Asset Guid="71646ebaae78d43aeb8b53cacdb69671" ResourceName="Textures" />
+      <Asset Guid="717e69f3bc88a8a4893d809d89948f2c" ResourceName="metasprite" />
       <Asset Guid="72e76810224064300b7d32e8322a5d12" ResourceName="Sounds" />
-      <Asset Guid="738bdf56857a65f479c367c7b62c4ad7" ResourceName="Entities" />
+      <Asset Guid="7540c6a9cdf4c604285eba9435c283e2" ResourceName="metasprite" />
+      <Asset Guid="766dfb6a2a5c63e4e88c98d7600f908f" ResourceName="metasprite" />
       <Asset Guid="77cbb7c5404c10242ab59953e0746314" ResourceName="Fonts" />
+      <Asset Guid="7972cafe925c18f4fa70ba3cb6d7bd87" ResourceName="metasprite" />
+      <Asset Guid="7c0056bd785d6a64c812b7aa268ffae4" ResourceName="DataTables" />
+      <Asset Guid="7c881fecdf3e1e84d8627d86f1c2c59f" ResourceName="metasprite" />
+      <Asset Guid="7d5a3fc1a216a9b4fb961317839fc4ef" ResourceName="metasprite" />
       <Asset Guid="7d5f7699d6d1d48e485ac71126e12061" ResourceName="Entities" />
+      <Asset Guid="7df19565e5718fe4582866699a5c12c8" ResourceName="metasprite" />
       <Asset Guid="7e91cd9bad7babf4b975882a4b7453cb" ResourceName="Textures" />
       <Asset Guid="7eae0d2701845a54aa570b07c55dab44" ResourceName="Textures" />
       <Asset Guid="7f5aee8da226edf4991598327cb32ce0" ResourceName="UI/UISprites/Logos" />
       <Asset Guid="7fd11dc5d29076d469d414dec2818f11" ResourceName="Configs" />
-      <Asset Guid="834bfaee90a9d4e04b1e8c1ca22cc88e" ResourceName="Entities" />
+      <Asset Guid="8072d473631210a4f86ab030c50dec26" ResourceName="DataTables" />
+      <Asset Guid="815689cd554e5174eae0ba0c96854e73" ResourceName="metasprite" />
       <Asset Guid="836be25be3e1e8c41ae5545bc8a9a4d7" ResourceName="Textures" />
+      <Asset Guid="84efc7f33df3f424a838fdfdc0ed59dc" ResourceName="metasprite" />
+      <Asset Guid="85664cef7fcc2554cb3186ab7f08029f" ResourceName="metasprite" />
+      <Asset Guid="86440b5a4227cb046ac97251be0012a1" ResourceName="UI/UIForms" />
       <Asset Guid="8940b037a9b441c4cbd3d2b446838424" ResourceName="Materials" />
+      <Asset Guid="8ae6bcd1f9d85514d8c4780cfc0e4e00" ResourceName="metasprite" />
       <Asset Guid="8b1acacd22538f34cb85287a0781ea5e" ResourceName="DataTables" />
-      <Asset Guid="8cf749fdfa5edc3478d16893efeaa0eb" ResourceName="Entities" />
+      <Asset Guid="8bf05ec0ea8a0e44a96dba8a58540a8f" ResourceName="metasprite" />
       <Asset Guid="8e114ded6a865324588170636872943c" ResourceName="DataTables" />
       <Asset Guid="8e27380ee68aa4a219b4db9018e7da31" ResourceName="Materials" />
-      <Asset Guid="9143e2b62ad50488482f9b73672fc331" ResourceName="Entities" />
+      <Asset Guid="8e7d6207828228c41b60713198cd7925" ResourceName="metasprite" />
+      <Asset Guid="918174c7fd5f98a449ebc8c6d8cb28cd" ResourceName="metasprite" />
+      <Asset Guid="927de05646bf1074b996d616785b38f9" ResourceName="metasprite" />
+      <Asset Guid="92b193a0508be814a8f0a92215ef6256" ResourceName="metasprite" />
+      <Asset Guid="92d1474c33451d64d9b8a9b7f73437a1" ResourceName="metasprite" />
       <Asset Guid="955000b4d1441470e8cbf94f483228b5" ResourceName="Materials" />
+      <Asset Guid="9584d5612b468c943aec5c95b587d610" ResourceName="metasprite" />
       <Asset Guid="97b1f8b25cca2bc458cb9d6127c8d186" ResourceName="Materials" />
       <Asset Guid="97d117308cf86924289e81e7e71dd5dd" ResourceName="DataTables" />
+      <Asset Guid="997724f804a6a644c81f2308b20a6e39" ResourceName="metasprite" />
+      <Asset Guid="9a28a6eab8a2ea8489ad65e501a9c7e0" ResourceName="metasprite" />
+      <Asset Guid="9a8546966a8458f4c8ed551928caf6e1" ResourceName="metasprite" />
       <Asset Guid="9afa958d6d8235941b9badb42aae4370" ResourceName="Meshes" />
       <Asset Guid="9b433f0bb7fef6f4085c316a0d88c307" ResourceName="DataTables" />
+      <Asset Guid="9b47675344fda9e4f9fb3f022587c2ff" ResourceName="metasprite" />
       <Asset Guid="9be2e1e45f4edd74c8764538ad306b78" ResourceName="Localization/Dictionaries" ResourceVariant="zh-cn" />
       <Asset Guid="9c3961f379234354e813d7b38146424d" ResourceName="DataTables" />
       <Asset Guid="9c3faac13c8ced84a9f3018303b7bb98" ResourceName="DataTables" />
+      <Asset Guid="9cc16e32118196f4da0d8d3f4ddfbbea" ResourceName="metasprite" />
       <Asset Guid="9ddab293e2a8af3499dac05f5fd6169c" ResourceName="Meshes" />
+      <Asset Guid="9e0f2ad0203421440965ebc60776959c" ResourceName="metasprite" />
       <Asset Guid="9f847ec5e66e03e4ead1d3c5f7b510e8" ResourceName="UI/UISprites/Common" />
       <Asset Guid="a019ae3af8e864616b85773c509f5285" ResourceName="Sounds" />
       <Asset Guid="a23eef5e20ff8cb46adf33491fc443fb" ResourceName="Materials" />
       <Asset Guid="a33e23ae848110243820cda82120b105" ResourceName="DataTables" />
-      <Asset Guid="a6d58f54ce5934781962a4f887e834f3" ResourceName="Entities" />
+      <Asset Guid="a35f3f57ce11eb847b35ee4db51446b4" ResourceName="DataTables" />
+      <Asset Guid="a59e17d1bb139b74fbbc8a4cd882b5a3" ResourceName="metasprite" />
+      <Asset Guid="a67c16135e4b4114f809b8effae9b7d7" ResourceName="metasprite" />
+      <Asset Guid="a6a6459bc972ef342913e6b08fc199ca" ResourceName="metasprite" />
       <Asset Guid="a71f8bb1b1b2c51438e2bafc884cb02c" ResourceName="DataTables" />
+      <Asset Guid="a74005c2978a1974c9d7bcc17e533c5b" ResourceName="metasprite" />
       <Asset Guid="a7b030cffa2dc44478c14e49a22771c2" ResourceName="Materials" />
+      <Asset Guid="a89760bd6b3487f42a476050173b2d8b" ResourceName="metasprite" />
       <Asset Guid="a8c07bbe04fdaf04b80e27f651a8edd6" ResourceName="UI/UISprites/Common" />
+      <Asset Guid="a9bede77aa4f31048871613dca683321" ResourceName="metasprite" />
+      <Asset Guid="aa5746d1938ae11438a0df1c59a262e4" ResourceName="DataTables" />
       <Asset Guid="ab45c3f613f388d43bbf43ec05eb92e2" ResourceName="UI/UISprites/Common" />
       <Asset Guid="ab4774faf71b57a40a29a9e902403fe3" ResourceName="DataTables" />
-      <Asset Guid="abd1565e9e268f04cac3631d022b4ace" ResourceName="Entities" />
+      <Asset Guid="ac036267acbc85045a4726340ecab702" ResourceName="metasprite" />
+      <Asset Guid="ad302467f5ac0aa4abd61a261adf8a00" ResourceName="metasprite" />
       <Asset Guid="ad56aae2bb0f2ce4a86711287e14e223" ResourceName="DataTables" />
       <Asset Guid="ae6a7f967521769458b0913fa39caaf4" ResourceName="Textures" />
-      <Asset Guid="afc18fc39ade3744397c0c993b57be53" ResourceName="Entities" />
       <Asset Guid="b031b4f2980561542a7f7ba41391edc3" ResourceName="Scenes" />
       <Asset Guid="b0c7cf51d3fecb446ab93bf854419715" ResourceName="Materials" />
+      <Asset Guid="b0ca33e6a02931a4e8e660d8a861a2b3" ResourceName="DataTables" />
       <Asset Guid="b2cebe04343227945bab3729ca9a3493" ResourceName="DataTables" />
+      <Asset Guid="b43b9428191cb3d4aa56d0d126b38917" ResourceName="metasprite" />
+      <Asset Guid="b474370e72ceec54ea3cb09d8765a548" ResourceName="Scenes" />
       <Asset Guid="ba157ba55f72c424a9e88f3c029997c4" ResourceName="Textures" />
       <Asset Guid="baedbbad82997f445a8cb4da210404e0" ResourceName="Meshes" />
       <Asset Guid="bbfd75fe6fe00e1448fe988173ede7f9" ResourceName="UI/UIForms" />
       <Asset Guid="bf75b984df8a84987bcf3a8bf6e2862d" ResourceName="Sounds" />
+      <Asset Guid="c37470be69c930245b17fe538b00ca6c" ResourceName="metasprite" />
+      <Asset Guid="c4b5766b8e896cb449ee7c2435feff48" ResourceName="metasprite" />
       <Asset Guid="c547624e174de984882f0a14b4bb32e1" ResourceName="Materials" />
       <Asset Guid="c58c9afddbd36d14d837fa218d772996" ResourceName="Materials" />
       <Asset Guid="c7d1e11dd37634b48a9dd4012b8e4306" ResourceName="UI/UISounds" />
       <Asset Guid="caa829ab2ffc71340a69253afdf58365" ResourceName="Music/Menu" />
       <Asset Guid="cadd0764941c8b646ae79b51d0ea8285" ResourceName="UI/UISprites/Common" />
+      <Asset Guid="ce09e29262f84844e92233b99ef8bfdc" ResourceName="metasprite" />
+      <Asset Guid="ce44adac21a80e54282b6868f39c17b1" ResourceName="metasprite" />
       <Asset Guid="cfe53cf384344bd47a8680f8c5f97a7b" ResourceName="DataTables" />
+      <Asset Guid="d0ca39b623336474d8f76d3a147cf0c5" ResourceName="metasprite" />
+      <Asset Guid="d1766a3d3abaf474abda7a4de4788ba1" ResourceName="metasprite" />
+      <Asset Guid="d35c503e19658d846996920b0834df36" ResourceName="metasprite" />
+      <Asset Guid="d366276d67987794b9d9b5db2a5b7480" ResourceName="metasprite" />
+      <Asset Guid="d3ff2f11d97fc494c85edf49ecc0e89f" ResourceName="metasprite" />
+      <Asset Guid="d4d7446448a48a6428edf9cb7e32d83c" ResourceName="UI/UIForms" />
+      <Asset Guid="d5db38eb2b16ff24e8b117f8c1320413" ResourceName="metasprite" />
+      <Asset Guid="d630a02e140f122448f2e836772a52d6" ResourceName="metasprite" />
+      <Asset Guid="d6a812a8972a0464399e662826d7d157" ResourceName="metasprite" />
+      <Asset Guid="d7bcee19e92fee744aa0ea57a3f7b053" ResourceName="metasprite" />
       <Asset Guid="d9808401c68af274a8edfbed3d1b53c7" ResourceName="Meshes" />
       <Asset Guid="db58965402f12ed47b4dad61a9e48c9d" ResourceName="UI/UISprites/Icons" />
+      <Asset Guid="dd23ec3e02064934885853db19512e89" ResourceName="metasprite" />
+      <Asset Guid="df68905f01abed1408e38f0cf786013a" ResourceName="metasprite" />
       <Asset Guid="e0792649e7774a24d8e7cceba0231c61" ResourceName="DataTables" />
+      <Asset Guid="e1e23aef153d1854a8bde7219d9dc7b2" ResourceName="metasprite" />
       <Asset Guid="e5ca26c53b6ab8a46b52817008d7c7fa" ResourceName="UI/UISprites/Icons" />
       <Asset Guid="e82837c9099f69a48b48fc44eb8d119d" ResourceName="UI/UISprites/Common" />
       <Asset Guid="e830964cdb85ff3429bca484c16bab44" ResourceName="UI/UISounds" />
       <Asset Guid="e85864330b68dde498dcb6e8711815d3" ResourceName="UI/UISprites/Common" />
+      <Asset Guid="e9ddf84dfc6fe1648acf52615a2f4c3b" ResourceName="metasprite" />
       <Asset Guid="eabb37cb6d738b443b398b701a64cd88" ResourceName="Textures" />
+      <Asset Guid="ef60c7d234dc31943bf804b986ecc865" ResourceName="metasprite" />
+      <Asset Guid="f245e18169a7de046bb9c72886c049cc" ResourceName="metasprite" />
       <Asset Guid="f2f4df0b7211e4c42a5638273525d8ee" ResourceName="UI/UISprites/Common" />
       <Asset Guid="f2f97a713beae744181ba934f9c4113a" ResourceName="DataTables" />
       <Asset Guid="f36c72c738c55f741afcd674a0b1245f" ResourceName="Materials" />
       <Asset Guid="f438a72a91e1c3c4a9ced40888ffec96" ResourceName="UI/UISprites/Icons" />
-      <Asset Guid="f4ec271e525e14ca9927a07e6a2e153d" ResourceName="Entities" />
+      <Asset Guid="f45cf8f218c2a774eb4fe90c5a4e619a" ResourceName="metasprite" />
+      <Asset Guid="f5d67fb6774eac24697cf4b0a8e682ee" ResourceName="metasprite" />
       <Asset Guid="f6db5bbdfe0e9894798706814cd6b336" ResourceName="Textures" />
+      <Asset Guid="fa0fbba01e873b449951b7f7fc1139e5" ResourceName="metasprite" />
+      <Asset Guid="fc7851c2f8f91dc44abe7c9dc76a5112" ResourceName="DataTables" />
+      <Asset Guid="fcc02251a7034214ba510a8bc6b4a030" ResourceName="metasprite" />
       <Asset Guid="fd3cbf51780694849b9b019b36a3938e" ResourceName="Textures" />
+      <Asset Guid="fd6ba078b127dda4f8e71588e165a6c3" ResourceName="metasprite" />
       <Asset Guid="fdb5edd099d06b045af609ba3172400a" ResourceName="DataTables" />
-      <Asset Guid="fedd25a3c60e7ae499fc6efab9ee180b" ResourceName="Entities" />
+      <Asset Guid="fde5b205d6058344d9ef82ec8fc96d3e" ResourceName="metasprite" />
+      <Asset Guid="ffeea1dc73c704149ae66dcd34512657" ResourceName="metasprite" />
     </Assets>
   </ResourceCollection>
 </UnityGameFramework>

BIN
Assets/GameMain/DataTables/CustomBody.bytes


BIN
Assets/GameMain/DataTables/CustomBody.txt


+ 1 - 1
Assets/HumanoidEditor.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: eb70d082e708cd146a2fda769dc1f6ad
+guid: 256ba80b9f051cc4085a65464dbd5c6a
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 2 - 3
Assets/HumanoidEditor/HE_Readme.pdf.meta

@@ -1,7 +1,6 @@
 fileFormatVersion: 2
-guid: 33473a67c48bc6140847a4d5fd65ac72
-timeCreated: 1532777384
-licenseType: Store
+guid: a1a07a25849aa0f4889b56b186cffdde
+folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: 

BIN
Assets/GameMain/Meshes/Animator/mary-head/Eye_d.png


+ 88 - 0
Assets/GameMain/Meshes/Animator/mary-head/Eye_d.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: d6e19c11dd66489449e3a1602fab8534
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 1
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/GameMain/Meshes/Animator/mary-head/Eye_e.png


+ 19 - 7
Assets/HumanoidEditor/HumanoidEditorGUI/xUp_Icon.png.meta

@@ -1,11 +1,9 @@
 fileFormatVersion: 2
-guid: 9facef3a8bb75d34eaa6a7d5fab58df8
-timeCreated: 1516846735
-licenseType: Store
+guid: 28f7ac62034eb7144898a22851a2d99a
 TextureImporter:
   fileIDToRecycleName: {}
   externalObjects: {}
-  serializedVersion: 4
+  serializedVersion: 9
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -23,6 +21,8 @@ TextureImporter:
     heightScale: 0.25
     normalMapFilter: 0
   isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -33,7 +33,7 @@ TextureImporter:
     serializedVersion: 2
     filterMode: -1
     aniso: -1
-    mipBias: -1
+    mipBias: -100
     wrapU: -1
     wrapV: -1
     wrapW: -1
@@ -45,18 +45,21 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
   textureType: 0
   textureShape: 1
+  singleChannelComponent: 0
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
   platformSettings:
-  - buildTarget: DefaultTexturePlatform
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
@@ -65,12 +68,21 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    androidETC2FallbackOverride: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
     physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
   spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 

BIN
Assets/GameMain/Meshes/Animator/mary-head/PSSLookupDirect.png


+ 28 - 8
Assets/HumanoidEditor/HumanoidEditorGUI/yUp_Icon.png.meta

@@ -1,10 +1,9 @@
 fileFormatVersion: 2
-guid: ab8f3255c3a7ac74782739c254b411ca
-timeCreated: 1505485599
-licenseType: Store
+guid: 4ad2c2578332f104fa51229031903bd7
 TextureImporter:
   fileIDToRecycleName: {}
-  serializedVersion: 4
+  externalObjects: {}
+  serializedVersion: 9
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -12,6 +11,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -20,6 +21,8 @@ TextureImporter:
     heightScale: 0.25
     normalMapFilter: 0
   isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
-    mipBias: -1
-    wrapMode: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
   nPOTScale: 1
   lightmap: 0
   compressionQuality: 50
@@ -39,30 +45,44 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
   textureType: 0
   textureShape: 1
+  singleChannelComponent: 0
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
   platformSettings:
-  - buildTarget: DefaultTexturePlatform
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    androidETC2FallbackOverride: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
   spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 

BIN
Assets/GameMain/Meshes/Animator/mary-head/PSSLookupDirectSM2.png


+ 28 - 8
Assets/HumanoidEditor/HumanoidEditorGUI/zUp_Icon.png.meta

@@ -1,10 +1,9 @@
 fileFormatVersion: 2
-guid: 8a39f1264044e87408da7ef08fe36d13
-timeCreated: 1505485599
-licenseType: Store
+guid: 19f2064899f0f6e4fb3515a43df9f2fa
 TextureImporter:
   fileIDToRecycleName: {}
-  serializedVersion: 4
+  externalObjects: {}
+  serializedVersion: 9
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -12,6 +11,8 @@ TextureImporter:
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -20,6 +21,8 @@ TextureImporter:
     heightScale: 0.25
     normalMapFilter: 0
   isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -27,10 +30,13 @@ TextureImporter:
   textureFormat: 1
   maxTextureSize: 2048
   textureSettings:
+    serializedVersion: 2
     filterMode: -1
     aniso: -1
-    mipBias: -1
-    wrapMode: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
   nPOTScale: 1
   lightmap: 0
   compressionQuality: 50
@@ -39,30 +45,44 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
   textureType: 0
   textureShape: 1
+  singleChannelComponent: 0
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
   platformSettings:
-  - buildTarget: DefaultTexturePlatform
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
+    resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    androidETC2FallbackOverride: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
   spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 

BIN
Assets/GameMain/Meshes/Animator/mary-head/PSSLookupSH.png


+ 88 - 0
Assets/GameMain/Meshes/Animator/mary-head/PSSLookupSH.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: a4baf7e233f0bd249aa30f6ebca317f5
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/GameMain/Meshes/Animator/mary-head/PSSLookupSpecAO.png


+ 88 - 0
Assets/GameMain/Meshes/Animator/mary-head/PSSLookupSpecAO.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: f17d8959ce1469c408f59668009defb0
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/GameMain/Meshes/Animator/mary-head/YaChi_d 1.png


+ 88 - 0
Assets/GameMain/Meshes/Animator/mary-head/YaChi_d 1.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: ab388e1325653ff489d0e7f5b65d7863
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 1
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 77 - 0
Assets/GameMain/Meshes/Animator/mary-head/diy-face07.mat

@@ -0,0 +1,77 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: diy-face07
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _NORMALMAP
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 2800000, guid: aab7f99ef32a7084187c61dddb86e77a, type: 3}
+        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: a09e61c96098f384e812f94a27089fe2, 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: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.97, g: 0.97, b: 0.97, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

+ 3 - 3
Assets/HumanoidEditor/HumanoidEditorGUI/PolybayEditorSkin.guiskin.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 7070054cc1eb1f34cbabfc6f05ad94bd
-timeCreated: 1474299321
-licenseType: Store
+guid: 91e981a1b3d23df4ebf4a9824ac445a0
 NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

BIN
Assets/GameMain/Meshes/Animator/mary-head/eye_shadows_d_a.png


+ 88 - 0
Assets/GameMain/Meshes/Animator/mary-head/eye_shadows_d_a.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: ce826193bb4701b4395110f8cd29c00f
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 1
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 78 - 0
Assets/GameMain/Meshes/Animator/mary-head/face-eyes1.mat

@@ -0,0 +1,78 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: face-eyes1
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _ALPHABLEND_ON
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  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: 0}
+        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: 1
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 2
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 5
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 1, g: 0, b: 0, a: 0}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

+ 8 - 0
Assets/GameMain/Meshes/Animator/mary-head/face-eyes1.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a57f0015c16803244afff2a09d9b88b6
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 78 - 0
Assets/GameMain/Meshes/Animator/mary-head/face-eyes2.mat

@@ -0,0 +1,78 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: face-eyes2
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _ALPHABLEND_ON _EMISSION
+  m_LightmapFlags: 2
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  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: 2800000, guid: 28f7ac62034eb7144898a22851a2d99a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: d6e19c11dd66489449e3a1602fab8534, 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: 1
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 2
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 5
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 1, g: 0.7882353, b: 0.7882353, a: 1}

+ 8 - 0
Assets/GameMain/Meshes/Animator/mary-head/face-eyes2.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c36d442cfd11c1448bf6ea166ef36d94
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 78 - 0
Assets/GameMain/Meshes/Animator/mary-head/face-eyes3.mat

@@ -0,0 +1,78 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: face-eyes3
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _ALPHABLEND_ON
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  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: ce826193bb4701b4395110f8cd29c00f, 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
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 2
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 5
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 0, g: 0, b: 0, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

+ 8 - 0
Assets/GameMain/Meshes/Animator/mary-head/face-eyes3.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fece29ae141016b40b73ea772a76f77f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 78 - 0
Assets/GameMain/Meshes/Animator/mary-head/face-eyes4.mat

@@ -0,0 +1,78 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: face-eyes4
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _ALPHABLEND_ON
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  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: 0}
+        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
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 2
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 5
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

+ 8 - 0
Assets/GameMain/Meshes/Animator/mary-head/face-eyes4.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 91d02c78c80695b42b54f0f73fa25ab8
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 78 - 0
Assets/GameMain/Meshes/Animator/mary-head/face-jiemao.mat

@@ -0,0 +1,78 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: face-jiemao
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _ALPHABLEND_ON
+  m_LightmapFlags: 6
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  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: 5db064fffbd27dd4bb0842dd8d3ba2ad, 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
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 2
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 5
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 0, g: 0, b: 0, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

+ 8 - 0
Assets/GameMain/Meshes/Animator/mary-head/face-jiemao.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c3d6e4bee34d82c4c854f9c96d52dea6
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/GameMain/Meshes/Animator/mary-head/face-jiemao.png


+ 88 - 0
Assets/GameMain/Meshes/Animator/mary-head/face-jiemao.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 5db064fffbd27dd4bb0842dd8d3ba2ad
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 1
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 78 - 0
Assets/GameMain/Meshes/Animator/mary-head/face-meimao.mat

@@ -0,0 +1,78 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: face-meimao
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _ALPHABLEND_ON
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  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: 4243a13e9aedfa047b21e7442cd0d74e, 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
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 2
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 5
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 0.1792453, g: 0.07796404, b: 0.051575292, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

+ 8 - 0
Assets/GameMain/Meshes/Animator/mary-head/face-meimao.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 562fac1343c6c8e47a285a72b27bbf88
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/GameMain/Meshes/Animator/mary-head/face-meimao.png


+ 88 - 0
Assets/GameMain/Meshes/Animator/mary-head/face-meimao.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 4243a13e9aedfa047b21e7442cd0d74e
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 1
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 78 - 0
Assets/GameMain/Meshes/Animator/mary-head/face-nothing.mat

@@ -0,0 +1,78 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: face-nothing
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _ALPHABLEND_ON
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  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: 0}
+        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
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 2
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 5
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 0}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

+ 8 - 0
Assets/GameMain/Meshes/Animator/mary-head/face-nothing.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8773b1613dd00a94399239dc9ec9df72
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/GameMain/Meshes/Animator/mary-head/face07-n.png


+ 92 - 0
Assets/GameMain/Meshes/Animator/mary-head/face07-n.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: aab7f99ef32a7084187c61dddb86e77a
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 0
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 1
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 1
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 78 - 0
Assets/GameMain/Meshes/Animator/mary-head/face_tooth_mat 1.mat

@@ -0,0 +1,78 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: face_tooth_mat 1
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _ALPHABLEND_ON
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  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: ab388e1325653ff489d0e7f5b65d7863, 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
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 2
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 5
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

+ 8 - 0
Assets/GameMain/Meshes/Animator/mary-head/face_tooth_mat 1.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c95fb0ca3c9cf25429c6b6a4d7212563
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/GameMain/Meshes/Animator/mary-head/head-sgo.png


+ 92 - 0
Assets/GameMain/Meshes/Animator/mary-head/head-sgo.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: b08ec631f982b2844b9f28a8502a0232
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 0
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 1
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 1
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 82 - 0
Assets/GameMain/Meshes/Animator/mary-head/head.mat

@@ -0,0 +1,82 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: head
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  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: 2800000, guid: a09e61c96098f384e812f94a27089fe2, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: a09e61c96098f384e812f94a27089fe2, 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}
+    - _SpecGlossMap:
+        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: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0.397, g: 0.397, b: 0.397, a: 1}
+    - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}

+ 8 - 0
Assets/GameMain/Meshes/Animator/mary-head/head.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d23bedbf8e93eb140803521d1b064ccb
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/GameMain/Meshes/Animator/mary-head/head01-d.png


+ 25 - 28
Assets/HumanoidEditor/HumanoidEditorGUI/HumanoidEditorLogo.png.meta

@@ -1,13 +1,13 @@
 fileFormatVersion: 2
-guid: 35570797cc7989f4aaa698c242221386
+guid: a09e61c96098f384e812f94a27089fe2
 TextureImporter:
-  fileIDToRecycleName: {}
+  internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 6
+  serializedVersion: 11
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
@@ -20,7 +20,7 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
-  isReadable: 0
+  isReadable: 1
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   grayScaleToAlpha: 0
@@ -31,12 +31,12 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
-    wrapU: -1
-    wrapV: -1
-    wrapW: -1
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
   nPOTScale: 1
   lightmap: 0
   compressionQuality: 50
@@ -57,51 +57,44 @@ TextureImporter:
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
+  applyGammaDecoding: 1
   platformSettings:
-  - serializedVersion: 2
+  - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 1
+    textureCompression: 0
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
-  - serializedVersion: 2
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 1
+    textureCompression: 0
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
-  - serializedVersion: 2
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 3
     buildTarget: Android
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  - serializedVersion: 2
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
+    textureCompression: 0
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -109,11 +102,15 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 
+    internalID: 0
     vertices: []
     indices: 
     edges: []
     weights: []
+    secondaryTextures: []
   spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 

BIN
Assets/GameMain/Meshes/Animator/mary-head/mary-head.fbx


+ 133 - 0
Assets/GameMain/Meshes/Animator/mary-head/mary-head.fbx.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: b5ec75d79e143ad4baef7e87fb19fd00
+ModelImporter:
+  serializedVersion: 23
+  fileIDToRecycleName:
+    100000: corea
+    100002: expression-hp
+    100004: eye-hp
+    100006: eyeL
+    100008: eyeR
+    100010: eyes
+    100012: face-face
+    100014: //RootNode
+    100016: mary-head
+    100018: sp
+    100020: yinying
+    400000: corea
+    400002: expression-hp
+    400004: eye-hp
+    400006: eyeL
+    400008: eyeR
+    400010: eyes
+    400012: face-face
+    400014: //RootNode
+    400016: mary-head
+    400018: sp
+    400020: yinying
+    2100000: face-eyes1
+    2100002: diy-face07
+    2100004: face-jiemao
+    2100006: face-nothing
+    2100008: face_tooth_mat 1
+    2100010: face-meimao
+    2100012: face-eyes2
+    2100014: face-eyes4
+    2100016: face-eyes3
+    4300000: corea
+    4300002: face-face
+    4300004: eyes
+    4300006: sp
+    4300008: yinying
+    9500000: //RootNode
+    13700000: corea
+    13700002: eyes
+    13700004: face-face
+    13700006: sp
+    13700008: yinying
+  externalObjects: {}
+  materials:
+    importMaterials: 1
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 1
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    optimizeMeshForGPU: 1
+    keepQuads: 0
+    weldVertices: 1
+    preserveHierarchy: 0
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    previousCalculatedGlobalScale: 0.01
+    hasPreviousCalculatedGlobalScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  importAnimation: 1
+  copyAvatar: 0
+  humanDescription:
+    serializedVersion: 2
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  animationType: 2
+  humanoidOversampling: 1
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/GameMain/Meshes/Animator/mary-head/referenceTexture.png


+ 88 - 0
Assets/GameMain/Meshes/Animator/mary-head/referenceTexture.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 84bdc72a56a9d3d4ead493b059cd940c
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

File diff suppressed because it is too large
+ 26180 - 0
Assets/GameMain/Meshes/Animator/mary-head/z1.obj


+ 123 - 0
Assets/GameMain/Meshes/Animator/mary-head/z1.obj.meta

@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: a37e70bb7a142404e8bd5f5cbb202021
+ModelImporter:
+  serializedVersion: 23
+  fileIDToRecycleName:
+    100000: corea
+    100002: eyes
+    100004: face_face
+    100006: sp
+    100008: yinying
+    100010: //RootNode
+    400000: corea
+    400002: eyes
+    400004: face_face
+    400006: sp
+    400008: yinying
+    400010: //RootNode
+    2100000: coreaMat
+    2100002: eyesMat
+    2100004: face_faceMat
+    2100006: spMat
+    2100008: yinyingMat
+    2300000: corea
+    2300002: eyes
+    2300004: face_face
+    2300006: sp
+    2300008: yinying
+    3300000: corea
+    3300002: eyes
+    3300004: face_face
+    3300006: sp
+    3300008: yinying
+    4300000: corea
+    4300002: eyes
+    4300004: face_face
+    4300006: sp
+    4300008: yinying
+  externalObjects: {}
+  materials:
+    importMaterials: 1
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 1
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    optimizeMeshForGPU: 1
+    keepQuads: 0
+    weldVertices: 1
+    preserveHierarchy: 0
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    previousCalculatedGlobalScale: 1
+    hasPreviousCalculatedGlobalScale: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  importAnimation: 1
+  copyAvatar: 0
+  humanDescription:
+    serializedVersion: 2
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  animationType: 0
+  humanoidOversampling: 1
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

File diff suppressed because it is too large
+ 26180 - 0
Assets/GameMain/Meshes/Animator/mary-head/z2.obj


+ 123 - 0
Assets/GameMain/Meshes/Animator/mary-head/z2.obj.meta

@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: f77666cacdcdc6b4ebe5d35bc1ee5e8c
+ModelImporter:
+  serializedVersion: 23
+  fileIDToRecycleName:
+    100000: corea
+    100002: eyes
+    100004: face_face
+    100006: sp
+    100008: yinying
+    100010: //RootNode
+    400000: corea
+    400002: eyes
+    400004: face_face
+    400006: sp
+    400008: yinying
+    400010: //RootNode
+    2100000: coreaMat
+    2100002: eyesMat
+    2100004: face_faceMat
+    2100006: spMat
+    2100008: yinyingMat
+    2300000: corea
+    2300002: eyes
+    2300004: face_face
+    2300006: sp
+    2300008: yinying
+    3300000: corea
+    3300002: eyes
+    3300004: face_face
+    3300006: sp
+    3300008: yinying
+    4300000: corea
+    4300002: eyes
+    4300004: face_face
+    4300006: sp
+    4300008: yinying
+  externalObjects: {}
+  materials:
+    importMaterials: 1
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 1
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    optimizeMeshForGPU: 1
+    keepQuads: 0
+    weldVertices: 1
+    preserveHierarchy: 0
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    previousCalculatedGlobalScale: 1
+    hasPreviousCalculatedGlobalScale: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  importAnimation: 1
+  copyAvatar: 0
+  humanDescription:
+    serializedVersion: 2
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  animationType: 0
+  humanoidOversampling: 1
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/GameMain/Meshes/Mary.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4e634e2db25568f4999b7c586252efbf
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 436 - 0
Assets/GameMain/Meshes/Mary/mary.prefab

@@ -0,0 +1,436 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &8736901819575298511
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8736901819575298508}
+  m_Layer: 0
+  m_Name: mary
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8736901819575298508
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8736901819575298511}
+  m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
+  m_LocalPosition: {x: -0.04, y: -1.35, z: -0.68}
+  m_LocalScale: {x: 10, y: 10, z: 10}
+  m_Children:
+  - {fileID: 8736901820260280424}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
+--- !u!1001 &8736901820260414182
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 8736901819575298508}
+    m_Modifications:
+    - target: {fileID: 100014, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_Name
+      value: mary-head
+      objectReference: {fileID: 0}
+    - target: {fileID: 100016, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.00637
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.00199
+      objectReference: {fileID: 0}
+    - target: {fileID: 400010, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.00169
+      objectReference: {fileID: 0}
+    - target: {fileID: 400014, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400014, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 400014, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 400014, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 400014, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400014, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.665
+      objectReference: {fileID: 0}
+    - target: {fileID: 400014, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400014, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 400014, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400014, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400014, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400014, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400014, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400014, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400018, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.00225
+      objectReference: {fileID: 0}
+    - target: {fileID: 400018, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.00052
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700000, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_CastShadows
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700000, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_ReceiveShadows
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700000, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_Materials.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700000, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: a57f0015c16803244afff2a09d9b88b6, type: 2}
+    - target: {fileID: 13700000, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_Materials.Array.data[1]
+      value: 
+      objectReference: {fileID: 2100000, guid: a57f0015c16803244afff2a09d9b88b6, type: 2}
+    - target: {fileID: 13700002, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_CastShadows
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700002, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_ReceiveShadows
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700002, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: c36d442cfd11c1448bf6ea166ef36d94, type: 2}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_DirtyAABB
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_CastShadows
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_ReceiveShadows
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_AABB.m_Center.x
+      value: -0.15328309
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_AABB.m_Center.y
+      value: -0.014089207
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_AABB.m_Center.z
+      value: -0.00000001816079
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_AABB.m_Extent.x
+      value: 0.012649111
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_AABB.m_Extent.y
+      value: 0.011669788
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_AABB.m_Extent.z
+      value: 0.011280799
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_Materials.Array.size
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_SkinnedMotionVectors
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: d23bedbf8e93eb140803521d1b064ccb, type: 2}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_Materials.Array.data[1]
+      value: 
+      objectReference: {fileID: 2100000, guid: c3d6e4bee34d82c4c854f9c96d52dea6, type: 2}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_Materials.Array.data[2]
+      value: 
+      objectReference: {fileID: 2100000, guid: 8773b1613dd00a94399239dc9ec9df72, type: 2}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_Materials.Array.data[3]
+      value: 
+      objectReference: {fileID: 2100000, guid: c95fb0ca3c9cf25429c6b6a4d7212563, type: 2}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_Materials.Array.data[4]
+      value: 
+      objectReference: {fileID: 2100000, guid: 562fac1343c6c8e47a285a72b27bbf88, type: 2}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_Materials.Array.data[5]
+      value: 
+      objectReference: {fileID: 2100000, guid: 562fac1343c6c8e47a285a72b27bbf88, type: 2}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_Materials.Array.data[6]
+      value: 
+      objectReference: {fileID: 2100000, guid: 562fac1343c6c8e47a285a72b27bbf88, type: 2}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.size
+      value: 88
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[0]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[1]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[2]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[3]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[6]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[8]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[24]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[26]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[30]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[40]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[41]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[42]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[43]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[44]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[45]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[46]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[47]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[48]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[50]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[51]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[53]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[55]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[56]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[58]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[59]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[62]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[65]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[67]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[69]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[71]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[72]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[75]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[76]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[77]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[78]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[79]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[80]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[81]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[82]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[83]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[84]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[85]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700004, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[87]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700006, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_CastShadows
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700006, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_ReceiveShadows
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700006, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 91d02c78c80695b42b54f0f73fa25ab8, type: 2}
+    - target: {fileID: 13700008, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_CastShadows
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700008, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_ReceiveShadows
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 13700008, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: fece29ae141016b40b73ea772a76f77f, type: 2}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: b5ec75d79e143ad4baef7e87fb19fd00, type: 3}
+--- !u!4 &8736901820260280424 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 400014, guid: b5ec75d79e143ad4baef7e87fb19fd00,
+    type: 3}
+  m_PrefabInstance: {fileID: 8736901820260414182}
+  m_PrefabAsset: {fileID: 0}

+ 2 - 2
Assets/DOTween/Editor/DOTweenUpgradeManager.XML.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 5b1674c72bb449847a6de58c4a425603
-TextScriptImporter:
+guid: 10e3945626a250146a109d921c2dec75
+PrefabImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

+ 5 - 5
Assets/GameMain/Meshes/Player/baseani.controller

@@ -22,7 +22,7 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
---- !u!1102 &3585764400497714350
+--- !u!1102 &174210262580191889
 AnimatorState:
   serializedVersion: 5
   m_ObjectHideFlags: 1
@@ -42,7 +42,7 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: -3419257869308726280, guid: 087ede0f360019a4cbae4000a58f6fb7,
+  m_Motion: {fileID: -3419257869308726280, guid: 858b834fc059ad94a95a891a0d6f1a28,
     type: 3}
   m_Tag: 
   m_SpeedParameter: 
@@ -59,8 +59,8 @@ AnimatorStateMachine:
   m_Name: Base Layer
   m_ChildStates:
   - serializedVersion: 1
-    m_State: {fileID: 3585764400497714350}
-    m_Position: {x: 274, y: 378, z: 0}
+    m_State: {fileID: 174210262580191889}
+    m_Position: {x: 130.35294, y: 255.23529, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -70,4 +70,4 @@ AnimatorStateMachine:
   m_EntryPosition: {x: 50, y: 120, z: 0}
   m_ExitPosition: {x: 800, y: 120, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
-  m_DefaultState: {fileID: 3585764400497714350}
+  m_DefaultState: {fileID: 174210262580191889}

BIN
Assets/GameMain/Meshes/Player/qita_2.FBX


+ 100 - 0
Assets/GameMain/Meshes/Player/qita_2.FBX.meta

@@ -0,0 +1,100 @@
+fileFormatVersion: 2
+guid: 603164cd2a1ef01488fd9a3b253a8f8d
+ModelImporter:
+  serializedVersion: 19301
+  internalIDToNameTable:
+  - first:
+      74: 1827226128182048838
+    second: Take 001
+  externalObjects: {}
+  materials:
+    materialImportMode: 1
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

File diff suppressed because it is too large
+ 26391 - 0
Assets/GameMain/Meshes/z Body .001.obj


+ 97 - 0
Assets/GameMain/Meshes/z Body .001.obj.meta

@@ -0,0 +1,97 @@
+fileFormatVersion: 2
+guid: 9fb05bb9b6c93a343bec21475edcb2f6
+ModelImporter:
+  serializedVersion: 19301
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 1
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/GameMain/Model.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b6dcc671de1083a49976dcc2678867e9
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/GameMain/Model/4.FBX


+ 957 - 0
Assets/GameMain/Model/4.FBX.meta

@@ -0,0 +1,957 @@
+fileFormatVersion: 2
+guid: 858b834fc059ad94a95a891a0d6f1a28
+ModelImporter:
+  serializedVersion: 19301
+  internalIDToNameTable:
+  - first:
+      74: 1827226128182048838
+    second: Take 001
+  - first:
+      74: -3419257869308726280
+    second: walk
+  externalObjects: {}
+  materials:
+    materialImportMode: 1
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: "\nClip 'Take 001' has import animation warnings that
+      might lower retargeting quality:\nNote: Activate translation DOF on avatar
+      to improve retargeting quality.\n\t'Spine_01' has translation animation that
+      will be discarded.\n\t'Spine_01' is inbetween humanoid transforms and has rotation
+      animation that will be discarded.\n\t'Thigh_R' has translation animation that
+      will be discarded.\n\t'Thigh_L' has translation animation that will be discarded.\n"
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 3
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations:
+    - serializedVersion: 16
+      name: Take 001
+      takeName: Take 001
+      internalID: 0
+      firstFrame: 0
+      lastFrame: 2500
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 0
+      loopBlend: 0
+      loopBlendOrientation: 0
+      loopBlendPositionY: 0
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 0
+      keepOriginalPositionY: 1
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 0
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events: []
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 0
+    - serializedVersion: 16
+      name: walk
+      takeName: Take 001
+      internalID: 0
+      firstFrame: 0
+      lastFrame: 37
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 1
+      loopBlend: 0
+      loopBlendOrientation: 0
+      loopBlendPositionY: 0
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 0
+      keepOriginalPositionY: 1
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 0
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events: []
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 0
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human:
+    - boneName: Pelvis
+      humanName: Hips
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Thigh_L
+      humanName: LeftUpperLeg
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Thigh_R
+      humanName: RightUpperLeg
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Calf_L
+      humanName: LeftLowerLeg
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Calf_R
+      humanName: RightLowerLeg
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Foot_L
+      humanName: LeftFoot
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Foot_R
+      humanName: RightFoot
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Spine_02
+      humanName: Spine
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Spine_03
+      humanName: Chest
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Neck_01
+      humanName: Neck
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Head
+      humanName: Head
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Clavicle_L
+      humanName: LeftShoulder
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Clavicle_R
+      humanName: RightShoulder
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: UpperArm_L
+      humanName: LeftUpperArm
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: UpperArm_R
+      humanName: RightUpperArm
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Forearm_L
+      humanName: LeftLowerArm
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Forearm_R
+      humanName: RightLowerArm
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Hand_L
+      humanName: LeftHand
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Hand_R
+      humanName: RightHand
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Toe_0_L
+      humanName: LeftToes
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Toe_0_L 1
+      humanName: RightToes
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: L Finger0
+      humanName: Left Thumb Proximal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: L Finger01
+      humanName: Left Thumb Intermediate
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: L Finger02
+      humanName: Left Thumb Distal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: L Finger1
+      humanName: Left Index Proximal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: L Finger11
+      humanName: Left Index Intermediate
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: L Finger12
+      humanName: Left Index Distal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: L Finger2
+      humanName: Left Middle Proximal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: L Finger21
+      humanName: Left Middle Intermediate
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: L Finger22
+      humanName: Left Middle Distal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: L Finger3
+      humanName: Left Ring Proximal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: L Finger31
+      humanName: Left Ring Intermediate
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: L Finger32
+      humanName: Left Ring Distal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: L Finger4
+      humanName: Left Little Proximal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: L Finger41
+      humanName: Left Little Intermediate
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: L Finger42
+      humanName: Left Little Distal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: R Finger0
+      humanName: Right Thumb Proximal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: R Finger01
+      humanName: Right Thumb Intermediate
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: R Finger02
+      humanName: Right Thumb Distal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: R Finger1
+      humanName: Right Index Proximal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: R Finger11
+      humanName: Right Index Intermediate
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: R Finger12
+      humanName: Right Index Distal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: R Finger2
+      humanName: Right Middle Proximal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: R Finger21
+      humanName: Right Middle Intermediate
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: R Finger22
+      humanName: Right Middle Distal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: R Finger3
+      humanName: Right Ring Proximal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: R Finger31
+      humanName: Right Ring Intermediate
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: R Finger32
+      humanName: Right Ring Distal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: R Finger4
+      humanName: Right Little Proximal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: R Finger41
+      humanName: Right Little Intermediate
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: R Finger42
+      humanName: Right Little Distal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    skeleton:
+    - name: 4(Clone)
+      parentName: 
+      position: {x: 0, y: 0, z: 0}
+      rotation: {x: 0, y: 0, z: 0, w: 1}
+      scale: {x: 1, y: 1, z: 1}
+    - name: Bip001
+      parentName: 4(Clone)
+      position: {x: -0.00037135347, y: 0.017105361, z: 0.00012346459}
+      rotation: {x: -0.47497937, y: 0.48722807, z: 0.51245314, w: 0.52382743}
+      scale: {x: 0.009999999, y: 0.01, z: 0.01}
+    - name: "\xD7t\xD7\xFC"
+      parentName: 4(Clone)
+      position: {x: -0, y: 0, z: 0}
+      rotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
+      scale: {x: 1, y: 1, z: 1}
+    - name: Root
+      parentName: 4(Clone)
+      position: {x: -0, y: 0, z: -5.3895377e-10}
+      rotation: {x: 0.00000006657903, y: -0, z: -0, w: 1}
+      scale: {x: 1, y: 1, z: 1}
+    - name: Bip_01
+      parentName: Root
+      position: {x: -0, y: 0.9254533, z: -0.00000015023653}
+      rotation: {x: -0.50000054, y: 0.49999952, z: 0.49999952, w: 0.50000054}
+      scale: {x: 0.99999994, y: 0.99999994, z: 1}
+    - name: Footsteps
+      parentName: Bip_01
+      position: {x: 0.0000000070530617, y: -0.0000000013753977, z: -0.9248202}
+      rotation: {x: 0.0000000021705353, y: -0.0000000032221537, z: -0.70710605, w: 0.7071075}
+      scale: {x: 1, y: 1, z: 1}
+    - name: Pelvis
+      parentName: Bip_01
+      position: {x: 0.000000009418132, y: -0.0000000074505815, z: 0.070728965}
+      rotation: {x: 0.5000001, y: -0.5000006, z: -0.49999958, w: -0.49999982}
+      scale: {x: 1.0000001, y: 1, z: 1}
+    - name: Spine_01
+      parentName: Pelvis
+      position: {x: -0.0976547, y: 0.026326489, z: 0.012349796}
+      rotation: {x: 0.00000205636, y: 0.0000006258487, z: 0.00039818877, w: -1}
+      scale: {x: 1.0000005, y: 1.0000005, z: 1.0000004}
+    - name: Thigh_L
+      parentName: Spine_01
+      position: {x: 0.10664272, y: -0.012129195, z: 0.06693955}
+      rotation: {x: -0.02222059, y: -0.9962213, z: 0.004625488, w: -0.08383371}
+      scale: {x: 0.99999946, y: 1.0000002, z: 0.9999997}
+    - name: Calf_L
+      parentName: Thigh_L
+      position: {x: -0.42879105, y: 0, z: -0.000000007450581}
+      rotation: {x: 0.00000008032655, y: 0.000000014901158, z: 0.0057825544, w: 0.9999833}
+      scale: {x: 1.0000002, y: 1.0000004, z: 1.0000001}
+    - name: Foot_L
+      parentName: Calf_L
+      position: {x: -0.47376853, y: -0.000000059604645, z: -0.000000007450581}
+      rotation: {x: -0.08824596, y: 0.082464956, z: 0.011973408, w: 0.9926071}
+      scale: {x: 1.0000002, y: 1.0000001, z: 1}
+    - name: Toe_0_L
+      parentName: Foot_L
+      position: {x: -0.07507513, y: 0.07286826, z: 0.0000000037252903}
+      rotation: {x: -0.01707941, y: -0.016210865, z: -0.72510695, w: 0.6882335}
+      scale: {x: 1.0000004, y: 1.0000005, z: 1.0000005}
+    - name: Bip001 L Toe0Nub
+      parentName: Toe_0_L
+      position: {x: -0.102095485, y: 0, z: 0.0000000018626451}
+      rotation: {x: 0, y: 0, z: 1, w: 6.123234e-17}
+      scale: {x: -1, y: -1.0000001, z: -1}
+    - name: Thigh_R
+      parentName: Spine_01
+      position: {x: 0.088261425, y: -0.031222314, z: -0.10769675}
+      rotation: {x: -0.022396063, y: -0.9968377, z: -0.0048351786, w: 0.0760906}
+      scale: {x: 1.0000001, y: 1.0000001, z: 1}
+    - name: Calf_R
+      parentName: Thigh_R
+      position: {x: -0.428791, y: -0.000000029802322, z: 0.0000000037252903}
+      rotation: {x: 0.000000020489091, y: -0.000000007450579, z: 0.005769717, w: 0.99998343}
+      scale: {x: 1.0000001, y: 1.0000001, z: 1}
+    - name: Foot_R
+      parentName: Calf_R
+      position: {x: -0.47376847, y: 0, z: 0.0000000037252903}
+      rotation: {x: 0.1467426, y: -0.073379256, z: -0.013142594, w: 0.9863617}
+      scale: {x: 1.0000001, y: 1.0000002, z: 1.0000004}
+    - name: Toe_0_L 1
+      parentName: Foot_R
+      position: {x: -0.07507511, y: 0.07286826, z: 0.0000000041909516}
+      rotation: {x: -0.0067155957, y: 0.006079793, z: -0.71469367, w: 0.699379}
+      scale: {x: 0.9999996, y: 0.99999934, z: 1}
+    - name: Bip001 R Toe0Nub
+      parentName: Toe_0_L 1
+      position: {x: -0.102095455, y: 0, z: -2.3283064e-10}
+      rotation: {x: 7.372575e-18, y: 0.0000000019790605, z: -0.0000000037252903, w: 1}
+      scale: {x: 1, y: 1.0000001, z: 1}
+    - name: Spine_02
+      parentName: Spine_01
+      position: {x: -0.12061095, y: -0.00005042553, z: -0.000018626451}
+      rotation: {x: 0.00070624775, y: 0.0004940699, z: -0.033130623, w: -0.99945074}
+      scale: {x: 1, y: 1.0000001, z: 1.0000001}
+    - name: Spine_03
+      parentName: Spine_02
+      position: {x: -0.068384886, y: -0.0001693219, z: -0.000015974045}
+      rotation: {x: 0.0011173786, y: 0.0006086529, z: 0.14088534, w: 0.9900251}
+      scale: {x: 0.99999994, y: 1.0000001, z: 0.9999998}
+    - name: Neck_01
+      parentName: Spine_03
+      position: {x: -0.28208268, y: 0.0156078935, z: 0.000000052154064}
+      rotation: {x: -0.00000002118759, y: 0.0000008568168, z: -0.3089759, w: 0.9510699}
+      scale: {x: 1, y: 1, z: 1.0000001}
+    - name: Head
+      parentName: Neck_01
+      position: {x: -0.06515503, y: 0.000000029802322, z: 0}
+      rotation: {x: -0.0070667276, y: 0.009604544, z: 0.00035205486, w: -0.99992883}
+      scale: {x: 1.0000002, y: 1.0000002, z: 1.0000002}
+    - name: Bip001 HeadNub
+      parentName: Head
+      position: {x: -0.21447515, y: 0.000000014901161, z: 0}
+      rotation: {x: -2.3283064e-10, y: 0.0000000018626451, z: 4.3368087e-19, w: 1}
+      scale: {x: 1, y: 1, z: 1}
+    - name: Jaw
+      parentName: Head
+      position: {x: -0.02894497, y: 0.11314389, z: 0.0012296438}
+      rotation: {x: -0.09133692, y: 0.70433414, z: 0.6955213, w: -0.10872527}
+      scale: {x: 0.5357057, y: 0.5357065, z: 0.5357062}
+    - name: RUYAO2
+      parentName: Spine_03
+      position: {x: -0.082221985, y: 0.050444156, z: 0.08365238}
+      rotation: {x: -0.5248991, y: 0.84656113, z: 0.048746925, w: 0.07374928}
+      scale: {x: 0.99999994, y: 0.99999994, z: 0.99999994}
+    - name: Clavicle_L
+      parentName: Spine_03
+      position: {x: -0.21929216, y: -0.006353587, z: 0.050159138}
+      rotation: {x: -0.5738192, y: -0.045500506, z: 0.8171113, w: 0.03146856}
+      scale: {x: 1, y: 1.0000002, z: 1.0000002}
+    - name: UpperArm_L
+      parentName: Clavicle_L
+      position: {x: -0.092243105, y: 0, z: 0}
+      rotation: {x: 0.23347268, y: 0.13370186, z: 0.03506038, w: 0.962489}
+      scale: {x: 1.0000002, y: 1.0000005, z: 1.0000002}
+    - name: Forearm_L
+      parentName: UpperArm_L
+      position: {x: -0.29423475, y: 0, z: 0}
+      rotation: {x: -0.0014520726, y: 0.015352985, z: 0.034621213, w: 0.9992815}
+      scale: {x: 1.0000005, y: 1.0000002, z: 1.0000005}
+    - name: Hand_L
+      parentName: Forearm_L
+      position: {x: -0.24826986, y: -0.000000059604645, z: 0}
+      rotation: {x: 0.7436867, y: -0.04188705, z: 0.024990732, w: -0.66674674}
+      scale: {x: 1.0000001, y: 1.0000002, z: 1.0000002}
+    - name: L Finger0
+      parentName: Hand_L
+      position: {x: -0.018302977, y: 0.020910263, z: -0.039728522}
+      rotation: {x: 0.3588394, y: -0.33495542, z: 0.09529377, w: 0.8660013}
+      scale: {x: 1, y: 1, z: 0.99999994}
+    - name: L Finger01
+      parentName: L Finger0
+      position: {x: -0.01968646, y: -0.000000029802322, z: 0}
+      rotation: {x: -0.000000029802312, y: -0.00000014901156, z: -0.03615986, w: 0.9993461}
+      scale: {x: 1.0000004, y: 1, z: 1}
+    - name: L Finger02
+      parentName: L Finger01
+      position: {x: -0.01968646, y: 0.000000014901161, z: 0}
+      rotation: {x: 0.000000018499474, y: 0.00000018047903, z: -0.03203469, w: 0.99948674}
+      scale: {x: 1, y: 1.0000002, z: 1.0000004}
+    - name: Bip001 L Finger0Nub
+      parentName: L Finger02
+      position: {x: -0.019686341, y: 0.000000014901161, z: 0}
+      rotation: {x: -0.000000008381902, y: -9.367507e-17, z: 0.000000011175871, w: 1}
+      scale: {x: 1, y: 1, z: 1}
+    - name: L Finger3
+      parentName: Hand_L
+      position: {x: -0.06964356, y: 0.0015187263, z: 0.019442052}
+      rotation: {x: -0.04373972, y: 0.082550555, z: -0.029816937, w: 0.99518}
+      scale: {x: 0.99999994, y: 0.9999998, z: 0.99999994}
+    - name: L Finger31
+      parentName: L Finger3
+      position: {x: -0.019063592, y: -0.000000029802322, z: 0}
+      rotation: {x: -0.00000006705517, y: 0.000000059604595, z: -0.041086983, w: 0.99915564}
+      scale: {x: 0.9999998, y: 1, z: 1.0000001}
+    - name: L Finger32
+      parentName: L Finger31
+      position: {x: -0.025264263, y: 0.000000014901161, z: 0}
+      rotation: {x: 0.00000006891787, y: 0.000000014901161, z: 0.018992007, w: 0.9998197}
+      scale: {x: 1, y: 1, z: 1.0000001}
+    - name: Bip001 L Finger3Nub
+      parentName: L Finger32
+      position: {x: -0.024406731, y: 0.000000029802322, z: 0}
+      rotation: {x: 0.0000000037252903, y: -0, z: -0, w: 1}
+      scale: {x: 1, y: 1, z: 1}
+    - name: L Finger2
+      parentName: Hand_L
+      position: {x: -0.07107115, y: 0.0027757883, z: -0.00040629506}
+      rotation: {x: 0.0000058710566, y: 0.036458425, z: -0.034200642, w: 0.99874985}
+      scale: {x: 0.99999994, y: 0.9999998, z: 1}
+    - name: L Finger21
+      parentName: L Finger2
+      position: {x: -0.032126963, y: -0.000000029802322, z: 0}
+      rotation: {x: 0.0000002575891, y: -0.00000036135282, z: -0.040363226, w: 0.99918514}
+      scale: {x: 0.9999998, y: 1.0000001, z: 1.0000002}
+    - name: L Finger22
+      parentName: L Finger21
+      position: {x: -0.027561009, y: 0, z: 0.000000029802322}
+      rotation: {x: -0.00000028972332, y: 0.00000004334295, z: 0.04116926, w: 0.99915224}
+      scale: {x: 1.0000002, y: 0.99999994, z: 1.0000002}
+    - name: Bip001 L Finger2Nub
+      parentName: L Finger22
+      position: {x: -0.022485256, y: -0.000000029802322, z: 0}
+      rotation: {x: 0.000000009313227, y: 0.0000000037252903, z: -0.000000014901161,
+        w: 1}
+      scale: {x: 1, y: 1, z: 1}
+    - name: L Finger1
+      parentName: Hand_L
+      position: {x: -0.06928587, y: 0.0066126585, z: -0.021980017}
+      rotation: {x: 0.000056177363, y: 0.010125537, z: 0.011082609, w: 0.9998874}
+      scale: {x: 1.0000001, y: 1.0000002, z: 1.0000004}
+    - name: L Finger11
+      parentName: L Finger1
+      position: {x: -0.019493759, y: 0, z: 0}
+      rotation: {x: 0.00000025222812, y: 0.00000019930285, z: -0.04051968, w: 0.9991788}
+      scale: {x: 1.0000008, y: 1.0000001, z: 1.0000008}
+    - name: L Finger12
+      parentName: L Finger11
+      position: {x: -0.025734663, y: 0.000000059604645, z: 0.000000029802322}
+      rotation: {x: -0.00000011579733, y: 0.00000002985189, z: -0.0017811275, w: 0.99999845}
+      scale: {x: 1.0000001, y: 1.0000004, z: 1.0000006}
+    - name: Bip001 L Finger1Nub
+      parentName: L Finger12
+      position: {x: -0.025137007, y: 0, z: -0.000000029802322}
+      rotation: {x: -0.0000000037252907, y: -5.5511164e-17, z: 0.000000014901163,
+        w: 1}
+      scale: {x: 0.9999999, y: 0.99999994, z: 0.99999994}
+    - name: L Finger4
+      parentName: Hand_L
+      position: {x: -0.062058866, y: 0.008446097, z: 0.0390504}
+      rotation: {x: -0.002621917, y: 0.0784588, z: -0.014949453, w: 0.99680185}
+      scale: {x: 0.99999994, y: 1.0000001, z: 1.0000002}
+    - name: L Finger41
+      parentName: L Finger4
+      position: {x: -0.01968646, y: 0.000000029802322, z: 0}
+      rotation: {x: 0.000000021420403, y: -0.000000037252878, z: -0.04117738, w: 0.9991519}
+      scale: {x: 1, y: 0.99999994, z: 1.0000001}
+    - name: L Finger42
+      parentName: L Finger41
+      position: {x: -0.01262939, y: -0.000000029802322, z: 0.000000029802322}
+      rotation: {x: -0.000000019956229, y: -0.00000022544369, z: -0.04117324, w: 0.99915206}
+      scale: {x: 0.9999998, y: 0.99999994, z: 0.99999994}
+    - name: Bip001 L Finger4Nub
+      parentName: L Finger42
+      position: {x: -0.014070511, y: 0, z: 0}
+      rotation: {x: 0.0000000037252899, y: -1.1102229e-16, z: -0.000000029802322,
+        w: 1}
+      scale: {x: 1, y: 1.0000001, z: 1.0000001}
+    - name: Clavicle_R
+      parentName: Spine_03
+      position: {x: -0.21929204, y: -0.0063533187, z: -0.050159164}
+      rotation: {x: 0.6043152, y: 0.040194545, z: 0.7952617, w: 0.027319293}
+      scale: {x: 1.0000002, y: 0.99999994, z: 0.99999994}
+    - name: UpperArm_R
+      parentName: Clavicle_R
+      position: {x: -0.092243195, y: 0, z: 0}
+      rotation: {x: 0.23910993, y: 0.13892122, z: 0.008593376, w: -0.96096486}
+      scale: {x: 1.0000004, y: 1.0000004, z: 1.0000001}
+    - name: Forearm_R
+      parentName: UpperArm_R
+      position: {x: -0.29423475, y: 0, z: 0}
+      rotation: {x: 0.0011104789, y: -0.01369206, z: 0.031197794, w: 0.9994188}
+      scale: {x: 1.0000004, y: 1.0000005, z: 1.0000004}
+    - name: Hand_R
+      parentName: Forearm_R
+      position: {x: -0.24826986, y: 0, z: -0.000000029802322}
+      rotation: {x: -0.7434076, y: 0.048385978, z: 0.032251958, w: -0.6663061}
+      scale: {x: 1.0000002, y: 1.0000006, z: 0.9999998}
+    - name: R Finger0
+      parentName: Hand_R
+      position: {x: -0.014956892, y: 0.021848112, z: 0.03869897}
+      rotation: {x: -0.34888142, y: 0.34195834, z: 0.11608427, w: 0.86479515}
+      scale: {x: 1.0000001, y: 0.9999997, z: 1}
+    - name: R Finger01
+      parentName: R Finger0
+      position: {x: -0.019686386, y: 0, z: 0.000000029802322}
+      rotation: {x: -0.000000029802312, y: 0.00000011920925, z: -0.036159907, w: 0.9993461}
+      scale: {x: 1.0000002, y: 1.0000001, z: 0.99999994}
+    - name: R Finger02
+      parentName: R Finger01
+      position: {x: -0.0196864, y: 0, z: -0.000000059604645}
+      rotation: {x: -0.000000052568375, y: -0.000000090350994, z: -0.032034736, w: 0.9994868}
+      scale: {x: 1, y: 1.0000002, z: 1.0000001}
+    - name: Bip001 R Finger0Nub
+      parentName: R Finger02
+      position: {x: -0.01968646, y: 0, z: -0.000000029802322}
+      rotation: {x: 0.000000029802326, y: -0.000000022351742, z: 1, w: 6.049016e-16}
+      scale: {x: -0.9999999, y: -1, z: -1}
+    - name: R Finger1
+      parentName: Hand_R
+      position: {x: -0.06951401, y: 0.006562054, z: 0.0239653}
+      rotation: {x: 0.0012718136, y: -0.010110952, z: -0.021340743, w: 0.99972034}
+      scale: {x: 1.0000001, y: 1.0000002, z: 1.0000001}
+    - name: R Finger11
+      parentName: R Finger1
+      position: {x: -0.029911637, y: 0.000000014901161, z: 0}
+      rotation: {x: -0.00000006833576, y: 0.00000070035424, z: -0.040516198, w: 0.9991789}
+      scale: {x: 1.0000002, y: 0.99999994, z: 1}
+    - name: R Finger12
+      parentName: R Finger11
+      position: {x: -0.025734723, y: -0.000000029802322, z: -0.000000029802322}
+      rotation: {x: 0.000000024332879, y: -0.00000004596802, z: -0.001781165, w: 0.99999845}
+      scale: {x: 0.9999998, y: 0.9999998, z: 1}
+    - name: Bip001 R Finger1Nub
+      parentName: R Finger12
+      position: {x: -0.016114771, y: 0, z: 0}
+      rotation: {x: -0.0000000037252903, y: -0.0000000037252903, z: 1, w: 4.735455e-17}
+      scale: {x: -1, y: -1, z: -1}
+    - name: R Finger2
+      parentName: Hand_R
+      position: {x: -0.0710156, y: 0.0007484555, z: 0.0021637082}
+      rotation: {x: 0.00073868, y: -0.036450956, z: -0.054593477, w: 0.99784285}
+      scale: {x: 1.0000002, y: 0.9999997, z: 0.99999994}
+    - name: R Finger21
+      parentName: R Finger2
+      position: {x: -0.032126963, y: -0.000000029802322, z: 0}
+      rotation: {x: 0.00000012078085, y: -0.000000018626444, z: -0.04036591, w: 0.99918497}
+      scale: {x: 1, y: 1.0000002, z: 0.99999994}
+    - name: R Finger22
+      parentName: R Finger21
+      position: {x: -0.02756095, y: 0, z: 0}
+      rotation: {x: -0.00000015724264, y: 0.0000001775678, z: 0.041167542, w: 0.99915224}
+      scale: {x: 1, y: 0.99999994, z: 0.99999994}
+    - name: Bip001 R Finger2Nub
+      parentName: R Finger22
+      position: {x: -0.022485256, y: 0, z: -0.000000059604645}
+      rotation: {x: 0.0000000018626451, y: 0.000000014901161, z: 1, w: 3.3476764e-17}
+      scale: {x: -1, y: -1, z: -1}
+    - name: R Finger4
+      parentName: Hand_R
+      position: {x: -0.06409687, y: 0.010454446, z: -0.040956914}
+      rotation: {x: 0.0023234773, y: -0.06604008, z: -0.010654259, w: 0.9977574}
+      scale: {x: 0.9999998, y: 0.99999994, z: 0.9999998}
+    - name: R Finger41
+      parentName: R Finger4
+      position: {x: -0.0196864, y: 0.000000014901161, z: 0}
+      rotation: {x: 0.00000018835988, y: -0.00000017136325, z: -0.041188374, w: 0.9991514}
+      scale: {x: 1.0000004, y: 1.0000004, z: 1}
+    - name: R Finger42
+      parentName: R Finger41
+      position: {x: -0.01262933, y: 0, z: 0}
+      rotation: {x: -0.00000024690462, y: 0.00000061575065, z: -0.041176748, w: 0.9991519}
+      scale: {x: 0.99999994, y: 0.99999994, z: 1.0000001}
+    - name: Bip001 R Finger4Nub
+      parentName: R Finger42
+      position: {x: -0.014070511, y: -0.000000029802322, z: 0}
+      rotation: {x: 0, y: 0, z: 1, w: 6.123234e-17}
+      scale: {x: -0.99999994, y: -1, z: -1}
+    - name: R Finger3
+      parentName: Hand_R
+      position: {x: -0.06913164, y: 0.005135119, z: -0.01927501}
+      rotation: {x: 0.043973718, y: -0.064862214, z: -0.025494814, w: 0.9965989}
+      scale: {x: 1.0000002, y: 0.9999997, z: 0.99999994}
+    - name: R Finger31
+      parentName: R Finger3
+      position: {x: -0.028140187, y: 0.000000029802322, z: -0.000000059604645}
+      rotation: {x: -0.000000048428745, y: -0.00000042468284, z: -0.041088305, w: 0.9991555}
+      scale: {x: 0.99999994, y: 1, z: 0.99999994}
+    - name: R Finger32
+      parentName: R Finger31
+      position: {x: -0.019860804, y: -0.000000059604645, z: -0.000000059604645}
+      rotation: {x: -0.0000000026434521, y: 0.000000006320772, z: 0.018992083, w: 0.9998197}
+      scale: {x: 1.0000001, y: 1.0000002, z: 0.9999998}
+    - name: Bip001 R Finger3Nub
+      parentName: R Finger32
+      position: {x: -0.024406672, y: 0, z: 0.000000059604645}
+      rotation: {x: -0.0000000074505815, y: -0.000000014901163, z: 1, w: -4.9789986e-17}
+      scale: {x: -0.99999994, y: -0.9999999, z: -0.9999999}
+    - name: RUYA0O1
+      parentName: Spine_03
+      position: {x: -0.08011818, y: 0.050750554, z: -0.08331715}
+      rotation: {x: -0.53217614, y: 0.8416022, z: -0.046193097, w: -0.07975329}
+      scale: {x: 0.9999998, y: 1, z: 1}
+    - name: model
+      parentName: 4(Clone)
+      position: {x: 5.3128324, y: 0.0000007748604, z: -6.025983}
+      rotation: {x: 1, y: 0, z: 0, w: -0.00000013315805}
+      scale: {x: 1, y: 1, z: 1}
+    - name: Standard_nv
+      parentName: model
+      position: {x: -5.3128324, y: -0.00000089367575, z: -6.025983}
+      rotation: {x: 1, y: 0, z: -0, w: 0.0000000754979}
+      scale: {x: 1, y: 1, z: 1}
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 1
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 3
+  humanoidOversampling: 1
+  avatarSetup: 1
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 704 - 6
Assets/GameMain/Scenes/CustomRole.unity

@@ -26,7 +26,7 @@ RenderSettings:
   m_AmbientIntensity: 1
   m_AmbientMode: 0
   m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
-  m_SkyboxMaterial: {fileID: 0}
+  m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
   m_HaloStrength: 0.5
   m_FlareStrength: 1
   m_FlareFadeSpeed: 3
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -694,8 +694,8 @@ Camera:
   m_GameObject: {fileID: 461674368}
   m_Enabled: 1
   serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.61877, g: 0.9716981, b: 0.7755437, a: 0}
+  m_ClearFlags: 2
+  m_BackGroundColor: {r: 1, g: 0.5801887, b: 0.70434576, a: 1}
   m_projectionMatrixMode: 1
   m_GateFitMode: 2
   m_FOVAxisMode: 0
@@ -742,6 +742,190 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &553076169
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: 858b834fc059ad94a95a891a0d6f1a28,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 9
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 858b834fc059ad94a95a891a0d6f1a28,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.26
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 858b834fc059ad94a95a891a0d6f1a28,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -1.12
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 858b834fc059ad94a95a891a0d6f1a28,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 858b834fc059ad94a95a891a0d6f1a28,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 858b834fc059ad94a95a891a0d6f1a28,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 858b834fc059ad94a95a891a0d6f1a28,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 858b834fc059ad94a95a891a0d6f1a28,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 858b834fc059ad94a95a891a0d6f1a28,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 858b834fc059ad94a95a891a0d6f1a28,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 180
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 858b834fc059ad94a95a891a0d6f1a28,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -1314833244017027695, guid: 858b834fc059ad94a95a891a0d6f1a28,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 159c8cbdb64bceb4783b8a9189c1ae47, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 858b834fc059ad94a95a891a0d6f1a28,
+        type: 3}
+      propertyPath: m_Materials.Array.data[1]
+      value: 
+      objectReference: {fileID: 2100000, guid: acc6163e8a63dfa4c88bd4597f2a223e, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 858b834fc059ad94a95a891a0d6f1a28,
+        type: 3}
+      propertyPath: m_Materials.Array.data[2]
+      value: 
+      objectReference: {fileID: 2100000, guid: 5e07c2dcefde2b44397def2ca5459b7c, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 858b834fc059ad94a95a891a0d6f1a28,
+        type: 3}
+      propertyPath: m_Materials.Array.data[3]
+      value: 
+      objectReference: {fileID: 2100000, guid: c6ea81e5e85b1a347adc96cdae1555ff, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 858b834fc059ad94a95a891a0d6f1a28,
+        type: 3}
+      propertyPath: m_Materials.Array.data[4]
+      value: 
+      objectReference: {fileID: 2100000, guid: 0a0aedaa352d2984a80b1ff99de3119f, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 858b834fc059ad94a95a891a0d6f1a28,
+        type: 3}
+      propertyPath: m_Materials.Array.data[5]
+      value: 
+      objectReference: {fileID: 2100000, guid: 19338570021349846af7145776c27072, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 858b834fc059ad94a95a891a0d6f1a28,
+        type: 3}
+      propertyPath: m_Materials.Array.data[6]
+      value: 
+      objectReference: {fileID: 2100000, guid: 7138ef9eb40b6c641b341820d4e77eb2, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 858b834fc059ad94a95a891a0d6f1a28,
+        type: 3}
+      propertyPath: m_Materials.Array.data[7]
+      value: 
+      objectReference: {fileID: 2100000, guid: a6aa3a78a349560428b6b3435964f1ca, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 858b834fc059ad94a95a891a0d6f1a28,
+        type: 3}
+      propertyPath: m_Materials.Array.data[8]
+      value: 
+      objectReference: {fileID: 2100000, guid: 405f468f778e93b4f9cf83c1d32f3d45, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 858b834fc059ad94a95a891a0d6f1a28,
+        type: 3}
+      propertyPath: m_Materials.Array.data[9]
+      value: 
+      objectReference: {fileID: 2100000, guid: dbd0dd2d87cc73a42a4a01d103f5f984, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 858b834fc059ad94a95a891a0d6f1a28,
+        type: 3}
+      propertyPath: m_Materials.Array.data[10]
+      value: 
+      objectReference: {fileID: 2100000, guid: 05e5ae4d01b8966489142b6014287049, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 858b834fc059ad94a95a891a0d6f1a28,
+        type: 3}
+      propertyPath: m_Materials.Array.data[11]
+      value: 
+      objectReference: {fileID: 2100000, guid: 4eafe122dc7178f41b0233be303f242e, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 858b834fc059ad94a95a891a0d6f1a28,
+        type: 3}
+      propertyPath: m_Materials.Array.data[12]
+      value: 
+      objectReference: {fileID: 2100000, guid: f617db28b90bad148a74b4a3ab76b5fb, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 858b834fc059ad94a95a891a0d6f1a28,
+        type: 3}
+      propertyPath: m_Materials.Array.data[13]
+      value: 
+      objectReference: {fileID: 2100000, guid: 4dfe6694e670f3e409164e135ac6a6ee, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 858b834fc059ad94a95a891a0d6f1a28,
+        type: 3}
+      propertyPath: m_Materials.Array.data[14]
+      value: 
+      objectReference: {fileID: 2100000, guid: ec29de4adbcee6e41aa51e1ecf446e98, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 858b834fc059ad94a95a891a0d6f1a28,
+        type: 3}
+      propertyPath: m_Materials.Array.data[15]
+      value: 
+      objectReference: {fileID: 2100000, guid: 04513c542aa764049959015bf044ce55, type: 2}
+    - target: {fileID: 919132149155446097, guid: 858b834fc059ad94a95a891a0d6f1a28,
+        type: 3}
+      propertyPath: m_Name
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 5866666021909216657, guid: 858b834fc059ad94a95a891a0d6f1a28,
+        type: 3}
+      propertyPath: m_Controller
+      value: 
+      objectReference: {fileID: 9100000, guid: c2825d2c1b851744691862abc76c2ecc, type: 2}
+    - target: {fileID: 5866666021909216657, guid: 858b834fc059ad94a95a891a0d6f1a28,
+        type: 3}
+      propertyPath: m_ApplyRootMotion
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 858b834fc059ad94a95a891a0d6f1a28, type: 3}
+--- !u!1 &553076170 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 858b834fc059ad94a95a891a0d6f1a28,
+    type: 3}
+  m_PrefabInstance: {fileID: 553076169}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &553076171
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 553076170}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7c3559daf63a51d44965d9864233a269, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Chest: []
+  UpperArmUp: []
+  UpperArmDown: []
+  UpperLegUp: []
+  UpperLegDown: []
+  LowerLegUp: []
+  LowerLegDown: []
 --- !u!4 &590729718 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 3008258441183359304, guid: a83bf52c2391bc247be837a410a359b3,
@@ -879,7 +1063,7 @@ PrefabInstance:
     - target: {fileID: 919132149155446097, guid: 087ede0f360019a4cbae4000a58f6fb7,
         type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4721406824358839022, guid: 087ede0f360019a4cbae4000a58f6fb7,
         type: 3}
@@ -1563,7 +1747,7 @@ Light:
   m_InnerSpotAngle: 21.80208
   m_CookieSize: 10
   m_Shadows:
-    m_Type: 2
+    m_Type: 0
     m_Resolution: -1
     m_CustomResolution: -1
     m_Strength: 1
@@ -1762,3 +1946,517 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 332438135}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &8736901820667912698
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 8736901819500412391, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901819575298508, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901819575298508, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.04
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901819575298508, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -1.35
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901819575298508, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -0.68
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901819575298508, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901819575298508, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901819575298508, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901819575298508, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901819575298508, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901819575298508, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 180
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901819575298508, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901819575298511, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_Name
+      value: mary
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901819575298511, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820260280428, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.00085
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820260316232, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[0]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[1]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[2]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[3]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[4]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[5]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[6]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[7]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[8]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[9]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[10]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[11]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[12]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[13]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[14]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[15]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[16]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[17]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[18]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[19]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[20]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[21]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[22]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[23]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[24]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[25]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[26]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[27]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[28]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[29]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[30]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[31]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[32]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[33]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[34]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[35]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[36]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[37]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[38]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[39]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[40]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[41]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[42]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[43]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[44]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[45]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[46]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[47]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[48]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[49]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[50]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[51]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[52]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[53]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[55]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[56]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[57]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[59]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[60]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[61]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[62]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[63]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[64]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[65]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[66]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[67]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[68]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[69]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[70]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[71]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[72]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[73]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[75]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[76]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[77]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[78]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[79]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[80]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[81]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[82]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[83]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[84]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[85]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[86]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8736901820271884610, guid: 10e3945626a250146a109d921c2dec75,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[87]
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 10e3945626a250146a109d921c2dec75, type: 3}

+ 1 - 1
Assets/GameMain/Scripts/DataTable/DRAircraft.cs

@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 // 此文件由工具自动生成,请勿直接修改。
-// 生成时间:2022-01-20 20:43:45.731
+// 生成时间:2022-01-24 15:21:03.687
 //------------------------------------------------------------
 
 using GameFramework;

+ 1 - 1
Assets/GameMain/Scripts/DataTable/DRArmor.cs

@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 // 此文件由工具自动生成,请勿直接修改。
-// 生成时间:2022-01-20 20:43:45.745
+// 生成时间:2022-01-24 15:21:03.700
 //------------------------------------------------------------
 
 using GameFramework;

+ 1 - 1
Assets/GameMain/Scripts/DataTable/DRAsteroid.cs

@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 // 此文件由工具自动生成,请勿直接修改。
-// 生成时间:2022-01-20 20:43:45.749
+// 生成时间:2022-01-24 15:21:03.703
 //------------------------------------------------------------
 
 using GameFramework;

+ 34 - 12
Assets/GameMain/Scripts/DataTable/DRCustomBody.cs

@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 // 此文件由工具自动生成,请勿直接修改。
-// 生成时间:2022-01-20 20:43:45.778
+// 生成时间:2022-01-24 15:21:03.731
 //------------------------------------------------------------
 
 using GameFramework;
@@ -154,15 +154,6 @@ namespace MetaClient
         }
 
         /// <summary>
-        /// 获取缩放类型。
-        /// </summary>
-        public int ModifyType
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
         /// 获取缩放修改。
         /// </summary>
         public Vector3 ScaleChange
@@ -207,6 +198,33 @@ namespace MetaClient
             private set;
         }
 
+        /// <summary>
+        /// 获取是否使用变形器。
+        /// </summary>
+        public bool IsBlend
+        {
+            get;
+            private set;
+        }
+
+        /// <summary>
+        /// 获取对应变形器名称。
+        /// </summary>
+        public string BlendName
+        {
+            get;
+            private set;
+        }
+
+        /// <summary>
+        /// 获取变形器默认值。
+        /// </summary>
+        public float DefaultBlendValue
+        {
+            get;
+            private set;
+        }
+
         public override bool ParseDataRow(string dataRowString, object userData)
         {
             string[] columnStrings = dataRowString.Split(DataTableExtension.DataSplitSeparators);
@@ -231,12 +249,14 @@ namespace MetaClient
             IsMirror = bool.Parse(columnStrings[index++]);
             ScaleRangeMin = float.Parse(columnStrings[index++]);
             ScaleRangeMax = float.Parse(columnStrings[index++]);
-            ModifyType = int.Parse(columnStrings[index++]);
             ScaleChange = DataTableExtension.ParseVector3(columnStrings[index++]);
             PositionChange = DataTableExtension.ParseVector3(columnStrings[index++]);
             RotationChange = DataTableExtension.ParseVector3(columnStrings[index++]);
             BoneName = columnStrings[index++];
             ParentStyple = int.Parse(columnStrings[index++]);
+            IsBlend = bool.Parse(columnStrings[index++]);
+            BlendName = columnStrings[index++];
+            DefaultBlendValue = float.Parse(columnStrings[index++]);
 
             GeneratePropertyArray();
             return true;
@@ -262,12 +282,14 @@ namespace MetaClient
                     IsMirror = binaryReader.ReadBoolean();
                     ScaleRangeMin = binaryReader.ReadSingle();
                     ScaleRangeMax = binaryReader.ReadSingle();
-                    ModifyType = binaryReader.Read7BitEncodedInt32();
                     ScaleChange = binaryReader.ReadVector3();
                     PositionChange = binaryReader.ReadVector3();
                     RotationChange = binaryReader.ReadVector3();
                     BoneName = binaryReader.ReadString();
                     ParentStyple = binaryReader.Read7BitEncodedInt32();
+                    IsBlend = binaryReader.ReadBoolean();
+                    BlendName = binaryReader.ReadString();
+                    DefaultBlendValue = binaryReader.ReadSingle();
                 }
             }
 

+ 1 - 1
Assets/GameMain/Scripts/DataTable/DREntity.cs

@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 // 此文件由工具自动生成,请勿直接修改。
-// 生成时间:2022-01-20 20:43:45.754
+// 生成时间:2022-01-24 15:21:03.708
 //------------------------------------------------------------
 
 using GameFramework;

+ 1 - 1
Assets/GameMain/Scripts/DataTable/DRMusic.cs

@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 // 此文件由工具自动生成,请勿直接修改。
-// 生成时间:2022-01-20 20:43:45.757
+// 生成时间:2022-01-24 15:21:03.711
 //------------------------------------------------------------
 
 using GameFramework;

+ 1 - 1
Assets/GameMain/Scripts/DataTable/DRScene.cs

@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 // 此文件由工具自动生成,请勿直接修改。
-// 生成时间:2022-01-20 20:43:45.759
+// 生成时间:2022-01-24 15:21:03.713
 //------------------------------------------------------------
 
 using GameFramework;

+ 1 - 1
Assets/GameMain/Scripts/DataTable/DRSound.cs

@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 // 此文件由工具自动生成,请勿直接修改。
-// 生成时间:2022-01-20 20:43:45.763
+// 生成时间:2022-01-24 15:21:03.715
 //------------------------------------------------------------
 
 using GameFramework;

+ 1 - 1
Assets/GameMain/Scripts/DataTable/DRThruster.cs

@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 // 此文件由工具自动生成,请勿直接修改。
-// 生成时间:2022-01-20 20:43:45.765
+// 生成时间:2022-01-24 15:21:03.718
 //------------------------------------------------------------
 
 using GameFramework;

+ 1 - 1
Assets/GameMain/Scripts/DataTable/DRUIForm.cs

@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 // 此文件由工具自动生成,请勿直接修改。
-// 生成时间:2022-01-20 20:43:45.767
+// 生成时间:2022-01-24 15:21:03.720
 //------------------------------------------------------------
 
 using GameFramework;

+ 1 - 1
Assets/GameMain/Scripts/DataTable/DRUISound.cs

@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 // 此文件由工具自动生成,请勿直接修改。
-// 生成时间:2022-01-20 20:43:45.769
+// 生成时间:2022-01-24 15:21:03.722
 //------------------------------------------------------------
 
 using GameFramework;

+ 1 - 1
Assets/GameMain/Scripts/DataTable/DRWeapon.cs

@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 // 此文件由工具自动生成,请勿直接修改。
-// 生成时间:2022-01-20 20:43:45.771
+// 生成时间:2022-01-24 15:21:03.724
 //------------------------------------------------------------
 
 using GameFramework;

+ 23 - 4
Assets/GameMain/Scripts/Entity/EntityData/RoleCustomBoneData.cs

@@ -11,6 +11,7 @@ namespace MetaClient
         public Dictionary<string, Vector3> orginLocalScaleList;
         public Dictionary<string, Vector3> orginLocalPositionList;
         public Dictionary<string, Quaternion> orginLocalRotationList;
+        public Dictionary<string, float> orginBlendList;
 
         public Dictionary<int, float> changedValueList;
         public Dictionary<string, Vector3> changedScaleList;
@@ -24,6 +25,7 @@ namespace MetaClient
             orginLocalScaleList = new Dictionary<string, Vector3>();
             orginLocalPositionList = new Dictionary<string, Vector3>();
             orginLocalRotationList = new Dictionary<string, Quaternion>();
+            orginBlendList = new Dictionary<string, float>();
 
             changedValueList = new Dictionary<int, float>();
             changedScaleList = new Dictionary<string, Vector3>();
@@ -48,6 +50,10 @@ namespace MetaClient
 
         public string[] bones;
 
+        //使用变形器
+        public string blendName;
+        public bool useBlend;
+
         public float minChangeValue;
         public float maxChangeValue;
         public Vector3 scaleChange;
@@ -64,19 +70,32 @@ namespace MetaClient
             pathValue = "";
         }
 
-        public PartData(int _id,string[] _bones,float _min,float _max,Vector3 _scaleChange,Vector3 _posChange,Vector3 _rotChange)
+        public PartData(int _id,string[] _bones,float _min,float _max,Vector3 _scaleChange,Vector3 _posChange,Vector3 _rotChange,bool _useBlend,string _blendName,float _defaultValue = 0)
         {
             id = _id;
-            floatValue = 1;
             vecValue = Vector3.zero;
             pathValue = "";
 
             bones = _bones;
-            minChangeValue = _min;
-            maxChangeValue = _max;
+            
             scaleChange = _scaleChange;
             positionChange = _posChange;
             rotationChange = _rotChange;
+            useBlend = _useBlend;
+            blendName = _blendName;
+
+            if(_useBlend)
+            {
+                floatValue = _defaultValue;
+                minChangeValue = 0;
+                maxChangeValue = 1;
+            }
+            else
+            {
+                floatValue = 1;
+                minChangeValue = _min;
+                maxChangeValue = _max;
+            }
         }
     }
 }

+ 109 - 60
Assets/GameMain/Scripts/Game/CustomRole/CustomManager.cs

@@ -3,7 +3,6 @@ using System.Collections;
 using System.Collections.Generic;
 using GameFramework.Event;
 using UnityEngine;
-using HumanoidEditor;
 using GameFramework.DataTable;
 
 namespace MetaClient
@@ -33,7 +32,7 @@ namespace MetaClient
         /// </summary>
         public void CreateCustomBodyData()
         {
-            testPlayer = GameObject.Find("标准女").GetComponent<CustomRoleController>();
+            testPlayer = GameObject.Find("4").GetComponent<CustomRoleController>();
 
             bodyData = new RoleCustomData();
             //初始化
@@ -48,7 +47,10 @@ namespace MetaClient
                     dtCB[i].ScaleRangeMax,
                     dtCB[i].ScaleChange,
                     dtCB[i].PositionChange,
-                    dtCB[i].RotationChange
+                    dtCB[i].RotationChange,
+                    dtCB[i].IsBlend,
+                    dtCB[i].BlendName,
+                    dtCB[i].DefaultBlendValue
                     );
                 bodyData.bodyList.Add(dtCB[i].Id, partData);
             }
@@ -58,16 +60,19 @@ namespace MetaClient
             {
                 var key = item.Key;
                 var value = item.Value;
-                for (int i = 0; i < value.bones.Length; i++)
+                if(!value.useBlend)
                 {
-                    var transform = CustomRoleUtility.GetChild(testPlayer.transform, value.bones[i]);
-                    if(!transform)
+                    for (int i = 0; i < value.bones.Length; i++)
                     {
-                        continue;
-                    }
-                    if(!bones.ContainsKey(value.bones[i]))
-                    {
-                        bones.Add(value.bones[i], transform);
+                        var transform = CustomRoleUtility.GetChild(testPlayer.transform, value.bones[i]);
+                        if (!transform)
+                        {
+                            continue;
+                        }
+                        if (!bones.ContainsKey(value.bones[i]))
+                        {
+                            bones.Add(value.bones[i], transform);
+                        }
                     }
                 }
             }
@@ -81,19 +86,6 @@ namespace MetaClient
                 bodyData.orginLocalScaleList.Add(key, value.localScale);
             }
 
-            ////初始缩放
-            //testPlayer.GetNormalAniBonesScale(ref bodyData.orginLocalScaleList);
-            //testPlayer.GetExtraAniBonesScale(ref bodyData.orginLocalScaleList, EditableBodyPart.Chest);
-            //testPlayer.GetExtraAniBonesScale(ref bodyData.orginLocalScaleList, EditableBodyPart.UpperArmUp);
-            //testPlayer.GetExtraAniBonesScale(ref bodyData.orginLocalScaleList, EditableBodyPart.UpperArmDown);
-            //testPlayer.GetExtraAniBonesScale(ref bodyData.orginLocalScaleList, EditableBodyPart.UpperLegUp);
-            //testPlayer.GetExtraAniBonesScale(ref bodyData.orginLocalScaleList, EditableBodyPart.UpperLegDown);
-            //testPlayer.GetExtraAniBonesScale(ref bodyData.orginLocalScaleList, EditableBodyPart.LowerLegUp);
-            //testPlayer.GetExtraAniBonesScale(ref bodyData.orginLocalScaleList, EditableBodyPart.LowerLegDown);
-            ////初始位置
-            //testPlayer.GetExtraAniBonesPosition(ref bodyData.orginLocalPositionList, EditableBodyPart.Chest);
-            ////初始旋转
-            //testPlayer.GetExtraAniBonesRotate(ref bodyData.orginLocalRotationList, EditableBodyPart.Chest);
         }
 
         public void Clear()
@@ -114,61 +106,94 @@ namespace MetaClient
                     Debug.LogError("ID :" + crf.Part + "   无数据");
                     return;
                 }
-                if(crf.ChangeValue.x == 0.5f)
-                {
-                    partData.floatValue = 1;
-                }
-                if(crf.ChangeValue.x < 0.5f)
+                if(partData.useBlend)
                 {
-                    partData.floatValue = partData.minChangeValue + (1 - partData.minChangeValue) * (crf.ChangeValue.x/0.5f);
+                    ChangeBlendShape(partData, crf.ChangeValue);
                 }
-                if(crf.ChangeValue.x > 0.5f)
+                else
                 {
-                    partData.floatValue = 1 + (partData.maxChangeValue - 1) * ((crf.ChangeValue.x - 0.5f)/0.5f);
+                    ChangeBone(partData, crf.ChangeValue);
                 }
-                Debug.Log(crf.Part + " : " + crf.ChangeValue + " 转换后 :" + partData.floatValue);
-                if (partData.scaleChange != Vector3.zero)
+                
+            }
+        }
+        /// <summary>
+        /// 变形器改变
+        /// </summary>
+        /// <param name="partData"></param>
+        /// <param name="changeValue"></param>
+        private void ChangeBlendShape(PartData partData, Vector3 changeValue)
+        {
+            partData.floatValue = changeValue.x;
+            RefreshRoleBlendShape(partData.blendName,partData.floatValue * 100);
+        }
+        /// <summary>
+        /// 骨骼改变
+        /// </summary>
+        /// <param name="partData"></param>
+        /// <param name="changeValue"></param>
+        private void ChangeBone(PartData partData,Vector3 changeValue)
+        {
+            if (changeValue.x == 0.5f)
+            {
+                partData.floatValue = 1;
+            }
+            if (changeValue.x < 0.5f)
+            {
+                partData.floatValue = partData.minChangeValue + (1 - partData.minChangeValue) * (changeValue.x / 0.5f);
+            }
+            if (changeValue.x > 0.5f)
+            {
+                partData.floatValue = 1 + (partData.maxChangeValue - 1) * ((changeValue.x - 0.5f) / 0.5f);
+            }
+            Debug.Log(partData.id + " : " + changeValue + " 转换后 :" + partData.floatValue);
+            if (partData.scaleChange != Vector3.zero)
+            {
+                for (int i = 0; i < partData.bones.Length; i++)
                 {
-                    for (int i = 0; i < partData.bones.Length; i++)
-                    {
-                        var orginBoneScale = bodyData.orginLocalScaleList[partData.bones[i]];
-                        var bone = bones[partData.bones[i]];
+                    var orginBoneScale = bodyData.orginLocalScaleList[partData.bones[i]];
+                    var bone = bones[partData.bones[i]];
 
-                        var nowBone = bones[partData.bones[i]];
-                        var nowScale = new Vector3(nowBone.localScale.x/orginBoneScale.x, nowBone.localScale.y / orginBoneScale.y, nowBone.localScale.z / orginBoneScale.z);
-                        //var newBoneScale = new Vector3(orginBoneScale.x * (partData.scaleChange.x == 1 ? partData.floatValue : 1) * nowScale.x, orginBoneScale.y * (partData.scaleChange.y == 1 ? partData.floatValue : 1) * nowScale.y, orginBoneScale.z * (partData.scaleChange.z == 1 ? partData.floatValue : 1) * nowScale.y);
+                    var nowBone = bones[partData.bones[i]];
+                    var nowScale = new Vector3(nowBone.localScale.x / orginBoneScale.x, nowBone.localScale.y / orginBoneScale.y, nowBone.localScale.z / orginBoneScale.z);
+                    //var newBoneScale = new Vector3(orginBoneScale.x * (partData.scaleChange.x == 1 ? partData.floatValue : 1) * nowScale.x, orginBoneScale.y * (partData.scaleChange.y == 1 ? partData.floatValue : 1) * nowScale.y, orginBoneScale.z * (partData.scaleChange.z == 1 ? partData.floatValue : 1) * nowScale.y);
 
-                        var newBoneScale = new Vector3(
-                            partData.scaleChange.x == 1 ? partData.floatValue * orginBoneScale.x : nowBone.localScale.x,
-                            partData.scaleChange.y == 1 ? partData.floatValue * orginBoneScale.y : nowBone.localScale.y,
-                            partData.scaleChange.z == 1 ? partData.floatValue * orginBoneScale.z : nowBone.localScale.z
-                            );
+                    var newBoneScale = new Vector3(
+                        partData.scaleChange.x == 1 ? partData.floatValue * orginBoneScale.x : nowBone.localScale.x,
+                        partData.scaleChange.y == 1 ? partData.floatValue * orginBoneScale.y : nowBone.localScale.y,
+                        partData.scaleChange.z == 1 ? partData.floatValue * orginBoneScale.z : nowBone.localScale.z
+                        );
 
-                        Debug.Log("newBoneScale : " + newBoneScale);
-                        bodyData.changedScaleList[partData.bones[i]] = newBoneScale;
-                    }
+                    Debug.Log("newBoneScale : " + newBoneScale);
+                    bodyData.changedScaleList[partData.bones[i]] = newBoneScale;
                 }
-
-                RefreshRole();
             }
+
+            RefreshRoleBone();
         }
 
         public float GetBodyBoneValue(int id)
         {
-            Debug.Log(id +":  GetBodyBoneValue + " + bodyData.bodyList[id].scaleChange + "   " + bodyData.bodyList[id].floatValue);
-            if (bodyData.bodyList[id].scaleChange.x == 1 || bodyData.bodyList[id].scaleChange.y == 1 || bodyData.bodyList[id].scaleChange.z == 1)
+            var partData = bodyData.bodyList[id];
+            if(partData.useBlend)
+            {
+                return partData.floatValue;
+            }
+
+            Debug.Log(id +":  GetBodyBoneValue + " + partData.scaleChange + "   " + partData.floatValue);
+            if (partData.scaleChange.x == 1 || partData.scaleChange.y == 1 || partData.scaleChange.z == 1)
             {
-                if (bodyData.bodyList[id].floatValue == 1)
+                if (partData.floatValue == 1)
                 {
                     return 0.5f;
                 }
-                if (bodyData.bodyList[id].floatValue < 1)
+                if (partData.floatValue < 1)
                 {
-                    return (bodyData.bodyList[id].floatValue - bodyData.bodyList[id].minChangeValue) / (1 - bodyData.bodyList[id].minChangeValue)/2;
+                    return (partData.floatValue - partData.minChangeValue) / (1 - partData.minChangeValue)/2;
                 }
-                if (bodyData.bodyList[id].floatValue > 1)
+                if (partData.floatValue > 1)
                 {
-                    return 0.5f + (bodyData.bodyList[id].floatValue - 1) / (bodyData.bodyList[id].maxChangeValue - 1)/2;
+                    return 0.5f + (partData.floatValue - 1) / (partData.maxChangeValue - 1)/2;
                 }
             }
             
@@ -190,7 +215,14 @@ namespace MetaClient
             {
                 var key = item.Key;
                 var value = item.Value;
-                value.floatValue = 1;
+                if(value.useBlend)
+                {
+                    value.floatValue = 0;
+                }
+                else
+                {
+                    value.floatValue = 1;
+                }
             }
 
             //重置缩放
@@ -200,6 +232,10 @@ namespace MetaClient
                 var value = item.Value;
                 //testPlayer.SetBoneScale(key, value);
                 testPlayer.SetBoneWorldScale(key, value);
+                if(bodyData.changedScaleList.ContainsKey(key))
+                {
+                    bodyData.changedScaleList[key] = bodyData.orginLocalScaleList[key];
+                }
             }
 
             //重置旋转
@@ -217,9 +253,22 @@ namespace MetaClient
                 var value = item.Value;
                 testPlayer.SetBonePos(key, value);
             }
+
+            testPlayer.ResetAllBlendShape();
+        }
+
+        public void RefreshRoleBlendShape(string name,float value)
+        {
+            if (testPlayer == null)
+            {
+                Debug.LogError("没有模型存在");
+                return;
+            }
+
+            testPlayer.SetBlendShape(name, value);
         }
 
-        public void RefreshRole()
+        public void RefreshRoleBone()
         {
             if (testPlayer == null)
             {

+ 47 - 0
Assets/GameMain/Scripts/Game/CustomRole/CustomRoleController.cs

@@ -171,4 +171,51 @@ public class CustomRoleController : MonoBehaviour
         }
         bone.DOScale(value, 0);
     }
+
+    public void SetBlendShape(string name,float value)
+    {
+        if (!body)
+        {
+            Debug.LogError(name + "不存在 SkinnedMeshRenderer");
+            return;
+        }
+        if(name == "no")
+        {
+            Debug.LogError("表里还没配,快去改表吧!");
+            return;
+        }
+        var index = body.sharedMesh.GetBlendShapeIndex(name);
+        if(index < 0)
+        {
+            Debug.LogError(name + "不存在名称为 " + name + "变形器");
+            return;
+        }
+        SetBlendShape(index, value);
+    }
+
+    public void SetBlendShape(int index,float value)
+    {
+        if(!body)
+        {
+            Debug.LogError(name + "不存在 SkinnedMeshRenderer");
+            return;
+        }
+        body.SetBlendShapeWeight(index, value);
+    }
+    /// <summary>
+    /// 重置所有变形器
+    /// </summary>
+    public void ResetAllBlendShape()
+    {
+        if (!body)
+        {
+            Debug.LogError(name + "不存在 SkinnedMeshRenderer");
+            return;
+        }
+        var count = body.sharedMesh.blendShapeCount;
+        for (int i = 0; i < count; i++)
+        {
+            SetBlendShape(i, 0);
+        }
+    }
 }

+ 2 - 0
Assets/GameMain/Scripts/Procedure/ProcedureCustomRole.cs

@@ -45,6 +45,8 @@ namespace MetaClient
 
             GameEntry.Event.Subscribe(OpenUIFormSuccessEventArgs.EventId, OnOpenUIFormSuccess);
             GameEntry.UI.OpenUIForm(UIFormId.CustomRole, this);
+
+            //CustomRoleUtility.ShowFile();
         }
 
         protected override void OnLeave(ProcedureOwner procedureOwner, bool isShutdown)

+ 5 - 0
Assets/GameMain/Scripts/UI/UICustom.cs

@@ -716,6 +716,11 @@ namespace MetaClient
         {
             GameEntry.Event.Fire(this, CustomRoleFaceEventArgs.Create(EditableFacePart.eye, new Vector3(1, 0, 0)));
         }
+
+        public void ClickResetBtn()
+        {
+            CustomManager.Instance.ResetRole();
+        }
     }
     public enum ECustomStyple
     {

+ 100 - 0
Assets/GameMain/Scripts/Utility/AvatarTool.cs

@@ -0,0 +1,100 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public static class AvatarTool
+{
+    /// <summary>
+    /// 应用装备
+    /// </summary>
+    /// <param name="targetRole">目标角色物体</param>
+    /// <param name="targetPart">被改变的部位</param>
+    /// <param name="partName">装备预制体名称</param>
+    /// <param name="partSavorRolePrefab">预制体所在的对象预制物体</param>
+    public static void ChangeAvatar(GameObject targetRole, GameObject targetPart, string partName, GameObject partSavorRolePrefab)
+    {
+        //Transform t = partSavorRolePrefab.transform.Find(partName);
+        Transform t = FindTargetObj(partSavorRolePrefab, partName);
+
+        if (t == null) return;
+        ChangeAvatar(targetRole, targetPart, t.gameObject);
+    }
+
+    /// <summary>
+    /// 寻找到目标物体
+    /// </summary>
+    public static Transform FindTargetObj(GameObject obj, string name)
+    {
+        Transform o = null;
+        Transform[] transforms = obj.transform.GetComponentsInChildren<Transform>();
+        foreach (Transform t in transforms)
+        {
+            if (t.name == name)
+            {
+                o = t;
+                break;
+            }
+        }
+        return o;
+    }
+
+    /// <summary>
+    /// 根据是否带有SkinnedMeshRenderer决定改变外观的方式
+    /// </summary>
+    /// <param name="targetRole"></param>
+    /// <param name="targetPart"></param>
+    /// <param name="part"></param>
+    public static void ChangeAvatar(GameObject targetRole, GameObject targetPart, GameObject part)
+    {
+        if (targetPart.GetComponent<SkinnedMeshRenderer>())
+        {
+            Transform[] hips = targetRole.GetComponentsInChildren<Transform>();//角色的骨骼物体
+            ChangeMesh(targetPart, part, hips);
+        }
+        else
+        {
+            ChangeMesh(targetPart, part);
+        }
+
+    }
+
+    /// <summary>
+    /// 改变mesh,这里主要使用蒙皮骨骼换装
+    /// </summary>
+    /// <param name="targetPart">需要被改变的玩家身上的部位,比如:鞋子</param>
+    /// <param name="part">用于改变的部位,比如:鞋子01</param>
+    /// <param name="hips">玩家身上的骨骼,targetPart和part必须在相同的一套或者同名(模型不同,但是骨骼完全一样)的骨骼下</param>
+    public static void ChangeMesh(GameObject targetPart, GameObject part, Transform[] hips)
+    {
+        SkinnedMeshRenderer smr = part.GetComponent<SkinnedMeshRenderer>();//获取预制物体下相关部位的SkinnedMeshRenderer
+
+        //获取角色物体下与预制物体相关更换的Mesh部位下作用于该Mesh,再场景中与其同名的骨骼列表
+        List<Transform> bones = new List<Transform>();
+        foreach (Transform bone in smr.bones)
+        {
+            foreach (Transform hip in hips)
+            {
+                if (hip.name != bone.name)
+                {
+                    continue;
+                }
+                bones.Add(hip);
+                break;
+            }
+        }
+        targetPart.GetComponent<SkinnedMeshRenderer>().sharedMesh = smr.sharedMesh;//更改mesh
+        targetPart.GetComponent<SkinnedMeshRenderer>().bones = bones.ToArray();//更换(刷新)骨骼列表
+        targetPart.GetComponent<SkinnedMeshRenderer>().materials = smr.sharedMaterials;//更换材质
+    }
+
+    /// <summary>
+    /// 改变Mesh,这里主要使用MeshRenderer
+    /// </summary>
+    /// <param name="targetPart">玩家身上的部位</param>
+    /// <param name="part"></param>
+    public static void ChangeMesh(GameObject targetPart, GameObject part)
+    {
+        targetPart.GetComponent<MeshFilter>().mesh = part.GetComponent<MeshFilter>().sharedMesh;
+        targetPart.GetComponent<MeshRenderer>().materials = part.GetComponent<MeshRenderer>().sharedMaterials;
+    }
+}

+ 11 - 0
Assets/GameMain/Scripts/Utility/AvatarTool.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 814f1ca5d26ede44ca7b8c7927eeb7ff
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 17 - 17
Assets/GameMain/Scripts/Utility/CustomRoleUtility.cs

@@ -240,7 +240,7 @@ public static class CustomRoleUtility
     public static void ShowFile()
     {
         FileStream fs = File.Open("E:/key.key", FileMode.Open);
-        FileStream fsout = File.Open("E:/keyout9.key", FileMode.Create);
+        FileStream fsout = File.Open("E:/keyout4.key", FileMode.Create);
         BinaryReader br = new BinaryReader(fs);
         BinaryWriter bw = new BinaryWriter(fsout);
         Byte[] byData = br.ReadBytes((int)fs.Length);
@@ -274,22 +274,22 @@ public static class CustomRoleUtility
         IList<byte> bData = new List<byte>();
         string[] strHexs = new string[16];
         int[] intData = {
-                245,
-                217,
-                174,
-                210,
-                90,
-                41,
-                167,
-                178,
-                110,
-                47,
-                158,
-                193,
-                35,
-                162,
-                230,
-                97
+                52,
+                202,
+                48,
+                138,
+                68,
+                75,
+                239,
+                159,
+                27,
+                50,
+                70,
+                255,
+                10,
+                248,
+                131,
+                73
             };
         for (int i = 0; i < 16; i++)
         {

+ 216 - 7
Assets/GameMain/UI/UIForms/CustomRole.prefab

@@ -30,6 +30,7 @@ RectTransform:
   m_Children:
   - {fileID: 5856596650124063523}
   - {fileID: 2921542304032736362}
+  - {fileID: 4019844992328216454}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -312,7 +313,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   uICustom: {fileID: 1633349417}
   eCustomStyple: 2
-  id: 4
+  id: 5
   eButtonStyple: 3
   part: 0
   eTSStyple: 0
@@ -1074,7 +1075,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   uICustom: {fileID: 1633349417}
   eCustomStyple: 2
-  id: 0
+  id: 1
   eButtonStyple: 3
   part: 0
   eTSStyple: 0
@@ -1755,7 +1756,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   uICustom: {fileID: 1633349417}
   eCustomStyple: 2
-  id: 2
+  id: 3
   eButtonStyple: 3
   part: 0
   eTSStyple: 0
@@ -2827,7 +2828,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   uICustom: {fileID: 1633349417}
   eCustomStyple: 2
-  id: 3
+  id: 4
   eButtonStyple: 3
   part: 0
   eTSStyple: 0
@@ -4976,7 +4977,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   uICustom: {fileID: 1633349417}
   eCustomStyple: 2
-  id: 5
+  id: 6
   eButtonStyple: 3
   part: 0
   eTSStyple: 0
@@ -5406,7 +5407,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   uICustom: {fileID: 1633349417}
   eCustomStyple: 2
-  id: 1
+  id: 2
   eButtonStyple: 3
   part: 0
   eTSStyple: 0
@@ -5546,7 +5547,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   uICustom: {fileID: 1633349417}
   eCustomStyple: 2
-  id: 6
+  id: 7
   eButtonStyple: 3
   part: 0
   eTSStyple: 0
@@ -6329,6 +6330,84 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &3318785950638680186
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4472487563909362133}
+  - component: {fileID: 7417344024526480456}
+  - component: {fileID: 6583491524936218062}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4472487563909362133
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3318785950638680186}
+  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: 4019844992328216454}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7417344024526480456
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3318785950638680186}
+  m_CullTransparentMesh: 0
+--- !u!114 &6583491524936218062
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3318785950638680186}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 30
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Reset
 --- !u!1 &3447988733459671993
 GameObject:
   m_ObjectHideFlags: 0
@@ -7056,6 +7135,136 @@ MonoBehaviour:
   m_Spacing: {x: 0, y: 30.4}
   m_Constraint: 1
   m_ConstraintCount: 1
+--- !u!1 &5178165738829128225
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4019844992328216454}
+  - component: {fileID: 5797924177769889367}
+  - component: {fileID: 6302493181153597008}
+  - component: {fileID: 2235219660695511041}
+  m_Layer: 5
+  m_Name: resetBtn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4019844992328216454
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5178165738829128225}
+  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:
+  - {fileID: 4472487563909362133}
+  m_Father: {fileID: 22498214}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 377.5, y: 139.5}
+  m_SizeDelta: {x: 160, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5797924177769889367
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5178165738829128225}
+  m_CullTransparentMesh: 0
+--- !u!114 &6302493181153597008
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5178165738829128225}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &2235219660695511041
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5178165738829128225}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 6302493181153597008}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1633349417}
+        m_MethodName: ClickResetBtn
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &5487702084294534458
 GameObject:
   m_ObjectHideFlags: 0

BIN
Assets/HumanoidEditor/HE_Readme.pdf


+ 0 - 0
Assets/HumanoidEditor/HumanoidEditor.dll


Some files were not shown because too many files changed in this diff