瀏覽代碼

优化道具生成

lzx 5 天之前
父節點
當前提交
6262cd5c5f

+ 1 - 1
Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

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

+ 2 - 2
Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Ints: []
     m_Floats:
     m_Floats:
-    - _Alpha: 0.2087822
+    - _Alpha: 0.17842919
     - _AlphaCutoff: 0.5
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.20158291
+    - _MainTexOffsetU: 0.23884106
     - _MainTexOffsetV: 0
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingU: 0.8
     - _MainTilingV: 1
     - _MainTilingV: 1

+ 1 - 1
Assets/Res/UI/DivineSence/DivineSenceRestoredWidget.prefab

@@ -118,7 +118,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 189.53296, y: -49.37755}
   m_AnchoredPosition: {x: 189.53296, y: -49.37755}
-  m_SizeDelta: {x: 0, y: 96.45}
+  m_SizeDelta: {x: 108, y: 96.45}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5304083428607473890
 --- !u!222 &5304083428607473890
 CanvasRenderer:
 CanvasRenderer:

+ 18 - 99
Assets/Res/UI/DivineSence/EventTipsPanel.prefab

@@ -32,12 +32,6 @@ RectTransform:
   m_Children:
   m_Children:
   - {fileID: 2896655462721008753}
   - {fileID: 2896655462721008753}
   - {fileID: 2569128129379278262}
   - {fileID: 2569128129379278262}
-  - {fileID: 2708046515207152597}
-  - {fileID: 562321534252030192}
-  - {fileID: 5659305390174163116}
-  - {fileID: 2086188629720428156}
-  - {fileID: 5866622043385976589}
-  - {fileID: 3258887086271990041}
   m_Father: {fileID: 0}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -118,11 +112,11 @@ RectTransform:
   m_Children:
   m_Children:
   - {fileID: 5421788321130738453}
   - {fileID: 5421788321130738453}
   - {fileID: 2618842243334602427}
   - {fileID: 2618842243334602427}
-  m_Father: {fileID: 8599819629026832582}
+  m_Father: {fileID: 2569128129379278262}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 134, y: -625}
+  m_AnchoredPosition: {x: 35.057465, y: -209.89569}
   m_SizeDelta: {x: 487.0498, y: 32.742203}
   m_SizeDelta: {x: 487.0498, y: 32.742203}
   m_Pivot: {x: 0, y: 1}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &1470563193536367963
 --- !u!222 &1470563193536367963
@@ -222,16 +216,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1866119032993322482}
   m_GameObject: {fileID: 1866119032993322482}
-  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_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Children: []
-  m_Father: {fileID: 8599819629026832582}
+  m_Father: {fileID: 2569128129379278262}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 347}
+  m_AnchoredPosition: {x: 0, y: 308.42603}
   m_SizeDelta: {x: 475.88, y: 44.8081}
   m_SizeDelta: {x: 475.88, y: 44.8081}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1851182301441702079
 --- !u!222 &1851182301441702079
@@ -308,6 +302,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children:
   m_Children:
   - {fileID: 6620055869968090277}
   - {fileID: 6620055869968090277}
+  - {fileID: 2708046515207152597}
+  - {fileID: 562321534252030192}
+  - {fileID: 2086188629720428156}
+  - {fileID: 5866622043385976589}
+  - {fileID: 3258887086271990041}
   m_Father: {fileID: 8599819629026832582}
   m_Father: {fileID: 8599819629026832582}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -393,17 +392,17 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2661625032725589361}
   m_GameObject: {fileID: 2661625032725589361}
-  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_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children:
   m_Children:
   - {fileID: 9019401354127365474}
   - {fileID: 9019401354127365474}
-  m_Father: {fileID: 8599819629026832582}
+  m_Father: {fileID: 2569128129379278262}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -80.8}
+  m_AnchoredPosition: {x: 0, y: -119.37398}
   m_SizeDelta: {x: 500.84, y: 440.9291}
   m_SizeDelta: {x: 500.84, y: 440.9291}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3793524203819905834
 --- !u!222 &3793524203819905834
@@ -859,11 +858,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Children: []
-  m_Father: {fileID: 8599819629026832582}
+  m_Father: {fileID: 2569128129379278262}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 211.1}
+  m_AnchoredPosition: {x: 0, y: 172.52591}
   m_SizeDelta: {x: 462.3704, y: 3.2457}
   m_SizeDelta: {x: 462.3704, y: 3.2457}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8123075089451312824
 --- !u!222 &8123075089451312824
@@ -1038,86 +1037,6 @@ MonoBehaviour:
   m_OnClick:
   m_OnClick:
     m_PersistentCalls:
     m_PersistentCalls:
       m_Calls: []
       m_Calls: []
---- !u!1 &7405747344607976440
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5659305390174163116}
-  - component: {fileID: 8440945211878829813}
-  - component: {fileID: 4303213804421114956}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Text_EventName (2)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5659305390174163116
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7405747344607976440}
-  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: 8599819629026832582}
-  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: -11.7, y: 164.9}
-  m_SizeDelta: {x: 475.88, y: 27.75}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8440945211878829813
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7405747344607976440}
-  m_CullTransparentMesh: 1
---- !u!114 &4303213804421114956
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7405747344607976440}
-  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: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 20
-    m_FontStyle: 1
-    m_BestFit: 0
-    m_MinSize: 2
-    m_MaxSize: 40
-    m_Alignment: 1
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u5C1D\u8BD5\u9014\u5F84"
 --- !u!1 &8121345727853060345
 --- !u!1 &8121345727853060345
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -1222,16 +1141,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9151032839066011116}
   m_GameObject: {fileID: 9151032839066011116}
-  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_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Children: []
-  m_Father: {fileID: 8599819629026832582}
+  m_Father: {fileID: 2569128129379278262}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 274.751}
+  m_AnchoredPosition: {x: 0, y: 236.17703}
   m_SizeDelta: {x: 475.88, y: 86.624}
   m_SizeDelta: {x: 475.88, y: 86.624}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5417248340603968389
 --- !u!222 &5417248340603968389

+ 1 - 1
Assets/Res/UI/ItemDetailsPanel/ItemSourcePanel.prefab

@@ -392,7 +392,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -19, y: 39.6}
+  m_AnchoredPosition: {x: 0, y: 39.6}
   m_SizeDelta: {x: 552.1149, y: 716.6434}
   m_SizeDelta: {x: 552.1149, y: 716.6434}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9156533754913033698
 --- !u!222 &9156533754913033698

+ 5 - 5
Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -5732,11 +5732,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
     - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
       propertyPath: m_AnchoredPosition.x
       propertyPath: m_AnchoredPosition.x
-      value: 36.3
+      value: 2.1
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
     - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
       propertyPath: m_AnchoredPosition.y
       propertyPath: m_AnchoredPosition.y
-      value: -8
+      value: -19.7
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
     - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       propertyPath: m_LocalEulerAnglesHint.x
@@ -6019,7 +6019,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
     - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
       propertyPath: m_AnchoredPosition.y
       propertyPath: m_AnchoredPosition.y
-      value: -6.3
+      value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
     - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       propertyPath: m_LocalEulerAnglesHint.x
@@ -6152,11 +6152,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
     - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
       propertyPath: m_AnchoredPosition.x
       propertyPath: m_AnchoredPosition.x
-      value: 36.3
+      value: 5.1
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
     - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
       propertyPath: m_AnchoredPosition.y
       propertyPath: m_AnchoredPosition.y
-      value: -8
+      value: -20.7
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
     - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       propertyPath: m_LocalEulerAnglesHint.x

+ 49 - 35
Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -599,6 +599,55 @@ public class EventSystemManager : Singleton<EventSystemManager>
         //初始化神识链条,用于监听条件是否完成
         //初始化神识链条,用于监听条件是否完成
         if (eventList != null && eventConfig.EventType != 2)
         if (eventList != null && eventConfig.EventType != 2)
         {
         {
+            //一开始就把道具掉落出来 ui上要显示
+            if (eventConfig.PrizeIDs != null)
+            {
+                for (var i = 0; i < eventConfig.PrizeIDs.Length; i++)
+                {
+                    
+                    List<ItemInfo> itemInfoss = DropManager.Instance.Drop(eventConfig.PrizeIDs[i],
+                        eventConfig.PrizeNums[i]);
+                    foreach (var itemInfo in itemInfoss)
+                    {
+                        eventList.itemInfos.Add(itemInfo.ToItemData());
+                    }
+                    
+                    // DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(eventConfig.PrizeIDs[i]);
+                    // if (dropConfig.dropType == 3)
+                    // {
+                    //     
+                    //     
+                    //     
+                    //     ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(dropConfig.dropGroupID[0]);
+                    //     if (itemConfig.associateID == 14)
+                    //     {
+                    //         List<ItemInfo> itemInfoss = DropManager.Instance.Drop(eventConfig.PrizeIDs[i],
+                    //             eventConfig.PrizeNums[i]);
+                    //         foreach (var itemInfo in itemInfoss)
+                    //         {
+                    //             eventList.itemInfos.Add(itemInfo.ToItemData());
+                    //         }
+                    //     }
+                    //
+                    //     else
+                    //     {
+                    //         ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0], eventConfig.PrizeNums[i]);
+                    //         eventList.itemInfos.Add(itemInfo.ToItemData());
+                    //     }
+                    // }
+                    // else
+                    // {
+                    //     List<ItemInfo> items =
+                    //         DropManager.Instance.Drop(eventConfig.PrizeIDs[i], eventConfig.PrizeNums[i]);
+                    //     foreach (var itemInfo in items)
+                    //     {
+                    //         eventList.itemInfos.Add(itemInfo.ToItemData());
+                    //     }
+                    // }
+                }
+            }
+
+
             foreach (var i in eventConfig.EventLinksId)
             foreach (var i in eventConfig.EventLinksId)
             {
             {
                 EventLinkConfig eventLinkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(i);
                 EventLinkConfig eventLinkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(i);
@@ -1208,41 +1257,6 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
 
 
 
         List<ItemInfo> itemInfos = new List<ItemInfo>();
         List<ItemInfo> itemInfos = new List<ItemInfo>();
-        if (eventConfig.PrizeIDs != null)
-        {
-            for (var i = 0; i < eventConfig.PrizeIDs.Length; i++)
-            {
-                List<ItemInfo> items =
-                    DropManager.Instance.Drop(eventConfig.PrizeIDs[i], eventConfig.PrizeNums[i]);
-                if (items != null)
-                    itemInfos.AddRange(items);
-                // DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(eventConfig.PrizeIDs[i]);
-                // if (dropConfig.dropType == 3)
-                // {
-                //     if (eventConfig.PrizeNums[i] < 0)
-                //     {
-                //         List<ItemInfo> items =
-                //             DropManager.Instance.Drop(dropConfig.dropGroupID[0], eventConfig.PrizeNums[i]);
-                //         if (items != null)
-                //             itemInfos.AddRange(items);
-                //     }
-                //     else
-                //     {
-                //         ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0], eventConfig.PrizeNums[i]);
-                //         itemInfos.Add(itemInfo);
-                //     }
-                // }
-                // else
-                // {
-                //     List<ItemInfo> items = DropManager.Instance.DropItem(eventConfig.PrizeIDs[i]);
-                //     if (items != null)
-                //         itemInfos.AddRange(items);
-                // }
-
-                // itemInfos.Add(new ItemInfo(eventConfig.PrizeIDs[i], eventConfig.PrizeNums[i]));
-            }
-        }
-
         foreach (var eventListItemInfo in eventList.itemInfos)
         foreach (var eventListItemInfo in eventList.itemInfos)
         {
         {
             itemInfos.Add(new ItemInfo(eventListItemInfo));
             itemInfos.Add(new ItemInfo(eventListItemInfo));

+ 27 - 4
Assets/Scripts/GameUI/UI/DivineSence/EventTipsPanel.cs

@@ -35,6 +35,13 @@ namespace Fort23.Mono
 
 
         public async override CTask<bool> AsyncInit(object[] uiData)
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
         {
+            foreach (var skipToWidget in skipToWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(skipToWidget);
+            }
+
+            skipToWidgets.Clear();
+
             AccountFileInfo.EventLinkData eventLinkData = uiData[0] as AccountFileInfo.EventLinkData;
             AccountFileInfo.EventLinkData eventLinkData = uiData[0] as AccountFileInfo.EventLinkData;
             callBack = uiData[1] as CTask<bool>;
             callBack = uiData[1] as CTask<bool>;
             EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventLinkData.eventId);
             EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventLinkData.eventId);
@@ -48,16 +55,32 @@ namespace Fort23.Mono
             }
             }
 
 
             Text_TiaoJian.text = desc;
             Text_TiaoJian.text = desc;
+
+            using (CTaskAwaitBuffer<SkipToWidget> cts = new CTaskAwaitBuffer<SkipToWidget>())
+            {
+                foreach (var eventConditionData in eventLinkData.eventConditions)
+                {
+                    EventConditionConfig eventConditionConfig =
+                        ConfigComponent.Instance.Get<EventConditionConfig>(eventConditionData.eventCondition);
+                    for (var i = 0; i < eventConditionConfig.SkiptoIds.Length; i++)
+                    {
+                        cts.AddTask(UIManager.Instance.CreateGComponent<SkipToWidget>(null, Content));
+                    }
+                }
+
+                skipToWidgets = await cts.WaitAll();
+            }
+
+            int index = 0;
+
             foreach (var eventConditionData in eventLinkData.eventConditions)
             foreach (var eventConditionData in eventLinkData.eventConditions)
             {
             {
                 EventConditionConfig eventConditionConfig =
                 EventConditionConfig eventConditionConfig =
                     ConfigComponent.Instance.Get<EventConditionConfig>(eventConditionData.eventCondition);
                     ConfigComponent.Instance.Get<EventConditionConfig>(eventConditionData.eventCondition);
                 foreach (var skiptoId in eventConditionConfig.SkiptoIds)
                 foreach (var skiptoId in eventConditionConfig.SkiptoIds)
                 {
                 {
-                    SkipToWidget skipToWidget = await UIManager.Instance.CreateGComponent<SkipToWidget>(null, Content);
-                    skipToWidget.CustonInit(skiptoId);
-                    skipToWidgets.Add(skipToWidget);
-                    skipToWidget.OnClick = OnClick;
+                    skipToWidgets[index].CustonInit(skiptoId);
+                    skipToWidgets[index++].OnClick = OnClick;
                 }
                 }
             }
             }
 
 

+ 12 - 35
Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2.cs

@@ -208,49 +208,26 @@ namespace Fort23.Mono
 
 
             Text_Type.text = EventHelper.GetEventType(randomEventConfig.EventTag);
             Text_Type.text = EventHelper.GetEventType(randomEventConfig.EventTag);
 
 
-            if (randomEventConfig.PrizeIDs != null)
-            {
-                List<ItemInfo> itemInfos = new List<ItemInfo>();
-                for (var i = 0; i < randomEventConfig.PrizeIDs.Length; i++)
-                {
-                    DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(randomEventConfig.PrizeIDs[i]);
-                    if (dropConfig.dropType == 3)
-                    {
-                        ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(dropConfig.dropGroupID[0]);
-                        if (itemConfig.associateID == 14)
-                        {
-                            List<ItemInfo> itemInfoss = DropManager.Instance.Drop(randomEventConfig.PrizeIDs[i],
-                                randomEventConfig.PrizeNums[i]);
-                            itemInfos.AddRange(itemInfoss);
-                            continue;
-                        }
-                    }
 
 
-                    if (dropConfig.showItemId != null)
-                    {
-                        foreach (var i1 in dropConfig.showItemId)
-                        {
-                            ItemInfo itemInfo = new ItemInfo(i1, randomEventConfig.PrizeNums[i]);
-                            itemInfos.Add(itemInfo);
-                        }
-                    }
-                }
 
 
-                for (var i = 0; i < itemInfos.Count; i++)
+
+
+            using (CTaskAwaitBuffer<WidgetItem> cts = new CTaskAwaitBuffer<WidgetItem>())
+            {
+                for (var i = 0; i < eventList.itemInfos.Count; i++)
                 {
                 {
-                    WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, ItemRoot);
-                    widgetItem.InitWidget(itemInfos[i]);
-                    widgetList.Add(widgetItem);
+                    cts.AddTask(UIManager.Instance.CreateGComponent<WidgetItem>(null, ItemRoot));
                 }
                 }
+
+                widgetList = await cts.WaitAll();
             }
             }
 
 
-            foreach (var eventListItemInfo in eventList.itemInfos)
+            for (var i = 0; i <  eventList.itemInfos.Count; i++)
             {
             {
-                WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, ItemRoot);
-                widgetItem.InitWidget(new ItemInfo(eventListItemInfo));
-                widgetList.Add(widgetItem);
+                widgetList[i].InitWidget(new ItemInfo( eventList.itemInfos[i]));
             }
             }
 
 
+
             foreach (var eventListEventLink in eventList.eventLinks)
             foreach (var eventListEventLink in eventList.eventLinks)
             {
             {
                 if (eventListEventLink.eventLinkId <= eventList.curStep)
                 if (eventListEventLink.eventLinkId <= eventList.curStep)
@@ -270,7 +247,7 @@ namespace Fort23.Mono
         public async void CustomInit1()
         public async void CustomInit1()
         {
         {
             Text_Tips.gameObject.SetActive(true);
             Text_Tips.gameObject.SetActive(true);
-Root.gameObject.SetActive(false);
+            Root.gameObject.SetActive(false);
         }
         }
 
 
         public override void DormancyObj()
         public override void DormancyObj()

+ 1 - 3
Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase4.cs

@@ -87,13 +87,11 @@ namespace Fort23.Mono.Phases
         {
         {
             pgm.StepInit();
             pgm.StepInit();
             PlayerGuideManager.Instance.SetOnClickMask(true);
             PlayerGuideManager.Instance.SetOnClickMask(true);
-            await TimerComponent.Instance.WaitAsync(100);
+            await TimerComponent.Instance.WaitAsync(200);
        
        
             GameObject gameObject = UIManager.Instance.GetComponent<AppBarPanel>().Btn_GongFa.gameObject;
             GameObject gameObject = UIManager.Instance.GetComponent<AppBarPanel>().Btn_GongFa.gameObject;
             Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
             Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
             Vector2 size = gameObject.GetComponent<RectTransform>().sizeDelta;
             Vector2 size = gameObject.GetComponent<RectTransform>().sizeDelta;
-            localPos = new Vector2(-30, -755);
-            size = new Vector2(78, 97);
             pgm.SetfxTransVisiable(true);
             pgm.SetfxTransVisiable(true);
             pgm.SetMaskTarget(gameObject);
             pgm.SetMaskTarget(gameObject);
             pgm.SetShowFramePosAndSize(localPos, size, 0, gameObject);
             pgm.SetShowFramePosAndSize(localPos, size, 0, gameObject);

+ 8 - 0
Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemSourcePanel.cs

@@ -35,6 +35,14 @@ namespace Fort23.Mono
 
 
         public async override CTask<bool> AsyncInit(object[] uiData)
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
         {
+            
+            foreach (var skipToWidget in skipToWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(skipToWidget);
+            }
+
+            skipToWidgets.Clear();
+            
             int itemId = (int)uiData[0];
             int itemId = (int)uiData[0];
             callBack = uiData[1] as CTask<bool>;
             callBack = uiData[1] as CTask<bool>;
             ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(itemId);
             ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(itemId);

+ 9 - 32
Assets/Scripts/GameUI/UI/Task/TaskInfoPanel.cs

@@ -68,10 +68,8 @@ namespace Fort23.Mono
                 }
                 }
                 else
                 else
                 {
                 {
-                    Text_Condition.text ="";
+                    Text_Condition.text = "";
                 }
                 }
-                
-             
             }
             }
             else
             else
             {
             {
@@ -96,38 +94,19 @@ namespace Fort23.Mono
                 }
                 }
             }
             }
 
 
-            if (taskConfig.PrizeIDs != null)
+            using (CTaskAwaitBuffer<WidgetItem> cts = new CTaskAwaitBuffer<WidgetItem>())
             {
             {
-                List<ItemInfo> itemInfos = new List<ItemInfo>();
-                for (var i = 0; i < taskConfig.PrizeIDs.Length; i++)
+                for (var i = 0; i < eventList.itemInfos.Count; i++)
                 {
                 {
-                    DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(taskConfig.PrizeIDs[i]);
-                    if (dropConfig.dropType == 3)
-                    {
-                        ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0], taskConfig.PrizeNums[i]);
-                        itemInfos.Add(itemInfo);
-                    }
-                    else
-                    {
-                        List<ItemInfo> items = DropManager.Instance.DropItem(taskConfig.PrizeNums[i]);
-                        if (items != null)
-                            itemInfos.AddRange(items);
-                    }
+                    cts.AddTask(UIManager.Instance.CreateGComponent<WidgetItem>(null, ItemRoot));
                 }
                 }
 
 
-                foreach (var itemInfo in itemInfos)
-                {
-                    WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, root: ItemRoot);
-                    widgetItem.InitWidget(itemInfo);
-                    widgetItems.Add(widgetItem);
-                }
+                widgetItems = await cts.WaitAll();
+            }
 
 
-                foreach (var eventListItemInfo in eventList.itemInfos)
-                {
-                    WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, ItemRoot);
-                    widgetItem.InitWidget(new ItemInfo(eventListItemInfo));
-                    widgetItems.Add(widgetItem);
-                }
+            for (var i = 0; i < eventList.itemInfos.Count; i++)
+            {
+                widgetItems[i].InitWidget(new ItemInfo(eventList.itemInfos[i]));
             }
             }
         }
         }
 
 
@@ -141,8 +120,6 @@ namespace Fort23.Mono
 
 
         public async override CTask Close()
         public async override CTask Close()
         {
         {
-         
-
             foreach (var widgetItem in widgetItems)
             foreach (var widgetItem in widgetItems)
             {
             {
                 UIManager.Instance.DormancyGComponent(widgetItem);
                 UIManager.Instance.DormancyGComponent(widgetItem);

二進制
Excel2Json/Excel/PlayerGuide.xlsx