Merge branch 'master' of http://git.dashgame.com/gsgundam/garden_client into 第四期

# Conflicts:
#	第四期.txt

Assets/Script/Object/Player.cs

@@ -407,51 +407,54 @@ public class CloseUnit
     public void OnBuy()
     {
         ManaCenter.Pay
-            (
-                "",
-                BuyAmt,
-                BuyCurrent,
-                () =>
-                {
-                    Unlock();
+        (
+            "",
+            BuyAmt,
+            BuyCurrent,
+            () =>
+            {
+                Unlock();
 
-                    ManaAudio.PlayClip(Clip.CurrentClip);
+                ManaAudio.PlayClip(Clip.CurrentClip);
 
-                    ManaPlayer.BoughtCloseList.UniqueAdd(ID);
+                ManaPlayer.BoughtCloseList.UniqueAdd(ID);
 
-                    ManaReso.Get("Pa_Info").TweenBacCG();
+                ManaReso.Get("Pa_Info").TweenBacCG();
 
-                    ManaServer.Save();
-                },
-                StaticsManager.ItemID.解锁服装,
-                StaticsManager.ConsumeModule.Shop,
-                true,
-                false,
-                () =>
-                {
-                    ManaPlayer.Player.Reset();
+                ChangeDress(ManaPlayer.Player);
+                SaveDressData();
 
-                    TweenRoot tweenRoot = ManaReso.Get("Pa_Info").TweenBacCG();
+                ManaServer.Save();
+            },
+            StaticsManager.ItemID.解锁服装,
+            StaticsManager.ConsumeModule.Shop,
+            true,
+            false,
+            () =>
+            {
+                ManaPlayer.Player.Reset();
 
-                    tweenRoot.AddEventOnetime
-                        (
-                            EventType.BackwardFinish,
-                            () =>
-                            {
-                                ManaPlayer.Player.Return();
-                            }
-                        );
+                TweenRoot tweenRoot = ManaReso.Get("Pa_Info").TweenBacCG();
 
-                    ManaReso.Get("B_SignIn0").GetTweenCG().AddEventOnetime
-                        (
-                            EventType.ForwardFinish,
-                            () =>
-                            {
-                                ManaReso.Get("F_Manage0").TweenForVec();
-                            }
-                        );
-                }
-            );
+                tweenRoot.AddEventOnetime
+                (
+                    EventType.BackwardFinish,
+                    () =>
+                    {
+                        ManaPlayer.Player.Return();
+                    }
+                );
+
+                ManaReso.Get("B_SignIn0").GetTweenCG().AddEventOnetime
+                (
+                    EventType.ForwardFinish,
+                    () =>
+                    {
+                        ManaReso.Get("F_Manage0").TweenForVec();
+                    }
+                );
+            }
+        );
     }
 
     public void ChangeDress(Player player)
@@ -477,6 +480,71 @@ public class CloseUnit
         }
     }
 
+    public void SaveDressData() //仅在购买完成时调用
+    {
+        SaveDressData(BodyPart);
+        if (BodyPart == BodyPart.Top)
+        {
+            ManaPlayer.DressData[8] = "Empty";
+            ManaPlayer.DressData[9] = "Empty";
+            ManaPlayer.DressData[10] = "Empty";
+            ManaPlayer.DressData[11] = "Empty";
+
+            foreach (var bodyPart in ExtraBodyParts)
+            {
+                SaveDressData(bodyPart);
+            }
+        }
+    }
+
+    public void SaveDressData(BodyPart bodyPart) //仅在购买完成时调用
+    {
+        if (bodyPart == BodyPart.LeftLongSleeve)
+        {
+            ManaPlayer.DressData[8] = ManaPlayer.Player.LeftLongSleeve;
+        }
+        else if (bodyPart == BodyPart.LeftShortSleeve)
+        {
+            ManaPlayer.DressData[9] = ManaPlayer.Player.LeftShortSleeve;
+        }
+        else if (bodyPart == BodyPart.RightLongSleeve)
+        {
+            ManaPlayer.DressData[10] = ManaPlayer.Player.RightLongSleeve;
+        }
+        else if (bodyPart == BodyPart.RightShortSleeve)
+        {
+            ManaPlayer.DressData[11] = ManaPlayer.Player.RightShortSleeve;
+        }
+        else if (bodyPart == BodyPart.Top)
+        {
+            ManaPlayer.DressData[4] = ManaPlayer.Player.Top;
+        }
+        else if (bodyPart == BodyPart.Shoe)
+        {
+            ManaPlayer.DressData[2] = ManaPlayer.Player.Shoe;
+        }
+        else if (bodyPart == BodyPart.Head)
+        {
+            ManaPlayer.DressData[0] = ManaPlayer.Player.Head;
+        }
+        else if (bodyPart == BodyPart.Wing)
+        {
+            ManaPlayer.DressData[7] = ManaPlayer.Player.Wing;
+        }
+        else if (bodyPart == BodyPart.Dress)
+        {
+            ManaPlayer.DressData[1] = ManaPlayer.Player.Dress;
+        }
+        else if (bodyPart == BodyPart.Headwear)
+        {
+            ManaPlayer.DressData[3] = ManaPlayer.Player.HeadWear;
+        }
+        else
+        {
+            throw new Exception();
+        }
+    }
+
     public void OnLevelChange()
     {
         if (Ignore)

Assets/Script/SFS/Manager/SFSPlazaRoomManager.cs

@@ -220,7 +220,7 @@ public class SFSPlazaRoomManager
             }
         );
 
-        JoinRoomCoroutine = DelayCall.Call(10f, () => { OnJoinPlazaRoomError(JoinRoomResult.Unknown); });
+        JoinRoomCoroutine = DelayCall.Call(20f, () => { OnJoinPlazaRoomError(JoinRoomResult.Unknown); });
     }
 
     public void TryEnterPlazaRoom()
@@ -518,6 +518,8 @@ public class SFSPlazaRoomManager
         {
             JoinRoomResult = joinRoomResult;
             TryEnterPlazaRoom();
+
+            DelayCall.stopCoroutine(JoinRoomCoroutine);
         }
     }
 

第四期.txt

@@ -1,14 +1,8 @@
-收到MarkError后就不再创建机器人
+//关闭ManaDebug 开启CatchException
 
+//切换到远程服务器
 
-开启公告
-
-
-关闭ManaDebug 开启CatchException
-
-切换到远程服务器
-
-关闭调试按键和界面
+//关闭调试按键和界面
 
 开启Service再打包