导入新工具

Assets/Resource/Logo.unity

@@ -91,6 +91,110 @@ NavMeshSettings:
     cellSize: 0.16666666
     accuratePlacement: 0
   m_NavMeshData: {fileID: 0}
+--- !u!1001 &263485219
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_Pivot.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1948781497737682, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
+      propertyPath: m_Name
+      value: Canvas (1)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1 &465425181
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -5468,7 +5468,7 @@ GameObject:
   - component: {fileID: 114351062305903252}
   - component: {fileID: 114237413162070142}
   m_Layer: 5
-  m_Name: C_Return
+  m_Name: C_AddFriendButton
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -8217,6 +8217,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1522001904063904
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224953753005934500}
+  - component: {fileID: 222326292241886232}
+  - component: {fileID: 114870197093549780}
+  - component: {fileID: 114991349132565114}
+  m_Layer: 5
+  m_Name: C_Return
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1524126974555952
 GameObject:
   m_ObjectHideFlags: 1
@@ -25685,7 +25703,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: af48058312dc15c429274dc84ed7f3a6, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3bb1c24c193126c479901843899b8ba3, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -42613,6 +42631,33 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114870197093549780
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1522001904063904}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 21300000, guid: af48058312dc15c429274dc84ed7f3a6, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114871013624860144
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -46434,6 +46479,47 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114991349132565114
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1522001904063904}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_DisabledColor: {r: 1, g: 1, b: 1, a: 1}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 114870197093549780}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
 --- !u!114 &114993395554635196
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -50747,6 +50833,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1093632609735874}
+--- !u!222 &222326292241886232
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1522001904063904}
 --- !u!222 &222326307657341154
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -55630,7 +55722,7 @@ RectTransform:
   - {fileID: 224533448685456568}
   - {fileID: 224145449118531274}
   m_Father: {fileID: 224557266129361242}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -56682,9 +56774,9 @@ 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: -0.000020503998, y: -36.850006}
+  m_AnchoredPosition: {x: -0.00001557768, y: 102.29999}
   m_SizeDelta: {x: 665, y: 278.3}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0.5, y: 1}
 --- !u!224 &224178620981773474
 RectTransform:
   m_ObjectHideFlags: 1
@@ -58918,7 +59010,7 @@ RectTransform:
   m_Children:
   - {fileID: 224011803084884950}
   m_Father: {fileID: 224557266129361242}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -59128,15 +59220,14 @@ RectTransform:
   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:
-  - {fileID: 224605112978736534}
+  m_Children: []
   m_Father: {fileID: 224557266129361242}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 200.664, y: -36.5}
-  m_SizeDelta: {x: 84.224, y: 73}
+  m_AnchoredPosition: {x: 206.5, y: -36.5}
+  m_SizeDelta: {x: 73, y: 67}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224320973604603478
 RectTransform:
@@ -62827,8 +62918,9 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 224305962298478718}
   - {fileID: 224320519828582118}
+  - {fileID: 224305962298478718}
+  - {fileID: 224953753005934500}
   - {fileID: 224101328303273372}
   m_Father: {fileID: 224246329819966360}
   m_RootOrder: 2
@@ -63665,7 +63757,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 224320519828582118}
+  m_Father: {fileID: 224953753005934500}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -69286,6 +69378,25 @@ RectTransform:
   m_AnchoredPosition: {x: 165.75, y: -25}
   m_SizeDelta: {x: 40, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224953753005934500
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1522001904063904}
+  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:
+  - {fileID: 224605112978736534}
+  m_Father: {fileID: 224557266129361242}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 200.664, y: -36.5}
+  m_SizeDelta: {x: 84.224, y: 73}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224953964165220174
 RectTransform:
   m_ObjectHideFlags: 1

Assets/Script/Label/ObjectLabel.cs

@@ -70,6 +70,7 @@ public class ObjectLabel
 	public static string C_Rank = "C_Rank";
 	public static string C_Info = "C_Info";
 	public static string C_Group4 = "C_Group4";
