Jidongchen 3 years ago
parent
commit
3a2df943f5

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

@@ -714,9 +714,9 @@ namespace MetaClient
             for (int i = 0; i < dRCustomBodies.Length; i++)
             {
                 Debug.Log(dRCustomBodies[i].Id);
-                if (dRCustomBodies[i].ParentStyple == parentid&&dRCustomBodies[i].Cengji==cengji)
+                if (dRCustomBodies[i].ParentStyple == parentid&&dRCustomBodies[i].Cengji==cengji&& dRCustomBodies[i].IsActive == 1)
                 {
-                    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);
                 }
             }
           
@@ -760,9 +760,9 @@ namespace MetaClient
             for (int i = 0; i < dRCustomBodies.Length; i++)
             {
                 Debug.Log(dRCustomBodies[i].Id);
-                if (dRCustomBodies[i].ParentStyple == parentid && dRCustomBodies[i].Cengji == cengji)
+                if (dRCustomBodies[i].ParentStyple == parentid && dRCustomBodies[i].Cengji == cengji&& dRCustomBodies[i].IsActive==1)
                 {
-                    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 +807,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);

+ 1 - 1
Assets/GameMain/UI/UIForms/AnimatorEditor.prefab

@@ -11,7 +11,7 @@ GameObject:
   - component: {fileID: 22498214}
   - component: {fileID: 1633349417}
   m_Layer: 5
-  m_Name: AnimatorEditor
+  m_Name: AnimatorEditorForm
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/GameMain/UI/UIForms/AnimatorEditor.prefab.meta → Assets/GameMain/UI/UIForms/AnimatorEditorForm.prefab.meta


+ 6 - 6
Assets/GameMain/UI/UIForms/CustomRole.prefab

@@ -4165,9 +4165,9 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -24, y: 29}
+  m_AnchoredPosition: {x: -72, y: 91.5}
   m_SizeDelta: {x: 96, y: 125}
-  m_Pivot: {x: 1, y: 0.5}
+  m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &1551334339
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -10967,10 +10967,10 @@ RectTransform:
   m_Father: {fileID: 1331787699}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0.5}
-  m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: 11.924988, y: 0}
-  m_SizeDelta: {x: 177.97, y: 1611.7765}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 177.97, y: 0}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &5235263282945642864
 CanvasRenderer:

+ 8 - 0
Assets/GameMain/UI/UISprites/CustomRole/cloth.meta

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