Core/GameEngine/DataToCtl/PackageRegedit.cs
@@ -422,6 +422,9 @@ Register(typeof(HAC09_tagGCFairyCeremonyInfo), typeof(DTCAC09_tagGCFairyCeremonyInfo)); Register(typeof(HAA14_tagMCXJSDRecharge), typeof(DTCAA14_tagMCXJSDRecharge)); Register(typeof(HAA15_tagMCAllPeoplePartyInfo), typeof(DTCAA15_tagMCAllPeoplePartyInfo)); Register(typeof(HAC0B_tagGCNewFairyCeremonyInfo), typeof(DTCAC0B_tagGCNewFairyCeremonyInfo)); Register(typeof(HAA22_tagMCNewXJSDRecharge), typeof(DTCAA22_tagMCNewXJSDRecharge)); Register(typeof(HAA23_tagMCNewAllPeoplePartyInfo), typeof(DTCAA23_tagMCNewAllPeoplePartyInfo)); #endregion #region 神兽 Core/GameEngine/Model/Player/Rank/PlayerRankData.cs
@@ -124,6 +124,7 @@ OpenServerRecharge = 21, OpenServerPet = 22, JadeDynastyTower=23,//诛仙塔排行榜 Def_BT_NewFCCostGold = 24, //消费排行榜(新仙界盛典) 24 } public class RankData Core/NetworkPackage/DTCFile/ServerPack/HAA_SaleActivity/DTCAA22_tagMCNewXJSDRecharge.cs
New file @@ -0,0 +1,21 @@ using UnityEngine; using System.Collections; using Snxxz.UI; // AA 22 新仙界盛典充值大礼 #tagMCNewXJSDRecharge public class DTCAA22_tagMCNewXJSDRecharge : DtcBasic { public override void Done(GameNetPackBasic vNetPack) { base.Done(vNetPack); HAA22_tagMCNewXJSDRecharge vNetData = vNetPack as HAA22_tagMCNewXJSDRecharge; var model = ModelCenter.Instance.GetModel<NewYearFairylandCeremonyModel>(); model.GetServerRechargeInfo(vNetData); } }
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: e8bcbd5d6d737b04196d56af34ff8f19 timeCreated: 1548645936 licenseType: Pro MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Core/NetworkPackage/DTCFile/ServerPack/HAA_SaleActivity/DTCAA23_tagMCNewAllPeoplePartyInfo.cs
New file @@ -0,0 +1,21 @@ using UnityEngine; using System.Collections; using Snxxz.UI; // AA 23 新仙界盛典全民来嗨玩家信息 #tagMCNewAllPeoplePartyInfo public class DTCAA23_tagMCNewAllPeoplePartyInfo : DtcBasic { public override void Done(GameNetPackBasic vNetPack) { base.Done(vNetPack); HAA23_tagMCNewAllPeoplePartyInfo vNetData = vNetPack as HAA23_tagMCNewAllPeoplePartyInfo; var model = ModelCenter.Instance.GetModel<NewYearFairylandCeremonyModel>(); model.GetServerPeopleInfo(vNetData); } }
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: b58ea3beec5473f40beee65664f5c52f timeCreated: 1548645936 licenseType: Pro MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Core/NetworkPackage/DTCFile/ServerPack/HAC_Activity/DTCAC0B_tagGCNewFairyCeremonyInfo.cs
New file @@ -0,0 +1,21 @@ using UnityEngine; using System.Collections; using Snxxz.UI; // AC 0B 新仙界盛典活动信息 #tagGCNewFairyCeremonyInfo public class DTCAC0B_tagGCNewFairyCeremonyInfo : DtcBasic { public override void Done(GameNetPackBasic vNetPack) { base.Done(vNetPack); HAC0B_tagGCNewFairyCeremonyInfo vNetData = vNetPack as HAC0B_tagGCNewFairyCeremonyInfo; var model = ModelCenter.Instance.GetModel<NewYearFairylandCeremonyModel>(); model.GetServerActiveInfo(vNetData); } }
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: b35fcff20e831be44b8cd523fd6dd60d timeCreated: 1548645936 licenseType: Pro MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA22_tagMCNewXJSDRecharge.cs
New file @@ -0,0 +1,17 @@ using UnityEngine; using System.Collections; // AA 22 新仙界盛典充值大礼 #tagMCNewXJSDRecharge public class HAA22_tagMCNewXJSDRecharge : GameNetPackBasic { public byte State; //0-不可领 1-可领 2-已领取 public HAA22_tagMCNewXJSDRecharge () { _cmd = (ushort)0xAA22; } public override void ReadFromBytes (byte[] vBytes) { TransBytes (out State, vBytes, NetDataType.BYTE); } } Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA22_tagMCNewXJSDRecharge.cs.meta
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: ece86af19cf032a488d22e51682d5ab6 timeCreated: 1548645937 licenseType: Pro MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA23_tagMCNewAllPeoplePartyInfo.cs
New file @@ -0,0 +1,33 @@ using UnityEngine; using System.Collections; // AA 23 新仙界盛典全民来嗨玩家信息 #tagMCNewAllPeoplePartyInfo public class HAA23_tagMCNewAllPeoplePartyInfo : GameNetPackBasic { public uint CurPoint; //当前总点数 public uint AwardRecord; //领奖记录 按奖励索引二进制位存储是否已领取 public byte Count; public tagMCNewAllPeoplePartyCount[] BuyCountList; //活动完成次数信息 public HAA23_tagMCNewAllPeoplePartyInfo () { _cmd = (ushort)0xAA23; } public override void ReadFromBytes (byte[] vBytes) { TransBytes (out CurPoint, vBytes, NetDataType.DWORD); TransBytes (out AwardRecord, vBytes, NetDataType.DWORD); TransBytes (out Count, vBytes, NetDataType.BYTE); BuyCountList = new tagMCNewAllPeoplePartyCount[Count]; for (int i = 0; i < Count; i ++) { BuyCountList[i] = new tagMCNewAllPeoplePartyCount(); TransBytes (out BuyCountList[i].ActID, vBytes, NetDataType.DWORD); TransBytes (out BuyCountList[i].CurTimes, vBytes, NetDataType.WORD); } } public struct tagMCNewAllPeoplePartyCount { public uint ActID; //活动ID public ushort CurTimes; //已完成次数 } } Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA23_tagMCNewAllPeoplePartyInfo.cs.meta
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: 5a952a9c068761b409b457f19e45960f timeCreated: 1548645936 licenseType: Pro MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Core/NetworkPackage/ServerPack/HAC_Activity/HAC0B_tagGCNewFairyCeremonyInfo.cs
New file @@ -0,0 +1,25 @@ using UnityEngine; using System.Collections; // AC 0B 新仙界盛典活动信息 #tagGCNewFairyCeremonyInfo public class HAC0B_tagGCNewFairyCeremonyInfo : GameNetPackBasic { public string StartDate; // 开始日期 y-m-d public string EndtDate; // 结束日期 y-m-d public ushort WorldLV; // 世界等级 public ushort LimitLV; // 限制等级 public byte ResetType; // 重置类型 0-0点重置 1-5点重置 public HAC0B_tagGCNewFairyCeremonyInfo () { _cmd = (ushort)0xAC0B; } public override void ReadFromBytes (byte[] vBytes) { TransBytes (out StartDate, vBytes, NetDataType.Chars, 10); TransBytes (out EndtDate, vBytes, NetDataType.Chars, 10); TransBytes (out WorldLV, vBytes, NetDataType.WORD); TransBytes (out LimitLV, vBytes, NetDataType.WORD); TransBytes (out ResetType, vBytes, NetDataType.BYTE); } } Core/NetworkPackage/ServerPack/HAC_Activity/HAC0B_tagGCNewFairyCeremonyInfo.cs.meta
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: 2e9d907361017904abe277919823d31a timeCreated: 1548645936 licenseType: Pro MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Fight/Stage/Dungeon/JadeDynastyTowerDungeonStage.cs
@@ -17,10 +17,26 @@ public override void Initialize() { base.Initialize(); var sceneRoot = GameObject.Find("Map113_Zxt"); if (sceneRoot != null) { m_TowerAnimator = sceneRoot.GetComponent<Animator>("Effect/wall"); m_ShowCamera = sceneRoot.GetComponent<Camera>("Effect/wall/Camera_Show"); m_ShowCamera.backgroundColor = CameraController.Instance.CameraObject.backgroundColor; m_ShowCamera.gameObject.SetActive(false); defaultShowCameraPosition = m_ShowCamera.transform.position; defaultShowCameraRotation = m_ShowCamera.transform.rotation; defaultFov = m_ShowCamera.fieldOfView; } } public override void UnInitialize() { CameraController.Instance.CameraObject.enabled = true; CameraManager.uiCamera.enabled = true; StopAllCoroutines(); base.UnInitialize(); } @@ -28,30 +44,97 @@ protected override void OnStageLoadFinish() { base.OnStageLoadFinish(); WindowCenter.Instance.Open<JadeDynastyTowerHintWin>(); var isBottom = model.IsBottomFloor(model.currentFloor); if (!isBottom && model.currentFloor > model.highestPassFloor) { PerformChallengeNextLevel(); } else { model.RequestRefreshMonster(); } } public void PerformChallengeNextLevel() void PerformChallengeNextLevel() { WindowCenter.Instance.Close<DungeonGradeWin>(); WindowCenter.Instance.Close<MapNameHintWin>(); WindowCenter.Instance.Close<JadeDynastyTowerHintWin>(); WindowCenter.Instance.Close<DemonJarBossLifeBarWin>(); model.RequestRefreshMonster(); StartCoroutine("Co_PerformChallengeNextLevel"); } if (PlayerDatas.Instance.hero != null) IEnumerator Co_PerformChallengeNextLevel() { WindowCenter.Instance.Close<JadeDynastyTowerHintWin>(); SoundPlayer.Instance.PlayBackGroundMusicOneShot(258); var config = Config.Instance.Get<JadeDynastyTowerConfig>(model.currentFloor); if (config != null && config.floorIndex > 1) { PlayerDatas.Instance.hero.Behaviour.StartHandupAI(); m_ShowCamera.gameObject.SetActive(true); CameraController.Instance.CameraObject.enabled = false; CameraManager.uiCamera.enabled = false; m_ShowCamera.transform.position = CameraController.Instance.CameraObject.transform.position; m_ShowCamera.transform.rotation = CameraController.Instance.CameraObject.transform.rotation; m_ShowCamera.fieldOfView = CameraController.Instance.CameraObject.fieldOfView; yield return StartCoroutine(Co_CameraLerpTo(m_ShowCamera, defaultShowCameraPosition, defaultShowCameraRotation, defaultFov)); if (m_TowerAnimator != null) { m_TowerAnimator.Play("Fyt_fx_ani_move", 0, 0f); } yield return new WaitForSeconds(3.1f); yield return StartCoroutine(Co_CameraLerpTo(m_ShowCamera, CameraController.Instance.CameraObject.transform.position, CameraController.Instance.CameraObject.transform.rotation, CameraController.Instance.CameraObject.fieldOfView)); model.RequestRefreshMonster(); m_ShowCamera.gameObject.SetActive(false); CameraController.Instance.CameraObject.enabled = true; CameraManager.uiCamera.enabled = true; WindowCenter.Instance.Open<DungeonEndCoolDownWin>(); if (PlayerDatas.Instance.hero != null) { PlayerDatas.Instance.hero.Behaviour.StartHandupAI(); } var mapConfig = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID); var mapResConfig = DTCA127_tagMCStartChangeMap.GetMapResourcesConfig(); SoundPlayer.Instance.PlayBackGroundMusic(mapResConfig.Music); WindowCenter.Instance.Open<MapNameHintWin>(); WindowCenter.Instance.Open<JadeDynastyTowerHintWin>(); } var mapConfig = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID); var mapResConfig = DTCA127_tagMCStartChangeMap.GetMapResourcesConfig(); SoundPlayer.Instance.PlayBackGroundMusic(mapResConfig.Music); WindowCenter.Instance.Open<DungeonEndCoolDownWin>(); WindowCenter.Instance.Open<MapNameHintWin>(); WindowCenter.Instance.Open<JadeDynastyTowerHintWin>(); } IEnumerator Co_CameraLerpTo(Camera _camera, Vector3 _toPosition, Quaternion _toRotation, float _toFov) { var startPosition = _camera.transform.position; var startRotation = _camera.transform.rotation; var startFov = _camera.fieldOfView; var timer = 0f; var duration = 0.5f; while (timer < duration) { timer += Time.deltaTime; var t = Mathf.Clamp01(timer / duration); _camera.transform.position = Vector3.Lerp(startPosition, _toPosition, t); _camera.transform.rotation = Quaternion.Lerp(startRotation, _toRotation, t); _camera.fieldOfView = Mathf.Lerp(startFov, _toFov, t); yield return null; } _camera.transform.position = _toPosition; _camera.transform.rotation = _toRotation; } } System/JadeDynastyTower/JadyDynastyTowerVictoryWin.cs
@@ -70,25 +70,8 @@ protected override void DrawExitTimer(int seconds) { if (dungeonModel.dungeonResult.grade == 5) { m_AwardTimer.text = Language.Get("JadeDynastyRewardTime", Mathf.Clamp(seconds, 0, int.MaxValue)); m_ExitTimer.text = Language.Get("DemonDungeonExit"); } else { m_AwardTimer.text = Language.Get("CoinTaskWin_Btn_Receive"); m_ExitTimer.text = Language.Get("DungeonVictoryWin_Btn_Exit_1", Mathf.Clamp(seconds, 0, int.MaxValue)); } } private void ChallengeNextRuneTower() { var dungeonStage = StageManager.Instance.CurrentStage as JadeDynastyTowerDungeonStage; dungeonStage.PerformChallengeNextLevel(); dungeonModel.UpdateCoolDown(DungeonCoolDownType.LeaveMap, 0); dungeonModel.UpdateCoolDown(DungeonCoolDownType.TowerTake, 0); CloseClick(); m_AwardTimer.text = Language.Get("JadeDynastyRewardTime", Mathf.Clamp(seconds, 0, int.MaxValue)); m_ExitTimer.text = Language.Get("DemonDungeonExit"); } private void DisplayAwardAndExitButton() System/NewYearFairylandCeremony/NewYearCeremonyOutOfPrintWin.cs
@@ -55,7 +55,7 @@ private void Init() { ceremonyModel.SendGetRankInfo(PlayerRankData.RankType.Def_BT_FCCostGold); ceremonyModel.SendGetRankInfo(PlayerRankData.RankType.Def_BT_NewFCCostGold); SetRankAward(firstItemlist,ceremonyModel.GetRankAwardByLv(1)); SetRankAward(secondItemlist, ceremonyModel.GetRankAwardByLv(2)); SetRankAward(thirdItemlist, ceremonyModel.GetRankAwardByLv(3)); @@ -66,14 +66,14 @@ private void OnRefreshRankList(int type) { if (type != (int)PlayerRankData.RankType.Def_BT_FCCostGold) return; if (type != (int)PlayerRankData.RankType.Def_BT_NewFCCostGold) return; RefreshRankInfo(); } private void RefreshRankInfo() { List<PlayerRankData.RankData> list = PlayerDatas.Instance.rank.GetRankList((int)PlayerRankData.RankType.Def_BT_FCCostGold); List<PlayerRankData.RankData> list = PlayerDatas.Instance.rank.GetRankList((int)PlayerRankData.RankType.Def_BT_NewFCCostGold); firstNameText.text = Language.Get("CeremoneyOutOfPrint"); secondNameText.text = Language.Get("CeremoneyOutOfPrint"); thirdNameText.text = Language.Get("CeremoneyOutOfPrint"); System/NewYearFairylandCeremony/NewYearCeremonyRechargeGiftWin.cs
@@ -129,7 +129,7 @@ bool isGrid = playerPack.GetReaminGridCount(PackType.rptItem) - itemlist.Count >= 0 ? true : false; if (isGrid) { ceremonyModel.SendReceiveAward(GotServerRewardType.Def_RewardType_FCRecharge,0); ceremonyModel.SendReceiveAward(GotServerRewardType.Def_RewardType_NewFairyCRecharge, 0); } else { System/NewYearFairylandCeremony/NewYearFairylandCeremonyModel.cs
@@ -45,14 +45,14 @@ } #region 处理服务端数据 public int worldLv { get; private set;} public void GetServerActiveInfo(HAC09_tagGCFairyCeremonyInfo info) public void GetServerActiveInfo(HAC0B_tagGCNewFairyCeremonyInfo info) { worldLv = info.WorldLV; OperationTimeHepler.Instance.RefreshFairyCeremonyInfo(info); OperationTimeHepler.Instance.RefreshNewYearFairyCeremonyInfo(info); } public Action RefreshRechargeStateAct; public void GetServerRechargeInfo(HAA14_tagMCXJSDRecharge info) public void GetServerRechargeInfo(HAA22_tagMCNewXJSDRecharge info) { switch(info.State) { @@ -82,7 +82,7 @@ public Action<int> RefreshHiPointAct; public Action RefreshHiAwardStateAct; public void GetServerPeopleInfo(HAA15_tagMCAllPeoplePartyInfo info) public void GetServerPeopleInfo(HAA23_tagMCNewAllPeoplePartyInfo info) { peopleAwardRecordDict.Clear(); sumHiPoint = (int)info.CurPoint; System/NewYearFairylandCeremony/NewYearToHiAwardCell.cs
@@ -111,7 +111,7 @@ bool isGrid = playerPack.GetReaminGridCount(PackType.rptItem) - itemlist.Count >= 0 ? true : false; if (isGrid) { ceremonyModel.SendReceiveAward(GotServerRewardType.Def_RewardType_FCParty, awardConfig.Index); ceremonyModel.SendReceiveAward(GotServerRewardType.Def_RewardType_NewFairyCParty, awardConfig.Index); } else { System/OpenServerActivity/OpenServiceAchievementModel.cs
@@ -433,6 +433,7 @@ } private void SetRedPointId()//设置红点ID { if (RedPointDic.Count >= 7) { return; } RedPointDic.Clear(); foreach (var key in WeekPartyDayInfoDic.Keys) { System/Welfare/OperationTimeHepler.cs
@@ -429,7 +429,7 @@ /// 春节仙界盛典 /// </summary> /// <param name="info"></param> public void RefreshNewYearFairyCeremonyInfo(HAC09_tagGCFairyCeremonyInfo package) public void RefreshNewYearFairyCeremonyInfo(HAC0B_tagGCNewFairyCeremonyInfo package) { OperationBase operation = null; operationDict.TryGetValue(Operation.NewYearFairyCeremony, out operation); Utility/EnumHelper.cs
@@ -1261,7 +1261,9 @@ Def_RewardType_IceLodeStar = 19, //冰晶矿脉星级奖励19 Def_RewardType_WeekPartyAct = 20, //领取周狂欢活动奖励20 Def_RewardType_WeekPartyPoint = 21,// 领取周狂欢积分奖励21 Def_RewardType_ActLoginAwardAct = 22, // 领取登录奖励活动奖励22 Def_RewardType_NewFairyCRecharge = 23, // 新仙界盛典充值大礼23 Def_RewardType_NewFairyCParty = 24, // 新仙界盛典全民来嗨24 } public enum MapType
