Просмотр исходного кода

添加事件道具飞行逻辑

lzx 4 часов назад
Родитель
Сommit
2e02d9b1da

+ 101 - 0
Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -644,6 +644,7 @@ GameObject:
   - component: {fileID: 7449959451257012562}
   - component: {fileID: 1758095285339168937}
   - component: {fileID: 1757363523434306847}
+  - component: {fileID: 6943081701573180366}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Bag
@@ -721,6 +722,50 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &6943081701573180366
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4637709884184476223}
+  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: 1757363523434306847}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &5477700202101321355
 GameObject:
   m_ObjectHideFlags: 0
@@ -757,6 +802,7 @@ RectTransform:
   - {fileID: 6880477143338550539}
   - {fileID: 8657432734085162108}
   - {fileID: 7449959451257012562}
+  - {fileID: 8778198924923952917}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -852,7 +898,62 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Btn_Bag
+    gameObject: {fileID: 6943081701573180366}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: StartPos
+    gameObject: {fileID: 8778198924923952917}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!1 &5657917399314919801
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8778198924923952917}
+  - component: {fileID: 2741619962998697045}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: StartPos
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8778198924923952917
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5657917399314919801}
+  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: 1803833552231621266}
+  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: -9, y: 123}
+  m_SizeDelta: {x: 59, y: 70}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2741619962998697045
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5657917399314919801}
+  m_CullTransparentMesh: 1
 --- !u!1 &5697844006904391659
 GameObject:
   m_ObjectHideFlags: 0

+ 139 - 0
Assets/Res/UI/DivineSence/ShengShiEventWidgetType2.prefab

@@ -445,6 +445,139 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &1856204643308014621
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1007467258602941415}
+  - component: {fileID: 5373070942229805094}
+  - component: {fileID: 3767965018812077829}
+  - component: {fileID: 1980144549166862394}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Bag
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1007467258602941415
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1856204643308014621}
+  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: 3764721290890148754}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 96, y: -105}
+  m_SizeDelta: {x: 59, y: 70}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &5373070942229805094
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1856204643308014621}
+  m_CullTransparentMesh: 1
+--- !u!114 &3767965018812077829
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1856204643308014621}
+  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: dec_ziyuan1
+  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 &1980144549166862394
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1856204643308014621}
+  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: 3767965018812077829}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &1904131733610652650
 GameObject:
   m_ObjectHideFlags: 0
@@ -778,6 +911,7 @@ RectTransform:
   - {fileID: 7325153162450915011}
   - {fileID: 8173313993394265504}
   - {fileID: 6639653483637829207}
+  - {fileID: 1007467258602941415}
   m_Father: {fileID: 3370061335406075943}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -1088,6 +1222,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Btn_Bag
+    gameObject: {fileID: 1980144549166862394}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &6161269103075097772
 GameObject:

+ 40 - 73
Assets/Res/UI/ShowItemMoveToTargetPanel.prefab

@@ -1,5 +1,41 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &473839478582866589
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 9041996581372624861}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Ui
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9041996581372624861
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 473839478582866589}
+  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: 5356005532403119995}
+  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: 750, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1762987028035963860
 GameObject:
   m_ObjectHideFlags: 0
@@ -67,9 +103,9 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6127126221331158600}
-  - {fileID: 3118263861250186501}
   - {fileID: 468572457641896074}
-  - {fileID: 3536505121131481239}
+  - {fileID: 3118263861250186501}
+  - {fileID: 9041996581372624861}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -106,7 +142,7 @@ MonoBehaviour:
     isList: 0
     ListCollectorDatas: []
   - key: Ui
-    gameObject: {fileID: 3536505121131481239}
+    gameObject: {fileID: 9041996581372624861}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
@@ -135,7 +171,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5048446545418806876}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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
@@ -148,75 +184,6 @@ RectTransform:
   m_AnchoredPosition: {x: -71, y: 702}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &5793281267933635054
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3536505121131481239}
-  - component: {fileID: 6704702385722977685}
-  - component: {fileID: 7235788929534476578}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Ui
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &3536505121131481239
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5793281267933635054}
-  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: 5356005532403119995}
-  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: 750, y: 1624}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6704702385722977685
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5793281267933635054}
-  m_CullTransparentMesh: 1
---- !u!223 &7235788929534476578
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5793281267933635054}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 2
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 1
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 0
-  m_AdditionalShaderChannelsFlag: 0
-  m_UpdateRectTransformForStandalone: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 3
-  m_TargetDisplay: 0
 --- !u!1 &5911324704009596132
 GameObject:
   m_ObjectHideFlags: 0

+ 139 - 0
Assets/Res/UI/Task/TaskInfoPanel.prefab

@@ -88,6 +88,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Btn_Bag
+    gameObject: {fileID: 4716130951729731685}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &1408015899473625068
 GameObject:
@@ -192,6 +197,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8887379241100265904}
+  - {fileID: 441960678594688368}
   m_Father: {fileID: 8599819629026832582}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -383,6 +389,139 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &2684168885766463697
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 441960678594688368}
+  - component: {fileID: 6997832437470838236}
+  - component: {fileID: 1032955016433112978}
+  - component: {fileID: 4716130951729731685}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Bag
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &441960678594688368
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2684168885766463697}
+  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: 2569128129379278262}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -19.938171, y: -5.541382}
+  m_SizeDelta: {x: 59, y: 70}
+  m_Pivot: {x: 1, y: 1}
+--- !u!222 &6997832437470838236
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2684168885766463697}
+  m_CullTransparentMesh: 1
+--- !u!114 &1032955016433112978
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2684168885766463697}
+  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: dec_ziyuan1
+  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 &4716130951729731685
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2684168885766463697}
+  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: 1032955016433112978}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3552915526930824737
 GameObject:
   m_ObjectHideFlags: 0

+ 1 - 1
Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -350,7 +350,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
 
         public int eventID;
         
-        public List<ItemInfo> itemInfos = new List<ItemInfo>();
+        public List<ItemData> itemInfos = new List<ItemData>();
 
         public List<EventLinkData> eventLinks = new List<EventLinkData>();
 

+ 4 - 1
Assets/Scripts/GameUI/EventManager/DialogueManager.cs

@@ -350,7 +350,10 @@ public class DialogueManager : Singleton<DialogueManager>
         }
         else
         {
-            CurrentEventList.itemInfos.AddRange(rewardsDic);
+            foreach (var itemInfo in rewardsDic)
+            {
+                CurrentEventList.itemInfos.Add(itemInfo.ToItemData());
+            }
             AccountFileInfo.Instance.SavePlayerData();
             // RewardsPanel rewardsPanel = await RewardsPanel.OpenPanel(rewardsDic, onClose, titleId);
             // await rewardsPanel.UIClosed();

+ 6 - 1
Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -837,8 +837,13 @@ public class EventSystemManager : Singleton<EventSystemManager>
                 itemInfos.Add(new ItemInfo(eventConfig.PrizeIDs[i], eventConfig.PrizeNums[i]));
             }
         }
+        
+        foreach (var eventListItemInfo in eventList.itemInfos)
+        {
+            itemInfos.Add(new ItemInfo(eventListItemInfo));
+        }
 
-        itemInfos.AddRange(eventList.itemInfos);
+       
         PlayerManager.Instance.BagController.AddItem(itemInfos);
         RewardsPanel rewardsPanel = await RewardsPanel.OpenPanel(itemInfos);
         await rewardsPanel.UIClosed();

+ 1 - 1
Assets/Scripts/GameUI/GameApplction.cs

@@ -125,7 +125,7 @@ public class GameApplction : IGameStart
         //     skillInfo.index = -1;
         //     PlayerManager.Instance.GongFaControl.AddSkillInfo(skillInfo);
         // }
-
+        await ShowItemMoveToTargetPanel.OpenShowItemMoveToTargetPanel();
         PlayerManager.Instance.AddSentimentData(1);
         foreach (var playerDataAllSkillData in AccountFileInfo.Instance.playerData.AllSkillDatas)
         {

+ 53 - 24
Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -5,8 +5,11 @@ using Excel2Json;
 using Fort23.UTool;
 using UnityEngine;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Fort23.Core;
+using GameLogic.Bag;
+using GameLogic.Player;
 using UnityEngine.UI;
 
 namespace Fort23.Mono
@@ -40,6 +43,8 @@ namespace Fort23.Mono
 
         private GameObject shownextIcon;
 
+        private bool isOver;
+
         public static async void OpenDialoguePanel(AccountFileInfo.EventList CurrentEventList, int id, string[] icon,
             ShowDialogueEventData.MessageShowType messageShowType,
             Action<int?> finish)
@@ -95,23 +100,10 @@ namespace Fort23.Mono
                 ShowNextIcon();
                 if (index >= dialogueMessaga.Length)
                 {
-                    // 所有句子显示完成,检查是否有选项
-                    // if (eventConditionConfig.optionType == 1 && !_isShowingOptions)
-                    // {
-                    //     ShowOptions();
-                    // }
-
                     if (eventConditionConfig.ID != 0 && !_isShowingOptions)
                     {
                         ShowOptions();
                     }
-                    // else
-                    // {
-                    //     // 无选项,关闭面板,返回 null
-                    //     UIManager.Instance.HideUIUIPanel(this);
-                    //     finish?.Invoke(null);
-                    // }
-                    // return;
                 }
             }
         }
@@ -120,8 +112,6 @@ namespace Fort23.Mono
         {
             if (eventConditionConfig.optionType == 1 && _isShowingOptions)
                 return;
-            // if (_isShowingOptions)
-            //     return;
             if (_isUpdate)
             {
                 SkipTyping();
@@ -187,10 +177,14 @@ namespace Fort23.Mono
             StartShowMassge();
         }
 
-        private void StartShowMassge()
+        private async void StartShowMassge()
         {
+            if (isOver)
+                return;
+
             if (index >= dialogueMessaga.Length)
             {
+                isOver = true;
                 if (eventConditionConfig.ID != 0 && !_isShowingOptions)
                 {
                     ShowOptions();
@@ -216,6 +210,48 @@ namespace Fort23.Mono
                     }
 
 
+                    if (eventConditionConfig.optionType == 3)
+                    {
+                        List<ItemInfo> itemInfos = new List<ItemInfo>();
+                        for (var i = 0; i < eventConditionConfig.PrizeIDs.Length; i++)
+                        {
+                            DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(eventConditionConfig.PrizeIDs[i]);
+                            if (dropConfig.dropType == 3)
+                            {
+                                ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0], eventConditionConfig.PrizeNums[i]);
+                                itemInfos.Add(itemInfo);
+                            }
+                            else
+                            {
+                                List<ItemInfo> items = DropManager.Instance.DropItem(eventConditionConfig.PrizeIDs[i]);
+                                itemInfos.AddRange(items);
+                            }
+                        }
+
+                        ShowItemMoveToTargetPanel showItemMoveToTargetUiPane = UIManager.Instance.GetComponent<ShowItemMoveToTargetPanel>();
+                        Vector3 target = showItemMoveToTargetUiPane.transform.worldToLocalMatrix * Btn_Bag.transform.position;
+                        Vector3 startPos = showItemMoveToTargetUiPane.transform.worldToLocalMatrix * StartPos.transform.position;
+                        int maxCount = 1;
+
+                        foreach (var itemInfo in itemInfos)
+                        {
+                            int addValue = (int)itemInfo.count.Value / maxCount;
+                            int finishVale = (int)itemInfo.count.Value % maxCount;
+                            // ItemInfo i = itemInfo;
+                            showItemMoveToTargetUiPane.ShowPanel(startPos, target, maxCount, itemInfo.config.icon, CombatItemShowEventData.ShowType.HeroExp, (imageMove) =>
+                            {
+                                int currAddValue = addValue;
+                                if (imageMove.GroupIndex == maxCount - 1)
+                                {
+                                    currAddValue += finishVale;
+                                }
+                            });
+                        }
+
+                        await TimerComponent.Instance.WaitAsync(2000);
+                    }
+
+
                     // 无选项,关闭面板,返回 null
                     UIManager.Instance.HideUIUIPanel(this);
                     finish?.Invoke(null);
@@ -318,20 +354,12 @@ namespace Fort23.Mono
                     ShowNextIcon();
                     if (index >= dialogueMessaga.Length)
                     {
-                        // // 所有句子显示完成,检查是否有选项
-                        // if (eventConditionConfig.optionType == 1 && !_isShowingOptions)
-                        // {
-                        //     ShowOptions();
-                        // }
-
                         if (eventConditionConfig.ID != 0 && !_isShowingOptions)
                         {
                             ShowOptions();
                         }
                     }
 
-                    // StartShowMassge();
-                    // ShowNextIcon();
                     return;
                 }
 
@@ -361,6 +389,7 @@ namespace Fort23.Mono
             DialgueType1.gameObject.SetActive(false);
             DialgueType2.gameObject.SetActive(false);
             OptionMarsk.SetActive(false);
+            isOver = false;
             base.Close();
         }
     }

+ 22 - 0
Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanelData.cs

@@ -173,6 +173,28 @@ namespace Fort23.Mono
 	      return _DialgueType3;
 	     }
 	   }
+	  private Button _Btn_Bag;
+	  public Button Btn_Bag
+	   {
+	   get{
+	      if (_Btn_Bag == null)
+	       {
+	         _Btn_Bag  = GetUIUnit<Button>("Btn_Bag"); 
+	       }
+	      return _Btn_Bag;
+	     }
+	   }
+	  private RectTransform _StartPos;
+	  public RectTransform StartPos
+	   {
+	   get{
+	      if (_StartPos == null)
+	       {
+	         _StartPos  = GetUIUnit<RectTransform>("StartPos"); 
+	       }
+	      return _StartPos;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

+ 18 - 1
Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2.cs

@@ -35,6 +35,12 @@ namespace Fort23.Mono
         public override void AddButtonEvent()
         {
             base.AddButtonEvent();
+            
+            Btn_Bag.onClick.AddListener(() =>
+            {
+                TipMessagePanel.OpenTipMessagePanel("事件的选择会影响获得的道具!");
+            });
+            
             Btn_RemoveEvent.onClick.AddListener(async () =>
             {
                 var isOk = await TipsPanle.OpenPnael("", "放弃后,事件会从列表消失。已消耗的神识不会返还。是否确认?");
@@ -86,6 +92,17 @@ namespace Fort23.Mono
             Text_EventName.text = LanguageManager.Instance.Text(randomEventConfig.EventName);
 
             Text_EventDesc.text = LanguageManager.Instance.Text(evenkConfig.conciseEventMessage);
+            
+            Btn_Bag.gameObject.SetActive(false);
+            foreach (var eventListEventLink in eventList.eventLinks)
+            {
+                EventLinkConfig eventLinkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(eventListEventLink.eventLinkId);
+                if (eventLinkConfig.optionType == 3)
+                {
+                    Btn_Bag.gameObject.SetActive(true);
+                    break;
+                }
+            }
 
             if (eventLinkData == null || eventLinkData.eventConditions == null || eventLinkData.eventConditions.Count == 0)
             {
@@ -175,7 +192,7 @@ namespace Fort23.Mono
             foreach (var eventListItemInfo in eventList.itemInfos)
             {
                 WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, ItemRoot);
-                widgetItem.InitWidget(eventListItemInfo);
+                widgetItem.InitWidget(new ItemInfo(eventListItemInfo));
                 widgetList.Add(widgetItem);
             }
         }

+ 11 - 0
Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2Data.cs

@@ -140,6 +140,17 @@ namespace Fort23.Mono
 	      return _EventconditionState;
 	     }
 	   }
+	  private Button _Btn_Bag;
+	  public Button Btn_Bag
+	   {
+	   get{
+	      if (_Btn_Bag == null)
+	       {
+	         _Btn_Bag  = GetUIUnit<Button>("Btn_Bag"); 
+	       }
+	      return _Btn_Bag;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

+ 1 - 1
Assets/Scripts/GameUI/UI/ShowItemMoveToTargetPanel/ShowItemMoveToTargetPanel.cs

@@ -134,7 +134,7 @@ namespace Fort23.Mono
             // myImage.icon_name = itemConfig;
 
             currImageMove.SizeCurve = AnimationCurveManager.Instance.AnimationCurveLibrary.ui_moveSize;
-            // gameObjectPool.own.transform.SetParent(Ui);
+            gameObjectPool.own.transform.SetParent(Ui);
 
 
             gameObjectPool.own.SetActive(false);

+ 18 - 0
Assets/Scripts/GameUI/UI/Task/TaskInfoPanel.cs

@@ -30,6 +30,7 @@ namespace Fort23.Mono
         public override void AddButtonEvent()
         {
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
+            Btn_Bag.onClick.AddListener(() => { TipMessagePanel.OpenTipMessagePanel("事件的选择会影响获得的道具!"); });
         }
 
         public async void CustomInit(AccountFileInfo.EventList eventList)
@@ -54,6 +55,16 @@ namespace Fort23.Mono
                 Text_Condition.text = desc;
             }
 
+            Btn_Bag.gameObject.SetActive(false);
+            foreach (var eventListEventLink in eventList.eventLinks)
+            {
+                EventLinkConfig eventLinkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(eventListEventLink.eventLinkId);
+                if (eventLinkConfig.optionType == 3)
+                {
+                    Btn_Bag.gameObject.SetActive(true);
+                    break;
+                }
+            }
 
             if (taskConfig.PrizeIDs != null)
             {
@@ -79,6 +90,13 @@ namespace Fort23.Mono
                     widgetItem.InitWidget(itemInfo);
                     widgetItems.Add(widgetItem);
                 }
+
+                foreach (var eventListItemInfo in eventList.itemInfos)
+                {
+                    WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, ItemRoot);
+                    widgetItem.InitWidget(new ItemInfo(eventListItemInfo));
+                    widgetItems.Add(widgetItem);
+                }
             }
         }
 

+ 11 - 0
Assets/Scripts/GameUI/UI/Task/TaskInfoPanelData.cs

@@ -85,6 +85,17 @@ namespace Fort23.Mono
 	      return _Text_Condition;
 	     }
 	   }
+	  private Button _Btn_Bag;
+	  public Button Btn_Bag
+	   {
+	   get{
+	      if (_Btn_Bag == null)
+	       {
+	         _Btn_Bag  = GetUIUnit<Button>("Btn_Bag"); 
+	       }
+	      return _Btn_Bag;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{