Bläddra i källkod

调整部分ui大小等问题

slambb 1 år sedan
förälder
incheckning
5419784136
21 ändrade filer med 805 tillägg och 108 borttagningar
  1. 15 15
      Assets/BowArrow/Modules/InfraredGuider/InfraredLightGuider2.prefab
  2. 1 1
      Assets/BowArrow/Resources/Textures/GameIcon/Prefabs/Views/Home/HomeView.prefab
  3. 15 0
      Assets/BowArrow/Scenes/Game.unity
  4. 8 8
      Assets/BowArrow/Scripts/Components/TextAutoLanguage2/Resources/TextAutoLanguage2/cn.json
  5. 4 4
      Assets/BowArrow/Scripts/Components/TextAutoLanguage2/Resources/TextAutoLanguage2/en.json
  6. 21 2
      Assets/BowArrow/Scripts/Game/GameAssistUI.cs
  7. 1 1
      Assets/BowArrow/Scripts/Manager/TextureMgr.cs
  8. 51 0
      Assets/BowArrow/Scripts/Util/SwitchCrossHair.cs
  9. 11 0
      Assets/BowArrow/Scripts/Util/SwitchCrossHair.cs.meta
  10. 15 0
      Assets/DuckHunter/Scenes/DuckHunter.unity
  11. 16 0
      Assets/FruitMaster/Scenes/FruitMaster.unity
  12. 87 10
      Assets/Game_Hyperspace/Hyperspace FX/Demo/Scenes/Hyperspace01.unity
  13. 88 11
      Assets/Game_Hyperspace/Hyperspace FX/Demo/Scenes/Hyperspace02.unity
  14. 88 11
      Assets/Game_Hyperspace/Hyperspace FX/Demo/Scenes/Hyperspace03.unity
  15. 1 1
      Assets/Game_Hyperspace/Script/GeneratingTarget.cs
  16. 11 11
      Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/InfraredScreenPositioningView.prefab
  17. 189 13
      Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/InfraredView.prefab
  18. 18 0
      Assets/SmartBow/Scripts/Views/InfraredViewParts/InfraredGuidanceView.cs
  19. 42 20
      Assets/SmartBow/Scripts/Views/InfraredViewParts/InfraredScreenPositioningView.cs
  20. BIN
      Assets/SmartBow/Textures/Guidance/Infrared/warning.png
  21. 123 0
      Assets/SmartBow/Textures/Guidance/Infrared/warning.png.meta

+ 15 - 15
Assets/BowArrow/Modules/InfraredGuider/InfraredLightGuider2.prefab

@@ -234,11 +234,11 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 3597647526147557788}
   m_FillRect: {fileID: 1235459866155883419}
   m_HandleRect: {fileID: 5546502235475850231}
-  m_Direction: 0
+  m_Direction: 1
   m_MinValue: -20
   m_MaxValue: 20
   m_WholeNumbers: 0
-  m_Value: 20
+  m_Value: 0.1
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -353,9 +353,9 @@ RectTransform:
   m_Father: {fileID: 3835120308163295950}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 1007, y: -82}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -189, y: -82}
   m_SizeDelta: {x: 1400, y: 480}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1824978958162942895
@@ -394,7 +394,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1000, y: 30}
+  m_SizeDelta: {x: 1200, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6088866626511230700
 CanvasRenderer:
@@ -411,7 +411,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1824978958162942895}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
@@ -666,7 +666,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1000, y: 30}
+  m_SizeDelta: {x: 1200, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2665963947307189207
 CanvasRenderer:
@@ -683,7 +683,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2099194137982326216}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
@@ -1658,9 +1658,9 @@ RectTransform:
   m_Father: {fileID: 3835120308163295950}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -1010, y: -82}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 189, y: -82}
   m_SizeDelta: {x: 1400, y: 480}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &4032870592230521222
@@ -1697,7 +1697,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.25}
   m_AnchorMax: {x: 1, y: 0.75}
-  m_AnchoredPosition: {x: -5, y: 0}
+  m_AnchoredPosition: {x: 5, y: 0}
   m_SizeDelta: {x: -20, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &4604881960620407814
@@ -2800,7 +2800,7 @@ RectTransform:
   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: 0, y: -187}
+  m_AnchoredPosition: {x: -37, y: 111}
   m_SizeDelta: {x: 1301.4, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &6041000795566327750
@@ -2866,7 +2866,7 @@ RectTransform:
   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: 0, y: 192}
+  m_AnchoredPosition: {x: -37, y: 112}
   m_SizeDelta: {x: 1301.4, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &7210086039866210060

+ 1 - 1
Assets/BowArrow/Resources/Textures/GameIcon/Prefabs/Views/Home/HomeView.prefab

@@ -8958,7 +8958,7 @@ MonoBehaviour:
     textId: FruitExpert
     languageType: 1
     startGameType: 15
-  - Name: "\u79FB\u52A8\u76EE\u6807"
+  - Name: "\u79FB\u52A8\u9776"
     Icon: {fileID: 21300000, guid: 4e11c7f54d1a161498596f36f8168f5b, type: 3}
     textId: MovingTarget
     languageType: 2

+ 15 - 0
Assets/BowArrow/Scenes/Game.unity

@@ -11999,6 +11999,7 @@ GameObject:
   - component: {fileID: 1088742833}
   - component: {fileID: 1088742836}
   - component: {fileID: 1088742835}
+  - component: {fileID: 1088742837}
   - component: {fileID: 1088742834}
   m_Layer: 5
   m_Name: CrossHair
@@ -12077,6 +12078,20 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1088742832}
   m_CullTransparentMesh: 0
+--- !u!114 &1088742837
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1088742832}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3731034ce1a974145b368df4817bbf0e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetImageSize: {x: 98, y: 98}
+  crossHairSprite: {fileID: 21300000, guid: 225abf6d1663b6941a1ed18ecc63babf, type: 3}
 --- !u!1 &1094424208
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -351,7 +351,7 @@
   "WolfHunt": "猎狼",
 
   "======MovingTarget======": "注释",
-  "MovingTarget": "移动目标",
+  "MovingTarget": "移动",
 
   /**
   homeView tip 页面
@@ -531,13 +531,13 @@
   "Infrared-Step1": "先进行投屏,并将激光定位器放置于电视前方,使摄像头上仰朝向屏幕。",
   "Infrared-Step2_title": "屏幕定位说明",
   "Infrared-Step2": "",
-  "Infrared-new-Step1": "1.请将手机画面投射到电视或投影仪上(建议使用投屏器)",
-  "Infrared-new-Step2": "2.请将激光定位器放在电视前下方,确保其底部低于电视屏幕",
-  "Infrared-new-Step3": "3.避免强光或阳光直射电视/投影屏幕和激光定位器",
+  "Infrared-new-Step1": "1.请将手机画面投射到电视或投影仪上(建议使用投屏器)",
+  "Infrared-new-Step2": "2.请将激光定位器放在电视前下方,确保其底部低于电视屏幕",
+  "Infrared-new-Step3": "3.避免强光或阳光直射电视/投影屏幕和激光定位器",
   /**
   手动识别部分
   **/
-  "TitleTip1": "调整激光定位器的角度,\n使摄像头拍摄到整个电视屏幕并位于梯形识别框内。",
+  "TitleTip1": "调整激光定位器的角度和位置,\n使摄像头可以完整地拍摄到整个电视屏幕",
   "TitleTip2": "如自动识别不准确,可调整激光定位器或调整图像对比度,使屏幕\n边缘更清晰后,再次自动识别;\n如多次自动识别不成功,可点击手动功能,并用手指拖动定位区域\n四个角进行调整,点击确认进入下一步。",
   "Withdrawal": "撤回",
   "Automatic": "自动",
@@ -549,12 +549,12 @@
   "TitleTipMarker": "使用{0}的红外激光瞄准屏幕的四个角,\n并单击准心键确认标记。待四个角都标记完成后,点击完成进入下一步",
   "TitleTipMarker-HOUYIPro": "HOUYI Pro瞄准模块",
   "TitleTipMarker-ArtemisPro": "Artemis Pro",
-  "TitleTipMarker-M9": "M9手枪",
+  "TitleTipMarker-M9": "操作M9手枪依次瞄准屏幕的四个角\n扣动扳机进行标记(四角位置标签)",
   "ScreenPositioningSuccessful-title": "屏幕定位成功,请选择最佳方案",
   "FirstResult": "结果一",
   "SecondResult": "结果二",
-  "FirstLineTip": "提示:这是根据AI自动识别出来的结果",
-  "SecondLineTip": "提示:这是根据手动标签半自动识别出来的结果二",
+  "FirstLineTip": "AI自动识别的结果",
+  "SecondLineTip": "通过四角位置标签,半自动识别的结果",
   "FittingFailed": "拟合失败,继续点击完成.",
   "Incomplete": "请完成屏幕四个角的标记后,再点击完成进入下一步",
   /**

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

@@ -587,7 +587,7 @@
   /**
   手动识别部分
   **/
-  "TitleTip1": "Adjust the angle of the laser locator so that the entire TV screen \nis captured by the camera and is within the trapezoidal recognition frame.",
+  "TitleTip1": "Adjust the angle and position of the laser locator so \nthat the camera can capture the entire TV screen completely",
   "TitleTip2": "If the automatic recognition is not accurate, you can adjust the laser locator or adjust the \nimage contrast to make the screen edge clearer and then automatically recognize it again; \n If automatic recognition fails multiple times, click the manual function and drag the four \ncorners of the positioning area with your finger to adjust. Click OK to proceed to the next step. ",
   "Withdrawal": "Withdrawal",
   "Automatic": "Automatic",
@@ -599,12 +599,12 @@
   "TitleTipMarker": "Aim the infrared laser of {0} at the four corners of the screen, \nand click the reticle button to confirm each mark. Once all four corners are marked, click 'Finish' to proceed to the next step.",
   "TitleTipMarker-HOUYIPro": "HOUYI Pro Aiming Module",
   "TitleTipMarker-ArtemisPro": "Artemis Pro",
