ソースを参照

修复搭配秀Bug

liuqilin 7 年 前
コミット
13bd124bc1

+ 4 - 5
Assets/Resource/Logo.unity

@@ -612,11 +612,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f1828554d8ffa12449b221fe29b2c32c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  AuditEdition: 0
-  DebugMode: 1
-  CatchException: 0
-  DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
-    type: 2}
+  AuditEdition: 1
+  DebugMode: 0
+  CatchException: 1
+  DebugModeGo: {fileID: 0}
 --- !u!4 &1833966245
 Transform:
   m_ObjectHideFlags: 0

+ 166 - 16
Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -2045,6 +2045,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1112217278232724
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224954810324305286}
+  - component: {fileID: 222377489819661698}
+  - component: {fileID: 114069933895185258}
+  m_Layer: 5
+  m_Name: Pg_FashionContent
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1113342556454646
 GameObject:
   m_ObjectHideFlags: 1
@@ -9598,6 +9615,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
+--- !u!1 &1517037531435062
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224817676393311524}
+  - component: {fileID: 222648515905885978}
+  - component: {fileID: 114371824186781654}
+  m_Layer: 5
+  m_Name: Pg_FashionTitle
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1517068999138782
 GameObject:
   m_ObjectHideFlags: 1
@@ -14236,7 +14270,7 @@ GameObject:
   - component: {fileID: 222598520826373562}
   - component: {fileID: 114726675665734502}
   m_Layer: 5
-  m_Name: Pg_FashionContent
+  m_Name: Pg_FashionContentPlaceHolder
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -14807,7 +14841,7 @@ GameObject:
   - component: {fileID: 222862225421356814}
   - component: {fileID: 114779466611016344}
   m_Layer: 5
-  m_Name: Pg_FashionTitle
+  m_Name: Pg_FashionTitlePlaceHolder
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -17676,7 +17710,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!1 &1963155686783080
 GameObject:
   m_ObjectHideFlags: 1
@@ -21172,6 +21206,39 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 10000
+--- !u!114 &114069933895185258
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1112217278232724}
+  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: 0.4156863, g: 0.4156863, b: 0.4156863, a: 1}
+  m_RaycastTarget: 0
+  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: 14
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 10
+    m_MaxSize: 20
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 0
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
 --- !u!114 &114070287797178690
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -25406,8 +25473,8 @@ MonoBehaviour:
     m_DisabledTrigger: Disabled
   m_Interactable: 1
   m_TargetGraphic: {fileID: 114270226636413600}
-  m_TextComponent: {fileID: 114726675665734502}
-  m_Placeholder: {fileID: 0}
+  m_TextComponent: {fileID: 114069933895185258}
+  m_Placeholder: {fileID: 114726675665734502}
   m_ContentType: 0
   m_InputType: 0
   m_AsteriskChar: 42
@@ -33033,6 +33100,39 @@ MonoBehaviour:
   MaxRollAmount: 0
   MaxChildAmount: 0
   Children: []
+--- !u!114 &114371824186781654
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1517037531435062}
+  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: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 0
+  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: 14
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 10
+    m_MaxSize: 30
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 0
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
 --- !u!114 &114372228290639698
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -51079,8 +51179,8 @@ MonoBehaviour:
     m_DisabledTrigger: Disabled
   m_Interactable: 1
   m_TargetGraphic: {fileID: 114255950987616236}
-  m_TextComponent: {fileID: 114779466611016344}
-  m_Placeholder: {fileID: 0}
+  m_TextComponent: {fileID: 114371824186781654}
+  m_Placeholder: {fileID: 114779466611016344}
   m_ContentType: 0
   m_InputType: 0
   m_AsteriskChar: 42
@@ -62391,6 +62491,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1519295901513760}
+--- !u!222 &222377489819661698
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1112217278232724}
 --- !u!222 &222380415668444280
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -63771,6 +63877,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1308451451363886}
+--- !u!222 &222648515905885978
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1517037531435062}
 --- !u!222 &222648853396000916
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -72427,8 +72539,8 @@ RectTransform:
   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: -206.00024, y: 216.29}
-  m_SizeDelta: {x: 288, y: 63}
+  m_AnchoredPosition: {x: -259.9, y: 216.29}
+  m_SizeDelta: {x: 180.2, y: 46.1}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224333637853919816
 RectTransform:
@@ -76728,7 +76840,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -206, y: 216.29}
-  m_SizeDelta: {x: 288, y: 63}
+  m_SizeDelta: {x: 288, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224544813035499940
 RectTransform:
@@ -77248,6 +77360,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.34999996, y: 0.34999996, z: 1}
   m_Children:
+  - {fileID: 224817676393311524}
   - {fileID: 224682440291469026}
   m_Father: {fileID: 224885158513677532}
   m_RootOrder: 5
@@ -79327,6 +79440,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1.0999999, y: 1.0999999, z: 1}
   m_Children:
+  - {fileID: 224954810324305286}
   - {fileID: 224864374457213066}
   m_Father: {fileID: 224885158513677532}
   m_RootOrder: 8
@@ -79703,14 +79817,14 @@ RectTransform:
   m_GameObject: {fileID: 1818837584440324}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 2.857143, y: 2.857143, z: 1}
+  m_LocalScale: {x: 2.857156, y: 2.857156, z: 1.0000044}
   m_Children: []
   m_Father: {fileID: 224571075445614744}
-  m_RootOrder: 0
+  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.0048675537, y: 0.000030517578}
+  m_AnchoredPosition: {x: -0.005004883, y: 0.000030517578}
   m_SizeDelta: {x: 87.79999, y: -61}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224682606920131934
@@ -82275,6 +82389,24 @@ RectTransform:
   m_AnchoredPosition: {x: 66.44995, y: -0.000015259}
   m_SizeDelta: {x: 93.8, y: 29.4}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224817676393311524
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1517037531435062}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 2.857143, y: 2.857143, z: 1}
+  m_Children: []
+  m_Father: {fileID: 224571075445614744}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.0048675537, y: 0.000030517578}
+  m_SizeDelta: {x: 87.79999, y: -61}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224817863727925410
 RectTransform:
   m_ObjectHideFlags: 1
@@ -83245,14 +83377,14 @@ RectTransform:
   m_GameObject: {fileID: 1791106448657506}
   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: 0.99999833, y: 0.99999833, z: 1.0000044}
   m_Children: []
   m_Father: {fileID: 224660473004951796}
-  m_RootOrder: 0
+  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.000091552734, y: 0.0000076293945}
+  m_AnchoredPosition: {x: 0, y: 0.000030517578}
   m_SizeDelta: {x: 69.91998, y: 11.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224864912545543336
@@ -85009,6 +85141,24 @@ RectTransform:
   m_AnchoredPosition: {x: -0.000020503998, y: -36.850006}
   m_SizeDelta: {x: 665, y: 278.3}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224954810324305286
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1112217278232724}
+  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: 224660473004951796}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.000091552734, y: 0.0000076293945}
+  m_SizeDelta: {x: 69.91998, y: 11.5}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224954956646312058
 RectTransform:
   m_ObjectHideFlags: 1

+ 8 - 8
Assets/Resource/XML/Config/dressRoom_config.xml

@@ -1,11 +1,11 @@
 <data>
   <item id="1" jump_frequency="10" type="" index="" bodypart="" level="" buy_currency="" buy_amt="" buy_advance_currency="" buy_advance_amt="" pixelSize="" iconOffset="" icon1offset="" icon2offset="" spriteName="" spriteAlpha="" armatureName="" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
-  <item id="2" jump_frequency="" type="1" index="0" bodypart="1" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="120" iconOffset="" icon1offset="" icon2offset="" spriteName="脑壳1" spriteAlpha="" armatureName="脑壳1" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="测试描述" />
-  <item id="3" jump_frequency="" type="1" index="1" bodypart="1" level="" buy_currency="1" buy_amt="10000000" buy_advance_currency="" buy_advance_amt="" pixelSize="120" iconOffset="" icon1offset="" icon2offset="" spriteName="脑壳1(棕色)" spriteAlpha="" armatureName="脑壳1(棕色)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="测试描述" />
-  <item id="4" jump_frequency="" type="1" index="2" bodypart="1" level="" buy_currency="2" buy_amt="50" buy_advance_currency="" buy_advance_amt="" pixelSize="120" iconOffset="" icon1offset="" icon2offset="" spriteName="脑壳1(粉色)" spriteAlpha="" armatureName="脑壳1(粉色)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="测试描述" />
-  <item id="5" jump_frequency="" type="1" index="3" bodypart="1" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="105" iconOffset="" icon1offset="" icon2offset="" spriteName="脑壳2(黄色)" spriteAlpha="" armatureName="脑壳2(黄色)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="测试描述" />
-  <item id="6" jump_frequency="" type="1" index="4" bodypart="1" level="" buy_currency="1" buy_amt="10000000" buy_advance_currency="" buy_advance_amt="" pixelSize="105" iconOffset="" icon1offset="" icon2offset="" spriteName="脑壳2" spriteAlpha="" armatureName="脑壳2" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="测试描述" />
-  <item id="7" jump_frequency="" type="1" index="5" bodypart="1" level="" buy_currency="2" buy_amt="50" buy_advance_currency="" buy_advance_amt="" pixelSize="105" iconOffset="" icon1offset="" icon2offset="" spriteName="脑壳2(粉色)" spriteAlpha="" armatureName="脑壳2(粉色)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="测试描述" />
+  <item id="2" jump_frequency="" type="1" index="0" bodypart="1" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="120" iconOffset="" icon1offset="" icon2offset="" spriteName="脑壳1" spriteAlpha="" armatureName="脑壳1" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="Desc0" />
+  <item id="3" jump_frequency="" type="1" index="1" bodypart="1" level="" buy_currency="1" buy_amt="10000000" buy_advance_currency="" buy_advance_amt="" pixelSize="120" iconOffset="" icon1offset="" icon2offset="" spriteName="脑壳1(棕色)" spriteAlpha="" armatureName="脑壳1(棕色)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="Desc1" />
+  <item id="4" jump_frequency="" type="1" index="2" bodypart="1" level="" buy_currency="2" buy_amt="50" buy_advance_currency="" buy_advance_amt="" pixelSize="120" iconOffset="" icon1offset="" icon2offset="" spriteName="脑壳1(粉色)" spriteAlpha="" armatureName="脑壳1(粉色)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="Desc2" />
+  <item id="5" jump_frequency="" type="1" index="3" bodypart="1" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="105" iconOffset="" icon1offset="" icon2offset="" spriteName="脑壳2(黄色)" spriteAlpha="" armatureName="脑壳2(黄色)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
+  <item id="6" jump_frequency="" type="1" index="4" bodypart="1" level="" buy_currency="1" buy_amt="10000000" buy_advance_currency="" buy_advance_amt="" pixelSize="105" iconOffset="" icon1offset="" icon2offset="" spriteName="脑壳2" spriteAlpha="" armatureName="脑壳2" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
+  <item id="7" jump_frequency="" type="1" index="5" bodypart="1" level="" buy_currency="2" buy_amt="50" buy_advance_currency="" buy_advance_amt="" pixelSize="105" iconOffset="" icon1offset="" icon2offset="" spriteName="脑壳2(粉色)" spriteAlpha="" armatureName="脑壳2(粉色)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="8" jump_frequency="" type="1" index="6" bodypart="1" level="" buy_currency="1" buy_amt="50000" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="17.5" icon1offset="25.38,-112.81" icon2offset="" spriteName="脑壳3+上(粉色),脑壳3+下(粉色)" spriteAlpha="" armatureName="脑壳3" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="9" jump_frequency="" type="1" index="7" bodypart="1" level="" buy_currency="1" buy_amt="10000000" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="17.5" icon1offset="25.38,-112.81" icon2offset="" spriteName="脑壳3+上(黄色),脑壳3+下(黄色)脑壳2——下" spriteAlpha="" armatureName="脑壳3(黄色)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
   <item id="10" jump_frequency="" type="1" index="8" bodypart="1" level="" buy_currency="2" buy_amt="50" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="17.5" icon1offset="25.38,-112.81" icon2offset="" spriteName="脑壳3+上(紫色),脑壳3+下(紫色)" spriteAlpha="" armatureName="脑壳3(紫色)" extraBodypart="" extraArmatureName="" ignore="" icon0offset="" desc="" />
@@ -115,7 +115,7 @@
   <item id="816" jump_frequency="" type="2" index="15" bodypart="5" level="50" buy_currency="2" buy_amt="650" buy_advance_currency="" buy_advance_amt="" pixelSize="60" iconOffset="" icon1offset="-50,36.31" icon2offset="57.8,33.83" spriteName="上衣13,上衣13袖子右,上衣13袖子左" spriteAlpha="" armatureName="上衣13" extraBodypart="10,9" extraArmatureName="短袖13右,短袖13左" ignore="" icon0offset="" desc="" />
   <item id="817" jump_frequency="" type="2" index="16" bodypart="5" level="50" buy_currency="2" buy_amt="700" buy_advance_currency="" buy_advance_amt="" pixelSize="80" iconOffset="" icon1offset="-59.77,36.31" icon2offset="57.8,33.83" spriteName="上衣13(紫),上衣13蓝袖子右,上衣13蓝袖子左" spriteAlpha="" armatureName="上衣13(紫)" extraBodypart="10,9" extraArmatureName="短袖13蓝右,短袖13蓝左" ignore="" icon0offset="" desc="" />
   <item id="818" jump_frequency="" type="2" index="17" bodypart="5" level="50" buy_currency="2" buy_amt="750" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="上衣14" spriteAlpha="" armatureName="上衣14" extraBodypart="10,9" extraArmatureName="" ignore="" icon0offset="" desc="" />
