修改bug

Assets/Art/ArtHero/General.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XXwctn75W3NqloctHmqNhRAnAVPbc0TVEPBbUvtDkfzRqu/lOZdEKhQ=
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/VFX/FXPrefabs/fx_shouDong.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CC5NvCmoB3ionfYxyy+fajYWpOsBICI75gboH34BPeIH8JEpBh4STXg=
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Bundles/BuildConfig.prefab

@@ -166,4 +166,9 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: -1500700343
+    gameObject: {fileID: 102900000, guid: 5e201259bd969584785a97a98e185870, type: 3}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1

Assets/Res/UI/ShowItemMoveToTargetPanel.prefab

@@ -74,7 +74,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: 1125, y: 2436}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &7368292285738498687
 MonoBehaviour:
@@ -208,7 +208,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 6c61e840f3f8d4a54bdbcb254e31bdbd, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -218,14 +218,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: 
+  _icon_name: icon_Coin
   isNotLoadDeftIcon: 1
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
-    packName: 
-    packgJsonPath: 
-    packgSpritePath: 
-    lasetJsonGUID: 
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 18d64ac0e2e24188d650460abb74e98b
 --- !u!1 &7807070408328210995
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/WidgetHero.prefab

@@ -758,7 +758,6 @@ GameObject:
   m_Component:
   - component: {fileID: 3910541968883406766}
   - component: {fileID: 3583483213665197690}
-  - component: {fileID: 3964371615776003987}
   - component: {fileID: 1341416267862987738}
   m_Layer: 0
   m_HasEditorInfo: 1
@@ -795,44 +794,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2415852398345921369}
   m_CullTransparentMesh: 1
---- !u!114 &3964371615776003987
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2415852398345921369}
-  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: icon_Video
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
-  packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
 --- !u!114 &1341416267862987738
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -873,7 +834,7 @@ MonoBehaviour:
     m_SelectedTrigger: Selected
     m_DisabledTrigger: Disabled
   m_Interactable: 1
-  m_TargetGraphic: {fileID: 3964371615776003987}
+  m_TargetGraphic: {fileID: 0}
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
@@ -1473,7 +1434,7 @@ MonoBehaviour:
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
   - key: Button_came_icon
-    gameObject: {fileID: 3964371615776003987}
+    gameObject: {fileID: 0}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas:

Assets/Scripts/Core/UI/Core/UIManager.cs

@@ -243,6 +243,21 @@ namespace Fort23.Mono
                 UGUIIamgeTool.minDepth = -1;
                 UGUIIamgeTool.renderOrder = 0;
             }
+
+            if (Input.GetMouseButtonUp(0) && UILayers != null)
+            {
+                Vector3 pos = UICamera.ScreenToWorldPoint(Input.mousePosition);
+                GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_ui_click.prefab",
+                    delegate(ParticleSystemPool pool)
+                    {
+                        if (pool != null)
+                        {
+                            Transform t=  UILayers[^1];
+                            pool.transform.SetParent(t);
+                            pool.transform.position = new Vector3(pos.x, pos.y,t.transform.position.z);
+                        }
+                    });
+            }
         }
 
 

Assets/Scripts/GameLogic/Bag/BagController.cs

@@ -305,7 +305,7 @@ namespace GameLogic.Bag
             CombatItemShowEventData combatItemShowEventData = CombatItemShowEventData.Create();
             combatItemShowEventData.count = showCount;
             combatItemShowEventData.startPos_WorldPos = startPos_WorldPos;
-            combatItemShowEventData.showName = "icon_Energy";
+            combatItemShowEventData.showName = "icon_Coin";
             combatItemShowEventData.showType = CombatItemShowEventData.ShowType.MonsterGold;
             combatItemShowEventData.addValue = itemCount;
             EventManager.Instance.Dispatch(CustomEventType.Combat_ItemShow, combatItemShowEventData);

Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -208,7 +208,13 @@ namespace GameLogic.Combat.CombatType
 
             BagController.Instance.DropHeroExp(combatHeroEntity.combatHeroGameObject.position, 1,
                 _levelBattleConfig.miniExpAndGold[0]);
-
+            int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
+            if (odds < 20)
+            {
+                BagController.Instance.DropMonsterGold(combatHeroEntity.combatHeroGameObject.position, 1,
+                    1);
+            }
+           
 
             // //TODO 装备掉落后，飞特效得逻辑
             // List<string> allEquip = new List<string>();
@@ -297,6 +303,8 @@ namespace GameLogic.Combat.CombatType
 
             BagController.Instance.DropHeroExp(combatHeroEntity.combatHeroGameObject.position, 20,
                 _levelBattleConfig.bossExpAndGold);
+            BagController.Instance.DropMonsterGold(combatHeroEntity.combatHeroGameObject.position, 30,
+                30);
             CombatController.currActiveCombat.CombatHeroController.SetFollowTarget();
             isBossCombat = false;
             LevelBattleConfig levelBattleConfig =

Assets/Scripts/GameLogic/Combat/Skill/S900001.cs

@@ -1,6 +1,8 @@
 using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
+using GameLogic.Bag;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
 using UnityEngine;
 using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
 
@@ -25,6 +27,17 @@ namespace GameLogic.Combat.Skill
             TriggerData triggerData)
         {
             CombatCalculateTool.Instance.TrueHarm(CombatHeroEntity, targetEntity, 1, AttType.Skill, triggerData);
+     
+            if (targetEntity.combatHeroEntity.CurrCombatHeroInfo.heroType == 4)
+            {
+                BagController.Instance.DropMonsterGold(targetEntity.combatHeroEntity.combatHeroGameObject.position, 15,
+                    15);
+            }
+            else
+            {
+                BagController.Instance.DropMonsterGold(targetEntity.combatHeroEntity.combatHeroGameObject.position, 5,
+                    5);
+            }
         }
 
         protected override void ProTimeLineTriggerGround(string groupName, ITimelineFxLogic timelineFxLogic, TriggerData triggerData)

Assets/Scripts/GameUI/Combat/CombatMonoBaisc.cs

@@ -52,6 +52,11 @@ namespace GameUI.Combat
                 MainUIPanel mainUIPanel = UIManager.Instance.GetComponent<MainUIPanel>();
                 Vector3 pos = mainUIPanel.Icon_HeroExp.transform.position;
                 target = _showItemMoveToTargetPanel.transform.worldToLocalMatrix * pos;
+            }  else if (showType == CombatItemShowEventData.ShowType.MonsterGold)
+            {
+                MainUIPanel mainUIPanel = UIManager.Instance.GetComponent<MainUIPanel>();
+                Vector3 pos = mainUIPanel.Icon_Coin.transform.position;
+                target = _showItemMoveToTargetPanel.transform.worldToLocalMatrix * pos;
             }
 
             Vector3 p = UIManager.Instance.CurrCustomCameraStack.camera.WorldToScreenPoint(
@@ -109,6 +114,20 @@ namespace GameUI.Combat
                             BagController.Instance.AddHeroExp(currAddValue);
                             // particleSystemPool.transform.
                         }
+                    } else if ((CombatItemShowEventData.ShowType)imageMove.data ==
+                               CombatItemShowEventData.ShowType.MonsterGold)
+                    {
+                        if (mainUIPanel != null)
+                        {
+                            ParticleSystemPool particleSystemPool =
+                                GObjectPool.Instance.FetchAsyncForGameObject<ParticleSystemPool>(mainUIPanel.fx_ui_coin,
+                                    "fx_ui_coin");
+                            particleSystemPool.transform.SetParent(mainUIPanel.Icon_Coin.transform);
+                            particleSystemPool.transform.localPosition = Vector3.zero;
+                            particleSystemPool.transform.localScale = Vector3.one;
+                            BagController.Instance.AddCoin(currAddValue);
+                            // particleSystemPool.transform.
+                        }
                     }
                 }, SetTargetPoint, showType);
         }