-  "TitleTipMarker-M9": "M9 Pistol",
+  "TitleTipMarker-M9": "Operate M9 pistol to aim at the four corners of the screen \nin sequence, pull the trigger to mark (four corner position label)",
   "ScreenPositioningSuccessful-title": "Screen positioning successful, please choose the best solution",
   "FirstResult": "First Result",
   "SecondResult": "Second Result",
-  "FirstLineTip": "Tip: This is the result automatically recognized by AI",
-  "SecondLineTip": "Tip: This is the result of semi-automatic recognition based on manual labeling",
+  "FirstLineTip": "The result of AI automatic recognition",
+  "SecondLineTip": "The result of semi-automatic recognition through four corner position labels",
   "FittingFailed": "Fitting failed, continue clicking to complete.",
   "Incomplete": "Please mark the four corners of the screen before clicking 'Finish' to proceed to the next step",
   /**

+ 21 - 2
Assets/BowArrow/Scripts/Game/GameAssistUI.cs

@@ -317,8 +317,27 @@ public class GameAssistUI : MonoBehaviour
         BowCamera bowCamera = BowCamera.ins;
         Transform scope = bowCamera.transform.Find("Scope");
 
-        CrossHair.ins.gameObject.GetComponent<RectTransform>().sizeDelta =  
-            open ? new Vector2(500, 500) : new Vector2(260, 260);
+        if (open)
+        {
+            if (GlobalData.MyDeviceMode == DeviceMode.Gun)
+                CrossHair.ins.gameObject.GetComponent<SwitchCrossHair>().ShowOldImage(true);
+
+            CrossHair.ins.gameObject.GetComponent<RectTransform>().sizeDelta = new Vector2(500, 500);
+        }
+        else {
+            if (GlobalData.MyDeviceMode == DeviceMode.Gun)
+            {
+                SwitchCrossHair switchCrossHair = CrossHair.ins.gameObject.GetComponent<SwitchCrossHair>();
+                switchCrossHair.ShowOldImage(false);
+                CrossHair.ins.gameObject.GetComponent<RectTransform>().sizeDelta = switchCrossHair.targetImageSize;
+            }
+            else {
+                CrossHair.ins.gameObject.GetComponent<RectTransform>().sizeDelta = new Vector2(260, 260);
+            }
+
+        }
+   
+
         if (open) CrossHair.ins.transform.localPosition = Vector3.zero;
 
         bowCamera.banCameraFieldOfView = open;

+ 1 - 1
Assets/BowArrow/Scripts/Manager/TextureMgr.cs

@@ -166,7 +166,7 @@ public class TextureMgr
         {13, ("野鸭关卡 (单人)", "LevelDuckHunter","LevelDuckHunter", "duck_level", 1) },
         {14, ("荒野射击 (单人)", "LevelWildAttack","LevelWildAttack", "wild_level", 1) },
         {15, ("水果达人 (单人)", "FruitExpert","FruitExpert", "FruitExpert", 1) },
-        {16, ("移动目标 (单人)", "MovingTarget","MovingTarget", "movingTarget_level", 2) },
+        {16, ("移动 (单人)", "MovingTarget","MovingTarget", "movingTarget_level", 2) },
     };
 
         foreach (var gameEntry in gameData)

+ 51 - 0
Assets/BowArrow/Scripts/Util/SwitchCrossHair.cs

@@ -0,0 +1,51 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+/// <summary>
+/// 这里用于替换准心
+/// </summary>
+public class SwitchCrossHair : MonoBehaviour
+{
+
+    Image targetImage;
+    public Vector2 targetImageSize = new Vector2(98,98);
+    public Sprite crossHairSprite;
+    Sprite oldImageSprite;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        targetImage = GetComponent<Image>();
+        oldImageSprite = targetImage.sprite;
+        if (GlobalData.MyDeviceMode == DeviceMode.Gun)
+        {
+            targetImage.sprite = crossHairSprite;
+            targetImage.rectTransform.sizeDelta = targetImageSize; // 设置 targetImage 的大小
+        }
+    }
+    /// <summary>
+    /// 切换image
+    /// </summary>
+    /// <param name="isOldImage"></param>
+    public void ShowOldImage(bool isOldImage) {
+        if (GlobalData.MyDeviceMode == DeviceMode.Gun)
+        {
+            if (isOldImage)
+            {
+                targetImage.sprite = oldImageSprite;
+            }
+            else
+            {
+                targetImage.sprite = crossHairSprite;
+            }
+        }
+    }
+
+    // Update is called once per frame
+    //void Update()
+    //{
+        
+    //}
+}

+ 11 - 0
Assets/BowArrow/Scripts/Util/SwitchCrossHair.cs.meta

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

+ 15 - 0
Assets/DuckHunter/Scenes/DuckHunter.unity

@@ -8527,6 +8527,7 @@ GameObject:
   - component: {fileID: 2091624734}
   - component: {fileID: 2091624736}
   - component: {fileID: 2091624735}
+  - component: {fileID: 2091624737}
   m_Layer: 5
   m_Name: Image
   m_TagString: Untagged
@@ -8592,6 +8593,20 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2091624733}
   m_CullTransparentMesh: 1
+--- !u!114 &2091624737
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2091624733}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3731034ce1a974145b368df4817bbf0e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetImageSize: {x: 98, y: 98}
+  crossHairSprite: {fileID: 21300000, guid: 225abf6d1663b6941a1ed18ecc63babf, type: 3}
 --- !u!1 &2117762102
 GameObject:
   m_ObjectHideFlags: 0

+ 16 - 0
Assets/FruitMaster/Scenes/FruitMaster.unity

@@ -19123,6 +19123,7 @@ GameObject:
   - component: {fileID: 1086173406}
   - component: {fileID: 1086173408}
   - component: {fileID: 1086173407}
+  - component: {fileID: 1086173409}
   m_Layer: 5
   m_Name: AimingCross
   m_TagString: Untagged
@@ -19188,6 +19189,20 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1086173405}
   m_CullTransparentMesh: 1
+--- !u!114 &1086173409
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1086173405}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3731034ce1a974145b368df4817bbf0e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetImageSize: {x: 98, y: 98}
+  crossHairSprite: {fileID: 21300000, guid: 225abf6d1663b6941a1ed18ecc63babf, type: 3}
 --- !u!1001 &1089271499
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -37839,6 +37854,7 @@ MonoBehaviour:
   languageFontSizes:
   - language: 1
     fontSize: 18
+    lineSpacing: 0
 --- !u!114 &2113727363
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 87 - 10
Assets/Game_Hyperspace/Hyperspace FX/Demo/Scenes/Hyperspace01.unity

@@ -1025,9 +1025,10 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 1622572986}
   m_Father: {fileID: 371264548}
-  m_RootOrder: 10
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1041,7 +1042,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 282576771}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
@@ -1456,10 +1457,10 @@ RectTransform:
   - {fileID: 91511993}
   - {fileID: 1569514123}
   - {fileID: 1040987483}
+  - {fileID: 282576772}
   - {fileID: 2092755633}
   - {fileID: 1818548470}
   - {fileID: 1372942026}
-  - {fileID: 282576772}
   m_Father: {fileID: 0}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -6285,7 +6286,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4473625673578586432, guid: 27b00cc8f3141df4aaaf1d6eb1b82add, type: 3}
       propertyPath: m_RootOrder
-      value: 9
+      value: 10
       objectReference: {fileID: 0}
     - target: {fileID: 4473625673578586432, guid: 27b00cc8f3141df4aaaf1d6eb1b82add, type: 3}
       propertyPath: m_AnchorMax.x
@@ -7390,6 +7391,82 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1570026377}
   m_CullTransparentMesh: 1
+--- !u!1 &1622572985
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1622572986}
+  - component: {fileID: 1622572988}
+  - component: {fileID: 1622572987}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1622572986
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1622572985}
+  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: 282576772}
+  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: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1622572987
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1622572985}
+  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: b8b605b3d5b2fb54a9a173dd75ee7ffc, type: 3}
+  m_Type: 0
+  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!222 &1622572988
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1622572985}
+  m_CullTransparentMesh: 1
 --- !u!1001 &1624869436
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -8109,7 +8186,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4473625673578586432, guid: 27b00cc8f3141df4aaaf1d6eb1b82add, type: 3}
       propertyPath: m_RootOrder
-      value: 8
+      value: 9
       objectReference: {fileID: 0}
     - target: {fileID: 4473625673578586432, guid: 27b00cc8f3141df4aaaf1d6eb1b82add, type: 3}
       propertyPath: m_AnchorMax.x
@@ -14277,16 +14354,16 @@ RectTransform:
   m_GameObject: {fileID: 2092755632}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.59341, y: 0.59341, z: 0.59341}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 371264548}
-  m_RootOrder: 7
+  m_RootOrder: 8
   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: 1, y: -2}
-  m_SizeDelta: {x: 351, y: 351}
+  m_SizeDelta: {x: 97, y: 98}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2092755635
 MonoBehaviour:
@@ -14308,7 +14385,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: ab47887ad02ad5544a613a4582e0149f, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 225abf6d1663b6941a1ed18ecc63babf, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

+ 88 - 11
Assets/Game_Hyperspace/Hyperspace FX/Demo/Scenes/Hyperspace02.unity

@@ -1025,9 +1025,10 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 2101480120}
   m_Father: {fileID: 371264548}
-  m_RootOrder: 10
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1041,7 +1042,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 282576771}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
@@ -1456,10 +1457,10 @@ RectTransform:
   - {fileID: 91511993}
   - {fileID: 1569514123}
   - {fileID: 1040987483}
+  - {fileID: 282576772}
   - {fileID: 2092755633}
   - {fileID: 1818548470}
   - {fileID: 1372942026}
-  - {fileID: 282576772}
   m_Father: {fileID: 0}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -6285,7 +6286,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4473625673578586432, guid: 27b00cc8f3141df4aaaf1d6eb1b82add, type: 3}
       propertyPath: m_RootOrder
-      value: 9
+      value: 10
       objectReference: {fileID: 0}
     - target: {fileID: 4473625673578586432, guid: 27b00cc8f3141df4aaaf1d6eb1b82add, type: 3}
       propertyPath: m_AnchorMax.x
@@ -8109,7 +8110,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4473625673578586432, guid: 27b00cc8f3141df4aaaf1d6eb1b82add, type: 3}
       propertyPath: m_RootOrder
-      value: 8
+      value: 9
       objectReference: {fileID: 0}
     - target: {fileID: 4473625673578586432, guid: 27b00cc8f3141df4aaaf1d6eb1b82add, type: 3}
       propertyPath: m_AnchorMax.x
@@ -14277,16 +14278,16 @@ RectTransform:
   m_GameObject: {fileID: 2092755632}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.59341, y: 0.59341, z: 0.59341}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 371264548}
-  m_RootOrder: 7
+  m_RootOrder: 8
   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: 1, y: -2}
-  m_SizeDelta: {x: 351, y: 351}
+  m_SizeDelta: {x: 97, y: 98}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2092755635
 MonoBehaviour:
@@ -14308,7 +14309,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: ab47887ad02ad5544a613a4582e0149f, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 225abf6d1663b6941a1ed18ecc63babf, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -14340,3 +14341,79 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   aimTransform: {fileID: 1819539335}
   limitAimInScrren: 0
+--- !u!1 &2101480119
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2101480120}
+  - component: {fileID: 2101480122}
+  - component: {fileID: 2101480121}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2101480120
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2101480119}
+  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: 282576772}
+  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: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &2101480121
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2101480119}
+  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: b8b605b3d5b2fb54a9a173dd75ee7ffc, type: 3}
+  m_Type: 0
+  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!222 &2101480122
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2101480119}
+  m_CullTransparentMesh: 1

+ 88 - 11
Assets/Game_Hyperspace/Hyperspace FX/Demo/Scenes/Hyperspace03.unity

@@ -1025,9 +1025,10 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 2079620712}
   m_Father: {fileID: 371264548}
-  m_RootOrder: 10
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1041,7 +1042,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 282576771}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
@@ -1456,10 +1457,10 @@ RectTransform:
   - {fileID: 91511993}
   - {fileID: 1569514123}
   - {fileID: 1040987483}
+  - {fileID: 282576772}
   - {fileID: 2092755633}
   - {fileID: 1818548470}
   - {fileID: 1372942026}
-  - {fileID: 282576772}
   m_Father: {fileID: 0}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -6285,7 +6286,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4473625673578586432, guid: 27b00cc8f3141df4aaaf1d6eb1b82add, type: 3}
       propertyPath: m_RootOrder
-      value: 9
+      value: 10
       objectReference: {fileID: 0}
     - target: {fileID: 4473625673578586432, guid: 27b00cc8f3141df4aaaf1d6eb1b82add, type: 3}
       propertyPath: m_AnchorMax.x
@@ -8109,7 +8110,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4473625673578586432, guid: 27b00cc8f3141df4aaaf1d6eb1b82add, type: 3}
       propertyPath: m_RootOrder
-      value: 8
+      value: 9
       objectReference: {fileID: 0}
     - target: {fileID: 4473625673578586432, guid: 27b00cc8f3141df4aaaf1d6eb1b82add, type: 3}
       propertyPath: m_AnchorMax.x
@@ -14113,6 +14114,82 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2021025441}
   m_CullTransparentMesh: 1
+--- !u!1 &2079620711
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2079620712}
+  - component: {fileID: 2079620714}
+  - component: {fileID: 2079620713}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2079620712
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2079620711}
+  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: 282576772}
+  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: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &2079620713
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2079620711}
+  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: b8b605b3d5b2fb54a9a173dd75ee7ffc, type: 3}
+  m_Type: 0
+  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!222 &2079620714
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2079620711}
+  m_CullTransparentMesh: 1
 --- !u!1 &2091816789
 GameObject:
   m_ObjectHideFlags: 0
@@ -14277,16 +14354,16 @@ RectTransform:
   m_GameObject: {fileID: 2092755632}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.59341, y: 0.59341, z: 0.59341}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 371264548}
-  m_RootOrder: 7
+  m_RootOrder: 8
   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: 1, y: -2}
-  m_SizeDelta: {x: 351, y: 351}
+  m_SizeDelta: {x: 97, y: 98}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2092755635
 MonoBehaviour:
@@ -14308,7 +14385,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: ab47887ad02ad5544a613a4582e0149f, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 225abf6d1663b6941a1ed18ecc63babf, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

+ 1 - 1
Assets/Game_Hyperspace/Script/GeneratingTarget.cs

@@ -542,7 +542,7 @@ public class GeneratingTarget : MonoBehaviour
     {
         if (stop)
             return;
-        var go = GameObject.Instantiate(Miss, position, Quaternion.identity, _canvasRectTransform);
+        var go = GameObject.Instantiate(Miss, position, Quaternion.identity, tp);//_canvasRectTransform
         go.AddComponent<CountDown>();
         go.SetActive(true);
     }

+ 11 - 11
Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/InfraredScreenPositioningView.prefab

@@ -1055,7 +1055,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 551.5333, y: -832}
+  m_AnchoredPosition: {x: 551.5333, y: -688}
   m_SizeDelta: {x: 1103.067, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3853685311607373227
@@ -1099,7 +1099,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: "\u63D0\u793A\uFF1A\u8FD9\u662F\u6839\u636E\u624B\u52A8\u6807\u7B7E\u534A\u81EA\u52A8\u8BC6\u522B\u51FA\u6765\u7684\u7ED3\u679C\u4E8C"
+  m_Text: "\u901A\u8FC7\u56DB\u89D2\u4F4D\u7F6E\u6807\u7B7E\uFF0C\u534A\u81EA\u52A8\u8BC6\u522B\u7684\u7ED3\u679C"
 --- !u!114 &3949695551961607894
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3858,7 +3858,7 @@ RectTransform:
   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: 100}
+  m_AnchoredPosition: {x: 0, y: 200}
   m_SizeDelta: {x: 1620, y: 160}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3752089122991403622
@@ -4065,7 +4065,7 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 1
-  m_Spacing: 27
+  m_Spacing: 50
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0
@@ -7659,7 +7659,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5110610357574040295
 RectTransform:
   m_ObjectHideFlags: 0
@@ -8106,7 +8106,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 551.5333, y: -832}
+  m_AnchoredPosition: {x: 551.5333, y: -688}
   m_SizeDelta: {x: 1103.067, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4507996942320382261
@@ -8150,7 +8150,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: "\u63D0\u793A\uFF1A\u8FD9\u662F\u6839\u636EAI\u81EA\u52A8\u8BC6\u522B\u51FA\u6765\u7684\u7ED3\u679C\u4E00"
+  m_Text: "AI\u81EA\u52A8\u8BC6\u522B\u7684\u7ED3\u679C"
 --- !u!114 &5982047643137971629
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -8184,7 +8184,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1649808020118721579
 RectTransform:
   m_ObjectHideFlags: 0
@@ -8462,7 +8462,7 @@ RectTransform:
   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: 100}
+  m_AnchoredPosition: {x: 0, y: 200}
   m_SizeDelta: {x: 1620, y: 136}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4349862695064073692
@@ -9109,7 +9109,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1.2
-  m_Text: "\u8C03\u6574\u6FC0\u5149\u5B9A\u4F4D\u5668\u7684\u89D2\u5EA6\uFF0C\n\u4F7F\u6444\u50CF\u5934\u62CD\u6444\u5230\u7684\u6574\u4E2A\u7535\u89C6\u5C4F\u5E55\u5E76\u4F4D\u4E8E\u68AF\u5F62\u8BC6\u522B\u6846\u5185\u3002"
+  m_Text: "\u8C03\u6574\u6FC0\u5149\u5B9A\u4F4D\u5668\u7684\u89D2\u5EA6\u548C\u4F4D\u7F6E\uFF0C\n\u4F7F\u6444\u50CF\u5934\u53EF\u4EE5\u5B8C\u6574\u5730\u62CD\u6444\u5230\u6574\u4E2A\u7535\u89C6\u5C4F\u5E55"
 --- !u!114 &4744325153230389224
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -9274,7 +9274,7 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 1
-  m_Spacing: 27
+  m_Spacing: 50
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0

+ 189 - 13
Assets/SmartBow/Resources/SmartBow/Prefabs/Views/Home/InfraredView.prefab

@@ -296,6 +296,82 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
   m_VerticalFit: 0
+--- !u!1 &1264808553027070288
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1572574612860474340}
+  - component: {fileID: 3723907803770114598}
+  - component: {fileID: 6780038611138705060}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1572574612860474340
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1264808553027070288}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 3367342650323003526}
+  m_RootOrder: 1
+  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_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3723907803770114598
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1264808553027070288}
+  m_CullTransparentMesh: 1
+--- !u!114 &6780038611138705060
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1264808553027070288}
+  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: b595751741ee90b4eac662c255aabfde, type: 3}
+  m_Type: 0
+  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 &1321508859510665533
 GameObject:
   m_ObjectHideFlags: 0
@@ -688,6 +764,86 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2392643086014881808
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3367342650323003526}
+  - component: {fileID: 3400640804592948125}
+  - component: {fileID: 2961210538681748150}
+  m_Layer: 5
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3367342650323003526
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2392643086014881808}
+  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: 5651314242930350345}
+  - {fileID: 1572574612860474340}
+  m_Father: {fileID: 5651314242315564806}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 156.1, y: -125}
+  m_SizeDelta: {x: 1500, y: 78}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!114 &3400640804592948125
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2392643086014881808}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 3
+  m_Spacing: 10
+  m_ChildForceExpandWidth: 0
+  m_ChildForceExpandHeight: 0
+  m_ChildControlWidth: 1
+  m_ChildControlHeight: 1
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &2961210538681748150
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2392643086014881808}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 0
 --- !u!1 &2397657128313122477
 GameObject:
   m_ObjectHideFlags: 0
@@ -1081,7 +1237,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1.3
-  m_Text: "3.\u907F\u514D\u5F3A\u5149\u6216\u9633\u5149\u76F4\u5C04\u7535\u89C6/\u6295\u5F71\u5C4F\u5E55\u548C\u6FC0\u5149\u5B9A\u4F4D\u5668\u3002"
+  m_Text: "3.\u907F\u514D\u5F3A\u5149\u6216\u9633\u5149\u76F4\u5C04\u7535\u89C6/\u6295\u5F71\u5C4F\u5E55\u548C\u6FC0\u5149\u5B9A\u4F4D\u5668"
 --- !u!114 &2267461727794046602
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1566,7 +1722,7 @@ RectTransform:
   - {fileID: 6541729197459587817}
   - {fileID: 6748997971718369909}
   - {fileID: 8243695795160698176}
-  - {fileID: 5651314242930350345}
+  - {fileID: 3367342650323003526}
   - {fileID: 5651314242594850861}
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -2071,6 +2227,7 @@ GameObject:
   - component: {fileID: 5651314242930350351}
   - component: {fileID: 5651314242930350344}
   - component: {fileID: 9128244148548196768}
+  - component: {fileID: 1499755085928079537}
   m_Layer: 5
   m_Name: Title
   m_TagString: Untagged
@@ -2085,18 +2242,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5651314242930350346}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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: 5651314242315564806}
-  m_RootOrder: 5
+  m_Father: {fileID: 3367342650323003526}
+  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: -808, y: 460}
-  m_SizeDelta: {x: 600, y: 30}
+  m_AnchorMin: {x: 0, y: 0}
+  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}
 --- !u!222 &5651314242930350351
 CanvasRenderer:
@@ -2119,7 +2276,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.1882353, g: 0.22352941, b: 0.22352941, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2155,6 +2312,26 @@ MonoBehaviour:
   textKey: Infrared-title
   layoutRebuildObject: {fileID: 0}
   languageFontSizes: []
+--- !u!114 &1499755085928079537
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5651314242930350346}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: 0
+  m_MinHeight: 0
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
 --- !u!1 &5651314243503148116
 GameObject:
   m_ObjectHideFlags: 0
@@ -3133,7 +3310,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1.3
-  m_Text: "2.\u8BF7\u5C06\u6FC0\u5149\u5B9A\u4F4D\u5668\u653E\u5728\u7535\u89C6\u524D\u4E0B\u65B9\uFF0C\u786E\u4FDD\u5176\u5E95\u90E8\u4F4E\u4E8E\u7535\u89C6\u5C4F\u5E55\u3002"
+  m_Text: "2.\u8BF7\u5C06\u6FC0\u5149\u5B9A\u4F4D\u5668\u653E\u5728\u7535\u89C6\u524D\u4E0B\u65B9\uFF0C\u786E\u4FDD\u5176\u5E95\u90E8\u4F4E\u4E8E\u7535\u89C6\u5C4F\u5E55"
 --- !u!114 &1066904095077956172
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3232,8 +3409,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1.3
-  m_Text: 1. Please cast the phone screen to the TV or projector. (It is recommended
-    to use a screen mirroring device).
+  m_Text: "1.\u8BF7\u5C06\u624B\u673A\u753B\u9762\u6295\u5C04\u5230\u7535\u89C6\u6216\u6295\u5F71\u4EEA\u4E0A\uFF08\u5EFA\u8BAE\u4F7F\u7528\u6295\u5C4F\u5668\uFF09"
 --- !u!114 &1008901692133159581
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 18 - 0
Assets/SmartBow/Scripts/Views/InfraredViewParts/InfraredGuidanceView.cs

@@ -11,6 +11,12 @@ public class InfraredGuidanceView  : JCUnityLib.ViewBase
     // Start is called before the first frame update
     void Start()
     {
+        Debug.Log("Start*********************************AwakenSimulateMouse:" + SB_EventSystem.ins.simulateMouseIsAwaked);
+        if (SB_EventSystem.ins && SB_EventSystem.ins.simulateMouseIsAwaked)
+        {
+            SB_EventSystem.ins.AwakenSimulateMouse();
+            // Debug.Log("simulate-mouse-close");
+        }
 
 #if UNITY_STANDALONE_WIN || UNITY_EDITOR
         RectTransform rect = layout1.transform as RectTransform;
@@ -22,6 +28,18 @@ public class InfraredGuidanceView  : JCUnityLib.ViewBase
 #endif
     }
 
+
+    private void OnDestroy()
+    {
+        //修改回进入手动调节页面时候的分辨率
+        //InfraredDemo._ins?.SetResolutionNew(DefaultResolutionIndex);
+        //Debug.Log("OnDestroy*********************************AwakenSimulateMouse:" + SB_EventSystem.ins.simulateMouseIsAwaked);
+        //if (SB_EventSystem.ins && !SB_EventSystem.ins.simulateMouseIsAwaked)
+        //{
+        //    SB_EventSystem.ins.AwakenSimulateMouse();
+        //}
+    }
+
     public void OnClick_EnterLayout2() {
         //进入标定的页面
         AudioMgr.ins.PlayBtn();

+ 42 - 20
Assets/SmartBow/Scripts/Views/InfraredViewParts/InfraredScreenPositioningView.cs

@@ -121,6 +121,7 @@ public class InfraredScreenPositioningView : JCUnityLib.ViewBase
         if (BluetoothAim.ins!=null && markerTextAutoLanguage2 != null)
         {
             string name = "";
+            bool switchValue = false;
             if (BluetoothAim.ins.isMainConnectToHOUYIPRO())
             {
                 name = TextAutoLanguage2.GetTextByKey("TitleTipMarker-HOUYIPro");
@@ -131,9 +132,16 @@ public class InfraredScreenPositioningView : JCUnityLib.ViewBase
             }
             else if (BluetoothAim.ins.isMainConnectToGun())
             {
-                name = TextAutoLanguage2.GetTextByKey("TitleTipMarker-M9");
+                //name = TextAutoLanguage2.GetTextByKey("TitleTipMarker-M9");
+                switchValue = true;
+            }
+            if (switchValue)
+            {
+                markerTextAutoLanguage2.SetTextKey("TitleTipMarker-M9");
+            }
+            else {
+                markerTextAutoLanguage2.textFormatArgs = new object[] { name };
             }
-            markerTextAutoLanguage2.textFormatArgs = new object[] { name };
         }
         //手动不高亮
         //ResetButton(btnHandMovement);
@@ -238,11 +246,11 @@ public class InfraredScreenPositioningView : JCUnityLib.ViewBase
         //InfraredDemo._ins?.SetResolutionNew(ScreenLocate.Main.HighScreenLocateResolutionIndex);
 
 
-        if (SB_EventSystem.ins && SB_EventSystem.ins.simulateMouseIsAwaked)
-        {
-            SB_EventSystem.ins.AwakenSimulateMouse();
-            // Debug.Log("simulate-mouse-close");
-        }
+        //if (SB_EventSystem.ins && SB_EventSystem.ins.simulateMouseIsAwaked)
+        //{
+        //    SB_EventSystem.ins.AwakenSimulateMouse();
+        //    // Debug.Log("simulate-mouse-close");
+        //}
        
     }
 
@@ -250,7 +258,7 @@ public class InfraredScreenPositioningView : JCUnityLib.ViewBase
     {
         //修改回进入手动调节页面时候的分辨率
         //InfraredDemo._ins?.SetResolutionNew(DefaultResolutionIndex);
-
+        Debug.Log("OnDestroy*********************************AwakenSimulateMouse:" + SB_EventSystem.ins.simulateMouseIsAwaked);
         if (SB_EventSystem.ins && !SB_EventSystem.ins.simulateMouseIsAwaked)
         {
             SB_EventSystem.ins.AwakenSimulateMouse();
@@ -981,6 +989,7 @@ public class InfraredScreenPositioningView : JCUnityLib.ViewBase
     #endregion
 
     #region 最后选择算法处理UI
+    int selected = -1;
     void initSelectInfo() {
         for (int i = 0; i < 2; i++)
         {
@@ -988,17 +997,17 @@ public class InfraredScreenPositioningView : JCUnityLib.ViewBase
 
             ResultImagesButtons[currentIndex].onClick.AddListener(() => SelectImage(currentIndex));
 
-            ResultButtons[currentIndex].onClick.AddListener(() =>
-            {
-                if (currentIndex == 0)
-                {
-                    OnFirstResult();
-                }
-                else if (currentIndex == 1)
-                {
-                    OnSecondResult();
-                }
-            });
+            //ResultButtons[currentIndex].onClick.AddListener(() =>
+            //{
+            //    if (currentIndex == 0)
+            //    {
+            //        OnFirstResult();
+            //    }
+            //    else if (currentIndex == 1)
+            //    {
+            //        OnSecondResult();
+            //    }
+            //});
         }
         //默认选择1 自动
         SelectImage(0);
@@ -1006,13 +1015,26 @@ public class InfraredScreenPositioningView : JCUnityLib.ViewBase
     // 添加一个选择函数
     void SelectImage(int selectedIndex)
     {
+        //如果重复选中则跳转
+        if (selected == selectedIndex) {
+            if (selected == 0)
+            {
+                OnFirstResult();
+            }
+            else if (selected == 1)
+            {
+                OnSecondResult();
+            }
+            return;
+        }
         // 遍历所有图片
-    
+
         for (int i = 0; i < ResultImages.Length; i++)
         {
             // 如果是选中的 index,赋值为 ResultLines[0],否则赋值为 ResultLines[1]
             if (i == selectedIndex)
             {
+                selected = i;
                 ResultImages[i].sprite = ResultLines[0];
                 ResultButtons[i].interactable = true;
             }

BIN
Assets/SmartBow/Textures/Guidance/Infrared/warning.png


+ 123 - 0
Assets/SmartBow/Textures/Guidance/Infrared/warning.png.meta

@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: b595751741ee90b4eac662c255aabfde
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: