修改一些细节

Assets/Resource/Prefab/PrefabUI/GroupC.prefab

@@ -559,6 +559,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1646427716712442
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224228613761954744}
+  - component: {fileID: 222329479403932562}
+  - component: {fileID: 114193172159251150}
+  - component: {fileID: 95728760736522580}
+  m_Layer: 5
+  m_Name: H_Rotate
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1649262070213938
 GameObject:
   m_ObjectHideFlags: 1
@@ -915,6 +933,23 @@ Animator:
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
+--- !u!95 &95728760736522580
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1646427716712442}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 34cc0759bb3f4324382dcc26f2e595c5, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
 --- !u!114 &114003077958782850
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1206,6 +1241,33 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u7279\u6B8A\u82B1\u6735"
+--- !u!114 &114193172159251150
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1646427716712442}
+  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: f9937d5d43f2ff447aeb985a91a7d690, 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 &114195862700110090
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -5417,6 +5479,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1950576184240726}
+--- !u!222 &222329479403932562
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1646427716712442}
 --- !u!222 &222370788896901318
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -5781,6 +5849,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 62.91}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224228613761954744
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1646427716712442}
+  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: 224590564811158144}
+  m_RootOrder: 3
+  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: 9.999919, y: -9.563425}
+  m_SizeDelta: {x: 172.1, y: 171.9}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224246231728578908
 RectTransform:
   m_ObjectHideFlags: 1
@@ -5967,7 +6053,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224590564811158144}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -6118,7 +6204,7 @@ RectTransform:
   - {fileID: 224293496060027752}
   - {fileID: 224970525637999822}
   m_Father: {fileID: 224590564811158144}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -6138,6 +6224,7 @@ RectTransform:
   - {fileID: 224779658539582892}
   - {fileID: 224843279890597442}
   - {fileID: 224752065467151726}
+  - {fileID: 224228613761954744}
   - {fileID: 224580893849471086}
   - {fileID: 224387557482805238}
   - {fileID: 224632658604237256}
@@ -6162,7 +6249,7 @@ RectTransform:
   - {fileID: 224396372018510664}
   - {fileID: 224768102107365078}
   m_Father: {fileID: 224590564811158144}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}

Assets/Resource/Prefab/PrefabUI/GroupD.prefab

@@ -92,6 +92,7 @@ GameObject:
   - component: {fileID: 224470330467200464}
   - component: {fileID: 222569527798151456}
   - component: {fileID: 114884407906316912}
+  - component: {fileID: 114870151928231454}
   m_Layer: 5
   m_Name: X_InfoBK
   m_TagString: Untagged
@@ -2681,6 +2682,7 @@ GameObject:
   - component: {fileID: 224357260864514764}
   - component: {fileID: 222308044829728810}
   - component: {fileID: 114254074785075674}
+  - component: {fileID: 114415160779021902}
   m_Layer: 5
   m_Name: X_Info
   m_TagString: Untagged
@@ -5254,11 +5256,11 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 20
+    m_Left: 15
     m_Right: 0
-    m_Top: 15
-    m_Bottom: 0
-  m_ChildAlignment: 0
+    m_Top: 0
+    m_Bottom: 20
+  m_ChildAlignment: 6
   m_Spacing: 5
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
@@ -6267,6 +6269,19 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114415160779021902
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1853548618198614}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
 --- !u!114 &114417908638232960
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -6915,7 +6930,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 2100000, guid: e45f62a955afe604f9f0e99be030d7a8, type: 2}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -8136,7 +8151,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 2100000, guid: e45f62a955afe604f9f0e99be030d7a8, type: 2}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -8325,7 +8340,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 2100000, guid: e45f62a955afe604f9f0e99be030d7a8, type: 2}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -8808,6 +8823,37 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114870151928231454
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1009134439996232}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 235c753c59692334b8eb0ebdbfe0822b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Content: {fileID: 224357260864514764}
+  m_Horizontal: 0
+  m_Vertical: 1
+  m_MovementType: 1
+  m_Elasticity: 0.1
+  m_Inertia: 0
+  m_DecelerationRate: 0.135
+  m_ScrollSensitivity: 1
+  m_Viewport: {fileID: 0}
+  m_HorizontalScrollbar: {fileID: 0}
+  m_VerticalScrollbar: {fileID: 0}
+  m_HorizontalScrollbarVisibility: 0
+  m_VerticalScrollbarVisibility: 0
+  m_HorizontalScrollbarSpacing: 0
+  m_VerticalScrollbarSpacing: 0
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
 --- !u!114 &114877415166627036
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -8977,7 +9023,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 0.7058824}
-  m_RaycastTarget: 0
+  m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -11990,11 +12036,11 @@ RectTransform:
   m_Father: {fileID: 224894474809591712}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -0.15, y: 0}
