فهرست منبع

修改搭配秀

LiuQilin 7 سال پیش
والد
کامیت
429562fe33
29فایلهای تغییر یافته به همراه1165 افزوده شده و 82 حذف شده
  1. 99 15
      Assets/Resource/Prefab/PrefabUI/Canvas.prefab
  2. 350 5
      Assets/Resource/Prefab/PrefabUI/FashionShowCloseBox.prefab
  3. 2 1
      Assets/Resource/XML/lan/ChineseSimplified.xml
  4. 1 0
      Assets/Resource/XML/lan/ChineseTraditional.xml
  5. 1 0
      Assets/Resource/XML/lan/English.xml
  6. BIN
      Assets/Resource/Xlsx/language_config.xlsx
  7. 2 1
      Assets/Script/Label/CanvasLabel.cs
  8. 16 1
      Assets/Script/Label/LanguageLabel.cs
  9. 9 0
      Assets/Script/Manage/FashionShowHttp.meta
  10. 65 0
      Assets/Script/Manage/FashionShowHttp/AddShowHttp.cs
  11. 12 0
      Assets/Script/Manage/FashionShowHttp/AddShowHttp.cs.meta
  12. 45 0
      Assets/Script/Manage/FashionShowHttp/CommentShowHttp.cs
  13. 12 0
      Assets/Script/Manage/FashionShowHttp/CommentShowHttp.cs.meta
  14. 14 0
      Assets/Script/Manage/FashionShowHttp/FashionShowType.cs
  15. 12 0
      Assets/Script/Manage/FashionShowHttp/FashionShowType.cs.meta
  16. 43 0
      Assets/Script/Manage/FashionShowHttp/PraiseShowHttp.cs
  17. 12 0
      Assets/Script/Manage/FashionShowHttp/PraiseShowHttp.cs.meta
  18. 56 0
      Assets/Script/Manage/FashionShowHttp/RateShowHttp.cs
  19. 12 0
      Assets/Script/Manage/FashionShowHttp/RateShowHttp.cs.meta
  20. 43 0
      Assets/Script/Manage/FashionShowHttp/ShowCommentsHttp.cs
  21. 12 0
      Assets/Script/Manage/FashionShowHttp/ShowCommentsHttp.cs.meta
  22. 47 0
      Assets/Script/Manage/FashionShowHttp/ShowListHttp.cs
  23. 12 0
      Assets/Script/Manage/FashionShowHttp/ShowListHttp.cs.meta
  24. 15 0
      Assets/Script/Manage/FashionShowHttp/ShowRateData.cs
  25. 12 0
      Assets/Script/Manage/FashionShowHttp/ShowRateData.cs.meta
  26. 12 4
      Assets/Script/Manage/HttpManager.cs
  27. 2 2
      Assets/Script/Social/FashionShowCloseBox.cs
  28. 243 51
      Assets/Script/Social/FashionShowEditPage.cs
  29. 4 2
      第五期.txt

+ 99 - 15
Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -3347,6 +3347,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1179876819904942
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224259883764621480}
+  - component: {fileID: 222273538223936112}
+  - component: {fileID: 114499566768838642}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1180271461380758
 GameObject:
   m_ObjectHideFlags: 1
@@ -14305,6 +14322,7 @@ GameObject:
   - component: {fileID: 222407071731414308}
   - component: {fileID: 114205389451963658}
   - component: {fileID: 114109641481820018}
+  - component: {fileID: 114325910027983378}
   m_Layer: 5
   m_Name: Pg_RateButton
   m_TagString: Untagged
@@ -20917,7 +20935,7 @@ MonoBehaviour:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1581880205243562}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
@@ -24527,7 +24545,7 @@ MonoBehaviour:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1474775570115746}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
@@ -26575,7 +26593,7 @@ MonoBehaviour:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1193289643163904}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
@@ -26608,7 +26626,7 @@ MonoBehaviour:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1654667645793430}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
@@ -26770,7 +26788,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 21300000, guid: 9581ccebf924e0d40bc15fdadc255351, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -27416,7 +27434,7 @@ MonoBehaviour:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1728918085616362}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
@@ -28209,7 +28227,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 21300000, guid: 9581ccebf924e0d40bc15fdadc255351, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -28510,7 +28528,7 @@ MonoBehaviour:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1407528392767648}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
@@ -28604,7 +28622,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 21300000, guid: 9581ccebf924e0d40bc15fdadc255351, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -30332,7 +30350,7 @@ MonoBehaviour:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1015639056508940}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
@@ -30817,6 +30835,20 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u53D6\u6D88"
+--- !u!114 &114325910027983378
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1799628466553676}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 1, g: 0, b: 0, a: 1}
+  m_EffectDistance: {x: 2, y: -2}
+  m_UseGraphicAlpha: 1
 --- !u!114 &114326412563911878
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -37666,6 +37698,33 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114499566768838642
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1179876819904942}
+  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: f6baf652ebcd8ed4093bcf36bbc8a007, 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 &114500764111181282
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -39916,7 +39975,7 @@ MonoBehaviour:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1723479803075880}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
@@ -53327,7 +53386,7 @@ MonoBehaviour:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1319964447016462}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
@@ -56151,7 +56210,7 @@ MonoBehaviour:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1240335620635706}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
@@ -61334,6 +61393,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1861830542535500}
+--- !u!222 &222273538223936112
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1179876819904942}
 --- !u!222 &222274129161667264
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -70517,6 +70582,24 @@ RectTransform:
   m_AnchoredPosition: {x: -25.1, y: 4.7}
   m_SizeDelta: {x: 23.9, y: 21.6}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224259883764621480
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1179876819904942}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_Children: []
+  m_Father: {fileID: 224815938603451662}
+  m_RootOrder: 0
+  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, y: -94.11}
+  m_SizeDelta: {x: 210, y: 40}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224261198272959660
 RectTransform:
   m_ObjectHideFlags: 1
@@ -72994,7 +73077,7 @@ RectTransform:
   m_LocalScale: {x: 0.9329999, y: 0.9329999, z: 0.9329999}
   m_Children: []
   m_Father: {fileID: 224815938603451662}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -77695,7 +77778,7 @@ RectTransform:
   - {fileID: 224176107121236314}
   - {fileID: 224239008306785784}
   m_Father: {fileID: 224815938603451662}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -81625,6 +81708,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 224259883764621480}
   - {fileID: 224400362593509352}
   - {fileID: 224617861767369824}
   m_Father: {fileID: 224885158513677532}

+ 350 - 5
Assets/Resource/Prefab/PrefabUI/FashionShowCloseBox.prefab

@@ -116,6 +116,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1247928191986344
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224215574197954050}
+  - component: {fileID: 222358514227838076}
+  - component: {fileID: 114078166965629544}
+  m_Layer: 5
+  m_Name: C_Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1266546654056180
 GameObject:
   m_ObjectHideFlags: 0
