Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Res/UI/SentimentPanel/SentimentEffectWidget.prefab

@@ -0,0 +1,197 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &3391897974650891347
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3793508176197929554}
+  - component: {fileID: 506275492875965220}
+  - component: {fileID: 2841686786122167157}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3793508176197929554
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3391897974650891347}
+  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: 3401713860920412346}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &506275492875965220
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3391897974650891347}
+  m_CullTransparentMesh: 1
+--- !u!114 &2841686786122167157
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3391897974650891347}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.21568629, g: 0.50980395, b: 0.43137258, 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: 0}
+  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
+  _icon_name: btn_24
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &3694727049325856288
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7864742459384017618}
+  - component: {fileID: 1857406282712736881}
+  - component: {fileID: 1270212801257857653}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: SentimentEffectWidget
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7864742459384017618
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3694727049325856288}
+  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: 3401713860920412346}
+  m_Father: {fileID: 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: -7, y: 408}
+  m_SizeDelta: {x: 248, y: 236}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1857406282712736881
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3694727049325856288}
+  m_CullTransparentMesh: 1
+--- !u!114 &1270212801257857653
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3694727049325856288}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data: []
+  isAssetBundle: 1
+--- !u!1 &6543777495714282891
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3401713860920412346}
+  - component: {fileID: 3109019948209640849}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Button
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3401713860920412346
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6543777495714282891}
+  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: 3793508176197929554}
+  m_Father: {fileID: 7864742459384017618}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3109019948209640849
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6543777495714282891}
+  m_CullTransparentMesh: 1

Assets/Res/UI/SentimentPanel/SentimentEffectWidget.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Wn4e43mrAX71VeIM4ZNeXp0Xk1yvaw8a4iRWQx1IT+pK6PLOJAzA4WWcPasH
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/SentimentPanel/SentimentInfoPanel.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!1 &385161379519398555
+--- !u!1 &232778302158126856
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,44 +8,132 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 8123689393780537258}
-  - component: {fileID: 8407378166907742849}
+  - component: {fileID: 8702795168959758065}
+  - component: {fileID: 1355547739017730002}
+  - component: {fileID: 6369946979264677772}
+  - component: {fileID: 5723639511191854946}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Button
+  m_Name: Btn_LingWu
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &8123689393780537258
+--- !u!224 &8702795168959758065
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 385161379519398555}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_GameObject: {fileID: 232778302158126856}
+  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: 7722911794395346242}
-  m_Father: {fileID: 3651673096014695874}
+  - {fileID: 1511940799475884827}
+  m_Father: {fileID: 2094779113935113657}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8407378166907742849
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: -0.000005364418, y: 8.2}
+  m_SizeDelta: {x: 159.8153, y: 50.5345}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &1355547739017730002
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 385161379519398555}
+  m_GameObject: {fileID: 232778302158126856}
   m_CullTransparentMesh: 1
+--- !u!114 &6369946979264677772
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 232778302158126856}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, 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: 0}
+  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
+  _icon_name: btn_shengji
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &5723639511191854946
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 232778302158126856}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 6369946979264677772}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &1256996740201335001
 GameObject:
   m_ObjectHideFlags: 0
@@ -59,7 +147,7 @@ GameObject:
   - component: {fileID: 7122415721055615620}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Text (Legacy) (1)
+  m_Name: Text_Desc
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -81,7 +169,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: 36, y: -76}
+  m_AnchoredPosition: {x: 36, y: -59.2}
   m_SizeDelta: {x: 582.1475, y: 77.5977}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &6960150362253834155
@@ -135,6 +223,8 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 5355338081498464365}
+  - component: {fileID: 5189416393149688706}
+  - component: {fileID: 8108906799740063584}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Content
@@ -160,8 +250,46 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 300}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
+--- !u!114 &5189416393149688706
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1535957553623792835}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 2
+--- !u!114 &8108906799740063584
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1535957553623792835}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_StartCorner: 0
+  m_StartAxis: 0
+  m_CellSize: {x: 141, y: 134}
+  m_Spacing: {x: 73.63, y: 73.63}
+  m_Constraint: 1
+  m_ConstraintCount: 3
 --- !u!1 &1979970940742213357
 GameObject:
   m_ObjectHideFlags: 0
@@ -295,6 +423,86 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &2743816543646761411
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1511940799475884827}
+  - component: {fileID: 4283190306314896791}
+  - component: {fileID: 2742275240557764076}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_LingWu
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1511940799475884827
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2743816543646761411}
+  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: 8702795168959758065}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4283190306314896791
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2743816543646761411}
+  m_CullTransparentMesh: 1
+--- !u!114 &2742275240557764076
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2743816543646761411}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 27
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u9886\u609F"
 --- !u!1 &2818405479463266363
 GameObject:
   m_ObjectHideFlags: 0
@@ -408,7 +616,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: 7.7511}
+  m_AnchoredPosition: {x: -0, y: 20}
   m_SizeDelta: {x: 570.3065, y: 528.4978}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1879486292270132546
@@ -426,7 +634,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2871436523937765220}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
@@ -479,6 +687,86 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &2877941877013801649
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6381722401322679321}
+  - component: {fileID: 8262373986634322139}
+  - component: {fileID: 3601304011763554745}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_Level
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6381722401322679321
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2877941877013801649}
+  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: 2094779113935113657}
+  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: 94.700005}
+  m_SizeDelta: {x: 282.5201, y: 32.4054}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &8262373986634322139
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2877941877013801649}
+  m_CullTransparentMesh: 1
+--- !u!114 &3601304011763554745
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2877941877013801649}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 26
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5F53\u524D\u5C42 \uFF1A1/5"
 --- !u!1 &4898189022425983401
 GameObject:
   m_ObjectHideFlags: 0
@@ -690,12 +978,15 @@ RectTransform:
   m_Children:
   - {fileID: 1207732784696938437}
   - {fileID: 1555521516844959039}
+  - {fileID: 6381722401322679321}
+  - {fileID: 2574349217801000201}
+  - {fileID: 8702795168959758065}
   m_Father: {fileID: 2042784205301195018}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0}
   m_AnchoredPosition: {x: -0.000030517578, y: 0}
-  m_SizeDelta: {x: 0, y: 237.3718}
+  m_SizeDelta: {x: 0, y: 266.6316}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &8643199852993090924
 CanvasRenderer:
@@ -747,72 +1038,6 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
---- !u!1 &7840268188030007600
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3651673096014695874}
-  - component: {fileID: 5066164622652955489}
-  - component: {fileID: 5631970264589426021}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: SentimentEffectWidget
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &3651673096014695874
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7840268188030007600}
-  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: 8123689393780537258}
-  m_Father: {fileID: 9037135992368401232}
-  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: -7, y: 408}
-  m_SizeDelta: {x: 248, y: 236}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5066164622652955489
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7840268188030007600}
-  m_CullTransparentMesh: 1
---- !u!114 &5631970264589426021
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7840268188030007600}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  data:
-  - key: Text_Name
-    gameObject: {fileID: 0}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
-  isAssetBundle: 1
 --- !u!1 &7893248989412750683
 GameObject:
   m_ObjectHideFlags: 0
@@ -917,7 +1142,7 @@ GameObject:
   - component: {fileID: 8478069992445658282}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Text (Legacy)
+  m_Name: Text_Name
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -984,94 +1209,6 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u900D\u9065\u81EA\u5728"
---- !u!1 &8113804211359339331
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 7722911794395346242}
-  - component: {fileID: 6381268814777101364}
-  - component: {fileID: 8712151764225297509}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: myImage (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &7722911794395346242
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8113804211359339331}
-  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: 8123689393780537258}
-  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: 248, y: 236}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6381268814777101364
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8113804211359339331}
-  m_CullTransparentMesh: 1
---- !u!114 &8712151764225297509
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8113804211359339331}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.21568629, g: 0.50980395, b: 0.43137258, 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: 0}
-  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
-  _icon_name: btn_24
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
-  packInfo:
-    packName: tongyong
-    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
-    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
 --- !u!1 &8994874510214016950
 GameObject:
   m_ObjectHideFlags: 0
@@ -1132,10 +1269,82 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: SentimentWidgetGams
+  - key: MainSentimentEffectWidget
     gameObject: {fileID: 7840268188030007600}
     isAssetBundle: 0
-    isList: 1
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 7840268188030007600}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+  - key: ItemWidgetType1Gam
+    gameObject: {fileID: 5488530608569697549}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 7840268188030007600}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+  - key: Text_Name
+    gameObject: {fileID: 8478069992445658282}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 7840268188030007600}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+  - key: Text_Desc
+    gameObject: {fileID: 7122415721055615620}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 7840268188030007600}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+  - key: Text_Level
+    gameObject: {fileID: 3601304011763554745}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 7840268188030007600}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+  - key: Btn_LingWu
+    gameObject: {fileID: 5723639511191854946}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 7840268188030007600}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+  - key: Content
+    gameObject: {fileID: 5355338081498464365}
+    isAssetBundle: 0
+    isList: 0
     ListCollectorDatas:
     - gameObject: {fileID: 7840268188030007600}
     - gameObject: {fileID: 0}
@@ -1145,3 +1354,261 @@ MonoBehaviour:
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
   isAssetBundle: 1
+--- !u!1001 &6883880457042837264
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 9037135992368401232}
+    m_Modifications:
+    - target: {fileID: 3694727049325856288, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
+      propertyPath: m_Name
+      value: SentimentEffectWidget
+      objectReference: {fileID: 0}
+    - target: {fileID: 7864742459384017618, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7864742459384017618, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7864742459384017618, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7864742459384017618, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7864742459384017618, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7864742459384017618, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7864742459384017618, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 248
+      objectReference: {fileID: 0}
+    - target: {fileID: 7864742459384017618, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 236
+      objectReference: {fileID: 0}
+    - target: {fileID: 7864742459384017618, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7864742459384017618, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7864742459384017618, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7864742459384017618, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7864742459384017618, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7864742459384017618, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7864742459384017618, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7864742459384017618, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -7
+      objectReference: {fileID: 0}
+    - target: {fileID: 7864742459384017618, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 408
+      objectReference: {fileID: 0}
+    - target: {fileID: 7864742459384017618, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7864742459384017618, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7864742459384017618, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
+--- !u!224 &3651673096014695874 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 7864742459384017618, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
+  m_PrefabInstance: {fileID: 6883880457042837264}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &7840268188030007600 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3694727049325856288, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
+  m_PrefabInstance: {fileID: 6883880457042837264}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &8548614426491118353
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 2094779113935113657}
+    m_Modifications:
+    - target: {fileID: 4218159833380005404, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_Name
+      value: ItemWidgetType1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5709030067082120474, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_Color.b
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5709030067082120474, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_Color.g
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5709030067082120474, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_Color.r
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 31.338501
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 65.4
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7091371511447556559, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7091371511447556559, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7091371511447556559, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 36
+      objectReference: {fileID: 0}
+    - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 44.4249
+      objectReference: {fileID: 0}
+    - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -15.66925
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+--- !u!224 &2574349217801000201 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+  m_PrefabInstance: {fileID: 8548614426491118353}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &5488530608569697549 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4218159833380005404, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+  m_PrefabInstance: {fileID: 8548614426491118353}
+  m_PrefabAsset: {fileID: 0}

Assets/Scripts/GameUI/EventManager/DialogueManager.cs

@@ -48,22 +48,9 @@ public class DialogueManager : Singleton<DialogueManager>
         // EndDialogue1();
     }
 
-    private void PlayDialogue(int dialogueID)
+    private void UpdateDiaLogutLinkId(int dialogueID)
     {
         currentDialogueID = dialogueID;
-        // 找到当前对话组
-        var dialogueConfig = ConfigComponent.Instance.Get<EventLinkConfig>(dialogueID);
-      
-
-
-        // foreach (var eventConditionData in eventLinkDatas.eventConditions)
-        // {
-        //     if (!EventSystemManager.Instance.IsEvenkLinkComplete(eventConditionData))
-        //     {
-        //         TipMessagePanel.OpenTipMessagePanel(EventHelper.GetTaskMessage(eventConditionData));
-        //       
-        //     }
-        // }
 
 
         //神识探索的事件记录步骤
@@ -78,7 +65,17 @@ public class DialogueManager : Singleton<DialogueManager>
                     EventSystemManager.Instance.CurrentEventList.selectEventLinkIds.Add(currentDialogueID);
             }
         }
-        
+    }
+
+    private void PlayDialogue(int dialogueID)
+    {
+        currentDialogueID = dialogueID;
+
+        UpdateDiaLogutLinkId(dialogueID);
+        // 找到当前对话组
+        var dialogueConfig = ConfigComponent.Instance.Get<EventLinkConfig>(dialogueID);
+
+
         if (CurrentEventList != null)
         {
             var eventLinkDatas = CurrentEventList.eventLinks.FirstOrDefault(el => el.eventLinkId == dialogueID);
@@ -247,6 +244,17 @@ public class DialogueManager : Singleton<DialogueManager>
             // case 4:
             //     PlayerManager.Instance.BagController.DeductItem(dialogueConfig.ConditionPara[0], dialogueConfig.finishCount);
             //     break;
+
+            //关闭任务
+            case 5:
+                if (dialogueConfig.ResultType == 1)
+                {
+                    UpdateDiaLogutLinkId(dialogueConfig.ResultOptions[0]);
+                }
+
+                onCancel?.Invoke();
+                return;
+                break;
         }
 
         if (CurrentEventList != null)
@@ -290,7 +298,6 @@ public class DialogueManager : Singleton<DialogueManager>
                     {
                         onCancel?.Invoke();
                     }
-                    
                 }
 
                 break;

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentEffectWidget.cs

@@ -0,0 +1,29 @@
+namespace Fort23.Mono
+{
+	[UIBinding(prefab = "SentimentEffectWidget"  )]
+	public partial class SentimentEffectWidget : UIComponent
+	{
+		private void Init()
+		{
+
+		}
+		public override void AddEvent()
+		{
+
+		}
+		public override void DelEvent()
+		{
+
+		}
+		public override void AddButtonEvent()
+		{
+
+		}
+
+		public void CustomInit(AccountFileInfo.SentimentProperty sentimentProperty)
+		{
+			
+		}
+
+	}
+}

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentEffectWidget.cs.meta

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

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentInfoPanel.cs

@@ -0,0 +1,38 @@
+using Fort23.Core;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "SentimentInfoPanel")]
+    public partial class SentimentInfoPanel : UIPanel
+    {
+        private AccountFileInfo.SentimentData sentimentData;
+
+        private void Init()
+        {
+        }
+
+        protected override void AddEvent()
+        {
+        }
+
+        protected override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+            Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
+        }
+
+        public override CTask<bool> AsyncInit(object[] uiData)
+        {
+            sentimentData = uiData[0] as AccountFileInfo.SentimentData;
+            return base.AsyncInit(uiData);
+        }
+
+        public async CTask OpenPanel(AccountFileInfo.SentimentData sentimentData)
+        {
+            await UIManager.Instance.LoadAndOpenPanel<SentimentInfoPanel>(null, uiData: new object[] { sentimentData });
+        }
+    }
+}

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentInfoPanel.cs.meta

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

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentInfoPanelData.cs

@@ -0,0 +1,106 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class SentimentInfoPanel 
+	{
+	  #region 自定义数据 
+	  private Button _Btn_Close;
+	  public Button Btn_Close
+	   {
+	   get{
+	      if (_Btn_Close == null)
+	       {
+	         _Btn_Close  = GetUIUnit<Button>("Btn_Close"); 
+	       }
+	      return _Btn_Close;
+	     }
+	   }
+	  private GameObject _MainSentimentEffectWidget;
+	  public GameObject MainSentimentEffectWidget
+	   {
+	   get{
+	      if (_MainSentimentEffectWidget == null)
+	       {
+	         _MainSentimentEffectWidget  = GetUIUnit<GameObject>("MainSentimentEffectWidget"); 
+	       }
+	      return _MainSentimentEffectWidget;
+	     }
+	   }
+	  private GameObject _ItemWidgetType1Gam;
+	  public GameObject ItemWidgetType1Gam
+	   {
+	   get{
+	      if (_ItemWidgetType1Gam == null)
+	       {
+	         _ItemWidgetType1Gam  = GetUIUnit<GameObject>("ItemWidgetType1Gam"); 
+	       }
+	      return _ItemWidgetType1Gam;
+	     }
+	   }
+	  private Text _Text_Name;
+	  public Text Text_Name
+	   {
+	   get{
+	      if (_Text_Name == null)
+	       {
+	         _Text_Name  = GetUIUnit<Text>("Text_Name"); 
+	       }
+	      return _Text_Name;
+	     }
+	   }
+	  private Text _Text_Desc;
+	  public Text Text_Desc
+	   {
+	   get{
+	      if (_Text_Desc == null)
+	       {
+	         _Text_Desc  = GetUIUnit<Text>("Text_Desc"); 
+	       }
+	      return _Text_Desc;
+	     }
+	   }
+	  private Text _Text_Level;
+	  public Text Text_Level
+	   {
+	   get{
+	      if (_Text_Level == null)
+	       {
+	         _Text_Level  = GetUIUnit<Text>("Text_Level"); 
+	       }
+	      return _Text_Level;
+	     }
+	   }
+	  private Button _Btn_LingWu;
+	  public Button Btn_LingWu
+	   {
+	   get{
+	      if (_Btn_LingWu == null)
+	       {
+	         _Btn_LingWu  = GetUIUnit<Button>("Btn_LingWu"); 
+	       }
+	      return _Btn_LingWu;
+	     }
+	   }
+	  private RectTransform _Content;
+	  public RectTransform Content
+	   {
+	   get{
+	      if (_Content == null)
+	       {
+	         _Content  = GetUIUnit<RectTransform>("Content"); 
+	       }
+	      return _Content;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentInfoPanelData.cs.meta

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