增加搭配秀

Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -9098,6 +9098,7 @@ GameObject:
   - component: {fileID: 224985939637195744}
   - component: {fileID: 222726040444587618}
   - component: {fileID: 114255950987616236}
+  - component: {fileID: 114835229075933518}
   m_Layer: 5
   m_Name: Pg_FashionTitleBackground
   m_TagString: Untagged
@@ -13390,6 +13391,7 @@ GameObject:
   - component: {fileID: 224016334341247666}
   - component: {fileID: 222668971028938592}
   - component: {fileID: 114270226636413600}
+  - component: {fileID: 114170249142177442}
   m_Layer: 5
   m_Name: Pg_FashionContentBackground
   m_TagString: Untagged
@@ -22530,6 +22532,69 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u7559\u8A00\u677F"
+--- !u!114 &114170249142177442
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1816981574551056}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 575553740, 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: 114270226636413600}
+  m_TextComponent: {fileID: 114726675665734502}
+  m_Placeholder: {fileID: 0}
+  m_ContentType: 0
+  m_InputType: 0
+  m_AsteriskChar: 42
+  m_KeyboardType: 0
+  m_LineType: 0
+  m_HideMobileInput: 0
+  m_CharacterValidation: 0
+  m_CharacterLimit: 0
+  m_OnEndEdit:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.InputField+SubmitEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.InputField+OnChangeEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+  m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_CustomCaretColor: 0
+  m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
+  m_Text: 
+  m_CaretBlinkRate: 0.85
+  m_CaretWidth: 1
+  m_ReadOnly: 0
 --- !u!114 &114170295345946788
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -30543,7 +30608,7 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 4
-  m_Spacing: 26.85
+  m_Spacing: 41
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0
@@ -31009,7 +31074,7 @@ MonoBehaviour:
     m_HighlightedTrigger: Highlighted
     m_PressedTrigger: Pressed
     m_DisabledTrigger: Disabled
-  m_Interactable: 1
+  m_Interactable: 0
   m_TargetGraphic: {fileID: 114667016830679012}
   m_OnClick:
     m_PersistentCalls:
@@ -33023,7 +33088,7 @@ MonoBehaviour:
   m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Content: {fileID: 0}
+  m_Content: {fileID: 224413326763452394}
   m_Horizontal: 1
   m_Vertical: 0
   m_MovementType: 1
@@ -41697,7 +41762,7 @@ MonoBehaviour:
     m_MaxSize: 20
     m_Alignment: 0
     m_AlignByGeometry: 0
-    m_RichText: 1
+    m_RichText: 0
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
@@ -43422,7 +43487,7 @@ MonoBehaviour:
     m_MaxSize: 30
     m_Alignment: 3
     m_AlignByGeometry: 0
-    m_RichText: 1
+    m_RichText: 0
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
@@ -44421,7 +44486,7 @@ MonoBehaviour:
     m_HighlightedTrigger: Highlighted
     m_PressedTrigger: Pressed
     m_DisabledTrigger: Disabled
-  m_Interactable: 1
+  m_Interactable: 0
   m_TargetGraphic: {fileID: 114204246214179144}
   m_OnClick:
     m_PersistentCalls:
@@ -45411,6 +45476,69 @@ MonoBehaviour:
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
   m_ChildControlHeight: 0
+--- !u!114 &114835229075933518
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1529500552528170}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 575553740, 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: 114255950987616236}
+  m_TextComponent: {fileID: 114779466611016344}
+  m_Placeholder: {fileID: 0}
+  m_ContentType: 0
+  m_InputType: 0
+  m_AsteriskChar: 42
+  m_KeyboardType: 0
+  m_LineType: 0
+  m_HideMobileInput: 0
+  m_CharacterValidation: 0
+  m_CharacterLimit: 0
+  m_OnEndEdit:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.InputField+SubmitEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.InputField+OnChangeEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+  m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_CustomCaretColor: 0
+  m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
+  m_Text: 
+  m_CaretBlinkRate: 0.85
+  m_CaretWidth: 1
+  m_ReadOnly: 0
 --- !u!114 &114837350644250442
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -131,6 +131,13 @@
     <P_SaveSucceed desc=""><![CDATA[保存成功]]></P_SaveSucceed>
     <Pa_Tit desc=""><![CDATA[购买装扮]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[购买]]></Pa_BtnLab>