@@ -131,6 +148,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1275364335888350
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224648394265863932}
+  - component: {fileID: 222570653949591904}
+  - component: {fileID: 114414564421138962}
+  m_Layer: 5
+  m_Name: B_Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1315386913123410
 GameObject:
   m_ObjectHideFlags: 1
@@ -288,6 +322,40 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1666025940279968
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224103134403216572}
+  - component: {fileID: 222807700078592042}
+  - component: {fileID: 114268705030609354}
+  m_Layer: 5
+  m_Name: E_Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1684941920053120
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224234127577587754}
+  - component: {fileID: 222214419336990008}
+  - component: {fileID: 114393510362596754}
+  m_Layer: 5
+  m_Name: D_Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1696470929713364
 GameObject:
   m_ObjectHideFlags: 1
@@ -324,6 +392,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1728582398649662
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224970017370662646}
+  - component: {fileID: 222395727563051982}
+  - component: {fileID: 114031405327367840}
+  m_Layer: 5
+  m_Name: A_Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1752240367066550
 GameObject:
   m_ObjectHideFlags: 1
@@ -542,6 +627,33 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114031405327367840
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1728582398649662}
+  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: f6baf652ebcd8ed4093bcf36bbc8a007, 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 &114041163425770886
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -583,6 +695,33 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114078166965629544
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1247928191986344}
+  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: f6baf652ebcd8ed4093bcf36bbc8a007, 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 &114084373302391084
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -913,6 +1052,33 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114268705030609354
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1666025940279968}
+  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: f6baf652ebcd8ed4093bcf36bbc8a007, 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 &114316835851471030
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -973,6 +1139,33 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 0
+--- !u!114 &114393510362596754
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1684941920053120}
+  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: f6baf652ebcd8ed4093bcf36bbc8a007, 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 &114406218505643638
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1041,6 +1234,33 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114414564421138962
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1275364335888350}
+  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: f6baf652ebcd8ed4093bcf36bbc8a007, 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 &114438923838971350
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1786,6 +2006,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1980472306202888}
+--- !u!222 &222214419336990008
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1684941920053120}
 --- !u!222 &222234869573912058
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -1822,6 +2048,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1792386106415838}
+--- !u!222 &222358514227838076
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1247928191986344}
 --- !u!222 &222375944770178340
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -1834,6 +2066,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1315386913123410}
+--- !u!222 &222395727563051982
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1728582398649662}
 --- !u!222 &222424269937092962
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -1846,6 +2084,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1000771760147324}
+--- !u!222 &222570653949591904
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1275364335888350}
 --- !u!222 &222608287925326326
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -1870,6 +2114,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1603229387967782}
+--- !u!222 &222807700078592042
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1666025940279968}
 --- !u!222 &222898156443408238
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -1895,6 +2145,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 51.099976, y: 45.299988}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224103134403216572
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1666025940279968}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_Children: []
+  m_Father: {fileID: 224297775971443796}
+  m_RootOrder: 0
+  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: 1.66, y: -88.12}
+  m_SizeDelta: {x: 210, y: 40}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224131076373525684
 RectTransform:
   m_ObjectHideFlags: 1
@@ -1927,7 +2195,7 @@ RectTransform:
   - {fileID: 224578430309886880}
   - {fileID: 224225934111306550}
   m_Father: {fileID: 224297775971443796}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1947,13 +2215,31 @@ RectTransform:
   - {fileID: 224100616564450604}
   - {fileID: 224746299562717448}
   m_Father: {fileID: 224432134195382954}
-  m_RootOrder: 0
+  m_RootOrder: 1
   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.0010262, y: -165.6}
   m_SizeDelta: {x: 347.77, y: 75}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224215574197954050
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1247928191986344}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_Children: []
+  m_Father: {fileID: 224614117914306190}
+  m_RootOrder: 0
+  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: 1.66, y: -88.12}
+  m_SizeDelta: {x: 210, y: 40}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224225934111306550
 RectTransform:
   m_ObjectHideFlags: 1
@@ -1972,6 +2258,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 58.6, y: 61.8}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224234127577587754
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1684941920053120}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_Children: []
+  m_Father: {fileID: 224432134195382954}
+  m_RootOrder: 0
+  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: 1.6599464, y: -88.11997}
+  m_SizeDelta: {x: 210, y: 40}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224265603061263988
 RectTransform:
   m_ObjectHideFlags: 1
@@ -2018,6 +2322,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.41, y: 0.41, z: 1}
   m_Children:
+  - {fileID: 224103134403216572}
   - {fileID: 224200952868343274}
   m_Father: {fileID: 224958522131875874}
   m_RootOrder: 4
@@ -2040,7 +2345,7 @@ RectTransform:
   - {fileID: 224131076373525684}
   - {fileID: 224943052951140786}
   m_Father: {fileID: 224796875692514438}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2057,6 +2362,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.41, y: 0.41, z: 1}
   m_Children:
+  - {fileID: 224648394265863932}
   - {fileID: 224648114471387560}
   m_Father: {fileID: 224958522131875874}
   m_RootOrder: 1
@@ -2094,6 +2400,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.41, y: 0.41, z: 1}
   m_Children:
+  - {fileID: 224234127577587754}
   - {fileID: 224202252458802612}
   m_Father: {fileID: 224958522131875874}
   m_RootOrder: 3
@@ -2188,6 +2495,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.41, y: 0.41, z: 1}
   m_Children:
+  - {fileID: 224215574197954050}
   - {fileID: 224967999587080508}
   m_Father: {fileID: 224958522131875874}
   m_RootOrder: 2
@@ -2210,13 +2518,31 @@ RectTransform:
   - {fileID: 224587676060109348}
   - {fileID: 224271322985346070}
   m_Father: {fileID: 224378653700916652}
-  m_RootOrder: 0
+  m_RootOrder: 1
   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.0010262, y: -165.6}
   m_SizeDelta: {x: 347.77, y: 75}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224648394265863932
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1275364335888350}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_Children: []
+  m_Father: {fileID: 224378653700916652}
+  m_RootOrder: 0
+  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: 1.66, y: -88.12}
+  m_SizeDelta: {x: 210, y: 40}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224666612108067186
 RectTransform:
   m_ObjectHideFlags: 1
@@ -2263,6 +2589,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.8565346, y: 0.8565346, z: 0.8565346}
   m_Children:
+  - {fileID: 224970017370662646}
   - {fileID: 224306606865634518}
   m_Father: {fileID: 224958522131875874}
   m_RootOrder: 0
@@ -2362,10 +2689,28 @@ RectTransform:
   - {fileID: 224490692592337912}
   - {fileID: 224523223528571376}
   m_Father: {fileID: 224614117914306190}
-  m_RootOrder: 0
+  m_RootOrder: 1
   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.0010262, y: -165.6}
   m_SizeDelta: {x: 347.77, y: 75}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224970017370662646
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1728582398649662}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_Children: []
+  m_Father: {fileID: 224796875692514438}
+  m_RootOrder: 0
+  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: 3.7, y: -92.91}
+  m_SizeDelta: {x: 210, y: 40}
+  m_Pivot: {x: 0.5, y: 0.5}

+ 2 - 1
Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -151,10 +151,11 @@
     <Pg_BadTitle desc=""><![CDATA[装扮名字包含敏感词]]></Pg_BadTitle>
     <Pg_BadContent desc=""><![CDATA[装扮介绍包含敏感词]]></Pg_BadContent>
     <Pg_RepeatData desc=""><![CDATA[请勿重复提交]]></Pg_RepeatData>
+    <Pg_RateDidntChange desc=""><![CDATA[请完成所有打分后再保存]]></Pg_RateDidntChange>
     <Ph_Tit desc=""><![CDATA[评论板]]></Ph_Tit>
     <Ph_Placeholder desc=""><![CDATA[评论]]></Ph_Placeholder>
     <Ph_CommentLab desc=""><![CDATA[评论]]></Ph_CommentLab>
-    <Ph_ContentTitle desc=""><![CDATA[评论]]></Ph_ContentTitle>
+    <Ph_ContentTitle desc=""><![CDATA[l]]></Ph_ContentTitle>
     <Ph_NicknameTitle desc=""><![CDATA[昵称]]></Ph_NicknameTitle>
     <Ph_CloseLab desc=""><![CDATA[关闭]]></Ph_CloseLab>
     <Pi_Title desc=""><![CDATA[搭配秀]]></Pi_Title>

+ 1 - 0
Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -151,6 +151,7 @@
     <Pg_BadTitle desc=""><![CDATA[裝扮名字包含敏感詞]]></Pg_BadTitle>
     <Pg_BadContent desc=""><![CDATA[裝扮介紹包含敏感詞]]></Pg_BadContent>
     <Pg_RepeatData desc=""><![CDATA[請勿重複提交]]></Pg_RepeatData>
+    <Pg_RateDidntChange desc=""><![CDATA[請完成所有打分後再保存]]></Pg_RateDidntChange>
     <Ph_Tit desc=""><![CDATA[評論板]]></Ph_Tit>
     <Ph_Placeholder desc=""><![CDATA[評論]]></Ph_Placeholder>
     <Ph_CommentLab desc=""><![CDATA[評論]]></Ph_CommentLab>

+ 1 - 0
Assets/Resource/XML/lan/English.xml

@@ -151,6 +151,7 @@ Program 水怪
     <Pg_BadTitle desc=""><![CDATA[Sensitive words in title]]></Pg_BadTitle>
     <Pg_BadContent desc=""><![CDATA[Sensitive words in content]]></Pg_BadContent>
     <Pg_RepeatData desc=""><![CDATA[Please submit only once]]></Pg_RepeatData>
+    <Pg_RateDidntChange desc=""><![CDATA[Rate them all before you save]]></Pg_RateDidntChange>
     <Ph_Tit desc=""><![CDATA[Comment]]></Ph_Tit>
     <Ph_Placeholder desc=""><![CDATA[Comment]]></Ph_Placeholder>
     <Ph_CommentLab desc=""><![CDATA[Comment]]></Ph_CommentLab>

BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 2 - 1
Assets/Script/Label/CanvasLabel.cs

@@ -46,7 +46,6 @@ public class CanvasLabel
     public static string C_MiniArrow0 = "C_MiniArrow0";
     public static string C_MiniArrow1 = "C_MiniArrow1";
     public static string C_MiniGameLab = "C_MiniGameLab";
-    public static string C_MinigameMask = "C_MinigameMask";
     public static string C_Group0 = "C_Group0";
     public static string C_Group = "C_Group";
     public static string C_Tip = "C_Tip";
@@ -601,6 +600,8 @@ public class CanvasLabel
     public static string Pg_GloryHandle = "Pg_GloryHandle";
     public static string Pg_GloryRateBackground = "Pg_GloryRateBackground";
     public static string Pg_GloryRateText = "Pg_GloryRateText";
+    public static string Pg_SubmitRateButton = "Pg_SubmitRateButton";
+    public static string Pg_ResetRateButton = "Pg_ResetRateButton";
     public static string Pg_RateButton = "Pg_RateButton";
     public static string Pg_Frame = "Pg_Frame";
     public static string Pg_FashionShowClosesTitle = "Pg_FashionShowClosesTitle";

+ 16 - 1
Assets/Script/Label/LanguageLabel.cs

@@ -20,7 +20,7 @@ public class LanguageLabel
     public static string UI__AJ_Content = "UI__AJ_Content";
     public static string UI__AJ_UpdateFailed = "UI__AJ_UpdateFailed";
     //StartMark-Used by LabelUtility-Do not remove
-    public static string UI = "UI";
+    	public static string UI = "UI";
     	public static string UI__C_MiniGameLab = "UI__C_MiniGameLab";
     	public static string UI__C_GardenLab = "UI__C_GardenLab";
     	public static string UI__C_DressRoom = "UI__C_DressRoom";
@@ -163,6 +163,7 @@ public class LanguageLabel
     	public static string UI__Pg_BadTitle = "UI__Pg_BadTitle";
     	public static string UI__Pg_BadContent = "UI__Pg_BadContent";
     	public static string UI__Pg_RepeatData = "UI__Pg_RepeatData";
+    	public static string UI__Pg_RateDidntChange = "UI__Pg_RateDidntChange";
     	public static string UI__Ph_Tit = "UI__Ph_Tit";
     	public static string UI__Ph_Placeholder = "UI__Ph_Placeholder";
     	public static string UI__Ph_CommentLab = "UI__Ph_CommentLab";
@@ -812,6 +813,12 @@ public class LanguageLabel
     	public static string DressRoom__Armature28 = "DressRoom__Armature28";
     	public static string DressRoom__Armature29 = "DressRoom__Armature29";
     	public static string DressRoom__Armature30 = "DressRoom__Armature30";
+    	public static string DressRoom__Armature31 = "DressRoom__Armature31";
+    	public static string DressRoom__Armature32 = "DressRoom__Armature32";
+    	public static string DressRoom__Armature33 = "DressRoom__Armature33";
+    	public static string DressRoom__Armature34 = "DressRoom__Armature34";
+    	public static string DressRoom__Armature35 = "DressRoom__Armature35";
+    	public static string DressRoom__Armature36 = "DressRoom__Armature36";
     	public static string DressRoom__Armature201 = "DressRoom__Armature201";
     	public static string DressRoom__Armature202 = "DressRoom__Armature202";
     	public static string DressRoom__Armature203 = "DressRoom__Armature203";
@@ -829,6 +836,8 @@ public class LanguageLabel
     	public static string DressRoom__Armature215 = "DressRoom__Armature215";
     	public static string DressRoom__Armature216 = "DressRoom__Armature216";
     	public static string DressRoom__Armature217 = "DressRoom__Armature217";
+    	public static string DressRoom__Armature218 = "DressRoom__Armature218";
+    	public static string DressRoom__Armature219 = "DressRoom__Armature219";
     	public static string DressRoom__Armature401 = "DressRoom__Armature401";
     	public static string DressRoom__Armature402 = "DressRoom__Armature402";
     	public static string DressRoom__Armature403 = "DressRoom__Armature403";
