修改bug

Assets/Res/UI/MainUIPanel.prefab

@@ -146,6 +146,8 @@ GameObject:
   - component: {fileID: 7295285484143575252}
   - component: {fileID: 5110367857571788923}
   - component: {fileID: 3173585067917471387}
+  - component: {fileID: 8460307177490204470}
+  - component: {fileID: 126865455933342945}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Icon_Diamon
@@ -219,6 +221,65 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: e90cdb0036b7598e8196c482eccd4329
+--- !u!114 &8460307177490204470
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 276298489757744287}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 0
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 3173585067917471387}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &126865455933342945
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 276298489757744287}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e30737fa9d44e934eb9236105be999f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  duration: 0.07
+  ease: 5
+  animationSizeDelta: {x: 0.2, y: 0.2, z: 0}
 --- !u!1 &292838646372743710
 GameObject:
   m_ObjectHideFlags: 0
@@ -1017,6 +1078,8 @@ GameObject:
   - component: {fileID: 5433286787357854352}
   - component: {fileID: 5309631651483224709}
   - component: {fileID: 6524193313608138032}
+  - component: {fileID: 5744364923132583880}
+  - component: {fileID: 1259213702763062060}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Icon_Coin
@@ -1090,6 +1153,65 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: e90cdb0036b7598e8196c482eccd4329
+--- !u!114 &5744364923132583880
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1211543753200599720}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 0
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 6524193313608138032}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &1259213702763062060
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1211543753200599720}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e30737fa9d44e934eb9236105be999f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  duration: 0.07
+  ease: 5
+  animationSizeDelta: {x: 0.2, y: 0.2, z: 0}
 --- !u!1 &1222237385420729871
 GameObject:
   m_ObjectHideFlags: 0
@@ -4557,6 +4679,33 @@ MonoBehaviour:
     - gameObject: {fileID: 6107101496507914859}
     - gameObject: {fileID: 397899105639740}
     - gameObject: {fileID: 3469845461661622283}
+  - key: Icon_HeroExp_button
+    gameObject: {fileID: 4024069355568480163}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9073062006211861286}
+    - gameObject: {fileID: 6107101496507914859}
+    - gameObject: {fileID: 397899105639740}
+    - gameObject: {fileID: 3469845461661622283}
+  - key: Icon_Coin_button
+    gameObject: {fileID: 5744364923132583880}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9073062006211861286}
+    - gameObject: {fileID: 6107101496507914859}
+    - gameObject: {fileID: 397899105639740}
+    - gameObject: {fileID: 3469845461661622283}
+  - key: Icon_Diamon_button
+    gameObject: {fileID: 8460307177490204470}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9073062006211861286}
+    - gameObject: {fileID: 6107101496507914859}
+    - gameObject: {fileID: 397899105639740}
+    - gameObject: {fileID: 3469845461661622283}
   isAssetBundle: 1
 --- !u!1 &6750499123037776255
 GameObject:
@@ -4962,6 +5111,8 @@ GameObject:
   - component: {fileID: 6989071283435105637}
   - component: {fileID: 2473317446412967829}
   - component: {fileID: 2002673787439862528}
+  - component: {fileID: 4024069355568480163}
+  - component: {fileID: 3098295541360265216}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Icon_HeroExp
@@ -5036,6 +5187,65 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
+--- !u!114 &4024069355568480163
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7748391517457046766}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 0
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 2002673787439862528}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &3098295541360265216
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7748391517457046766}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e30737fa9d44e934eb9236105be999f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  duration: 0.07
+  ease: 5
+  animationSizeDelta: {x: 0.2, y: 0.2, z: 0}
 --- !u!1 &7803319478472451267
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -216,10 +216,10 @@ namespace GameLogic.Combat.CombatType
             BagController.Instance.DropHeroExp(combatHeroEntity.combatHeroGameObject.position, 3,
                 _levelBattleConfig.miniExpAndGold[0]);
             int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
-            if (odds < 20)
+            if (odds < 70)
             {
-                BagController.Instance.DropMonsterGold(combatHeroEntity.combatHeroGameObject.position, 1,
-                    1);
+                BagController.Instance.DropMonsterGold(combatHeroEntity.combatHeroGameObject.position, 3,
+                    3);
             }
            
 
@@ -311,7 +311,7 @@ namespace GameLogic.Combat.CombatType
             BagController.Instance.DropHeroExp(combatHeroEntity.combatHeroGameObject.position, 20,
                 _levelBattleConfig.bossExpAndGold);
             BagController.Instance.DropMonsterGold(combatHeroEntity.combatHeroGameObject.position, 30,
-                30);
+                100);
             CombatController.currActiveCombat.CombatHeroController.SetFollowTarget();
             isBossCombat = false;
             LevelBattleConfig levelBattleConfig =

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

@@ -34,13 +34,18 @@ namespace GameLogic.Combat.Skill
 
             if (targetEntity.combatHeroEntity.CurrCombatHeroInfo.heroType == 4)
             {
-                BagController.Instance.DropMonsterGold(targetEntity.combatHeroEntity.combatHeroGameObject.position, 2,
-                    2);
+                int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
+                if (odds < 40)
+                {
+                    BagController.Instance.DropMonsterGold(targetEntity.combatHeroEntity.combatHeroGameObject.position,
+                        3,
+                        3);
+                }
             }
             else
             {
                 int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
-                if (odds < 70)
+                if (odds < 30)
                 {
                     BagController.Instance.DropMonsterGold(targetEntity.combatHeroEntity.combatHeroGameObject.position,
                         1,

Assets/Scripts/GameUI/UI/MainUIPanel.cs

@@ -98,6 +98,27 @@ namespace Fort23.Mono
             Button_battleBoss.onClick.AddListener(OnClickButtonBattleBoss);
             box.onClick.AddListener(OnOpenBox);
             Button_huiQiu.onClick.AddListener(OnClickPlayerSkill);
+            Icon_HeroExp_button.onClick.AddListener(OnClickIcon_HeroExp_button);
+            Icon_Coin_button.onClick.AddListener(OnClickIcon_Coin_button);
+            Icon_Diamon_button.onClick.AddListener(OnClickIcon_Diamon_button);
+        }
+
+        private void OnClickIcon_HeroExp_button()
+        {
+            TipMessagePanel.OpenTipMessagePanel("英雄经验，可用于升级英雄等级<color=#ff0000>（每杀死一个小怪能获得经验，击杀boss能获得大量经验）</color>",
+                new Vector2(Icon_HeroExp_button.transform.position.x, Icon_HeroExp_button.transform.position.y - 0.5f));
+        }
+
+        private void OnClickIcon_Coin_button()
+        {
+            TipMessagePanel.OpenTipMessagePanel("金币，用于抽取英雄宝箱<color=#ff0000>（每杀死一个小怪有几率获得金币，击杀boss能获得大量金币）</color>",
+                new Vector2(Icon_Coin_button.transform.position.x, Icon_Coin_button.transform.position.y - 0.5f));
+        }
+
+        private void OnClickIcon_Diamon_button()
+        {
+            TipMessagePanel.OpenTipMessagePanel("紫砖（敬请期待）",
+                new Vector2(Icon_Diamon_button.transform.position.x, Icon_Diamon_button.transform.position.y - 0.5f));
         }
 
         private void OnOpenBox()
@@ -120,7 +141,7 @@ namespace Fort23.Mono
         {
             Debug.Log("显示描述");
             RectTransform huoQiu = Button_huiQiu.GetComponent<RectTransform>();
-            TipMessagePanel.OpenTipMessagePanel("点击屏幕空白处从天空中召唤一个陨石，对怪物造成1点伤害，并有70%概率获得1枚金币（boss怪必定掉落，金币数量+2）",
+            TipMessagePanel.OpenTipMessagePanel("点击屏幕空白处从天空中召唤一个陨石，对怪物造成1点伤害，并有<color=#ff0000>30%</color>概率获得1枚金币（boss怪<color=#ff0000>40%</color>掉落，金币数量<color=#ff0000>+2</color>）",
                 new Vector2(huoQiu.position.x, huoQiu.position.y + 0.5f));
         }
 

Assets/Scripts/GameUI/UI/MainUIPanelData.cs

@@ -144,6 +144,7 @@ namespace Fort23.Mono
 	     }
 	   }
 	  private TextMeshProUGUI _txtDiamond;
+        
 	  public TextMeshProUGUI txtDiamond
 	   {
 	   get{
@@ -264,6 +265,39 @@ namespace Fort23.Mono
 	      return _Button_huiQiu_tween;
 	     }
 	   }
+	  private Button _Icon_HeroExp_button;
+	  public Button Icon_HeroExp_button
+	   {
+	   get{
+	      if (_Icon_HeroExp_button == null)
+	       {
+	         _Icon_HeroExp_button  = GetUIUnit<Button>("Icon_HeroExp_button"); 
+	       }
+	      return _Icon_HeroExp_button;
+	     }
+	   }
+	  private Button _Icon_Coin_button;
+	  public Button Icon_Coin_button
+	   {
+	   get{
+	      if (_Icon_Coin_button == null)
+	       {
+	         _Icon_Coin_button  = GetUIUnit<Button>("Icon_Coin_button"); 
+	       }
+	      return _Icon_Coin_button;
+	     }
+	   }
+	  private Button _Icon_Diamon_button;
+	  public Button Icon_Diamon_button
+	   {
+	   get{
+	      if (_Icon_Diamon_button == null)
+	       {
+	         _Icon_Diamon_button  = GetUIUnit<Button>("Icon_Diamon_button"); 
+	       }
+	      return _Icon_Diamon_button;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/TipMessage/TipMessagePanel.cs

@@ -14,6 +14,12 @@ namespace Fort23.Mono
             tipMessagePanel.SetTipMessage(meg, worldPos);
         }
 
+        public override async CTask Open()
+        {
+            await base.Open();
+            GObjectPoolInterface.SetActive(false);
+        }
+
         private void Init()
         {
         }
@@ -85,6 +91,7 @@ namespace Fort23.Mono
             dotPoint.anchoredPosition = pos;
             LayoutRebuilder.MarkLayoutForRebuild(bgTran);
             LayoutRebuilder.ForceRebuildLayoutImmediate(bgTran);
+            GObjectPoolInterface.SetActive(true);
         }
     }
 }