+    <Pg_Cute desc=""><![CDATA[可爱]]></Pg_Cute>
+    <Pg_Grace desc=""><![CDATA[优雅]]></Pg_Grace>
+    <Pg_Vivid desc=""><![CDATA[活泼]]></Pg_Vivid>
+    <Pg_Simple desc=""><![CDATA[清纯]]></Pg_Simple>
+    <Pg_Glory desc=""><![CDATA[华丽]]></Pg_Glory>
+    <Pg_CloseGridTitle desc=""><![CDATA[所有装扮]]></Pg_CloseGridTitle>
+    <Pg_RecommendTitle desc=""><![CDATA[[&value&] 推荐]]></Pg_RecommendTitle>
     <Q_Tit desc=""><![CDATA[留言板]]></Q_Tit>
     <Q_Placeholder desc=""><![CDATA[给这家主人说点什么吧]]></Q_Placeholder>
     <Q_CommentLab desc=""><![CDATA[留言]]></Q_CommentLab>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -131,6 +131,13 @@
     <P_SaveSucceed desc=""><![CDATA[保存成功]]></P_SaveSucceed>
     <Pa_Tit desc=""><![CDATA[購買裝扮]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[購買]]></Pa_BtnLab>
+    <Pg_Cute desc=""><![CDATA[]]></Pg_Cute>
+    <Pg_Grace desc=""><![CDATA[]]></Pg_Grace>
+    <Pg_Vivid desc=""><![CDATA[]]></Pg_Vivid>
+    <Pg_Simple desc=""><![CDATA[]]></Pg_Simple>
+    <Pg_Glory desc=""><![CDATA[]]></Pg_Glory>
+    <Pg_CloseGridTitle desc=""><![CDATA[]]></Pg_CloseGridTitle>
+    <Pg_RecommendTitle desc=""><![CDATA[]]></Pg_RecommendTitle>
     <Q_Tit desc=""><![CDATA[留言板]]></Q_Tit>
     <Q_Placeholder desc=""><![CDATA[給這家主人說點什麼吧]]></Q_Placeholder>
     <Q_CommentLab desc=""><![CDATA[留言]]></Q_CommentLab>

Assets/Resource/XML/lan/English.xml

@@ -131,6 +131,13 @@ Program 水怪
     <P_SaveSucceed desc=""><![CDATA[Saved]]></P_SaveSucceed>
     <Pa_Tit desc=""><![CDATA[Buy clothing]]></Pa_Tit>
     <Pa_BtnLab desc=""><![CDATA[Buy]]></Pa_BtnLab>
+    <Pg_Cute desc=""><![CDATA[]]></Pg_Cute>
+    <Pg_Grace desc=""><![CDATA[]]></Pg_Grace>
+    <Pg_Vivid desc=""><![CDATA[]]></Pg_Vivid>
+    <Pg_Simple desc=""><![CDATA[]]></Pg_Simple>
+    <Pg_Glory desc=""><![CDATA[]]></Pg_Glory>
+    <Pg_CloseGridTitle desc=""><![CDATA[]]></Pg_CloseGridTitle>
+    <Pg_RecommendTitle desc=""><![CDATA[]]></Pg_RecommendTitle>
     <Q_Tit desc=""><![CDATA[Message board]]></Q_Tit>
     <Q_Placeholder desc=""><![CDATA[Say something to the host]]></Q_Placeholder>
     <Q_CommentLab desc=""><![CDATA[Comment]]></Q_CommentLab>

Assets/Script/Label/LanguageLabel.cs

@@ -140,6 +140,13 @@ public class LanguageLabel
     	public static string UI__P_SaveSucceed = "UI__P_SaveSucceed";
     	public static string UI__Pa_Tit = "UI__Pa_Tit";
     	public static string UI__Pa_BtnLab = "UI__Pa_BtnLab";
+    	public static string UI__Pg_Cute = "UI__Pg_Cute";
+    	public static string UI__Pg_Grace = "UI__Pg_Grace";
+    	public static string UI__Pg_Vivid = "UI__Pg_Vivid";
+    	public static string UI__Pg_Simple = "UI__Pg_Simple";
+    	public static string UI__Pg_Glory = "UI__Pg_Glory";
+    	public static string UI__Pg_CloseGridTitle = "UI__Pg_CloseGridTitle";
+    	public static string UI__Pg_RecommendTitle = "UI__Pg_RecommendTitle";
     	public static string UI__Q_Tit = "UI__Q_Tit";
     	public static string UI__Q_Placeholder = "UI__Q_Placeholder";
     	public static string UI__Q_CommentLab = "UI__Q_CommentLab";