@@ -844,6 +853,8 @@ public class LanguageLabel
     	public static string DressRoom__Armature413 = "DressRoom__Armature413";
     	public static string DressRoom__Armature414 = "DressRoom__Armature414";
     	public static string DressRoom__Armature415 = "DressRoom__Armature415";
+    	public static string DressRoom__Armature416 = "DressRoom__Armature416";
+    	public static string DressRoom__Armature417 = "DressRoom__Armature417";
     	public static string DressRoom__Armature601 = "DressRoom__Armature601";
     	public static string DressRoom__Armature602 = "DressRoom__Armature602";
     	public static string DressRoom__Armature603 = "DressRoom__Armature603";
@@ -856,6 +867,8 @@ public class LanguageLabel
     	public static string DressRoom__Armature610 = "DressRoom__Armature610";
     	public static string DressRoom__Armature611 = "DressRoom__Armature611";
     	public static string DressRoom__Armature612 = "DressRoom__Armature612";
+    	public static string DressRoom__Armature613 = "DressRoom__Armature613";
+    	public static string DressRoom__Armature614 = "DressRoom__Armature614";
     	public static string DressRoom__Armature801 = "DressRoom__Armature801";
     	public static string DressRoom__Armature802 = "DressRoom__Armature802";
     	public static string DressRoom__Armature803 = "DressRoom__Armature803";
@@ -873,6 +886,8 @@ public class LanguageLabel
     	public static string DressRoom__Armature815 = "DressRoom__Armature815";
     	public static string DressRoom__Armature816 = "DressRoom__Armature816";
     	public static string DressRoom__Armature817 = "DressRoom__Armature817";
+    	public static string DressRoom__Armature818 = "DressRoom__Armature818";
+    	public static string DressRoom__Armature819 = "DressRoom__Armature819";
     	public static string DressRoom__Armature1001 = "DressRoom__Armature1001";
     	public static string DressRoom__Armature1002 = "DressRoom__Armature1002";
     	public static string DressRoom__Armature1003 = "DressRoom__Armature1003";

+ 9 - 0
Assets/Script/Manage/FashionShowHttp.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 020dd19e6e8040d42951061abb7f1e67
+folderAsset: yes
+timeCreated: 1522659040
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 65 - 0
Assets/Script/Manage/FashionShowHttp/AddShowHttp.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using LitJson;
+using UnityEngine;
+
+public class AddShowHttp
+{
+    private static Action succeedCallback;
+    private static Action failedCallback;
+
+    public static void Test()
+    {
+        FashionShowData data = new FashionShowData();
+        data.RefererId = "1000000";
+        data.ShowName = "Name";
+        data.ShowContent = "Content";
+        data.CloseIDs.Add(0);
+        data.CloseIDs.Add(0);
+        data.CloseIDs.Add(0);
+        data.CloseIDs.Add(0);
+        data.CloseIDs.Add(0);
+        data.CloseIDs.Add(0);
+        data.CloseIDs.Add(0);
+        data.CloseIDs.Add(0);
+        data.CloseIDs.Add(0);
+        Add(data, null, null);
+    }
+
+    public static void Add(FashionShowData data, Action succeedCallback, Action failedCallback)
+    {
+        AddShowHttp.succeedCallback = succeedCallback;
+        AddShowHttp.failedCallback = failedCallback;
+
+        URLRequestData requestData = new URLRequestData();
+        requestData.Add("u", long.Parse(data.RefererId));
+        requestData.Add("tl", data.ShowName);
+        requestData.Add("ct", data.ShowContent);
+        requestData.Add("hd", data.GetHeadId());
+        requestData.Add("hw", data.GetHeadwearId());
+        requestData.Add("ey", data.GetEyeId());
+        requestData.Add("mo", data.GetMouseId());
+        requestData.Add("cl", data.GetTopId());
+        requestData.Add("sk", data.GetSkirtId());
+        requestData.Add("sh", data.GetShoeId());
+        requestData.Add("wi", data.GetWingId());
+
+        //URLRequest.CreateURLRequest(true, HttpManager.AddShowURL, requestData,
+        //    Callback, URLRequest.Method.POST);
+
+        URLRequest.CreateStrURLRequest(true, HttpManager.AddShowURL, requestData,
+            Callback, URLRequest.Method.POST);
+    }
+
+    private static void Callback(JsonData data)
+    {
+        Debug.Log(data.ToJson());
+    }
+
+    private static void Callback(string str)
+    {
+        Debug.Log(str);
+    }
+}

+ 12 - 0
Assets/Script/Manage/FashionShowHttp/AddShowHttp.cs.meta

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

+ 45 - 0
Assets/Script/Manage/FashionShowHttp/CommentShowHttp.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using LitJson;
+using UnityEngine;
+
+public class CommentShowHttp
+{
+    private static Action succeedCallback;
+    private static Action failedCallback;
+
+    public static void Test()
+    {
+        Comment(0, 0, "0", null, null);
+    }
+
+    public static void Comment(long playerId, int showId, string comment, Action succeedCallback, Action failedCallback)
+    {
+        CommentShowHttp.succeedCallback = succeedCallback;
+        CommentShowHttp.failedCallback = failedCallback;
+
+        URLRequestData requestData = new URLRequestData();
+        requestData.Add("u", playerId);
+        requestData.Add("s", showId);
+        requestData.Add("t", 0);
+        requestData.Add("c", comment);
+
+        //URLRequest.CreateURLRequest(true, HttpManager.AddShowURL, requestData,
+        //    Callback, URLRequest.Method.POST);
+
+        URLRequest.CreateStrURLRequest(true, HttpManager.CommentShowURL, requestData,
+            Callback, URLRequest.Method.POST);
+    }
+
+    private static void Callback(JsonData data)
+    {
+        Debug.Log(data.ToJson());
+    }
+
+    private static void Callback(string str)
+    {
+        Debug.Log(str);
+    }
+}

+ 12 - 0
Assets/Script/Manage/FashionShowHttp/CommentShowHttp.cs.meta

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

+ 14 - 0
Assets/Script/Manage/FashionShowHttp/FashionShowType.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+public enum FashionShowType
+{
+    All = 0,
+    Cute = 1,
+    Grace = 2,
+    Vivid = 3,
+    Simple = 4,
+    Glory = 5,
+}

+ 12 - 0
Assets/Script/Manage/FashionShowHttp/FashionShowType.cs.meta

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

+ 43 - 0
Assets/Script/Manage/FashionShowHttp/PraiseShowHttp.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using LitJson;
+using UnityEngine;
+
+public class PraiseShowHttp
+{
+    private static Action succeedCallback;
+    private static Action failedCallback;
+
+    public static void Test()
+    {
+        Praise(0, 0, null, null);
+    }
+
+    public static void Praise(long playerId, int showId, Action succeedCallback, Action failedCallback)
+    {
+        PraiseShowHttp.succeedCallback = succeedCallback;
+        PraiseShowHttp.failedCallback = failedCallback;
+
+        URLRequestData requestData = new URLRequestData();
+        requestData.Add("u", playerId);
+        requestData.Add("s", showId);
+
+        //URLRequest.CreateURLRequest(true, HttpManager.AddShowURL, requestData,
+        //    Callback, URLRequest.Method.POST);
+
+        URLRequest.CreateStrURLRequest(true, HttpManager.PraiseShowURL, requestData,
+            Callback, URLRequest.Method.POST);
+    }
+
+    private static void Callback(JsonData data)
+    {
+        Debug.Log(data.ToJson());
+    }
+
+    private static void Callback(string str)
+    {
+        Debug.Log(str);
+    }
+}

+ 12 - 0
Assets/Script/Manage/FashionShowHttp/PraiseShowHttp.cs.meta

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

+ 56 - 0
Assets/Script/Manage/FashionShowHttp/RateShowHttp.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using LitJson;
+using UnityEngine;
+
+public class RateShowHttp
+{
+    private static Action succeedCallback;
+    private static Action failedCallback;
+
+    public static void Test()
+    {
+        ShowRateData data = new ShowRateData();
+        data.playerId = 0;
+        data.showId = 0;
+        data.cuteRate = 0;
+        data.graceRate = 0;
+        data.vividRate = 0;
+        data.simpleRate = 0;
+        data.gloryRate = 0;
+        Rate(data, null, null);
+    }
+
+    public static void Rate(ShowRateData data, Action succeedCallback, Action failedCallback)
+    {
+        RateShowHttp.succeedCallback = succeedCallback;
+        RateShowHttp.failedCallback = failedCallback;
+
+        URLRequestData requestData = new URLRequestData();
+        requestData.Add("u", data.playerId);
+        requestData.Add("s", data.showId);
+        requestData.Add("s1", data.cuteRate);
+        requestData.Add("s2", data.graceRate);
+        requestData.Add("s3", data.vividRate);
+        requestData.Add("s4", data.simpleRate);
+        requestData.Add("s5", data.gloryRate);
+
+        //URLRequest.CreateURLRequest(true, HttpManager.AddShowURL, requestData,
+        //    Callback, URLRequest.Method.POST);
+
+        URLRequest.CreateStrURLRequest(true, HttpManager.RateShowURL, requestData,
+            Callback, URLRequest.Method.POST);
+    }
+
+    private static void Callback(JsonData data)
+    {
+        Debug.Log(data.ToJson());
+    }
+
+    private static void Callback(string str)
+    {
+        Debug.Log(str);
+    }
+}

+ 12 - 0
Assets/Script/Manage/FashionShowHttp/RateShowHttp.cs.meta

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

+ 43 - 0
Assets/Script/Manage/FashionShowHttp/ShowCommentsHttp.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using LitJson;
+using UnityEngine;
+
+public class ShowCommentsHttp
+{
+    private static Action succeedCallback;
+    private static Action failedCallback;
+
+    public static void Test()
+    {
+        Get(0, 1, null, null);
+    }
+
+    public static void Get(int page, int showId, Action succeedCallback, Action failedCallback)
+    {
+        ShowCommentsHttp.succeedCallback = succeedCallback;
+        ShowCommentsHttp.failedCallback = failedCallback;
+
+        URLRequestData requestData = new URLRequestData();
+        requestData.Add("p", page);
+        requestData.Add("s", showId);
+
+        //URLRequest.CreateURLRequest(true, HttpManager.AddShowURL, requestData,
+        //    Callback, URLRequest.Method.POST);
+
+        URLRequest.CreateStrURLRequest(true, HttpManager.GetShowListURL, requestData,
+            Callback, URLRequest.Method.POST);
+    }
+
+    private static void Callback(JsonData data)
+    {
+        Debug.Log(data.ToJson());
+    }
+
+    private static void Callback(string str)
+    {
+        Debug.Log(str);
+    }
+}

+ 12 - 0
Assets/Script/Manage/FashionShowHttp/ShowCommentsHttp.cs.meta

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

+ 47 - 0
Assets/Script/Manage/FashionShowHttp/ShowListHttp.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using LitJson;
+using UnityEngine;
+
+public class ShowListHttp
+{
+    private static Action succeedCallback;
+    private static Action failedCallback;
+
+    public static void Test()
+    {
+        Get(0, 0, null, null);
+    }
+
+    public static void Get(int page, FashionShowType type, Action succeedCallback, Action failedCallback)
+    {
+        ShowListHttp.succeedCallback = succeedCallback;
+        ShowListHttp.failedCallback = failedCallback;
+
+        //URLRequestData requestData = new URLRequestData();
+        //requestData.Add("p", page);
+        //requestData.Add("s", type.GetHashCode());
+
+        URLRequestData requestData = new URLRequestData();
+        requestData.Add("s", 0);
+        requestData.Add("p", 0);
+
+        //URLRequest.CreateURLRequest(true, HttpManager.AddShowURL, requestData,
+        //    Callback, URLRequest.Method.POST);
+
+        URLRequest.CreateStrURLRequest(true, HttpManager.GetShowListURL, requestData,
+            Callback, URLRequest.Method.POST);
+    }
+
+    private static void Callback(JsonData data)
+    {
+        Debug.Log(data.ToJson());
+    }
+
+    private static void Callback(string str)
+    {
+        Debug.Log(str);
+    }
+}

+ 12 - 0
Assets/Script/Manage/FashionShowHttp/ShowListHttp.cs.meta

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

+ 15 - 0
Assets/Script/Manage/FashionShowHttp/ShowRateData.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+public class ShowRateData
+{
+    public long playerId;
+    public int showId;
+    public int cuteRate;
+    public int vividRate;
+    public int simpleRate;
+    public int graceRate;
+    public int gloryRate;
+}

+ 12 - 0
Assets/Script/Manage/FashionShowHttp/ShowRateData.cs.meta

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

+ 12 - 4
Assets/Script/Manage/HttpManager.cs

@@ -172,12 +172,20 @@ public class HttpManager : Regist
     public static string SearchBuddyURL = NewBaseURL + "/buddy/like";
     public static string GetPrivateMessageURL = NewBaseURL + "/comment/find";
     public static string LoadFileURL = NewBaseURL + "/index/loadfile";