+	public static string C_AddFriendButton = "C_AddFriendButton";
 	public static string C_EnterPlazaRoom0 = "C_EnterPlazaRoom0";
 	public static string C_EnterPlazaRoom = "C_EnterPlazaRoom";
 	public static string C_PlazaRoomArrow0 = "C_PlazaRoomArrow0";
@@ -142,18 +143,6 @@ public class ObjectLabel
 	public static string L_ShareLab = "L_ShareLab";
 	public static string L_CreditsBtn = "L_CreditsBtn";
 	public static string L_CreditsLab = "L_CreditsLab";
-	public static string La_Info = "La_Info";
-	public static string La_Info0 = "La_Info0";
-	public static string La_Tit = "La_Tit";
-	public static string La_Lab = "La_Lab";
-	public static string La_Cancel = "La_Cancel";
-	public static string La_CancelLab = "La_CancelLab";
-	public static string La_Confirm = "La_Confirm";
-	public static string La_ConfirmLab = "La_ConfirmLab";
-	public static string La_InputField = "La_InputField";
-	public static string La_InputLab = "La_InputLab";
-	public static string La_Placeholder = "La_Placeholder";
-	public static string La_Mask = "La_Mask";
 	public static string Lb_Info = "Lb_Info";
 	public static string Lb_Info0 = "Lb_Info0";
 	public static string Lb_Tit = "Lb_Tit";
@@ -171,6 +160,18 @@ public class ObjectLabel
 	public static string Lc_Pos = "Lc_Pos";
 	public static string Lc_CreditsContent = "Lc_CreditsContent";
 	public static string Lc_CreditsIcon = "Lc_CreditsIcon";
+	public static string La_Info = "La_Info";
+	public static string La_Info0 = "La_Info0";
+	public static string La_Tit = "La_Tit";
+	public static string La_Lab = "La_Lab";
+	public static string La_Cancel = "La_Cancel";
+	public static string La_CancelLab = "La_CancelLab";
+	public static string La_Confirm = "La_Confirm";
+	public static string La_ConfirmLab = "La_ConfirmLab";
+	public static string La_InputField = "La_InputField";
+	public static string La_InputLab = "La_InputLab";
+	public static string La_Placeholder = "La_Placeholder";
+	public static string La_Mask = "La_Mask";
 	public static string F_Manage = "F_Manage";
 	public static string F_Manage0 = "F_Manage0";
 	public static string F_Close = "F_Close";

Assets/Script/Manage/HttpManager.cs

@@ -1252,10 +1252,11 @@ public class HttpManager : Regist
         {
             selfSerialNumber = SerialNumber;
         }
-
+        //Debug.Log(targetSerialNumber);
         URLRequestData requestData = new URLRequestData();
         requestData.Add("u", selfSerialNumber);
         requestData.Add("b", targetSerialNumber);
