Browse Source

1.切回英文版。2.屏蔽语言切换选项。3.设置界面ui适配

lvjincheng 3 years ago
parent
commit
7397274fda

+ 45 - 193
Assets/BowArrow/Resources/Prefabs/Views/Home/SettingsGameView.prefab

@@ -11,6 +11,7 @@ GameObject:
   - component: {fileID: 6444685551478064890}
   - component: {fileID: 6682904953295702164}
   - component: {fileID: 1851240179480968824}
+  - component: {fileID: 2398793835561661085}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -30,7 +31,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 5278046845778656986}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -74,11 +75,26 @@ MonoBehaviour:
     m_MaxSize: 40
     m_Alignment: 4
     m_AlignByGeometry: 0
-    m_RichText: 0
+    m_RichText: 1
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 
+--- !u!114 &2398793835561661085
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 191636620464980118}
+  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}
+  languageFontSizes: []
 --- !u!1 &542238361244571168
 GameObject:
   m_ObjectHideFlags: 0
@@ -401,101 +417,6 @@ MonoBehaviour:
   layoutRebuildObject: {fileID: 0}
   textFormatArgs: []
   languageFontSizes: []
---- !u!1 &1367088754608517391
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5237890747013869340}
-  - component: {fileID: 5819257011241886517}
-  - component: {fileID: 5653395249470392859}
-  - component: {fileID: 4038479900816877224}
-  m_Layer: 5
-  m_Name: Placeholder
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5237890747013869340
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1367088754608517391}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 5278046845778656986}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  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_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5819257011241886517
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1367088754608517391}
-  m_CullTransparentMesh: 1
---- !u!114 &5653395249470392859
-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: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 28
-    m_FontStyle: 2
-    m_BestFit: 0
-    m_MinSize: 2
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    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}
-  languageFontSizes: []
 --- !u!1 &1957444802930511365
 GameObject:
   m_ObjectHideFlags: 0
@@ -904,9 +825,9 @@ RectTransform:
   m_Father: {fileID: 3272219798247979803}
   m_RootOrder: 1
   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: -173.33334, y: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 110.66666, y: 0}
   m_SizeDelta: {x: 160, y: 60}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &7370284945824027401
@@ -1017,9 +938,9 @@ RectTransform:
   m_Father: {fileID: 8963406415416676176}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 65}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -295}
   m_SizeDelta: {x: 1144, y: 90}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &2266541563170002118
@@ -1100,6 +1021,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   inputField: {fileID: 0}
   moveRect: {fileID: 0}
+  noTransparentOnFocused: {fileID: 0}
 --- !u!1 &4890174974628219031
 GameObject:
   m_ObjectHideFlags: 0
@@ -1215,7 +1137,7 @@ RectTransform:
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0, y: 1}
 --- !u!222 &3323778583502834505
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1342,11 +1264,11 @@ RectTransform:
   m_Father: {fileID: 3272219798247979803}
   m_RootOrder: 2
   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: 206.66667, y: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -49.333252, y: 0}
   m_SizeDelta: {x: 56, y: 55}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &1132155416305412972
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1419,9 +1341,9 @@ RectTransform:
   m_Father: {fileID: 243481542007038700}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 15, y: -16.5}
   m_SizeDelta: {x: 30, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2858025188186152223
@@ -1720,11 +1642,11 @@ RectTransform:
   m_Father: {fileID: 3272219798247979803}
   m_RootOrder: 0
   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: -218, y: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 36, y: 0}
   m_SizeDelta: {x: 60, y: 60}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &7150901343152010354
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1797,9 +1719,9 @@ RectTransform:
   m_Father: {fileID: 243481542007038700}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 100, y: -16.5}
   m_SizeDelta: {x: 30, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1152509048056449935
@@ -2126,8 +2048,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 105, y: -15}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 130, y: -16.5}
+  m_SizeDelta: {x: 25, y: 33}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &2075870506722154811
 CanvasRenderer:
@@ -2463,8 +2385,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 45, y: -15}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 45, y: -16.5}
+  m_SizeDelta: {x: 25, y: 33}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &4646865985747465999
 CanvasRenderer:
@@ -3189,7 +3111,6 @@ GameObject:
   - component: {fileID: 5278046845778656986}
   - component: {fileID: 5551665681046406536}
   - component: {fileID: 7813744944211934169}
-  - component: {fileID: 2560332287677407898}
   m_Layer: 5
   m_Name: InputDistance
   m_TagString: Untagged
@@ -3208,7 +3129,6 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 5237890747013869340}
   - {fileID: 6444685551478064890}
   m_Father: {fileID: 4660470137020590352}
   m_RootOrder: 1
@@ -3256,74 +3176,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!114 &2560332287677407898
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8605709907090143677}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 7813744944211934169}
-  m_TextComponent: {fileID: 1851240179480968824}
-  m_Placeholder: {fileID: 5653395249470392859}
-  m_ContentType: 0
-  m_InputType: 0
-  m_AsteriskChar: 42
-  m_KeyboardType: 0
-  m_LineType: 0
-  m_HideMobileInput: 0
-  m_CharacterValidation: 0
-  m_CharacterLimit: 0
-  m_OnEndEdit:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnSubmit:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnValueChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_CaretColor: {r: 0, g: 0, b: 0, a: 1}
-  m_CustomCaretColor: 0
-  m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
-  m_Text: 
-  m_CaretBlinkRate: 1
-  m_CaretWidth: 2
-  m_ReadOnly: 0
-  m_ShouldActivateOnSelect: 1
 --- !u!1 &8963406415416676015
 GameObject:
   m_ObjectHideFlags: 0
@@ -5158,7 +5010,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: 1144, y: 290}
+  m_SizeDelta: {x: 1144, y: 390}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4681577669823545561
 MonoBehaviour:

+ 2 - 0
Assets/BowArrow/Scripts/CommonConfig.cs

@@ -14,6 +14,8 @@ public class CommonConfig
     {
         get => AppLanguages[Array.IndexOf(AppNames, Application.productName)];
     }
+    //禁止语言切换(ios安全上架)
+    public static bool banLanguageChangeSwitch { get => Application.platform ==  RuntimePlatform.IPhonePlayer; }
     //禁止绑定关联账号的相关功能(找回密码,注册界面绑定手机邮箱,个人界面绑定手机邮箱)
     public static bool banBindRelateAccount { get => Application.platform == RuntimePlatform.IPhonePlayer; }
     public static bool iosTaoKe = false; //IOS套壳开关

+ 37 - 18
Assets/BowArrow/Scripts/View/Home/SettingsGameView.cs