+    public static string AddShowURL = NewBaseURL + "/show/add";
+    public static string RateShowURL = NewBaseURL + "/show/score";
+    public static string PraiseShowURL = NewBaseURL + "/show/like";
+    public static string CommentShowURL = NewBaseURL + "/show/comment";
+    public static string GetShowListURL = NewBaseURL + "/show/show_list";
+    public static string GetShowCommentListURL = NewBaseURL + "/show/comment_list";
     public static string ReportMailAddress = "bug@dashgame.com";
 
     #endregion
 
     public void Awake()
     {
+        AddShowHttp.Test();
+
         //URLRequestData urlData = new URLRequestData();
         //urlData.Add("u", "Custom0");
         //URLRequest.CreateURLRequest(false, LoginURL, urlData, data => Debug.Log(data.ToJson()), URLRequest.Method.POST);
@@ -1732,8 +1740,8 @@ public class HttpManager : Regist
         for (int i = 0; i < 10; i++)
         {
             FashionShowData fashionShowData = new FashionShowData();
-            fashionShowData.FashionShowName = $"名字{Random.Range(0, 100)}";
-            fashionShowData.FashionShowContent = $"内容{Random.Range(0, 100)}";
+            fashionShowData.ShowName = $"名字{Random.Range(0, 100)}";
+            fashionShowData.ShowContent = $"内容{Random.Range(0, 100)}";
             if (Random.Range(0f, 1f) < 0.5f)
             {
                 fashionShowData.CuteRate = "0";
@@ -1752,11 +1760,11 @@ public class HttpManager : Regist
             }
             if (Random.Range(0f, 1f) < 0.5f)
             {
-                fashionShowData.RefererNickname = $"推荐人{Random.Range(0, 100)}";
+                fashionShowData.RefererId = $"推荐人{Random.Range(0, 100)}";
             }
             else
             {
-                fashionShowData.RefererNickname = NickNameManager.NickName;
+                fashionShowData.RefererId = NickNameManager.NickName;
             }
             fashionShowData.CloseIDs.Add(PlayerManager.CloseIDDictionary["脑壳2"] + Random.Range(-1, 2));
             fashionShowData.CloseIDs.Add(PlayerManager.CloseIDDictionary["裙子2"] + Random.Range(-1, 2));

+ 2 - 2
Assets/Script/Social/FashionShowCloseBox.cs

@@ -44,7 +44,7 @@ public class FashionShowCloseCell
         DisplayButton.transform.SetActive(true);
         Player = PlayerManager.Instance.GetRawPlayer();
         Player.transform.SetParent(DisplayButton.transform);
-        Player.transform.SetAsFirstSibling();
+        Player.transform.SetSiblingIndex(1);
         Player.transform.localPosition = Vector3.zero;
         foreach (var closeID in data.CloseIDs)
         {
@@ -92,7 +92,7 @@ public class FashionShowCloseCell
     {
         AudioManager.PlayClip(ResourceLabel.BtnClip);
         TweenRoot tween = FashionShowHomePage.HideSidePanel();
-        bool belongSelf = FashionShowData.RefererNickname == NickNameManager.NickName;
+        bool belongSelf = FashionShowData.RefererId == NickNameManager.NickName;
         tween.AddEventOnetime(EventType.BackwardFinish, ()=> { FashionShowEditPage.ShowRatePanel(belongSelf, FashionShowData); FashionShowEditPage.LeaveToHomePage = true; });
     }
 }

+ 243 - 51
Assets/Script/Social/FashionShowEditPage.cs

@@ -8,15 +8,81 @@ public class FashionShowData
 {
     public int PraisedAmount;
     public bool Praised;
-    public string RefererNickname;
-    public string FashionShowName;
-    public string FashionShowContent;
+    public string RefererId;
+    public string ShowName;
+    public string ShowContent;
     public string CuteRate;
     public string GloryRate;
     public string GraceRate;
     public string SimpleRate;
     public string VividRate;
+
     public List<int> CloseIDs = new List<int>();
+
+    public int GetHeadId()
+    {
+        return CloseIDs[0];
+    }
+
+    public int GetSkirtId()
+    {
+        return CloseIDs[1];
+    }
+
+    public int GetShoeId()
+    {
+        return CloseIDs[2];
+    }
+
+    public int GetHeadwearId()
+    {
+        return CloseIDs[3];
+    }
+
+    public int GetTopId()
+    {
+        return CloseIDs[4];
+    }
+
+    public int GetEyeId()
+    {
+        return CloseIDs[5];
+    }
+
+    public int GetMouseId()
+    {
+        return CloseIDs[6];
+    }
+
+    public int GetWingId()
+    {
+        return CloseIDs[7];
+    }
+
+    public int GetCuteRate()
+    {
+        return int.Parse(CuteRate);
+    }
+
+    public int GetGloryRate()
+    {
+        return int.Parse(GloryRate);
+    }
+
+    public int GetGraceRate()
+    {
+        return int.Parse(GraceRate);
+    }
+
+    public int GetSimpleRate()
+    {
+        return int.Parse(SimpleRate);
+    }
+
+    public int GetVividRate()
+    {
+        return int.Parse(VividRate);
+    }
 }
 
 public class FashionShowEditPage : Regist
@@ -61,6 +127,10 @@ public class FashionShowEditPage : Regist
     private static Button RateButton;
     //EndMark-Used by LabelUtility-Do not remove
 
+    private static Button SubmitRateButton;
+    private static Button ResetRateButton;
+    private static TweenOutline rateButtonAnim;
+
     private static Button DressroomFashionShowButton;
     private static Transform GardenFashionShowButtonParent;
 
@@ -152,6 +222,8 @@ public class FashionShowEditPage : Regist
         FashionTitleEditButton = ResourceManager.Get<Button>(CanvasLabel.Pg_FashionTitleEditButton);
         FashionContentEditButton = ResourceManager.Get<Button>(CanvasLabel.Pg_FashionContentEditButton);
         RateButton = ResourceManager.Get<Button>(CanvasLabel.Pg_RateButton);
+        SubmitRateButton = ResourceManager.Get<Button>(CanvasLabel.Pg_SubmitRateButton);
+        ResetRateButton = ResourceManager.Get<Button>(CanvasLabel.Pg_ResetRateButton);
 
         DressroomFashionShowButton = ResourceManager.Get<Button>(CanvasLabel.P_FashionShowButton);
         GardenFashionShowButtonParent = ResourceManager.Get(CanvasLabel.C_FashionShowButtonParent);
@@ -202,6 +274,8 @@ public class FashionShowEditPage : Regist
         ShareButton.onClick.AddListener(OnShareButtonClick);
         DisplayEditButton.onClick.AddListener(OnDisplayEditButtonClick);
         RateButton.onClick.AddListener(OnRateButtonClick);
+        SubmitRateButton.onClick.AddListener(OnSubmitRateClick);
+        ResetRateButton.onClick.AddListener(OnResetRateClick);
         SaveButton.onClick.AddListener(OnSaveButtonClick);
         ResetButton.onClick.AddListener(OnResetButtonClick);
         DeleteButton.onClick.AddListener(OnDeleteButtonClick);
@@ -210,6 +284,16 @@ public class FashionShowEditPage : Regist
         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; };
+
+        Outline outline = RateButton.GetComponent<Outline>();
+        Color originColor = outline.effectColor;
+        Color destColor = outline.effectColor;
+        destColor.a = 0;
+        rateButtonAnim = new TweenOutline(outline, originColor, destColor, 0.5f, true, true, Curve.EaseOutQuad);
+        rateButtonAnim.OnForwardFinish += () => rateButtonAnim.StartBackward();
+        rateButtonAnim.OnBackwardFinish += () => rateButtonAnim.StartForward();
+        rateButtonAnim.StartForward();
+        rateButtonAnim.Pause();
     }
 
 
