1

2026-09-05 18:51:36 +08:00
parent f0c2bfd2ad
commit 69a699ef44
15 changed files with 734 additions and 561 deletions
@@ -1212,7 +1212,7 @@ PrefabInstance:
    - target: {fileID: 4022379169775942501, guid: 039b215e909215f4885955ecacc6e7df,
        type: 3}
      propertyPath: m_IsActive
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 4022379169775942501, guid: 039b215e909215f4885955ecacc6e7df,
        type: 3}
@@ -1352,7 +1352,12 @@ PrefabInstance:
    - target: {fileID: 4405847838886852390, guid: 039b215e909215f4885955ecacc6e7df,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: -23
+      value: -8.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4405847838886852390, guid: 039b215e909215f4885955ecacc6e7df,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 8.6
      objectReference: {fileID: 0}
    - target: {fileID: 4405847838886852390, guid: 039b215e909215f4885955ecacc6e7df,
        type: 3}
@@ -2793,7 +2798,8 @@ MonoBehaviour:
  yzID: 
  colliderList: []
  lockPoint: {fileID: 0}
-  bingDongEffect: {fileID: 0}
+  bingDongEffect:
+  - {fileID: 0}
  needLockEvent: 0
  createVideoClip: {fileID: 0}
  rotationPY: 60
@@ -1838,7 +1838,7 @@ MonoBehaviour:
  bulletPrefab_Two: {fileID: 0}
  bulletPrefab: {fileID: 651644301851706979, guid: 502ef21f2785e994db30708b1b2b75f8,
    type: 3}
-  laserPrefab: {fileID: 4871744834294513039, guid: 999e5fe75ff584347af22cd20e757f8e,
+  laserPrefab: {fileID: 2047468684989902714, guid: 7fc392dfe503bdc4d8b904e3694d10b3,
    type: 3}
  laserWidth: 10
  laserColor: {r: 1, g: 0.3, b: 0.3, a: 0.9}
@@ -301,8 +301,11 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
                    }
                    else
                    {
-                        item.btn_TurretAdd.gameObject.SetActive(false);
-                        item.btn_TurretMinus.gameObject.SetActive(false);
+                        // ⭐ 各游戏prefab未拖拽加减倍按钮时为null，做保护（XJMH座位没有该按钮）
+                        if (item.btn_TurretAdd != null)
+                            item.btn_TurretAdd.gameObject.SetActive(false);
+                        if (item.btn_TurretMinus != null)
+                            item.btn_TurretMinus.gameObject.SetActive(false);
                    }

                }
@@ -552,7 +555,9 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
            }
        });
        btn_Setting.onClick.AddListener(() => {subUIManager.ShowAsync(UIPanel.SettingPanel); });
-        btn_BiaoQing.onClick.AddListener(OnBiaoQingButtonClick);
+        // ⭐ 各游戏prefab未拖拽表情按钮时为null，做保护（XJMH面板没有该按钮）
+        if (btn_BiaoQing != null)
+            btn_BiaoQing.onClick.AddListener(OnBiaoQingButtonClick);
        btn_TuiChu.onClick.AddListener(() =>
        {
            StartLeaveCountdown();
@@ -2972,7 +2972,7 @@ RectTransform:
  m_GameObject: {fileID: 7058229970481212058}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 1794931854136992370}
@@ -4307,17 +4307,17 @@ PrefabInstance:
      propertyPath: m_SortingLayer
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 2293393451766763578, guid: ebdae2574a0ae4a4388300d711901565,
+    - target: {fileID: 749241092513455717, guid: ebdae2574a0ae4a4388300d711901565,
        type: 3}
      propertyPath: m_LocalScale.x
      value: 1
      objectReference: {fileID: 0}
-    - target: {fileID: 2293393451766763578, guid: ebdae2574a0ae4a4388300d711901565,
+    - target: {fileID: 749241092513455717, guid: ebdae2574a0ae4a4388300d711901565,
        type: 3}
      propertyPath: m_LocalScale.y
      value: 1
      objectReference: {fileID: 0}
-    - target: {fileID: 2293393451766763578, guid: ebdae2574a0ae4a4388300d711901565,
+    - target: {fileID: 749241092513455717, guid: ebdae2574a0ae4a4388300d711901565,
        type: 3}
      propertyPath: m_LocalScale.z
      value: 1
@@ -4362,46 +4362,6 @@ PrefabInstance:
      propertyPath: m_SortingLayer
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 7003098710454334343, guid: ebdae2574a0ae4a4388300d711901565,
-        type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 7003098710454334343, guid: ebdae2574a0ae4a4388300d711901565,
-        type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 7003098710454334343, guid: ebdae2574a0ae4a4388300d711901565,
-        type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 7003098710454334343, guid: ebdae2574a0ae4a4388300d711901565,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 7003098710454334343, guid: ebdae2574a0ae4a4388300d711901565,
-        type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 7003098710454334343, guid: ebdae2574a0ae4a4388300d711901565,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 7003098710454334343, guid: ebdae2574a0ae4a4388300d711901565,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 7003098710454334343, guid: ebdae2574a0ae4a4388300d711901565,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
    - target: {fileID: 7003098710454334343, guid: ebdae2574a0ae4a4388300d711901565,
        type: 3}
      propertyPath: m_LocalPosition.x
@@ -4437,16 +4397,6 @@ PrefabInstance:
      propertyPath: m_LocalRotation.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 7003098710454334343, guid: ebdae2574a0ae4a4388300d711901565,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7003098710454334343, guid: ebdae2574a0ae4a4388300d711901565,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
    - target: {fileID: 7003098710454334343, guid: ebdae2574a0ae4a4388300d711901565,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
@@ -4487,8 +4437,8 @@ PrefabInstance:
    m_AddedGameObjects: []
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: ebdae2574a0ae4a4388300d711901565, type: 3}
--- !u!224 &8218205984014533710 stripped
-RectTransform:
+--- !u!4 &8218205984014533710 stripped
+Transform:
  m_CorrespondingSourceObject: {fileID: 7003098710454334343, guid: ebdae2574a0ae4a4388300d711901565,
    type: 3}
  m_PrefabInstance: {fileID: 1386246533418940361}
@@ -4804,21 +4754,6 @@ PrefabInstance:
      propertyPath: m_SortingLayer
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 3490028313455901527, guid: 9e114e29415d348448005cf3fcebe71c,
-        type: 3}
-      propertyPath: m_LocalScale.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3490028313455901527, guid: 9e114e29415d348448005cf3fcebe71c,
-        type: 3}
-      propertyPath: m_LocalScale.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3490028313455901527, guid: 9e114e29415d348448005cf3fcebe71c,
-        type: 3}
-      propertyPath: m_LocalScale.z
-      value: 1
-      objectReference: {fileID: 0}
    - target: {fileID: 3640998782411907828, guid: 9e114e29415d348448005cf3fcebe71c,
        type: 3}
      propertyPath: m_Enabled
@@ -4859,6 +4794,21 @@ PrefabInstance:
      propertyPath: m_SortingLayer
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 4588948724391519567, guid: 9e114e29415d348448005cf3fcebe71c,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4588948724391519567, guid: 9e114e29415d348448005cf3fcebe71c,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4588948724391519567, guid: 9e114e29415d348448005cf3fcebe71c,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 5704936572906703974, guid: 9e114e29415d348448005cf3fcebe71c,
        type: 3}
      propertyPath: m_Enabled
@@ -4904,46 +4854,6 @@ PrefabInstance:
      propertyPath: m_SortingLayer
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 7274721101021965849, guid: 9e114e29415d348448005cf3fcebe71c,
-        type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 7274721101021965849, guid: 9e114e29415d348448005cf3fcebe71c,
-        type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 7274721101021965849, guid: 9e114e29415d348448005cf3fcebe71c,
-        type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 7274721101021965849, guid: 9e114e29415d348448005cf3fcebe71c,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 7274721101021965849, guid: 9e114e29415d348448005cf3fcebe71c,
-        type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 7274721101021965849, guid: 9e114e29415d348448005cf3fcebe71c,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 7274721101021965849, guid: 9e114e29415d348448005cf3fcebe71c,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 7274721101021965849, guid: 9e114e29415d348448005cf3fcebe71c,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
    - target: {fileID: 7274721101021965849, guid: 9e114e29415d348448005cf3fcebe71c,
        type: 3}
      propertyPath: m_LocalPosition.x
@@ -4979,16 +4889,6 @@ PrefabInstance:
      propertyPath: m_LocalRotation.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 7274721101021965849, guid: 9e114e29415d348448005cf3fcebe71c,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7274721101021965849, guid: 9e114e29415d348448005cf3fcebe71c,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
    - target: {fileID: 7274721101021965849, guid: 9e114e29415d348448005cf3fcebe71c,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
@@ -5039,8 +4939,8 @@ PrefabInstance:
    m_AddedGameObjects: []
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 9e114e29415d348448005cf3fcebe71c, type: 3}
--- !u!224 &4964396664302914908 stripped
-RectTransform:
+--- !u!4 &4964396664302914908 stripped
+Transform:
  m_CorrespondingSourceObject: {fileID: 7274721101021965849, guid: 9e114e29415d348448005cf3fcebe71c,
    type: 3}
  m_PrefabInstance: {fileID: 2310368852100981573}
@@ -5656,21 +5556,41 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 2149982692187042854}
    m_Modifications:
+    - target: {fileID: 489525297998720608, guid: 3a10d8f351e3d52489bceee1b4740337,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 489525297998720608, guid: 3a10d8f351e3d52489bceee1b4740337,
        type: 3}
      propertyPath: m_SortingLayer
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 736456756303208684, guid: 3a10d8f351e3d52489bceee1b4740337,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 736456756303208684, guid: 3a10d8f351e3d52489bceee1b4740337,
        type: 3}
      propertyPath: m_SortingLayer
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 1373419184824227033, guid: 3a10d8f351e3d52489bceee1b4740337,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 1373419184824227033, guid: 3a10d8f351e3d52489bceee1b4740337,
        type: 3}
      propertyPath: m_SortingLayer
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 1510351021166158382, guid: 3a10d8f351e3d52489bceee1b4740337,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 1510351021166158382, guid: 3a10d8f351e3d52489bceee1b4740337,
        type: 3}
      propertyPath: m_SortingLayer
@@ -5686,36 +5606,61 @@ PrefabInstance:
      propertyPath: m_Name
      value: gun_barrel_14901_multy
      objectReference: {fileID: 0}
-    - target: {fileID: 2826291771310781170, guid: 3a10d8f351e3d52489bceee1b4740337,
+    - target: {fileID: 2444395877751059100, guid: 3a10d8f351e3d52489bceee1b4740337,
        type: 3}
-      propertyPath: m_LocalScale.x
+      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 2826291771310781170, guid: 3a10d8f351e3d52489bceee1b4740337,
+    - target: {fileID: 3658765242434420830, guid: 3a10d8f351e3d52489bceee1b4740337,
        type: 3}
-      propertyPath: m_LocalScale.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2826291771310781170, guid: 3a10d8f351e3d52489bceee1b4740337,
-        type: 3}
-      propertyPath: m_LocalScale.z
-      value: 0
+      propertyPath: m_Enabled
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 3658765242434420830, guid: 3a10d8f351e3d52489bceee1b4740337,
        type: 3}
      propertyPath: m_SortingLayer
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 3836700306920308535, guid: 3a10d8f351e3d52489bceee1b4740337,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3836700306920308535, guid: 3a10d8f351e3d52489bceee1b4740337,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3836700306920308535, guid: 3a10d8f351e3d52489bceee1b4740337,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4109429954169556795, guid: 3a10d8f351e3d52489bceee1b4740337,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 4109429954169556795, guid: 3a10d8f351e3d52489bceee1b4740337,
        type: 3}
      propertyPath: m_SortingLayer
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 6597453068862911414, guid: 3a10d8f351e3d52489bceee1b4740337,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 6597453068862911414, guid: 3a10d8f351e3d52489bceee1b4740337,
        type: 3}
      propertyPath: m_SortingLayer
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 7483470123548333543, guid: 3a10d8f351e3d52489bceee1b4740337,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 7483470123548333543, guid: 3a10d8f351e3d52489bceee1b4740337,
        type: 3}
      propertyPath: m_SortingLayer
@@ -5776,6 +5721,11 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: -0
      objectReference: {fileID: 0}
+    - target: {fileID: 8414673600077309479, guid: 3a10d8f351e3d52489bceee1b4740337,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 8414673600077309479, guid: 3a10d8f351e3d52489bceee1b4740337,
        type: 3}
      propertyPath: m_SortingLayer
@@ -5901,7 +5851,7 @@ PrefabInstance:
    - target: {fileID: 2751321387637269240, guid: 9e114e29415d348448005cf3fcebe71c,
        type: 3}
      propertyPath: m_Enabled
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 2751321387637269240, guid: 9e114e29415d348448005cf3fcebe71c,
        type: 3}
@@ -5931,7 +5881,7 @@ PrefabInstance:
    - target: {fileID: 3640998782411907828, guid: 9e114e29415d348448005cf3fcebe71c,
        type: 3}
      propertyPath: m_Enabled
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 3640998782411907828, guid: 9e114e29415d348448005cf3fcebe71c,
        type: 3}
@@ -5943,10 +5893,15 @@ PrefabInstance:
      propertyPath: m_Name
      value: gun_barrel_14080_multy
      objectReference: {fileID: 0}
+    - target: {fileID: 3774533120367730850, guid: 9e114e29415d348448005cf3fcebe71c,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 4085866428465621391, guid: 9e114e29415d348448005cf3fcebe71c,
        type: 3}
      propertyPath: m_Enabled
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 4085866428465621391, guid: 9e114e29415d348448005cf3fcebe71c,
        type: 3}
@@ -5956,17 +5911,32 @@ PrefabInstance:
    - target: {fileID: 4237856643226359049, guid: 9e114e29415d348448005cf3fcebe71c,
        type: 3}
      propertyPath: m_Enabled
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 4237856643226359049, guid: 9e114e29415d348448005cf3fcebe71c,
        type: 3}
      propertyPath: m_SortingLayer
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 4588948724391519567, guid: 9e114e29415d348448005cf3fcebe71c,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4588948724391519567, guid: 9e114e29415d348448005cf3fcebe71c,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4588948724391519567, guid: 9e114e29415d348448005cf3fcebe71c,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 5704936572906703974, guid: 9e114e29415d348448005cf3fcebe71c,
        type: 3}
      propertyPath: m_Enabled
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 5704936572906703974, guid: 9e114e29415d348448005cf3fcebe71c,
        type: 3}
@@ -5976,7 +5946,7 @@ PrefabInstance:
    - target: {fileID: 6356880912916836035, guid: 9e114e29415d348448005cf3fcebe71c,
        type: 3}
      propertyPath: m_Enabled
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 6356880912916836035, guid: 9e114e29415d348448005cf3fcebe71c,
        type: 3}
@@ -5991,7 +5961,7 @@ PrefabInstance:
    - target: {fileID: 6846663508741455379, guid: 9e114e29415d348448005cf3fcebe71c,
        type: 3}
      propertyPath: m_Enabled
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 6846663508741455379, guid: 9e114e29415d348448005cf3fcebe71c,
        type: 3}
@@ -6001,7 +5971,7 @@ PrefabInstance:
    - target: {fileID: 7260677943558604325, guid: 9e114e29415d348448005cf3fcebe71c,
        type: 3}
      propertyPath: m_Enabled
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7260677943558604325, guid: 9e114e29415d348448005cf3fcebe71c,
        type: 3}
@@ -6081,7 +6051,7 @@ PrefabInstance:
    - target: {fileID: 7461961071856083505, guid: 9e114e29415d348448005cf3fcebe71c,
        type: 3}
      propertyPath: m_Enabled
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7461961071856083505, guid: 9e114e29415d348448005cf3fcebe71c,
        type: 3}
@@ -6091,7 +6061,7 @@ PrefabInstance:
    - target: {fileID: 7546358370739871016, guid: 9e114e29415d348448005cf3fcebe71c,
        type: 3}
      propertyPath: m_Enabled
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7546358370739871016, guid: 9e114e29415d348448005cf3fcebe71c,
        type: 3}
@@ -6101,7 +6071,7 @@ PrefabInstance:
    - target: {fileID: 7715653928237324522, guid: 9e114e29415d348448005cf3fcebe71c,
        type: 3}
      propertyPath: m_Enabled
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7715653928237324522, guid: 9e114e29415d348448005cf3fcebe71c,
        type: 3}
@@ -6147,8 +6117,8 @@ ParticleSystem:
    type: 3}
  m_PrefabInstance: {fileID: 8943552163165867115}
  m_PrefabAsset: {fileID: 0}
--- !u!224 &1794931854136992370 stripped
-RectTransform:
+--- !u!4 &1794931854136992370 stripped
+Transform:
  m_CorrespondingSourceObject: {fileID: 7274721101021965849, guid: 9e114e29415d348448005cf3fcebe71c,
    type: 3}
  m_PrefabInstance: {fileID: 8943552163165867115}
@@ -3983,7 +3983,7 @@ RectTransform:
  m_GameObject: {fileID: 2849236668462387409}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.820125, y: 0.820125, z: 0.820125}
+  m_LocalScale: {x: 0.6292649, y: 0.6292649, z: 0.6292649}
  m_ConstrainProportionsScale: 1
  m_Children: []
  m_Father: {fileID: 6391811923979739103}
@@ -3991,7 +3991,7 @@ RectTransform:
  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: 102, y: 100}
+  m_SizeDelta: {x: 94, y: 108}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2949839776759448369
 CanvasRenderer:
@@ -4021,7 +4021,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: ac878198c8ae47e4382d0b314d3e8cdd, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 6f64d15ebfb301546b50ad911656a2b2, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@@ -11377,7 +11377,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &2005369776542458706
 RectTransform:
  m_ObjectHideFlags: 0
@@ -11425,7 +11425,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: f53ba0b289a9d1b4c954b43ec3dc1b4f, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 0197bfd5ac31f1244afb10fa558db0f1, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@@ -127,11 +127,13 @@ public class UIHome_BY_ShopPanel : SubUIBase
                        {
                            item.sprite_Icon = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f));
                            obj.GetChild(0).GetComponent<Image>().sprite = item.sprite_Icon;
+                            obj.GetChild(0).GetComponent<Image>().SetNativeSize();
                        });
                    }
                    else
                    {
                        obj.GetChild(0).GetComponent<Image>().sprite = item.sprite_Icon;
+                        obj.GetChild(0).GetComponent<Image>().SetNativeSize();
                    }
                    obj.name = item.number;
                    dic_GoldItems[item.number] = item;
@@ -177,11 +179,13 @@ public class UIHome_BY_ShopPanel : SubUIBase
                        {
                            item.sprite_Icon = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f));
                            obj.GetChild(0).GetComponent<Image>().sprite = item.sprite_Icon;
+                            obj.GetChild(0).GetComponent<Image>().SetNativeSize();
                        });
                    }
                    else
                    {
                        obj.GetChild(0).GetComponent<Image>().sprite = item.sprite_Icon;
+                        obj.GetChild(0).GetComponent<Image>().SetNativeSize();
                    }
                    obj.name = item.number;
                    dic_DiamondItems[item.number] = item;
@@ -231,11 +235,13 @@ public class UIHome_BY_ShopPanel : SubUIBase
                    {
                        item.sprite_Icon = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f));
                        obj.GetChild(0).GetComponent<Image>().sprite = item.sprite_Icon;
+                        obj.GetChild(0).GetComponent<Image>().SetNativeSize();
                    });
                }
                else
                {
                    obj.GetChild(0).GetComponent<Image>().sprite = item.sprite_Icon;
+                    obj.GetChild(0).GetComponent<Image>().SetNativeSize();
                }
                obj.name = item.number;
                dic_PropItems[item.number] = item;
@@ -274,11 +280,13 @@ public class UIHome_BY_ShopPanel : SubUIBase
                    {
                        item.sprite_Icon = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f));
                        obj.GetChild(0).GetComponent<Image>().sprite = item.sprite_Icon;
+                        obj.GetChild(0).GetComponent<Image>().SetNativeSize();
                    });
                }
                else
                {
                    obj.GetChild(0).GetComponent<Image>().sprite = item.sprite_Icon;
+                    obj.GetChild(0).GetComponent<Image>().SetNativeSize();
                }
                obj.name = item.number;
                dic_PropItems[item.number] = item;
@@ -326,11 +334,13 @@ public class UIHome_BY_ShopPanel : SubUIBase
                    {
                        item.sprite_Icon = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f));
                        obj.GetChild(0).GetComponent<Image>().sprite = item.sprite_Icon;
+                        obj.GetChild(0).GetComponent<Image>().SetNativeSize();
                    });
                }
                else
                {
                    obj.GetChild(0).GetComponent<Image>().sprite = item.sprite_Icon;
+                    obj.GetChild(0).GetComponent<Image>().SetNativeSize();
                }
                obj.name = item.number;
                dic_PropItems[item.number] = item;
@@ -473,11 +483,13 @@ public class UIHome_BY_ShopPanel : SubUIBase
                {
                    item.sprite_Icon = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f));
                    obj.GetChild(0).GetComponent<Image>().sprite = item.sprite_Icon;
+                    obj.GetChild(0).GetComponent<Image>().SetNativeSize();
                });
            }
            else
            {
                obj.GetChild(0).GetComponent<Image>().sprite = item.sprite_Icon;
+                obj.GetChild(0).GetComponent<Image>().SetNativeSize();
            }
            obj.name = item.number;
            dic_PropItems[item.number] = item;