添加控制是否显示双人游戏操作，更新模拟射击游戏

Assets/BowArrow/Scripts/Bluetooth/ShootCheck.cs

@@ -67,7 +67,7 @@ public class ShootCheck : MonoBehaviour
         //打印
         string logTxt = $"序号{id}，时区1：{time1}毫秒，时区2：{time2}毫秒，校验：{sumCheckRes}，弓轨速度：{speed}m/s，箭的速度：{shootSpeed}m/s";
         if (DebugForDevice.ins) DebugForDevice.ins.LogInfrared(logTxt);
-        Debug.Log(logTxt);
+        //Debug.Log(logTxt);
 
         if (SB_EventSystem.ins && SB_EventSystem.ins.simulateMouseIsAwaked) {
             SB_EventSystem.ins.ClickMouse();

Assets/BowArrow/Scripts/CommonConfig.cs

@@ -150,6 +150,11 @@ public class CommonConfig
     /// </summary>
     public static bool bInfraredURL { get; } = true;
 
+    /// <summary>
+    /// 是否显示双人游戏
+    /// </summary>
+    public static bool bDisplayTwoPlayerGames { get; } = false;
+
     #endregion
 
 

Assets/BowArrow/Scripts/View/Home/DeviceViewInfrared.cs

@@ -138,7 +138,7 @@ public class DeviceViewInfrared : JCUnityLib.ViewBase, MenuBackInterface
             }
             //if (!selectDeviceViewItem.bInfraredDevices())
             DeviceTypeHelper.DeviceType detectedType = DeviceTypeHelper.DetectDeviceType();
-            if (detectedType == DeviceTypeHelper.DeviceType.iPhone)
+            if (CommonConfig.bDisplayTwoPlayerGames && detectedType == DeviceTypeHelper.DeviceType.iPhone)
             {
                 //2p 按钮 ，两个同时蓝牙连接后。隐藏
                 if (deviceViewItems[1].gameObject.activeSelf || deviceViewItems[0].getBLEConnectState() && deviceViewItems[1].getBLEConnectState())
@@ -155,7 +155,7 @@ public class DeviceViewInfrared : JCUnityLib.ViewBase, MenuBackInterface
             }
             else
             {
-                //ipad暂时隐藏2p
+                //bDisplayTwoPlayerGames控制和ipad暂时隐藏2p
                 if (smartConnect2Buttons[3].gameObject.activeSelf)
                 {
                     smartConnect2Buttons[3].gameObject.SetActive(false);
@@ -165,10 +165,9 @@ public class DeviceViewInfrared : JCUnityLib.ViewBase, MenuBackInterface
     }
 
     void ShowDeviceViewItemsTwo(bool bShow) {
-
+        //显示第二个设备，如果第二个玩家，才走true这里
         if (bShow)
         {
-      
             if (!deviceViewItems[1].gameObject.activeSelf)
             {
                 deviceViewItems[1].gameObject.SetActive(true);
@@ -176,8 +175,6 @@ public class DeviceViewInfrared : JCUnityLib.ViewBase, MenuBackInterface
                 horizontalLayoutGroup.spacing = 40;
                 //显示2p时候。默认选择中
                 deviceViewItems[1].OnSelectEvent();
-
-              
             }
         }
         else
@@ -353,9 +350,8 @@ public class DeviceViewInfrared : JCUnityLib.ViewBase, MenuBackInterface
                     }
                     break;
                 case 3:
-                    //增加2p todo HOUYI Pro/ARTEMIS Pro时，先不能增加2P；（先隐藏，待后续增加2P后，再显示）
                     // if (!(BluetoothAim.ins && (BluetoothAim.ins.isMainConnectToInfraredDevice() || BluetoothAim.ins.isMainConnectToGun())))
-                    //if (BluetoothAim.ins)
+                    //目前枪不能增加2p
                     if (!(BluetoothAim.ins && BluetoothAim.ins.isMainConnectToGun()))
                     {
 

Assets/BowArrow/Scripts/View/Home/ModeSelectView.cs

@@ -47,7 +47,7 @@ public class ModeSelectView : JCUnityLib.ViewBase
                 DeviceTypeHelper.DeviceType detectedType = DeviceTypeHelper.DetectDeviceType();
                 if (detectedType == DeviceTypeHelper.DeviceType.iPhone) {
                     // 目前只有奥运射箭和塔防有双人模式，先显示奥运射箭
-                    if (isShowButton && allButtons.Count > 3)
+                    if (CommonConfig.bDisplayTwoPlayerGames && isShowButton && allButtons.Count > 3)
                     {
                         buttons.Add(allButtons[3]);
                         allButtons[3].gameObject.SetActive(true);

Assets/ShotSimulator/Languages/Tables/LanguagesTable_en.asset

@@ -306,7 +306,7 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 56704550268928
-    m_Localized: Track and destroy randomly moving targets.
+    m_Localized: Shoot the central target to spawn new targets in a radial pattern.
     m_Metadata:
       m_Items: []
   - m_Id: 56749253160960

Assets/ShotSimulator/Languages/Tables/LanguagesTable_zh-Hans.asset

@@ -300,7 +300,7 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 56704550268928
-    m_Localized: "\u7403\u4F53\u4F1A\u4E0D\u65AD\u751F\u6210\u5E76\u968F\u5373\u79FB\u52A8\uFF0C\u5C3D\u53EF\u80FD\u591A\u5730\u8FFD\u8E2A\u76F4\u5230\u6D88\u706D\u8FD9\u4E9B\u7403\u4F53"
+    m_Localized: "\u5C04\u51FB\u4E2D\u592E\u9759\u6001\u76EE\u6807\uFF0C\u4E0B\u4E00\u4E2A\u9759\u6001\u76EE\u6807\u5C06\u5728\u8718\u86DB\u5F62\u56FE\u6848\u7684\u968F\u673A\u4F4D\u7F6E\u51FA\u73B0"
     m_Metadata:
       m_Items: []
   - m_Id: 56749253160960

Assets/ShotSimulator/Resources/Prefabs/UI/RankingUIView.prefab

@@ -330,83 +330,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &276328058673142662
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5038636090843368012}
-  - component: {fileID: 387981647585196993}
-  - component: {fileID: 1785274920249661354}
-  m_Layer: 5
-  m_Name: Background
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5038636090843368012
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 276328058673142662}
-  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:
-  - {fileID: 4307318072876835426}
-  m_Father: {fileID: 8189019485731503011}
-  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 &387981647585196993
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 276328058673142662}
-  m_CullTransparentMesh: 1
---- !u!114 &1785274920249661354
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 276328058673142662}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 3eefd36449fb56748b5f061fb5ae4277, type: 3}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &315584747623911686
 GameObject:
   m_ObjectHideFlags: 0
@@ -5748,127 +5671,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &2861314539460464356
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6191197444213777031}
-  - component: {fileID: 6981106488325585163}
-  - component: {fileID: 2187094729790896455}
-  - component: {fileID: 4982529606322611081}
-  m_Layer: 5
-  m_Name: Label
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &6191197444213777031
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2861314539460464356}
-  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: 8189019485731503011}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 67.5, y: 0}
-  m_SizeDelta: {x: -135, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6981106488325585163
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2861314539460464356}
-  m_CullTransparentMesh: 1
---- !u!114 &2187094729790896455
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2861314539460464356}
-  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: 1, g: 1, b: 1, a: 1}
-  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: 30
-    m_FontStyle: 1
-    m_BestFit: 0
-    m_MinSize: 3
-    m_MaxSize: 40
-    m_Alignment: 3
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: ARTEMIS Pro
---- !u!114 &4982529606322611081
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2861314539460464356}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_StringReference:
-    m_TableReference:
-      m_TableCollectionName: GUID:70c061568e128ba4eb5e3b74511068c0
-    m_TableEntryReference:
-      m_KeyId: 44751857610752
-      m_Key: 
-    m_FallbackState: 0
-    m_WaitForCompletion: 0
-    m_LocalVariables: []
-  m_FormatArguments: []
-  m_UpdateString:
-    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 2187094729790896455}
-        m_TargetAssemblyTypeName: UnityEngine.UI.Text, UnityEngine.UI
-        m_MethodName: set_text
-        m_Mode: 0
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: 
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 1
-  references:
-    version: 2
-    RefIds: []
 --- !u!1 &2870540054804117602
 GameObject:
   m_ObjectHideFlags: 0
@@ -10843,82 +10645,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &5875812631968533558
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4307318072876835426}
-  - component: {fileID: 6759969171040896725}
-  - component: {fileID: 2477965779888784419}
-  m_Layer: 5
-  m_Name: Checkmark
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &4307318072876835426
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5875812631968533558}
-  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: 5038636090843368012}
-  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 &6759969171040896725
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5875812631968533558}
-  m_CullTransparentMesh: 1
---- !u!114 &2477965779888784419
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5875812631968533558}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 02c18d746675b8c45b8951b095023b9c, type: 3}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &5960059546587450411
 GameObject:
   m_ObjectHideFlags: 0
@@ -13055,7 +12781,6 @@ RectTransform:
   - {fileID: 2152631345189499090}
   - {fileID: 4464580527211062941}
   - {fileID: 7658123381904879668}
-  - {fileID: 8189019485731503011}
   m_Father: {fileID: 1478756757311543018}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -13155,107 +12880,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: -65.000015}
   m_SizeDelta: {x: 0, y: -130}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &7325424849737207992
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8189019485731503011}
-  - component: {fileID: 7879611726907043357}
-  - component: {fileID: 5068858094553531103}
-  m_Layer: 5
-  m_Name: ArtemisProToggle
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &8189019485731503011
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7325424849737207992}
-  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:
-  - {fileID: 5038636090843368012}
-  - {fileID: 6191197444213777031}
-  m_Father: {fileID: 2358946910344572658}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 463.39996, y: -415.85}
-  m_SizeDelta: {x: 926.7999, y: 115}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &7879611726907043357
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7325424849737207992}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, 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: 1785274920249661354}
-  toggleTransition: 1
-  graphic: {fileID: 2477965779888784419}
-  m_Group: {fileID: 311096403598904007}
-  onValueChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_IsOn: 0
---- !u!114 &5068858094553531103
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7325424849737207992}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1a44253df6d29a94eb443c22cab20b3a, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_DeviceType: 3
 --- !u!1 &7340589744373654346
 GameObject:
   m_ObjectHideFlags: 0
