Parcourir la source

1.此commit 是修复bug。pure_infrared 可以同步;
2.双人pk结果和电量文案翻译,头像mask 红色背景RoleSelectView.prefab
3.摄像机同步bug。ArrowSync.cs ,ArrowCamera.cs

slambb il y a 1 mois
Parent
commit
05f4a02d81

+ 8 - 3
Assets/BowArrow/DoubleScene/Scripts/DoublePKGameView.cs

@@ -13,10 +13,14 @@ public class DoublePKGameView : MonoBehaviour
 
     [SerializeField] Text Battery1P;
     [SerializeField] Text Battery2P;
+
+    private string batteryLevel;
     // Start is called before the first frame update
     void Start()
     {
-        
+        batteryLevel = TextAutoLanguage2.GetTextByKey("BatteryLevel");
+        setBattery1P(0);
+        setBattery2P(0);
     }
 
     // Update is called once per frame
@@ -40,11 +44,12 @@ public class DoublePKGameView : MonoBehaviour
 
     public void setBattery1P(int value) 
     {
-        Battery1P.text = "µçÁ¿:"+ value.ToString() + "%";
+
+        Battery1P.text = batteryLevel + ":" + value.ToString() + "%";
     }
 
     public void setBattery2P(int value)
     {
-        Battery2P.text = "µçÁ¿:" + value.ToString() + "%";
+        Battery2P.text = batteryLevel + ":" + value.ToString() + "%";
     }
 }

+ 5 - 5
Assets/BowArrow/DoubleScene/Scripts/GameAssistUIDoublePlayer.cs

@@ -135,11 +135,11 @@ public class GameAssistUIDoublePlayer : MonoBehaviour
                 {
                     InfraredDemo._ins?.SetAdjustPointsOffset(PlayerType.FirstPlayer);
                 }
-                //else
-                //{
-                //   //使用旧模式重置1p
-                //    AimHandler.ins?.DoIdentity();
-                //}
+                else
+                {
+                   //使用旧模式重置1p
+                    AimHandler.ins?.DoIdentity();
+                }
             };
 
             //action_OnClickBtnIdentity?.Invoke();

+ 2 - 2
Assets/BowArrow/Resources/Textures/GameIcon/Prefabs/Views/Home/RoleSelectView.prefab

@@ -90,7 +90,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_ShowMaskGraphic: 1
+  m_ShowMaskGraphic: 0
 --- !u!1 &3061568478711900722
 GameObject:
   m_ObjectHideFlags: 0
@@ -328,7 +328,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_ShowMaskGraphic: 1
+  m_ShowMaskGraphic: 0
 --- !u!1 &4507770289733904449
 GameObject:
   m_ObjectHideFlags: 0

+ 50 - 7
Assets/BowArrow/Scenes/Entry.unity

@@ -38,6 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
+  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -229,7 +230,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!81 &29910638
 AudioListener:
@@ -454,7 +455,6 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 0
   m_SortingLayerID: 0
   m_SortingOrder: 1
@@ -473,7 +473,7 @@ RectTransform:
   m_Children:
   - {fileID: 1693457930}
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -522,7 +522,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1422346461
 GameObject:
@@ -554,7 +554,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1422346463
 MonoBehaviour:
@@ -645,7 +645,6 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 0
   m_SortingLayerID: 0
   m_SortingOrder: 0
@@ -665,7 +664,7 @@ RectTransform:
   - {fileID: 2060474346}
   - {fileID: 730210589}
   m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -748,6 +747,50 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1693457929}
   m_CullTransparentMesh: 1
+--- !u!1 &1842207388
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1842207389}
+  - component: {fileID: 1842207390}
+  m_Layer: 0
+  m_Name: "AOTAdapter[\u975E\u5E38\u91CD\u8981]"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1842207389
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1842207388}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1842207390
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1842207388}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 68c1448bae6cec044896a9067bd99768, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &2060474345
 GameObject:
   m_ObjectHideFlags: 0

+ 108 - 12
Assets/BowArrow/Scenes/GameDouble.unity

@@ -4908,8 +4908,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: 29.692308, y: -16.5}
-  m_SizeDelta: {x: 39.384617, y: 33}
+  m_AnchoredPosition: {x: 30, y: -16.5}
+  m_SizeDelta: {x: 40, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &286416209
 MonoBehaviour:
@@ -9603,6 +9603,7 @@ GameObject:
   - component: {fileID: 580039907}
   - component: {fileID: 580039906}
   - component: {fileID: 580039905}
+  - component: {fileID: 580039908}
   m_Layer: 5
   m_Name: Draw2
   m_TagString: Untagged
@@ -9687,6 +9688,21 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 580039902}
   m_CullTransparentMesh: 1
+--- !u!114 &580039908
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 580039902}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: game_settle_Draw
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &582317203
 GameObject:
   m_ObjectHideFlags: 0
@@ -10782,6 +10798,7 @@ GameObject:
   - component: {fileID: 656989273}
   - component: {fileID: 656989272}
   - component: {fileID: 656989271}
+  - component: {fileID: 656989274}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -10866,6 +10883,21 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 656989268}
   m_CullTransparentMesh: 1
+--- !u!114 &656989274
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 656989268}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: game_settle_win
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &659933254
 GameObject:
   m_ObjectHideFlags: 0
@@ -12313,8 +12345,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: 29.692308, y: -16.5}
-  m_SizeDelta: {x: 39.384617, y: 33}
+  m_AnchoredPosition: {x: 30, y: -16.5}
+  m_SizeDelta: {x: 40, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &745608731
 MonoBehaviour:
@@ -13079,8 +13111,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: 29.692308, y: -16.5}
-  m_SizeDelta: {x: 39.384617, y: 33}
+  m_AnchoredPosition: {x: 30, y: -16.5}
+  m_SizeDelta: {x: 40, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &781839819
 MonoBehaviour:
@@ -13695,6 +13727,7 @@ GameObject:
   - component: {fileID: 828728027}
   - component: {fileID: 828728026}
   - component: {fileID: 828728025}
+  - component: {fileID: 828728028}
   m_Layer: 5
   m_Name: Draw1
   m_TagString: Untagged
@@ -13779,6 +13812,21 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 828728022}
   m_CullTransparentMesh: 1
+--- !u!114 &828728028
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 828728022}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: game_settle_Draw
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &829773043
 GameObject:
   m_ObjectHideFlags: 0
@@ -17589,6 +17637,7 @@ GameObject:
   - component: {fileID: 1086500647}
   - component: {fileID: 1086500646}
   - component: {fileID: 1086500645}
+  - component: {fileID: 1086500648}
   m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
@@ -17673,6 +17722,21 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1086500642}
   m_CullTransparentMesh: 1
+--- !u!114 &1086500648
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1086500642}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: game_settle_win
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &1088670741
 GameObject:
   m_ObjectHideFlags: 0
@@ -20049,8 +20113,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: 49.384617, y: -16.5}
-  m_SizeDelta: {x: 78.76923, y: 33}
+  m_AnchoredPosition: {x: 50, y: -16.5}
+  m_SizeDelta: {x: 80, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1278939257
 MonoBehaviour:
@@ -25318,8 +25382,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: 29.692308, y: -16.5}
-  m_SizeDelta: {x: 39.384617, y: 33}
+  m_AnchoredPosition: {x: 30, y: -16.5}
+  m_SizeDelta: {x: 40, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1609303132
 MonoBehaviour:
@@ -26210,6 +26274,7 @@ GameObject:
   - component: {fileID: 1644623717}
   - component: {fileID: 1644623716}
   - component: {fileID: 1644623715}
+  - component: {fileID: 1644623718}
   m_Layer: 5
   m_Name: Fail1
   m_TagString: Untagged
@@ -26294,6 +26359,21 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1644623712}
   m_CullTransparentMesh: 1
+--- !u!114 &1644623718
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1644623712}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: game_settle_fail
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &1656470006
 GameObject:
   m_ObjectHideFlags: 0
@@ -27404,6 +27484,7 @@ GameObject:
   - component: {fileID: 1699029736}
   - component: {fileID: 1699029735}
   - component: {fileID: 1699029734}
+  - component: {fileID: 1699029737}
   m_Layer: 5
   m_Name: Fail2
   m_TagString: Untagged
@@ -27488,6 +27569,21 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1699029731}
   m_CullTransparentMesh: 1
+--- !u!114 &1699029737
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1699029731}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f4efe98aab6c6b41a7ee1f4c49df27b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  textKey: game_settle_fail
+  layoutRebuildObject: {fileID: 0}
+  languageFontSizes: []
 --- !u!1 &1710547628
 GameObject:
   m_ObjectHideFlags: 0
@@ -29406,8 +29502,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: 49.384617, y: -16.5}
-  m_SizeDelta: {x: 78.76923, y: 33}
+  m_AnchoredPosition: {x: 50, y: -16.5}
+  m_SizeDelta: {x: 80, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1807247319
 MonoBehaviour:

+ 6 - 3
Assets/BowArrow/Scripts/CommonConfig.cs

@@ -8,6 +8,9 @@ public class CommonConfig
 {
     //青凤鸾 WONDERFITTER ,WONDER FITTER Pro ,WONDER FITTER 运动
     public static readonly string[] AppNames = { "WONDERFITTER Pro 运动", "WONDER FITTER Pro", "WONDERFITTER PRO B" };
+
+    public static readonly string[] AppNames9Axis = { "WONDERFITTER 运动", "WONDERFITTER" };
+
     //App地区(0:国内版;1:海外版;)
     public static int AppArea
     {
@@ -80,7 +83,7 @@ public class CommonConfig
 
 
     public enum ServerType { LocalTest, Produce, Test };
-    private static ServerType serverType = ServerType.Test;
+    private static ServerType serverType = ServerType.Produce;
     //网关服务器访问地址
     public static string gateServerURL
     {
@@ -133,7 +136,7 @@ public class CommonConfig
     /// <summary>
     /// 是否打包红外软件App,这里主要和九轴有区别
     /// </summary>
-    //public static bool bInfraredApp { get; } = true;
+    public static bool bInfraredApp { get; } = false;
 
     //打包App 的端,比如打包B 端就设置 B
     public static OperatingPlatform OP { get; } = OperatingPlatform.C;
@@ -153,7 +156,7 @@ public class CommonConfig
     /// <summary>
     /// 是否显示双人游戏
     /// </summary>
-    public static bool bDisplayTwoPlayerGames { get; } = false;
+    public static bool bDisplayTwoPlayerGames { get; } = true;
 
     #endregion
 

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

@@ -213,6 +213,7 @@
   "pk-match_match-waiting3": "正在搜索实力相当的对手···",
   "game_settle_win": "胜利",
   "game_settle_fail": "失败",
+  "game_settle_Draw": "平局",
   "game_challenge_pk_score": "得分: {0}",
   "game_challenge_surplus_rabbit": "剩余野兔",
   "game_challenge_surplus_pheasant": "剩余野鸡",
@@ -362,6 +363,7 @@
 
   "======WildAttack======": "注释",
   "LevelWildAttack": "荒野射击",
+  "BatteryLevel": "电量",
 
   "======OlynpicArchery======": "注释",
   "OlynpicArchery": "经典射箭",

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

@@ -212,6 +212,7 @@
   "pk-match_match-waiting3": "Searching for opponents of equal strength···",
   "game_settle_win": "Win",
   "game_settle_fail": "Fail",
+  "game_settle_Draw": "Draw",
   "game_challenge_pk_score": "Score: {0}",
   "game_challenge_surplus_rabbit": "Hares",
   "game_challenge_surplus_pheasant": "Pheasants",
@@ -410,6 +411,7 @@
 
   "======WildAttack======": "注释",
   "LevelWildAttack": "Wild Attack",
+  "BatteryLevel": "Batt.",
 
   "======OlynpicArchery======": "注释",
   "OlynpicArchery": "Classic Archery",

+ 14 - 4
Assets/BowArrow/Scripts/Editor/MenuChangeAppLanguage.cs

@@ -40,11 +40,21 @@ public class MenuChangeAppLanguage
     static void ApplySetting(LanguageType lang, DeviceType device)
     {
         int langId = (int)lang;
-       // EditorPrefs.SetInt("AppLanguage", langId);
+        // EditorPrefs.SetInt("AppLanguage", langId);
+
+        if (CommonConfig.bInfraredApp)
+        {
+            PlayerSettings.productName = CommonConfig.StandaloneModeOrPlatformB
+                ? CommonConfig.AppNames[2]
+                : CommonConfig.AppNames[langId];
+        }
+        else
+        {
+            PlayerSettings.productName = CommonConfig.StandaloneModeOrPlatformB
+                ? CommonConfig.AppNames[2]
+                : CommonConfig.AppNames9Axis[langId];
+        }
 
-        PlayerSettings.productName = CommonConfig.StandaloneModeOrPlatformB
-            ? CommonConfig.AppNames[2]
-            : CommonConfig.AppNames[langId];
 
 #if UNITY_IOS
         string bundleId = lang switch

+ 1 - 1
Assets/BowArrow/Scripts/Game/ArrowCamera.cs

@@ -340,7 +340,7 @@ class ArrowCameraTemplate_targetLock : ArrowCameraTemplate
         // 记录初始总路程(XZ 平面,不考虑高度差)
         totalDist = GetXZDistance(offsetPos, targetCenterPos);
 
-        arrowSpeed = arrowCamera.arrow.mySpeed;
+        arrowSpeed = arrowCamera.isArrowSync ? arrowCamera.arrowSync.mySyncSpeed: arrowCamera.arrow.mySpeed;
         Debug.Log("当前弓箭速度:" + arrowSpeed);
     }
 

+ 22 - 5
Assets/BowArrow/Scripts/GameMode/OnlineObject/ArrowSync.cs

@@ -20,8 +20,20 @@ public class ArrowSync : MonoBehaviour
 
     void UpdatePosAndRot(float t) {
         transform.position = Vector3.Lerp(transform.position, position, t);
-        Head().position = transform.position;
-        transform.rotation = Quaternion.Lerp(transform.rotation, rotation, t);     
+  
+        transform.rotation = Quaternion.Lerp(transform.rotation, rotation, t);
+
+        //这里处理应该联网的时候拖尾,跟随有一点误差位置
+        if (guadiantuowei)
+        {
+            Head().position = transform.position + new Vector3(0, 0, 0.78f);//这里之前应该是只是同步父节点的,所以可能有点显示问题
+            guadiantuowei.localPosition = new Vector3(Head().localPosition.x, Head().localPosition.y, guadiantuowei.localPosition.z);
+        }
+        else if (tuowei) {
+            //旧的特效加个 -0.78f
+            Head().position = transform.position + new Vector3(0, 0, -0.78f);//这里之前应该是只是同步父节点的,所以可能有点显示问题
+            tuowei.localPosition = new Vector3(Head().localPosition.x, Head().localPosition.y, tuowei.localPosition.z);
+        }
     }
 
     void UpdatePosAndRotImmediate() {
@@ -58,17 +70,21 @@ public class ArrowSync : MonoBehaviour
     {
         this.transform.Find("Head/EF_baodian").gameObject.SetActive(value);
     }
+    Transform guadiantuowei;
+    Transform tuowei;
     void activeEffectTrail(bool value)
     {
         if (GlobalData.MyDeviceMode == DeviceMode.Archery)
         {
             //this.transform.Find("EF_tuowei").gameObject.SetActive(value);
             //this.transform.Find("EF_tuowei/Trail").GetComponent<TrailRenderer>().time = 1.6f / mySpeed;
-            Transform guadiantuowei = this.transform.Find("guadiantuowei");
+            guadiantuowei = this.transform.Find("guadiantuowei");
             if (guadiantuowei == null)
             {
-                this.transform.Find("EF_tuowei").gameObject.SetActive(value);
-                this.transform.Find("EF_tuowei/Trail").GetComponent<TrailRenderer>().time = 1.6f / mySpeed;
+                tuowei = this.transform.Find("EF_tuowei");
+                tuowei.gameObject.SetActive(value);
+                //this.transform.Find("EF_tuowei/Trail").GetComponent<TrailRenderer>().time = 1.6f / mySpeed;
+                tuowei.Find("Trail").GetComponent<TrailRenderer>().time = 1.6f / mySpeed;
             }
             else
             {
@@ -96,6 +112,7 @@ public class ArrowSync : MonoBehaviour
     Quaternion rotation;
     Vector3 position;
     float mySpeed;
+    public float mySyncSpeed => mySpeed;
     bool hasPlayHitAudio = false;
     bool hasPlayHitEffect = false;
     string[] hitTargetAnimalInfo;

+ 14 - 14
Assets/Game_Hyperspace/Script/UIManager.cs

@@ -10,7 +10,7 @@ namespace HyperspaceGame
     {
         public static UIManager _ins;
         /// <summary>
-        /// 锟斤拷录一锟斤拷锟杰凤拷
+        /// 记录一个总分
         /// </summary>
         public static int mHyperspaceScore { get; set; } = 0;
 
@@ -20,7 +20,7 @@ namespace HyperspaceGame
         [SerializeField] Button _btnCrosshair;
         [SerializeField] Button _btnCalibrationOffset;
         [SerializeField] Material outlight;
-        //准锟侥诧拷锟斤拷
+        //准心部分
         private bool open = false;
         private bool visiable = false;
         private bool onlyShow = true;
@@ -31,13 +31,13 @@ namespace HyperspaceGame
         {
             if (_ins != null && _ins != this)
             {
-                //Destroy(this.gameObject); // 锟斤拷锟斤拷丫锟斤拷锟斤拷锟绞碉拷锟斤拷锟斤拷锟斤拷锟斤拷俚锟角帮拷锟斤拷锟�
+                //Destroy(this.gameObject); // 如果已经存在实例,则销毁当前对象
                 return;
             }
             _ins = this;
-            //DontDestroyOnLoad(this.gameObject); // 锟斤拷证锟斤拷锟斤拷锟节筹拷锟斤拷锟叫伙拷时锟斤拷锟斤拷锟斤拷锟斤拷
+            //DontDestroyOnLoad(this.gameObject); // 保证对象在场景切换时不被销毁
 
-            //锟斤拷锟斤拷时锟斤拷锟绞硷拷锟揭伙拷锟阶刺�
+            //生成时候初始化一下状态
             if (ShootCheck.ins) ShootCheck.ins.bluetoothDeviceStatus = SmartBowSDK.BluetoothDeviceStatus.MagazineLoading;
         }
 
@@ -45,26 +45,26 @@ namespace HyperspaceGame
         {
             if (_ins == this)
             {
-                _ins = null; // 锟斤拷锟斤拷锟斤拷时锟酵放碉拷锟斤拷
+                _ins = null; // 在销毁时释放单例
             }
             GlobalEventCenter.ins.onSimulateMouseAwakeChanged -= UpdateHideShow;
         }
         // Start is called before the first frame update
         void Start()
         {
-            //锟截憋拷原锟斤拷准锟斤拷
+            //关闭原来准心
             SimulateMouseController.ins?.RemoveOpenLocker("NotGame");
 
             image = GeneratingTarget.gm.shootingEvent.GetComponent<Image>();
 
-            //b锟剿碉拷锟斤拷
+            //b端单人
             if (CommonConfig.StandaloneModeOrPlatformB) 
             {
                 _btnCrosshair.gameObject.SetActive(false);
                 _btnCalibrationOffset.gameObject.SetActive(false);
             } else {
 
-                //锟斤拷取锟斤拷锟斤拷值锟斤拷一锟斤拷锟芥储值
+                //获取设置值和一个存储值
                 bool onInitOpen = InfraredDemo._ins ? InfraredDemo._ins.bInitCrosshairShow() : true;
                 Image crossHairImage = _btnCrosshair.GetComponentInChildren<Image>();
                 crossHairImage.material = onInitOpen ? outlight : null;
@@ -73,7 +73,7 @@ namespace HyperspaceGame
                     AudioMgr.ins.PlayBtn();
                     bool onlyShow = !GetOnlyShow();
                     SetOnlyShow(onlyShow);
-                    //锟斤拷录准锟斤拷
+                    //记录准心
                     if (InfraredDemo._ins) InfraredDemo._ins.setCrosshairValue(onlyShow);
                     if (onlyShow)
                     {
@@ -107,8 +107,8 @@ namespace HyperspaceGame
             //CrossHairOutBoundChecker1 outBoundChecker = Instantiate(Resources.Load<GameObject>("Prefabs/CrossHairOutBoundChecker1")).GetComponent<CrossHairOutBoundChecker1>();
             //outBoundChecker.crossHair = transform as RectTransform;
 
-            //锟斤拷取准锟斤拷
-            if (InfraredDemo._ins) SetOnlyShow(InfraredDemo._ins.getCrosshairValue() == 1);
+            //读取准心
+            if (AimHandler.ins && !AimHandler.ins.bRuning9Axis() && InfraredDemo._ins) SetOnlyShow(InfraredDemo._ins.getCrosshairValue() == 1);
 
         }
 
@@ -127,7 +127,7 @@ namespace HyperspaceGame
         {
             //SceneManager.LoadScene("Home",LoadSceneMode.Single);
             GeneratingTarget.gm.onUploadScore();
-            //锟斤拷锟斤拷锟斤拷戏页锟斤拷
+            //结束游戏页面
             GeneratingTarget.gm.userGameAnalyse1.showResultView(() =>
             {
                 SceneManager.LoadScene("Home", LoadSceneMode.Single);
@@ -150,7 +150,7 @@ namespace HyperspaceGame
         {
             if (AutoResetView.ins != null)
             {
-                //锟斤拷锟斤拷校准时锟斤拷一锟斤拷锟斤拷示准锟斤拷
+                //进入校准时候,一定显示准心
                 SetVisiable(true);
             }
             else

+ 1 - 1
Assets/SmartBow/SmartBowSDK/BleWinHelper.cs

@@ -29,7 +29,7 @@ namespace SmartBowSDK_BleWinHelper
             if (bDebug)Debug.Log(LogTag + text);
         }
 
-        private string targetDeviceNameAxis = "Bbow_20210501 | ARTEMIS | HOUYI";
+        private string targetDeviceNameAxis = "Bbow_20210501 | ARTEMIS | HOUYI | HOUYI Pro | ARTEMIS Pro";
         private string targetDeviceName = "Bbow_20210501 | ARTEMIS Pro";
         private string targetDeviceNameHOUYIPro = "HOUYI Pro | Bbow_20210501";
         private string targetDeviceNameGun = "Pistol | Pistol M9 | Bbow_20210501";