Assets/Script/Object/Player.cs

@@ -251,7 +251,7 @@ public class CloseItem
             {
                 AudioManager.PlayClip(AudioLabel.ClickButton);
 
-                OpenBuyPanel();
+                OpenBuyPanel(NavigateToChargeFromDressroom);
                 //ResourceManager.Get(CanvasLabel.Pa_Info).TweenForCG();
 
                 //float newSize = PixelSize / Sprites[0].rect.width;
@@ -260,11 +260,11 @@ public class CloseItem
                 //ResourceManager.SetText(CanvasLabel.Pa_Lab, Name);
                 //ResourceManager.SetText(CanvasLabel.Pa_BtnLab, Language.GetStr(LanguageLabel.UI__Pa_BtnLab) + Auxiliary.ImageParse(BuyCurrent) + BuyCost);
 
-                ResourceManager.SetButtonEvent
-                (
-                    CanvasLabel.Pa_Btn,
-                    OnBuy
-                );
+                //ResourceManager.SetButtonEvent
+                //(
+                //    CanvasLabel.Pa_Btn,
+                //    () => OnBuy
+                //);
             }
         );
 
@@ -463,7 +463,7 @@ public class CloseItem
         }
     }
 
-    public void OpenBuyPanel()
+    public void OpenBuyPanel(Action navigateAction)
     {
         ResourceManager.Get(CanvasLabel.Pa_Info).TweenForCG();
 
@@ -472,6 +472,12 @@ public class CloseItem
 
         ResourceManager.SetText(CanvasLabel.Pa_Lab, Name);
         ResourceManager.SetText(CanvasLabel.Pa_BtnLab, Language.GetStr(LanguageLabel.UI__Pa_BtnLab) + Auxiliary.ImageParse(BuyCurrent) + BuyCost);
+
+        ResourceManager.SetButtonEvent
+        (
+            CanvasLabel.Pa_Btn,
+            () => OnBuy(navigateAction)
+        );
     }
 
 
@@ -492,8 +498,9 @@ public class CloseItem
         Manager.CloseAmt++;
     }
 
-    public void OnBuy()
+    public void OnBuy(Action navigateAction)
     {
+        bool navigate = navigateAction != null;
         Manager.Pay
         (
             "",
@@ -510,31 +517,12 @@ public class CloseItem
             },
             StaticsManager.ItemID.解锁服装,
             StaticsManager.ConsumeModule.Shop,
-            true,
+            navigate,
             false,
             () =>
             {
                 PlayerManager.Player.ResetDressDatas();
-
-                TweenRoot tweenRoot = ResourceManager.Get(CanvasLabel.Pa_Info).TweenBacCG();
-
-                tweenRoot.AddEventOnetime
-                (
-                    EventType.BackwardFinish,
-                    () =>
-                    {
-                        PlayerManager.Player.LeaveDressroom();
-                    }
-                );
-
-                ResourceManager.Get(CanvasLabel.B_SignIn0).GetTweenCG().AddEventOnetime
-                (
-                    EventType.ForwardFinish,
-                    () =>
-                    {
-                        ResourceManager.Get(CanvasLabel.F_Manage0).TweenForVec();
-                    }
-                );
+                navigateAction.SafeInvoke();
             }
         );
     }
@@ -547,6 +535,29 @@ public class CloseItem
         HttpManager.UploadConfig();
     }
 
+    public void NavigateToChargeFromDressroom()
+    {
+        TweenRoot tweenRoot = ResourceManager.Get(CanvasLabel.Pa_Info).TweenBacCG();
+
+        tweenRoot.AddEventOnetime
+        (
+            EventType.BackwardFinish,
+            () =>
+            {
+                PlayerManager.Player.LeaveDressroom();
+            }
+        );
+
+        ResourceManager.Get(CanvasLabel.B_SignIn0).GetTweenCG().AddEventOnetime
+        (
+            EventType.ForwardFinish,
+            () =>
+            {
+                ResourceManager.Get(CanvasLabel.F_Manage0).TweenForVec();
+            }
+        );
+    }
+
     public void ChangeDress(Player player)
     {
         player.ChangeClose(BodyPart, ArmatureName);
@@ -661,6 +672,24 @@ public class CloseItem
         ExchangeInfo.GetExchangeValue(info, consumeModule);
         return info;
     }