-  <item id="819" jump_frequency="" type="2" index="18" bodypart="5" level="50" buy_currency="2" buy_amt="700" buy_advance_currency="" buy_advance_amt="" pixelSize="80" iconOffset="" icon1offset="71.85,2.89" icon2offset="-66.24,-0.4" spriteName="上衣15,上衣15(袖子)-1,上衣15(袖子)-2" spriteAlpha="" armatureName="上衣15" extraBodypart="10,9" extraArmatureName="上衣15(袖子)左,上衣15(袖子)右" ignore="" icon0offset="" desc="" />
+  <item id="819" jump_frequency="" type="2" index="18" bodypart="5" level="50" buy_currency="2" buy_amt="700" buy_advance_currency="" buy_advance_amt="" pixelSize="73" iconOffset="" icon1offset="71.85,2.89" icon2offset="-66.24,-0.4" spriteName="上衣15,上衣15(袖子)-1,上衣15(袖子)-2" spriteAlpha="" armatureName="上衣15" extraBodypart="10,9" extraArmatureName="上衣15(袖子)左,上衣15(袖子)右" ignore="" icon0offset="" desc="" />
   <item id="820" jump_frequency="" type="2" index="19" bodypart="5" level="50" buy_currency="2" buy_amt="700" buy_advance_currency="" buy_advance_amt="" pixelSize="90" iconOffset="" icon1offset="" icon2offset="" spriteName="上衣14a" spriteAlpha="" armatureName="上衣14a" extraBodypart="10,9" extraArmatureName="上衣14a-袖子2,上衣14a-袖子1" ignore="" icon0offset="" desc="" />
   <item id="821" jump_frequency="" type="2" index="20" bodypart="5" level="50" buy_currency="2" buy_amt="700" buy_advance_currency="" buy_advance_amt="" pixelSize="70" iconOffset="" icon1offset="-59.56,16.23" icon2offset="56.97,13.65" spriteName="上衣14b,上衣14b-袖子2,上衣14b-袖子1" spriteAlpha="" armatureName="上衣14b" extraBodypart="10,9" extraArmatureName="上衣14b-袖子2,上衣14b-袖子1" ignore="" icon0offset="" desc="" />
   <item id="822" jump_frequency="" type="2" index="21" bodypart="5" level="50" buy_currency="2" buy_amt="700" buy_advance_currency="" buy_advance_amt="" pixelSize="70" iconOffset="" icon1offset="-59.56,16.23" icon2offset="56.97,13.65" spriteName="上衣14c,上衣14c-袖子2,上衣14c-袖子1" spriteAlpha="" armatureName="上衣14c" extraBodypart="10,9" extraArmatureName="上衣14c-袖子2,上衣14c-袖子1" ignore="" icon0offset="" desc="" />
@@ -195,7 +195,7 @@ sprite透明度
 第一个Sprite的额外偏移
 </icon0offset>
     <desc>
-描述
+添加描述
 </desc>
   </comment>
 </data>

+ 1 - 1
Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="22" />
+  <Version value="23" />
   <ReplayVersion value="1" />
   
   <ID value="Default" />

+ 6 - 0
Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -161,6 +161,9 @@
     <Ph_CloseLab desc=""><![CDATA[关闭]]></Ph_CloseLab>
     <Pi_Title desc=""><![CDATA[搭配秀]]></Pi_Title>
     <Pi_HomePage desc=""><![CDATA[首页]]></Pi_HomePage>
+    <Pi_TitleTip desc=""><![CDATA[请填写标题]]></Pi_TitleTip>
+    <Pi_ContentTip desc=""><![CDATA[请填写描述]]></Pi_ContentTip>
+    <Pi_BuyAllTip desc=""><![CDATA[确定要购买缺少的装扮?]]></Pi_BuyAllTip>
     <Q_Tit desc=""><![CDATA[留言板]]></Q_Tit>
     <Q_Placeholder desc=""><![CDATA[给这家主人说点什么吧]]></Q_Placeholder>
     <Q_CommentLab desc=""><![CDATA[留言]]></Q_CommentLab>
@@ -918,6 +921,9 @@
     <Armature1003 desc=""><![CDATA[精灵之翼]]></Armature1003>
     <Armature1004 desc=""><![CDATA[蝴蝶妖精]]></Armature1004>
     <Armature1005 desc=""><![CDATA[蝶梦]]></Armature1005>
+    <Desc0 desc=""><![CDATA[描述0]]></Desc0>
+    <Desc1 desc=""><![CDATA[描述1]]></Desc1>
+    <Desc2 desc=""><![CDATA[描述2]]></Desc2>
   </DressRoom>
   <Tip>
     <Tip1 desc=""><![CDATA[玩累了就休息一下,即使离线,花园也有收益哟~]]></Tip1>

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

@@ -161,6 +161,9 @@
     <Ph_CloseLab desc=""><![CDATA[關閉]]></Ph_CloseLab>
     <Pi_Title desc=""><![CDATA[搭配秀]]></Pi_Title>
     <Pi_HomePage desc=""><![CDATA[首頁]]></Pi_HomePage>
+    <Pi_TitleTip desc=""><![CDATA[請填寫標題]]></Pi_TitleTip>
+    <Pi_ContentTip desc=""><![CDATA[請填寫描述]]></Pi_ContentTip>
+    <Pi_BuyAllTip desc=""><![CDATA[確定要購買缺少的裝扮?]]></Pi_BuyAllTip>
     <Q_Tit desc=""><![CDATA[留言板]]></Q_Tit>
     <Q_Placeholder desc=""><![CDATA[給這家主人說點什麼吧]]></Q_Placeholder>
     <Q_CommentLab desc=""><![CDATA[留言]]></Q_CommentLab>
@@ -918,6 +921,9 @@
     <Armature1003 desc=""><![CDATA[精靈之翼]]></Armature1003>
     <Armature1004 desc=""><![CDATA[蝴蝶妖精]]></Armature1004>
     <Armature1005 desc=""><![CDATA[蝶夢]]></Armature1005>
+    <Desc0 desc=""><![CDATA[]]></Desc0>
+    <Desc1 desc=""><![CDATA[]]></Desc1>
+    <Desc2 desc=""><![CDATA[]]></Desc2>
   </DressRoom>
   <Tip>
     <Tip1 desc=""><![CDATA[玩累了就休息一下,即使離線,花園也有收益喲~]]></Tip1>

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

@@ -161,6 +161,9 @@ Program 水怪
     <Ph_CloseLab desc=""><![CDATA[Close]]></Ph_CloseLab>
     <Pi_Title desc=""><![CDATA[Dress Collocation]]></Pi_Title>
     <Pi_HomePage desc=""><![CDATA[Home]]></Pi_HomePage>
+    <Pi_TitleTip desc=""><![CDATA[Enter the title]]></Pi_TitleTip>
+    <Pi_ContentTip desc=""><![CDATA[Enter the description]]></Pi_ContentTip>
+    <Pi_BuyAllTip desc=""><![CDATA[Are you sure to buy them all?]]></Pi_BuyAllTip>
     <Q_Tit desc=""><![CDATA[Message board]]></Q_Tit>
     <Q_Placeholder desc=""><![CDATA[Say something to the host]]></Q_Placeholder>
     <Q_CommentLab desc=""><![CDATA[Comment]]></Q_CommentLab>
@@ -917,6 +920,9 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <Armature1003 desc=""><![CDATA[Elf Wings]]></Armature1003>
     <Armature1004 desc=""><![CDATA[Butterfly Elf]]></Armature1004>
     <Armature1005 desc=""><![CDATA[Dream of Butterfly]]></Armature1005>
+    <Desc0 desc=""><![CDATA[]]></Desc0>
+    <Desc1 desc=""><![CDATA[]]></Desc1>
+    <Desc2 desc=""><![CDATA[]]></Desc2>
   </DressRoom>
   <Tip>
     <Tip1 desc=""><![CDATA[The visitors will come to pay the tickest for your garden even if your are offline!]]></Tip1>

BIN
Assets/Resource/Xlsx/dressRoom_config.xlsx


BIN
Assets/Resource/Xlsx/language_config.xlsx


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

@@ -550,10 +550,12 @@ public class CanvasLabel
     public static string Pg_FashionTitleBackground = "Pg_FashionTitleBackground";
     public static string Pg_FashionTitleParent = "Pg_FashionTitleParent";
     public static string Pg_FashionTitle = "Pg_FashionTitle";
+    public static string Pg_FashionTitlePlaceHolder = "Pg_FashionTitlePlaceHolder";
     public static string Pg_FashionTitleEditButton = "Pg_FashionTitleEditButton";
     public static string Pg_FashionContentBackground = "Pg_FashionContentBackground";
     public static string Pg_FashionContentParent = "Pg_FashionContentParent";
     public static string Pg_FashionContent = "Pg_FashionContent";
+    public static string Pg_FashionContentPlaceHolder = "Pg_FashionContentPlaceHolder";
     public static string Pg_FashionContentEditButton = "Pg_FashionContentEditButton";
     public static string Pg_SliderBackground = "Pg_SliderBackground";
     public static string Pg_VerticalSliderGroup = "Pg_VerticalSliderGroup";

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

@@ -173,6 +173,9 @@ public class LanguageLabel
     	public static string UI__Ph_CloseLab = "UI__Ph_CloseLab";
     	public static string UI__Pi_Title = "UI__Pi_Title";
     	public static string UI__Pi_HomePage = "UI__Pi_HomePage";
+    	public static string UI__Pi_TitleTip = "UI__Pi_TitleTip";
+    	public static string UI__Pi_ContentTip = "UI__Pi_ContentTip";
+    	public static string UI__Pi_BuyAllTip = "UI__Pi_BuyAllTip";
     	public static string UI__Q_Tit = "UI__Q_Tit";
     	public static string UI__Q_Placeholder = "UI__Q_Placeholder";
     	public static string UI__Q_CommentLab = "UI__Q_CommentLab";
@@ -820,6 +823,10 @@ public class LanguageLabel
     	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__Armature37 = "DressRoom__Armature37";
