From 05c157b4376f306db95a3bee173b95b617ccb229 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 12 十二月 2018 15:35:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Cross_Server
---
System/MainInterfacePanel/PlayerMainDate.cs | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/System/MainInterfacePanel/PlayerMainDate.cs b/System/MainInterfacePanel/PlayerMainDate.cs
index 12ddcf8..e35d598 100644
--- a/System/MainInterfacePanel/PlayerMainDate.cs
+++ b/System/MainInterfacePanel/PlayerMainDate.cs
@@ -24,6 +24,7 @@
{
get { return m_PlayerPackModel ?? (m_PlayerPackModel = ModelCenter.Instance.GetModel<PlayerPackModel>()); }
}
+ DungeonAssistModel assistModel { get { return ModelCenter.Instance.GetModel<DungeonAssistModel>(); } }
//鐢ㄤ簬璁板綍XP鎶�鑳界殑淇℃伅
public delegate void OnXpSkill();
public static event OnXpSkill Event_XpSkill;
@@ -167,7 +168,25 @@
string WaHuangHighestFloorStr= Config.Instance.Get<FuncConfigConfig>("WaHuangHighestFloor").Numerical1;
WaHuangHighestFloor = int.Parse(WaHuangHighestFloorStr);
ruinsTranscriptMapId = int.Parse(Config.Instance.Get<FuncConfigConfig>("SpRewardMapID").Numerical1);//濞茬殗鍦板浘ID
- WHYJPowerDic = ConfigParse.GetDic<int, int>(Config.Instance.Get<FuncConfigConfig>("WHFloorChoose").Numerical1);//濞茬殗鎴樺姏
+
+ WHYJPowerDic.Clear();
+ for (int i = 0; i < 8; i++)
+ {
+ DungeonHelpBattleConfig Config = assistModel.GetHelpBattleConfig(51010,i);
+ if (Config != null)
+ {
+ int type = i + 1;
+ if (type == 1)
+ {
+ WHYJPowerDic.Add(type, 0);
+ }
+ else
+ {
+ WHYJPowerDic.Add(type, Config.RobotFightPower);
+ }
+ }
+ }
+ // WHYJPowerDic = ConfigParse.GetDic<int, int>(Config.Instance.Get<FuncConfigConfig>("WHFloorChoose").Numerical1);//濞茬殗鎴樺姏
}
@@ -402,10 +421,11 @@
if (WindowCenter.Instance.IsOpen<PowerAddWin>())
{
WindowCenter.Instance.CloseImmediately<PowerAddWin>();
- if (prowNum != 0)
- {
- prowNum += power;
- }
+
+ }
+ if (prowNum != 0)
+ {
+ prowNum += power;
}
WindowCenter.Instance.Open<PowerAddWin>();
}
--
Gitblit v1.8.0