+
+
+    public static List<KV<Current, double>> GetTotalBuyCost(List<int> closeIDs)
+    {
+        double totalCoin = 0;
+        double totalDiamond = 0;
+        foreach (var closeID in closeIDs)
+        {
+            CloseItem closeItem = PlayerManager.CloseItemDictionary[closeID];
+            if (closeItem.IsBought) continue;
+            if (closeItem.BuyCurrent == Current.Coin) totalCoin += closeItem.BuyCost;
+            if (closeItem.BuyCurrent == Current.Diamond) totalDiamond += closeItem.BuyCost;
+        }
+        List<KV<Current, double>> results = new List<KV<Current, double>>();
+        results.Add(new KV<Current, double>(Current.Coin, totalCoin));
+        results.Add(new KV<Current, double>(Current.Diamond, totalDiamond));
+        return results;
+    }
 }
 
 public enum PlayerDirection
@@ -1069,6 +1098,28 @@ public class Player : Regist , IPointerClickHandler
         PlayerManager.BuildPlayer(dressData);
     }
 
+    public List<int> GetCurrentChangableDressIDs()
+    {
+        List<int> ids = new List<int>();
+        //if (PlayAnimFlag1) ids.Add(PlayerManager.CloseIDDictionary[TempClose]);
+        //else ids.Add(PlayerManager.CloseIDDictionary[Eye]);
+        ids.Add(PlayerManager.CloseIDDictionary[Top]);
+        ids.Add(PlayerManager.CloseIDDictionary[Shoe]);
+        ids.Add(PlayerManager.CloseIDDictionary[Head]);
+        if (Wing != "Empty")
+        {
+            ids.Add(PlayerManager.CloseIDDictionary[Wing]);
+        }
+        ids.Add(PlayerManager.CloseIDDictionary[Dress]);
+        //ids.Add(PlayerManager.CloseIDDictionary[Mouse]);
+        ids.Add(PlayerManager.CloseIDDictionary[HeadWear]);
+        //ids.Add(PlayerManager.CloseIDDictionary[LeftLongSleeve]);
+        //ids.Add(PlayerManager.CloseIDDictionary[LeftShortSleeve]);
+        //ids.Add(PlayerManager.CloseIDDictionary[RightLongSleeve]);
+        //ids.Add(PlayerManager.CloseIDDictionary[RightShortSleeve]);
+        return ids;
+    }
+
     public void BuyDressNavigate(List<CloseItem> closeUnitList)
     {
         for (int i = 0; i < closeUnitList.Count; i++)

Assets/Script/Social/FashionShowCloseItem.cs

@@ -16,21 +16,26 @@ public class FashionShowCloseItem
     private TextPlus BuyButtonText;
     //EndMark-Used by LabelUtility-Do not remove
 
+    private Button BoxButton;
+
     #endregion
 
     public void Init(int closeID, Transform fashionShowCloseItem)
     {
         Dictionary<string, Transform> childDictionary = new Dictionary<string, Transform>();
         Auxiliary.CompileDic(fashionShowCloseItem, childDictionary);
-        Icon1 = childDictionary["Icon1"].GetComponent<Image>();
-        Icon2 = childDictionary["Icon2"].GetComponent<Image>();
-        Icon3 = childDictionary["Icon3"].GetComponent<Image>();
-        BuyButton = childDictionary["BuyButton"].GetComponent<Button>();
-        BuyButtonText = childDictionary["BuyButtonText"].GetComponent<TextPlus>();
+        Icon1 = childDictionary[FashionShowCloseItemLabel.Icon1].GetComponent<Image>();
+        Icon2 = childDictionary[FashionShowCloseItemLabel.Icon2].GetComponent<Image>();
+        Icon3 = childDictionary[FashionShowCloseItemLabel.Icon3].GetComponent<Image>();
+        BuyButton = childDictionary[FashionShowCloseItemLabel.BuyButton].GetComponent<Button>();
+        BoxButton = childDictionary[FashionShowCloseItemLabel.FashionShowCloseItem].GetComponent<Button>();
+        BuyButtonText = childDictionary[FashionShowCloseItemLabel.BuyButtonText].GetComponent<TextPlus>();
 
         CloseItem closeItem = PlayerManager.CloseItemDictionary[closeID];
         closeItem.SetupStandardItem(Icon1, Icon2, Icon3, BuyButton, BuyButtonText);
+        BuyButton.SetActive(false);
+        BoxButton.interactable = !closeItem.IsBought;
 
-
+        BoxButton.onClick.AddListener(() => closeItem.OpenBuyPanel(null));
     }
 }