+    	public static string DressRoom__Armature38 = "DressRoom__Armature38";
+    	public static string DressRoom__Armature39 = "DressRoom__Armature39";
+    	public static string DressRoom__Armature40 = "DressRoom__Armature40";
     	public static string DressRoom__Armature201 = "DressRoom__Armature201";
     	public static string DressRoom__Armature202 = "DressRoom__Armature202";
     	public static string DressRoom__Armature203 = "DressRoom__Armature203";
@@ -839,6 +846,9 @@ public class LanguageLabel
     	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__Armature220 = "DressRoom__Armature220";
+    	public static string DressRoom__Armature221 = "DressRoom__Armature221";
+    	public static string DressRoom__Armature222 = "DressRoom__Armature222";
     	public static string DressRoom__Armature401 = "DressRoom__Armature401";
     	public static string DressRoom__Armature402 = "DressRoom__Armature402";
     	public static string DressRoom__Armature403 = "DressRoom__Armature403";
@@ -856,6 +866,9 @@ public class LanguageLabel
     	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__Armature418 = "DressRoom__Armature418";
+    	public static string DressRoom__Armature419 = "DressRoom__Armature419";
+    	public static string DressRoom__Armature420 = "DressRoom__Armature420";
     	public static string DressRoom__Armature601 = "DressRoom__Armature601";
     	public static string DressRoom__Armature602 = "DressRoom__Armature602";
     	public static string DressRoom__Armature603 = "DressRoom__Armature603";
@@ -870,6 +883,8 @@ public class LanguageLabel
     	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__Armature615 = "DressRoom__Armature615";
+    	public static string DressRoom__Armature616 = "DressRoom__Armature616";
     	public static string DressRoom__Armature801 = "DressRoom__Armature801";
     	public static string DressRoom__Armature802 = "DressRoom__Armature802";
     	public static string DressRoom__Armature803 = "DressRoom__Armature803";
@@ -889,9 +904,17 @@ public class LanguageLabel
     	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__Armature820 = "DressRoom__Armature820";
+    	public static string DressRoom__Armature821 = "DressRoom__Armature821";
+    	public static string DressRoom__Armature822 = "DressRoom__Armature822";
     	public static string DressRoom__Armature1001 = "DressRoom__Armature1001";
     	public static string DressRoom__Armature1002 = "DressRoom__Armature1002";
     	public static string DressRoom__Armature1003 = "DressRoom__Armature1003";
+    	public static string DressRoom__Armature1004 = "DressRoom__Armature1004";
+    	public static string DressRoom__Armature1005 = "DressRoom__Armature1005";
+    	public static string DressRoom__Desc0 = "DressRoom__Desc0";
+    	public static string DressRoom__Desc1 = "DressRoom__Desc1";
+    	public static string DressRoom__Desc2 = "DressRoom__Desc2";
     	public static string Tip = "Tip";
     	public static string Tip__Tip1 = "Tip__Tip1";
     	public static string Tip__Tip2 = "Tip__Tip2";

+ 20 - 0
Assets/Script/Manage/ConfigManager.cs

@@ -1431,6 +1431,13 @@ public class ConfigManager : Regist
             ToVersion22(nativeDoc, defaultDoc);
         }
 
+        if (nativeVersion < 23)
+        {
+            Debug.LogWarning("UpdateArchive to 23");
+
+            ToVersion23(nativeDoc, defaultDoc);
+        }
+
         return nativeDoc;
     }
 
@@ -1778,4 +1785,17 @@ public class ConfigManager : Regist
 
         return nativeDoc;
     }
+
+    public static XmlDocument ToVersion23(XmlDocument nativeDoc, XmlDocument defaultDoc)
+    {
+        nativeDoc.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value = 23.ToString();
+
+        string persistentFolderPath = $"{Application.persistentDataPath}{Path.DirectorySeparatorChar}HotUpdate";
+        if (Directory.Exists(persistentFolderPath))
+        {
+            Directory.Delete(persistentFolderPath, true);
+        }
+
+        return nativeDoc;
+    }
 }

+ 6 - 1
Assets/Script/Object/Player.cs

@@ -484,7 +484,8 @@ public class CloseItem
         else
         {
             descTxt.SetActive(true);
-            descTxt.text = desc;
+            string descContent = Language.GetStr("DressRoom", desc);
+            descTxt.text = descContent;
         }
 
         ResourceManager.SetText(CanvasLabel.Pa_Lab, Name);
