Browse Source

Merge branch 'master' of http://git.xwxgame.com/qianzhuqing/metaClient

Jidongchen 3 years ago
parent
commit
6712a72ace
32 changed files with 2023 additions and 1967 deletions
  1. 1012 189
      Assets/DynamicBone/Demo/c1.fbx.meta
  2. 1 1
      Assets/GameMain/Configs/ResourceBuilder.xml
  3. 86 0
      Assets/GameMain/Configs/ResourceCollection.xml
  4. BIN
      Assets/GameMain/Model/6.FBX
  5. 100 0
      Assets/GameMain/Model/6.FBX.meta
  6. BIN
      Assets/GameMain/Model/7.FBX
  7. 100 0
      Assets/GameMain/Model/7.FBX.meta
  8. 200 1647
      Assets/GameMain/Scenes/CustomRole.unity
  9. 4 0
      Assets/GameMain/Scripts/Entity/EntityData/RoleCustomBoneData.cs
  10. 45 10
      Assets/GameMain/Scripts/Game/CustomRole/CustomManager.cs
  11. 22 8
      Assets/GameMain/Scripts/Game/CustomRole/CustomRoleController.cs
  12. 1 0
      Assets/GameMain/Scripts/UI/UICustomDrag.cs
  13. 32 8
      Assets/GameMain/UI/UISprites/CustomRole/neijiaokuandu.png.meta
  14. 32 8
      Assets/GameMain/UI/UISprites/CustomRole/neishangyanxian.png.meta
  15. 32 8
      Assets/GameMain/UI/UISprites/CustomRole/neixiayanxian.png.meta
  16. 32 8
      Assets/GameMain/UI/UISprites/CustomRole/shuangyanjiaodu.png.meta
  17. 32 8
      Assets/GameMain/UI/UISprites/CustomRole/shuangyankaihe.png.meta
  18. 32 8
      Assets/GameMain/UI/UISprites/CustomRole/shuangyanqianhou.png.meta
  19. 32 8
      Assets/GameMain/UI/UISprites/CustomRole/shuangyanshangxia.png.meta
  20. 32 8
      Assets/GameMain/UI/UISprites/CustomRole/waijiaogaodu.png.meta
  21. 32 8
      Assets/GameMain/UI/UISprites/CustomRole/waishangyanxian.png.meta
  22. 32 8
      Assets/GameMain/UI/UISprites/CustomRole/xiongbu_.png.meta
  23. 32 8
      Assets/GameMain/UI/UISprites/CustomRole/yanjinggaodu.png.meta
  24. 32 8
      Assets/GameMain/UI/UISprites/CustomRole/yanjingkuandu.png.meta
  25. 32 8
      Assets/GameMain/UI/UISprites/CustomRole/zhongshangyanxian.png.meta
  26. 32 8
      Assets/GameMain/UI/UISprites/CustomRole/zhongxiayanxian.png.meta
  27. 4 0
      Assets/Launcher.unity
  28. BIN
      Assets/StreamingAssets/GameData.dat
  29. BIN
      Assets/StreamingAssets/GameFrameworkVersion.dat
  30. BIN
      Assets/StreamingAssets/Resources.dat
  31. BIN
      Assets/StreamingAssets/UI.dat
  32. BIN
      Assets/StreamingAssets/metasprite.dat

File diff suppressed because it is too large
+ 1012 - 189
Assets/DynamicBone/Demo/c1.fbx.meta


+ 1 - 1
Assets/GameMain/Configs/ResourceBuilder.xml

@@ -2,7 +2,7 @@
 <UnityGameFramework>
   <ResourceBuilder>
     <Settings>
-      <InternalResourceVersion>4</InternalResourceVersion>
+      <InternalResourceVersion>6</InternalResourceVersion>
       <Platforms>32</Platforms>
       <AssetBundleCompression>1</AssetBundleCompression>
       <CompressionHelperTypeName>UnityGameFramework.Runtime.DefaultCompressionHelper</CompressionHelperTypeName>

+ 86 - 0
Assets/GameMain/Configs/ResourceCollection.xml

@@ -26,6 +26,7 @@
       <Resource Name="UI/UISprites/Logos" FileSystem="UI" LoadType="0" Packed="True" />
     </Resources>
     <Assets>
+      <Asset Guid="00382163660681f4aa095f6d5e7ee756" ResourceName="metasprite" />
       <Asset Guid="00fb74125b3f6cb4586e3f17b5389562" ResourceName="metasprite" />
       <Asset Guid="011a24e787d1b484b9f52f178e67581c" ResourceName="metasprite" />
       <Asset Guid="0179316b5fc7c2946a67c5877c02fc30" ResourceName="UI/UISprites/Common" />
@@ -39,20 +40,28 @@
       <Asset Guid="0a1fa08fa3d4899459c305017d9f7a30" ResourceName="metasprite" />
       <Asset Guid="0a65a68c01a76ea4b8b574827a6467aa" ResourceName="UI/UISprites/Common" />
       <Asset Guid="0c9331c5f63a4174a94fdeb28c5a2276" ResourceName="metasprite" />
+      <Asset Guid="0db4b07459c827848b831730625891ab" 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="10bb8a53afc48484e9b2ff1202b190bd" ResourceName="metasprite" />
       <Asset Guid="1108590e681998042b48076d7d60ef61" ResourceName="metasprite" />
