소스 검색

Home 翻译

lvjincheng 4 년 전
부모
커밋
8d854360fc

+ 216 - 24
Assets/BowArrow/Resources/Prefabs/Views/FriendView.prefab

@@ -1191,6 +1191,7 @@ GameObject:
   - component: {fileID: 1787046699}
   - component: {fileID: 1787046701}
   - component: {fileID: 1787046700}
+  - component: {fileID: 6738906781536297832}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -1249,9 +1250,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
     m_FontSize: 20
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 1
-    m_MaxSize: 40
+    m_MaxSize: 20
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -1259,6 +1260,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u62D2\u7EDD"
+--- !u!114 &6738906781536297832
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1787046698}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: common_reject
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &1886836211
 GameObject:
   m_ObjectHideFlags: 0
@@ -2002,6 +2018,7 @@ GameObject:
   - component: {fileID: 2122721119}
   - component: {fileID: 2122721121}
   - component: {fileID: 2122721120}
+  - component: {fileID: 5283759376283768134}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -2060,9 +2077,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
     m_FontSize: 20
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 1
-    m_MaxSize: 40
+    m_MaxSize: 20
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -2070,6 +2087,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6DFB\u52A0"
+--- !u!114 &5283759376283768134
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2122721118}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: common_add
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &690602929954758442
 GameObject:
   m_ObjectHideFlags: 0
@@ -2227,6 +2259,7 @@ GameObject:
   - component: {fileID: 3394266695575911416}
   - component: {fileID: 4922710588430675585}
   - component: {fileID: 3083119936133955045}
+  - component: {fileID: 7441028795354198595}
   m_Layer: 5
   m_Name: Placeholder
   m_TagString: Untagged
@@ -2295,6 +2328,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u8BF7\u8F93\u5165\u73A9\u5BB6\u7F16\u53F7"
+--- !u!114 &7441028795354198595
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 709159765364773893}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: friend_placeholder_player-search
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &805201342782678565
 GameObject:
   m_ObjectHideFlags: 0
@@ -2661,6 +2709,7 @@ GameObject:
   - component: {fileID: 2098970731862168571}
   - component: {fileID: 2098970731862168565}
   - component: {fileID: 2098970731862168564}
+  - component: {fileID: 3278779936093409949}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -2685,7 +2734,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: -36, y: 0}
-  m_SizeDelta: {x: 160, y: 50}
+  m_SizeDelta: {x: 160, y: 60}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &2098970731862168565
 CanvasRenderer:
@@ -2719,9 +2768,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
     m_FontSize: 28
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 2
-    m_MaxSize: 40
+    m_MaxSize: 28
     m_Alignment: 5
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -2729,6 +2778,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6211\u7684\u597D\u53CB"
+--- !u!114 &3278779936093409949
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2098970731862168570}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: friend_tab_my-friend
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &2098970732063129810
 GameObject:
   m_ObjectHideFlags: 0
@@ -2819,6 +2883,7 @@ GameObject:
   - component: {fileID: 2098970732120295118}
   - component: {fileID: 2098970732120295112}
   - component: {fileID: 2098970732120295119}
+  - component: {fileID: 7374850301782513959}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -2877,9 +2942,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
     m_FontSize: 20
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 1
-    m_MaxSize: 40
+    m_MaxSize: 20
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -2887,6 +2952,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5220\u9664"
+--- !u!114 &7374850301782513959
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2098970732120295117}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: common_del
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &2098970732125368535
 GameObject:
   m_ObjectHideFlags: 0
@@ -3019,6 +3099,7 @@ GameObject:
   - component: {fileID: 2098970732228296259}
   - component: {fileID: 2098970732228296253}
   - component: {fileID: 2098970732228296252}
+  - component: {fileID: 2659137016393597367}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -3043,7 +3124,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: -36, y: 0}
-  m_SizeDelta: {x: 160, y: 50}
+  m_SizeDelta: {x: 160, y: 60}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &2098970732228296253
 CanvasRenderer:
@@ -3077,9 +3158,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
     m_FontSize: 28
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 2
-    m_MaxSize: 40
+    m_MaxSize: 28
     m_Alignment: 5
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -3087,6 +3168,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u641C\u7D22\u73A9\u5BB6"
+--- !u!114 &2659137016393597367
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2098970732228296258}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: friend_tab_player-search
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &2098970732265874955
 GameObject:
   m_ObjectHideFlags: 0
