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

Assets/Res/AnimtionCurveLibrary/GameAnimationCurveLibrary.asset

@@ -82,6 +82,39 @@ MonoBehaviour:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
+  JumpY:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 1.4183592
+      outSlope: 1.4183592
+      tangentMode: 34
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.5990832
+      value: 0.8497151
+      inSlope: 1.0030364
+      outSlope: 1.0030364
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.48756155
+    - serializedVersion: 3
+      time: 1
+      value: 1
+      inSlope: 0.13476646
+      outSlope: 0.13476646
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.5600396
+      outWeight: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
   fabaoAtt:
     serializedVersion: 2
     m_Curve:

Assets/Res/UI/DialoguePanel/DialogueBubblePanel.prefab

@@ -479,7 +479,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &948722669700608952
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -96,6 +96,82 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!1 &423032053834936686
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7991042903017610511}
+  - component: {fileID: 6999292764514718436}
+  - component: {fileID: 4206909756989078852}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Handle
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7991042903017610511
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 423032053834936686}
+  m_LocalRotation: {x: -0, y: -0, z: 0.71000355, w: 0.7041981}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8853702443283609107}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90.47}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: -0.3049996}
+  m_SizeDelta: {x: 40, y: 15.35}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6999292764514718436
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 423032053834936686}
+  m_CullTransparentMesh: 1
+--- !u!114 &4206909756989078852
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 423032053834936686}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 03842b4f66c204983a211006f597bb4b, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &770259465006051386
 GameObject:
   m_ObjectHideFlags: 0
@@ -539,6 +615,43 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 73747c90ef6f3497ab9cd07d8ff19dd0
+--- !u!1 &2067316311261386271
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6647451473267767034}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Fill Area
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6647451473267767034
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2067316311261386271}
+  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: 5882913974828552639}
+  m_Father: {fileID: 4048428373501315793}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.25}
+  m_AnchorMax: {x: 1, y: 0.75}
+  m_AnchoredPosition: {x: -5, y: 0}
+  m_SizeDelta: {x: -20, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &2206965197882195376
 GameObject:
   m_ObjectHideFlags: 0
@@ -686,6 +799,97 @@ MonoBehaviour:
   m_Spacing: {x: 0, y: -50.3}
   m_Constraint: 0
   m_ConstraintCount: 2
+--- !u!1 &2484980549804746481
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4048428373501315793}
+  - component: {fileID: 4391221413790696349}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: CameraSelect
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4048428373501315793
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2484980549804746481}
+  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: 9168279217466308750}
+  - {fileID: 6647451473267767034}
+  - {fileID: 8853702443283609107}
+  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: -258.1, y: -487.9}
+  m_SizeDelta: {x: 160, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &4391221413790696349
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2484980549804746481}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, 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: 4206909756989078852}
+  m_FillRect: {fileID: 5882913974828552639}
+  m_HandleRect: {fileID: 7991042903017610511}
+  m_Direction: 0
+  m_MinValue: 0
+  m_MaxValue: 1
+  m_WholeNumbers: 0
+  m_Value: 0
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &2612461740519665566
 GameObject:
   m_ObjectHideFlags: 0
@@ -1320,6 +1524,82 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 73747c90ef6f3497ab9cd07d8ff19dd0
+--- !u!1 &3838446993191253101
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5882913974828552639}
+  - component: {fileID: 4844010585154998816}
+  - component: {fileID: 2002541408010012067}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Fill
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5882913974828552639
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3838446993191253101}
+  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: 6647451473267767034}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 10, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4844010585154998816
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3838446993191253101}
+  m_CullTransparentMesh: 1
+--- !u!114 &2002541408010012067
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3838446993191253101}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &4316868802843550002
 GameObject:
   m_ObjectHideFlags: 0