@@ -241,7 +325,7 @@ public class FashionShowEditPage : Regist
     {
         DisplayPlayer = PlayerManager.Instance.GetRawPlayer();
         DisplayPlayer.transform.SetParent(DisplayBackground);
-        DisplayPlayer.transform.SetAsFirstSibling();
+        DisplayPlayer.transform.SetSiblingIndex(1);
         DisplayPlayer.transform.localPosition = Vector3.zero;
         foreach (var closeID in CloseIDs)
         {
@@ -260,24 +344,13 @@ public class FashionShowEditPage : Regist
         GraceSlider.value = cuteRate == 0 ? 1 : graceRate;
         SimpleSlider.value = cuteRate == 0 ? 1 : simpleRate;
         VividSlider.value = cuteRate == 0 ? 1 : vividRate;
-        CuteSliderBg.SetActive(false);
-        GlorySliderBg.SetActive(false);
-        GraceSliderBg.SetActive(false);
-        SimpleSliderBg.SetActive(false);
-        VividSliderBg.SetActive(false);
-        CuteSlider.interactable = false;
-        GlorySlider.interactable = false;
-        GraceSlider.interactable = false;
-        SimpleSlider.interactable = false;
-        VividSlider.interactable = false;
-        CuteValue.text = FashionShowData.CuteRate == "0" ? "--" : FashionShowData.CuteRate;
-        GloryValue.text = FashionShowData.GloryRate == "0" ? "--" : FashionShowData.GloryRate;
-        GraceValue.text = FashionShowData.GraceRate == "0" ? "--" : FashionShowData.GraceRate;
-        SimpleValue.text = FashionShowData.SimpleRate == "0" ? "--" : FashionShowData.SimpleRate;
-        VividValue.text = FashionShowData.VividRate == "0" ? "--" : FashionShowData.VividRate;
-        FashionTitleInputField.text = FashionShowData.FashionShowName;
-        FashionContentInputField.text = FashionShowData.FashionShowContent;
-        RecommendTitle.text = Language.GetStr(LanguageLabel.UI__Pg_RecommendTitle).Replace(TransferLabel.Value, FashionShowData.RefererNickname);
+        ShowRateValue();
+        FashionTitleInputField.text = FashionShowData.ShowName;
+        FashionContentInputField.text = FashionShowData.ShowContent;
+        RecommendTitle.text = Language.GetStr(LanguageLabel.UI__Pg_RecommendTitle).Replace(TransferLabel.Value, FashionShowData.RefererId);
+
+        HideRateButton();
+        DisableRatePanel();
 
         for (int i = 0; i < CloseItems.Count; i++)
         {
@@ -295,6 +368,20 @@ public class FashionShowEditPage : Regist
         }
     }
 
+    private static void ShowRateValue()
+    {
+        CuteSlider.value = 3;
+        GlorySlider.value = 3;
+        GraceSlider.value = 3;
+        SimpleSlider.value = 3;
+        VividSlider.value = 3;
+        CuteValue.text = FashionShowData.CuteRate == "0" ? "--" : FashionShowData.CuteRate;
+        GloryValue.text = FashionShowData.GloryRate == "0" ? "--" : FashionShowData.GloryRate;
+        GraceValue.text = FashionShowData.GraceRate == "0" ? "--" : FashionShowData.GraceRate;
+        SimpleValue.text = FashionShowData.SimpleRate == "0" ? "--" : FashionShowData.SimpleRate;
+        VividValue.text = FashionShowData.VividRate == "0" ? "--" : FashionShowData.VividRate;
+    }
+
     private static void TransitPanel()
     {
         Renderer renderer = PlayerManager.Player.HeadSlot.UnityTransform.GetComponentInChildren<Renderer>(true);
@@ -318,7 +405,6 @@ public class FashionShowEditPage : Regist
         ShareButton.SetActive(false);
         CommentButton.SetActive(false);
         DisplayEditButton.SetActive(false);
-        RateButton.SetActive(false);
         FashionTitleEditButton.SetActive(true);
         FashionContentEditButton.SetActive(true);
         FashionTitleInputField.SetActive(true);
@@ -346,12 +432,13 @@ public class FashionShowEditPage : Regist
         ShareButton.SetActive(true);
         CommentButton.SetActive(true);
         DisplayEditButton.SetActive(BelongSelf);
-        RateButton.SetActive(false);
         FashionTitleEditButton.SetActive(false);
         FashionContentEditButton.SetActive(false);
         FashionTitleInputField.SetActive(false);
         FashionContentInputField.SetActive(false);
 
+        ShowRateButton();
+
         bool haveUnboughtClose = false;
         foreach (var closeItem in CloseItems)
         {
@@ -456,17 +543,6 @@ public class FashionShowEditPage : Regist
         EnterEditMode();
     }
 
-    private static void OnRateButtonClick()
-    {
-        AudioManager.PlayClip(ResourceLabel.BtnClip);
-        RateButton.SetActive(false);
-        //CuteSliderBg.SetActive(true);
-        //GlorySliderBg.SetActive(true);
-        //GraceSliderBg.SetActive(true);
-        //SimpleSliderBg.SetActive(true);
-        //VividSliderBg.SetActive(true);
-    }
-
     private static void OnSaveButtonClick()
     {
         AudioManager.PlayClip(ResourceLabel.BtnClip);
@@ -495,7 +571,7 @@ public class FashionShowEditPage : Regist
             return;
         }
 
-        if (FashionShowData.FashionShowName == FashionTitleInputField.text && FashionShowData.FashionShowContent == FashionContentInputField.text)
+        if (FashionShowData.ShowName == FashionTitleInputField.text && FashionShowData.ShowContent == FashionContentInputField.text)
         {
             Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Pg_RepeatData));
             return;
@@ -503,9 +579,9 @@ public class FashionShowEditPage : Regist
 
         SaveButton.interactable = false;
         FashionShowData data = new FashionShowData();
-        data.FashionShowName = FashionTitleInputField.text;
-        data.FashionShowContent = FashionContentInputField.text;
-        data.RefererNickname = NickNameManager.NickName;
+        data.ShowName = FashionTitleInputField.text;
+        data.ShowContent = FashionContentInputField.text;
+        data.RefererId = NickNameManager.NickName;
         HttpManager.SaveFashionShowData(data, OnSaveSucceedCallback, OnSaveFailedCallback);
     }
 
@@ -517,8 +593,8 @@ public class FashionShowEditPage : Regist
 
     private static void OnSaveSucceedCallback(FashionShowData fashionShowData)
     {
-        FashionShowData.FashionShowName = fashionShowData.FashionShowName;
-        FashionShowData.FashionShowContent = fashionShowData.FashionShowName;
+        FashionShowData.ShowName = fashionShowData.ShowName;
+        FashionShowData.ShowContent = fashionShowData.ShowName;
         SaveButton.interactable = true;
         Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Pg_SaveSucceed));
     }
