lvjincheng 3 years ago
parent
commit
1b222b47b2

+ 16 - 0
Assets/BowArrow/Resources/Prefabs/Views/MeView.prefab

@@ -5376,6 +5376,7 @@ GameObject:
   - component: {fileID: 8176172530855807561}
   - component: {fileID: 8545464384530476845}
   - component: {fileID: 3838776601401910233}
+  - component: {fileID: 7213515386477112372}
   m_Layer: 0
   m_Name: Title
   m_TagString: Untagged
@@ -5444,6 +5445,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5934\u50CF\u9009\u62E9"
+--- !u!114 &7213515386477112372
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6150517197083534885}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: me_avatar-select
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &6263401399188491799
 GameObject:
   m_ObjectHideFlags: 0

+ 69 - 1
Assets/BowArrow/Resources/Prefabs/Views/SetUpView.prefab

@@ -412,6 +412,7 @@ GameObject:
   - component: {fileID: 5237890747013869340}
   - component: {fileID: 5819257011241886517}
   - component: {fileID: 5653395249470392859}
+  - component: {fileID: 4038479900816877224}
   m_Layer: 5
   m_Name: Placeholder
   m_TagString: Untagged
@@ -480,6 +481,22 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5C4F\u5E55\u8DDD\u79BB 2.5 \u7C73"
+--- !u!114 &4038479900816877224
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1367088754608517391}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: setup_screen-distance
+  layoutRebuildObject: {fileID: 0}
+  textFormatArgs: []
+  languageFontSizes: []
 --- !u!1 &1957444802930511365
 GameObject:
   m_ObjectHideFlags: 0
@@ -866,6 +883,7 @@ GameObject:
   - component: {fileID: 7370284945824027401}
   - component: {fileID: 708890940804922775}
   - component: {fileID: 2727341008564576731}
+  - component: {fileID: 5087997094354710977}
   m_Layer: 0
   m_Name: Text
   m_TagString: Untagged
@@ -949,6 +967,22 @@ 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 &5087997094354710977
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4022446795051023200}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: setup_train-mode
+  layoutRebuildObject: {fileID: 0}
+  textFormatArgs: []
+  languageFontSizes: []
 --- !u!1 &4637735829160408701
 GameObject:
   m_ObjectHideFlags: 0
@@ -1557,6 +1591,7 @@ GameObject:
   - component: {fileID: 7171678757244244076}
   - component: {fileID: 5450951135558854815}
   - component: {fileID: 4500220098228963460}
+  - component: {fileID: 4477086205334876442}
   m_Layer: 5
   m_Name: Placeholder
   m_TagString: Untagged
@@ -1625,6 +1660,22 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5C4F\u5E55\u5C3A\u5BF8 60 \u82F1\u5BF8"
+--- !u!114 &4477086205334876442
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5807219551455418855}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: setup_screen-size
+  layoutRebuildObject: {fileID: 0}
+  textFormatArgs: []
+  languageFontSizes: []
 --- !u!1 &5846369377054792261
 GameObject:
   m_ObjectHideFlags: 0
@@ -2063,7 +2114,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: 129.80975, y: 0}
+  m_AnchoredPosition: {x: 129.04007, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &2075870506722154811
@@ -5285,6 +5336,7 @@ GameObject:
   - component: {fileID: 4131586736671841535}
   - component: {fileID: 9070360034943974198}
   - component: {fileID: 1161946151975994497}
+  - component: {fileID: 4199230876389284112}
   m_Layer: 0
   m_Name: Text
   m_TagString: Untagged
@@ -5368,3 +5420,19 @@ 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 &4199230876389284112
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9167743285887930410}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: setup_fix-game-bg
+  layoutRebuildObject: {fileID: 0}
+  textFormatArgs: []
+  languageFontSizes: []

+ 44 - 37
Assets/BowArrow/Scenes/Login.unity

@@ -3743,7 +3743,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: 34.918293, y: 0}
+  m_AnchoredPosition: {x: 34.62926, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &355551584
@@ -3999,6 +3999,7 @@ GameObject:
   - component: {fileID: 449693026}
   - component: {fileID: 449693025}
   - component: {fileID: 449693024}
+  - component: {fileID: 449693027}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -4083,6 +4084,21 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 449693022}
   m_CullTransparentMesh: 1
