Merge branch 'main' of http://192.168.10.102:30008/dal4segno/Northbound

Assets/UI/Upgrade.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6391d22e038f51b4e9f238cf61386cab
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/UI/Upgrade/EffectRow.prefab

@@ -10,7 +10,8 @@ GameObject:
   m_Component:
   - component: {fileID: 2444931357977275400}
   - component: {fileID: 9061793412099809719}
-  - component: {fileID: 6403066547393456078}
+  - component: {fileID: 647699644516212128}
+  - component: {fileID: 8318611973315991405}
   m_Layer: 0
   m_Name: EffectRow
   m_TagString: Untagged
@@ -47,7 +48,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2898808802133596136}
   m_CullTransparentMesh: 1
---- !u!114 &6403066547393456078
+--- !u!114 &647699644516212128
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -56,89 +57,43 @@ MonoBehaviour:
   m_GameObject: {fileID: 2898808802133596136}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
   m_Name: 
-  m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI
+  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.HorizontalLayoutGroup
-  m_Material: {fileID: 0}
+  m_Padding:
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+    m_Left: 0
-  m_RaycastTarget: 1
+    m_Right: 0
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+    m_Top: 0
-  m_Maskable: 1
+    m_Bottom: 0
-  m_OnCullStateChanged:
+  m_ChildAlignment: 3
-    m_PersistentCalls:
+  m_Spacing: 12
-      m_Calls: []
+  m_ChildForceExpandWidth: 0
-  m_text: 
+  m_ChildForceExpandHeight: 0
-  m_isRightToLeft: 0
+  m_ChildControlWidth: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_ChildControlHeight: 1
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_ChildScaleWidth: 0
-  m_fontSharedMaterials: []
+  m_ChildScaleHeight: 0
-  m_fontMaterial: {fileID: 0}
+  m_ReverseArrangement: 0
-  m_fontMaterials: []
+--- !u!114 &8318611973315991405
-  m_fontColor32:
+MonoBehaviour:
-    serializedVersion: 2
+  m_ObjectHideFlags: 0
-    rgba: 4294967295
+  m_CorrespondingSourceObject: {fileID: 0}
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_PrefabInstance: {fileID: 0}
-  m_enableVertexGradient: 0
+  m_PrefabAsset: {fileID: 0}
-  m_colorMode: 3
+  m_GameObject: {fileID: 2898808802133596136}
-  m_fontColorGradient:
+  m_Enabled: 1
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
+  m_EditorHideFlags: 0
-    topRight: {r: 1, g: 1, b: 1, a: 1}
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+  m_Name: 
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.LayoutElement
-  m_fontColorGradientPreset: {fileID: 0}
+  m_IgnoreLayout: 0
-  m_spriteAsset: {fileID: 0}
+  m_MinWidth: -1
-  m_tintAllSprites: 0
+  m_MinHeight: -1
-  m_StyleSheet: {fileID: 0}
+  m_PreferredWidth: -1
-  m_TextStyleHashCode: -1183493901
+  m_PreferredHeight: 50
-  m_overrideHtmlColors: 0
+  m_FlexibleWidth: -1
-  m_faceColor:
+  m_FlexibleHeight: -1
-    serializedVersion: 2
+  m_LayoutPriority: 1
-    rgba: 4294967295
-  m_fontSize: 36
-  m_fontSizeBase: 36
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_characterHorizontalScale: 1
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 0
-  m_ActiveFontFeatures: 6e72656b
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_EmojiFallbackSupport: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 1
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 0
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &5410120199112262557
 GameObject:
   m_ObjectHideFlags: 0
@@ -171,10 +126,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 2444931357977275400}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 200, y: 50}
+  m_SizeDelta: {x: 200, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5461095200051268521
 CanvasRenderer:
@@ -204,7 +159,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: New Text
+  m_text: +20
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -231,8 +186,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 36
+  m_fontSize: 32
-  m_fontSizeBase: 36
+  m_fontSizeBase: 32
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -308,10 +263,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 2444931357977275400}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 200, y: 50}
+  m_SizeDelta: {x: 200, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3107770936480059608
 CanvasRenderer:
@@ -341,7 +296,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: New Text
+  m_text: Capacity
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -368,8 +323,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 36
+  m_fontSize: 32
-  m_fontSizeBase: 36
+  m_fontSizeBase: 32
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18

Assets/UI/Upgrade/ReqChip.prefab

@@ -65,7 +65,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: New Text
+  m_text: Mana Capacity 1
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}

Assets/UI/Upgrade/UpgradeListItem.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ff4717eb00d83a740b7ad45ad693db0c
+guid: c571cad31de0cc341b86870131c0c193
 PrefabImporter:
   externalObjects: {}
   userData: