Browse Source

修改bug

DESKTOP-FB72PO8\Administrator 3 ngày trước cách đây
mục cha
commit
300cc0fcc0

+ 1 - 1
Assets/Art/VFX/FXAnimation/fx_ui_fb_shifang.controller

@@ -11,7 +11,7 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: -1708647650252794724}
-    m_Position: {x: 200, y: 0, z: 0}
+    m_Position: {x: 290, y: 80, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []

+ 1 - 1
Assets/Art/VFX/Materials/UIMat/ui fb kuang glow3 mask uv.mat

@@ -139,7 +139,7 @@ Material:
     - _MainSpeedU: 0
     - _MainSpeedV: 0
     - _MainTexOffsetU: 0
-    - _MainTexOffsetV: 0.5
+    - _MainTexOffsetV: -0.3
     - _MainTilingU: 1
     - _MainTilingV: 0.78
     - _MaskSpeedU: 0.5

+ 199 - 21
Assets/Res/UI/CombatPanel.prefab

@@ -428,6 +428,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7561374860469839472}
+  - {fileID: 8866218788833705411}
   - {fileID: 271634867267467130}
   - {fileID: 6966436685152839904}
   - {fileID: 345731962149340685}
@@ -2053,7 +2054,7 @@ RectTransform:
   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: 80, y: 90}
+  m_SizeDelta: {x: 100, y: 140}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8722334600143122962
 CanvasRenderer:
@@ -2076,7 +2077,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.9529412}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2088,19 +2089,19 @@ MonoBehaviour:
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 1
-  m_FillAmount: 1
+  m_FillAmount: 0
   m_FillClockwise: 0
-  m_FillOrigin: 0
+  m_FillOrigin: 1
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_fb3401
+  _icon_name: dec_fbDiban
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: skillIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
-    lasetJsonGUID: b2843643b4298cdf1d66ce110c944378
+    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}
@@ -2342,6 +2343,94 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ShowMaskGraphic: 0
+--- !u!1 &2749743865999300788
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7509376821817412047}
+  - component: {fileID: 3627101906851185713}
+  - component: {fileID: 5744739095708771596}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fb_kuang
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7509376821817412047
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2749743865999300788}
+  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: 4925541673947957992}
+  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: 5}
+  m_SizeDelta: {x: 93, y: 130}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3627101906851185713
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2749743865999300788}
+  m_CullTransparentMesh: 1
+--- !u!114 &5744739095708771596
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2749743865999300788}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.4012, g: 0.68, b: 0.5313067, 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_fb_kuang
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &2929139248548498174
 GameObject:
   m_ObjectHideFlags: 0
@@ -5664,6 +5753,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7479615743388508295}
+  - {fileID: 7509376821817412047}
   - {fileID: 7833523249163798776}
   - {fileID: 2146270928697371138}
   - {fileID: 7255814566391051554}
@@ -5899,7 +5989,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.33962262, g: 0.33962262, b: 0.33962262, a: 1}
+  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
@@ -6501,7 +6591,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  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
@@ -7380,6 +7470,94 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &7024122897744601800
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8866218788833705411}
+  - component: {fileID: 6163622132043819703}
+  - component: {fileID: 2054773142702067391}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fb_kuang
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8866218788833705411
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7024122897744601800}
+  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: 4197360294442415998}
+  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: 5}
+  m_SizeDelta: {x: 93, y: 130}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6163622132043819703
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7024122897744601800}
+  m_CullTransparentMesh: 1
+--- !u!114 &2054773142702067391
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7024122897744601800}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.4012, g: 0.68, b: 0.5313067, 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_fb_kuang
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &7190989899415035677
 GameObject:
   m_ObjectHideFlags: 0
@@ -9278,7 +9456,7 @@ RectTransform:
   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: 80, y: 90}
+  m_SizeDelta: {x: 100, y: 140}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1606752382028469863
 CanvasRenderer:
@@ -9301,7 +9479,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.9254902}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -9315,17 +9493,17 @@ MonoBehaviour:
   m_FillMethod: 1
   m_FillAmount: 0
   m_FillClockwise: 0
-  m_FillOrigin: 0
+  m_FillOrigin: 1
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_fb3401
+  _icon_name: dec_fbDiban
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: skillIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
-    lasetJsonGUID: b2843643b4298cdf1d66ce110c944378
+    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}

+ 1 - 1
Assets/Scenes/testCombat.scene

@@ -2394,7 +2394,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

+ 6 - 2
Assets/Scripts/Core/Pool/GPool/ParticleSystemPool.cs

@@ -195,8 +195,8 @@ namespace Fort23.UTool
                 }
 
                 Particles[i].Stop();
-                Particles[i].Clear(true);
-                Particles[i].Play(true);
+                Particles[i].Clear(false);
+                Particles[i].Play(false);
             }
 
             if (DelayShows != null)
@@ -261,6 +261,10 @@ namespace Fort23.UTool
             {
                 delayTime = 30;
             }
+            else
+            {
+                delayTime = 2;
+            }
 
             if (currDelayTime < delayTime)
             {

+ 5 - 2
Assets/Scripts/GameLogic/Combat/Hero/CombatMagicWeaponEntity.cs

@@ -234,9 +234,12 @@ namespace GameLogic.Combat.Hero
                 if (b1008 == null)
                 {
                     cd -= t;
-                    if (_rootMagicWeaponControl.isAutoUse && IsCanUse())
+                    if ( IsCanUse())
                     {
-                        UseMagicWeapon();
+                        if (_rootMagicWeaponControl.isAutoUse && cd < -1f)//自动的延迟一秒释放
+                        {
+                            UseMagicWeapon();
+                        }
                     }
                 }
             }

+ 60 - 4
Assets/Scripts/GameUI/UI/CombatPanel/MagicWeaponWidget.cs

@@ -2,9 +2,11 @@ using Common.Utility.CombatEvent;
 using Core.Language;
 using Excel2Json;
 using Fort23.Core;
+using Fort23.UTool;
 using GameLogic.Combat.Buff;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero;
+using UnityEngine;
 
 namespace Fort23.Mono
 {
@@ -13,6 +15,13 @@ namespace Fort23.Mono
     {
         private CombatMagicWeaponEntity combatMagicWeaponEntity;
 
+        private bool isChargedFinish;
+
+        private bool isForewarn;
+
+        private ParticleSystemPool noshifang;
+        private ParticleSystemPool chargedFinish;
+        // private ParticleSystemPool chargedFinish;
         private void Init()
         {
         }
@@ -21,6 +30,7 @@ namespace Fort23.Mono
         {
             StaticUpdater.Instance.AddLateUpdateCallBack(Update);
             CombatEventManager.Instance.AddEventListener(CombatEventType.AddBuff, AddBuff);
+            CombatEventManager.Instance.AddEventListener(CombatEventType.UseMagicWeapon, UseMagicWeapon);
             CombatEventManager.Instance.AddEventListener(CombatEventType.RemoveBuff, RemoveBuff);
         }
 
@@ -29,9 +39,20 @@ namespace Fort23.Mono
         {
             StaticUpdater.Instance.RemoveLateUpdateCallBack(Update);
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.AddBuff, AddBuff);
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.UseMagicWeapon, UseMagicWeapon);
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.RemoveBuff, RemoveBuff);
         }
 
+        private void UseMagicWeapon(IEventData iEventData)
+        {
+            UseMagicWeaponEventData useMagicWeaponEventData = iEventData as UseMagicWeaponEventData;
+            if (useMagicWeaponEventData.combatMagicWeaponEntity == combatMagicWeaponEntity)
+            {
+                GObjectPool.Instance.Recycle(chargedFinish);
+                chargedFinish = null;
+            }
+        }
+
         private void AddBuff(IEventData iEventData)
         {
             BuffEventData buffEventData = iEventData as BuffEventData;
@@ -39,7 +60,15 @@ namespace Fort23.Mono
             {
                 if (buffEventData.BuffBasic is b_1008)
                 {
-                    feng.SetActive(true);
+                    GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_ui_fb_Noshifang",
+                        delegate(ParticleSystemPool pool)
+                        {
+                            pool.transform.SetParent(transform);
+                            pool.transform.localPosition = new Vector3(0, 0, 0);
+                            pool.transform.SetAsLastSibling();
+                            noshifang = pool;
+                        });
+                    // feng.SetActive(true);
                 }
             }
         }
@@ -51,7 +80,8 @@ namespace Fort23.Mono
             {
                 if (buffEventData.BuffBasic is b_1008)
                 {
-                    feng.SetActive(false);
+                    GObjectPool.Instance.Recycle(noshifang);
+                    noshifang = null;
                 }
             }
         }
@@ -88,7 +118,9 @@ namespace Fort23.Mono
 
         public void InitWidget(CombatMagicWeaponEntity combatMagicWeaponEntity)
         {
-            feng.SetActive(false);
+            noshifang = null;
+            chargedFinish = null;
+            // feng.SetActive(false);
             this.combatMagicWeaponEntity = combatMagicWeaponEntity;
         }
 
@@ -102,7 +134,31 @@ namespace Fort23.Mono
             float d =
                 (combatMagicWeaponEntity.cd + combatMagicWeaponEntity.RootMagicWeaponControl.globalMagicWeaponCd) /
                 (combatMagicWeaponEntity.MaxCd);
-            cd.fillAmount = 1 - d;
+            cd.fillAmount = d;
+            if (combatMagicWeaponEntity.cd < 1 && !isForewarn)
+            {
+                isForewarn = true;
+                GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_ui_fb_gw_Starshifang",
+                    delegate(ParticleSystemPool pool)
+                    {
+                        pool.transform.SetParent(transform);
+                        pool.transform.localPosition = new Vector3(0, 0, 0);
+                        pool.transform.SetAsLastSibling();
+                    });
+            }
+
+            if (!isChargedFinish && combatMagicWeaponEntity.cd <= 0)
+            {
+                isChargedFinish = true;
+                GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_ui_fb_shifang",
+                    delegate(ParticleSystemPool pool)
+                    {
+                        pool.transform.SetParent(transform);
+                        pool.transform.localPosition = new Vector3(0, 0, 0);
+                        pool.transform.SetSiblingIndex(3);
+                        chargedFinish= pool;
+                    }); 
+            }
         }
     }
 }

+ 8 - 0
Assets/Scripts/GameUI/UI/CombatPanel/ZhuanPanPanel.cs

@@ -26,6 +26,8 @@ namespace Fort23.Mono
         private ParticleSystemPool fx_ui_zhuangPan;
         public async CTask ShowPanel()
         {
+            GObjectPool.Instance.DormancyPool<ParticleSystemPool>("fx_ui_fb_shifang");
+            GObjectPool.Instance.DormancyPool<ParticleSystemPool>("fx_ui_fb_Noshifang");
             CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
             cTaskAwaitBuffer.AddTask(
                 GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_ui_jin_tw", Prestore: true));
@@ -37,6 +39,12 @@ namespace Fort23.Mono
                 GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_ui_huo_tw", Prestore: true));
             cTaskAwaitBuffer.AddTask(
                 GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_ui_tu_tw", Prestore: true));
+            cTaskAwaitBuffer.AddTask(
+                GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_ui_fb_shifang", Prestore: true));
+            cTaskAwaitBuffer.AddTask(
+                GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_ui_fb_Noshifang", Prestore: true));
+            cTaskAwaitBuffer.AddTask(
+                GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_ui_fb_gw_Starshifang", Prestore: true));
             cTaskAwaitBuffer.AddTask(
                 GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_ui_zhuanpanBuff_xingchendao",
                     delegate(ParticleSystemPool pool)

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


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