+--- !u!114 &449693027
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 449693022}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: common_save
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &466652729
 GameObject:
   m_ObjectHideFlags: 0
@@ -4433,14 +4449,13 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 511007674}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b7cbfcb0916cf694fb3d059ea4b4c1da, type: 3}
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  textID: 7
+  textKey: common_next
   layoutRebuildObject: {fileID: 0}
-  textFormatArgs: []
   languageFontSizes: []
 --- !u!114 &511007677
 MonoBehaviour:
@@ -6078,7 +6093,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: 114.704796, y: 0}
+  m_AnchoredPosition: {x: 115.801605, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &750604318
@@ -6763,12 +6778,12 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 858610723}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: b7cbfcb0916cf694fb3d059ea4b4c1da, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  textID: 25
+  textID: 35
   layoutRebuildObject: {fileID: 0}
   textFormatArgs: []
   languageFontSizes: []
@@ -9311,16 +9326,13 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1252636012}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b7cbfcb0916cf694fb3d059ea4b4c1da, type: 3}
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  textID: 119
+  textKey: register_placeholder_birthday
   layoutRebuildObject: {fileID: 0}
-  textFormatArgs:
-  - 1
-  - 12
   languageFontSizes: []
 --- !u!114 &1252636015
 MonoBehaviour:
@@ -10504,14 +10516,13 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1497719633}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b7cbfcb0916cf694fb3d059ea4b4c1da, type: 3}
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  textID: 31
+  textKey: register_title_region
   layoutRebuildObject: {fileID: 0}
-  textFormatArgs: []
   languageFontSizes: []
 --- !u!114 &1497719636
 MonoBehaviour:
@@ -10670,7 +10681,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: 244.95518, y: 0}
+  m_AnchoredPosition: {x: 247.77556, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1549087752
@@ -11087,7 +11098,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: 368.81918, y: 0}
+  m_AnchoredPosition: {x: 373.20642, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1628073323
@@ -11478,7 +11489,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1666954137
 RectTransform:
   m_ObjectHideFlags: 0
@@ -11663,12 +11674,12 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1687503762}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: b7cbfcb0916cf694fb3d059ea4b4c1da, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  textID: 25
+  textID: 35
   layoutRebuildObject: {fileID: 0}
   textFormatArgs: []
   languageFontSizes: []
@@ -12492,12 +12503,12 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1829322614}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: b7cbfcb0916cf694fb3d059ea4b4c1da, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  textID: 25
+  textID: 35
   layoutRebuildObject: {fileID: 0}
   textFormatArgs: []
   languageFontSizes: []
@@ -12588,14 +12599,13 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1829607269}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b7cbfcb0916cf694fb3d059ea4b4c1da, type: 3}
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  textID: 31
+  textKey: register_title_birthday
   layoutRebuildObject: {fileID: 0}
-  textFormatArgs: []
   languageFontSizes: []
 --- !u!114 &1829607272
 MonoBehaviour:
@@ -12809,7 +12819,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: 112.34581, y: 0}
+  m_AnchoredPosition: {x: 112.5451, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1847328316
@@ -13294,7 +13304,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: 306.8872, y: 0}
+  m_AnchoredPosition: {x: 310.491, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1900702359
@@ -14327,16 +14337,13 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2082508071}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b7cbfcb0916cf694fb3d059ea4b4c1da, type: 3}
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  textID: 119
+  textKey: register_placeholder_region
   layoutRebuildObject: {fileID: 0}
-  textFormatArgs:
-  - 1
-  - 12
   languageFontSizes: []
 --- !u!114 &2082508074
 MonoBehaviour:

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

