Browse Source

完善搭配秀功能

LiuQilin 7 years ago
parent
commit
b02e0b144e

+ 500 - 20
Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -608,6 +608,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
+--- !u!1 &1036587961271096
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224455119204633364}
+  - component: {fileID: 222964302607601684}
+  - component: {fileID: 114129874339420692}
+  - component: {fileID: 114139608527713390}
+  m_Layer: 5
+  m_Name: Pi_GloryTabButton
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1037486862455116
 GameObject:
   m_ObjectHideFlags: 1
@@ -8170,6 +8188,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1440687312484814
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224549302067237646}
+  m_Layer: 5
+  m_Name: Pi_GloryTab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1440983372372528
 GameObject:
   m_ObjectHideFlags: 1
@@ -8505,7 +8538,7 @@ GameObject:
   - component: {fileID: 114209819356747284}
   - component: {fileID: 114152176598945686}
   m_Layer: 5
-  m_Name: Ph_GloryGrid
+  m_Name: Ph_MineGrid
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -9456,7 +9489,7 @@ GameObject:
   - component: {fileID: 222609578868088184}
   - component: {fileID: 114840912518110706}
   m_Layer: 5
-  m_Name: Pi_GloryTabBubble
+  m_Name: Pi_MineTabBubble
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -12243,7 +12276,7 @@ GameObject:
   - component: {fileID: 114765244341409840}
   - component: {fileID: 114223036684120272}
   m_Layer: 5
-  m_Name: Pi_GloryScrollRect
+  m_Name: Pi_MineScrollRect
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -12928,6 +12961,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1712912261795614
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224958815614711516}
+  - component: {fileID: 114419751252420532}
+  - component: {fileID: 114006034046192178}
+  m_Layer: 5
+  m_Name: Ph_GloryGrid
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1716042371607326
 GameObject:
   m_ObjectHideFlags: 1
@@ -15698,7 +15748,7 @@ GameObject:
   - component: {fileID: 114080441501910462}
   - component: {fileID: 114071853161686916}
   m_Layer: 5
-  m_Name: Pi_GloryTabButton
+  m_Name: Pi_MineTabButton
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -16445,7 +16495,7 @@ GameObject:
   m_Component:
   - component: {fileID: 224747277297083974}
   m_Layer: 5
-  m_Name: Pi_GloryTab
+  m_Name: Pi_MineTab
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -16555,6 +16605,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1913550674797158
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224469386900561110}
+  - component: {fileID: 222386576398135754}
+  - component: {fileID: 114575288644351318}
+  m_Layer: 5
+  m_Name: Pi_GloryTabBubble
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1914711486939178
 GameObject:
   m_ObjectHideFlags: 1
@@ -16712,6 +16779,25 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1923635776990468
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224448063658062092}
+  - component: {fileID: 114497172897694974}
+  - component: {fileID: 222559831557558946}
+  - component: {fileID: 114141778993835592}
+  - component: {fileID: 114356523403114814}
+  m_Layer: 5
+  m_Name: Pi_GloryScrollRect
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1924000398775880
 GameObject:
   m_ObjectHideFlags: 1
@@ -17680,6 +17766,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
+--- !u!1 &1967856893959580
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224999182153631348}
+  - component: {fileID: 222252484739920774}
+  - component: {fileID: 114378298731369388}
+  m_Layer: 5
+  m_Name: Pi_GloryTabButtonText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1968136947264410
 GameObject:
   m_ObjectHideFlags: 1
@@ -17965,7 +18068,7 @@ GameObject:
   - component: {fileID: 222168138549630596}
   - component: {fileID: 114697803327069874}
   m_Layer: 5
-  m_Name: Pi_GloryTabButtonText
+  m_Name: Pi_MineTabButtonText
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -18509,6 +18612,28 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114006034046192178
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1712912261795614}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 3
+  m_Spacing: 10
+  m_ChildForceExpandWidth: 0
+  m_ChildForceExpandHeight: 0
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
 --- !u!114 &114007238370707012
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -23613,6 +23738,33 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: OFF
+--- !u!114 &114129874339420692
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1036587961271096}
+  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: cc406256d3e6c6544af7f91fee3855cd, 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 &114129948775031542
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -24236,6 +24388,74 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u672C\u6B21\u5C0F\u6E38\u620F"
+--- !u!114 &114139608527713390
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1036587961271096}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 1, g: 1, b: 1, 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: 114129874339420692}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+--- !u!114 &114141778993835592
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1923635776990468}
+  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: 0}
+  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: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114144145836108294
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -32009,6 +32229,44 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114356523403114814
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1923635776990468}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 770e019109ba2f54cb52c7bd83f162aa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Content: {fileID: 224958815614711516}
+  m_Horizontal: 1
+  m_Vertical: 0
+  m_MovementType: 1
+  m_Elasticity: 0.1
+  m_Inertia: 0
+  m_DecelerationRate: 0.135
+  m_ScrollSensitivity: 1
+  m_Viewport: {fileID: 0}
+  m_HorizontalScrollbar: {fileID: 0}
+  m_VerticalScrollbar: {fileID: 0}
+  m_HorizontalScrollbarVisibility: 0
+  m_VerticalScrollbarVisibility: 0
+  m_HorizontalScrollbarSpacing: 0
+  m_VerticalScrollbarSpacing: 0
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+  FirstIndex: 0
+  LastIndex: 0
+  Inited: 0
+  LayoutGroup: {fileID: 0}
+  MaxRollAmount: 0
+  MaxChildAmount: 0
+  Children: []
 --- !u!114 &114357502513800322
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -33019,6 +33277,39 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114378298731369388
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1967856893959580}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, 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_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 2
+    m_MaxSize: 20
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 0
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u7FC5\u8180"
 --- !u!114 &114378561477986130
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -34572,6 +34863,19 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114419751252420532
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1712912261795614}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!114 &114422082454109244
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -37644,6 +37948,17 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114497172897694974
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1923635776990468}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &114497197089644822
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -40386,6 +40701,33 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114575288644351318
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1913550674797158}
+  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: 0.7058824}
+  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: edbe2121843ac4346a1ff7c6b8d5ca32, 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 &114575607549564590
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -45252,7 +45594,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u7FC5\u8180"
+  m_Text: "\u6211\u7684"
 --- !u!114 &114697815397900828
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -61303,6 +61645,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1858865617860700}
+--- !u!222 &222252484739920774
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1967856893959580}
 --- !u!222 &222255483006336346
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -62029,6 +62377,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1047447276821764}
+--- !u!222 &222386576398135754
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1913550674797158}
 --- !u!222 &222387152684578504
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -62929,6 +63283,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1386628585711608}
+--- !u!222 &222559831557558946
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1923635776990468}
 --- !u!222 &222562227883569240
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -65059,6 +65419,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1473370309253244}
+--- !u!222 &222964302607601684
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1036587961271096}
 --- !u!222 &222965278118370200
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -65495,7 +65861,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 383.32, y: -50.99999}
+  m_AnchoredPosition: {x: 363, y: -50.99999}
   m_SizeDelta: {x: 86, y: 51}
   m_Pivot: {x: 0.49999997, y: 0.00000020489097}
 --- !u!224 &224009964519409292