-  m_SizeDelta: {x: 547.3, y: 682}
-  m_Pivot: {x: 0.5, y: 0.9999998}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: -0.20007104, y: -7.149327}
+  m_SizeDelta: {x: 548, y: 20}
+  m_Pivot: {x: 0.5, y: -0.00000010430813}
 --- !u!224 &224358377575468156
 RectTransform:
   m_ObjectHideFlags: 1
@@ -13857,8 +13903,8 @@ RectTransform:
   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: 2.5}
-  m_SizeDelta: {x: 0, y: -5}
+  m_AnchoredPosition: {x: 0, y: -7.5}
+  m_SizeDelta: {x: 0, y: -15}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224898314465273696
 RectTransform:

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -172,6 +172,7 @@
     <Z_RoomExpire desc=""><![CDATA[派对已经结束，自己创建一个吧!]]></Z_RoomExpire>
     <Z_Unknown desc=""><![CDATA[派对人数已满]]></Z_Unknown>
     <Z_SystemRoomName desc=""><![CDATA[派对不停歇]]></Z_SystemRoomName>
+    <AA_DefaultName desc=""><![CDATA[[&value&]的派对]]></AA_DefaultName>
     <AA_BtnLab desc=""><![CDATA[创建]]></AA_BtnLab>
     <AA_AllWhiteSpace desc=""><![CDATA[派对名字不能为空]]></AA_AllWhiteSpace>
     <AA_TooLong desc=""><![CDATA[名字太长]]></AA_TooLong>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -172,6 +172,7 @@
     <Z_RoomExpire desc=""><![CDATA[派對已經結束，自己創建一個吧!]]></Z_RoomExpire>
     <Z_Unknown desc=""><![CDATA[派對人數已滿]]></Z_Unknown>
     <Z_SystemRoomName desc=""><![CDATA[派對不停歇]]></Z_SystemRoomName>
+    <AA_DefaultName desc=""><![CDATA[[&value&]的派對]]></AA_DefaultName>
     <AA_BtnLab desc=""><![CDATA[創建]]></AA_BtnLab>
     <AA_AllWhiteSpace desc=""><![CDATA[派對名字不能為空]]></AA_AllWhiteSpace>
     <AA_TooLong desc=""><![CDATA[名字太長]]></AA_TooLong>

Assets/Resource/XML/lan/English.xml

@@ -172,6 +172,7 @@ Program 水怪
     <Z_RoomExpire desc=""><![CDATA[Party is over, create one by your self!]]></Z_RoomExpire>
     <Z_Unknown desc=""><![CDATA[Party room is full]]></Z_Unknown>
     <Z_SystemRoomName desc=""><![CDATA[Party time]]></Z_SystemRoomName>
+    <AA_DefaultName desc=""><![CDATA[[&value&]'s party]]></AA_DefaultName>
     <AA_BtnLab desc=""><![CDATA[Create]]></AA_BtnLab>
     <AA_AllWhiteSpace desc=""><![CDATA[Party name can not be null]]></AA_AllWhiteSpace>
     <AA_TooLong desc=""><![CDATA[Party name too long]]></AA_TooLong>

Assets/Script/Manage/ManaGarden.cs

@@ -528,6 +528,7 @@ public class ManaGarden : Regist
             ManaReso.Get<Button>("H_Icon2").interactable = false;
             ManaReso.SetActive("H_AmtLab", false);
             ManaReso.SetActive("H_Desc", false);
+            ManaReso.SetActive("H_Rotate", false);
         }
         else
         {
@@ -535,6 +536,7 @@ public class ManaGarden : Regist
             ManaReso.Get<Button>("H_Icon2").interactable = true;
             ManaReso.SetActive("H_AmtLab", true);
             ManaReso.SetText("H_AmtLab", "x" + flowerInfo.RemainAmount);
+            ManaReso.SetActive("H_Rotate", true);
         }
     }
 

Assets/Script/Manage/ManaInfoBox.cs

@@ -112,16 +112,17 @@ public class ManaInfoBox : Regist
 
             if (VerticalLayoutGroup != null)
             {
-                Auxiliary.Instance.DelayCall(
+                Auxiliary.Instance.DelayCall
+                (
                     () =>
                     {
-                        VerticalLayoutGroup.SetLayoutVertical();
+                        LayoutRebuilder.MarkLayoutForRebuild(VerticalLayoutGroup.GetComponent<RectTransform>());
+                        //VerticalLayoutGroup.SetLayoutVertical();
                     },
                     1
                 );
             }
 
-
             InfoText infoText = new InfoText();
 
             text.text = str;
@@ -143,7 +144,7 @@ public class ManaInfoBox : Regist
     #region Config
 
     private const int MaxGardenInfoCount = 4;
-    private const int MaxPlazaRoomCount = 14;
+    private const int MaxPlazaRoomCount = 300;
 
     private static InfoBox GardenInfoBox;
     private static InfoBox PlazaRoomInfoBox;

Assets/Script/Manage/ManaSocial.cs

@@ -539,6 +539,8 @@ public class ManaSocial : Regist
             string content = StringFilter.GetFilteredString(InputField.text);
 
             ManaServer.AddComment(ManaServer.SerialNumber, ManaVisit.VisiteeSerialNumber, content, CommentType.Garden);
+
+            InputField.text = "";
         }
         else
         {

Assets/Script/Manage/PlazaRoomMge.cs

@@ -495,6 +495,9 @@ public class PlazaRoomMge : Regist
     public static void OpenCreatePanel()
     {
         ManaReso.Get("AA_CreatePlazaRoom").TweenForCG();
+
+        string defaultName = Language.GetStr("UI", "AA_DefaultName").Replace("[&value&]", ManaNickName.NickName);
+        ManaReso.Get<InputField>("AA_InputField").text = defaultName;
     }
 
     public static void CloseCreatePanel()

Assets/Script/Object/CommentItem.cs

@@ -103,6 +103,15 @@ public class CommentItem : Regist
         Content = content;
         SerialNumber = serialNumber;
 
+        if (serialNumber == ManaServer.SerialNumber)
+        {
+            VisitBtn.SetActive(false);
+        }
+        else
+        {
+            VisitBtn.SetActive(true);
+        }
+
         if (!string.IsNullOrEmpty(nickname))
         {
             Tit.text = nickname;

Assets/Script/SFS/Manager/ChestMge.cs

@@ -145,7 +145,9 @@ public class ChestMge : Regist
     private static Text SliderValueLab;
     private static Slider Slider;
     private static Button Btn;
+    private static Button GuessBtn;
     private static InputField InputField;
+    private static InputField GuessInputField;
 
     private static string RefundNodeName = "Refund";
     private static string ReceivedNodeName = "Received";
@@ -186,11 +188,31 @@ public class ChestMge : Regist
     public override void RegistReference()
     {
         Btn = ManaReso.Get<Button>("Yb_Btn");
+        GuessBtn = ManaReso.Get<Button>("Y_Btn");
         Desc = ManaReso.Get<Text>("Yb_Desc");
         Slider = ManaReso.Get<Slider>("Yb_Slider");
         BtnLab = ManaReso.Get<Text>("Yb_BtnLab");
         InputField = ManaReso.Get<InputField>("Yb_InputField");
+        GuessInputField = ManaReso.Get<InputField>("Y_InputField");
         SliderValueLab = ManaReso.Get<Text>("Yb_SliderValueLab");
+
+        GuessInputField.onValueChanged.AddListener(OnGuessInputValueChange);
+        OnGuessInputValueChange(null);
+    }
+
+
+    public static void OnGuessInputValueChange(string value)
+    {
+        if (string.IsNullOrEmpty(value))
+        {
+            GuessBtn.image.material = Lib.GrayMat;
+            GuessBtn.interactable = false;
+        }
+        else
+        {
+            GuessBtn.image.material = null;
+            GuessBtn.interactable = true;
+        }
     }
 
 

Assets/Script/SFS/Manager/SFSPlazaRoomManager.cs

@@ -174,6 +174,7 @@ public class SFSPlazaRoomManager
 
     #endregion
 
+    private Coroutine JoinRoomCoroutine;
     public void BeginEnterPlazaRoom(RoomData roomData)
     {
         CurrentRoomData = roomData;
@@ -219,6 +220,8 @@ public class SFSPlazaRoomManager
                 }
             }
         );