+
         URLRequest.CreateStrURLRequest
         (
             true,
@@ -1263,6 +1264,7 @@ public class HttpManager : Regist
             requestData,
             data =>
             {
+                //Debug.Log(data);
                 try
                 {
                     JsonData jData = JsonMapper.ToObject(data.Trim());

Assets/Script/Manage/SocialManager.cs

@@ -185,7 +185,18 @@ public class SocialManager : Regist
         IsPanelOpen = true;
         ResourceManager.Get(ObjectLabel.Q_CommentBK).TweenForCG();
 
-        ResourceManager.SetActive(ObjectLabel.Q_InputBK, VisitManager.InVisit);
+        if (VisitManager.InVisit)
+        {
+            ResourceManager.SetActive(ObjectLabel.Q_InputBK, true);
+            RectTransform rectTransform = ResourceManager.Get<RectTransform>(ObjectLabel.Q_ScrollRect);
+            rectTransform.sizeDelta = new Vector2(rectTransform.rect.size.x, 206.1f);
+        }
+        else
+        {
+            ResourceManager.SetActive(ObjectLabel.Q_InputBK, false);
+            RectTransform rectTransform = ResourceManager.Get<RectTransform>(ObjectLabel.Q_ScrollRect);
+            rectTransform.sizeDelta = new Vector2(rectTransform.rect.size.x, 278.3f);
+        }
     }
 
     public static void CloseCommentPanel()

Assets/Script/Manage/UIManager.cs

@@ -444,6 +444,31 @@ public class UIManager : Regist
         #endregion
 
 
+        #region C_AddFriendButton
+
+        ResourceManager.AddButtonEvent
+        (
+            ObjectLabel.C_AddFriendButton,
+            () =>
+            {
+                HttpManager.ApplyBuddy
+                (
+                    VisitManager.VisiteeSerialNumber,
+                    () =>
+                    {
+                        Bubble.Show(null, Language.GetStr(LanguageLabel.UI__AG_SendApplySucceed));
+                        ResourceManager.SetActive(ObjectLabel.C_AddFriendButton, false);
+                    },
+                    () =>
+                    {
+                        Bubble.Show(null, Language.GetStr(LanguageLabel.UI__AG_ConnectError));
+                    }
+                );
+            }
+        );
+
+        #endregion
+
         #region C_Visit
 
         ResourceManager.AddButtonEvent
@@ -524,6 +549,7 @@ public class UIManager : Regist
             {
                 ResourceManager.SetActive(ObjectLabel.C_Visit, false);
                 ResourceManager.SetActive(ObjectLabel.C_Return, false);
+                ResourceManager.SetActive(ObjectLabel.C_AddFriendButton, false);
 
                 tween = ResourceManager.Get(ObjectLabel.I_BlackMask).GetTweenCG();
 
@@ -535,8 +561,8 @@ public class UIManager : Regist
                     EventType.BackwardFinish,
                     () =>
                     {
-                        VisitManager.ExitVisiteeGarden();
-                        ResourceManager.SetActive(ObjectLabel.C_EnterPlazaRoom0, true);
+                        VisitManager.StartExitVisiteeGarden();
+                        VisitManager.OnStartExitVisiteeGarden();
                     }
                 );
 

Assets/Script/Manage/VisitManager.cs

@@ -198,6 +198,11 @@ public class VisitManager : Regist
     }
 
 
+    public static void OnStartEnterVisiteeGarden()
+    {
+        ResourceManager.SetActive(ObjectLabel.C_EnterPlazaRoom0, false);
+    }
+
     public static void EnterVisiteeGarden(VisitData visitData)
     {
         IsPullConfigComplete = true;
@@ -216,7 +221,7 @@ public class VisitManager : Regist
         OnEnterVisteeGarden.SafeInvoke();
     }
 
-    public static void ExitVisiteeGarden()
+    public static void StartExitVisiteeGarden()
     {
         ResourceManager.Get(ObjectLabel.I_BlackMask).TweenForCG();
 
@@ -351,6 +356,11 @@ public class VisitManager : Regist
         OnExitVisteeGarden.SafeInvoke();
     }
 
+    public static void OnStartExitVisiteeGarden()
+    {
+        ResourceManager.SetActive(ObjectLabel.C_EnterPlazaRoom0, true);
+    }
+
     public static void EnterVisiteeGarden()
     {
         if (!IsPullConfigComplete || !IsBlackMaskTweenComplete)
@@ -383,7 +393,7 @@ public class VisitManager : Regist
             GardenManager.StarList = new List<Star>();
         }
 
-
+        ResourceManager.SetActive(ObjectLabel.C_AddFriendButton, true);
         ResourceManager.SetActive(ObjectLabel.C_Return, true);
 
         GardenManager.InMinigameFlag = false;
@@ -698,7 +708,7 @@ public class VisitManager : Regist
             () =>
             {
                 ResourceManager.Get(ObjectLabel.I_BlackMask).TweenForCG();
-                ResourceManager.SetActive(ObjectLabel.C_EnterPlazaRoom0, true);
+                OnStartExitVisiteeGarden();
             },
             null,
             false
@@ -826,7 +836,7 @@ public class VisitManager : Regist
             return;
         }
 
-        ResourceManager.SetActive(ObjectLabel.C_EnterPlazaRoom0, false);
+        OnStartEnterVisiteeGarden();
 
         Manager.Pay
         (