@@ -1,4 +1,10 @@
 {
+    "common_next": "下一步",
+    "common_save": "保存",
+    "register_title_birthday": "出生日期:",
+    "register_title_region": "所在地区:",
+    "register_placeholder_birthday": "年-月-日",
+    "register_placeholder_region": "国-省-市",
     "course_title_1": "弓的介绍及护具佩戴",
     "course_title_2": "热身",
     "course_title_3": "站姿",
@@ -10,6 +16,11 @@
     "course_title_9": "瞄准",
     "course_title_10": "撒放",
     "course_title_11": "结束动作",
+    "setup_fix-game-bg": "固定游戏背景",
+    "setup_train-mode": "训练模式",
+    "setup_screen-size": "屏幕尺寸 {0} 英寸",
+    "setup_screen-distance": "屏幕距离 {0} 米",
+    "me_avatar-select": "头像选择",
     "tip_about-us": "关于我们-智能弓箭App!",
     "tip_friend-receive-request": "收到好友添加请求,可到好友界面查看!",
     "tip_pk_gametype_1": "静止靶PK",

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

@@ -1,4 +1,10 @@
 {
+    "common_next": "Next",
+    "common_save": "Save",
+    "register_title_birthday": "Birthday :",
+    "register_title_region": "Region :",
+    "register_placeholder_birthday": "Year-Month-Day",
+    "register_placeholder_region": "Country-State-City",
     "course_title_1": "Introduction of bow and equipment",
     "course_title_2": "Warm up",
     "course_title_3": "Standing posture",
@@ -10,6 +16,11 @@
     "course_title_9": "Aim",
     "course_title_10": "Release",
     "course_title_11": "Finish up job",
+    "setup_fix-game-bg": "FixGameBG",
+    "setup_train-mode": "TrainMode",
+    "setup_screen-size": "Screen Size {0} Inch",
+    "setup_screen-distance": "Screen Distance {0} M",
+    "me_avatar-select": "Avatar Select",
     "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",

+ 4 - 4
Assets/BowArrow/Scripts/Components/TextAutoLanguage2/TextAutoLanguage2.cs

@@ -11,7 +11,7 @@ public class TextAutoLanguage2 : MonoBehaviour
     static LanguageEnum currentLanguageEnum = LanguageEnum.Chinese;
     static Dictionary<string, string> languageDictionary = null;
     static HashSet<TextAutoLanguage2> textAutoLanguages = new HashSet<TextAutoLanguage2>();
-    public string[] textFormatArgs = {};
+    public object[] textFormatArgs = {};
     [SerializeField] LanguageFontSize[] languageFontSizes = {};
 
     private static bool inited = false;
@@ -33,7 +33,7 @@ public class TextAutoLanguage2 : MonoBehaviour
         foreach (var textAutoLanguage in textAutoLanguages)
         {
             try {
-                textAutoLanguage.ApplyText();    
+                textAutoLanguage.ApplyToText();    
             } catch (Exception e) { Debug.LogError(e.Message); }
         }
     }
@@ -69,7 +69,7 @@ public class TextAutoLanguage2 : MonoBehaviour
     void Start()
     {
         textAutoLanguages.Add(this);
-        ApplyText();   
+        ApplyToText();   
     }
 
     void OnDestroy()
@@ -116,7 +116,7 @@ public class TextAutoLanguage2 : MonoBehaviour
         return this.textKey;
     }
 
-    void ApplyText()
+    public void ApplyToText()
     {
         SetTextKey(textKey);
     }

+ 6 - 2
Assets/BowArrow/Scripts/View/SetUpView.cs

@@ -65,12 +65,16 @@ public class SetUpView : MonoBehaviour
 
     void ShowScreenSize(float v) {
         string vStr = v.ToString("#0.00");
-        inputSize.transform.Find("Placeholder").GetComponent<Text>().text = $"屏幕尺寸 {vStr} 英寸";
+        TextAutoLanguage2 textAutoLanguage2 = inputSize.transform.Find("Placeholder").GetComponent<TextAutoLanguage2>();
+        textAutoLanguage2.textFormatArgs = new object[]{vStr};
+        textAutoLanguage2.ApplyToText();
     }
 
     void ShowScreenDistance(float v) {
         string vStr = v.ToString("#0.00");
-        inputDistance.transform.Find("Placeholder").GetComponent<Text>().text = $"屏幕距离 {vStr} 米";
+        TextAutoLanguage2 textAutoLanguage2 = inputDistance.transform.Find("Placeholder").GetComponent<TextAutoLanguage2>();
+        textAutoLanguage2.textFormatArgs = new object[]{vStr};
+        textAutoLanguage2.ApplyToText();
     }
 
     public void CheckBox(GameObject checkBox) {