@@ -3535,6 +3631,7 @@ GameObject:
   - component: {fileID: 2098970732597963393}
   - component: {fileID: 2098970732597963395}
   - component: {fileID: 2098970732597963394}
+  - component: {fileID: 3674444358540871009}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -3559,7 +3656,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: -36, y: 0}
-  m_SizeDelta: {x: 160, y: 50}
+  m_SizeDelta: {x: 160, y: 60}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &2098970732597963395
 CanvasRenderer:
@@ -3593,9 +3690,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
     m_FontSize: 28
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 2
-    m_MaxSize: 40
+    m_MaxSize: 28
     m_Alignment: 5
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -3603,6 +3700,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u597D\u53CB\u8BF7\u6C42"
+--- !u!114 &3674444358540871009
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2098970732597963392}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: friend_tab_request
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &2098970732608781295
 GameObject:
   m_ObjectHideFlags: 0
@@ -4732,6 +4844,7 @@ GameObject:
   - component: {fileID: 2098970733786561593}
   - component: {fileID: 2098970733786561592}
   - component: {fileID: 2098970733786561599}
+  - component: {fileID: 5618033442562927543}
   m_Layer: 0
   m_Name: Text
   m_TagString: Untagged
@@ -4815,6 +4928,21 @@ MonoBehaviour:
   m_EffectColor: {r: 0.3339622, g: 0.5847058, b: 1, a: 0.5}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &5618033442562927543
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2098970733786561597}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: friend_title
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &2098970733825205905
 GameObject:
   m_ObjectHideFlags: 0
@@ -5726,6 +5854,7 @@ GameObject:
   - component: {fileID: 2614240551622161727}
   - component: {fileID: 1646675012676382450}
   - component: {fileID: 1038028224493217813}
+  - component: {fileID: 8739768366611186036}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -5784,9 +5913,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 2
-    m_MaxSize: 40
+    m_MaxSize: 24
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -5794,6 +5923,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u641C\u7D22"
+--- !u!114 &8739768366611186036
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3156498172362429185}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: friend_btn_search
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &3276759278548929614
 GameObject:
   m_ObjectHideFlags: 0
@@ -5841,6 +5985,7 @@ GameObject:
   - component: {fileID: 2372572762646897144}
   - component: {fileID: 2472570837521855879}
   - component: {fileID: 6687091840984359641}
+  - component: {fileID: 8659492020423659901}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -5899,9 +6044,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
     m_FontSize: 20
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 1
-    m_MaxSize: 40
+    m_MaxSize: 20
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -5909,6 +6054,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u540C\u610F"
+--- !u!114 &8659492020423659901
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3436140063543727077}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: common_agree
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &3513344362119016393
 GameObject:
   m_ObjectHideFlags: 0
@@ -6406,6 +6566,7 @@ GameObject:
   - component: {fileID: 5040807030450717584}
   - component: {fileID: 1147890238792145567}
   - component: {fileID: 4978575039254117039}
+  - component: {fileID: 4101091389509955353}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -6430,7 +6591,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: -36, y: 0}
-  m_SizeDelta: {x: 160, y: 50}
+  m_SizeDelta: {x: 160, y: 60}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &1147890238792145567
 CanvasRenderer:
@@ -6464,9 +6625,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
     m_FontSize: 28
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 2
-    m_MaxSize: 40
+    m_MaxSize: 28
     m_Alignment: 5
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -6474,6 +6635,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u63A8\u8350\u597D\u53CB"
+--- !u!114 &4101091389509955353
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5130988112535563843}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: friend_tab_recommend
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &5997642302949334554
 GameObject:
   m_ObjectHideFlags: 0
@@ -7068,6 +7244,7 @@ GameObject:
   - component: {fileID: 3492215444447429370}
   - component: {fileID: 1286614819761266047}
   - component: {fileID: 1789086300091627184}
+  - component: {fileID: 5912226074238450347}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -7126,9 +7303,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
     m_FontSize: 20
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 1
-    m_MaxSize: 40
+    m_MaxSize: 20
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -7136,6 +7313,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6DFB\u52A0"
+--- !u!114 &5912226074238450347
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7667905531355012132}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: common_add
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &7743216500439265848
 GameObject:
   m_ObjectHideFlags: 0

