LT 1 week ago
parent
commit
f826924ad1

File diff suppressed because it is too large
+ 1055 - 0
Assets/Art/cs3.scene


+ 72 - 0
Assets/Res/UI/HeroInformainPanel/Animator/SelectBreakthroughItemPanel.controller

@@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1102 &-8724106998535025409
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: SelectBreakthroughItemPanelopen
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 1cc8d2539cc579e4986e1999780bc5d0, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: SelectBreakthroughItemPanel
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 9043207564023730481}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1107 &9043207564023730481
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: -8724106998535025409}
+    m_Position: {x: 166.50003, y: 322.00003, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: -8724106998535025409}

+ 8 - 0
Assets/Res/UI/HeroInformainPanel/Animator/SelectBreakthroughItemPanel.controller.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: XCtN5yL8US8PAOTLhMfbDlsoXrGTJ0+LPCv6Y3Jt2tKU+pdcI/Nz1ff06Ab6
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 127 - 0
Assets/Res/UI/HeroInformainPanel/Animator/SelectBreakthroughItemPanelopen.anim

@@ -0,0 +1,127 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: SelectBreakthroughItemPanelopen
+  serializedVersion: 9
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -691
+        inSlope: 287.59445
+        outSlope: 287.59445
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.3647568
+      - serializedVersion: 3
+        time: 0.26666668
+        value: -644
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.y
+    path: myImage
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 2583589396
+      attribute: 538195251
+      script: {fileID: 0}
+      typeID: 224
+      customType: 28
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.26666668
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -691
+        inSlope: 287.59445
+        outSlope: 287.59445
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.3647568
+      - serializedVersion: 3
+        time: 0.26666668
+        value: -644
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.y
+    path: myImage
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []
+  m_ACLContext:
+    m_RootBone: {fileID: 0}
+    ACLCompressionLevel: 0
+    ACLCurvePrecision: 0.01
+    UseACLCurve: 0

+ 8 - 0
Assets/Res/UI/HeroInformainPanel/Animator/SelectBreakthroughItemPanelopen.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: DilMvX6vVngLwR7e8ZV+HO1W3bRH/cXIALaEadmSAjhgFIz4NEjtlqBW0XhF
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 53 - 31
Assets/Res/UI/HeroInformainPanel/SelectBreakthroughItemPanel.prefab

@@ -311,7 +311,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 80, y: 176}
+  m_AnchoredPosition: {x: 48, y: 156}
   m_SizeDelta: {x: 160, y: 33.5608}
   m_SizeDelta: {x: 160, y: 33.5608}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6217484099708709913
 --- !u!222 &6217484099708709913
@@ -335,7 +335,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0.5411765, g: 0.45882356, b: 0.38431376, a: 1}
+  m_Color: {r: 0.3254902, g: 0.3019608, b: 0.27058825, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -673,7 +673,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0.7254902, g: 0.4156863, b: 0.121568635, a: 1}
+  m_Color: {r: 0.8632074, g: 0.4802922, b: 0.044788964, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -935,7 +935,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0.59607846, g: 0.40784317, b: 0.21960786, a: 1}
+  m_Color: {r: 0.5188678, g: 0.43180707, b: 0.3157261, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -1015,7 +1015,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0.30980393, g: 0.20000002, b: 0.09019608, a: 1}
+  m_Color: {r: 0.9339621, g: 0.9339621, b: 0.9339621, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -1024,8 +1024,8 @@ MonoBehaviour:
       m_Calls: []
       m_Calls: []
   m_FontData:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 20
-    m_FontStyle: 1
+    m_FontSize: 22
+    m_FontStyle: 0
     m_BestFit: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MinSize: 1
     m_MaxSize: 40
     m_MaxSize: 40
@@ -1095,7 +1095,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9725491, g: 0.9490197, b: 0.8745099, a: 1}
+  m_Color: {r: 0.9811319, g: 0.96154314, b: 0.8608044, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -1104,8 +1104,8 @@ MonoBehaviour:
       m_Calls: []
       m_Calls: []
   m_FontData:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 26
-    m_FontStyle: 1
+    m_FontSize: 30
+    m_FontStyle: 0
     m_BestFit: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MinSize: 2
     m_MaxSize: 40
     m_MaxSize: 40
@@ -1340,7 +1340,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -643.9}
+  m_AnchoredPosition: {x: 0, y: -644}
   m_SizeDelta: {x: 750, y: 485.64966}
   m_SizeDelta: {x: 750, y: 485.64966}
   m_Pivot: {x: 0.5, y: 0}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &524714867080188752
 --- !u!222 &524714867080188752
@@ -1455,7 +1455,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0.58431375, g: 0.49411768, b: 0.3372549, a: 1}
+  m_Color: {r: 0.34117648, g: 0.56078434, b: 0.5568628, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -1590,7 +1590,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.7372549}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -1607,7 +1607,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_lingwu
+  _icon_name: btn_04_h
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
   packInfo:
@@ -1699,8 +1699,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -329.4, y: -12.099976}
-  m_SizeDelta: {x: 169.4441, y: 27.0412}
+  m_AnchoredPosition: {x: -329.4, y: -9}
+  m_SizeDelta: {x: 169.4, y: 31.7}
   m_Pivot: {x: 0, y: 1}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &6016738999040956583
 --- !u!222 &6016738999040956583
 CanvasRenderer:
 CanvasRenderer:
@@ -1723,7 +1723,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0.76470596, g: 0.6156863, b: 0.47058827, a: 1}
+  m_Color: {r: 0.1556601, g: 0.08721405, b: 0.02202735, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -1732,10 +1732,10 @@ MonoBehaviour:
       m_Calls: []
       m_Calls: []
   m_FontData:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 26
-    m_FontStyle: 1
+    m_FontSize: 28
+    m_FontStyle: 0
     m_BestFit: 0
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 2
     m_MaxSize: 40
     m_MaxSize: 40
     m_Alignment: 0
     m_Alignment: 0
     m_AlignByGeometry: 0
     m_AlignByGeometry: 0
@@ -1779,8 +1779,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -185.02562, y: 25.8}
-  m_SizeDelta: {x: 183.7099, y: 301.7909}
+  m_AnchoredPosition: {x: -189, y: 25.8}
+  m_SizeDelta: {x: 210, y: 300.7}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8612881284138927429
 --- !u!222 &8612881284138927429
 CanvasRenderer:
 CanvasRenderer:
@@ -1803,7 +1803,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0.85098046, g: 0.83921576, b: 0.7843138, a: 1}
+  m_Color: {r: 0.8396225, g: 0.831763, b: 0.75249183, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -1892,7 +1892,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8078432, g: 0.79215693, b: 0.7176471, a: 1}
+  m_Color: {r: 0.64705884, g: 0.7294118, b: 0.67058825, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -2008,6 +2008,7 @@ GameObject:
   m_Component:
   m_Component:
   - component: {fileID: 5318323102501209997}
   - component: {fileID: 5318323102501209997}
   - component: {fileID: 3563408254755769735}
   - component: {fileID: 3563408254755769735}
+  - component: {fileID: 8883357906726470524}
   m_Layer: 5
   m_Layer: 5
   m_HasEditorInfo: 1
   m_HasEditorInfo: 1
   m_Name: SelectBreakthroughItemPanel
   m_Name: SelectBreakthroughItemPanel
@@ -2107,6 +2108,27 @@ MonoBehaviour:
     isList: 0
     isList: 0
     ListCollectorDatas: []
     ListCollectorDatas: []
   isAssetBundle: 1
   isAssetBundle: 1
+--- !u!95 &8883357906726470524
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7308605241962880610}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: cabb8a2d44bd6544397e1c7d7ba5d4be, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!1 &7472297620610942561
 --- !u!1 &7472297620610942561
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -2248,7 +2270,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.7372549}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -2265,7 +2287,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_quxiao
+  _icon_name: btn_05_h
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
   packInfo:
@@ -2357,8 +2379,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 137, y: 61.9}
-  m_SizeDelta: {x: 281.6704, y: 175.7678}
+  m_AnchoredPosition: {x: 137, y: 41}
+  m_SizeDelta: {x: 341.9, y: 165.7}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4288302572715536881
 --- !u!222 &4288302572715536881
 CanvasRenderer:
 CanvasRenderer:
@@ -2381,7 +2403,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0.654902, g: 0.58431375, b: 0.50980395, a: 1}
+  m_Color: {r: 0.3254902, g: 0.3019608, b: 0.27058825, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -2391,7 +2413,7 @@ MonoBehaviour:
   m_FontData:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 28
     m_FontSize: 28
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MinSize: 2
     m_MaxSize: 40
     m_MaxSize: 40
@@ -2400,7 +2422,7 @@ MonoBehaviour:
     m_RichText: 1
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_VerticalOverflow: 0
-    m_LineSpacing: 1.5
+    m_LineSpacing: 1
   m_Text: "\u78A7\u7389\u846B\u82A6\u662F\u4E0A\u53E4\u65F6\u671F\u7559\u4E0B\u7684xxxxx\uFF0C\u62E5\u6709xxx\u7684\u795E\u5947\u80FD\u529B\uFF0C\u53EF\u4EE5\u4E3A\u5143\u5A74\u671F\u7684\u4FEE\u58EB\uFF0C\u63D0\u5173\u952E\u7684\u5E2E\u52A9\uFF01"
   m_Text: "\u78A7\u7389\u846B\u82A6\u662F\u4E0A\u53E4\u65F6\u671F\u7559\u4E0B\u7684xxxxx\uFF0C\u62E5\u6709xxx\u7684\u795E\u5947\u80FD\u529B\uFF0C\u53EF\u4EE5\u4E3A\u5143\u5A74\u671F\u7684\u4FEE\u58EB\uFF0C\u63D0\u5173\u952E\u7684\u5E2E\u52A9\uFF01"
 --- !u!1 &9180492859032817554
 --- !u!1 &9180492859032817554
 GameObject:
 GameObject:

+ 23 - 23
Assets/Res/UI/ShopPanel/DaiJinJuanWidgetopen.anim

@@ -22,14 +22,14 @@ AnimationClip:
       - serializedVersion: 3
       - serializedVersion: 3
         time: 0
         time: 0
         value: {x: 0.13125, y: 1, z: 1}
         value: {x: 0.13125, y: 1, z: 1}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
+        inSlope: {x: 7.6994, y: 0, z: 0}
+        outSlope: {x: 7.6994, y: 0, z: 0}
         tangentMode: 0
         tangentMode: 0
         weightedMode: 0
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.19610591, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
       - serializedVersion: 3
-        time: 0.2
+        time: 0.16666667
         value: {x: 1, y: 1, z: 1}
         value: {x: 1, y: 1, z: 1}
         inSlope: {x: 0, y: 0, z: 0}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
@@ -49,14 +49,14 @@ AnimationClip:
       - serializedVersion: 3
       - serializedVersion: 3
         time: 0
         time: 0
         value: 0
         value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
+        inSlope: 8.863149
+        outSlope: 8.863149
+        tangentMode: 0
         weightedMode: 0
         weightedMode: 0
         inWeight: 0.33333334
         inWeight: 0.33333334
-        outWeight: 0.33333334
+        outWeight: 0.23663446
       - serializedVersion: 3
       - serializedVersion: 3
-        time: 0.2
+        time: 0.16666667
         value: 1
         value: 1
         inSlope: 0
         inSlope: 0
         outSlope: 0
         outSlope: 0
@@ -73,7 +73,7 @@ AnimationClip:
     script: {fileID: 0}
     script: {fileID: 0}
     flags: 0
     flags: 0
   m_PPtrCurves: []
   m_PPtrCurves: []
-  m_SampleRate: 30
+  m_SampleRate: 60
   m_WrapMode: 0
   m_WrapMode: 0
   m_Bounds:
   m_Bounds:
     m_Center: {x: 0, y: 0, z: 0}
     m_Center: {x: 0, y: 0, z: 0}
@@ -104,7 +104,7 @@ AnimationClip:
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
     m_StartTime: 0
-    m_StopTime: 0.2
+    m_StopTime: 0.16666667
     m_OrientationOffsetY: 0
     m_OrientationOffsetY: 0
     m_Level: 0
     m_Level: 0
     m_CycleOffset: 0
     m_CycleOffset: 0
@@ -127,14 +127,14 @@ AnimationClip:
       - serializedVersion: 3
       - serializedVersion: 3
         time: 0
         time: 0
         value: 0
         value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
+        inSlope: 8.863149
+        outSlope: 8.863149
+        tangentMode: 0
         weightedMode: 0
         weightedMode: 0
         inWeight: 0.33333334
         inWeight: 0.33333334
-        outWeight: 0.33333334
+        outWeight: 0.23663446
       - serializedVersion: 3
       - serializedVersion: 3
-        time: 0.2
+        time: 0.16666667
         value: 1
         value: 1
         inSlope: 0
         inSlope: 0
         outSlope: 0
         outSlope: 0
@@ -157,14 +157,14 @@ AnimationClip:
       - serializedVersion: 3
       - serializedVersion: 3
         time: 0
         time: 0
         value: 0.13125
         value: 0.13125
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
+        inSlope: 7.6994
+        outSlope: 7.6994
+        tangentMode: 0
         weightedMode: 0
         weightedMode: 0
         inWeight: 0.33333334
         inWeight: 0.33333334
-        outWeight: 0.33333334
+        outWeight: 0.19610591
       - serializedVersion: 3
       - serializedVersion: 3
-        time: 0.2
+        time: 0.16666667
         value: 1
         value: 1
         inSlope: 0
         inSlope: 0
         outSlope: 0
         outSlope: 0
@@ -194,7 +194,7 @@ AnimationClip:
         inWeight: 0.33333334
         inWeight: 0.33333334
         outWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
       - serializedVersion: 3
-        time: 0.2
+        time: 0.16666667
         value: 1
         value: 1
         inSlope: 0
         inSlope: 0
         outSlope: 0
         outSlope: 0
@@ -224,7 +224,7 @@ AnimationClip:
         inWeight: 0.33333334
         inWeight: 0.33333334
         outWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
       - serializedVersion: 3
-        time: 0.2
+        time: 0.16666667
         value: 1
         value: 1
         inSlope: 0
         inSlope: 0
         outSlope: 0
         outSlope: 0

+ 8 - 26
Assets/Res/UI/TipMessagePanel/showTips.anim

@@ -30,23 +30,14 @@ AnimationClip:
         weightedMode: 0
         weightedMode: 0
         inWeight: 0.33333334
         inWeight: 0.33333334
         outWeight: 0.33333334
         outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.75
-        value: 15
-        inSlope: 36
-        outSlope: 36
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
       - serializedVersion: 3
       - serializedVersion: 3
         time: 1.6666666
         time: 1.6666666
         value: 150
         value: 150
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
+        inSlope: 261.38235
+        outSlope: 261.38235
+        tangentMode: 0
         weightedMode: 0
         weightedMode: 0
-        inWeight: 0.33333334
+        inWeight: 0.13191552
         outWeight: 0.33333334
         outWeight: 0.33333334
       m_PreInfinity: 2
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_PostInfinity: 2
@@ -156,23 +147,14 @@ AnimationClip:
         weightedMode: 0
         weightedMode: 0
         inWeight: 0.33333334
         inWeight: 0.33333334
         outWeight: 0.33333334
         outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.75
-        value: 15
-        inSlope: 36
-        outSlope: 36
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
       - serializedVersion: 3
       - serializedVersion: 3
         time: 1.6666666
         time: 1.6666666
         value: 150
         value: 150
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
+        inSlope: 261.38235
+        outSlope: 261.38235
+        tangentMode: 0
         weightedMode: 0
         weightedMode: 0
-        inWeight: 0.33333334
+        inWeight: 0.13191552
         outWeight: 0.33333334
         outWeight: 0.33333334
       m_PreInfinity: 2
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_PostInfinity: 2

Some files were not shown because too many files changed in this diff