+      <Asset Guid="117763e9492099042a9a6cbd93d80f79" ResourceName="metasprite" />
       <Asset Guid="11cb5c81f9e062e4285602f571b2fca8" ResourceName="metasprite" />
       <Asset Guid="12bad035587d7444ea7e97aa31ce4ed7" ResourceName="metasprite" />
+      <Asset Guid="139e20a7f9e514a4380b9aa0f32cc3c7" 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="162aca155bacd7b4c99c2d9ebd2e12c8" ResourceName="metasprite" />
       <Asset Guid="17503f9303574294bb34c41cc4e7abbf" ResourceName="metasprite" />
       <Asset Guid="185f97f18bd603a478461ce9c08bd039" ResourceName="Materials" />
       <Asset Guid="188aa591a021e464ea437bbcfa9e0251" ResourceName="metasprite" />
+      <Asset Guid="18c0382f9c9ecbd4da5203f8b39bbcf3" ResourceName="metasprite" />
+      <Asset Guid="1b448cd74f1e9674ab8aad95cfaa6921" ResourceName="metasprite" />
       <Asset Guid="1b4bad6cea5a94611b21f9757fe41444" ResourceName="Materials" />
+      <Asset Guid="1b77fa8c520b51e4f83bd8df75635568" ResourceName="metasprite" />
       <Asset Guid="1be38a19390f10a49ad9e2a3b0e3c64f" ResourceName="metasprite" />
       <Asset Guid="1be4472894949437694aead55c6da60f" ResourceName="Sounds" />
       <Asset Guid="1be83576f4195314e97dd52e3fbfd00e" ResourceName="metasprite" />
@@ -63,6 +72,7 @@
       <Asset Guid="1e0350b97c61bfb4a91c62d756d01727" ResourceName="Materials" />
       <Asset Guid="1ead258f71f0d884e913087590ece730" ResourceName="metasprite" />
       <Asset Guid="20cfd8b7ea61a1941aefa438b87ce633" ResourceName="metasprite" />
+      <Asset Guid="2286ad9ad531ef5448bca534d5597654" ResourceName="metasprite" />
       <Asset Guid="236433a27ce40a7429b87d14d8fa3035" ResourceName="UI/UISprites/Common" />
       <Asset Guid="239366f83979ffa48a45dac2f0f1e8cb" ResourceName="DataTables" />
       <Asset Guid="23d3422dfe6276f419de91f64f82f5b3" ResourceName="metasprite" />
@@ -77,20 +87,34 @@
       <Asset Guid="2b85adb3ae0810749a8a7a0917a0eab4" ResourceName="metasprite" />
       <Asset Guid="2cb5eef4d7d7bf6459dd13a3f8d90246" ResourceName="Textures" />
       <Asset Guid="2e6582224f30cba438be0850c053766e" ResourceName="metasprite" />
+      <Asset Guid="2ea44652e7c12314f951d145ba02a9f6" ResourceName="metasprite" />
       <Asset Guid="315e8ed2db27c254cb3366ff0793cd90" ResourceName="DataTables" />
+      <Asset Guid="32d40a67819372143b3255a4beb64322" ResourceName="metasprite" />
+      <Asset Guid="34c646641e6c04f4e81b67eaaf038144" ResourceName="metasprite" />
+      <Asset Guid="34ed913c29df1ab478d16cd8388d90e7" ResourceName="metasprite" />
       <Asset Guid="352da872791696c48af3b21132e3e3c3" ResourceName="DataTables" />
+      <Asset Guid="362fa3169f11292499f2128495d37a16" ResourceName="metasprite" />
+      <Asset Guid="365610c927d11d3439866b16bea245c9" ResourceName="metasprite" />
       <Asset Guid="36bd34f59b194604b84605b33c5e470c" ResourceName="metasprite" />
       <Asset Guid="372a8b1e52bedc64b9207b12d167afaa" ResourceName="DataTables" />
       <Asset Guid="384c714394619bd40a66b8715f4c424e" ResourceName="metasprite" />
+      <Asset Guid="39ae1a90c4258604d9ce80a8c9cd77b6" 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="3de0f53f7de34274eb07c51f856cde9d" ResourceName="metasprite" />
+      <Asset Guid="3dfbff0088eca8c4394eff0fb7c779ee" ResourceName="metasprite" />
       <Asset Guid="3e504a46a8fcec34db3c4776530c6eb2" ResourceName="Textures" />
       <Asset Guid="3f54fcfdac53aec42ae18a6a1c6d8cb1" ResourceName="UI/UISprites/Common" />
+      <Asset Guid="4061f826e79dced46a9da3495d013b3f" ResourceName="metasprite" />
+      <Asset Guid="43bfccbfd1c34114293035d2a02e4f88" ResourceName="metasprite" />
       <Asset Guid="4473d81b14ddb0143addf0e6050d8491" ResourceName="Scenes" />
       <Asset Guid="44c8db52241385c45bbb14a1718f17bf" ResourceName="Configs" />
+      <Asset Guid="45c7317dcfc513945bc819f5ef5b2c40" ResourceName="metasprite" />
+      <Asset Guid="465d25d18dbeb5141afe83bb76e43883" ResourceName="metasprite" />
+      <Asset Guid="486c851f54245084da2aec558132136b" ResourceName="metasprite" />
       <Asset Guid="4a17d2c656f5c6b44a31e3ee547a76b0" ResourceName="DataTables" />
       <Asset Guid="4ad0dfa60082c8e468583584242210df" ResourceName="metasprite" />
       <Asset Guid="4b62c0d98288d2540a5529d15ea6bde2" ResourceName="metasprite" />