+ 70 - 6
Assets/BowArrow/Resources/Prefabs/Views/PKMatchingView.prefab

@@ -220,6 +220,7 @@ GameObject:
   - component: {fileID: 8849455051062369218}
   - component: {fileID: 8849455051062369219}
   - component: {fileID: 8849455051062369220}
+  - component: {fileID: 6682092240682158707}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -284,7 +285,7 @@ MonoBehaviour:
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 0
+    m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u73A9\u5BB61"
@@ -303,6 +304,21 @@ MonoBehaviour:
   m_EffectColor: {r: 0.2867924, g: 0.765061, b: 1, a: 0.5}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &6682092240682158707
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8849455051062369222}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: pk-match_player1
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &8849455051308405526
 GameObject:
   m_ObjectHideFlags: 0
@@ -993,7 +1009,7 @@ MonoBehaviour:
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 0
+    m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6B63\u5728\u641C\u5BFB\u5B9E\u529B\u76F8\u5F53\u5E95\u5BF9\u624B\u2026"
@@ -1146,6 +1162,7 @@ GameObject:
   - component: {fileID: 8849455052204022850}
   - component: {fileID: 8849455052204022851}
   - component: {fileID: 8849455052204022852}
+  - component: {fileID: 255403315394393350}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -1204,9 +1221,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
     m_FontSize: 30
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 3
-    m_MaxSize: 40
+    m_MaxSize: 30
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -1229,6 +1246,21 @@ MonoBehaviour:
   m_EffectColor: {r: 0.2867924, g: 0.765061, b: 1, a: 0.5}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &255403315394393350
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8849455052204022854}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: pk-match_wait-to-join
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &8849455052247686387
 GameObject:
   m_ObjectHideFlags: 0
@@ -1619,6 +1651,7 @@ GameObject:
   - component: {fileID: 8849455052588054754}
   - component: {fileID: 8849455052588054755}
   - component: {fileID: 8849455052588054756}
+  - component: {fileID: 8986413529949367217}
   m_Layer: 0
   m_Name: Text
   m_TagString: Untagged
@@ -1683,7 +1716,7 @@ MonoBehaviour:
     m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 0
+    m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u53D6\u6D88\u7B49\u5F85"
@@ -1702,6 +1735,21 @@ MonoBehaviour:
   m_EffectColor: {r: 0.3339622, g: 0.5847058, b: 1, a: 0.5}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &8986413529949367217
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8849455052588054758}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: pk-match_cancel-waiting
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &8849455052613166184
 GameObject:
   m_ObjectHideFlags: 0
@@ -2140,6 +2188,7 @@ GameObject:
   - component: {fileID: 8849455052931251507}
   - component: {fileID: 8849455052931251508}
   - component: {fileID: 8849455052931251509}
+  - component: {fileID: 6097031780623039301}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -2204,7 +2253,7 @@ MonoBehaviour:
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 0
+    m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u73A9\u5BB62"
@@ -2223,6 +2272,21 @@ MonoBehaviour:
   m_EffectColor: {r: 0.2867924, g: 0.765061, b: 1, a: 0.5}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &6097031780623039301
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8849455052931251511}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: pk-match_player2
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &8849455053014067258
 GameObject:
   m_ObjectHideFlags: 0

+ 147 - 19
Assets/BowArrow/Resources/Prefabs/Views/RankView.prefab

@@ -331,6 +331,7 @@ GameObject:
   - component: {fileID: 4750727927633246154}
   - component: {fileID: 8278285284904108403}
   - component: {fileID: 1333441395956434271}
+  - component: {fileID: 4350256953037386412}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -355,7 +356,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: -10, y: -10}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8278285284904108403
 CanvasRenderer:
@@ -389,9 +390,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
     m_FontSize: 20
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 2
-    m_MaxSize: 40
+    m_MaxSize: 20
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -399,6 +400,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u91CE\u9E21\u95EF\u5173PK"
+--- !u!114 &4350256953037386412
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4868626077579382378}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: rank_gametype_3
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &5035129765619884284
 GameObject:
   m_ObjectHideFlags: 0
@@ -606,6 +622,7 @@ GameObject:
   - component: {fileID: 59179234504702565}
   - component: {fileID: 3367789342090389185}
   - component: {fileID: 2602637349329257045}
+  - component: {fileID: 8235978802167836136}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -630,7 +647,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: -10, y: -10}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3367789342090389185
 CanvasRenderer:
@@ -664,9 +681,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
     m_FontSize: 20
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 2
-    m_MaxSize: 40
+    m_MaxSize: 20
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -674,6 +691,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u91CE\u5154\u95EF\u5173PK"
+--- !u!114 &8235978802167836136
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5347140485885614652}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: rank_gametype_2
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &5531302797138384335
 GameObject:
   m_ObjectHideFlags: 0
@@ -889,6 +921,7 @@ GameObject:
   - component: {fileID: 5531302797351152021}
   - component: {fileID: 5531302797351152023}
   - component: {fileID: 5531302797351152022}
+  - component: {fileID: 2852873154793503160}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -913,7 +946,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: -10, y: -10}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5531302797351152023
 CanvasRenderer:
@@ -947,9 +980,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
     m_FontSize: 20
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 2
-    m_MaxSize: 40
+    m_MaxSize: 20
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -957,6 +990,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u9759\u6B62\u9776PK"
+--- !u!114 &2852873154793503160
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5531302797351152020}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: rank_gametype_1
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &5531302797475916378
 GameObject:
   m_ObjectHideFlags: 0
@@ -1366,6 +1414,7 @@ GameObject:
   - component: {fileID: 5531302797783804039}
   - component: {fileID: 5531302797783804057}
   - component: {fileID: 5531302797783804056}
+  - component: {fileID: 2178483385467435165}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -1424,9 +1473,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
     m_FontSize: 28
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 2
-    m_MaxSize: 40
+    m_MaxSize: 28
     m_Alignment: 5
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -1434,6 +1483,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u672C\u5E02\u6392\u884C"
+--- !u!114 &2178483385467435165
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5531302797783804038}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: rank_title_city
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &5531302797853806244
 GameObject:
   m_ObjectHideFlags: 0
@@ -1445,6 +1509,7 @@ GameObject:
   - component: {fileID: 5531302797853806245}
   - component: {fileID: 5531302797853806247}
   - component: {fileID: 5531302797853806246}
+  - component: {fileID: 4916031469236129953}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -1503,9 +1568,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
     m_FontSize: 28
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 2
-    m_MaxSize: 40
+    m_MaxSize: 28
     m_Alignment: 5
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -1513,6 +1578,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u672C\u7701\u6392\u884C"
+--- !u!114 &4916031469236129953
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5531302797853806244}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: rank_title_state
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &5531302797880406280
 GameObject:
   m_ObjectHideFlags: 0
@@ -2221,7 +2301,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 5531302799128653533}
   m_HandleRect: {fileID: 5531302799128653532}
   m_Direction: 2
-  m_Value: 1
+  m_Value: 0
   m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -2238,6 +2318,7 @@ GameObject:
   - component: {fileID: 5531302798323627813}
   - component: {fileID: 5531302798323627815}
   - component: {fileID: 5531302798323627814}
+  - component: {fileID: 2707224959402617512}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -2296,9 +2377,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
     m_FontSize: 28
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 2
-    m_MaxSize: 40
+    m_MaxSize: 28
     m_Alignment: 5
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -2306,6 +2387,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5168\u7403\u6392\u884C"
+--- !u!114 &2707224959402617512
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5531302798323627812}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: rank_tab_global
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &5531302798396986662
 GameObject:
   m_ObjectHideFlags: 0
@@ -2668,6 +2764,7 @@ GameObject:
   - component: {fileID: 5531302798682989990}
   - component: {fileID: 5531302798682989989}
   - component: {fileID: 5531302798682989988}
+  - component: {fileID: 3481678168071826024}
   m_Layer: 0
   m_Name: Text
   m_TagString: Untagged
@@ -2751,6 +2848,21 @@ MonoBehaviour:
   m_EffectColor: {r: 0.3339622, g: 0.5847058, b: 1, a: 0.5}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &3481678168071826024
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5531302798682989986}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: rank_title
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &5531302798731732210
 GameObject:
   m_ObjectHideFlags: 0
@@ -3964,6 +4076,7 @@ GameObject:
   - component: {fileID: 6912752654222811876}
   - component: {fileID: 4361469474808502914}
   - component: {fileID: 4601559730808017644}
+  - component: {fileID: 9057038932461584799}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -3988,7 +4101,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: -10, y: -10}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4361469474808502914
 CanvasRenderer:
