From bbd7bbe9ed3a1eae6cd9ca45ca149cc7f882daa2 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 18 九月 2018 15:01:26 +0800
Subject: [PATCH] 3243 【开发】开服限时活动定制
---
System/MainInterfacePanel/PlayerMainDate.cs | 69 +++++++++++++++++++++++++++-------
1 files changed, 55 insertions(+), 14 deletions(-)
diff --git a/System/MainInterfacePanel/PlayerMainDate.cs b/System/MainInterfacePanel/PlayerMainDate.cs
index d791053..a2f654b 100644
--- a/System/MainInterfacePanel/PlayerMainDate.cs
+++ b/System/MainInterfacePanel/PlayerMainDate.cs
@@ -52,6 +52,7 @@
public static Action NetworkStateEvent;
//--------濞茬殗閬楄抗锛涗腑鐨勫眰鏁拌褰曚竴涓嬩笅
+ public int WaHuangHighestFloor = 0;//璁板綍濞茬殗灞傛暟鎵ｉ櫎鍙傛暟
public int _layerNumber = 1;//鏈嶅姟绔殑灞傛暟
public int LayerNumber
{
@@ -105,6 +106,30 @@
public int FlyShoseTaskID = 0;
//--------鑾峰彇鐜╁姝讳骸鐘舵��
public bool IsDead = false;
+
+ //----------鍏充簬鏌愪簺鍓湰鍙互杩涜鍦板浘鎸傛満
+ public List<int> OneKeyList = new List<int>();
+
+ //----------浣跨敤濞茬殗鍗疯酱鍚庣殑Buff琛ㄧ幇
+ public static event Action EmperorBuffEvent;
+ public bool IsEmperor = false;
+
+ //---------鍏充簬浠诲姟闇�瑕佺殑鏁版嵁
+ public List<int> TaskId_Skill = new List<int>();
+ public List<int> TaskId_Skill1 = new List<int>();
+ public int ItemID = 0;
+ public int UnitPrice = 0;
+ public int ItemNumber = 0;
+ public int TaskLv = 0;//浠诲姟绛夌骇
+ //-----鍏充簬鏀嚎缈呰唨浠诲姟鐨勭壒娈婇�昏緫
+ public int WingTask = 0;
+
+ //------ 鍏充簬鍒囩嚎PK鐘舵�佺殑鐗规畩閫昏緫
+ public List<int> ActivityList = new List<int>();
+ public List<int> ShieldedArea = new List<int>();//闇�瑕佸睆钄界殑鍦板浘鍖哄煙
+
+
+
public override void Init()
{
IsTipBool = true;
@@ -124,21 +149,21 @@
}
NetworkState = (int)SDKUtility.Instance.NetworkType;
GetPassiveSkillTask();
+ var WingsTask = Config.Instance.Get<FuncConfigConfig>("WingsTask");
+ WingTask = int.Parse(WingsTask.Numerical1);
+
+ var ActivityListcon = Config.Instance.Get<FuncConfigConfig>("FairyGrabMapLine");
+ int[] Activity_List = ConfigParse.GetMultipleStr<int>(ActivityListcon.Numerical1);
+ for (int i = 0; i < Activity_List.Length; i++)
+ {
+ ActivityList.Add(Activity_List[i]);
+ }
+ ShieldedArea.Add(10010);
+ ShieldedArea.Add(10020);
+ ShieldedArea.Add(10030);
+ string WaHuangHighestFloorStr= Config.Instance.Get<FuncConfigConfig>("WaHuangHighestFloor").Numerical1;
+ WaHuangHighestFloor = int.Parse(WaHuangHighestFloorStr);
}
- //----------鍏充簬鏌愪簺鍓湰鍙互杩涜鍦板浘鎸傛満
- public List<int> OneKeyList = new List<int>();
-
- //----------浣跨敤濞茬殗鍗疯酱鍚庣殑Buff琛ㄧ幇
- public static event Action EmperorBuffEvent;
- public bool IsEmperor = false;
-
- //---------鍏充簬浠诲姟闇�瑕佺殑鏁版嵁
- public List<int> TaskId_Skill = new List<int>();
- public List<int> TaskId_Skill1 = new List<int>();
- public int ItemID = 0;
- public int UnitPrice = 0;
- public int ItemNumber = 0;
-
private void GetPassiveSkillTask()//鑾峰彇浠诲姟鏁版嵁
{
@@ -156,11 +181,14 @@
TaskId_Skill1.Add(TaskId_SkillInt1[i]);
}
int[] PassiveSkillTask = ConfigParse.GetMultipleStr<int>(PassiveSkillTaskconfig.Numerical3);
+ string str4 =PassiveSkillTaskconfig.Numerical4;
+ TaskLv = int.Parse(str4);
if (PassiveSkillTask.Length >= 3)
{
ItemID = PassiveSkillTask[0];
UnitPrice = PassiveSkillTask[1];
ItemNumber = PassiveSkillTask[2];
+
}
}
@@ -309,6 +337,10 @@
public void PowerAdd(int power)
{
+ if (ModelCenter.Instance.GetModel<TreasureModel>().inPotentialModifyPower)
+ {
+ return;
+ }
if (prowBool)
{
prowNum = power;
@@ -362,6 +394,15 @@
WindowCenter.Instance.Open<PowerAddWin>();
}
+ public void FabaoPowerAdd(int power)
+ {
+ ProwNumAdd = power;
+ if (WindowCenter.Instance.CheckOpen<PowerAddWin>())
+ {
+ WindowCenter.Instance.CloseImmediately<PowerAddWin>();
+ }
+ WindowCenter.Instance.Open<PowerAddWin>();
+ }
public void KissMonsterExperience(int _source, int _ExpPoint, int _Exp)//锛�1.鍗曚綅缁忛獙浜跨偣锛�2.缁忛獙鍗曚綅鐐癸級
{
if (Event_Experience != null)
--
Gitblit v1.8.0