From fff4bf318a2c10d360da6e850228ada4fb800547 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 09 五月 2019 15:15:07 +0800
Subject: [PATCH] 6705 【后端】【2.0】天星塔功能

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SkyTower.py |   11 ++---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py                               |   39 ++-----------------
 PySysDB/PySysDBPY.h                                                                                                |   12 -----
 3 files changed, 11 insertions(+), 51 deletions(-)

diff --git a/PySysDB/PySysDBPY.h b/PySysDB/PySysDBPY.h
index 03fc42b..7228fd2 100644
--- a/PySysDB/PySysDBPY.h
+++ b/PySysDB/PySysDBPY.h
@@ -1664,17 +1664,6 @@
 	DWORD		ZhuXianScore;	//需要诛仙总评分
 };
 
-//诛仙塔表
-
-struct tagZhuXianTower
-{
-	DWORD		_ID;	//塔编号
-	DWORD		NPCID;	//npcid
-	list		FirstAward;	//首次S级奖励
-	dict		GradeAward;	//评级奖励
-	WORD		UnLockEquipPlace;	//解锁的装备位
-	DWORD		NeedPower;	//推荐战力
-};
 
 //诛仙装备分解表
 
@@ -1905,4 +1894,5 @@
 	dict		Reward;	//奖励
 	WORD		NeedLV;	//要求等级
 	DWORD		FightPower;	//推荐战力
+	BYTE		IsNotify;	//是否广播
 };
\ No newline at end of file
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SkyTower.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SkyTower.py
index 3f5d124..8462085 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SkyTower.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SkyTower.py
@@ -309,15 +309,14 @@
     
             
     if ipyData.GetIsNotify():
-        IPY_Data = IpyGameDataPY.IPY_Data()
-        maxLevel = IPY_Data.GetRuneTowerByIndex(IPY_Data.GetRuneTowerCount()-1).GetID()
-        sysMark = 'RuneTowerInfo_1' if floorID == maxLevel else 'GeRen_liubo_471172'
-        PlayerControl.WorldNotify(0, sysMark,
-                                  [curPlayer.GetPlayerName(), floorID / 100])
+        #IPY_Data = IpyGameDataPY.IPY_Data()
+        #maxLevel = IPY_Data.GetRuneTowerByIndex(IPY_Data.GetRuneTowerCount()-1).GetID()
+        sysMark = 'KillGodTowerInfo_1'# if floorID == maxLevel else 'GeRen_liubo_471172'
+        PlayerControl.WorldNotify(0, sysMark, [curPlayer.GetPlayerName(), floorID])
     #更新关卡
     SetSkyTowerCurfloorID(curPlayer, floorID)
     # 给过关奖励
-    prizeDict = __GiveFBPassPrize(curPlayer, floorID)
+    prizeDict = __GiveFBPassPrize(curPlayer, ipyData)
     # 过关时间
     costTime = tick - GameWorld.GetGameFB().GetFBStepTick()
     prizeDict[FBCommon.Over_costTime] = costTime
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index 02a6b60..1f63907 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -1294,15 +1294,6 @@
                         ("DWORD", "ZhuXianScore", 0),
                         ),
 
-                "ZhuXianTower":(
-                        ("DWORD", "ID", 1),
-                        ("DWORD", "NPCID", 0),
-                        ("list", "FirstAward", 0),
-                        ("dict", "GradeAward", 0),
-                        ("WORD", "UnLockEquipPlace", 0),
-                        ("DWORD", "NeedPower", 0),
-                        ),
-
                 "ZhuXianEquipDecompose":(
                         ("BYTE", "ClassLV", 1),
                         ("dict", "DecomposeInfo", 0),
@@ -1469,6 +1460,7 @@
                         ("dict", "Reward", 0),
                         ("WORD", "NeedLV", 0),
                         ("DWORD", "FightPower", 0),
+                        ("BYTE", "IsNotify", 0),
                         ),
                 }
 
@@ -4125,25 +4117,6 @@
     def GetRealmLV(self): return self.RealmLV # 需要境界
     def GetZhuXianScore(self): return self.ZhuXianScore # 需要诛仙总评分
 
-# 诛仙塔表
-class IPY_ZhuXianTower():
-    
-    def __init__(self):
-        self.ID = 0
-        self.NPCID = 0
-        self.FirstAward = []
-        self.GradeAward = {}
-        self.UnLockEquipPlace = 0
-        self.NeedPower = 0
-        return
-        
-    def GetID(self): return self.ID # 塔编号
-    def GetNPCID(self): return self.NPCID # npcid
-    def GetFirstAward(self): return self.FirstAward # 首次S级奖励
-    def GetGradeAward(self): return self.GradeAward # 评级奖励
-    def GetUnLockEquipPlace(self): return self.UnLockEquipPlace # 解锁的装备位
-    def GetNeedPower(self): return self.NeedPower # 推荐战力
-
 # 诛仙装备分解表
 class IPY_ZhuXianEquipDecompose():
     
@@ -4492,14 +4465,16 @@
         self.BossID = 0
         self.Reward = {}
         self.NeedLV = 0
-        self.FightPower = 0
+        self.FightPower = 0
+        self.IsNotify = 0
         return
         
     def GetFloorID(self): return self.FloorID # 层
     def GetBossID(self): return self.BossID # bossID
     def GetReward(self): return self.Reward # 奖励
     def GetNeedLV(self): return self.NeedLV # 要求等级
-    def GetFightPower(self): return self.FightPower # 推荐战力
+    def GetFightPower(self): return self.FightPower # 推荐战力
+    def GetIsNotify(self): return self.IsNotify # 是否广播
 
 
 def Log(msg, playerID=0, par=0):
@@ -4781,8 +4756,6 @@
         self.ipyZhuXianSuitAttrLen = len(self.ipyZhuXianSuitAttrCache)
         self.ipyZhuXianBossCache = self.__LoadFileData("ZhuXianBoss", IPY_ZhuXianBoss)
         self.ipyZhuXianBossLen = len(self.ipyZhuXianBossCache)
-        self.ipyZhuXianTowerCache = self.__LoadFileData("ZhuXianTower", IPY_ZhuXianTower)
-        self.ipyZhuXianTowerLen = len(self.ipyZhuXianTowerCache)
         self.ipyZhuXianEquipDecomposeCache = self.__LoadFileData("ZhuXianEquipDecompose", IPY_ZhuXianEquipDecompose)
         self.ipyZhuXianEquipDecomposeLen = len(self.ipyZhuXianEquipDecomposeCache)
         self.ipyActFeastWeekPartyCache = self.__LoadFileData("ActFeastWeekParty", IPY_ActFeastWeekParty)
@@ -5247,8 +5220,6 @@
     def GetZhuXianSuitAttrByIndex(self, index): return self.ipyZhuXianSuitAttrCache[index]
     def GetZhuXianBossCount(self): return self.ipyZhuXianBossLen
     def GetZhuXianBossByIndex(self, index): return self.ipyZhuXianBossCache[index]
-    def GetZhuXianTowerCount(self): return self.ipyZhuXianTowerLen
-    def GetZhuXianTowerByIndex(self, index): return self.ipyZhuXianTowerCache[index]
     def GetZhuXianEquipDecomposeCount(self): return self.ipyZhuXianEquipDecomposeLen
     def GetZhuXianEquipDecomposeByIndex(self, index): return self.ipyZhuXianEquipDecomposeCache[index]
     def GetActFeastWeekPartyCount(self): return self.ipyActFeastWeekPartyLen

--
Gitblit v1.8.0