gdl_123 пре 7 месеци
родитељ
комит
5985abfffc

BIN
Assets/Content/Icons/FrameNew/frame_ic_contract.png


BIN
Assets/Content/Icons/FrameNew/frame_ic_follow.png


BIN
Assets/Content/Icons/FrameNew/frame_ic_follow_r.png


BIN
Assets/Content/Icons/FrameNew/frame_ic_follow_s.png


+ 8 - 8
Assets/Content/Prefabs/UI/GridViewItem/IconPetItem.prefab

@@ -201,8 +201,8 @@ RectTransform:
   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: 100.9, y: 25.8}
-  m_SizeDelta: {x: 68, y: 60}
+  m_AnchoredPosition: {x: 59.800003, y: 25.8}
+  m_SizeDelta: {x: 104, y: 60}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &8985056147908181368
 CanvasRenderer:
@@ -713,8 +713,8 @@ RectTransform:
   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: 100.899994, y: 25.800003}
-  m_SizeDelta: {x: 68, y: 60}
+  m_AnchoredPosition: {x: 59.799995, y: 25.800003}
+  m_SizeDelta: {x: 104, y: 60}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &7036978075749422577
 CanvasRenderer:
@@ -1476,8 +1476,8 @@ RectTransform:
   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: 100.899994, y: 25.800003}
-  m_SizeDelta: {x: 68, y: 60}
+  m_AnchoredPosition: {x: 59.8, y: 25.800003}
+  m_SizeDelta: {x: 104, y: 60}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &5653257954836797558
 CanvasRenderer:
@@ -2194,8 +2194,8 @@ RectTransform:
   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: 100.899994, y: 25.800003}
-  m_SizeDelta: {x: 68, y: 60}
+  m_AnchoredPosition: {x: 59.799995, y: 25.800003}
+  m_SizeDelta: {x: 104, y: 60}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &1714096937991088691
 CanvasRenderer:

+ 40 - 79
Assets/Content/Prefabs/UI/UILanuch/UILanuch.prefab

@@ -1901,7 +1901,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 188, y: 28}
+  m_SizeDelta: {x: 217, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3052409915049618604
 CanvasRenderer:
@@ -8314,7 +8314,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 138, y: 28}
+  m_SizeDelta: {x: 168, y: 45}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6452615104976114183
 CanvasRenderer:
@@ -8709,7 +8709,8 @@ GameObject:
   - component: {fileID: 1313536936118464242}
   - component: {fileID: 2271795092944002016}
   - component: {fileID: 591780373755176039}
-  - component: {fileID: 4500064826990095048}
+  - component: {fileID: 529813737520110427}
+  - component: {fileID: 7598129675120768468}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -8758,7 +8759,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_key: TitleNotify
---- !u!114 &4500064826990095048
+--- !u!114 &529813737520110427
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8767,7 +8768,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 5504490238751048666}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -8778,75 +8779,35 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\u6E38\u620F\u516C\u544A"
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, type: 2}
-  m_sharedMaterial: {fileID: 2100000, guid: 2a55426dee1005f4ba060aaad88233c4, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 32
-  m_fontSizeBase: 36
-  m_fontWeight: 400
-  m_enableAutoSizing: 1
-  m_fontSizeMin: 4
-  m_fontSizeMax: 32
-  m_fontStyle: 0
-  m_HorizontalAlignment: 2
-  m_VerticalAlignment: 512
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 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: 1
-  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}
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 90ed5292e87d8a64aac7038df97ece85, type: 3}
+    m_FontSize: 42
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 4
+    m_MaxSize: 42
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 11111
+--- !u!114 &7598129675120768468
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5504490238751048666}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1 &5882261254970375086
 GameObject:
   m_ObjectHideFlags: 0
@@ -10455,7 +10416,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 448, y: 44}
+  m_SizeDelta: {x: 419, y: 67}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2742791068091194763
 CanvasRenderer:
@@ -11012,7 +10973,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 448, y: 44}
+  m_SizeDelta: {x: 419, y: 67}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3359823752756287131
 CanvasRenderer:
@@ -11090,7 +11051,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 214, y: 28}
+  m_SizeDelta: {x: 247, y: 43}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6246396476109089923
 CanvasRenderer:
@@ -11420,8 +11381,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: -399, y: 783}
-  m_SizeDelta: {x: 251.09, y: 124.86}
+  m_AnchoredPosition: {x: -397.05, y: 735.17}
+  m_SizeDelta: {x: 254.99, y: 220.53}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &8009138779813825542
 MonoBehaviour:

BIN
Assets/Content/Raw_Art/UI/UILanuch/an_01.png


BIN
Assets/Content/Raw_Art/UI/UILanuch/an_02.png


BIN
Assets/Content/Raw_Art/UI/UILanuch/an_03.png


BIN
Assets/Content/Raw_Art/UI/UILanuch/txt_login_cn.png