@@ -68388,7 +68754,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 297.32, y: -50.99999}
+  m_AnchoredPosition: {x: 277, y: -50.99999}
   m_SizeDelta: {x: 86, y: 51}
   m_Pivot: {x: 0.49999997, y: 0.00000020489097}
 --- !u!224 &224145881584416564
@@ -69261,11 +69627,11 @@ RectTransform:
   - {fileID: 224004424670305752}
   - {fileID: 224616778865199180}
   m_Father: {fileID: 224484188298403516}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 125.32001, y: -50.999977}
+  m_AnchoredPosition: {x: 105, y: -50.999977}
   m_SizeDelta: {x: 86, y: 51}
   m_Pivot: {x: 0.5, y: 0.00000041350722}
 --- !u!224 &224201318974070842
@@ -70059,7 +70425,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 211.32, y: -50.99999}
+  m_AnchoredPosition: {x: 191, y: -50.99999}
   m_SizeDelta: {x: 86, y: 51}
   m_Pivot: {x: 0.5, y: 0.00000022724271}
 --- !u!224 &224236738206977114
@@ -73949,6 +74315,25 @@ RectTransform:
   m_AnchoredPosition: {x: 0.00035095215, y: -0.105041504}
   m_SizeDelta: {x: 0, y: 5}
   m_Pivot: {x: 0.49999994, y: 0.99999994}
+--- !u!224 &224448063658062092
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1923635776990468}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.2537498, y: 1.2537498, z: 1.25375}
+  m_Children:
+  - {fileID: 224958815614711516}
+  m_Father: {fileID: 224549302067237646}
+  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: 28, y: -49.755005}
+  m_SizeDelta: {x: 736, y: 370}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224448924540390426
 RectTransform:
   m_ObjectHideFlags: 1
@@ -74112,6 +74497,26 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224455119204633364
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1036587961271096}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 224469386900561110}
+  - {fileID: 224999182153631348}
+  m_Father: {fileID: 224484188298403516}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 535, y: -51.000004}
+  m_SizeDelta: {x: 86, y: 51}
+  m_Pivot: {x: 0.4999999, y: -0.000000042736303}
 --- !u!224 &224455221790296274
 RectTransform:
   m_ObjectHideFlags: 1
@@ -74469,6 +74874,24 @@ RectTransform:
   m_AnchoredPosition: {x: -77, y: -57.1}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224469386900561110
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1913550674797158}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 224455119204633364}
+  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: -25.1, y: 4.7}
+  m_SizeDelta: {x: 23.9, y: 21.6}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224471577763303176
 RectTransform:
   m_ObjectHideFlags: 1
@@ -74684,6 +75107,7 @@ RectTransform:
   - {fileID: 224145624064758428}
   - {fileID: 224009253804691750}
   - {fileID: 224794324577066476}
+  - {fileID: 224455119204633364}
   - {fileID: 224684846496047688}
   - {fileID: 224199249379451404}
   m_Father: {fileID: 224791006927686970}
@@ -74692,7 +75116,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: -80.138245, y: -182.99924}
-  m_SizeDelta: {x: 598.32, y: 51}
+  m_SizeDelta: {x: 664, y: 51}
   m_Pivot: {x: 0.9999998, y: 0.000000044703484}
 --- !u!224 &224484530123866530
 RectTransform:
@@ -76017,6 +76441,7 @@ RectTransform:
   - {fileID: 224410250384729040}
   - {fileID: 224181304112279672}
   - {fileID: 224556376707151520}
+  - {fileID: 224549302067237646}
   - {fileID: 224747277297083974}
   m_Father: {fileID: 224400564893835002}
   m_RootOrder: 1
@@ -76320,6 +76745,25 @@ RectTransform:
   m_AnchoredPosition: {x: 9.651001, y: -39.3}
   m_SizeDelta: {x: 257.3, y: 32}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224549302067237646
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1440687312484814}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.9312028, y: 0.9312028, z: 0.9312028}
+  m_Children:
+  - {fileID: 224448063658062092}
+  m_Father: {fileID: 224532511594157728}
+  m_RootOrder: 7
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.000091551774, y: -0.000030517338}
+  m_SizeDelta: {x: 69, y: 39}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224549740110156898
 RectTransform:
   m_ObjectHideFlags: 1
@@ -79259,16 +79703,16 @@ RectTransform:
   m_GameObject: {fileID: 1862005670062362}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 1.0000036, y: 1.0000036, z: 0.9999987}
   m_Children:
   - {fileID: 224474422001958786}
   - {fileID: 224379763573872414}
   m_Father: {fileID: 224484188298403516}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 555.32, y: -51.000004}
+  m_AnchoredPosition: {x: 621, y: -51.000004}
   m_SizeDelta: {x: 86, y: 51}
   m_Pivot: {x: 0.4999999, y: -0.000000042736303}
 --- !u!224 &224686357828526102
@@ -80482,15 +80926,15 @@ RectTransform:
   m_GameObject: {fileID: 1905656435279268}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.9312028, y: 0.9312028, z: 0.9312028}
+  m_LocalScale: {x: 0.93119955, y: 0.93119955, z: 0.93119955}
   m_Children:
   - {fileID: 224612307937741832}
   m_Father: {fileID: 224532511594157728}
-  m_RootOrder: 7
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.000091551774, y: -0.000030517338}
+  m_AnchoredPosition: {x: -0.00012207031, y: -0.000061035156}
   m_SizeDelta: {x: 69, y: 39}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224747832885531626
@@ -81341,7 +81785,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 469.32, y: -50.999977}
+  m_AnchoredPosition: {x: 449, y: -50.999977}
   m_SizeDelta: {x: 86, y: 51}
   m_Pivot: {x: 0.5, y: 0.00000041350722}
 --- !u!224 &224795297365008076
@@ -84618,6 +85062,24 @@ RectTransform:
   m_AnchoredPosition: {x: -40.6, y: -34.4}
   m_SizeDelta: {x: 53.1, y: 48.4}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224958815614711516
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1712912261795614}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 224448063658062092}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 0.000030517578, y: -0.000009081999}
+  m_SizeDelta: {x: 0, y: 370}
+  m_Pivot: {x: 0, y: 0.5}
 --- !u!224 &224960515231824426
 RectTransform:
   m_ObjectHideFlags: 1
@@ -85418,6 +85880,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 187.5}
   m_SizeDelta: {x: 376, y: 375}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224999182153631348
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1967856893959580}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 224455119204633364}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -8}
+  m_SizeDelta: {x: -13.7, y: -15.8}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!225 &225008751828935646
 CanvasGroup:
   m_ObjectHideFlags: 1

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

@@ -139,6 +139,7 @@
     <Pg_Vivid desc=""><![CDATA[活泼]]></Pg_Vivid>
     <Pg_Simple desc=""><![CDATA[清纯]]></Pg_Simple>
     <Pg_Glory desc=""><![CDATA[华丽]]></Pg_Glory>
+    <Pg_Mine desc=""><![CDATA[我的]]></Pg_Mine>
     <Pg_CloseGridTitle desc=""><![CDATA[所有装扮]]></Pg_CloseGridTitle>
     <Pg_RecommendTitle desc=""><![CDATA[[&value&] 推荐]]></Pg_RecommendTitle>
     <Pg_DeleteWarning desc=""><![CDATA[是否删除该搭配推荐?]]></Pg_DeleteWarning>
@@ -155,7 +156,7 @@
     <Ph_Tit desc=""><![CDATA[评论板]]></Ph_Tit>
     <Ph_Placeholder desc=""><![CDATA[评论]]></Ph_Placeholder>
     <Ph_CommentLab desc=""><![CDATA[评论]]></Ph_CommentLab>
-    <Ph_ContentTitle desc=""><![CDATA[l]]></Ph_ContentTitle>
+    <Ph_ContentTitle desc=""><![CDATA[评论]]></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

@@ -139,6 +139,7 @@
     <Pg_Vivid desc=""><![CDATA[活潑]]></Pg_Vivid>
     <Pg_Simple desc=""><![CDATA[清純]]></Pg_Simple>
     <Pg_Glory desc=""><![CDATA[華麗]]></Pg_Glory>
+    <Pg_Mine desc=""><![CDATA[我的]]></Pg_Mine>
     <Pg_CloseGridTitle desc=""><![CDATA[所有裝扮]]></Pg_CloseGridTitle>
     <Pg_RecommendTitle desc=""><![CDATA[[&value&] 推薦]]></Pg_RecommendTitle>
     <Pg_DeleteWarning desc=""><![CDATA[是否删除该搭配推荐?]]></Pg_DeleteWarning>

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

@@ -139,6 +139,7 @@ Program 水怪
     <Pg_Vivid desc=""><![CDATA[Lively]]></Pg_Vivid>
     <Pg_Simple desc=""><![CDATA[Pure]]></Pg_Simple>
     <Pg_Glory desc=""><![CDATA[Gorgeous]]></Pg_Glory>
+    <Pg_Mine desc=""><![CDATA[Mine]]></Pg_Mine>
     <Pg_CloseGridTitle desc=""><![CDATA[All]]></Pg_CloseGridTitle>
     <Pg_RecommendTitle desc=""><![CDATA[[&value&] recommend]]></Pg_RecommendTitle>
     <Pg_DeleteWarning desc=""><![CDATA[Are you sure to delete it?]]></Pg_DeleteWarning>

BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 7 - 0
Assets/Script/Label/CanvasLabel.cs

@@ -500,6 +500,9 @@ public class CanvasLabel
     public static string Pi_GloryTabButton = "Pi_GloryTabButton";
     public static string Pi_GloryTabBubble = "Pi_GloryTabBubble";
     public static string Pi_GloryTabButtonText = "Pi_GloryTabButtonText";
+    public static string Pi_MineTabButton = "Pi_MineTabButton";
+    public static string Pi_MineTabBubble = "Pi_MineTabBubble";
+    public static string Pi_MineTabButtonText = "Pi_MineTabButtonText";
     public static string Pi_HomeTabButton = "Pi_HomeTabButton";
     public static string Pi_HomeTabBubble = "Pi_HomeTabBubble";
     public static string Pi_HomeTabButtonText = "Pi_HomeTabButtonText";
@@ -522,6 +525,9 @@ public class CanvasLabel
     public static string Pi_GloryTab = "Pi_GloryTab";
     public static string Pi_GloryScrollRect = "Pi_GloryScrollRect";
     public static string Ph_GloryGrid = "Ph_GloryGrid";
+    public static string Pi_MineTab = "Pi_MineTab";
+    public static string Pi_MineScrollRect = "Pi_MineScrollRect";
+    public static string Ph_MineGrid = "Ph_MineGrid";
     public static string Pg_FashionShowEditPanel = "Pg_FashionShowEditPanel";
     public static string Pg_FashionShowEditPanelPosition = "Pg_FashionShowEditPanelPosition";
     public static string Pg_Ribbon = "Pg_Ribbon";
@@ -531,6 +537,7 @@ public class CanvasLabel
     public static string Pg_DiamondText = "Pg_DiamondText";
     public static string Pg_RecommendTitle = "Pg_RecommendTitle";
     public static string Pg_DisplayBackground = "Pg_DisplayBackground";
+    public static string Image = "Image";
     public static string Pg_DisplayEditButton = "Pg_DisplayEditButton";
     public static string Pg_HorizontalGroup = "Pg_HorizontalGroup";
     public static string Pg_DeleteButton = "Pg_DeleteButton";

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

@@ -151,6 +151,7 @@ public class LanguageLabel
     	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_Mine = "UI__Pg_Mine";
     	public static string UI__Pg_CloseGridTitle = "UI__Pg_CloseGridTitle";
     	public static string UI__Pg_RecommendTitle = "UI__Pg_RecommendTitle";
     	public static string UI__Pg_DeleteWarning = "UI__Pg_DeleteWarning";

+ 1 - 0
Assets/Script/Label/ResourceLabel.cs

@@ -41,6 +41,7 @@ public class ResourceLabel
     public static string Firework = "Firework";
     public static string AchieveItem = "AchieveItem";
     public static string SkillItem = "SkillItem";
+    public static string ShowComment = "ShowComment"; 
     public static string CommentItem = "CommentItem";
     public static string RankItem = "RankItem";
     public static string HudText = "HudText";

+ 16 - 5
Assets/Script/Manage/FashionShowHttp/CommentShowHttp.cs

@@ -12,7 +12,7 @@ public class CommentShowHttp
 
     public static void Test()
     {
-        Comment(10000, 1, "comment", null, null);
+        Comment(10000, 46, "评论0", null, null);
     }
 
     public static void Comment(long playerId, int showId, string comment, Action succeedCallback, Action failedCallback)
@@ -26,16 +26,27 @@ public class CommentShowHttp
         requestData.Add("t", 0);
         requestData.Add("c", comment);
 
-        //URLRequest.CreateURLRequest(true, HttpManager.AddShowURL, requestData,
-        //    Callback, URLRequest.Method.POST);
-
-        URLRequest.CreateStrURLRequest(true, HttpManager.CommentShowURL, requestData,
+        URLRequest.CreateURLRequest(true, HttpManager.CommentShowURL, 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());
+        int errorCode = (int)data["error"];
+        if (errorCode == 0)
+        {
+            if (succeedCallback != null)
+                succeedCallback.Invoke();
+        }
+        else
+        {
+            if (failedCallback != null)
+                failedCallback.Invoke();
+        }
     }
 
     private static void Callback(string str)

+ 14 - 12
Assets/Script/Manage/FashionShowHttp/FashionShowData/GetFashionShowData.cs

@@ -17,10 +17,11 @@ public class GetFashionShowData : FashionShowData
     public int praiseCnt;
     public bool praised;
     public string playerNickName;
+    public bool rated;
 
     public GetFashionShowData()
     {
-        
+
     }
 
     public GetFashionShowData(GetFashionShowData data)
@@ -54,14 +55,14 @@ public class GetFashionShowData : FashionShowData
         playerId = long.Parse((string) data["user_id"]);
         title = (string) data["title"];
         content = (string) data["content"];
-        head = (int)data["head"];
-        headwear = (int)data["headwear"];
-        eye = (int)data["eyes"];
-        mouth = (int)data["mouth"];
-        top = (int)data["clothes"];
-        skirt = (int)data["skirt"];
-        shoe = (int)data["shoes"];
-        wing = (int)data["wing"];
+        head = (int) data["head"];
+        headwear = (int) data["headwear"];
+        eye = (int) data["eyes"];
+        mouth = (int) data["mouth"];
+        top = (int) data["clothes"];
+        skirt = (int) data["skirt"];
+        shoe = (int) data["shoes"];
+        wing = (int) data["wing"];
 
         showId = (int) data["id"];
         cuteScore = (int) data["score1"];
@@ -72,7 +73,8 @@ public class GetFashionShowData : FashionShowData
         scoreCnt = (int) data["num_scored"];
         praiseCnt = (int) data["likes"];
         praised = ((int) data["liked"]).ToBool();
-        playerNickName = (string)data["nickname"];
+        playerNickName = (string) data["nickname"];
+        rated = ((int) data["scored"]).ToBool();
     }
 
     public float GetCuteRate()
@@ -92,11 +94,11 @@ public class GetFashionShowData : FashionShowData
 
     public float GetGloryRate()
     {
-        return (float) graceScore/scoreCnt;
+        return (float) gloryScore/scoreCnt;
     }
 
     public float GetGraceRate()
     {
-        return (float) gloryScore/scoreCnt;
+        return (float) graceScore/scoreCnt;
     }
 }

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

@@ -11,4 +11,5 @@ public enum FashionShowType
     Vivid = 3,
     Simple = 4,
     Glory = 5,
+    Mine = 6,
 }

+ 50 - 20
Assets/Script/Manage/FashionShowHttp/ShowCommentsHttp.cs

@@ -7,37 +7,67 @@ using UnityEngine;
 
 public class ShowCommentsHttp
 {
-    private static Action succeedCallback;
-    private static Action failedCallback;
+    public bool disable;
 
-    public static void Test()
-    {
-        Get(0, 1, null, null);
-    }
+    private Action<object> succeedCallback;
+    private Action failedCallback;
 
-    public static void Get(int page, int showId, Action succeedCallback, Action failedCallback)
+    public void Callback(JsonData data)
     {
-        ShowCommentsHttp.succeedCallback = succeedCallback;
-        ShowCommentsHttp.failedCallback = failedCallback;
+        //Debug.Log(data.ToJson());
+        if (disable)
+        {
+            return;
+        }
 
-        URLRequestData requestData = new URLRequestData();
-        requestData.Add("p", page);
-        requestData.Add("s", showId);
+        bool succeed = data.Inst_Object.ContainsKey("list");
 
-        //URLRequest.CreateURLRequest(true, HttpManager.AddShowURL, requestData,
-        //    Callback, URLRequest.Method.POST);
+        if (succeed == false)
+        {
+            if (failedCallback != null)
+                failedCallback.Invoke();
+        }
+        else
+        {
+            List<ShowCommentData> commentDatas = new List<ShowCommentData>();
+            JsonData listData = data["list"];
+            for (int i = 0; i < listData.Count; i++)
+            {
+                //Debug.Log(listData[i].ToJson());
+                ShowCommentData commentData = new ShowCommentData(listData[i]);
+                commentDatas.Add(commentData);
+            }
+            //Debug.Log(commentDatas.Count);
+            if (succeedCallback != null)
+                succeedCallback.Invoke(commentDatas);
+        }
+    }
 
-        URLRequest.CreateStrURLRequest(true, HttpManager.GetShowCommentListURL, requestData,
-            Callback, URLRequest.Method.POST);
+    public void Callback(string str)
+    {
+        Debug.Log(str);
     }
 
-    private static void Callback(JsonData data)
+    public static void Test()
     {
-        Debug.Log(data.ToJson());
+        Get(0, 46, null, null);
     }
 
-    private static void Callback(string str)
+    public static void Get(int page, int showId, Action<object> succeedCallback, Action failedCallback)
     {
-        Debug.Log(str);
+        ShowCommentsHttp http = new ShowCommentsHttp();
+
+        http.succeedCallback = succeedCallback;
+        http.failedCallback = failedCallback;
+
+        URLRequestData requestData = new URLRequestData();
+        requestData.Add("p", page);
+        requestData.Add("s", showId);
+
+        URLRequest.CreateURLRequest(true, HttpManager.GetShowCommentListURL, requestData,
+            http.Callback, URLRequest.Method.POST);
+
+        //URLRequest.CreateStrURLRequest(true, HttpManager.GetShowCommentListURL, requestData,
+        //    http.Callback, URLRequest.Method.POST);
     }
 }

+ 22 - 1
Assets/Script/Manage/FashionShowHttp/ShowListHttp.cs

@@ -14,13 +14,14 @@ public class ShowListHttp
 
     public void Callback(JsonData data)
     {
+        //Debug.Log(data.ToJson());
         if (disable)
         {
             return;
         }
 
         bool succeed = data.Inst_Object.ContainsKey("list");
-
+        //Debug.Log(succeed);
         if (succeed == false)
         {
             if (failedCallback != null)
@@ -70,4 +71,24 @@ public class ShowListHttp
 
         return http;
     }
+
+    public static ShowListHttp Get(long playerId, long targetPlayerId, int page, Action<object> succeedCallback, Action failedCallback)
+    {
+        ShowListHttp http = new ShowListHttp();
+        http.succeedCallback = succeedCallback;
+        http.failedCallback = failedCallback;
+
+        URLRequestData requestData = new URLRequestData();
+        requestData.Add("mu", playerId);
+        requestData.Add("u", targetPlayerId);
+        requestData.Add("p", page);
+
+        URLRequest.CreateURLRequest(true, HttpManager.GetUserShowListURL, requestData,
+            http.Callback, URLRequest.Method.POST);
+
+        //URLRequest.CreateStrURLRequest(true, HttpManager.GetUserShowListURL, requestData,
+        //    http.Callback, URLRequest.Method.POST);
+
+        return http;
+    }
 }

+ 43 - 43
Assets/Script/Manage/FashionShowHttp/UserShowListHttp.cs

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

+ 1 - 1
Assets/Script/Manage/HttpManager.cs

@@ -187,7 +187,7 @@ public class HttpManager : Regist
 
     public void Awake()
     {
-        //ShowListHttp.Test();
+        ShowCommentsHttp.Test();
         //DeleteShowHttp.Delete(1709207727231988804, 17, null, null);
 
         //URLRequestData urlData = new URLRequestData();

+ 14 - 0
Assets/Script/Manage/ResourceManager.cs

@@ -64,6 +64,7 @@ public enum ObjType
     FlowerItem,
     AchieveItem,
     CommentItem,
+    ShowComment,
     FashionShowCloseItem,
     FashionShowCloseBox,
 
@@ -790,6 +791,19 @@ public class ResourceManager : Regist
     }
 
 
+    public static ShowComment GetShowComment(ShowCommentData data)
+    {
+        Transform tra = Get(ResourceLabel.ShowComment, Folder.UI, false, Get(CanvasLabel.Ph_Grid), false, 
+            ObjType.ShowComment, typeof(ShowComment));
+
+        ShowComment comment = tra.GetComponent<ShowComment>();
+
+        comment.InitAtOnce();
+        comment.Reset(data.accountData, data.content);
+
+        return comment;
+    }
+
     private static char ElfSeperator = '_';
     private static float ElfMinOffset = 0.001f;
     private static float ElfMaxOffset = 0.1f;

+ 9 - 0
Assets/Script/Object/Comment.meta

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

+ 10 - 68
Assets/Script/Object/CommentItem.cs → Assets/Script/Object/Comment/BaseComment.cs

@@ -1,67 +1,11 @@
-using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
+using Random = System.Random;
 