@@ -1411,6 +1412,10 @@ public class Player : Regist , IPointerClickHandler
             Renderer[] renderers = PlayerManager.Player.UAC.transform.GetComponentsInChildren<Renderer>(true);
             foreach (var renderer in renderers)
             {
+                if (renderer.sharedMaterial == null)
+                {
+                    continue;
+                }
                 TweenRenderer fadeAnim = AnimManager.CreateTweenRenderer(renderer, 0, 1, 0.25f, true, true, Curve.EaseOutQuad);
                 fadeAnim.UseSharedMaterial = true;
                 fadeAnims.Add(fadeAnim);

+ 26 - 6
Assets/Script/Social/FashionShowEditPage.cs

@@ -13,8 +13,8 @@ public class FashionShowEditPage : Regist
     private static Text DiamondText;
     private static Text RecommendTitle;
     private static Text PraiseText;
-    //private static Text FashionTitle;
-    //private static Text FashionContent;
+    private static Text FashionTitlePlaceHolder;
+    private static Text FashionContentPlaceHolder;
     private static Text CuteTitle;
     private static Text CuteValue;
     private static Text CuteRateText;
@@ -100,8 +100,8 @@ public class FashionShowEditPage : Regist
         DiamondText = ResourceManager.Get<Text>(CanvasLabel.Pg_DiamondText);
         RecommendTitle = ResourceManager.Get<Text>(CanvasLabel.Pg_RecommendTitle);
         PraiseText = ResourceManager.Get<Text>(CanvasLabel.Pg_PraiseText);
-        //FashionTitle = ResourceManager.Get<Text>(CanvasLabel.Pg_FashionTitle);
-        //FashionContent = ResourceManager.Get<Text>(CanvasLabel.Pg_FashionContent);
+        FashionTitlePlaceHolder = ResourceManager.Get<Text>(CanvasLabel.Pg_FashionTitlePlaceHolder);
+        FashionContentPlaceHolder = ResourceManager.Get<Text>(CanvasLabel.Pg_FashionContentPlaceHolder);
         CuteTitle = ResourceManager.Get<Text>(CanvasLabel.Pg_CuteTitle);
         CuteValue = ResourceManager.Get<Text>(CanvasLabel.Pg_CuteValue);
         CuteRateText = ResourceManager.Get<Text>(CanvasLabel.Pg_CuteRateText);
@@ -161,6 +161,8 @@ public class FashionShowEditPage : Regist
         FashionTitleInputField = ResourceManager.Get<InputField>(CanvasLabel.Pg_FashionTitleBackground);
         FashionContentInputField = ResourceManager.Get<InputField>(CanvasLabel.Pg_FashionContentBackground);
 
+        LanguageManager.Add(FashionTitlePlaceHolder, new MulLanStr(LanguageLabel.UI__Pi_TitleTip));
+        LanguageManager.Add(FashionContentPlaceHolder, new MulLanStr(LanguageLabel.UI__Pi_ContentTip));
         LanguageManager.Add(BuyAllButtonText, new MulLanStr(LanguageLabel.UI__Pg_BuyAll));
         LanguageManager.Add(CuteTitle, new MulLanStr(LanguageLabel.UI__Pg_Cute));
         LanguageManager.Add(GraceTitle, new MulLanStr(LanguageLabel.UI__Pg_Grace));
@@ -616,8 +618,18 @@ public class FashionShowEditPage : Regist
             Bubble.Show(Language.GetStr(LanguageLabel.Common__ShortDiamond));
             return;
         }
-        Manager.Pay("", TotalCoin.Value, Current.Coin, OnBuyAllSucceedCallback, StaticsManager.ItemID.解锁服装, StaticsManager.ConsumeModule.Charge, false, false, null, TotalCoin.Key);
-        Manager.Pay("", TotalDiamond.Value, Current.Diamond, OnBuyAllSucceedCallback, StaticsManager.ItemID.解锁服装, StaticsManager.ConsumeModule.Charge, false, false, null, TotalDiamond.Key);
+        ShowBuyTip();
+    }
+
+    private static void ShowBuyTip()
+    {
+        Bubble.Show(Language.GetStr(LanguageLabel.UI__Pi_BuyAllTip), null, null, null,
+            () =>
+            {
+                Manager.Pay("", TotalCoin.Value, Current.Coin, OnBuyAllSucceedCallback, StaticsManager.ItemID.解锁服装, StaticsManager.ConsumeModule.Charge, false, false, null, TotalCoin.Key);
+                Manager.Pay("", TotalDiamond.Value, Current.Diamond, OnBuyAllSucceedCallback, StaticsManager.ItemID.解锁服装, StaticsManager.ConsumeModule.Charge, false, false, null, TotalDiamond.Key);
+            }
+        );
     }
 
     private static void OnBuyAllSucceedCallback()
@@ -666,6 +678,13 @@ public class FashionShowEditPage : Regist
         data.graceRate = (int) GraceSlider.value;
         data.gloryRate = (int) GlorySlider.value;
         RateShowHttp.Rate(data, null, null);
+
+        FashionShowData.cuteScore += data.cuteRate;
+        FashionShowData.vividScore += data.vividRate;
+        FashionShowData.simpleScore += data.simpleRate;
+        FashionShowData.graceScore += data.graceRate;
+        FashionShowData.gloryScore += data.gloryRate;
+        FashionShowData.scoreCnt++;
     }
 
     private static bool IsRateChanged()