@@ -4022,9 +4135,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
     m_FontSize: 20
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 2
-    m_MaxSize: 40
+    m_MaxSize: 20
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -4032,6 +4145,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u91CE\u72FC\u95EF\u5173PK"
+--- !u!114 &9057038932461584799
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8720175997838672107}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: rank_gametype_4
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &8931323987653056293
 GameObject:
   m_ObjectHideFlags: 0

+ 145 - 17
Assets/BowArrow/Scenes/Home.unity

@@ -964,7 +964,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 8.854109, y: 0}
+  m_AnchoredPosition: {x: 8.921012, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &219397737
@@ -1549,6 +1549,7 @@ GameObject:
   - component: {fileID: 321914143}
   - component: {fileID: 321914142}
   - component: {fileID: 321914141}
+  - component: {fileID: 321914144}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -1614,9 +1615,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
     m_FontSize: 30
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 3
-    m_MaxSize: 40
+    m_MaxSize: 30
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -1632,6 +1633,21 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 321914139}
   m_CullTransparentMesh: 1
+--- !u!114 &321914144
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 321914139}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: pk-match_wait-to-join
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &334159418
 GameObject:
   m_ObjectHideFlags: 0
@@ -1922,6 +1938,7 @@ GameObject:
   - component: {fileID: 356458186}
   - component: {fileID: 356458185}
   - component: {fileID: 356458184}
+  - component: {fileID: 356458187}
   m_Layer: 0
   m_Name: Text
   m_TagString: Untagged
@@ -2005,6 +2022,21 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 356458182}
   m_CullTransparentMesh: 0
+--- !u!114 &356458187
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 356458182}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: pk-match_title
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &374414402
 GameObject:
   m_ObjectHideFlags: 0
@@ -2454,6 +2486,7 @@ GameObject:
   - component: {fileID: 407996483}
   - component: {fileID: 407996485}
   - component: {fileID: 407996484}
+  - component: {fileID: 407996486}
   m_Layer: 0
   m_Name: Title
   m_TagString: Untagged
@@ -2510,7 +2543,7 @@ MonoBehaviour:
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 0
+    m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u597D\u53CB\u9009\u62E9"
@@ -2522,6 +2555,21 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 407996482}
   m_CullTransparentMesh: 1
+--- !u!114 &407996486
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 407996482}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: pk-match_tab_friend-select
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &408267605
 GameObject:
   m_ObjectHideFlags: 0
@@ -4229,6 +4277,7 @@ GameObject:
   - component: {fileID: 658509184}
   - component: {fileID: 658509183}
   - component: {fileID: 658509182}
+  - component: {fileID: 658509185}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -4294,9 +4343,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
     m_FontSize: 34
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 3
-    m_MaxSize: 40
+    m_MaxSize: 34
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -4312,6 +4361,21 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 658509180}
   m_CullTransparentMesh: 1
+--- !u!114 &658509185
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 658509180}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: pk-match_player1
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &664475002
 GameObject:
   m_ObjectHideFlags: 0
@@ -5745,6 +5809,7 @@ GameObject:
   - component: {fileID: 938114167}
   - component: {fileID: 938114170}
   - component: {fileID: 938114169}
+  - component: {fileID: 938114168}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -5771,6 +5836,21 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 1}
   m_SizeDelta: {x: 0, y: 2}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &938114168
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 938114166}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: common_next
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!114 &938114169
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5795,9 +5875,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
     m_FontSize: 28
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 2
-    m_MaxSize: 40
+    m_MaxSize: 28
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -7715,6 +7795,7 @@ GameObject:
   - component: {fileID: 1259270697}
   - component: {fileID: 1259270699}
   - component: {fileID: 1259270698}
+  - component: {fileID: 1259270700}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -7739,7 +7820,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: -36, y: 0}
-  m_SizeDelta: {x: 160, y: 50}
+  m_SizeDelta: {x: 180, y: 50}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!114 &1259270698
 MonoBehaviour:
@@ -7765,9 +7846,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
     m_FontSize: 28
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 2
-    m_MaxSize: 40
+    m_MaxSize: 28
     m_Alignment: 5
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -7783,6 +7864,21 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1259270696}
   m_CullTransparentMesh: 1
+--- !u!114 &1259270700
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1259270696}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: pk-match_tab_friend
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &1260390455
 GameObject:
   m_ObjectHideFlags: 0
