Browse Source

新事件特效

lzx 2 ngày trước cách đây
mục cha
commit
5f8d472b2c

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

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

+ 648 - 7
Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -1,5 +1,94 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &267844642322349411
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8010219124151300276}
+  - component: {fileID: 4829760602679532235}
+  - component: {fileID: 8027710173212846871}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8010219124151300276
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 267844642322349411}
+  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: 86604009502899239}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 328, y: 41}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &4829760602679532235
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 267844642322349411}
+  m_CullTransparentMesh: 1
+--- !u!114 &8027710173212846871
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 267844642322349411}
+  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_renw_db1
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
+  packInfo:
+    packName: mainUI
+    packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
+    packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
+    lasetJsonGUID: 214c89e2c78332ad9b5a02fccaecc26e
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &423032053834936686
 GameObject:
   m_ObjectHideFlags: 0
@@ -109,6 +198,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 7242877048583604540}
   - {fileID: 8048570897024190138}
   - {fileID: 2175225039670005603}
   m_Father: {fileID: 86604009502899239}
@@ -2765,6 +2855,10 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 2394298463810824802}
+  - {fileID: 8010219124151300276}
+  - {fileID: 1713729240865209901}
+  - {fileID: 7440752129834858667}
   - {fileID: 8258499293957039645}
   - {fileID: 8728580503868501898}
   - {fileID: 1194356122697894574}
@@ -2796,7 +2890,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.003921569}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2813,14 +2907,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_renwu_diban
+  _icon_name: 
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
+  CurrSpriteAtlas: {fileID: 0}
   packInfo:
-    packName: mainUI
-    packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
-    packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
-    lasetJsonGUID: 84621fa40ca51eb52cde8b5d36f124e5
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
   imageH: 100
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -3306,6 +3400,95 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &7811668771085897324
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2394298463810824802}
+  - component: {fileID: 5012491853445144891}
+  - component: {fileID: 9215601903000794814}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2394298463810824802
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7811668771085897324}
+  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: 86604009502899239}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 330, y: 130}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &5012491853445144891
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7811668771085897324}
+  m_CullTransparentMesh: 1
+--- !u!114 &9215601903000794814
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7811668771085897324}
+  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_renw_db2
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
+  packInfo:
+    packName: mainUI
+    packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
+    packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
+    lasetJsonGUID: 214c89e2c78332ad9b5a02fccaecc26e
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &8048350266640076490
 GameObject:
   m_ObjectHideFlags: 0