+
+        JoinRoomCoroutine = DelayCall.Call(10f, () => { OnJoinPlazaRoomError(JoinRoomResult.Unknown); });
     }
 
     public void TryEnterPlazaRoom()
@@ -334,6 +337,12 @@ public class SFSPlazaRoomManager
                 ManaReso.Get("B_SignIn0").TweenForCG();
                 ManaReso.Get("T_NickName").TweenForCG();
 
+                Transform tra = ManaReso.Get("X_Info");
+                while (tra.childCount > 0)
+                {
+                    ManaReso.Save(tra.GetChild(0));
+                }
+
                 foreach (var kv in UserInstanceDictionary)
                 {
                     kv.Value.Save();
@@ -497,16 +506,24 @@ public class SFSPlazaRoomManager
 
     public void OnJoinPlazaRoom(Room room)
     {
-        GardenSmartFox.PlazaRoomManager.CurrentPlazaRoom = room;
+        if (JoinRoomResult == JoinRoomResult.Pending)
+        {
+            GardenSmartFox.PlazaRoomManager.CurrentPlazaRoom = room;
 
-        JoinRoomResult = JoinRoomResult.Succeed;
-        TryEnterPlazaRoom();
+            JoinRoomResult = JoinRoomResult.Succeed;
+            TryEnterPlazaRoom();
+
+            DelayCall.stopCoroutine(JoinRoomCoroutine);
+        }
     }
 
     public void OnJoinPlazaRoomError(JoinRoomResult joinRoomResult)
     {
-        this.JoinRoomResult = joinRoomResult;
-        TryEnterPlazaRoom();
+        if (JoinRoomResult == JoinRoomResult.Pending)
+        {
+            JoinRoomResult = joinRoomResult;
+            TryEnterPlazaRoom();
+        }
     }
 
     public void OnUserExitPlazaRoom(int userID)

Assets/Script/Tool/Bundle.cs

@@ -356,7 +356,7 @@ public class Bundle : MonoBehaviour
             ManaServer.PackTypeRequest();
         }
 
-        yield return LoadDiscard();
+        //yield return LoadDiscard();
 
         yield return LoadUI();
 

Assets/Script/Tool/DelayCall.cs

@@ -37,6 +37,11 @@ public class DelayCall : MonoBehaviour
         return Instance.StartCoroutine(EDelayCall(delayTime, action));
     }
 
+    public static void stopCoroutine(Coroutine coroutine)
+    {
+        Instance.StopCoroutine(coroutine);
+    }
+
     private static IEnumerator EDelayCall(int delayFrame, Action action)
     {
         int count = 0;

第三期.txt

@@ -1,6 +1,3 @@
-系统宝箱的总价值
-
-
 关闭ManaDebug 开启CatchException
 
 切换到远程服务器