-using System.Collections;
-using System.Collections.Generic;
-using LitJson;
-using Random = UnityEngine.Random;
-
-public class CommentItemLabel
-{
-    public static string Title = "Title";
-    public static string VisitButtonTitle = "VisitButtonTitle";
-    public static string VisitButton = "VisitButton";
-    public static string Content = "Content";
-    public static string AddFriendButton = "AddFriendButton";
-    public static string AddFriendButtonTitle = "AddFriendButtonTitle";
-    public static string SendMessageButton = "SendMessageButton";
-    public static string SendMessageButtonTitle = "SendMessageButtonTitle";
-    public static string NewMessageFlagImage = "NewMessageFlagImage";
-}
-
-public class CommentData
-{
-    public string SerialNumber;
-    public string Content;
-    public string NickName;
-
-    public CommentData(JsonData jsonData)
-    {
-        SerialNumber = jsonData["s"].ToString();
-        Content = jsonData["c"].ToString();
-        NickName = jsonData["n"].ToString();
-    }
-
-    public static bool operator ==(CommentData r1, CommentData r2)
-    {
-        if ((r1.SerialNumber == r2.SerialNumber) && (r1.Content == r2.Content) && (r1.NickName == r2.NickName))
-        {
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-
-    public static bool operator !=(CommentData r1, CommentData r2)
-    {
-        return !(r1 == r2);
-    }
-
-    public override bool Equals(object obj)
-    {
-        return this == (CommentData)obj;
-    }
-
-    public override int GetHashCode()
-    {
-        return SerialNumber.GetHashCode() + Content.GetHashCode() + NickName.GetHashCode();
-    }
-}
-
-public class CommentItem : Regist
+public class BaseComment : Regist
 {
     #region Config
 
@@ -123,14 +67,12 @@ public class CommentItem : Regist
         return false;
     }
 
-    public void Visit()
+    public virtual void Visit()
     {
-        SocialManager.CloseCommentPanel();
-        SocialManager.RecordCommentPanel();
         VisitManager.Visit(ConfigSource.SerialNumber, AccountData.SerialNumber);
     }
 
-    public void Reset(AccountData accountData, string content)
+    public virtual void Reset(AccountData accountData, string content)
     {
         Content = content;
         AccountData = accountData;
@@ -162,7 +104,7 @@ public class CommentItem : Regist
                 SendMessageButton.SetActive(false);
             }
         }
-
+        
         if (!string.IsNullOrEmpty(accountData.Nickname))
         {
             Title.text = accountData.Nickname;
@@ -175,7 +117,7 @@ public class CommentItem : Regist
             }
             else
             {
-                Title.text = "****" + Random.Range(1000, 10000);
+                Title.text = "****" + UnityEngine.Random.Range(1000, 10000);
             }
         }
 
@@ -183,7 +125,7 @@ public class CommentItem : Regist
     }
 
 
