lvjincheng 4 роки тому
батько
коміт
0397b29f5e

+ 0 - 30
Assets/BowArrow/Scenes/GameChallengeScene/AnimalSlider.cs

@@ -1,30 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
-public class AnimalSlider : MonoBehaviour
-{
-    public Transform animalRoot;
-    public Slider slider;
-    public Text text;
-
-
-    void Start()
-    {
-        onSlider(slider.value);
-        slider.onValueChanged.AddListener(onSlider);  
-
-        foreach (var item in animalRoot.GetComponentsInChildren<AnimationPlayer>())
-        {
-            item.play(0, WrapMode.Loop);
-        }
-    }
-
-    void onSlider(float v) {
-        Vector3 pos = animalRoot.transform.localPosition;
-        pos.z = 70f * v;
-        animalRoot.transform.localPosition = pos;
-        text.text = pos.z.ToString("#0.00") + "米";
-    }
-}

+ 0 - 11
Assets/BowArrow/Scenes/GameChallengeScene/AnimalSlider.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 6bff793879d1a1e47bb6f5909e46ddab
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 36 - 1
Assets/BowArrow/Scripts/Components/TextAutoLanguage2/Resources/TextAutoLanguage2/en.json

@@ -20,5 +20,40 @@
     "tip_pk_invite-try-again": "Invite Again ",
     "当前正处于匹配状态,无法接受好友PK邀请!": "In matching, can't accept PK!",
     "目前状态下,无法接受该邀请!": "In current state, can't accept invite!",
-    "某方退出或掉线,联机游戏终止!": "One quit or outline, game stop!"
+    "某方退出或掉线,联机游戏终止!": "One quit or outline, game stop!",
+    "操作过于频繁": "",
+    "请输入用户名": "",
+    "请输入密码": "",
+    "验证码错误": "",
+    "请阅读并同意App协议": "",
+    "账号未注册": "",
+    "登录成功": "",
+    "密码错误": "",
+    "用户名长度至少6位": "",
+    "密码长度至少6位": "",
+    "两次输入的密码不一致": "",
+    "该账号已被注册": "",
+    "注册成功": "",
+    "注册失败": "",
+    "请输入游戏昵称": "",
+    "未填写出生日期": "",
+    "未填写所在地区": "",
+    "用户不存在": "",
+    "验证密码不对": "",
+    "昵称错误": "",
+    "性别错误": "",
+    "生日错误": "",
+    "所在地区错误": "",
+    "保存成功": "",
+    "对方拒绝了你的邀请": "",
+    "登录认证过期": "",
+    "好友列表为空": "",
+    "好友请求列表为空": "",
+    "没有可推荐的好友": "",
+    "没有搜索到目标玩家": "",
+    "请先连接设备": "",
+    "昵称不能为空": "",
+    "你尚未设置所属地区,无法查看该排行榜!": "",
+    "输入值不在常规范围内": "",
+    "转化比率 = ": ""
 }

+ 6 - 1
Assets/BowArrow/Scripts/Components/TextAutoLanguage2/TextAutoLanguage2.cs

@@ -53,7 +53,12 @@ public class TextAutoLanguage2 : MonoBehaviour
         if (currentLanguageEnum == LanguageEnum.Chinese) {
             return textKey;
         }
-        return languageDictionary[textKey];
+        string resText = null;
+        languageDictionary.TryGetValue(textKey, out resText);
+        if (resText == null) {
+            return textKey;
+        }
+        return resText;
     }
 
     void Awake()

+ 1 - 1
Assets/BowArrow/Scripts/Network/UserPlayer.cs

@@ -86,7 +86,7 @@ public class UserPlayer : JCEntity
             //clear token info
             PlayerPrefs.DeleteKey("IdAndToken");
             //tip
-            PopupMgr.ins.ShowTip("登录Token失效!");
+            PopupMgr.ins.ShowTip("登录认证过期");
             //delay back login or quit
             Sequence seq = DOTween.Sequence();
             seq.AppendInterval(1.5f);

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

@@ -38,7 +38,7 @@ public class SetUpView : MonoBehaviour
             //save
             UserSettings.ins.bowRotateConvert.screenSize = v;
             UserSettings.ins.Save();
-            PopupMgr.ins.ShowTip("游戏旋转角度 : 实际旋转角度 = " + UserSettings.ins.bowRotateConvert.GetRate());
+            PopupMgr.ins.ShowTip("转化比率 = " + UserSettings.ins.bowRotateConvert.GetRate());
         };
         UnityAction<string> onEndEdit_inputDistance = (string str) => {
             inputDistance.SetTextWithoutNotify("");
@@ -51,7 +51,7 @@ public class SetUpView : MonoBehaviour
             //save
             UserSettings.ins.bowRotateConvert.screenDistance = v;
             UserSettings.ins.Save();
-            PopupMgr.ins.ShowTip("游戏旋转角度 : 实际旋转角度 = " + UserSettings.ins.bowRotateConvert.GetRate());
+            PopupMgr.ins.ShowTip("转化比率 = " + UserSettings.ins.bowRotateConvert.GetRate());
         };
         inputSize.onEndEdit.AddListener(onEndEdit_inputSize);
         inputDistance.onEndEdit.AddListener(onEndEdit_inputDistance);

+ 2 - 17
Assets/BowArrow/Test/PopupRoot/PopupTest.cs

@@ -4,20 +4,5 @@ using UnityEngine;
 
 public class PopupTest : MonoBehaviour
 {
-    // Start is called before the first frame update
-    void Start()
-    {
-        // PopupMgr.ins.ShowPKInviteNotice(10, "aaa", "邀请你过来", null);
-    }
-
-    int index = 0;
-    float t = 0;
-    void Update()
-    {
-        t += Time.deltaTime;
-        if (t > 0.5) {
-            t = 0;
-            PopupMgr.ins.ShowTip("ttt" + index++);
-        }
-    }
-}
+    
+}