@@ -1978,6 +2258,43 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 73747c90ef6f3497ab9cd07d8ff19dd0
+--- !u!1 &8091980665139676657
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8853702443283609107}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Handle Slide Area
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8853702443283609107
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8091980665139676657}
+  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: 7991042903017610511}
+  m_Father: {fileID: 4048428373501315793}
+  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: -20, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &8542463699263459027
 GameObject:
   m_ObjectHideFlags: 0
@@ -2158,6 +2475,82 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &8986363544919513421
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 9168279217466308750}
+  - component: {fileID: 3862447913992152294}
+  - component: {fileID: 8789007335362210979}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Background
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9168279217466308750
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8986363544919513421}
+  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: 4048428373501315793}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.25}
+  m_AnchorMax: {x: 1, y: 0.75}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3862447913992152294
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8986363544919513421}
+  m_CullTransparentMesh: 1
+--- !u!114 &8789007335362210979
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8986363544919513421}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &8994874510214016950
 GameObject:
   m_ObjectHideFlags: 0
@@ -2188,6 +2581,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 4048428373501315793}
   - {fileID: 6895274337125899519}
   - {fileID: 1798015912972164048}
   - {fileID: 6634741294730613967}
@@ -2233,12 +2627,17 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: Text (Legacy) (1)
+  - key: Text_ExplorationProgress
     gameObject: {fileID: 2298873888804225080}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  isAssetBundle: 1
+  - key: CameraSelect
+    gameObject: {fileID: 4391221413790696349}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 0
 --- !u!1 &9153091249090986804
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/RewardsPanel/ShowItemNumberCom.prefab

@@ -0,0 +1,238 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &2311896207658132684
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2071401264842426928}
+  - component: {fileID: 5668092925206625825}
+  - component: {fileID: 8376924640516992993}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Item
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2071401264842426928
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2311896207658132684}
+  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: 4728143542991051966}
+  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: -26.2098, y: 0.3}
+  m_SizeDelta: {x: 47.5803, y: 47.58}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5668092925206625825
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2311896207658132684}
+  m_CullTransparentMesh: 1
+--- !u!114 &8376924640516992993
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2311896207658132684}
+  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: 21300000, guid: aede80725d7ea9847aba7ca1664aa3c8, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_eq_4_1_1
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: allIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    lasetJsonGUID: 
+--- !u!1 &8646299697326961619
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4728143542991051966}
+  - component: {fileID: 9111758787558866785}
+  - component: {fileID: 9160525272223938117}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: ShowItemNumberCom
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4728143542991051966
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8646299697326961619}
+  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: 2071401264842426928}
+  - {fileID: 8305414635516840236}
+  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: -2317.6138, y: 973.8722}
+  m_SizeDelta: {x: 188.7725, y: 61.7444}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9111758787558866785
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8646299697326961619}
+  m_CullTransparentMesh: 1
+--- !u!114 &9160525272223938117
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8646299697326961619}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Icon_Item
+    gameObject: {fileID: 8376924640516992993}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Number
+    gameObject: {fileID: 2628316432632847572}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!1 &9064707866169406707
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8305414635516840236}
+  - component: {fileID: 8782582591641023350}
+  - component: {fileID: 2628316432632847572}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_Number
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8305414635516840236
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9064707866169406707}
+  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: 4728143542991051966}
+  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: 40.32522, y: -0.6}
+  m_SizeDelta: {x: 66.4504, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8782582591641023350
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9064707866169406707}
+  m_CullTransparentMesh: 1
+--- !u!114 &2628316432632847572
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9064707866169406707}
+  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: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 21
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: +100

Assets/Res/UI/RewardsPanel/ShowItemNumberCom.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: W31Lsir4B3wcQcmcLp7X3Xle+cD4LQSK8GzQug+xxEvn3RNwuhLNPlu04nDN
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Core/UI/UTool/CTween/AnimationCurveLibrary.cs