@@ -98,25 +122,37 @@
       <Asset Guid="4c885fe5b2267de4cbdc7e01a4580597" ResourceName="metasprite" />
       <Asset Guid="4d35cf464dbd0be438017301e8c08f10" ResourceName="metasprite" />
       <Asset Guid="4db6a299939bfe94893585eb387f577a" ResourceName="DataTables" />
+      <Asset Guid="4e4133b5e64fd7645a2ad42d9167c9d9" ResourceName="metasprite" />
+      <Asset Guid="4e92460b3fc66954b979a5b20c49bc51" ResourceName="metasprite" />
       <Asset Guid="4f688097e85071841a2c3ba165000c20" ResourceName="Textures" />
+      <Asset Guid="50d40338fd713584fa6e9dd03346310b" ResourceName="metasprite" />
       <Asset Guid="5282f20eba4d44213820e21af8481932" ResourceName="Meshes" />
       <Asset Guid="541cbd87f61ca3b44a01ce2e313c452d" ResourceName="metasprite" />
+      <Asset Guid="542d2d5fbe69f2b43a0258382637ff67" ResourceName="metasprite" />
+      <Asset Guid="55b2ba8da378ea740bd05c1aa512135b" ResourceName="metasprite" />
       <Asset Guid="56b8df63bbad60749a69e38bc687fadf" ResourceName="UI/UISprites/Common" />
       <Asset Guid="578af1667322bab45b652b79a40bb4fb" ResourceName="Materials" />
       <Asset Guid="583ff7026dac91849b7c7b2468ba456b" ResourceName="Materials" />
+      <Asset Guid="58c014303c89ae445b4d54e9ce0f6203" ResourceName="metasprite" />
+      <Asset Guid="5ad106f18f2a33145b09a4ec29335a76" ResourceName="DataTables" />
       <Asset Guid="5cf6cfde166d4d249a1748fbe3dfa141" ResourceName="metasprite" />
       <Asset Guid="5dcd89912e222bf4c87f76db4044bc5e" ResourceName="Localization/Dictionaries" ResourceVariant="ko-kr" />
+      <Asset Guid="623434968a835a84c89a0e15f1f84ce1" ResourceName="metasprite" />
+      <Asset Guid="627009eab3edd744492e8109200b293b" ResourceName="metasprite" />
       <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="66fc62d873a12b24b89957a99e0342e0" ResourceName="metasprite" />
       <Asset Guid="6a4b82edcf27b7e4d9ce8a39136614f1" ResourceName="metasprite" />
+      <Asset Guid="6bffcfbb75e425640a653347b6a80be0" 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="6e2e7e6735e9c49409ba620fa876d34f" ResourceName="metasprite" />
       <Asset Guid="6e3730451fa077346abd4ac642ea71d8" ResourceName="Textures" />
       <Asset Guid="6e5d026bf0652ed4380f6a66f4aa26c5" ResourceName="Textures" />
       <Asset Guid="6e814a81b97303041aae97a746bfcb8d" ResourceName="metasprite" />
@@ -126,11 +162,16 @@
       <Asset Guid="7540c6a9cdf4c604285eba9435c283e2" ResourceName="metasprite" />
       <Asset Guid="766dfb6a2a5c63e4e88c98d7600f908f" ResourceName="metasprite" />
       <Asset Guid="77cbb7c5404c10242ab59953e0746314" ResourceName="Fonts" />
+      <Asset Guid="77e8cda1fdb1be941b6f7299193e0de0" ResourceName="metasprite" />
       <Asset Guid="7972cafe925c18f4fa70ba3cb6d7bd87" ResourceName="metasprite" />
+      <Asset Guid="7a4ee2db77d4fa6419881f60e4e87ec3" ResourceName="metasprite" />
       <Asset Guid="7c0056bd785d6a64c812b7aa268ffae4" ResourceName="DataTables" />
+      <Asset Guid="7c0df739bed9a2644bdff689c3262424" ResourceName="metasprite" />
       <Asset Guid="7c881fecdf3e1e84d8627d86f1c2c59f" ResourceName="metasprite" />
+      <Asset Guid="7d1e37fc3cc8a224196bcd494ae6c1d2" ResourceName="metasprite" />
       <Asset Guid="7d5a3fc1a216a9b4fb961317839fc4ef" ResourceName="metasprite" />
       <Asset Guid="7d5f7699d6d1d48e485ac71126e12061" ResourceName="Entities" />
+      <Asset Guid="7dc4a086e5eb4eb4084b2364405745df" ResourceName="metasprite" />
       <Asset Guid="7df19565e5718fe4582866699a5c12c8" ResourceName="metasprite" />
       <Asset Guid="7e91cd9bad7babf4b975882a4b7453cb" ResourceName="Textures" />
       <Asset Guid="7eae0d2701845a54aa570b07c55dab44" ResourceName="Textures" />
@@ -138,6 +179,7 @@
       <Asset Guid="7fd11dc5d29076d469d414dec2818f11" ResourceName="Configs" />
       <Asset Guid="8072d473631210a4f86ab030c50dec26" ResourceName="DataTables" />
       <Asset Guid="815689cd554e5174eae0ba0c96854e73" ResourceName="metasprite" />