@@ -10561,7 +10657,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 96.56233, y: 0}
+  m_AnchoredPosition: {x: 96.76304, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1698308730
@@ -10647,6 +10743,7 @@ GameObject:
   - component: {fileID: 1702981463}
   - component: {fileID: 1702981465}
   - component: {fileID: 1702981464}
+  - component: {fileID: 1702981466}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -10671,7 +10768,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: -36, y: 0}
-  m_SizeDelta: {x: 160, y: 50}
+  m_SizeDelta: {x: 180, y: 50}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!114 &1702981464
 MonoBehaviour:
@@ -10697,9 +10794,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
     m_FontSize: 28
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 2
-    m_MaxSize: 40
+    m_MaxSize: 28
     m_Alignment: 5
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -10715,6 +10812,21 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1702981462}
   m_CullTransparentMesh: 1
+--- !u!114 &1702981466
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1702981462}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: pk-match_tab_random
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &1707954532
 GameObject:
   m_ObjectHideFlags: 0
@@ -11632,6 +11744,7 @@ GameObject:
   - component: {fileID: 1818880492}
   - component: {fileID: 1818880491}
   - component: {fileID: 1818880490}
+  - component: {fileID: 1818880493}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -11697,9 +11810,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 1ad2cf6c2f09744489d8c60b3fe3bab2, type: 3}
     m_FontSize: 34
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 3
-    m_MaxSize: 40
+    m_MaxSize: 34
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -11715,6 +11828,21 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1818880488}
   m_CullTransparentMesh: 1
+--- !u!114 &1818880493
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1818880488}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: pk-match_player2
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &1829558062
 GameObject:
   m_ObjectHideFlags: 0

+ 38 - 0
Assets/BowArrow/Scripts/Components/TextAutoLanguage2/Resources/TextAutoLanguage2/cn.json

