UI調整

popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/detail_histoy.prefab

@@ -1,5 +1,123 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &5584441313272373001
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5541129917930766474}
+  - component: {fileID: 7934789976170800748}
+  - component: {fileID: 1442642106177556608}
+  - component: {fileID: 4249076875034152723}
+  m_Layer: 5
+  m_Name: LevelText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5541129917930766474
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5584441313272373001}
+  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: 6878252344180914110}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -340, y: 150}
+  m_SizeDelta: {x: 98.11737, y: 56}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7934789976170800748
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5584441313272373001}
+  m_CullTransparentMesh: 0
+--- !u!114 &1442642106177556608
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5584441313272373001}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.43137258, g: 0.29803923, b: 0.19215688, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
+    m_FontSize: 35
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 30
+    m_MaxSize: 35
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Lv.99
+--- !u!114 &4249076875034152723
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5584441313272373001}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mTerm: '-'
+  mTermSecondary: Font/DFHannotateStdN-W7
+  PrimaryTermModifier: 0
+  SecondaryTermModifier: 0
+  TermPrefix: 
+  TermSuffix: 
+  LocalizeOnAwake: 1
+  IgnoreRTL: 0
+  MaxCharactersInRTL: 0
+  IgnoreNumbersInRTL: 1
+  CorrectAlignmentForRTL: 1
+  AddSpacesToJoinedLanguages: 0
+  AllowLocalizedParameters: 1
+  AllowParameters: 1
+  TranslatedObjects: []
+  LocalizeEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  AlwaysForceLocalize: 0
+  LocalizeCallBack:
+    Target: {fileID: 0}
+    MethodName: 
+  mGUI_ShowReferences: 0
+  mGUI_ShowTems: 1
+  mGUI_ShowCallback: 0
+  mLocalizeTarget: {fileID: 0}
+  mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text
 --- !u!1 &6878252344180914081
 GameObject:
   m_ObjectHideFlags: 0
@@ -29,6 +147,7 @@ RectTransform:
   m_Children:
   - {fileID: 6878252345310641719}
   - {fileID: 6878252344990047428}
+  - {fileID: 5541129917930766474}
   - {fileID: 6878252345909755265}
   - {fileID: 6878252345190694868}
   m_Father: {fileID: 6878252344716020596}
@@ -89,6 +208,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ec14e6a9da43403d96c18ca8372f3b9a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  levelText: {fileID: 1442642106177556608}
   achievementText: {fileID: 6878252345909755294}
   playButton: {fileID: 6878252345190694869}
   oddColorBG: {fileID: 6878252345310641718}
@@ -111,7 +231,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6878252344990047428
 RectTransform:
   m_ObjectHideFlags: 0
@@ -278,7 +398,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6878252344180914110}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -597,12 +717,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6878252344180914110}
-  m_RootOrder: 2
+  m_RootOrder: 3
   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: -39, y: 150}
+  m_AnchoredPosition: {x: -26.34, y: 150}
-  m_SizeDelta: {x: 700, y: 56}
+  m_SizeDelta: {x: 521.1516, y: 56}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6878252345909755295
 CanvasRenderer:
@@ -644,7 +764,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "Lv.1\u3000\u3072\u3088\u3063\u3053\u306E\u304A\u5E97"
+  m_Text: "\u3072\u3088\u3063\u3053\u306E\u304A\u5E97"
 --- !u!114 &3539815984432210124
 MonoBehaviour:
   m_ObjectHideFlags: 0

popcorn/Assets/MyGame/Scenes/Main/Scripts/ShopHistoryItemView.cs

@@ -5,21 +5,29 @@ using UnityEngine.UI;
 
 public class ShopHistoryItemView : MonoBehaviour
 {
-    private static readonly string levelTextFormat = "Lv.{0}　{1}";
+    private static readonly string levelTextFormat = "Lv.{0}";
+    [SerializeField] private Text levelText;
     [SerializeField] private Text achievementText;
     [SerializeField] private Button playButton;
     [SerializeField] private GameObject oddColorBG;
     [SerializeField] private GameObject viewObject;
     [SerializeField] private GameObject unreleasedObject;
     public IObservable<Unit> PlayButton => playButton.OnClickAsObservable().TakeUntilDestroy(this);
+
+    private void Awake()
+    {
+        levelText.text = String.Empty;
+    }
+
     public void SetData(ShopLevelData levelData)
     {
-        SetAchievementText(String.Format(levelTextFormat, levelData.shopLevel, levelData.Achievement));
+        SetAchievementText(levelData.Achievement);
+        levelText.text = String.Format(levelTextFormat, levelData.shopLevel);
     }
 
     public void SetAchievementText(string text)
     {
-        achievementText.text = $"    　{text}";
+        achievementText.text = $"{text}";
     }
 
     public void SetUnreleased(bool active)