+      <Asset Guid="81bcc4589f3cf7540a02ef4f0ab4c285" ResourceName="DataTables" />
       <Asset Guid="836be25be3e1e8c41ae5545bc8a9a4d7" ResourceName="Textures" />
       <Asset Guid="84efc7f33df3f424a838fdfdc0ed59dc" ResourceName="metasprite" />
       <Asset Guid="85664cef7fcc2554cb3186ab7f08029f" ResourceName="metasprite" />
@@ -145,7 +187,9 @@
       <Asset Guid="8940b037a9b441c4cbd3d2b446838424" ResourceName="Materials" />
       <Asset Guid="8ae6bcd1f9d85514d8c4780cfc0e4e00" ResourceName="metasprite" />
       <Asset Guid="8b1acacd22538f34cb85287a0781ea5e" ResourceName="DataTables" />
+      <Asset Guid="8b4d5b2e6ce757d4a9e21cfd1c207896" ResourceName="metasprite" />
       <Asset Guid="8bf05ec0ea8a0e44a96dba8a58540a8f" ResourceName="metasprite" />
+      <Asset Guid="8d60e45aa43ceac4584eca8a7182a0aa" ResourceName="metasprite" />
       <Asset Guid="8e114ded6a865324588170636872943c" ResourceName="DataTables" />
       <Asset Guid="8e27380ee68aa4a219b4db9018e7da31" ResourceName="Materials" />
       <Asset Guid="8e7d6207828228c41b60713198cd7925" ResourceName="metasprite" />
@@ -153,7 +197,10 @@
       <Asset Guid="927de05646bf1074b996d616785b38f9" ResourceName="metasprite" />
       <Asset Guid="92b193a0508be814a8f0a92215ef6256" ResourceName="metasprite" />
       <Asset Guid="92d1474c33451d64d9b8a9b7f73437a1" ResourceName="metasprite" />
+      <Asset Guid="93df4e8b24f0c554292c672fc0e891f4" ResourceName="metasprite" />
+      <Asset Guid="94cf64719f9937442a4a76ad441f41f8" ResourceName="metasprite" />
       <Asset Guid="955000b4d1441470e8cbf94f483228b5" ResourceName="Materials" />
+      <Asset Guid="9578f46265c4831458dc806bc1b9f936" ResourceName="metasprite" />
       <Asset Guid="9584d5612b468c943aec5c95b587d610" ResourceName="metasprite" />
       <Asset Guid="97b1f8b25cca2bc458cb9d6127c8d186" ResourceName="Materials" />
       <Asset Guid="97d117308cf86924289e81e7e71dd5dd" ResourceName="DataTables" />
@@ -171,83 +218,122 @@
       <Asset Guid="9e0f2ad0203421440965ebc60776959c" ResourceName="metasprite" />
       <Asset Guid="9f847ec5e66e03e4ead1d3c5f7b510e8" ResourceName="UI/UISprites/Common" />
       <Asset Guid="a019ae3af8e864616b85773c509f5285" ResourceName="Sounds" />
+      <Asset Guid="a200bb85daa0ce84b859efc7d424d88a" ResourceName="metasprite" />
       <Asset Guid="a23eef5e20ff8cb46adf33491fc443fb" ResourceName="Materials" />
       <Asset Guid="a33e23ae848110243820cda82120b105" ResourceName="DataTables" />
       <Asset Guid="a35f3f57ce11eb847b35ee4db51446b4" ResourceName="DataTables" />
       <Asset Guid="a59e17d1bb139b74fbbc8a4cd882b5a3" ResourceName="metasprite" />
       <Asset Guid="a67c16135e4b4114f809b8effae9b7d7" ResourceName="metasprite" />
+      <Asset Guid="a67e5d921e1f43e4e8e4dc3c56da4561" 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="a90d539e3b6670c46925e8015fbfeb0e" ResourceName="metasprite" />
       <Asset Guid="a9bede77aa4f31048871613dca683321" ResourceName="metasprite" />
       <Asset Guid="aa5746d1938ae11438a0df1c59a262e4" ResourceName="DataTables" />
+      <Asset Guid="ab3dcc29c7de02a4d830417f594f1a6f" ResourceName="metasprite" />
       <Asset Guid="ab45c3f613f388d43bbf43ec05eb92e2" ResourceName="UI/UISprites/Common" />
       <Asset Guid="ab4774faf71b57a40a29a9e902403fe3" ResourceName="DataTables" />
       <Asset Guid="ac036267acbc85045a4726340ecab702" ResourceName="metasprite" />
+      <Asset Guid="acbe227bb477bc146a956132556abf8c" ResourceName="metasprite" />
       <Asset Guid="ad302467f5ac0aa4abd61a261adf8a00" ResourceName="metasprite" />
       <Asset Guid="ad56aae2bb0f2ce4a86711287e14e223" ResourceName="DataTables" />
+      <Asset Guid="ad8783d4109ca7d448ddd273c4300ce7" ResourceName="metasprite" />
       <Asset Guid="ae6a7f967521769458b0913fa39caaf4" ResourceName="Textures" />
+      <Asset Guid="ae95a682f9053b944a29b394ac14e60c" ResourceName="metasprite" />
       <Asset Guid="b031b4f2980561542a7f7ba41391edc3" ResourceName="Scenes" />
+      <Asset Guid="b0bb94df6dd58f7468c2f5af32c88752" ResourceName="metasprite" />
       <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="b66e82dfae131bd4bb173452f618d883" ResourceName="metasprite" />