@@ -10,7 +10,8 @@ public class SettingsGameView : JCUnityLib.ViewBase, MenuBackInterface
 {
     [SerializeField] Image[] crossHairOptionChecks;
     InputField inputSize;
-    InputField inputDistance;
+    // InputField inputDistance;
+    Text inputDistanceText;
 
     void Start()
     {
@@ -24,8 +25,22 @@ public class SettingsGameView : JCUnityLib.ViewBase, MenuBackInterface
         RenderShootLevel();
         RenderActualArrowWeight();
         InitForRotateConvert();
+        if (CommonConfig.banLanguageChangeSwitch)
+        {
+            this.transform.Find("Items/Language").gameObject.SetActive(false);
+            StartCoroutine(FixMaxRow(this.transform.Find("Items/TrainMode") as RectTransform));
+        }
     }
 
+    IEnumerator FixMaxRow(RectTransform rtf)
+    {
+        yield return null;
+        rtf.GetComponentInParent<GridLayoutGroup>().enabled = false;
+        Vector2 v2 = rtf.sizeDelta;
+        v2.x = (rtf.parent as RectTransform).rect.width;
+        rtf.sizeDelta = v2;
+    } 
+
     void OnDestroy()
     {
         PersistenHandler.ins?.menuBackCtr.views.Remove(this);
@@ -38,7 +53,8 @@ public class SettingsGameView : JCUnityLib.ViewBase, MenuBackInterface
 
     void InitForRotateConvert() {
         inputSize = transform.Find("RotateConvert/InputSize").GetComponent<InputField>();
-        inputDistance = transform.Find("RotateConvert/InputDistance").GetComponent<InputField>();
+        // inputDistance = transform.Find("RotateConvert/InputDistance").GetComponent<InputField>();
+        inputDistanceText = transform.Find("RotateConvert/InputDistance").GetComponentInChildren<Text>();
         UnityAction<string> onEndEdit_inputSize = (string str) => {
             inputSize.SetTextWithoutNotify("");
             float v = (float) System.Math.Round(double.Parse(str), 2);
@@ -53,22 +69,22 @@ public class SettingsGameView : JCUnityLib.ViewBase, MenuBackInterface
             ShowScreenDistance(UserSettings.ins.bowRotateConvert.GetAdviseScreenDistance());
             // PopupMgr.ins.ShowTip(TextAutoLanguage2.GetTextByCNKey("转化比率 = ") + UserSettings.ins.bowRotateConvert.GetRate());
         };
-        UnityAction<string> onEndEdit_inputDistance = (string str) => {
-            // inputDistance.SetTextWithoutNotify("");
-            // float v = (float) System.Math.Round(double.Parse(str), 2);
-            // if (v < 0.1 || v > 100) {
-            //     PopupMgr.ins.ShowTip(TextAutoLanguage2.GetTextByCNKey("输入值不在常规范围内"));
-            //     return;
-            // }
-            // ShowScreenDistance(v);
-            // //save
-            // UserSettings.ins.bowRotateConvert.screenDistance = v;
-            // UserSettings.ins.Save();
-            // PopupMgr.ins.ShowTip(TextAutoLanguage2.GetTextByCNKey("转化比率 = ") + UserSettings.ins.bowRotateConvert.GetRate());
-        };
+        // UnityAction<string> onEndEdit_inputDistance = (string str) => {
+        //     inputDistance.SetTextWithoutNotify("");
+        //     float v = (float) System.Math.Round(double.Parse(str), 2);
+        //     if (v < 0.1 || v > 100) {
+        //         PopupMgr.ins.ShowTip(TextAutoLanguage2.GetTextByCNKey("输入值不在常规范围内"));
+        //         return;
+        //     }
+        //     ShowScreenDistance(v);
+        //     //save
+        //     UserSettings.ins.bowRotateConvert.screenDistance = v;
+        //     UserSettings.ins.Save();
+        //     PopupMgr.ins.ShowTip(TextAutoLanguage2.GetTextByCNKey("转化比率 = ") + UserSettings.ins.bowRotateConvert.GetRate());
+        // };
         inputSize.onEndEdit.AddListener(onEndEdit_inputSize);
-        inputDistance.onEndEdit.AddListener(onEndEdit_inputDistance);
-        inputDistance.readOnly = true;
+        // inputDistance.onEndEdit.AddListener(onEndEdit_inputDistance);
+        // inputDistance.readOnly = true;
         ShowScreenSize(UserSettings.ins.bowRotateConvert.screenSize);
         // ShowScreenSize(UserSettings.ins.bowRotateConvert.screenDistance);
         ShowScreenDistance(UserSettings.ins.bowRotateConvert.GetAdviseScreenDistance());
@@ -91,7 +107,10 @@ public class SettingsGameView : JCUnityLib.ViewBase, MenuBackInterface
         // textAutoLanguage2.textFormatArgs = new object[]{vStr};
         // textAutoLanguage2.ApplyToText();
 
-        inputDistance.text = string.Format(TextAutoLanguage2.GetTextByKey("setup_screen-distance"), v.ToString("#0.00"));
+        // inputDistance.text = string.Format(TextAutoLanguage2.GetTextByKey("setup_screen-distance"), v.ToString("#0.00"));
+        TextAutoLanguage2 textAutoLanguage2 = inputDistanceText.GetComponent<TextAutoLanguage2>();
+        textAutoLanguage2.textFormatArgs = new object[]{v.ToString("#0.00")};
+        textAutoLanguage2.ApplyToText();
     }
 
     public void CheckBox(GameObject checkBox) {

+ 1 - 1
ProjectSettings/ProjectSettings.asset

@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: JssF
-  productName: "\u9752\u51E4\u9E3E"
+  productName: HOUYI
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}