321

Assets/GameMain/Configs/ResourceBuilder.xml

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

Assets/GameMain/Configs/ResourceCollection.xml

@@ -47,6 +47,7 @@
       <Asset Guid="1053b0070685be347ab58587156842dc" ResourceName="Localization/Dictionaries" ResourceVariant="zh-tw" />
       <Asset Guid="1108590e681998042b48076d7d60ef61" ResourceName="metasprite" />
       <Asset Guid="11cb5c81f9e062e4285602f571b2fca8" ResourceName="metasprite" />
+      <Asset Guid="1230c64ed51074347befd28b8b24b9f5" ResourceName="metasprite" />
       <Asset Guid="12bad035587d7444ea7e97aa31ce4ed7" ResourceName="metasprite" />
       <Asset Guid="139e20a7f9e514a4380b9aa0f32cc3c7" ResourceName="metasprite" />
       <Asset Guid="1478894bc9a1ed241b05b0862a7b8bce" ResourceName="Textures" />
@@ -84,6 +85,7 @@
       <Asset Guid="2ea44652e7c12314f951d145ba02a9f6" ResourceName="metasprite" />
       <Asset Guid="315e8ed2db27c254cb3366ff0793cd90" ResourceName="DataTables" />
       <Asset Guid="32d40a67819372143b3255a4beb64322" ResourceName="metasprite" />
+      <Asset Guid="339e6fc834007ef4596bcdf5b0662933" ResourceName="metasprite" />
       <Asset Guid="34c646641e6c04f4e81b67eaaf038144" ResourceName="metasprite" />
       <Asset Guid="34ed913c29df1ab478d16cd8388d90e7" ResourceName="metasprite" />
       <Asset Guid="352da872791696c48af3b21132e3e3c3" ResourceName="DataTables" />
@@ -118,6 +120,7 @@
       <Asset Guid="4f688097e85071841a2c3ba165000c20" ResourceName="Textures" />
       <Asset Guid="50d40338fd713584fa6e9dd03346310b" ResourceName="metasprite" />
       <Asset Guid="5282f20eba4d44213820e21af8481932" ResourceName="Meshes" />
+      <Asset Guid="53c7dbcef37747a49ac26b51926c7461" ResourceName="metasprite" />
       <Asset Guid="55b2ba8da378ea740bd05c1aa512135b" ResourceName="metasprite" />
       <Asset Guid="56b8df63bbad60749a69e38bc687fadf" ResourceName="UI/UISprites/Common" />
       <Asset Guid="578af1667322bab45b652b79a40bb4fb" ResourceName="Materials" />
@@ -133,6 +136,8 @@
       <Asset Guid="64f3bb52c6a54854688fcc656af2b1c9" ResourceName="DataTables" />
       <Asset Guid="66de9fe7ca5a92846a2768b2f690e306" ResourceName="metasprite" />
       <Asset Guid="66fc62d873a12b24b89957a99e0342e0" ResourceName="metasprite" />
+      <Asset Guid="67724e16dbcf80f419f9aa3b5bee9029" ResourceName="metasprite" />
+      <Asset Guid="67ed9b226a775d444ad606695e5c8d1a" ResourceName="metasprite" />
       <Asset Guid="6a4b82edcf27b7e4d9ce8a39136614f1" ResourceName="metasprite" />
       <Asset Guid="6bffcfbb75e425640a653347b6a80be0" ResourceName="metasprite" />
       <Asset Guid="6cbc2c323b77f804fb958fa4eca33998" ResourceName="UI/UISprites/Common" />
@@ -187,6 +192,7 @@
       <Asset Guid="9584d5612b468c943aec5c95b587d610" ResourceName="metasprite" />
       <Asset Guid="97b1f8b25cca2bc458cb9d6127c8d186" ResourceName="Materials" />
       <Asset Guid="97d117308cf86924289e81e7e71dd5dd" ResourceName="DataTables" />
+      <Asset Guid="99764b52ff34d5c4d83b6980de35375c" ResourceName="metasprite" />
       <Asset Guid="997724f804a6a644c81f2308b20a6e39" ResourceName="metasprite" />
       <Asset Guid="9a28a6eab8a2ea8489ad65e501a9c7e0" ResourceName="metasprite" />
       <Asset Guid="9a8546966a8458f4c8ed551928caf6e1" ResourceName="metasprite" />
@@ -219,12 +225,14 @@
       <Asset Guid="ab45c3f613f388d43bbf43ec05eb92e2" ResourceName="UI/UISprites/Common" />
       <Asset Guid="ab4774faf71b57a40a29a9e902403fe3" ResourceName="DataTables" />
       <Asset Guid="ac036267acbc85045a4726340ecab702" ResourceName="metasprite" />
+      <Asset Guid="acb7cc16fbedcd747a805e27a1f1d6ef" 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="b0980eb20d9f2dd42853914470233efe" ResourceName="metasprite" />
       <Asset Guid="b0c7cf51d3fecb446ab93bf854419715" ResourceName="Materials" />
       <Asset Guid="b0ca33e6a02931a4e8e660d8a861a2b3" ResourceName="DataTables" />
       <Asset Guid="b2cebe04343227945bab3729ca9a3493" ResourceName="DataTables" />
@@ -262,8 +270,10 @@
       <Asset Guid="d630a02e140f122448f2e836772a52d6" ResourceName="metasprite" />
       <Asset Guid="d6a812a8972a0464399e662826d7d157" ResourceName="metasprite" />
       <Asset Guid="d7bcee19e92fee744aa0ea57a3f7b053" ResourceName="metasprite" />
+      <Asset Guid="d7dc05f438c660048b9aab62cf4e5126" ResourceName="UI/UIForms" />
       <Asset Guid="d9808401c68af274a8edfbed3d1b53c7" ResourceName="Meshes" />
       <Asset Guid="d9a234a77917fed469c1546b5d5a539a" ResourceName="metasprite" />
+      <Asset Guid="da4ca077811a277459824c0c81e0dbcb" ResourceName="UI/UIForms" />
       <Asset Guid="db58965402f12ed47b4dad61a9e48c9d" ResourceName="UI/UISprites/Icons" />
       <Asset Guid="db80ff7f8bc04b24a88f0155d9c6c054" ResourceName="metasprite" />
       <Asset Guid="dd23ec3e02064934885853db19512e89" ResourceName="metasprite" />
@@ -278,6 +288,7 @@
       <Asset Guid="e85864330b68dde498dcb6e8711815d3" ResourceName="UI/UISprites/Common" />
       <Asset Guid="e9ddf84dfc6fe1648acf52615a2f4c3b" ResourceName="metasprite" />
       <Asset Guid="eabb37cb6d738b443b398b701a64cd88" ResourceName="Textures" />
+      <Asset Guid="ee25b48a0e3d9d94c81acf3df6cb8a37" ResourceName="metasprite" />
       <Asset Guid="ef60c7d234dc31943bf804b986ecc865" ResourceName="metasprite" />
       <Asset Guid="f15200ad2b9106342a44334fb2c8f2b0" ResourceName="metasprite" />
       <Asset Guid="f245e18169a7de046bb9c72886c049cc" ResourceName="metasprite" />

Assets/GameMain/Scenes/CustomRole.unity

