|
@@ -98,7 +98,7 @@ namespace GameLogic.Combat.CombatType
|
|
|
/// <summary>
|
|
|
/// 掉落逻辑放这里
|
|
|
/// </summary>
|
|
|
- private void EntityDropLogic(CombatHeroEntity combatHeroEntity, float waitTime= 2f)
|
|
|
+ private void EntityDropLogic(CombatHeroEntity combatHeroEntity, float waitTime = 2f)
|
|
|
{
|
|
|
// return;
|
|
|
List<ItemInfo> equipmentList =
|
|
@@ -126,7 +126,7 @@ namespace GameLogic.Combat.CombatType
|
|
|
|
|
|
protected override void ProHeroDie(CombatHeroEntity combatHeroEntity, HarmReturnInfo harmReturnInfo)
|
|
|
{
|
|
|
- if (harmReturnInfo==null || harmReturnInfo.harmType == HarmType.SystemKo)
|
|
|
+ if (harmReturnInfo == null || harmReturnInfo.harmType == HarmType.SystemKo)
|
|
|
{
|
|
|
return;
|
|
|
}
|
|
@@ -144,7 +144,7 @@ namespace GameLogic.Combat.CombatType
|
|
|
{
|
|
|
EntityDropLogic(combatHeroEntity, 0.8f);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
BossKo(combatHeroEntity);
|
|
|
}
|
|
|
}
|
|
@@ -160,7 +160,6 @@ namespace GameLogic.Combat.CombatType
|
|
|
|
|
|
public void Resume()
|
|
|
{
|
|
|
-
|
|
|
HarmReturnInfo newharm = new HarmReturnInfo();
|
|
|
newharm.harmType = HarmType.SystemKo;
|
|
|
CombatHeroEntity[] allHero = combatController.CombatHeroController.GetHero(true);
|
|
@@ -226,23 +225,23 @@ namespace GameLogic.Combat.CombatType
|
|
|
{
|
|
|
return;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
BagController.Instance.AddHeroExp(_levelBattleConfig.miniExpAndGold[0]);
|
|
|
-
|
|
|
+
|
|
|
// BagController.Instance.DropHeroExp(combatHeroEntity.combatHeroGameObject.position, 3,
|
|
|
// _levelBattleConfig.miniExpAndGold[0]);
|
|
|
int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
|
|
|
- if (odds < 30)
|
|
|
+ if (odds < 70)
|
|
|
{
|
|
|
ShowTextEventData showTextEventData = ShowTextEventData.Create();
|
|
|
- showTextEventData.text = "+金幣 1";
|
|
|
+ showTextEventData.text = "+金幣 5";
|
|
|
showTextEventData.Color = new Color(1f, 0.64f, 0.22f);
|
|
|
showTextEventData.worldPos = combatHeroEntity.combatHeroGameObject.position;
|
|
|
EventManager.Instance.Dispatch(CustomEventType.ShowText, showTextEventData);
|
|
|
- BagController.Instance.AddCoin(1);
|
|
|
+ BagController.Instance.AddCoin(5);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
|
|
|
// //TODO 装备掉落后,飞特效得逻辑
|
|
|
// List<string> allEquip = new List<string>();
|
|
@@ -260,8 +259,6 @@ namespace GameLogic.Combat.CombatType
|
|
|
// combatEquipFallEventData.startPos_WorldPos = combatItemShowEventData.startPos_WorldPos;
|
|
|
// EventManager.Instance.Dispatch(CustomEventType.Combat_EquipFall, combatEquipFallEventData);
|
|
|
|
|
|
-
|
|
|
-
|
|
|
|
|
|
// BagController.Instance.AddHeroExp(10);
|
|
|
int levelExp = combatHeroEntity.CurrCombatHeroInfo.heroType == 2 ? 1 : 1;
|
|
@@ -329,7 +326,7 @@ namespace GameLogic.Combat.CombatType
|
|
|
BagController.Instance.DropHeroExp(combatHeroEntity.combatHeroGameObject.position, 20,
|
|
|
_levelBattleConfig.bossExpAndGold);
|
|
|
BagController.Instance.DropMonsterGold(combatHeroEntity.combatHeroGameObject.position, 30,
|
|
|
- 100);
|
|
|
+ 500);
|
|
|
CombatController.currActiveCombat.CombatHeroController.SetFollowTarget();
|
|
|
isBossCombat = false;
|
|
|
LevelBattleConfig levelBattleConfig =
|
|
@@ -382,7 +379,6 @@ namespace GameLogic.Combat.CombatType
|
|
|
CombatHeroEntity[] allHero = combatController.CombatHeroController.GetHero(true);
|
|
|
if (allHero != null)
|
|
|
{
|
|
|
-
|
|
|
List<CombatHeroEntity> heroEntities = new List<CombatHeroEntity>();
|
|
|
heroEntities.AddRange(allHero);
|
|
|
for (int i = 0; i < heroEntities.Count; i++)
|