@@ -1,6 +1,10 @@
 {
     "common_next": "下一步",
     "common_save": "保存",
+    "common_agree": "同意",
+    "common_reject": "拒绝",
+    "common_add": "添加",
+    "common_del": "删除",
     "register_title_birthday": "出生日期:",
     "register_title_region": "所在地区:",
     "register_placeholder_birthday": "年-月-日",
@@ -21,6 +25,40 @@
     "setup_screen-size": "屏幕尺寸 {0} 英寸",
     "setup_screen-distance": "屏幕距离 {0} 米",
     "me_avatar-select": "头像选择",
+    "rank_title": "排行榜",
+    "rank_tab_global": "全球排行",
+    "rank_title_state": "本省排行",
+    "rank_title_city": "本市排行",
+    "rank_gametype_1": "静止靶PK",
+    "rank_gametype_2": "野兔闯关PK",
+    "rank_gametype_3": "野鸡闯关PK",
+    "rank_gametype_4": "野狼闯关PK",
+    "friend_title": "好友",
+    "friend_tab_my-friend": "我的好友",
+    "friend_tab_request": "好友请求",
+    "friend_tab_recommend": "推荐好友",
+    "friend_tab_player-search": "搜索玩家",
+    "friend_placeholder_player-search": "请输入玩家编号",
+    "friend_btn_search": "搜索",
+    "friend_offline-time_0": "在线",
+    "friend_offline-time_1": "离线",
+    "friend_offline-time_2": "{0}分钟前",
+    "friend_offline-time_3": "{0}小时前",
+    "friend_offline-time_4": "{0}天前",
+    "friend_offline-time_5": "{0}年前",
+    "friend_record_play-again-count": "最近一起进行{0}场对战",
+    "pk-match_title": "玩家匹配",
+    "pk-match_player1": "玩家1",
+    "pk-match_player2": "玩家2",
+    "pk-match_wait-to-join": "等待加入",
+    "pk-match_tab_random": "随机匹配",
+    "pk-match_tab_friend": "好友匹配",
+    "pk-match_tab_friend-select": "选择好友",
+    "pk-match_cancel-waiting": "取消等待",
+    "pk-match_match-success": "匹配成功,即将开始游戏!",
+    "pk-match_match-waiting1": "正在等待好友加入游戏···",
+    "pk-match_match-waiting2": "正在等待对方加入游戏···",
+    "pk-match_match-waiting3": "正在搜索实力相当的对手···",
     "tip_about-us": "关于我们-智能弓箭App!",
     "tip_friend-receive-request": "收到好友添加请求,可到好友界面查看!",
     "tip_pk_gametype_1": "静止靶PK",

+ 38 - 0
Assets/BowArrow/Scripts/Components/TextAutoLanguage2/Resources/TextAutoLanguage2/en.json

@@ -1,6 +1,10 @@
 {
     "common_next": "Next",
     "common_save": "Save",
+    "common_agree": "Agree",
+    "common_reject": "Reject",
+    "common_add": "Add",
+    "common_del": "Delete",
     "register_title_birthday": "Birthday :",
     "register_title_region": "Region :",
     "register_placeholder_birthday": "Year-Month-Day",
@@ -21,6 +25,40 @@
     "setup_screen-size": "Screen Size {0} Inch",
     "setup_screen-distance": "Screen Distance {0} M",
     "me_avatar-select": "Avatar Select",
+    "rank_title": "Rank",
+    "rank_tab_global": "Global\nRanking",
+    "rank_title_state": "The State\nRanking",
+    "rank_title_city": "The City\nRanking",
+    "rank_gametype_1": "Fixed Target\nPK",
+    "rank_gametype_2": "Rabbit\nChallenge PK",
+    "rank_gametype_3": "Pheasant\nChallenge PK",
+    "rank_gametype_4": "Wolf\nChallenge PK",
+    "friend_title": "Friend",
+    "friend_tab_my-friend": "My\nFriend",
+    "friend_tab_request": "Friend\nRequest",
+    "friend_tab_recommend": "Friend\nRecommend",
+    "friend_tab_player-search": "Player\nSearch",
+    "friend_placeholder_player-search": "Please enter user's id",
+    "friend_btn_search": "Search",
+    "friend_offline-time_0": "Online",
+    "friend_offline-time_1": "Offline",
+    "friend_offline-time_2": "{0} Min Ago",
+    "friend_offline-time_3": "{0} Hour Ago",
+    "friend_offline-time_4": "{0} Day Ago",
+    "friend_offline-time_5": "{0} Year Ago",
+    "friend_record_play-again-count": "Recently, we played {0} game together.",
+    "pk-match_title": "Player Match",
+    "pk-match_player1": "Player1",
+    "pk-match_player2": "Player2",
+    "pk-match_wait-to-join": "Waiting Join",
+    "pk-match_tab_random": "Random Match",
+    "pk-match_tab_friend": "Friend Match",
+    "pk-match_tab_friend-select": "Friend Select",
+    "pk-match_cancel-waiting": "Cancel Waiting",
+    "pk-match_match-success": "Match successful, ready to start the game!",
+    "pk-match_match-waiting1": "Waiting for friends to join the game···",
+    "pk-match_match-waiting2": "Waiting for each other to join the game···",
+    "pk-match_match-waiting3": "Searching for opponents of equal strength···",
     "tip_about-us": "About us - Smart bow app !",
     "tip_friend-receive-request": "Has friend requet, can check at friend view!",
     "tip_pk_gametype_1": "Fixed Target PK",

+ 7 - 6
Assets/BowArrow/Scripts/Util/TimeUtil.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -25,25 +26,25 @@ public class TimeUtil
     }
 
     public static string GetOfflineTimeStr(long offlineTime, bool online) {
-        if (online) return "在线";
+        if (online) return TextAutoLanguage2.GetTextByKey("friend_offline-time_0");
         long now = JC.CS.Utility.GetTimestamp();
         long dt = now - offlineTime;
         if (dt < 0) dt = 0;
-        if (offlineTime == 0) return "离线";
+        if (offlineTime == 0) return TextAutoLanguage2.GetTextByKey("friend_offline-time_1");
         long min = dt / (60 * 1000);
         if (min == 0) min += 1;
         if (min < 60) {
-            return min + "分钟前";
+            return String.Format(TextAutoLanguage2.GetTextByKey("friend_offline-time_2"), min);
         }
         long hour = min / 60;
         if (hour < 24) {
-            return hour + "小时前";
+            return String.Format(TextAutoLanguage2.GetTextByKey("friend_offline-time_3"), hour);
         }
         long day = hour / 24;
         if (day < 365) {
-            return day + "天前";
+            return String.Format(TextAutoLanguage2.GetTextByKey("friend_offline-time_4"), day);
         }
         long year = day / 365;
-        return year + "年前";
+        return String.Format(TextAutoLanguage2.GetTextByKey("friend_offline-time_5"), year);
     }
 }