Assets/Script/Social/FashionShowCloseItemLabel.cs

@@ -0,0 +1,16 @@
+public class FashionShowCloseItemLabel
+{
+	#region Config
+
+	//StartMark-Used by LabelUtility-Do not remove
+	public static string FashionShowCloseItem = "FashionShowCloseItem";
+	public static string Icon1 = "Icon1";
+	public static string Icon3 = "Icon3";
+	public static string Icon2 = "Icon2";
+	public static string BuyButton = "BuyButton";
+	public static string BuyButtonText = "BuyButtonText";
+	public static string BuyButtonImagePlus = "BuyButtonImagePlus";
+	//EndMark-Used by LabelUtility-Do not remove
+
+	#endregion
+}

Assets/Script/Social/FashionShowCloseItemLabel.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 84afe1ead5009a24fb5a645aef7ea54e
+timeCreated: 1513675919
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/Social/FashionShowEditPage.cs

@@ -62,6 +62,9 @@ public class FashionShowEditPage : Regist
     private static Transform VividRateBackground;
     private static Transform SimpleRateBackground;
     private static Transform GloryRateBackground;
+    private static Transform FashionShowCloseGrid;
+    private static InputField FashionTitleInputField;
+    private static InputField FashionContentInputField;
 
     private static TweenRenderer PlayerTween;
 
@@ -123,6 +126,16 @@ public class FashionShowEditPage : Regist
         VividRateBackground = ResourceManager.Get(CanvasLabel.Pg_VividRateBackground);
         SimpleRateBackground = ResourceManager.Get(CanvasLabel.Pg_SimpleRateBackground);
         GloryRateBackground = ResourceManager.Get(CanvasLabel.Pg_GloryRateBackground);
+        FashionShowCloseGrid = ResourceManager.Get(CanvasLabel.Pg_FashionShowCloseGrid);
+        FashionTitleInputField = ResourceManager.Get<InputField>(CanvasLabel.Pg_FashionTitleBackground);
+        FashionContentInputField = ResourceManager.Get<InputField>(CanvasLabel.Pg_FashionContentBackground);
+
+        LanguageManager.Add(CuteTitle, new MulLanStr(LanguageLabel.UI__Pg_Cute));
+        LanguageManager.Add(GraceTitle, new MulLanStr(LanguageLabel.UI__Pg_Grace));
+        LanguageManager.Add(SimpleTitle, new MulLanStr(LanguageLabel.UI__Pg_Simple));
+        LanguageManager.Add(VividTitle, new MulLanStr(LanguageLabel.UI__Pg_Vivid));
+        LanguageManager.Add(GloryTitle, new MulLanStr(LanguageLabel.UI__Pg_Glory));
+        LanguageManager.Add(FashionShowClosesTitle, new MulLanStr(LanguageLabel.UI__Pg_CloseGridTitle));
 
         Panel.CreateTweenVec2D(ResourceManager.Get(CanvasLabel.Pg_FashionShowEditPanelPosition).position, 0.5f, false, false, true, Curve.EaseOutQuad);
         ChangeDressPanel.CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
@@ -132,22 +145,61 @@ public class FashionShowEditPage : Regist
         GardenFashionShowButton.onClick.AddListener(OnGardenFashionShowButtonClick);
         DressroomFashionShowButton.onClick.AddListener(OnDressroomFashionShowButtonClick);
         Manager.OnLevelChange += OnLevelChange;
+        Manager.OnCoinChange += amt => { CoinText.text = ResourceManager.Get<Text>(CanvasLabel.F_CoinLab).text; };
+        Manager.OnDiamondChange += amt => { DiamondText.text = ResourceManager.Get<Text>(CanvasLabel.F_DiamondLab).text; };
     }
 
 
