Merge branch 'feature/1.3.0' of bitbucket.org:usaya/popcorn into feature/1.3.0

popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/_Stock.prefab

@@ -283,6 +283,7 @@ MonoBehaviour:
   popcornImage: {fileID: 6575909497785744315}
   maxPosision: 0.44
   minPosision: -1.75
+  textObject: {fileID: 9065752651984734903}
 --- !u!1 &6863917638577353925
 GameObject:
   m_ObjectHideFlags: 0
@@ -404,6 +405,7 @@ GameObject:
   m_Component:
   - component: {fileID: 2640383126096438143}
   - component: {fileID: 4680395383523372758}
+  - component: {fileID: 8257400175472798055}
   m_Layer: 0
   m_Name: text
   m_TagString: Untagged
@@ -464,7 +466,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 5
-  m_Sprite: {fileID: 21300000, guid: d2e4ae50bfa33574dbf61988d91f2634, type: 3}
+  m_Sprite: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -472,6 +474,46 @@ SpriteRenderer:
   m_Size: {x: 1.08, y: 0.72}
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
+  m_WasSpriteAssigned: 0
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!114 &8257400175472798055
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9065752651984734903}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mTerm: ui_marketing_StockMeter_StocktText
+  mTermSecondary: 
+  PrimaryTermModifier: 0
+  SecondaryTermModifier: 0
+  TermPrefix: 
+  TermSuffix: 
+  LocalizeOnAwake: 1
+  IgnoreRTL: 0
+  MaxCharactersInRTL: 0
+  IgnoreNumbersInRTL: 1
+  CorrectAlignmentForRTL: 1
+  AddSpacesToJoinedLanguages: 0
+  AllowLocalizedParameters: 1
+  AllowParameters: 1
+  TranslatedObjects:
+  - {fileID: 21300000, guid: d2e4ae50bfa33574dbf61988d91f2634, type: 3}
+  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_UnityStandard_SpriteRenderer

popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs

@@ -44,6 +44,7 @@ public class MarketManager : MonoBehaviour
         // カスタマイズ読み込み
         marketView.SetAllItem();
         stockView = marketView.GetTarget(ShopCustomizeCategory.Category4).GetComponentInChildren<ShopStockView>();
+        stockView.SetTextActive(true);
         ShopCustomizeCoinManager.Instance.ChangeCoin(gameData.ShopCustomizeCoin);
 
         if (!gameData.FinishedFlags.HasFlag(TutorialFlag.FirstPlay))