-    private void OnAddFriendButtonClick()
+    public void OnAddFriendButtonClick()
     {
         if (!FriendPanel.IsFriendFull(true))
         {

+ 12 - 0
Assets/Script/Object/Comment/BaseComment.cs.meta

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

+ 72 - 0
Assets/Script/Object/Comment/CommentItem.cs

@@ -0,0 +1,72 @@
+using System;
+using UnityEngine;
+using UnityEngine.UI;
+
+using System.Collections;
+using System.Collections.Generic;
+using LitJson;
+using Random = UnityEngine.Random;
+
+public class CommentItemLabel
+{
+    public static string Title = "Title";
+    public static string VisitButtonTitle = "VisitButtonTitle";
+    public static string VisitButton = "VisitButton";
+    public static string Content = "Content";
+    public static string AddFriendButton = "AddFriendButton";
+    public static string AddFriendButtonTitle = "AddFriendButtonTitle";
+    public static string SendMessageButton = "SendMessageButton";
+    public static string SendMessageButtonTitle = "SendMessageButtonTitle";
+    public static string NewMessageFlagImage = "NewMessageFlagImage";
+}
+
+public class CommentData
+{
+    public string SerialNumber;
+    public string Content;
+    public string NickName;
+
+    public CommentData(JsonData jsonData)
+    {
+        SerialNumber = jsonData["s"].ToString();
+        Content = jsonData["c"].ToString();
+        NickName = jsonData["n"].ToString();
+    }
+
+    public static bool operator ==(CommentData r1, CommentData r2)
+    {
+        if ((r1.SerialNumber == r2.SerialNumber) && (r1.Content == r2.Content) && (r1.NickName == r2.NickName))
+        {
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+    public static bool operator !=(CommentData r1, CommentData r2)
+    {
+        return !(r1 == r2);
+    }
+
+    public override bool Equals(object obj)
+    {
+        return this == (CommentData)obj;
+    }
+
+    public override int GetHashCode()
+    {
+        return SerialNumber.GetHashCode() + Content.GetHashCode() + NickName.GetHashCode();
+    }
+}
+
+public class CommentItem : BaseComment
+{
+    public override void Visit()
+    {
+        SocialManager.CloseCommentPanel();
+        SocialManager.RecordCommentPanel();
+        base.Visit();
+    }
+}

+ 2 - 2
Assets/Script/Object/CommentItem.cs.meta → Assets/Script/Object/Comment/CommentItem.cs.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 0747e81994fc64e4b810da51c2b7309d
-timeCreated: 1503892378
+guid: 0f0a1c55be353a447ac1f1bd5a724930
+timeCreated: 1522747680
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

+ 26 - 0
Assets/Script/Object/Comment/ShowComment.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using LitJson;
+
+public class ShowCommentData
+{
+    public int id;
+    public string content;
+    public AccountData accountData;
+
+    public ShowCommentData(JsonData data)
+    {
+        id = (int) data["id"];
+        content = (string) data["content"];
+        long playerId = (long) data["user_id"];
+        string nickname = (string) data["nickname"];
+        accountData = new AccountData(nickname, playerId.ToString());
+    }
+}
+
+public class ShowComment : BaseComment
+{
+    
+}

+ 12 - 0
Assets/Script/Object/Comment/ShowComment.cs.meta

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

+ 5 - 2
Assets/Script/Social/FashionShowEditPage.cs

@@ -367,7 +367,10 @@ public class FashionShowEditPage : Regist
         FashionTitleInputField.SetActive(false);
         FashionContentInputField.SetActive(false);
 
-        ShowRateButton();
+        if (FashionShowData.rated == false)
+        {
+            ShowRateButton();
+        }
 
         bool haveUnboughtClose = false;
         foreach (var closeItem in CloseItems)
@@ -636,7 +639,7 @@ public class FashionShowEditPage : Regist
             return;
         }
         SubmitRate();
-        ShowRateButton();
+        //ShowRateButton();
         AudioManager.PlayClip(ResourceLabel.BtnClip);
         DisableRatePanel();
         ShowRateValue();

+ 43 - 14
Assets/Script/Social/FashionShowHomePage.cs

@@ -6,13 +6,13 @@ public class FashionShowHomePage : Regist
 {
 	#region Config
 
-	//StartMark-Used by LabelUtility-Do not remove
 	private static Text HomeTabButtonText;
 	private static Text CuteTabButtonText;
 	private static Text GraceTabButtonText;
 	private static Text VividTabButtonText;
 	private static Text SimpleTabButtonText;
 	private static Text GloryTabButtonText;
+	private static Text MineTabButtonText;
 	private static Text RecommendTitle;
 	private static Button Return;
 	private static Button HomeTabButton;
@@ -21,15 +21,15 @@ public class FashionShowHomePage : Regist
 	private static Button VividTabButton;
 	private static Button SimpleTabButton;
 	private static Button GloryTabButton;
+	private static Button MineTabButton;
 	private static VirtualScrollRectPlus HomeScrollRect;
 	private static VirtualScrollRectPlus CuteScrollRect;
 	private static VirtualScrollRectPlus GraceScrollRect;
 	private static VirtualScrollRectPlus VividScrollRect;
 	private static VirtualScrollRectPlus SimpleScrollRect;
 	private static VirtualScrollRectPlus GloryScrollRect;
-    //EndMark-Used by LabelUtility-Do not remove
+	private static VirtualScrollRectPlus MineScrollRect;
 
-    //private static int requestIndex;
     private static int currentDataIndex;
     private static int currentPage;
     private static bool requesting;
@@ -50,6 +50,7 @@ public class FashionShowHomePage : Regist
     private static List<GetFashionShowData> VividDatas = new List<GetFashionShowData>();
     private static List<GetFashionShowData> SimpleDatas = new List<GetFashionShowData>();
     private static List<GetFashionShowData> GloryDatas = new List<GetFashionShowData>();
+    private static List<GetFashionShowData> MineDatas = new List<GetFashionShowData>();
     private static List<List<GetFashionShowData>> TabDatasList = new List<List<GetFashionShowData>>();
     private static List<FashionShowCloseBox> Boxes = new List<FashionShowCloseBox>();
 
@@ -57,13 +58,13 @@ public class FashionShowHomePage : Regist
 
     public override void RegistReference()
     {
-        //RegistStartMark-Used by LabelUtility-Do not remove
         HomeTabButtonText = ResourceManager.Get<Text>(CanvasLabel.Pi_HomeTabButtonText);
         CuteTabButtonText = ResourceManager.Get<Text>(CanvasLabel.Pi_CuteTabButtonText);
         GraceTabButtonText = ResourceManager.Get<Text>(CanvasLabel.Pi_GraceTabButtonText);
         VividTabButtonText = ResourceManager.Get<Text>(CanvasLabel.Pi_VividTabButtonText);
         SimpleTabButtonText = ResourceManager.Get<Text>(CanvasLabel.Pi_SimpleTabButtonText);
         GloryTabButtonText = ResourceManager.Get<Text>(CanvasLabel.Pi_GloryTabButtonText);
+        MineTabButtonText = ResourceManager.Get<Text>(CanvasLabel.Pi_MineTabButtonText);
         RecommendTitle = ResourceManager.Get<Text>(CanvasLabel.Pi_RecommendTitle);
         Return = ResourceManager.Get<Button>(CanvasLabel.Pi_Return);
         HomeTabButton = ResourceManager.Get<Button>(CanvasLabel.Pi_HomeTabButton);
@@ -72,13 +73,14 @@ public class FashionShowHomePage : Regist
         VividTabButton = ResourceManager.Get<Button>(CanvasLabel.Pi_VividTabButton);
         SimpleTabButton = ResourceManager.Get<Button>(CanvasLabel.Pi_SimpleTabButton);
         GloryTabButton = ResourceManager.Get<Button>(CanvasLabel.Pi_GloryTabButton);
+        MineTabButton = ResourceManager.Get<Button>(CanvasLabel.Pi_MineTabButton);
         HomeScrollRect = ResourceManager.Get<VirtualScrollRectPlus>(CanvasLabel.Pi_HomeScrollRect);
         CuteScrollRect = ResourceManager.Get<VirtualScrollRectPlus>(CanvasLabel.Pi_CuteScrollRect);
         GraceScrollRect = ResourceManager.Get<VirtualScrollRectPlus>(CanvasLabel.Pi_GraceScrollRect);
         VividScrollRect = ResourceManager.Get<VirtualScrollRectPlus>(CanvasLabel.Pi_VividScrollRect);
         SimpleScrollRect = ResourceManager.Get<VirtualScrollRectPlus>(CanvasLabel.Pi_SimpleScrollRect);
         GloryScrollRect = ResourceManager.Get<VirtualScrollRectPlus>(CanvasLabel.Pi_GloryScrollRect);
-        //RegistEndMark-Used by LabelUtility-Do not remove
+        MineScrollRect = ResourceManager.Get<VirtualScrollRectPlus>(CanvasLabel.Pi_MineScrollRect);
 
         Panel = ResourceManager.Get(CanvasLabel.Pi_FashionShowHomePanel);
         SidePanel = ResourceManager.Get(CanvasLabel.Pi_FashionShowHomeSidePanel);
@@ -91,18 +93,21 @@ public class FashionShowHomePage : Regist
         TabButtons.Add(VividTabButton);
         TabButtons.Add(SimpleTabButton);
         TabButtons.Add(GloryTabButton);
+        TabButtons.Add(MineTabButton);
         ScrollRects.Add(HomeScrollRect);
         ScrollRects.Add(CuteScrollRect);
         ScrollRects.Add(GraceScrollRect);
         ScrollRects.Add(VividScrollRect);
         ScrollRects.Add(SimpleScrollRect);
         ScrollRects.Add(GloryScrollRect);
+        ScrollRects.Add(MineScrollRect);
         TabDatasList.Add(HomeDatas);
         TabDatasList.Add(CuteDatas);
         TabDatasList.Add(GraceDatas);
         TabDatasList.Add(VividDatas);
         TabDatasList.Add(SimpleDatas);
         TabDatasList.Add(GloryDatas);
+        TabDatasList.Add(MineDatas);
 
         Panel.CreateTweenVec2D(ResourceManager.Get(CanvasLabel.Pi_FashionShowHomePanelPosition).position, 0.5f, false, false, true, Curve.EaseOutQuad);
         SidePanel.CreateTweenVec2D(ResourceManager.Get(CanvasLabel.Pi_FashionShowHomePanelPosition).position, 0.5f, false, false, true, Curve.EaseOutQuad);
@@ -113,6 +118,7 @@ public class FashionShowHomePage : Regist
         VividTabButton.CreateTweenScale(new Vector3(1, 1, 1), new Vector3(1.1f, 1.1f, 1.1f), 0.25f, true, true, Curve.EaseOutQuad);
         SimpleTabButton.CreateTweenScale(new Vector3(1, 1, 1), new Vector3(1.1f, 1.1f, 1.1f), 0.25f, true, true, Curve.EaseOutQuad);
         GloryTabButton.CreateTweenScale(new Vector3(1, 1, 1), new Vector3(1.1f, 1.1f, 1.1f), 0.25f, true, true, Curve.EaseOutQuad);
+        MineTabButton.CreateTweenScale(new Vector3(1, 1, 1), new Vector3(1.1f, 1.1f, 1.1f), 0.25f, true, true, Curve.EaseOutQuad);
 
         LanguageManager.Add(HomeTabButtonText, new MulLanStr(LanguageLabel.UI__Pi_HomePage));
         LanguageManager.Add(CuteTabButtonText, new MulLanStr(LanguageLabel.UI__Pg_Cute));
@@ -120,6 +126,7 @@ public class FashionShowHomePage : Regist
         LanguageManager.Add(VividTabButtonText, new MulLanStr(LanguageLabel.UI__Pg_Vivid));
         LanguageManager.Add(GloryTabButtonText, new MulLanStr(LanguageLabel.UI__Pg_Glory));
         LanguageManager.Add(SimpleTabButtonText, new MulLanStr(LanguageLabel.UI__Pg_Simple));
+        LanguageManager.Add(MineTabButtonText, new MulLanStr(LanguageLabel.UI__Pg_Mine));
         LanguageManager.Add(RecommendTitle, new MulLanStr(LanguageLabel.UI__Pi_Title));
 
         Return.onClick.AddListener(OnCloseButtonClick);
@@ -130,6 +137,7 @@ public class FashionShowHomePage : Regist
         VividTabButton.onClick.AddListener(() => OnTabButtonClick(VividTabButton));
         SimpleTabButton.onClick.AddListener(() => OnTabButtonClick(SimpleTabButton));
         GloryTabButton.onClick.AddListener(() => OnTabButtonClick(GloryTabButton));
+        MineTabButton.onClick.AddListener(() => OnTabButtonClick(MineTabButton));
 
         HomeScrollRect.Init(1, 1000000);
         CuteScrollRect.Init(1, 1000000);
@@ -137,6 +145,7 @@ public class FashionShowHomePage : Regist
         SimpleScrollRect.Init(1, 1000000);
         VividScrollRect.Init(1, 1000000);
         GloryScrollRect.Init(1, 1000000);
+        MineScrollRect.Init(1, 1000000);
         HomeScrollRect.OnSaveItem += OnSaveItem;
         HomeScrollRect.OnGetNextItem += OnGetNextItem;
         HomeScrollRect.OnGetPreviousItem += OnGetPreviousItem;
@@ -155,6 +164,9 @@ public class FashionShowHomePage : Regist
         GloryScrollRect.OnSaveItem += OnSaveItem;
         GloryScrollRect.OnGetNextItem += OnGetNextItem;
         GloryScrollRect.OnGetPreviousItem += OnGetPreviousItem;
+        MineScrollRect.OnSaveItem += OnSaveItem;
+        MineScrollRect.OnGetNextItem += OnGetNextItem;
+        MineScrollRect.OnGetPreviousItem += OnGetPreviousItem;
     }
 
     private static void ShowPanel()
@@ -327,19 +339,36 @@ public class FashionShowHomePage : Regist
         }
         else
         {
-            if (requesting == false)
-            {
-                requesting = true;
-                http = ShowListHttp.Get
-                (
-                    HttpManager.GetPlayerId(), currentPage, currentType,
-                    OnGetShowListSucceed, OnGetShowListFailed
-                );
-            }
+            GetShowList();
             return null;
         }
     }
 
+    private static void GetShowList()
+    {
+        if (requesting)
+        {
+            return;
+        }
+        requesting = true;
+        if (currentType == FashionShowType.Mine)
+        {
+            http = ShowListHttp.Get
+            (
+                HttpManager.GetPlayerId(), HttpManager.GetPlayerId(), currentPage,
+                OnGetShowListSucceed, OnGetShowListFailed
+            );
+        }
+        else
+        {
+            http = ShowListHttp.Get
+            (
+                HttpManager.GetPlayerId(), currentPage, currentType,
+                OnGetShowListSucceed, OnGetShowListFailed
+            );
+        }
+    }
+
     private static void OnGetShowListSucceed(object obj)
     {
         requesting = false;

+ 9 - 12
Assets/Script/Tool/Test.cs

@@ -15,18 +15,15 @@ public class Test : MonoBehaviour
 
     public void Awake()
     {
-        ShowListHttp.Test();
-
-
-        //FilePath = $"{Application.persistentDataPath}/Test.png";
-        //if (!File.Exists(FilePath))
-        //{
-        //    File.WriteAllBytes(FilePath, Texture2D.EncodeToPNG());
-        //}
-        //Text.text = FilePath;
-        //ShareSDK = gameObject.AddComponent<ShareSDK>();
-        //ShareSDK.Initialize();
-        //ShareSDK.shareHandler = ShareCallback;
+        FilePath = $"{Application.persistentDataPath}/Test.png";
+        if (!File.Exists(FilePath))
+        {
+            File.WriteAllBytes(FilePath, Texture2D.EncodeToPNG());
+        }
+        Text.text = FilePath;
+        ShareSDK = gameObject.AddComponent<ShareSDK>();
+        ShareSDK.Initialize();
+        ShareSDK.shareHandler = ShareCallback;
     }
 
     public static ShareSDK ShareSDK;