@@ -272,6 +272,81 @@ PrefabInstance:
       propertyPath: m_Materials.Array.data[0]
       value: 
       objectReference: {fileID: 2100000, guid: d2e36b9d239dfb840a0593a3f224c708, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 2fd13e1bcc307cf409ba3aeaab94e9cb,
+        type: 3}
+      propertyPath: m_Materials.Array.data[1]
+      value: 
+      objectReference: {fileID: 2100000, guid: 17a9680819fb25d4a836eb9220967fbb, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 2fd13e1bcc307cf409ba3aeaab94e9cb,
+        type: 3}
+      propertyPath: m_Materials.Array.data[2]
+      value: 
+      objectReference: {fileID: 2100000, guid: c83f248a8149afe4dafc518dd2776df0, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 2fd13e1bcc307cf409ba3aeaab94e9cb,
+        type: 3}
+      propertyPath: m_Materials.Array.data[3]
+      value: 
+      objectReference: {fileID: 2100000, guid: 68d1e91f5b890444890411921dc63987, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 2fd13e1bcc307cf409ba3aeaab94e9cb,
+        type: 3}
+      propertyPath: m_Materials.Array.data[4]
+      value: 
+      objectReference: {fileID: 2100000, guid: 88495cdff5d7e72468c1c676aed56ba5, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 2fd13e1bcc307cf409ba3aeaab94e9cb,
+        type: 3}
+      propertyPath: m_Materials.Array.data[5]
+      value: 
+      objectReference: {fileID: 2100000, guid: 20fb3687548f78343b8768ff9c0c1207, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 2fd13e1bcc307cf409ba3aeaab94e9cb,
+        type: 3}
+      propertyPath: m_Materials.Array.data[6]
+      value: 
+      objectReference: {fileID: 2100000, guid: 86deb58dfd47e96469e186d683154906, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 2fd13e1bcc307cf409ba3aeaab94e9cb,
+        type: 3}
+      propertyPath: m_Materials.Array.data[7]
+      value: 
+      objectReference: {fileID: 2100000, guid: 46a115b0c59daff42867a3cba4c5f0c8, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 2fd13e1bcc307cf409ba3aeaab94e9cb,
+        type: 3}
+      propertyPath: m_Materials.Array.data[8]
+      value: 
+      objectReference: {fileID: 2100000, guid: 02f5de8525ae2ea45ba5bdd2a99c17d6, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 2fd13e1bcc307cf409ba3aeaab94e9cb,
+        type: 3}
+      propertyPath: m_Materials.Array.data[9]
+      value: 
+      objectReference: {fileID: 2100000, guid: 53573ca77c75872429c0fa38bd9d48c0, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 2fd13e1bcc307cf409ba3aeaab94e9cb,
+        type: 3}
+      propertyPath: m_Materials.Array.data[10]
+      value: 
+      objectReference: {fileID: 2100000, guid: 5a84b1265899ded4293d3f1cb6cd6ee0, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 2fd13e1bcc307cf409ba3aeaab94e9cb,
+        type: 3}
+      propertyPath: m_Materials.Array.data[11]
+      value: 
+      objectReference: {fileID: 2100000, guid: 986d93bb3851fa248807519459183e3f, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 2fd13e1bcc307cf409ba3aeaab94e9cb,
+        type: 3}
+      propertyPath: m_Materials.Array.data[12]
+      value: 
+      objectReference: {fileID: 2100000, guid: 8a26ea452d4034b40aba9066c9c0c8dc, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 2fd13e1bcc307cf409ba3aeaab94e9cb,
+        type: 3}
+      propertyPath: m_Materials.Array.data[13]
+      value: 
+      objectReference: {fileID: 2100000, guid: f7b64b0071691b14582e15a84482eb73, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 2fd13e1bcc307cf409ba3aeaab94e9cb,
+        type: 3}
+      propertyPath: m_Materials.Array.data[14]
+      value: 
+      objectReference: {fileID: 2100000, guid: 72515c70a0eb24943948efd71db7c949, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 2fd13e1bcc307cf409ba3aeaab94e9cb,
+        type: 3}
+      propertyPath: m_Materials.Array.data[15]
+      value: 
+      objectReference: {fileID: 2100000, guid: bc8be32b47a94d547a3a88f0ffac5ac2, type: 2}
     - target: {fileID: 919132149155446097, guid: 2fd13e1bcc307cf409ba3aeaab94e9cb,
         type: 3}
       propertyPath: m_Name

Assets/GameMain/Scripts/Entity/EntityData/RoleCustomBoneData.cs

@@ -12,7 +12,7 @@ namespace MetaClient
         public Dictionary<string, Vector3> orginChangeScaleList;
         public Dictionary<string, Vector3> ChangedScaleParamsList;
         public Dictionary<string, Vector3> orginLocalPositionList;
-        public Dictionary<string, Quaternion> orginLocalRotationList;
+        public Dictionary<string, Vector3> orginLocalRotationList;
         public Dictionary<string, float> orginBlendList;
 
         public Dictionary<int, float> changedValueList;
@@ -28,7 +28,7 @@ namespace MetaClient
             orginChangeScaleList = new Dictionary<string, Vector3>();
             ChangedScaleParamsList = new Dictionary<string, Vector3>();
             orginLocalPositionList = new Dictionary<string, Vector3>();
-            orginLocalRotationList = new Dictionary<string, Quaternion>();
+            orginLocalRotationList = new Dictionary<string, Vector3>();
             orginBlendList = new Dictionary<string, float>();
 
             changedValueList = new Dictionary<int, float>();

Assets/GameMain/Scripts/Game/CustomRole/CustomManager.cs

@@ -62,7 +62,7 @@ namespace MetaClient
             {
                 var partData = new PartData(
                     dtCF[i].Id,
-                    dtCF[i].BoneName.Split(','),
+                    dtCF[i].BoneName==""?null:dtCF[i].BoneName.Split(','),
                     dtCF[i].ScaleRangeMin,
                     dtCF[i].ScaleRangeMax,
                     dtCF[i].ScaleChange,
@@ -97,6 +97,27 @@ namespace MetaClient
                     }
                 }
             }
+            foreach (var item in bodyData.faceList)
+            {
+                var key = item.Key;
+                var value = item.Value;
+                if (!value.useBlend)
+                {
+                    for (int i = 0; i < value.bones.Length; i++)
+                    {
+                        var transform = CustomRoleUtility.GetChild(testPlayer.transform, value.bones[i]);
+                        if (!transform)
+                        {
+                            continue;
+                        }
+                        if (!bones.ContainsKey(value.bones[i]))
+                        {
+                            bones.Add(value.bones[i], transform);
+                        }
+                    }
+                }
+            }
+
             Debug.Log( "一共有"+ bones.Count + "部位的骨骼自定义修改");
 
             //获取自定义骨骼的初始数据
@@ -107,6 +128,9 @@ namespace MetaClient
                 bodyData.orginLocalScaleList.Add(key, value.localScale);
                 bodyData.orginChangeScaleList.Add(key, new Vector3(1,1,1));
                 bodyData.ChangedScaleParamsList.Add(key, new Vector3(1,1,1));
+
+                bodyData.orginLocalPositionList.Add(key, value.localPosition);
+                bodyData.orginLocalRotationList.Add(key, value.localEulerAngles);
             }
 
         }
@@ -121,9 +145,25 @@ namespace MetaClient
             CustomRoleBodyEventArgs crf = (CustomRoleBodyEventArgs)e;
             if (crf != null)
             {
-                
+                PartData partData = null;
+                switch (crf.Type)
+                {
+                    case ECustomStyple.None:
+                        break;
+                    case ECustomStyple.NieLian:
+                        partData = bodyData.faceList[crf.Part];
+                        break;
+                    case ECustomStyple.Body:
+                        partData = bodyData.bodyList[crf.Part];
+                        break;
+                    case ECustomStyple.Cloth:
+                        break;
+                    case ECustomStyple.Ornament:
+                        break;
+                    default:
+                        break;
+                }
                 //更新数据
-                var partData = bodyData.bodyList[crf.Part];
                 if(partData == null)
                 {
                     Debug.LogError("ID :" + crf.Part + "   无数据");
@@ -137,7 +177,6 @@ namespace MetaClient
                 {
                     ChangeBone(partData, crf.ChangeValue);
                 }
-                
             }
         }
         /// <summary>
@@ -148,6 +187,7 @@ namespace MetaClient
         private void ChangeBlendShape(PartData partData, Vector3 changeValue)
         {
             partData.floatValue = changeValue.x;
+            Debug.Log(partData.id + " : "+ partData.floatValue);
             if(partData.oneBlend)
             {
                 RefreshRoleBlendShape(partData.biggerBlendName, partData.floatValue);
@@ -235,6 +275,21 @@ namespace MetaClient
                 }
             }
 
+            //修改位置
+            if (partData.positionChange != Vector3.zero)
+            {
+                for (int i = 0; i < partData.bones.Length; i++)
+                {
+
+                }
+            }
+
+            //修改旋转
+            if (partData.rotationChange != Vector3.zero)
+            {
+
+            }
+
             RefreshRoleBone();
         }
 
@@ -264,7 +319,8 @@ namespace MetaClient
                 return 0;
             }
 
-            if(partData.useBlend)
+            Debug.Log(partData.id + " :" + partData.useBlend + " : " + partData.floatValue);
+            if (partData.useBlend)
             {
                 return partData.floatValue;
             }

Assets/GameMain/Scripts/Game/CustomRole/CustomRoleController.cs

@@ -143,12 +143,12 @@ public class CustomRoleController : MonoBehaviour
         }
     }
 
-    public void SetBoneRot(string name, Quaternion value)
+    public void SetBoneRot(string name, Vector3 value)
     {
         var bone = CustomRoleUtility.GetChild(transform, name);
         if (bone)
         {
-            bone.transform.localRotation = value;
+            bone.localEulerAngles = value;
         }
     }
 

Assets/GameMain/Scripts/UI/UICustom.cs

@@ -521,6 +521,7 @@ namespace MetaClient
 
             //scrollbar.value = _value;
             part = _part;
+            Debug.Log(eCustomStyple.ToString());
             scrollbar.value = CustomManager.Instance.GetBodyBoneValue(eCustomStyple,part);
         }
         /// <summary>