@@ -526,8 +602,8 @@ public class FashionShowEditPage : Regist
     private static void OnResetButtonClick()
     {
         AudioManager.PlayClip(ResourceLabel.BtnClip);
-        FashionTitleInputField.text = FashionShowData.FashionShowName;
-        FashionContentInputField.text = FashionShowData.FashionShowContent;
+        FashionTitleInputField.text = FashionShowData.ShowName;
+        FashionContentInputField.text = FashionShowData.ShowContent;
     }
 
     private static void OnDeleteButtonClick()
@@ -577,11 +653,127 @@ public class FashionShowEditPage : Regist
     }
 
 
+
+    private static void OnRateButtonClick()
+    {
+        HideRateButton();
+        AudioManager.PlayClip(ResourceLabel.BtnClip);
+        EnableRatePanel();
+    }
+
+    private static void OnSubmitRateClick()
+    {
+        if (IsRateChanged() == false)
+        {
+            Bubble.Show(null, Language.GetStr(LanguageLabel.UI__Pg_RateDidntChange));
+            return;
+        }
+        ShowRateButton();
+        AudioManager.PlayClip(ResourceLabel.BtnClip);
+        DisableRatePanel();
+        ShowRateValue();
+    }
+
+    private static bool IsRateChanged()
+    {
+        if (CuteValue.text == "--")
+            return false;
+        if (VividValue.text == "--")
+            return false;
+        if (GloryValue.text == "--")
+            return false;
+        if (GraceValue.text == "--")
+            return false;
+        if (SimpleValue.text == "--")
+            return false;
+        return true;
+        //int cuteRate = (int) CuteSlider.value;
+        //int vividRate = (int) VividSlider.value;
+        //int gloryRate = (int) GlorySlider.value;
+        //int graceRate = (int) GraceSlider.value;
+        //int simpleRate = (int) SimpleSlider.value;
+        //if (FashionShowData.GetCuteRate() != cuteRate)
+        //    return true;
+        //if (FashionShowData.GetVividRate() != vividRate)
+        //    return true;
+        //if (FashionShowData.GetGloryRate() != gloryRate)
+        //    return true;
+        //if (FashionShowData.GetGraceRate() != graceRate)
+        //    return true;
+        //if (FashionShowData.GetSimpleRate() != simpleRate)
+        //    return true;
+        //return false;
+    }
+
+    private static void OnResetRateClick()
+    {
+        ShowRateButton();
+        AudioManager.PlayClip(ResourceLabel.BtnClip);
+        DisableRatePanel();
+        ShowRateValue();
+    }
+
+    private static void ShowRateButton()
+    {
+        RateButton.SetActive(true);
+        rateButtonAnim.Resume();
+    }
+
+    private static void HideRateButton()
+    {
+        RateButton.SetActive(false);
+        rateButtonAnim.Pause();
+    }
+
+    private static void EnableRatePanel()
+    {
+        SubmitRateButton.SetActive(true);
+        ResetRateButton.SetActive(true);
+        CuteSliderBg.SetActive(true);
+        GlorySliderBg.SetActive(true);
+        GraceSliderBg.SetActive(true);
+        SimpleSliderBg.SetActive(true);
+        VividSliderBg.SetActive(true);
+        CuteSlider.interactable = true;
+        GlorySlider.interactable = true;
+        GraceSlider.interactable = true;
+        SimpleSlider.interactable = true;
+        VividSlider.interactable = true;
+        CuteSlider.value = 0;
+        GlorySlider.value = 0;
+        SimpleSlider.value = 0;
+        VividSlider.value = 0;
+        GraceSlider.value = 0;
+        CuteValue.text = "--";
+        GloryValue.text = "--";
+        GraceValue.text = "--";
+        SimpleValue.text = "--";
+        VividValue.text = "--";
+    }
+
+    private static void DisableRatePanel()
+    {
+        SubmitRateButton.SetActive(false);
+        ResetRateButton.SetActive(false);
+        CuteSliderBg.SetActive(false);
+        GlorySliderBg.SetActive(false);
+        GraceSliderBg.SetActive(false);
+        SimpleSliderBg.SetActive(false);
+        VividSliderBg.SetActive(false);
+        CuteSlider.interactable = false;
+        GlorySlider.interactable = false;
+        GraceSlider.interactable = false;
+        SimpleSlider.interactable = false;
+        VividSlider.interactable = false;
+    }
+
+
+
     private static void OnCuteSliderValueChange(float value)
     {
         AudioManager.PlayClip(ResourceLabel.BtnClip);
         CuteRateText.text = value.ToString("0");
-        RateButton.SetActive(true);
+        CuteValue.text = value.ToString("0");
     }
 
     private static void OnCuteSliderSelect()
@@ -598,7 +790,7 @@ public class FashionShowEditPage : Regist
     {
         AudioManager.PlayClip(ResourceLabel.BtnClip);
         GraceRateText.text = value.ToString("0");
-        RateButton.SetActive(true);
+        GraceValue.text = value.ToString("0");
     }
 
     private static void OnGraceSliderSelect()
@@ -615,7 +807,7 @@ public class FashionShowEditPage : Regist
     {
         AudioManager.PlayClip(ResourceLabel.BtnClip);
         VividRateText.text = value.ToString("0");
-        RateButton.SetActive(true);
+        VividValue.text = value.ToString("0");
     }
 
     private static void OnVividSliderSelect()
@@ -632,7 +824,7 @@ public class FashionShowEditPage : Regist
     {
         AudioManager.PlayClip(ResourceLabel.BtnClip);
         SimpleRateText.text = value.ToString("0");
-        RateButton.SetActive(true);
+        SimpleValue.text = value.ToString("0");
     }
 
     private static void OnSimpleSliderSelect()
@@ -649,7 +841,7 @@ public class FashionShowEditPage : Regist
     {
         AudioManager.PlayClip(ResourceLabel.BtnClip);
         GloryRateText.text = value.ToString("0");
-        RateButton.SetActive(true);
+        GloryValue.text = value.ToString("0");
     }
 
     private static void OnGlorySliderSelect()
@@ -690,9 +882,9 @@ public class FashionShowEditPage : Regist
         data.GraceRate = "0";
         data.SimpleRate = "0";
         data.VividRate = "0";
-        data.FashionShowName = "";
-        data.FashionShowContent = "";
-        data.RefererNickname = NickNameManager.NickName;
+        data.ShowName = "";
+        data.ShowContent = "";
+        data.RefererId = NickNameManager.NickName;
         data.CloseIDs = PlayerManager.Player.GetCurrentChangableDressIDs();
         ShowEditPanel(data);
     }

+ 4 - 2
第五期.txt

@@ -1,9 +1,11 @@
+进入搭配秀界面蜜蜂动画会死机
+
+角色的鞋子没有Alpha动画(试衣间)
+
 5兆金币成就
 
 点击换小游戏卡住
 
-角色的鞋子没有Alpha动画(试衣间)
-
 
 
 //关闭DebugMode 开启CatchException