@@ -867,6 +886,7 @@ public class FashionShowEditPage : Regist
         data.title = "";
         data.content = "";
         data.playerId = HttpManager.GetPlayerId();
+        data.playerNickName = NickNameManager.NickName;
         List<int> closeIds = PlayerManager.Player.GetCurrentChangableDressIDs();
         data.SetCloseIds(closeIds);
         ShowEditPanel(data);

+ 35 - 1
Assets/Script/Social/FashionShowHomePage.cs

@@ -22,7 +22,16 @@ public class FashionShowHomePage : Regist
 	private static Button SimpleTabButton;
 	private static Button GloryTabButton;
 	private static Button MineTabButton;
-	private static VirtualScrollRectPlus HomeScrollRect;
+
+	private static Image HomeBubble;
+    private static Image CuteBubble;
+    private static Image GraceBubble;
+    private static Image VividBubble;
+    private static Image SimpleBubble;
+    private static Image GloryBubble;
+    private static Image MineBubble;
+
+    private static VirtualScrollRectPlus HomeScrollRect;
 	private static VirtualScrollRectPlus CuteScrollRect;
 	private static VirtualScrollRectPlus GraceScrollRect;
 	private static VirtualScrollRectPlus VividScrollRect;
@@ -43,6 +52,7 @@ public class FashionShowHomePage : Regist
     private static Transform Panel;
     private static Transform SidePanel;
     private static List<Button> TabButtons = new List<Button>();
+    private static List<Image> TabBubbles = new List<Image>();
     private static List<VirtualScrollRectPlus> ScrollRects = new List<VirtualScrollRectPlus>();
     private static List<GetFashionShowData> HomeDatas = new List<GetFashionShowData>();
     private static List<GetFashionShowData> CuteDatas = new List<GetFashionShowData>();
@@ -74,6 +84,15 @@ public class FashionShowHomePage : Regist
         SimpleTabButton = ResourceManager.Get<Button>(CanvasLabel.Pi_SimpleTabButton);
         GloryTabButton = ResourceManager.Get<Button>(CanvasLabel.Pi_GloryTabButton);
         MineTabButton = ResourceManager.Get<Button>(CanvasLabel.Pi_MineTabButton);
+
+        HomeBubble = ResourceManager.Get<Image>(CanvasLabel.Pi_HomeTabBubble);
+        CuteBubble = ResourceManager.Get<Image>(CanvasLabel.Pi_CuteTabBubble);
+        GraceBubble = ResourceManager.Get<Image>(CanvasLabel.Pi_GraceTabBubble);
+        VividBubble = ResourceManager.Get<Image>(CanvasLabel.Pi_VividTabBubble);
+        SimpleBubble = ResourceManager.Get<Image>(CanvasLabel.Pi_SimpleTabBubble);
+        GloryBubble = ResourceManager.Get<Image>(CanvasLabel.Pi_GloryTabBubble);
+        MineBubble = ResourceManager.Get<Image>(CanvasLabel.Pi_MineTabBubble);
+
         HomeScrollRect = ResourceManager.Get<VirtualScrollRectPlus>(CanvasLabel.Pi_HomeScrollRect);
         CuteScrollRect = ResourceManager.Get<VirtualScrollRectPlus>(CanvasLabel.Pi_CuteScrollRect);
         GraceScrollRect = ResourceManager.Get<VirtualScrollRectPlus>(CanvasLabel.Pi_GraceScrollRect);
@@ -94,6 +113,15 @@ public class FashionShowHomePage : Regist
         TabButtons.Add(SimpleTabButton);
         TabButtons.Add(GloryTabButton);
         TabButtons.Add(MineTabButton);
+
+        TabBubbles.Add(HomeBubble);
+        TabBubbles.Add(CuteBubble);
+        TabBubbles.Add(GraceBubble);
+        TabBubbles.Add(VividBubble);
+        TabBubbles.Add(SimpleBubble);
+        TabBubbles.Add(GloryBubble);
+        TabBubbles.Add(MineBubble);
+
         ScrollRects.Add(HomeScrollRect);
         ScrollRects.Add(CuteScrollRect);
         ScrollRects.Add(GraceScrollRect);
@@ -248,6 +276,12 @@ public class FashionShowHomePage : Regist
             http.disable = true;
         }
 
+        foreach (var tabBubble in TabBubbles)
+        {
+            tabBubble.SetActive(false);
+        }
+        TabBubbles[index].SetActive(true);
+
         AudioManager.PlayClip(ResourceLabel.BtnClip);
         for (int i = 0; i < TabButtons.Count; i++)
         {

+ 3 - 3
ProjectSettings/GraphicsSettings.asset

@@ -43,13 +43,13 @@ GraphicsSettings:
     type: 0}
   m_TierSettings_Tier1:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_TierSettings_Tier2:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_TierSettings_Tier3:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_DefaultRenderingPath: 1
   m_DefaultMobileRenderingPath: 1
   m_TierSettings: []