@@ -570,6 +571,7 @@ namespace MetaClient
                     //    ZiDingYiNeiLian(eCustomStyple, id, _nieLianXX.transform.GetChild(0).gameObject);
                     //    return;
                     //}
+                    eCustomStyple = ECustomStyple.Cloth;
                     CreateNieLianImg(id, zidingyi,isColor);
                     break;
                 case ECustomStyple.Body:
@@ -583,6 +585,7 @@ namespace MetaClient
                     //    ZiDingYiBody(eCustomStyple, id, _bodyListXX.transform.GetChild(0).gameObject);
                     //    return;
                     //}
+    
                     CreateBodyImg(id, zidingyi,isColor);
                     break;
                 case ECustomStyple.Cloth:
@@ -716,7 +719,7 @@ namespace MetaClient
                 Debug.Log(dRCustomBodies[i].Id);
                 if (dRCustomBodies[i].ParentStyple == parentid&&dRCustomBodies[i].Cengji==cengji)
                 {
-                    CreateButtonFun(dRCustomBodies[i].Icon, dRCustomBodies[i].Name, _objPar, dRCustomBodies[i].Id, dRCustomBodies[i].ButtonStyple, ECustomStyple.Body, dRCustomBodies[i].IsActive);
+                    CreateButtonFun(dRCustomBodies[i].Icon, dRCustomBodies[i].Name, _objPar, dRCustomBodies[i].Id, dRCustomBodies[i].ButtonStyple, ECustomStyple.NieLian, dRCustomBodies[i].IsActive);
                 }
             }
           
@@ -762,7 +765,7 @@ namespace MetaClient
                 Debug.Log(dRCustomBodies[i].Id);
                 if (dRCustomBodies[i].ParentStyple == parentid && dRCustomBodies[i].Cengji == cengji)
                 {
-                    CreateButtonFun(dRCustomBodies[i].Icon, dRCustomBodies[i].Name, _objPar, dRCustomBodies[i].Id, dRCustomBodies[i].ButtonStyple, ECustomStyple.Body, dRCustomBodies[i].IsActive);
+                    CreateButtonFun(dRCustomBodies[i].Icon, dRCustomBodies[i].Name, _objPar, dRCustomBodies[i].Id, dRCustomBodies[i].ButtonStyple, ECustomStyple.Cloth, dRCustomBodies[i].IsActive);
                 }
             }
             ChangeListBotton(_objPar);
@@ -807,7 +810,7 @@ namespace MetaClient
                 Debug.Log(dRCustomBodies[i].Id);
                 if (dRCustomBodies[i].ParentStyple == parentid && dRCustomBodies[i].Cengji == cengji)
                 {
-                    CreateButtonFun(dRCustomBodies[i].Icon, dRCustomBodies[i].Name, _objPar, dRCustomBodies[i].Id, dRCustomBodies[i].ButtonStyple, ECustomStyple.Body, dRCustomBodies[i].IsActive);
+                    CreateButtonFun(dRCustomBodies[i].Icon, dRCustomBodies[i].Name, _objPar, dRCustomBodies[i].Id, dRCustomBodies[i].ButtonStyple, ECustomStyple.Ornament, dRCustomBodies[i].IsActive);
                 }
             }
             ChangeListBotton(_objPar);

Assets/GameMain/Scripts/UI/UICustomNor.cs

@@ -46,7 +46,7 @@ namespace MetaClient
                     uICustom.isTween = false;
                     uICustom.HistoryAdd(eCustomStyple+"");
                     uICustom.ChangeECustomStyple(eCustomStyple);
-                    Debug.Log("222");
+                    Debug.Log("222" + eCustomStyple);
                 });
             });
             Debug.Log("333");

Assets/GameMain/Scripts/UIBaseComponent.meta

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

Assets/GameMain/Scripts/UIColorMix.meta

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

Assets/GameMain/UI/UIForms/GameMenuForm.prefab

@@ -1223,7 +1223,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1622769529439997512
 RectTransform:
   m_ObjectHideFlags: 0

Assets/GameMain/UI/UISprites/Shop.meta

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

ProjectSettings/EditorBuildSettings.asset

@@ -11,7 +11,7 @@ EditorBuildSettings:
   - enabled: 0
     path: Assets/GameMain/Scenes/Menu.unity
     guid: b031b4f2980561542a7f7ba41391edc3
-  - enabled: 1
+  - enabled: 0
     path: Assets/GameMain/Scenes/CustomRole.unity
     guid: b474370e72ceec54ea3cb09d8765a548
   - enabled: 1