1、游戏规则文案修改

2、击打靶子的文字显示时长修改

Assets/BowArrow/Animations/HitTargetNumberLine.anim

@@ -29,43 +29,43 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.083333336
+        time: 0.16666667
         value: {x: 1, y: 1.36, z: 1}
-        inSlope: {x: 2.160001, y: 0, z: 0}
-        outSlope: {x: 2.160001, y: 0, z: 0}
+        inSlope: {x: 1.0800005, y: 0, z: 0}
+        outSlope: {x: 1.0800005, y: 0, z: 0}
         tangentMode: 0
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.16666667
+        time: 0.33333334
         value: {x: 1.09, y: 1.22, z: 1}
-        inSlope: {x: 1.2600003, y: -2.0400004, z: 0}
-        outSlope: {x: 1.2600003, y: -2.0400004, z: 0}
+        inSlope: {x: 0.6300002, y: -1.0200002, z: 0}
+        outSlope: {x: 0.6300002, y: -1.0200002, z: 0}
         tangentMode: 0
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.25
+        time: 0.5
         value: {x: 1.21, y: 1.02, z: 1}
-        inSlope: {x: 1.3800001, y: -2.3400002, z: 0}
-        outSlope: {x: 1.3800001, y: -2.3400002, z: 0}
+        inSlope: {x: 0.69000006, y: -1.1700001, z: 0}
+        outSlope: {x: 0.69000006, y: -1.1700001, z: 0}
         tangentMode: 0
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.33333334
+        time: 0.6666667
         value: {x: 1.32, y: 0.83, z: 1}
-        inSlope: {x: 1.1999997, y: -1.9200001, z: 0}
-        outSlope: {x: 1.1999997, y: -1.9200001, z: 0}
+        inSlope: {x: 0.59999985, y: -0.96000004, z: 0}
+        outSlope: {x: 0.59999985, y: -0.96000004, z: 0}
         tangentMode: 0
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 0.41666666
+        time: 0.8333333
         value: {x: 1.41, y: 0.7, z: 1}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
@@ -91,7 +91,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.25
+        time: 0.5
         value: 1
         inSlope: 0
         outSlope: 0
@@ -119,7 +119,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.25
+        time: 0.5
         value: 1
         inSlope: 0
         outSlope: 0
@@ -147,7 +147,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.25
+        time: 0.5
         value: 1
         inSlope: 0
         outSlope: 0
@@ -175,7 +175,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.083333336
+        time: 0.16666667
         value: 1
         inSlope: 0
         outSlope: 0
@@ -184,7 +184,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.25
+        time: 0.5
         value: 1
         inSlope: 0
         outSlope: 0
@@ -193,7 +193,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.41666666
+        time: 0.8333333
         value: 0
         inSlope: 0
         outSlope: 0
@@ -257,7 +257,7 @@ AnimationClip:
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 0.41666666
+    m_StopTime: 0.8333333
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0
@@ -286,43 +286,43 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.083333336
+        time: 0.16666667
         value: 1
-        inSlope: 2.160001
-        outSlope: 2.160001
+        inSlope: 1.0800005
+        outSlope: 1.0800005
         tangentMode: 136
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.16666667
+        time: 0.33333334
         value: 1.09
-        inSlope: 1.2600003
-        outSlope: 1.2600003
+        inSlope: 0.6300002
+        outSlope: 0.6300002
         tangentMode: 136
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.25
+        time: 0.5
         value: 1.21
-        inSlope: 1.3800001
-        outSlope: 1.3800001
+        inSlope: 0.69000006
+        outSlope: 0.69000006
         tangentMode: 136
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.33333334
+        time: 0.6666667
         value: 1.32
-        inSlope: 1.1999997
-        outSlope: 1.1999997
+        inSlope: 0.59999985
+        outSlope: 0.59999985
         tangentMode: 136
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.41666666
+        time: 0.8333333
         value: 1.41
         inSlope: 0
         outSlope: 0
@@ -350,7 +350,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.083333336
+        time: 0.16666667
         value: 1.36
         inSlope: 0
         outSlope: 0
@@ -359,34 +359,34 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.16666667
+        time: 0.33333334
         value: 1.22
-        inSlope: -2.0400004
-        outSlope: -2.0400004
+        inSlope: -1.0200002
+        outSlope: -1.0200002
         tangentMode: 136
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.25
+        time: 0.5
         value: 1.02
-        inSlope: -2.3400002
-        outSlope: -2.3400002
+        inSlope: -1.1700001
+        outSlope: -1.1700001
         tangentMode: 136
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.33333334
+        time: 0.6666667
         value: 0.83
-        inSlope: -1.9200001
-        outSlope: -1.9200001
+        inSlope: -0.96000004
+        outSlope: -0.96000004
         tangentMode: 136
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.41666666
+        time: 0.8333333
         value: 0.7
         inSlope: 0
         outSlope: 0
@@ -414,7 +414,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.25
+        time: 0.5
         value: 1
         inSlope: 0
         outSlope: 0
@@ -442,7 +442,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.25
+        time: 0.5
         value: 1
         inSlope: 0
         outSlope: 0
@@ -470,7 +470,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.25
+        time: 0.5
         value: 1
         inSlope: 0
         outSlope: 0
@@ -498,7 +498,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.25
+        time: 0.5
         value: 1
         inSlope: 0
         outSlope: 0
@@ -526,7 +526,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.083333336
+        time: 0.16666667
         value: 1
         inSlope: 0
         outSlope: 0
@@ -535,7 +535,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.25
+        time: 0.5
         value: 1
         inSlope: 0
         outSlope: 0
@@ -544,7 +544,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 0.41666666
+        time: 0.8333333
         value: 0
         inSlope: 0
         outSlope: 0

Assets/BowArrow/Resources/Prefabs/Views/GameRuleView.prefab

@@ -361,6 +361,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   textID: 96
   layoutRebuildObject: {fileID: 7069939210709011093}
+  textFormatArgs: []
 --- !u!1 &7069939211236851653
 GameObject:
   m_ObjectHideFlags: 0
@@ -554,7 +555,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   rule1: e8030000e9030000
-  rule2: d0070000d1070000d2070000d3070000d4070000
+  rule2: d0070000d1070000d2070000d3070000
 --- !u!1 &7069939212018072967
 GameObject:
   m_ObjectHideFlags: 0
@@ -739,3 +740,4 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   textID: 0
   layoutRebuildObject: {fileID: 7069939210709011093}
+  textFormatArgs: []

Assets/BowArrow/Scripts/Bluetooth/ShootCheck.cs

@@ -41,7 +41,7 @@ public class ShootCheck : MonoBehaviour
 //socket
         string ipStr = ipInputField.text;//ipInputField.GetComponentInChildren<Text>();
         string serverIP = ipStr;
-        serverIP = "172.16.20.57";
+        // serverIP = "172.16.20.57";
         string address = "ws://" + serverIP + ":8088/Ble/";
         webSocket = new WebSocket(new Uri(address));
 #if !UNITY_WEBGL

Assets/BowArrow/Scripts/Components/TextAutoLanguage.cs

@@ -225,10 +225,9 @@ class LanguageDefault {
     public string text1000 = "在固定的时间内尽量射更多的箭。";
     public string text1001 = "总环数逐渐增加，挑战自己的纪录。";
     public string text2000 = "两个人轮流射箭，使用奥运会的规则进行PK。";
-    public string text2001 = "比赛最多为5局，每局3支箭，累计得分高者胜出。";
+    public string text2001 = "比赛最多为5局，每局3支箭，交替射箭。";
     public string text2002 = "获胜者获得积分2分，打平各1分，输者不得积分。";
     public string text2003 = "先得6分者胜利，如5局打完是平局，则加赛一箭定胜负。";
-    public string text2004 = "总环数逐渐增加，挑战自己的纪录。";
 
     //道具名称
     public string text101000 = "{0}倍镜";
@@ -390,10 +389,9 @@ class LanguageEnglish : LanguageDefault {
     public new string text1000 = "Shoot as many arrows as you can at a fixed time.";
     public new string text1001 = "The total number of rings gradually increased, \nchallenging their own records.";
     public new string text2000 = "Two people arched in turn, using the rules of the Olympic Games PK.";
-    public new string text2001 = "The maximum number of games is 5, 3 arrows in each game, \nand the one with the highest score wins.";
+    public new string text2001 = "The maximum number of games is 5, 3 arrows in each game, \nshooting arrows alternately.";
     public new string text2002 = "The winner will get 2 points and 1 draw each. \nThe loser will not get points.";
     public new string text2003 = "If the first 6 points win, \nif it is a draw at the end of the 5 innings, \nthe game will be decided by one arrow.";
-    public new string text2004 = "The total number of rings gradually increased, \nchallenging their own records.";
 
     //道具名称
     public new string text101000 = "{0}X Mirrors";

Assets/BowArrow/Scripts/Effect/HitTargetNumber.cs

@@ -20,7 +20,7 @@ public class HitTargetNumber : MonoBehaviour
         rtf.localScale = Vector3.zero;
         seq.Append(rtf.DOScale(new Vector3(scale1, scale1, 0), 0.1f));
         seq.Append(rtf.DOScale(new Vector3(scale2, scale2, 0), 0.1f));
-        seq.AppendInterval(0.93f);
+        seq.AppendInterval(1.88f);
         seq.Append(rtf.GetComponent<Text>().DOFade(0, 0.23f));
         seq.AppendCallback(delegate() {
             Destroy(this.gameObject);