@@ -18,6 +18,7 @@ public class AnimationCurveLibrary : ScriptableObject
     // [Header("UI显示大小")] public AnimationCurve ui_showSize;
     [Header("UI移动大小")] public AnimationCurve ui_moveSize;
     [Header("UI移动速度")] public AnimationCurve ui_moveSpped;
+    [Header("获得道具曲线")] public AnimationCurve JumpY;
     [Header("法宝攻击速度曲线")] public AnimationCurve fabaoAtt;
     [Header("法宝对拼速度曲线")] public AnimationCurve fabaoDuiPing;
     [Header("一次对拼的速度")]public float fabaoSpeed=0.7f;

Assets/Scripts/GameLogic/EventManager/DialogueManager.cs

@@ -7,6 +7,7 @@ using Fort23.Core;
 using Fort23.Mono;
 using Fort23.UTool;
 using GameLogic.Bag;
+using GameLogic.Combat.CombatTool;
 using UnityEngine;
 using Utility;
 
@@ -115,6 +116,7 @@ public class DialogueManager : Singleton<DialogueManager>
                         cTask.SetResult();
                     });
                 await cTask;
+                dialogue.ChangeComabtState(CombatController.idle);
                 break;
             //获得奖励
             case 3:
@@ -125,7 +127,7 @@ public class DialogueManager : Singleton<DialogueManager>
                     itemInfos.Add(itemInfo);
                 }
 
-                await dialogue.OpenRewardsPanel(itemInfos);
+                await dialogue.OpenRewardsPanel(eventConfig.ID,itemInfos);
                 LogTool.Log("对话结束，获得奖励");
                 break;
         }

Assets/Scripts/GameLogic/EventManager/DialogueMono.cs

@@ -9,8 +9,10 @@ public interface IDialogueMono
     void OpenDialoguePanel(int id, string[] icon, ShowDialogueEventData.MessageShowType messageShowType,
         Action<int?> finish);
 
-    CTask OpenRewardsPanel(List<ItemInfo> rewardsDic, Action onClose = null, int titleId = 0);
+    CTask OpenRewardsPanel(int eventId, List<ItemInfo> rewardsDic, Action onClose = null, int titleId = 0);
 
     CTask OpenDialoguePanel(int id, Action<int?> finish);
     void StartCombat(int levelBattle,System.Action<bool> finishCombat);
+
+    void ChangeComabtState(string state);
 }

Assets/Scripts/GameLogic/EventManager/EventSystemManager.cs

@@ -4,6 +4,8 @@ using Core.Language;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
+using GameLogic.Combat;
+using GameLogic.Combat.CombatTool;
 using UnityEngine;
 using Utility;
 using Random = UnityEngine.Random;
@@ -14,12 +16,16 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
     List<AccountFileInfo.EventData> eventDatas = new List<AccountFileInfo.EventData>();
 
+    IDialogueMono dialogueMono;
+
     public AccountFileInfo.EventList CurrentEventList;
 
-    public void CustomInit()
+    public bool isTriggerEvent;
+
+    public void CustomInit(IDialogueMono dialogueMono)
     {
         eventConfigs = ConfigComponent.Instance.GetAll<EventConfig>().ToList();
-
+        this.dialogueMono = dialogueMono;
         StaticUpdater.Instance.AddRenderUpdateCallBack(Update);
     }
 
@@ -71,6 +77,8 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
     private List<EventConfig> DetectEvents(int bigMapId, int eventCount)
     {
+        if (isTriggerEvent)
+            return default;
         BigMap bigMap = ConfigComponent.Instance.Get<BigMap>(bigMapId);
         DivineSenseConfig divineSenseConfig = ConfigComponent.Instance.Get<DivineSenseConfig>(AccountFileInfo.Instance.playerData.divineSenseLevel);
 
@@ -129,6 +137,8 @@ public class EventSystemManager : Singleton<EventSystemManager>
     /// </summary>
     public void DetectRandomEvents()
     {
+        if (isTriggerEvent)
+            return;
         // 获取随机事件
         List<EventConfig> randomEvents = eventConfigs.Where(e => e.EventTriggerType == 2 && CanTriggerEvent(e.ID)).ToList();
 
@@ -140,7 +150,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         }
 
 
-        int idex = Random.Range(1, randomEvents.Count);
+        int idex = Random.Range(0, randomEvents.Count);
         TriggerEvent(randomEvents[idex]);
     }
 
@@ -150,7 +160,11 @@ public class EventSystemManager : Singleton<EventSystemManager>
     /// </summary>
     public void TriggerEvent(EventConfig evt)
     {
+        if (isTriggerEvent)
+            return;
+        isTriggerEvent = true;
         LogTool.Log($"触发事件: {evt.Description} (ID: {evt.ID}, 品质: {evt.EventQuality})");
+        dialogueMono.ChangeComabtState(CombatController.idle);
 
         DialogueManager.Instance.StartDialogue(evt.EventType, evt.ID, () => { CompleteEvent(evt.ID); });
     }
@@ -160,6 +174,9 @@ public class EventSystemManager : Singleton<EventSystemManager>
     /// </summary>
     public void TriggerEvent(AccountFileInfo.EventList evt)
     {
+        if (isTriggerEvent)
+            return;
+        isTriggerEvent = true;
         EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(evt.eventID);
         LogTool.Log($"触发事件: {LanguageManager.Instance.Text(eventConfig.Description)} (ID: {eventConfig.ID}, 品质: {eventConfig.EventQuality})");
 
@@ -174,7 +191,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         }
 
         CurrentEventList = evt;
-
+        dialogueMono.ChangeComabtState(CombatController.idle);
         DialogueManager.Instance.StartDialogue(dialogueID, eventConfig.ID, () => { CompleteEvent(); });
     }
 
@@ -225,6 +242,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
     /// <param name="eventID">事件ID</param>
     public void CompleteEvent(int eventID)
     {
+        isTriggerEvent = false;
         LogTool.Log($"完成事件{eventID}");
         AccountFileInfo.EventData eventData = AccountFileInfo.Instance.playerData.events.FirstOrDefault((e) => e.eventID == eventID);
         if (eventData == null)
@@ -241,6 +259,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
 
         AccountFileInfo.Instance.SavePlayerData();
+        dialogueMono.ChangeComabtState(CombatController.update);
 
         // EventManager.Instance.Dispatch(CustomEventType.CompleteEvent, null);
     }
@@ -251,6 +270,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
     /// <param name="eventID">事件ID</param>
     public void CompleteEvent()
     {
+        isTriggerEvent = false;
         LogTool.Log($"完成事件{CurrentEventList.eventID}");
         AccountFileInfo.EventData eventData = AccountFileInfo.Instance.playerData.events.FirstOrDefault((e) => e.eventID == CurrentEventList.eventID);
         if (eventData == null)
@@ -270,5 +290,6 @@ public class EventSystemManager : Singleton<EventSystemManager>
         AccountFileInfo.Instance.SavePlayerData();
 
         EventManager.Instance.Dispatch(CustomEventType.CompleteEvent, null);
+        dialogueMono.ChangeComabtState(CombatController.update);
     }
 }

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -30,7 +30,7 @@ public class PlayerManager : Singleton<PlayerManager>
         SetConfigs();
         AccountFileInfo.Instance.LoadPlayerData();
         InitGameData();
-        EventSystemManager.Instance.CustomInit();
+      
        
     }
 

Assets/Scripts/GameUI/DialogueMono.cs

@@ -1,10 +1,13 @@
 using System;
 using System.Collections.Generic;
 using Common.Utility.CombatEvent;
+using Excel2Json;
 using Fort23.Core;
 using Fort23.Mono;
+using Fort23.UTool;
 using GameLogic.Bag;
 using GameLogic.Combat;
+using UnityEngine;
 
 namespace GameUI
 {
@@ -16,12 +19,22 @@ namespace GameUI
             DialoguePanel.OpenDialoguePanel(id, icon, messageShowType, finish);
         }
 
-        public async CTask OpenRewardsPanel(List<ItemInfo> rewardsDic, Action onClose = null, int titleId = 0)
+        public async CTask OpenRewardsPanel(int eventId, List<ItemInfo> rewardsDic, Action onClose = null, int titleId = 0)
         {
-            CTask cTask = CTask.Create();
-            RewardsPanel rewardsPanel = await RewardsPanel.OpenPanel(rewardsDic, onClose, titleId);
-            await rewardsPanel.UIClosed();
-            cTask.SetResult();
+            EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventId);
+            if (eventConfig.EventTriggerType == 2)
+            {
+                Vector3 worldPos =CombatDrive.Instance.CombatController.CombatHeroController.playerHeroEntity.combatHeroGameObject.hpTransform.position;
+
+                worldPos.y += 0.5f;
+                await ShowItemNumberCom.Open(worldPos, rewardsDic[0]);
+                await TimerComponent.Instance.WaitAsync(100);
+            }
+            else
+            {
+                RewardsPanel rewardsPanel = await RewardsPanel.OpenPanel(rewardsDic, onClose, titleId);
+                await rewardsPanel.UIClosed();
+            }
         }
 
         public async CTask OpenDialoguePanel(int id, Action<int?> finish)
@@ -33,5 +46,10 @@ namespace GameUI
         {
             CombatDrive.Instance.LoadLevelBattleCombat(levelBattle, finishCombat);
         }
+
+        public void ChangeComabtState(string state)
+        {
+            CombatDrive.Instance.CombatController.ChangeState(state);
+        }
     }
 }

Assets/Scripts/GameUI/GameApplction.cs

@@ -112,8 +112,9 @@ public class GameApplction : IGameStart
         //     LogTool.Error("登陆失败");
         //     return;
         // }
-        DialogueManager.Instance.CustomInit(new DialogueMono());
-
+        DialogueMono dialogueMono = new DialogueMono();
+        DialogueManager.Instance.CustomInit(dialogueMono);
+        EventSystemManager.Instance.CustomInit(dialogueMono);
         PlayerManager.Instance.Init();
         // PlayerManager.Instance.InitTestHero();
 

Assets/Scripts/GameUI/UI/DialoguePanel/DialogueBubblePanel.cs

@@ -142,16 +142,21 @@ namespace Fort23.Mono
 
         public void Update()
         {
-            Vector3 p = CombatDrive.Instance.CombatController.CombatHeroController.playerHeroEntity.GameObject.transform.Find("hitpos").position;
-            p.x -= 0.2f;
-            p.y += 0.7f;
-            p = CombatDrive.Instance.CombatController.CombatCameraControllder.Camera.WorldToScreenPoint(p);
-            p = UIManager.Instance.UICamera.ScreenToWorldPoint(p);
-
-
-            p = transform.worldToLocalMatrix * p;
-
-            dotPoint.anchoredPosition = p;
+            // Vector3 p = CombatDrive.Instance.CombatController.CombatHeroController.playerHeroEntity.GameObject.transform.Find("hitpos").position;
+            // p.x -= 0.2f;
+            // p.y += 0.7f;
+            // p = CombatDrive.Instance.CombatController.CombatCameraControllder.Camera.WorldToScreenPoint(p);
+            // p = UIManager.Instance.UICamera.ScreenToWorldPoint(p);
+            //
+            //
+            // p = transform.worldToLocalMatrix * p;
+            //
+            // dotPoint.anchoredPosition = p;
+
+            Vector3 worldPos = CombatDrive.Instance.CombatController.CombatHeroController.playerHeroEntity.combatHeroGameObject.hpTransform.position;
+            Vector3 p = UIManager.Instance.CurrCustomCameraStack.camera.WorldToScreenPoint(worldPos);
+            Vector3 p2 = UIManager.Instance.UICamera.ScreenToWorldPoint(p);
+            dotPoint.transform.position = p2;
 
             if (!_isUpdate) return;
 

Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -40,15 +40,35 @@ namespace Fort23.Mono
         public override void AddButtonEvent()
         {
             bnt_shengShi.onClick.AddListener(Bnt_shengShi_onClick);
+            CameraSelect.onValueChanged.AddListener(CameraSelect_onValueChanged);
         }
 
         public override CTask<bool> AsyncInit(object[] uiData)
         {
             Text_divineSensePoint.text = $"{AccountFileInfo.Instance.playerData.divineSensePoint}/{PlayerManager.Instance.gameConstantConfig.DetectEventCount}";
             CreatShengShiEvent();
+
             return base.AsyncInit(uiData);
         }
 
+        public async override CTask Show()
+        {
+            await base.Show();
+            SkillSelectPanel.OpenSkillSelectPanel();
+            CameraSelect.value = 0.7f;
+        }
+
+        private void CameraSelect_onValueChanged(float value)
+        {
+            if (CombatController.currActiveCombat == null ||
+                CombatController.currActiveCombat.CombatCameraControllder == null)
+            {
+                return;
+            }
+
+            CombatController.currActiveCombat.CombatCameraControllder.CameraSelect_onValueChanged(value);
+        }
+
         private async void Bnt_shengShi_onClick()
         {
             // EventSystemManager.Instance.DetectRandomEvents();
@@ -59,13 +79,13 @@ namespace Fort23.Mono
                 return;
             }
 
-          
+
             CombatController.currActiveCombat.CombatSenceController.StartPayShengShi(CombatController.currActiveCombat
                 .CombatHeroController.playerHeroEntity.GameObject.transform);
             List<AccountFileInfo.EventList> eventLists = EventSystemManager.Instance.UseDivinesense(1);
             if (eventLists == null || eventLists.Count == 0)
                 return;
-      
+
             AccountFileInfo.Instance.playerData.eventList.AddRange(eventLists);
             AccountFileInfo.Instance.SavePlayerData();
             CreatShengShiEvent();
@@ -83,7 +103,7 @@ namespace Fort23.Mono
                 shengShiEventWidget.InitShengShiEventWidget(AccountFileInfo.Instance.playerData.eventList[i]);
             }
         }
-        
+
 
         [CustomMethod(CustomMethodType.Update)]
         public void Update()

Assets/Scripts/GameUI/UI/MainPanel/MainPanelData.cs

@@ -52,6 +52,28 @@ namespace Fort23.Mono
 	      return _Text_divineSensePoint;
 	     }
 	   }
+	  private Text _Text_ExplorationProgress;
+	  public Text Text_ExplorationProgress
+	   {
+	   get{
+	      if (_Text_ExplorationProgress == null)
+	       {
+	         _Text_ExplorationProgress  = GetUIUnit<Text>("Text_ExplorationProgress"); 
+	       }
+	      return _Text_ExplorationProgress;
+	     }
+	   }
+	  private Slider _CameraSelect;
+	  public Slider CameraSelect
+	   {
+	   get{
+	      if (_CameraSelect == null)
+	       {
+	         _CameraSelect  = GetUIUnit<Slider>("CameraSelect"); 
+	       }
+	      return _CameraSelect;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/RewardsPanel/ShowItemNumberCom.cs

@@ -0,0 +1,68 @@
+using System.Drawing;
+using Fort23.Core;
+using GameLogic.Bag;
+using UnityEngine;
+using Utility.UITool;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "ShowItemNumberCom")]
+    public partial class ShowItemNumberCom : UIComponent
+    {
+        private float _currentTime;
+        private float _originY;
+        private TimerEntity _timerEntity;
+
+        private void Init()
+        {
+        }
+
+        public override void AddEvent()
+        {
+        }
+
+        public override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+        }
+
+        public static async CTask<ShowItemNumberCom> Open(Vector3 pos, ItemInfo itemInfo)
+        {
+            ShowItemNumberCom showItemNumberCom = await UIManager.Instance.CreateGComponent<ShowItemNumberCom>(null, UIManager.Instance.GetLayer(UILayer.Top));
+            Vector3 p = UIManager.Instance.CurrCustomCameraStack.camera.WorldToScreenPoint(pos);
+            Vector3 p2 = UIManager.Instance.UICamera.ScreenToWorldPoint(p);
+            showItemNumberCom.GObjectPoolInterface.GetComponent<RectTransform>().position = p2;
+            showItemNumberCom.ShowTips(itemInfo);
+            return showItemNumberCom;
+        }
+
+        public void ShowTips(ItemInfo itemInfo)
+        {
+            Vector3 pos = transform.GetComponent<RectTransform>().localPosition;
+            Text_Number.text = $"+{itemInfo.count}";
+            Icon_Item.gameObject.SetActive(true);
+            Text_Number.gameObject.SetActive(true);
+            Icon_Item.icon_name = itemInfo.config.icon;
+            _currentTime = 0;
+            _originY = transform.GetComponent<RectTransform>().localPosition.y;
+            _timerEntity = TimerComponent.Instance.AddTimer(20, (() => { Close(); }), 50, () =>
+            {
+                _currentTime += 0.02f;
+                float offsetY = _originY + AnimationCurveManager.Instance.AnimationCurveLibrary.JumpY.Evaluate(_currentTime) * 100;
+                transform.localPosition = new Vector3(pos.x, offsetY, pos.z);
+            });
+        }
+
+        public override void Close()
+        {
+            UIManager.Instance.DormancyGComponent(this);
+            _timerEntity?.Dispose();
+            _timerEntity = null;
+
+            base.Close();
+        }
+    }
+}

Assets/Scripts/GameUI/UI/RewardsPanel/ShowItemNumberCom.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: W3gbs3+rAi//OM5KPEatclNNjGV6BOo8+mE+BmBQVPz+fvPRcd3WXCTbCsG7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameUI/UI/RewardsPanel/ShowItemNumberComData.cs

@@ -0,0 +1,40 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class ShowItemNumberCom 
+	{
+	  #region 自定义数据 
+	  private MyImage _Icon_Item;
+	  public MyImage Icon_Item
+	   {
+	   get{
+	      if (_Icon_Item == null)
+	       {
+	         _Icon_Item  = GetUIUnit<MyImage>("Icon_Item"); 
+	       }
+	      return _Icon_Item;
+	     }
+	   }
+	  private Text _Text_Number;
+	  public Text Text_Number
+	   {
+	   get{
+	      if (_Text_Number == null)
+	       {
+	         _Text_Number  = GetUIUnit<Text>("Text_Number"); 
+	       }
+	      return _Text_Number;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

Assets/Scripts/GameUI/UI/RewardsPanel/ShowItemNumberComData.cs.meta

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

Assets/Scripts/GameUI/UI/RewardsPanel/WidgetItem.cs

@@ -87,13 +87,13 @@ namespace Fort23.Mono
                 // txtLv.text = itemInfo.eqInfo.level + "级";
                 txtLv.text = LanguageManager.Instance.Text(161, itemInfo.eqInfo.level);
             }
-            else if (itemInfo.config.itemTyp == 5)
-            {
-                heroShards.SetActive(true);
-                icon.gameObject.SetActive(false);
-                heroShardsIcon.icon_name = itemInfo.config.icon;
-                lvObj.SetActive(false);
-            }
+            // else if (itemInfo.config.itemTyp == 5)
+            // {
+            //     heroShards.SetActive(true);
+            //     icon.gameObject.SetActive(false);
+            //     heroShardsIcon.icon_name = itemInfo.config.icon;
+            //     lvObj.SetActive(false);
+            // }
             else
             {
                 icon.icon_name = itemInfo.config.icon;