@@ -4441,7 +4624,175 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: fx_ui_renwu_wancheng_loop
+    gameObject: {fileID: 8128765917665622823}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: fx_ui_renwu_chuxian
+    gameObject: {fileID: 3269764053996185141}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: fx_ui_fengling_loop
+    gameObject: {fileID: 1284629548629742072}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
+--- !u!1001 &3138801776349823333
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 86604009502899239}
+    m_Modifications:
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 36.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -8
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7227907902282158874, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7227907902282158874, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7708796182496633298, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_Name
+      value: fx_ui_renwu_wancheng_loop
+      objectReference: {fileID: 0}
+    - target: {fileID: 7708796182496633298, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8751265460450608351, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8751265460450608351, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8771004271906671140, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8771004271906671140, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+--- !u!224 &1713729240865209901 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+  m_PrefabInstance: {fileID: 3138801776349823333}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &8128765917665622823 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 6575376528328145474, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+  m_PrefabInstance: {fileID: 3138801776349823333}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &5278104223100402329
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -4552,3 +4903,293 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
   m_PrefabInstance: {fileID: 5278104223100402329}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &5462578363888426548
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1194356122697894574}
+    m_Modifications:
+    - target: {fileID: 775948486671169824, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 775948486671169824, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2849248009424179347, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2849248009424179347, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5480339610297055522, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_Name
+      value: fx_ui_fengling_loop
+      objectReference: {fileID: 0}
+    - target: {fileID: 5480339610297055522, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+--- !u!114 &1284629548629742072 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 6493365826333577164, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+  m_PrefabInstance: {fileID: 5462578363888426548}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!224 &7242877048583604540 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+  m_PrefabInstance: {fileID: 5462578363888426548}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &6850002921673445621
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 86604009502899239}
+    m_Modifications:
+    - target: {fileID: 507171982171638083, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_Name
+      value: fx_ui_renwu_chuxian
+      objectReference: {fileID: 0}
+    - target: {fileID: 507171982171638083, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 36.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -8
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4122540452922128776, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5487483250641198662, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_RaycastTarget
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6240171663678730031, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6240171663678730031, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+--- !u!114 &3269764053996185141 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 8246249556651767488, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+  m_PrefabInstance: {fileID: 6850002921673445621}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!224 &7440752129834858667 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+  m_PrefabInstance: {fileID: 6850002921673445621}
+  m_PrefabAsset: {fileID: 0}

+ 2 - 0
Assets/Res/UIAtlas/mainUI.spriteatlasv2

@@ -32,6 +32,8 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 19448b5e8c48ae748b181fc098a42ebd, type: 3}
     - {fileID: 2800000, guid: 4d4fd799a5a9a7d428a39eb4bbd60b15, type: 3}
     - {fileID: 2800000, guid: 57e52cb3eeb03a942a554f60db0db782, type: 3}
+    - {fileID: 2800000, guid: e331aa9696aa95442afd1c99be6ebdf1, type: 3}
+    - {fileID: 2800000, guid: 35e03d0aa90e64240913ca8c32f3e877, type: 3}
     - {fileID: 2800000, guid: f82d1b4984be31a4bbcd212e7d42374e, type: 3}
     - {fileID: 2800000, guid: 1db9d86baf4548f449f6aec203999ca0, type: 3}
     - {fileID: 2800000, guid: bfcfc5758571af94a87e12b34550e4d4, type: 3}

+ 1 - 0
Assets/Scripts/Core/Event/Event/CustomEventType.cs

@@ -85,6 +85,7 @@ namespace Fort23.Core
       /// 完成事件
       /// </summary>
       CompleteEvent,
+      CompleteUpdate,
       /// <summary>
       /// 移除事件
       /// </summary>

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

@@ -1195,6 +1195,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
         CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
         EventManager.Instance.Dispatch(CustomEventType.CompleteEvent, null);
+        EventManager.Instance.Dispatch(CustomEventType.CompleteUpdate, null);
         onCompleteCallback?.Invoke();
         onCompleteCallback = null;
     }
@@ -1215,7 +1216,8 @@ public class EventSystemManager : Singleton<EventSystemManager>
     {
         LogTool.Log($"取消事件{eventList.eventID}");
         isTriggerEvent = false;
-        EventManager.Instance.Dispatch(CustomEventType.CompleteEvent, null);
+        EventManager.Instance.Dispatch(CustomEventType.CompleteUpdate, null);
+        // EventManager.Instance.Dispatch(CustomEventType.CompleteEvent, null);
         CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
         onCompleteCallback?.Invoke();
         onCompleteCallback = null;

+ 37 - 3
Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -33,6 +33,7 @@ namespace Fort23.Mono
         {
             EventManager.Instance.AddEventListener(CustomEventType.ShengShiOnClick, ShengShiOnClick);
             EventManager.Instance.AddEventListener(CustomEventType.CompleteEvent, CompleteEvent);
+            EventManager.Instance.AddEventListener(CustomEventType.CompleteUpdate, CompleteUpdate);
             EventManager.Instance.AddEventListener(CustomEventType.RemoveEvent, RemoveEvent);
             EventManager.Instance.AddEventListener(CustomEventType.ChangeMap, ChangeMapEvent);
             EventManager.Instance.AddEventListener(CustomEventType.DaoYouCounUpdate, DaoYouCounUpdate);
@@ -85,10 +86,12 @@ namespace Fort23.Mono
             ChagneShenshiBtnActive();
         }
 
-        private void CompleteEvent(IEventData e)
+        private void CompleteUpdate(IEventData e)
         {
             ChangeMap(null);
             Text_EventNum.text = EventSystemManager.Instance.GetShenShiCount().ToString();
+            // fx_ui_renwu_chuxian.gameObject.SetActive(true);
+            // fx_ui_renwu_chuxian.Play();
             CreatShengShiEvent();
             ChagneShenshiBtnActive();
             Slider_SmallJD.value = PlayerManager.Instance.CurrentsmallPlaces.completionEventCount;
@@ -100,6 +103,15 @@ namespace Fort23.Mono
             {
                 AudioManager.Instance.PlayAudio("ui_jinduwancheng");
             }
+
+            PlayEventCompletedEfx();
+        }
+
+        private void CompleteEvent(IEventData e)
+        {
+            PlayEventCompletedEfx();
+            fx_ui_renwu_chuxian.gameObject.SetActive(true);
+            fx_ui_renwu_chuxian.Play();
         }
 
         public void UpdateDaoYouCoun()
@@ -130,6 +142,7 @@ namespace Fort23.Mono
         protected override void DelEvent()
         {
             EventManager.Instance.RemoveEventListener(CustomEventType.CompleteEvent, CompleteEvent);
+            EventManager.Instance.RemoveEventListener(CustomEventType.CompleteUpdate, CompleteUpdate);
             EventManager.Instance.RemoveEventListener(CustomEventType.RemoveEvent, RemoveEvent);
             EventManager.Instance.RemoveEventListener(CustomEventType.ShengShiOnClick, ShengShiOnClick);
             EventManager.Instance.RemoveEventListener(CustomEventType.ChangeMap, ChangeMapEvent);
@@ -166,7 +179,7 @@ namespace Fort23.Mono
             // Btn_Tower.onClick.AddListener(() => { TowerPanel.OpenPanel(1); });
             Btn_QianKunDai.onClick.AddListener(() => { QiankundaiPanel.OpenPanel(); });
 
-            Btn_StartEvent.onClick.AddListener(() =>
+            Btn_StartEvent.onClick.AddListener(async () =>
             {
                 if (PlayerGuideManager.Instance.curPhase == 3)
                 {
@@ -201,7 +214,7 @@ namespace Fort23.Mono
                     if (eventList.isCompleted)
                         return;
 
-                    EventSystemManager.Instance.TriggerEvent(eventList);
+                    await EventSystemManager.Instance.TriggerEvent(eventList);
                 }
             });
 
@@ -291,9 +304,30 @@ namespace Fort23.Mono
                 widgets.Add(energyWidget);
             }
 
+
+            PlayEventCompletedEfx();
+
             // UpdateTaskInfo();
         }
 
+        private void PlayEventCompletedEfx()
+        {
+            AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.eventList.FirstOrDefault(e =>
+                e.guid == AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId);
+            if (eventList != null)
+            {
+                var eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
+                if (eventConfig.EventTriggerType == 4)
+                {
+                    if (eventList.isCompleted1)
+                    {
+                        fx_ui_renwu_wancheng_loop.gameObject.SetActive(true);
+                        fx_ui_renwu_wancheng_loop.Play();
+                    }
+                }
+            }
+        }
+
 
         private void AlterName(IEventData e)
         {

+ 35 - 0
Assets/Scripts/GameUI/UI/MainPanel/MainPanelData.cs

@@ -3,6 +3,8 @@ using Fort23.UTool;
 using UnityEngine.UI;
 using UnityEngine;
 using System.Collections.Generic;
+using Coffee.UIExtensions;
+
 namespace Fort23.Mono
 {
 	public partial class MainPanel 
@@ -294,6 +296,39 @@ namespace Fort23.Mono
 	      return _Btn_PlayerName;
 	     }
 	   }
+	  private UIParticle _fx_ui_renwu_wancheng_loop;
+	  public UIParticle fx_ui_renwu_wancheng_loop
+	   {
+	   get{
+	      if (_fx_ui_renwu_wancheng_loop == null)
+	       {
+	         _fx_ui_renwu_wancheng_loop  = GetUIUnit<UIParticle>("fx_ui_renwu_wancheng_loop"); 
+	       }
+	      return _fx_ui_renwu_wancheng_loop;
+	     }
+	   }
+	  private UIParticle _fx_ui_renwu_chuxian;
+	  public UIParticle fx_ui_renwu_chuxian
+	   {
+	   get{
+	      if (_fx_ui_renwu_chuxian == null)
+	       {
+	         _fx_ui_renwu_chuxian  = GetUIUnit<UIParticle>("fx_ui_renwu_chuxian"); 
+	       }
+	      return _fx_ui_renwu_chuxian;
+	     }
+	   }
+	  private UIParticle _fx_ui_fengling_loop;
+	  public UIParticle fx_ui_fengling_loop
+	   {
+	   get{
+	      if (_fx_ui_fengling_loop == null)
+	       {
+	         _fx_ui_fengling_loop  = GetUIUnit<UIParticle>("fx_ui_fengling_loop"); 
+	       }
+	      return _fx_ui_fengling_loop;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
UGUIPack/uguiconfig.db


Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác