DGJ 1 year ago
parent
commit
34b002974b

File diff suppressed because it is too large
+ 97 - 719
Assets/Game/ShowSupport/ShowRtc.prefab


+ 23 - 0
Assets/Game/ShowSupport/SupportControl.cs

@@ -23,6 +23,10 @@ public class SupportControl : AbstractController
     private Color colorWhite = new Color32(255,255,255,255);
 
     public UnityEvent OnReset = new UnityEvent();
+    /// <summary>
+    ///  选择的问题类型
+    /// </summary>
+    public QuestionEnum Question;
     void Awake()
     {
 #if UNITY_EDITOR
@@ -83,6 +87,18 @@ public class SupportControl : AbstractController
         //ShowRTC.Instance.gotoWindow(ScenesManager.SceneType.ShowRTCHistory);
     }
 
+    /// <summary>
+    ///  选择问题
+    /// </summary>
+    /// <param name="question"></param>
+    public void SettingQuest(int question)
+    {
+        this.Question = (QuestionEnum)question;
+    }
+
+   
+
+
     private void Init()
     {
         ShowRtcTrans = new GameObject("ShowRtcTrans").transform;
@@ -104,3 +120,10 @@ public class SupportControl : AbstractController
         */
     }
 }
+
+public enum QuestionEnum
+{
+    NetWork,
+    Host,
+    Storage
+}

+ 2 - 2
Assets/LangChaoRTC/Remote/ShowRoom/PeerSamllView.cs

@@ -129,7 +129,7 @@ public class PeerSamllView : BaseView, IPointerEnterHandler, IPointerExitHandler
             {
                 this.inviteUserConfig = null;
             }
-            user.SetActive(true);
+         //   user.SetActive(true);
             add.SetActive(false);
             enterBtn.SetActive(false);
             sysEenter.gameObject.SetActive(true);
@@ -199,7 +199,7 @@ public class PeerSamllView : BaseView, IPointerEnterHandler, IPointerExitHandler
                 cPeer = null;
             }
             this.inviteUserConfig = c as InviteUserConfig;
-            user.SetActive(true);
+        //    user.SetActive(true);
             add.SetActive(false);
           //  tName.text = "等待进入...";
             name.text = "等待进入...";

+ 155 - 4
Assets/LangChaoRTC/Remote/ShowRoom/RoomFile.prefab

@@ -24,7 +24,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 149986230}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.341, y: 0.153, z: 0.745}
+  m_LocalPosition: {x: -0.243, y: 0.034, z: 0.745}
   m_LocalScale: {x: 0.008119999, y: 0.008119999, z: 0.008119999}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -527,7 +527,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 5295285540814818976}
   m_Father: {fileID: 8120215037918195507}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -764,8 +765,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -10.67, y: -41.13}
-  m_SizeDelta: {x: 323.18, y: 294.35}
+  m_AnchoredPosition: {x: -3.63, y: -38.34}
+  m_SizeDelta: {x: 1041.92, y: 197.22}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4183152055824392442
 CanvasRenderer:
@@ -1523,3 +1524,153 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 4
+--- !u!1001 &1975480019
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 7873290928976605117}
+    m_Modifications:
+    - target: {fileID: 2471450907492502192, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2471450907492502192, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2471450907492502192, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540205387260, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540205387260, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540205387260, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540205387260, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540247215454, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540247215454, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540247215454, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540247215454, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 138.455
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540247215454, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540490895468, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_Name
+      value: MsgItem
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540490895475, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540490895475, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540490895475, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540490895475, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540490895475, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540490895475, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540490895475, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540490895475, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540490895475, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540490895475, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540490895475, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540490895475, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -0.00018146387
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540490895475, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540490895475, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540490895475, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540490895475, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540490895475, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540490895475, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540490895475, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540490895475, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5295285540490895475, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+--- !u!224 &5295285540814818976 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 5295285540490895475, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+  m_PrefabInstance: {fileID: 1975480019}
+  m_PrefabAsset: {fileID: 0}

+ 91 - 23
Assets/LangChaoRTC/Remote/ShowRoom/RoomInvite/Prefab/MsgItem.prefab

@@ -34,10 +34,10 @@ RectTransform:
   m_Father: {fileID: 5295285541080847994}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 20, y: 0}
-  m_SizeDelta: {x: 895.4, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 20, y: -20}
+  m_SizeDelta: {x: 787.5, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &5295285539923751739
 CanvasRenderer:
@@ -265,12 +265,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 90
+    m_Left: 134
     m_Right: 0
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 0
-  m_Spacing: 0
+  m_Spacing: 5
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
@@ -327,8 +327,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 56, y: -39.049976}
-  m_SizeDelta: {x: 112, y: 21.9}
+  m_AnchoredPosition: {x: 61.2, y: -39.049976}
+  m_SizeDelta: {x: 122.4, y: 21.9}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5295285540395979798
 CanvasRenderer:
@@ -385,8 +385,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 28
-  m_fontSizeBase: 28
+  m_fontSize: 35
+  m_fontSizeBase: 35
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -590,7 +590,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5295285541080847994
 RectTransform:
   m_ObjectHideFlags: 0
@@ -607,10 +607,10 @@ RectTransform:
   m_Father: {fileID: 5295285540247215454}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 547.7, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 537.75, y: 0}
+  m_SizeDelta: {x: 807.5, y: 47}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &5295285541080847998
 CanvasRenderer:
@@ -679,8 +679,8 @@ MonoBehaviour:
   m_Padding:
     m_Left: 20
     m_Right: 0
-    m_Top: 12
-    m_Bottom: 0
+    m_Top: 20
+    m_Bottom: 20
   m_ChildAlignment: 0
   m_Spacing: 0
   m_ChildForceExpandWidth: 1
@@ -703,8 +703,52 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 326842007013501043, guid: 8159e16c99a3d9548b98bc48e0a86dda, type: 3}
       propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 412570834748894171, guid: 8159e16c99a3d9548b98bc48e0a86dda, type: 3}
+      propertyPath: m_fontSize
+      value: 45
+      objectReference: {fileID: 0}
+    - target: {fileID: 412570834748894171, guid: 8159e16c99a3d9548b98bc48e0a86dda, type: 3}
+      propertyPath: m_fontSizeBase
+      value: 45
+      objectReference: {fileID: 0}
+    - target: {fileID: 412570834748894171, guid: 8159e16c99a3d9548b98bc48e0a86dda, type: 3}
+      propertyPath: m_HorizontalAlignment
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5093841004970431913, guid: 8159e16c99a3d9548b98bc48e0a86dda, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0.70000076
+      objectReference: {fileID: 0}
+    - target: {fileID: 5538574736825190120, guid: 8159e16c99a3d9548b98bc48e0a86dda, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6628953026257988857, guid: 8159e16c99a3d9548b98bc48e0a86dda, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: e6d6724fc22afbf44a7cc04cdcb7b3bb, type: 3}
+    - target: {fileID: 6628953026257988857, guid: 8159e16c99a3d9548b98bc48e0a86dda, type: 3}
+      propertyPath: m_Color.a
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6628953026257988857, guid: 8159e16c99a3d9548b98bc48e0a86dda, type: 3}
+      propertyPath: m_Color.b
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6628953026257988857, guid: 8159e16c99a3d9548b98bc48e0a86dda, type: 3}
+      propertyPath: m_Color.g
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6628953026257988857, guid: 8159e16c99a3d9548b98bc48e0a86dda, type: 3}
+      propertyPath: m_Color.r
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6628953026257988857, guid: 8159e16c99a3d9548b98bc48e0a86dda, type: 3}
+      propertyPath: m_PixelsPerUnitMultiplier
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 7723947848514141927, guid: 8159e16c99a3d9548b98bc48e0a86dda, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -723,7 +767,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7723947848514141927, guid: 8159e16c99a3d9548b98bc48e0a86dda, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7723947848514141927, guid: 8159e16c99a3d9548b98bc48e0a86dda, type: 3}
       propertyPath: m_AnchorMin.x
@@ -731,15 +775,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7723947848514141927, guid: 8159e16c99a3d9548b98bc48e0a86dda, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7723947848514141927, guid: 8159e16c99a3d9548b98bc48e0a86dda, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 170
+      value: 500
       objectReference: {fileID: 0}
     - target: {fileID: 7723947848514141927, guid: 8159e16c99a3d9548b98bc48e0a86dda, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 32
+      value: 60
       objectReference: {fileID: 0}
     - target: {fileID: 7723947848514141927, guid: 8159e16c99a3d9548b98bc48e0a86dda, type: 3}
       propertyPath: m_LocalPosition.x
@@ -771,11 +815,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7723947848514141927, guid: 8159e16c99a3d9548b98bc48e0a86dda, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 135
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7723947848514141927, guid: 8159e16c99a3d9548b98bc48e0a86dda, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -45
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7723947848514141927, guid: 8159e16c99a3d9548b98bc48e0a86dda, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -789,6 +833,30 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8574629433077326366, guid: 8159e16c99a3d9548b98bc48e0a86dda, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 25
+      objectReference: {fileID: 0}
+    - target: {fileID: 8574629433077326366, guid: 8159e16c99a3d9548b98bc48e0a86dda, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 25
+      objectReference: {fileID: 0}
+    - target: {fileID: 8574629433077326366, guid: 8159e16c99a3d9548b98bc48e0a86dda, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -200.8
+      objectReference: {fileID: 0}
+    - target: {fileID: 8574629433077326366, guid: 8159e16c99a3d9548b98bc48e0a86dda, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -0.0000076293945
+      objectReference: {fileID: 0}
+    - target: {fileID: 8733701805374550988, guid: 8159e16c99a3d9548b98bc48e0a86dda, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -87.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 8733701805374550988, guid: 8159e16c99a3d9548b98bc48e0a86dda, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0.0000019073486
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 8159e16c99a3d9548b98bc48e0a86dda, type: 3}
 --- !u!224 &2471450907492502192 stripped

+ 1 - 1
Assets/UI/1013NewUI/msg.png.meta

@@ -48,7 +48,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 28, y: 22, z: 33, w: 23}
+  spriteBorder: {x: 28, y: 24, z: 33, w: 23}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 0

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