@@ -14727,7 +14351,6 @@ MonoBehaviour:
   - {fileID: 4068997804449542237}
   - {fileID: 296381558466665564}
   - {fileID: 7739482532673106268}
-  - {fileID: 7879611726907043357}
   deviceTypeTypeText: {fileID: 6289812141697355312}
 --- !u!1 &7888651776947128473
 GameObject:
@@ -17294,7 +16917,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3569404450985183948
 RectTransform:
   m_ObjectHideFlags: 0

Assets/ShotSimulator/Scripts/ShotSimulatorEnum.cs

@@ -125,6 +125,5 @@ namespace ShotSimulator
         M9 = 0,
         M17 = 1,
         M416 = 2,
-        ArtemisPro = 3,
     }
 }

Assets/ShotSimulator/Scripts/UI/Train/Rank/RankingUIView.cs

@@ -244,18 +244,25 @@ namespace ShotSimulator.UI
                 Destroy(child.gameObject);
             }
             selfRankingItem.Reset();
+            selfRankingItem.gameObject.SetActive(false);
             if (datas != null)
             {
                 for (int i = 0; i < datas.Count; i++)
                 {
-                    GameObject obj = Instantiate<GameObject>(Resources.Load<GameObject>("Prefabs/UI/Ranking/RankingItem"));
-                    RankingItem item = obj.GetComponent<RankingItem>();
-                    item.transform.SetParent(rankViewContent, false);
-                    item.SetRankData(datas[i]);
                     if (datas[i].isSelf)
                     {
+                        selfRankingItem.gameObject.SetActive(true);
                         selfRankingItem.SetRankData(datas[i]);
+                        if (datas[i].rank > 4)
+                        {
+                            continue;
+                        }
                     }
+                    GameObject obj = Instantiate<GameObject>(Resources.Load<GameObject>("Prefabs/UI/Ranking/RankingItem"));
+                    RankingItem item = obj.GetComponent<RankingItem>();
+                    item.transform.SetParent(rankViewContent, false);
+                    item.SetRankData(datas[i]);
+
                 }
             }
         }

Assets/ShotSimulator/Scripts/UI/Train/TrainSettlementUIView.cs

@@ -231,19 +231,24 @@ namespace ShotSimulator.UI
                 Destroy(child.gameObject);
             }
             selfRankingItem.Reset();
-
+            selfRankingItem.gameObject.SetActive(false);
             if (datas != null)
             {
                 for (int i = 0; i < datas.Count; i++)
                 {
-                    GameObject obj = Instantiate<GameObject>(Resources.Load<GameObject>("Prefabs/UI/Ranking/SettlementRankingItem"));
-                    RankingItem item = obj.GetComponent<RankingItem>();
-                    item.transform.SetParent(rankViewContent, false);
-                    item.SetRankData(datas[i]);
                     if (datas[i].isSelf)
                     {
+                        selfRankingItem.gameObject.SetActive(true);
                         selfRankingItem.SetRankData(datas[i]);
+                        if (datas[i].rank > 4)
+                        {
+                            continue;
+                        }
                     }
+                    GameObject obj = Instantiate<GameObject>(Resources.Load<GameObject>("Prefabs/UI/Ranking/SettlementRankingItem"));
+                    RankingItem item = obj.GetComponent<RankingItem>();
+                    item.transform.SetParent(rankViewContent, false);
+                    item.SetRankData(datas[i]);
                 }
             }
         }

Assets/ShotSimulator/_Barking_Dog/敌潮射击/护盾碎裂/护盾碎裂.anim

@@ -73,6 +73,34 @@ AnimationClip:
     path: 
     classID: 137
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.41666666
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Enabled
+    path: 
+    classID: 137
+    script: {fileID: 0}
   m_PPtrCurves: []
   m_SampleRate: 60
   m_WrapMode: 0
@@ -95,6 +123,13 @@ AnimationClip:
       typeID: 137
       customType: 22
       isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 3305885265
+      script: {fileID: 0}
+      typeID: 137
+      customType: 0
+      isPPtrCurve: 0
     pptrCurveMapping: []
   m_AnimationClipSettings:
     serializedVersion: 2
@@ -173,6 +208,34 @@ AnimationClip:
     path: 
     classID: 137
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.41666666
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Enabled
+    path: 
+    classID: 137
+    script: {fileID: 0}
   m_EulerEditorCurves: []
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0

ProjectSettings/ProjectSettings.asset

@@ -137,7 +137,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 2.1.4
+  bundleVersion: 2.1.5
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0