-    private static void ShowPanel()
+    private static void ShowPanel(List<int> closeIDs)
     {
         Renderer renderer = PlayerManager.Player.HeadSlot.UnityTransform.GetComponentInChildren<Renderer>();
         PlayerTween = AnimManager.CreateTweenRenderer(renderer, 0, 1, 0.25f, false, true, Curve.EaseOutQuad);
         PlayerTween.UseSharedMaterial = true;
         PlayerTween.StartBackward();
-
+        
         ChangeDressPanel.GetTweenCG().AddEventOnetime(EventType.BackwardFinish, () => { Panel.TweenForVec(); });
         ChangeDressPanel.TweenBacCG();
 
-        Transform itemTrans = ResourceManager.Get(ResourceLabel.FashionShowCloseItem, Folder.UI, false, ResourceManager.Get(CanvasLabel.Pg_FashionShowCloseGrid), false, ObjType.FashionShowCloseItem);
-        FashionShowCloseItem item = new FashionShowCloseItem();
-        item.Init(7, itemTrans);
+        CuteValue.text = "--";
+        GloryValue.text = "--";
+        GraceValue.text = "--";
+        SimpleValue.text = "--";
+        VividValue.text = "--";
+        CuteSlider.interactable = false;
+        GlorySlider.interactable = false;
+        GraceSlider.interactable = false;
+        SimpleSlider.interactable = false;
+        VividSlider.interactable = false;
+        FashionTitleInputField.text = "";
+        FashionContentInputField.text = "";
+        FashionTitleInputField.interactable = false;
+        FashionContentInputField.interactable = false;
+        RecommendTitle.text = Language.GetStr(LanguageLabel.UI__Pg_RecommendTitle).Replace(TransferLabel.Value, NickNameManager.NickName);
+        DeleteButton.SetActive(true);
+        SaveButton.SetActive(true);
+        ResetButton.SetActive(true);
+        PraiseButton.SetActive(false);
+        ShareButton.SetActive(false);
+        CommentButton.SetActive(false);
+        DisplayEditButton.SetActive(false);
+
+        while (FashionShowCloseGrid.childCount > 0)
+        {
+            ResourceManager.Save(FashionShowCloseGrid.GetChild(0));
+        }
+        foreach (var closeID in closeIDs)
+        {
+            Transform itemTrans = ResourceManager.Get(ResourceLabel.FashionShowCloseItem, Folder.UI, false, FashionShowCloseGrid, false, ObjType.FashionShowCloseItem);
+            FashionShowCloseItem item = new FashionShowCloseItem();
+            item.Init(closeID, itemTrans);
+        }
+
+        List<KV<Current, double>> costKvs = CloseItem.GetTotalBuyCost(closeIDs);
+        foreach (var costKv in costKvs)
+        {
+            if (costKv.Key == Current.Coin) CloseTotalCoinText.text = Auxiliary.ShrinkNumberStr(costKv.Value);
+            if (costKv.Key == Current.Diamond) CloseTotalDiamondText.text = Auxiliary.ShrinkNumberStr(costKv.Value);
+        }
     }
 
     private static void HidePanel()
@@ -178,6 +230,6 @@ public class FashionShowEditPage : Regist
 
     private static void OnDressroomFashionShowButtonClick()
     {
-        ShowPanel();
+        ShowPanel(PlayerManager.Player.GetCurrentChangableDressIDs());
     }
 }

Assets/Tookits/LabelUtility/LabelUtility.prefab

@@ -85,10 +85,10 @@ MonoBehaviour:
     TotalHeight: 18
     ComponentPurviews: 
   - Name: Temp
-    LabelScriptPath: 
-    LabelScriptName: 
-    LabePrefix: private static string
-    LabelScript: {fileID: 0}
+    LabelScriptPath: Assets\Script\Social
+    LabelScriptName: FashionShowCloseItemLabel
+    LabePrefix: public static string
+    LabelScript: {fileID: 11500000, guid: 84afe1ead5009a24fb5a645aef7ea54e, type: 3}
     ComponentScriptPath: 
     ComponentScriptName: 
     ComponentPrefix: private
@@ -99,5 +99,5 @@ MonoBehaviour:
     Prefabs:
     - {fileID: 1887102537064112, guid: 54874ae024488a042a77657efe49f358, type: 2}
     FoldOut: 1
-    TotalHeight: 540
+    TotalHeight: 432
     ComponentPurviews: 020000000000000003000000

第五期.txt

@@ -2,7 +2,7 @@ LabelUtility
 {
   找不到标记自动添加一组
   自动完成注册(Prefix和Suffix 备注:从ResourceManager注册 从ChildDic注册 备注:需要引入新的Mark)
-  可以手动添加需要的组件
+  可以手动添加需要的组件(自动寻找组件修改为自动添加需要组件)
 }