修改ui

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.7810897
+    - _Alpha: 0.1403743
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.60491556
+    - _Alpha: 0
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -37,7 +37,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 2.4, y: 431}
+  m_AnchoredPosition: {x: 2.4, y: 427}
   m_SizeDelta: {x: 135.4431, y: 64.1194}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4309580754683082469
@@ -345,8 +345,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 303.6, y: -661.39}
-  m_SizeDelta: {x: 177.5, y: 51.8}
+  m_AnchoredPosition: {x: 292, y: -661.39}
+  m_SizeDelta: {x: 184.1, y: 51.8}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &1203846129011065506
 CanvasRenderer:
@@ -1447,8 +1447,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 237.5, y: -379.39}
-  m_SizeDelta: {x: 172, y: 47}
+  m_AnchoredPosition: {x: 225, y: -379.39}
+  m_SizeDelta: {x: 186.5, y: 47}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &8777019402569436550
 CanvasRenderer:
@@ -2104,8 +2104,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 225.1353, y: 211}
-  m_SizeDelta: {x: 137.9815, y: 47}
+  m_AnchoredPosition: {x: 214, y: 211}
+  m_SizeDelta: {x: 142.5, y: 47}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &3966226649241584167
 CanvasRenderer:

Assets/Res/UI/SkillSelectPanel/SkillWidget.prefab

@@ -69,11 +69,11 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 24
+    m_FontSize: 26
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
-    m_MaxSize: 40
+    m_MaxSize: 41
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -93,9 +93,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  effectColor: {r: 0.3207546, g: 0.139396, b: 0.08472758, a: 1}
-  effectDistanceX: 1
-  effectDistanceY: 1
+  effectColor: {r: 0.14751682, g: 0.4718189, b: 0.4811319, a: 1}
+  effectDistanceX: 1.5
+  effectDistanceY: 1.5
   samplingRate: 10
 --- !u!1 &740275112248685339
 GameObject:
@@ -284,7 +284,7 @@ MonoBehaviour:
     - Target: {fileID: 4044849639734904529}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 1, y: 0.92102784, z: 0.22641498, w: 1}
+      - {x: 0.9481131, y: 0.81000423, z: 0.15205573, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
   - StateInfos:
@@ -355,7 +355,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: 172, y: 236}
+  m_SizeDelta: {x: 162, y: 229}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2581929947445778465
 CanvasRenderer:
@@ -487,7 +487,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u4E3B\u52A8"
+  m_Text: "\u8F85\u52A9"
 --- !u!1 &2275450100977324630
 GameObject:
   m_ObjectHideFlags: 0
@@ -615,7 +615,7 @@ RectTransform:
   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: -2}
+  m_AnchoredPosition: {x: -3.300003, y: -2}
   m_SizeDelta: {x: 16, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8199172619172445228
@@ -648,18 +648,18 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 30
-    m_FontStyle: 0
+    m_FontSize: 26
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 1
-    m_MaxSize: 40
+    m_MaxSize: 283
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u70C8\u7130\u5251"
+  m_Text: "\u8840\u5203\u91D1\u714C\u529F"
 --- !u!1 &2765189794887986478
 GameObject:
   m_ObjectHideFlags: 0
@@ -786,7 +786,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -1.6, y: -20.7}
-  m_SizeDelta: {x: 74.2, y: 26}
+  m_SizeDelta: {x: 81.9, y: 28}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &184391794983304602
 CanvasRenderer:
@@ -809,7 +809,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.6313726, g: 0.82745105, b: 0.8117648, a: 1}
+  m_Color: {r: 0.70980394, g: 0.8039216, b: 0.7890024, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -826,7 +826,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_juxing_yuanjiao16
+  _icon_name: dec_yuanjiao8
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -875,8 +875,8 @@ 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: -1.5, y: 99.3}
-  m_SizeDelta: {x: 108.1, y: 30}
+  m_AnchoredPosition: {x: -1.5, y: 99.1}
+  m_SizeDelta: {x: 98, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &438287497116520212
 CanvasRenderer:
@@ -899,7 +899,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.45098042, g: 0.6, b: 0.5647059, a: 1}
+  m_Color: {r: 0.45098042, g: 0.6039216, b: 0.5686275, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -989,7 +989,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.94509804, g: 0.61960787, b: 0.07450981, a: 1}
+  m_Color: {r: 0.9481131, g: 0.81000423, b: 0.15205573, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1181,11 +1181,11 @@ MonoBehaviour:
       UIStateV4Datas: []
       UIStateStrTypes: 00020000
       UIStateStrDatas:
-      - dec_gongfa_di2
+      - dec_gongfa_di1
     - Target: {fileID: 3266992687204387941}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.7725491, y: 0.6627451, z: 0.43137258, w: 1}
+      - {x: 0.45098042, y: 0.6039216, z: 0.5686275, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
   - StateInfos:
@@ -1194,18 +1194,18 @@ MonoBehaviour:
       UIStateV4Datas: []
       UIStateStrTypes: 00020000
       UIStateStrDatas:
-      - dec_gongfa_di1
+      - dec_gongfa_di2
     - Target: {fileID: 3266992687204387941}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.45098042, y: 0.6, z: 0.5647059, w: 1}
+      - {x: 0.62352943, y: 0.427451, z: 0.62352943, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
   AllComs:
   - {fileID: 1269921678863901166}
   - {fileID: 3266992687204387941}
   AllComsStateTypes: 0002000040000000
-  CurrIndex: 1
+  CurrIndex: 0
 --- !u!1 &5661546328325043756
 GameObject:
   m_ObjectHideFlags: 0
@@ -1243,7 +1243,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: 172, y: 236}
+  m_SizeDelta: {x: 162, y: 229}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7377986201002905578
 CanvasRenderer:
@@ -1266,7 +1266,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.6313726}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.79607844}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1283,7 +1283,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_gfdiban
+  _icon_name: dec_gongfa_di1
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
   packInfo:
@@ -1291,7 +1291,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
-  imageH: 0
+  imageH: 236
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1331,8 +1331,8 @@ 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: 14.4}
-  m_SizeDelta: {x: 156, y: 41}
+  m_AnchoredPosition: {x: 0, y: 13.1}
+  m_SizeDelta: {x: 164, y: 41}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &5472442743536986917
 CanvasRenderer:
@@ -1548,14 +1548,14 @@ RectTransform:
   m_GameObject: {fileID: 7078492729563374827}
   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_LocalScale: {x: 0.76, y: 0.76, z: 0.76}
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 7716599432344587041}
   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: 62, y: 97}
+  m_AnchoredPosition: {x: 64.6, y: -95}
   m_SizeDelta: {x: 99, y: 74}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &570341425408612011
@@ -1604,7 +1604,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 99b40747f72180f8bdc5e972731dc65f
-  imageH: 0
+  imageH: 74
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1857,11 +1857,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -25.5
+      value: -20.1
       objectReference: {fileID: 0}
     - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.2
+      value: -13.2
       objectReference: {fileID: 0}
     - target: {fileID: 2409437247996614116, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1883,10 +1883,34 @@ PrefabInstance:
       propertyPath: m_Name
       value: RedDotComType01
       objectReference: {fileID: 0}
+    - target: {fileID: 4639458729338371754, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_Color.b
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4639458729338371754, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_Color.g
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4639458729338371754, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_Color.r
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4639458729338371754, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: _icon_name
+      value: dec_xiaohongdian
+      objectReference: {fileID: 0}
     - target: {fileID: 5439336813456305210, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
       propertyPath: RedDotConfigId
       value: 2
       objectReference: {fileID: 0}
+    - target: {fileID: 5697877519372400105, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 28
+      objectReference: {fileID: 0}
+    - target: {fileID: 5697877519372400105, guid: a32d58bc31be04846bd2ff420b56c70c, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 28
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

Assets/Scenes/testCombat.scene

@@ -916,6 +916,146 @@ AudioSource:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
+--- !u!1 &182052503
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 182052507}
+  - component: {fileID: 182052506}
+  - component: {fileID: 182052505}
+  - component: {fileID: 182052504}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Camera
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!114 &182052504
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 182052503}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_RenderShadows: 1
+  m_RequiresDepthTextureOption: 2
+  m_RequiresOpaqueTextureOption: 2
+  m_CameraType: 0
+  m_Cameras: []
+  m_RendererIndex: -1
+  m_VolumeLayerMask:
+    serializedVersion: 2
+    m_Bits: 1
+  m_VolumeTrigger: {fileID: 0}
+  m_VolumeFrameworkUpdateModeOption: 2
+  m_RenderPostProcessing: 0
+  m_Antialiasing: 0
+  m_AntialiasingQuality: 2
+  m_StopNaN: 0
+  m_Dithering: 0
+  m_ClearDepth: 1
+  m_AllowXRRendering: 1
+  m_AllowHDROutput: 1
+  m_UseScreenCoordOverride: 0
+  m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
+  m_RequiresDepthTexture: 0
+  m_RequiresColorTexture: 0
+  m_Version: 2
+  m_TaaSettings:
+    m_Quality: 3
+    m_FrameInfluence: 0.1
+    m_JitterScale: 1
+    m_MipBias: 0
+    m_VarianceClampScale: 0.9
+    m_ContrastAdaptiveSharpening: 0
+--- !u!81 &182052505
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 182052503}
+  m_Enabled: 1
+--- !u!20 &182052506
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 182052503}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 1
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_Iso: 200
+  m_ShutterSpeed: 0.005
+  m_Aperture: 16
+  m_FocusDistance: 10
+  m_FocalLength: 50
+  m_BladeCount: 5
+  m_Curvature: {x: 2, y: 11}
+  m_BarrelClipping: 0.25
+  m_Anamorphism: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 0
+  orthographic size: 5
+  m_Depth: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_enableGDRP: 1
+  m_backfaceCulling: 0
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!4 &182052507
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 182052503}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.57925487, y: 0.5109834, z: -0.00000008435591}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &376281604
 GameObject:
   m_ObjectHideFlags: 0
@@ -2423,7 +2563,116 @@ Sprite:
     - {x: 0.64, y: -0.83}
   m_Bones: []
   m_SpriteID: 5e97eb03825dee720800000000000000
---- !u!213 &1689545617
+--- !u!1001 &1733556487
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 5394572769830370106, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_Name
+      value: Canvas
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370106, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 7091770935250694576, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1469808077}
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+--- !u!224 &1733556488 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 7091770935250694576, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
+  m_PrefabInstance: {fileID: 1733556487}
+  m_PrefabAsset: {fileID: 0}
+--- !u!213 &1762606480
 Sprite:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2638,115 +2887,6 @@ Sprite:
     - {x: 0.575, y: 0.16499999}
   m_Bones: []
   m_SpriteID: 5e97eb03825dee720800000000000000
---- !u!1001 &1733556487
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 5394572769830370106, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_Name
-      value: Canvas
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370106, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5394572769830370110, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects:
-    - targetCorrespondingSourceObject: {fileID: 7091770935250694576, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 1469808077}
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
---- !u!224 &1733556488 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 7091770935250694576, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
-  m_PrefabInstance: {fileID: 1733556487}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1831378551
 GameObject:
   m_ObjectHideFlags: 0
@@ -2805,7 +2945,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 1689545617}
+  m_Sprite: {fileID: 1762606480}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3066,3 +3206,4 @@ SceneRoots:
   - {fileID: 6588466611375917160}
   - {fileID: 1131043597}
   - {fileID: 1733556487}
+  - {fileID: 182052507}

UserSettings/EditorUserSettings.asset

@@ -39,16 +39,16 @@ EditorUserSettings:
       value: 0002065506010b09555d0e7a12750a4443151a297a2e70317d7d4d6be1e1616f
       flags: 0
     RecentlyUsedSceneGuid-6:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 5009075552535a5d5b565c2446260844401548287a7d743674704963e1e1673c
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 5009075552535a5d5b565c2446260844401548287a7d743674704963e1e1673c
+      value: 540803075206595a085d5c7241260e4415164b722a2922647d2a4a62e6b3676c
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 540803075206595a085d5c7241260e4415164b722a2922647d2a4a62e6b3676c
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615