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

Assets/GameMain/Scripts/UI/UICustom.cs

@@ -586,7 +586,11 @@ namespace MetaClient
 
         //    return null;
         //}
-
+        public void ModelMove(Vector2 v2)
+        {
+            Debug.Log(v2.x);
+            //CustomManaget.Instance.RotateModel(v2.x);
+        }
         private void RemoveAllChildren(GameObject parent,int _index=0)
         {
             Transform transform;

Assets/GameMain/Scripts/UI/UICustomDrag.cs

@@ -0,0 +1,33 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.EventSystems;
+namespace MetaClient
+{
+
+    public class UICustomDrag : MonoBehaviour, IDragHandler, IEndDragHandler, IBeginDragHandler
+    {
+        // Start is called before the first frame update
+        void Start()
+        {
+
+        }
+        public void OnDrag(PointerEventData eventData)
+        {
+            //CustomManager.Instance
+            Debug.Log(eventData.delta.x + "");
+        }
+        public void OnBeginDrag(PointerEventData eventData)
+        {
+        }
+        public void OnEndDrag(PointerEventData eventData)
+        {
+            
+        }
+        // Update is called once per frame
+        void Update()
+        {
+
+        }
+    }
+}

Assets/GameMain/Scripts/UI/UICustomDrag.cs.meta

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

Assets/GameMain/UI/UIForms/CustomRole.prefab

@@ -2856,7 +2856,7 @@ RectTransform:
   - {fileID: 1399077090}
   - {fileID: 1191658825}
   m_Father: {fileID: 2921542304032736362}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
@@ -3694,7 +3694,7 @@ RectTransform:
   - {fileID: 723150304825286416}
   - {fileID: 1551334337}
   m_Father: {fileID: 2921542304032736362}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -5667,7 +5667,7 @@ RectTransform:
   - {fileID: 1935163379261594772}
   - {fileID: 7742362321348794451}
   m_Father: {fileID: 2921542304032736362}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -5712,6 +5712,93 @@ RectTransform:
   m_AnchoredPosition: {x: 73.3, y: 0}
   m_SizeDelta: {x: 146.73401, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &940833284543376021
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5308641913551943334}
+  - component: {fileID: 5792720933521227428}
+  - component: {fileID: 6640817377668499293}
+  - component: {fileID: 7115024805073442899}
+  m_Layer: 5
+  m_Name: Panel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5308641913551943334
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 940833284543376021}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2921542304032736362}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5792720933521227428
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 940833284543376021}
+  m_CullTransparentMesh: 0
+--- !u!114 &6640817377668499293
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 940833284543376021}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.011764706}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &7115024805073442899
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 940833284543376021}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ed145c2d52d0c6e4bb6634f3033dc62b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1203307411010762690
 GameObject:
   m_ObjectHideFlags: 0
@@ -6441,7 +6528,7 @@ RectTransform:
   m_Children:
   - {fileID: 1937983574150838761}
   m_Father: {fileID: 2921542304032736362}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -6909,6 +6996,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 5308641913551943334}
   - {fileID: 4287760994855644235}
   - {fileID: 2120691760}
   - {fileID: 1331787699}