+ 4 - 1
Assets/BowArrow/Scripts/View/FriendView.cs

@@ -195,7 +195,10 @@ public class FriendView : MonoBehaviour
                         o.name = userID.ToString();
                         o.transform.Find("Avatar/Sprite").GetComponent<Image>().sprite = RoleMgr.GetAvatar(avatarID);
                         o.transform.Find("Name").GetComponent<Text>().text = nickname;
-                        o.transform.Find("PlayCount").GetComponent<Text>().text = $"最近一起进行过 {playCount} 场对战";
+                        o.transform.Find("PlayCount").GetComponent<Text>().text = 
+                            String.Format(
+                                TextAutoLanguage2.GetTextByKey("friend_record_play-again-count"), playCount
+                            );
                         o.transform.Find("BG0").gameObject.SetActive(!online);
                         o.transform.Find("BG1").gameObject.SetActive(online);
                         Text onlineTip = o.transform.Find("OnlineTip").GetComponent<Text>();

+ 3 - 1
Assets/BowArrow/Scripts/View/PKMatchView.cs

@@ -119,7 +119,9 @@ public class PKMatchView : MonoBehaviour
 
     void RenderPlayerInfo(int playerID, Sprite avatar, string nickname, bool active) {
         this.transform.Find($"BoxRight/Player{playerID}/NameBox")
-            .GetComponentInChildren<Text>().text = active ? nickname : "等待加入";
+            .GetComponentInChildren<Text>().text = active 
+                ? nickname 
+                : TextAutoLanguage2.GetTextByKey("pk-match_wait-to-join");
         Transform avatarT = this.transform.Find($"BoxRight/Player{playerID}/MatchHeadBG/Avatar");
         avatarT.gameObject.SetActive(active);
         avatarT.Find("Sprite").GetComponent<Image>().sprite = avatar;

+ 7 - 5
Assets/BowArrow/Scripts/View/PKMatchingView.cs

@@ -58,11 +58,11 @@ public class PKMatchingView : MonoBehaviour
         RenderPlayerInfo(2, null, "", false);
 
         if (isFriendPKInviter || isFriendPKInvitee) {
-            RenderTip("正在等待好友加入游戏···");
+            RenderTip(TextAutoLanguage2.GetTextByKey("pk-match_match-waiting1"));
         } else if (isTryAgainInviter || isTryAgainInvitee) {
-            RenderTip("正在等待对方加入游戏···");
+            RenderTip(TextAutoLanguage2.GetTextByKey("pk-match_match-waiting2"));
         } else {
-            RenderTip("正在搜索实力相当的对手···");
+            RenderTip(TextAutoLanguage2.GetTextByKey("pk-match_match-waiting3"));
         }
         
         if (isFriendPKInviter) {
@@ -82,7 +82,7 @@ public class PKMatchingView : MonoBehaviour
         int otherIndex = (GlobalData.playerIndexInRoom + 1) % 2;
         MatchPlayerInfo info = GlobalData.matchPlayerInfos[otherIndex];
         RenderPlayerInfo(2, RoleMgr.GetAvatar(info.avatarID), info.nickname, true);
-        RenderTip("匹配成功,即将开始游戏!");
+        RenderTip(TextAutoLanguage2.GetTextByKey("pk-match_match-success"));
         HideBtnBack();
         PauseWaitingTime();
         JC.Unity.CoroutineStarter.Start(LoadSceneOnEnterGame());
@@ -111,7 +111,9 @@ public class PKMatchingView : MonoBehaviour
 
     void RenderPlayerInfo(int playerID, Sprite avatar, string nickname, bool active) {
         this.transform.Find($"BoxRight/Player{playerID}/NameBox")
-            .GetComponentInChildren<Text>().text = active ? nickname : "等待加入";
+            .GetComponentInChildren<Text>().text = active
+                ? nickname 
+                : TextAutoLanguage2.GetTextByKey("pk-match_wait-to-join");
         Transform avatarT = this.transform.Find($"BoxRight/Player{playerID}/MatchHeadBG/Avatar");
         avatarT.gameObject.SetActive(active);
         avatarT.Find("Sprite").GetComponent<Image>().sprite = avatar;