|
|
@@ -18,6 +18,7 @@ namespace Fort23.Mono
|
|
|
|
|
|
private LevelbattleConfig levelbattleConfig;
|
|
|
private GroupConfig groupConfig;
|
|
|
+
|
|
|
List<BossInfoHeadWidget> BossInfoHeadWidgets = new List<BossInfoHeadWidget>();
|
|
|
// private HeroModelConfig heroModelConfig;
|
|
|
// private MonsterPowerUpConfig heroPowerUpConfig;
|
|
|
@@ -58,28 +59,50 @@ namespace Fort23.Mono
|
|
|
|
|
|
public async override CTask<bool> AsyncInit(object[] uiData)
|
|
|
{
|
|
|
- await CustomInit((int)uiData[0], uiData[1] as CTask<bool>);
|
|
|
+ await CustomInit((int)uiData[0], uiData[2] as AccountFileInfo.EventList, uiData[2] as CTask<bool>);
|
|
|
return await base.AsyncInit(uiData);
|
|
|
}
|
|
|
|
|
|
|
|
|
- public async CTask CustomInit(int levebattleId, CTask<bool> result)
|
|
|
+ public async CTask CustomInit(int levebattleId, AccountFileInfo.EventList eventList, CTask<bool> result)
|
|
|
{
|
|
|
this.result = result;
|
|
|
levelbattleConfig = ConfigComponent.Instance.Get<LevelbattleConfig>(levebattleId);
|
|
|
groupConfig = ConfigComponent.Instance.Get<GroupConfig>(levelbattleConfig.Group[0]);
|
|
|
- foreach (var i in groupConfig.GroupMonster)
|
|
|
+ for (var i = 0; i < groupConfig.GroupMonster.Length; i++)
|
|
|
{
|
|
|
- HeroModelConfig heroModelConfig = ConfigComponent.Instance.Get<HeroModelConfig>(i);
|
|
|
- MonsterPowerUpConfig heroPowerUpConfig = ConfigComponent.Instance.Get<MonsterPowerUpConfig>(PlayerManager.Instance.myHero.level.Value);
|
|
|
+ HeroModelConfig heroModelConfig =
|
|
|
+ ConfigComponent.Instance.Get<HeroModelConfig>(groupConfig.GroupMonster[i]);
|
|
|
CombatHeroInfo combatHeroInfo = new CombatHeroInfo();
|
|
|
- combatHeroInfo.InitMonster(heroModelConfig.ID, heroPowerUpConfig.ID);
|
|
|
+ //玩家等级
|
|
|
+ if (groupConfig.GroupMonsterLevel[i] == -1)
|
|
|
+ {
|
|
|
+ MonsterPowerUpConfig heroPowerUpConfig =
|
|
|
+ ConfigComponent.Instance.Get<MonsterPowerUpConfig>(eventList.heroLevel);
|
|
|
+
|
|
|
+ combatHeroInfo.InitMonster(heroModelConfig.ID, heroPowerUpConfig.ID);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ MonsterPowerUpConfig heroPowerUpConfig =
|
|
|
+ ConfigComponent.Instance.Get<MonsterPowerUpConfig>(groupConfig.GroupMonsterLevel[i]);
|
|
|
+
|
|
|
+ combatHeroInfo.InitMonster(heroModelConfig.ID, heroPowerUpConfig.ID);
|
|
|
+ }
|
|
|
|
|
|
- BossInfoHeadWidget bossInfoHeadWidget = await UIManager.Instance.CreateGComponent<BossInfoHeadWidget>(null,BossInfoHeadRoot);
|
|
|
+
|
|
|
+ BossInfoHeadWidget bossInfoHeadWidget =
|
|
|
+ await UIManager.Instance.CreateGComponent<BossInfoHeadWidget>(null, BossInfoHeadRoot);
|
|
|
bossInfoHeadWidget.CustomInit(combatHeroInfo);
|
|
|
bossInfoHeadWidget.OnClick = OnClick;
|
|
|
BossInfoHeadWidgets.Add(bossInfoHeadWidget);
|
|
|
}
|
|
|
+ // foreach (var i in groupConfig.GroupMonster)
|
|
|
+ // {
|
|
|
+ //
|
|
|
+ //
|
|
|
+ // }
|
|
|
+
|
|
|
// heroModelConfig = ConfigComponent.Instance.Get<HeroModelConfig>(groupConfig.GroupMonster[0]);
|
|
|
// heroPowerUpConfig = ConfigComponent.Instance.Get<MonsterPowerUpConfig>(PlayerManager.Instance.myHero.level.Value);
|
|
|
//
|
|
|
@@ -92,7 +115,7 @@ namespace Fort23.Mono
|
|
|
private void OnClick(ItemWidgetBasic obj)
|
|
|
{
|
|
|
BossInfoHeadWidget bossInfoHeadWidget = obj as BossInfoHeadWidget;
|
|
|
- UpdateInfo(2,bossInfoHeadWidget._combatHero);
|
|
|
+ UpdateInfo(2, bossInfoHeadWidget._combatHero);
|
|
|
Icon_Select.transform.SetParent(bossInfoHeadWidget.transform);
|
|
|
Icon_Select.transform.SetAsFirstSibling();
|
|
|
Icon_Select.GetComponent<RectTransform>().anchoredPosition = new Vector2(0, 0);
|
|
|
@@ -112,14 +135,17 @@ namespace Fort23.Mono
|
|
|
Icon_Select.transform.SetParent(Btn_Player.transform);
|
|
|
Icon_Select.transform.SetAsFirstSibling();
|
|
|
Icon_Select.GetComponent<RectTransform>().anchoredPosition = new Vector2(0, 0);
|
|
|
- Text_Name.text = "名称：" + LanguageManager.Instance.Text(PlayerManager.Instance.PlayerName);
|
|
|
+ Text_Name.text = "名称：" + PlayerManager.Instance.PlayerName;
|
|
|
|
|
|
|
|
|
- Text_Jingjie.text = "境界：" + LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
|
|
|
- LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
|
|
|
- LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
|
|
|
+ Text_Jingjie.text =
|
|
|
+ "境界：" +
|
|
|
+ LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
|
|
|
+ LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
|
|
|
+ LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
|
|
|
|
|
|
- Text_Linggen.text = $"金：{PlayerManager.Instance.myHero.Metal} 木：{PlayerManager.Instance.myHero.Wood} 水：{PlayerManager.Instance.myHero.Water} 火：{PlayerManager.Instance.myHero.Fire} 土：{PlayerManager.Instance.myHero.Earth}";
|
|
|
+ Text_Linggen.text =
|
|
|
+ $"金：{PlayerManager.Instance.myHero.Metal} 木：{PlayerManager.Instance.myHero.Wood} 水：{PlayerManager.Instance.myHero.Water} 火：{PlayerManager.Instance.myHero.Fire} 土：{PlayerManager.Instance.myHero.Earth}";
|
|
|
Text_Hp.text = PlayerManager.Instance.myHero.hp.Value.ToString();
|
|
|
|
|
|
using (CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer())
|
|
|
@@ -159,13 +185,14 @@ namespace Fort23.Mono
|
|
|
{
|
|
|
// Icon_Select.transform.SetParent(Btn_Boss.transform);
|
|
|
// Icon_Select.transform.SetAsFirstSibling();
|
|
|
-
|
|
|
+
|
|
|
Text_Name.text = "名称：" + LanguageManager.Instance.Text(combatHeroInfo.modelConfig.name);
|
|
|
|
|
|
|
|
|
- Text_Jingjie.text = "境界：" + LanguageManager.Instance.Text(combatHeroInfo.MonsterPowerUpConfig.jingjie1) +
|
|
|
- LanguageManager.Instance.Text(combatHeroInfo.MonsterPowerUpConfig.jingjie2) +
|
|
|
- LanguageManager.Instance.Text(combatHeroInfo.MonsterPowerUpConfig.jingjie3);
|
|
|
+ Text_Jingjie.text =
|
|
|
+ "境界：" + LanguageManager.Instance.Text(combatHeroInfo.MonsterPowerUpConfig.jingjie1) +
|
|
|
+ LanguageManager.Instance.Text(combatHeroInfo.MonsterPowerUpConfig.jingjie2) +
|
|
|
+ LanguageManager.Instance.Text(combatHeroInfo.MonsterPowerUpConfig.jingjie3);
|
|
|
|
|
|
using (CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer())
|
|
|
{
|
|
|
@@ -175,12 +202,19 @@ namespace Fort23.Mono
|
|
|
{
|
|
|
int index = i;
|
|
|
bool isUlock = combatHeroInfo.level >= combatHeroInfo.modelConfig.fabaoActiveLv[i];
|
|
|
- cTaskAwaitBuffer.AddTask(UIManager.Instance.CreateGComponent<GongFaWidgetType2>((faBaoWidget) =>
|
|
|
+ if (isUlock)
|
|
|
{
|
|
|
- faBaoWidget.CustomInit(new FaBaoInfo(combatHeroInfo.modelConfig.fa_bao_id[index], combatHeroInfo.MonsterPowerUpConfig.FabaoLv, 1),isUlock);
|
|
|
- faBaoWidget.OnClick = FaBaoWidgetOnClick;
|
|
|
- gongFaWidgetType2s.Add(faBaoWidget);
|
|
|
- }, FabaoRoot));
|
|
|
+ cTaskAwaitBuffer.AddTask(UIManager.Instance.CreateGComponent<GongFaWidgetType2>(
|
|
|
+ (faBaoWidget) =>
|
|
|
+ {
|
|
|
+ faBaoWidget.CustomInit(
|
|
|
+ new FaBaoInfo(combatHeroInfo.modelConfig.fa_bao_id[index],
|
|
|
+ combatHeroInfo.MonsterPowerUpConfig.FabaoLv,
|
|
|
+ combatHeroInfo.MonsterPowerUpConfig.FabaoStar), isUlock);
|
|
|
+ faBaoWidget.OnClick = FaBaoWidgetOnClick;
|
|
|
+ gongFaWidgetType2s.Add(faBaoWidget);
|
|
|
+ }, FabaoRoot));
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -190,12 +224,18 @@ namespace Fort23.Mono
|
|
|
{
|
|
|
int index = i;
|
|
|
bool isUlock = combatHeroInfo.level >= combatHeroInfo.modelConfig.skillActiveLv[i];
|
|
|
- cTaskAwaitBuffer.AddTask(UIManager.Instance.CreateGComponent<GongFaWidgetType2>((skillWidget) =>
|
|
|
+ if (isUlock)
|
|
|
{
|
|
|
- skillWidget.CustomInit(new SkillInfo(combatHeroInfo.modelConfig.skillID[index], combatHeroInfo.MonsterPowerUpConfig.GongfaLv, combatHeroInfo.MonsterPowerUpConfig.GongfaStar));
|
|
|
- skillWidget.OnClick = FaBaoWidgetOnClick;
|
|
|
- gongFaWidgetType2s.Add(skillWidget);
|
|
|
- }, GongfaRoot));
|
|
|
+ cTaskAwaitBuffer.AddTask(UIManager.Instance.CreateGComponent<GongFaWidgetType2>(
|
|
|
+ (skillWidget) =>
|
|
|
+ {
|
|
|
+ skillWidget.CustomInit(new SkillInfo(combatHeroInfo.modelConfig.skillID[index],
|
|
|
+ combatHeroInfo.MonsterPowerUpConfig.GongfaLv,
|
|
|
+ combatHeroInfo.MonsterPowerUpConfig.GongfaStar));
|
|
|
+ skillWidget.OnClick = FaBaoWidgetOnClick;
|
|
|
+ gongFaWidgetType2s.Add(skillWidget);
|
|
|
+ }, GongfaRoot));
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -203,7 +243,8 @@ namespace Fort23.Mono
|
|
|
}
|
|
|
|
|
|
|
|
|
- Text_Linggen.text = $"金：{combatHeroInfo.Metal} 木：{combatHeroInfo.Wood} 水：{combatHeroInfo.Water} 火：{combatHeroInfo.Fire} 土：{combatHeroInfo.Earth}";
|
|
|
+ Text_Linggen.text =
|
|
|
+ $"金：{combatHeroInfo.Metal} 木：{combatHeroInfo.Wood} 水：{combatHeroInfo.Water} 火：{combatHeroInfo.Fire} 土：{combatHeroInfo.Earth}";
|
|
|
Text_Hp.text = combatHeroInfo.hp.Value.ToString();
|
|
|
}
|
|
|
}
|
|
|
@@ -232,11 +273,12 @@ namespace Fort23.Mono
|
|
|
}
|
|
|
|
|
|
gongFaWidgetType2s.Clear();
|
|
|
-
|
|
|
+
|
|
|
foreach (var bossInfoHeadWidget in BossInfoHeadWidgets)
|
|
|
{
|
|
|
UIManager.Instance.DormancyGComponent(bossInfoHeadWidget);
|
|
|
}
|
|
|
+
|
|
|
BossInfoHeadWidgets.Clear();
|
|
|
|
|
|
Icon_Select.transform.SetParent(transform);
|
|
|
@@ -245,11 +287,12 @@ namespace Fort23.Mono
|
|
|
await base.Close();
|
|
|
}
|
|
|
|
|
|
- public async static CTask<bool> OpenPanel(int levebattleId)
|
|
|
+ public async static CTask<bool> OpenPanel(int levebattleId, AccountFileInfo.EventList CurrentEventList)
|
|
|
{
|
|
|
CTask<bool> result = CTask<bool>.Create();
|
|
|
-
|
|
|
- BossInfoPanel bossInfoPanel = await UIManager.Instance.LoadAndOpenPanel<BossInfoPanel>(null, UILayer.Top, uiData: new object[] { levebattleId, result },isShowBG:true);
|
|
|
+
|
|
|
+ BossInfoPanel bossInfoPanel = await UIManager.Instance.LoadAndOpenPanel<BossInfoPanel>(null, UILayer.Top,
|
|
|
+ uiData: new object[] { levebattleId, CurrentEventList, result }, isShowBG: true);
|
|
|
// bossInfoPanel.CustomInit(levebattleId, result);
|
|
|
return await result;
|
|
|
}
|
lzx