+      <Asset Guid="b918b4d8da1aa3141a07072354121571" ResourceName="metasprite" />
+      <Asset Guid="b9c67ea45361f5946a3d39a88f72565c" ResourceName="metasprite" />
       <Asset Guid="ba157ba55f72c424a9e88f3c029997c4" ResourceName="Textures" />
       <Asset Guid="baedbbad82997f445a8cb4da210404e0" ResourceName="Meshes" />
       <Asset Guid="bbfd75fe6fe00e1448fe988173ede7f9" ResourceName="UI/UIForms" />
+      <Asset Guid="bde2c1c1ec04ed1499f93bec07820629" ResourceName="metasprite" />
       <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="c7dc145077698914cad86c697c2335a3" ResourceName="metasprite" />
+      <Asset Guid="ca48b4c55fb530541b51422a4fb497bf" ResourceName="metasprite" />
       <Asset Guid="caa829ab2ffc71340a69253afdf58365" ResourceName="Music/Menu" />
       <Asset Guid="cadd0764941c8b646ae79b51d0ea8285" ResourceName="UI/UISprites/Common" />
+      <Asset Guid="cd449aa7925767d45a70ab090b36fff4" ResourceName="metasprite" />
       <Asset Guid="ce09e29262f84844e92233b99ef8bfdc" ResourceName="metasprite" />
       <Asset Guid="ce44adac21a80e54282b6868f39c17b1" ResourceName="metasprite" />
       <Asset Guid="cfe53cf384344bd47a8680f8c5f97a7b" ResourceName="DataTables" />
+      <Asset Guid="d06e690a6d3fb2f45b2367e1187d4a2f" ResourceName="metasprite" />
+      <Asset Guid="d0a86b2d8dd39c1488e9908bba16e34d" ResourceName="metasprite" />
       <Asset Guid="d0ca39b623336474d8f76d3a147cf0c5" ResourceName="metasprite" />
       <Asset Guid="d1766a3d3abaf474abda7a4de4788ba1" ResourceName="metasprite" />
+      <Asset Guid="d2c88224d0cb48347b46dc3772feb1a4" ResourceName="metasprite" />
       <Asset Guid="d35c503e19658d846996920b0834df36" ResourceName="metasprite" />
+      <Asset Guid="d363b6c1526152f46a20c4b08f64aff3" ResourceName="metasprite" />
       <Asset Guid="d366276d67987794b9d9b5db2a5b7480" ResourceName="metasprite" />
       <Asset Guid="d3ff2f11d97fc494c85edf49ecc0e89f" ResourceName="metasprite" />
+      <Asset Guid="d4587962995e3c0408c3acf619463c4e" 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="d9a234a77917fed469c1546b5d5a539a" ResourceName="metasprite" />
       <Asset Guid="db58965402f12ed47b4dad61a9e48c9d" ResourceName="UI/UISprites/Icons" />
+      <Asset Guid="db80ff7f8bc04b24a88f0155d9c6c054" ResourceName="metasprite" />
+      <Asset Guid="dc11b242a3f695540b3ed9e588bad59a" ResourceName="metasprite" />
+      <Asset Guid="dc3d0d5968fdc174e8ffa10b12a092db" ResourceName="metasprite" />
       <Asset Guid="dd23ec3e02064934885853db19512e89" ResourceName="metasprite" />
+      <Asset Guid="dde0766e81f878d449fa0ae21ef3b921" ResourceName="metasprite" />
+      <Asset Guid="ddffdd4ff4ebc624aabe72955b2694c0" ResourceName="metasprite" />
       <Asset Guid="df68905f01abed1408e38f0cf786013a" ResourceName="metasprite" />
       <Asset Guid="e0792649e7774a24d8e7cceba0231c61" ResourceName="DataTables" />
+      <Asset Guid="e12e67af88c2d22499286196c649199f" ResourceName="metasprite" />
       <Asset Guid="e1e23aef153d1854a8bde7219d9dc7b2" ResourceName="metasprite" />
       <Asset Guid="e5ca26c53b6ab8a46b52817008d7c7fa" ResourceName="UI/UISprites/Icons" />
+      <Asset Guid="e5f06a9bd45eef640832eef1e61880b0" ResourceName="metasprite" />
       <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="f15200ad2b9106342a44334fb2c8f2b0" ResourceName="metasprite" />
+      <Asset Guid="f1a8a6bef7d59a745860179fa9ab7efc" ResourceName="metasprite" />
       <Asset Guid="f245e18169a7de046bb9c72886c049cc" ResourceName="metasprite" />
+      <Asset Guid="f250f5e2fa13ff84cafef0a41477cd88" 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="f45cf8f218c2a774eb4fe90c5a4e619a" ResourceName="metasprite" />
       <Asset Guid="f5d67fb6774eac24697cf4b0a8e682ee" ResourceName="metasprite" />
+      <Asset Guid="f67c5d2f3a4774144890aa8da86263b8" ResourceName="metasprite" />
       <Asset Guid="f6db5bbdfe0e9894798706814cd6b336" ResourceName="Textures" />
+      <Asset Guid="f7e14a802aa853f48bb63f55f8fc461d" ResourceName="metasprite" />
+      <Asset Guid="f8badb2739a289d46b2727b9c79af284" ResourceName="metasprite" />
+      <Asset Guid="f9b715b001b87bb4db896a0c65f01808" ResourceName="metasprite" />
       <Asset Guid="fa0fbba01e873b449951b7f7fc1139e5" ResourceName="metasprite" />
       <Asset Guid="fc7851c2f8f91dc44abe7c9dc76a5112" ResourceName="DataTables" />
+      <Asset Guid="fc9e47ac0b9c7f3458fc3703dfbc186a" ResourceName="metasprite" />
       <Asset Guid="fcc02251a7034214ba510a8bc6b4a030" ResourceName="metasprite" />
       <Asset Guid="fd3cbf51780694849b9b019b36a3938e" ResourceName="Textures" />
       <Asset Guid="fd6ba078b127dda4f8e71588e165a6c3" ResourceName="metasprite" />
       <Asset Guid="fdb5edd099d06b045af609ba3172400a" ResourceName="DataTables" />
+      <Asset Guid="fdbcaade321385543a350063cc44e662" ResourceName="metasprite" />
       <Asset Guid="fde5b205d6058344d9ef82ec8fc96d3e" ResourceName="metasprite" />
+      <Asset Guid="ff092632153f64d42b56364ff04379b9" ResourceName="metasprite" />
+      <Asset Guid="ff8c67c3d32d2864a99413b3874dfd86" ResourceName="metasprite" />
       <Asset Guid="ffeea1dc73c704149ae66dcd34512657" ResourceName="metasprite" />
     </Assets>
   </ResourceCollection>

BIN
Assets/GameMain/Model/6.FBX


+ 100 - 0
Assets/GameMain/Model/6.FBX.meta

@@ -0,0 +1,100 @@
+fileFormatVersion: 2
+guid: 28dd1eddc92ddef46ac3d3dda4fe7491
+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: 3
+    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: 1
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 3
+  humanoidOversampling: 1
+  avatarSetup: 1
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/GameMain/Model/7.FBX


+ 100 - 0
Assets/GameMain/Model/7.FBX.meta

@@ -0,0 +1,100 @@
+fileFormatVersion: 2
+guid: d78685f299284ba47a5ee546bf758d6e
+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
+ 200 - 1647
Assets/GameMain/Scenes/CustomRole.unity


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

@@ -9,6 +9,8 @@ namespace MetaClient
         public Dictionary<int, PartData> bodyList;
         public Dictionary<int, PartData> faceList;
         public Dictionary<string, Vector3> orginLocalScaleList;
+        public Dictionary<string, Vector3> orginChangeScaleList;
+        public Dictionary<string, Vector3> ChangedScaleParamsList;
         public Dictionary<string, Vector3> orginLocalPositionList;
         public Dictionary<string, Quaternion> orginLocalRotationList;
         public Dictionary<string, float> orginBlendList;
@@ -23,6 +25,8 @@ namespace MetaClient
             bodyList = new Dictionary<int, PartData>();
             faceList = new Dictionary<int, PartData>();
             orginLocalScaleList = new Dictionary<string, Vector3>();
+            orginChangeScaleList = new Dictionary<string, Vector3>();
+            ChangedScaleParamsList = new Dictionary<string, Vector3>();
             orginLocalPositionList = new Dictionary<string, Vector3>();
             orginLocalRotationList = new Dictionary<string, Quaternion>();
             orginBlendList = new Dictionary<string, float>();

+ 45 - 10
Assets/GameMain/Scripts/Game/CustomRole/CustomManager.cs

@@ -32,7 +32,7 @@ namespace MetaClient
         /// </summary>
         public void CreateCustomBodyData()
         {
-            testPlayer = GameObject.Find("5").GetComponent<CustomRoleController>();
+            testPlayer = GameObject.Find("6").GetComponent<CustomRoleController>();
 
             bodyData = new RoleCustomData();
             //初始化
@@ -85,6 +85,8 @@ namespace MetaClient
                 var key = item.Key;
                 var value = item.Value;
                 bodyData.orginLocalScaleList.Add(key, value.localScale);
+                bodyData.orginChangeScaleList.Add(key, new Vector3(1,1,1));
+                bodyData.ChangedScaleParamsList.Add(key, new Vector3(1,1,1));
             }
 
         }
@@ -166,21 +168,45 @@ namespace MetaClient
             {
                 for (int i = 0; i < partData.bones.Length; i++)
                 {
+                    //var orginBoneScale = bodyData.orginWorldScaleList[partData.bones[i]];
                     var orginBoneScale = bodyData.orginLocalScaleList[partData.bones[i]];
+                    var changeScale = bodyData.orginChangeScaleList[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 scale = nowBone.lossyScale;
+                    var scale = nowBone.localScale;
+                    var nowScale = new Vector3(scale.x / orginBoneScale.x, scale.y / orginBoneScale.y, scale.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
+                        partData.scaleChange.x == 1 ? partData.floatValue * orginBoneScale.x * changeScale.x : scale.x,
+                        partData.scaleChange.y == 1 ? partData.floatValue * orginBoneScale.y * changeScale.y : scale.y,
+                        partData.scaleChange.z == 1 ? partData.floatValue * orginBoneScale.z * changeScale.z : scale.z
                         );
 
-                    Debug.Log("newBoneScale : " + newBoneScale);
+                    
                     bodyData.changedScaleList[partData.bones[i]] = newBoneScale;
+                    bodyData.ChangedScaleParamsList[partData.bones[i]] = new Vector3(newBoneScale.x/orginBoneScale.x/changeScale.x, newBoneScale.y / orginBoneScale.y / changeScale.y, newBoneScale.z / orginBoneScale.z / changeScale.z);
+                    Debug.Log(partData.bones[i] + " : " + bodyData.ChangedScaleParamsList[partData.bones[i]]);
+                    //子物体
+                    var count = nowBone.childCount;
+                    for (int j = 0; j < count; j++)
+                    {
+                        var childname = nowBone.GetChild(j).name;
+                        if(bones.ContainsKey(childname))
+                        {
+                            var orginChildBoneScale = bodyData.orginLocalScaleList[childname];
+                            var beforeChildScaleParams = bodyData.ChangedScaleParamsList[childname];
+                            bodyData.orginChangeScaleList[childname] = new Vector3(orginBoneScale.x/newBoneScale.x, orginBoneScale.y / newBoneScale.y, orginBoneScale.z / newBoneScale.z);
+                            bodyData.changedScaleList[childname] = new Vector3(
+                                beforeChildScaleParams.x * bodyData.orginChangeScaleList[childname].x * orginChildBoneScale.x,
+                                beforeChildScaleParams.y * bodyData.orginChangeScaleList[childname].y * orginChildBoneScale.y,
+                                beforeChildScaleParams.z * bodyData.orginChangeScaleList[childname].z * orginChildBoneScale.z
+                                );
+                            Debug.Log(childname + " : " + bodyData.ChangedScaleParamsList[childname]);
+                        }
+                    }
                 }
             }
 
@@ -245,12 +271,15 @@ namespace MetaClient
             {
                 var key = item.Key;
                 var value = item.Value;
-                //testPlayer.SetBoneScale(key, value);
-                testPlayer.SetBoneWorldScale(key, value);
-                if(bodyData.changedScaleList.ContainsKey(key))
+                testPlayer.SetBoneScale(key, value);
+                //testPlayer.SetBoneWorldScale(key, value);
+                if (bodyData.changedScaleList.ContainsKey(key))
                 {
                     bodyData.changedScaleList[key] = bodyData.orginLocalScaleList[key];
                 }
+
+                bodyData.orginChangeScaleList[key] = new Vector3(1, 1, 1);
+                bodyData.ChangedScaleParamsList[key] = new Vector3(1, 1, 1);
             }
 
             //重置旋转
@@ -313,6 +342,7 @@ namespace MetaClient
                 var key = item.Key;
                 var value = item.Value;
 
+                //testPlayer.SetBoneWorldScale(key, value, bodyData.orginLocalScaleList[key], bodyData.orginWorldScaleList[key]);
                 testPlayer.SetBoneScale(key, value);
             }
         }
@@ -321,7 +351,12 @@ namespace MetaClient
         /// </summary>
         public void RotateModel(float offset)
         {
-
+            if (testPlayer == null)
+            {
+                Debug.LogError("没有模型存在");
+                return;
+            }
+            testPlayer.RotateSelf(offset);
         }
     }
 }

+ 22 - 8
Assets/GameMain/Scripts/Game/CustomRole/CustomRoleController.cs

@@ -152,24 +152,38 @@ public class CustomRoleController : MonoBehaviour
         }
     }
 
-    public void SetBoneScale(string name, Vector3 value)
+    public void SetBoneWorldScale(string name, Vector3 scale,Vector3 orginLocalScale,Vector3 orginWorldScale)
     {
         var bone = CustomRoleUtility.GetChild(transform, name);
         if (bone)
         {
-            bone.transform.localScale = value;
+            var value = scale.x;
+            var trans = bone.transform;
+            var beforeScale = trans.localScale;
+            var world_l = orginWorldScale;
+            trans.SetLocalScaleX(orginLocalScale.x * scale.x / world_l.x);
+            trans.SetLocalScaleY(orginLocalScale.y * scale.y / world_l.y);
+            trans.SetLocalScaleZ(orginLocalScale.z * scale.z / world_l.z);
+            return;
+            var lcount = trans.childCount;
+            for (int j = 0; j < lcount; j++)
+            {
+                var childTrans = trans.GetChild(j);
+                var oldScale = childTrans.localScale;
+                childTrans.SetLocalScaleX(oldScale.x * beforeScale.x / scale.x);
+                childTrans.SetLocalScaleY(oldScale.y * beforeScale.y / scale.y);
+                childTrans.SetLocalScaleZ(oldScale.z * beforeScale.z / scale.z);
+            }
         }
     }
 
-    public void SetBoneWorldScale(string name, Vector3 value)
+    public void SetBoneScale(string name, Vector3 scale)
     {
         var bone = CustomRoleUtility.GetChild(transform, name);
-        if(bone == null)
+        if (bone)
         {
-            Debug.Log("不存在此骨骼 : " + name);
-            return;
+            bone.transform.localScale = scale;
         }
-        bone.DOScale(value, 0);
     }
 
     public void SetBlendShape(string name,float value)
@@ -221,6 +235,6 @@ public class CustomRoleController : MonoBehaviour
 
     public void RotateSelf(float offset)
     {
-
+        transform.Rotate(0, -offset/10, 0);
     }
 }

+ 1 - 0
Assets/GameMain/Scripts/UI/UICustomDrag.cs

@@ -16,6 +16,7 @@ namespace MetaClient
         {
             //CustomManager.Instance
             Debug.Log(eventData.delta.x + "");
+            CustomManager.Instance.RotateModel(eventData.delta.x);
         }
         public void OnBeginDrag(PointerEventData eventData)
         {

+ 32 - 8
Assets/GameMain/UI/UISprites/CustomRole/neijiaokuandu.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -34,13 +34,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
-    wrapV: 0
+    wrapU: 1
+    wrapV: 1
     wrapW: 0
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -49,9 +49,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   maxTextureSizeSet: 0
@@ -71,13 +71,37 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

+ 32 - 8
Assets/GameMain/UI/UISprites/CustomRole/neishangyanxian.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -34,13 +34,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
-    wrapV: 0
+    wrapU: 1
+    wrapV: 1
     wrapW: 0
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -49,9 +49,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   maxTextureSizeSet: 0
@@ -71,13 +71,37 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

+ 32 - 8
Assets/GameMain/UI/UISprites/CustomRole/neixiayanxian.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -34,13 +34,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
-    wrapV: 0
+    wrapU: 1
+    wrapV: 1
     wrapW: 0
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -49,9 +49,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   maxTextureSizeSet: 0
@@ -71,13 +71,37 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

+ 32 - 8
Assets/GameMain/UI/UISprites/CustomRole/shuangyanjiaodu.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -34,13 +34,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
-    wrapV: 0
+    wrapU: 1
+    wrapV: 1
     wrapW: 0
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -49,9 +49,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   maxTextureSizeSet: 0
@@ -71,13 +71,37 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

+ 32 - 8
Assets/GameMain/UI/UISprites/CustomRole/shuangyankaihe.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -34,13 +34,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
-    wrapV: 0
+    wrapU: 1
+    wrapV: 1
     wrapW: 0
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -49,9 +49,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   maxTextureSizeSet: 0
@@ -71,13 +71,37 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

+ 32 - 8
Assets/GameMain/UI/UISprites/CustomRole/shuangyanqianhou.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -34,13 +34,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
-    wrapV: 0
+    wrapU: 1
+    wrapV: 1
     wrapW: 0
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -49,9 +49,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   maxTextureSizeSet: 0
@@ -71,13 +71,37 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

+ 32 - 8
Assets/GameMain/UI/UISprites/CustomRole/shuangyanshangxia.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -34,13 +34,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
-    wrapV: 0
+    wrapU: 1
+    wrapV: 1
     wrapW: 0
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -49,9 +49,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   maxTextureSizeSet: 0
@@ -71,13 +71,37 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

+ 32 - 8
Assets/GameMain/UI/UISprites/CustomRole/waijiaogaodu.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -34,13 +34,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
-    wrapV: 0
+    wrapU: 1
+    wrapV: 1
     wrapW: 0
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -49,9 +49,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   maxTextureSizeSet: 0
@@ -71,13 +71,37 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

+ 32 - 8
Assets/GameMain/UI/UISprites/CustomRole/waishangyanxian.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -34,13 +34,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
-    wrapV: 0
+    wrapU: 1
+    wrapV: 1
     wrapW: 0
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -49,9 +49,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   maxTextureSizeSet: 0
@@ -71,13 +71,37 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

+ 32 - 8
Assets/GameMain/UI/UISprites/CustomRole/xiongbu_.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -34,13 +34,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
-    wrapV: 0
+    wrapU: 1
+    wrapV: 1
     wrapW: 0
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -49,9 +49,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   maxTextureSizeSet: 0
@@ -71,13 +71,37 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

+ 32 - 8
Assets/GameMain/UI/UISprites/CustomRole/yanjinggaodu.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -34,13 +34,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
-    wrapV: 0
+    wrapU: 1
+    wrapV: 1
     wrapW: 0
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -49,9 +49,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   maxTextureSizeSet: 0
@@ -71,13 +71,37 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

+ 32 - 8
Assets/GameMain/UI/UISprites/CustomRole/yanjingkuandu.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -34,13 +34,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
-    wrapV: 0
+    wrapU: 1
+    wrapV: 1
     wrapW: 0
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -49,9 +49,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   maxTextureSizeSet: 0
@@ -71,13 +71,37 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

+ 32 - 8
Assets/GameMain/UI/UISprites/CustomRole/zhongshangyanxian.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -34,13 +34,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
-    wrapV: 0
+    wrapU: 1
+    wrapV: 1
     wrapW: 0
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -49,9 +49,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   maxTextureSizeSet: 0
@@ -71,13 +71,37 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

+ 32 - 8
Assets/GameMain/UI/UISprites/CustomRole/zhongxiayanxian.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -34,13 +34,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
-    wrapV: 0
+    wrapU: 1
+    wrapV: 1
     wrapW: 0
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -49,9 +49,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   maxTextureSizeSet: 0
@@ -71,13 +71,37 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

+ 4 - 0
Assets/Launcher.unity

@@ -342,6 +342,10 @@ PrefabInstance:
       value: 
       objectReference: {fileID: 11400000, guid: a4c1cc1e6676f0e48a527bad48941f98,
         type: 2}
+    - target: {fileID: 11402440, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3}
+      propertyPath: m_ActiveWindow
+      value: 3
+      objectReference: {fileID: 0}
     - target: {fileID: 11405216, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3}
       propertyPath: m_EntranceProcedureTypeName
       value: MetaClient.ProcedureLaunch

BIN
Assets/StreamingAssets/GameData.dat


BIN
Assets/StreamingAssets/GameFrameworkVersion.dat


BIN
Assets/StreamingAssets/Resources.dat


BIN
Assets/StreamingAssets/UI.dat


BIN
Assets/StreamingAssets/metasprite.dat