Cjw/Zqdn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

移除无用的代码

Browse Source
This commit is contained in:
SD-20250415ABSO\Administrator 2025-04-24 17:34:34 +08:00
parent 67a94e0be7
commit d9fea6d724
6 changed files with 1461 additions and 1522 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1634
UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/Actor.cs
View File

File diff suppressed because it is too large Load Diff

74
UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorItem.cs
View File

@ -1,46 +1,46 @@
using System.Collections;
using System.Collections.Generic;
using Cysharp.Threading.Tasks;
using DG.Tweening;
using UnityEngine;
// using System.Collections;
// using System.Collections.Generic;
// using Cysharp.Threading.Tasks;
// using DG.Tweening;
// using UnityEngine;
namespace GameLogic
{
public class ActorItem : MonoBehaviour
{
// Start is called before the first frame update
// namespace GameLogic
// {
// public class ActorItem : MonoBehaviour
// {
// // Start is called before the first frame update
[SerializeField]
private SpriteRenderer spriteRenderer;
// [SerializeField]
// private SpriteRenderer spriteRenderer;
[SerializeField]
private GameObject effect;
// [SerializeField]
// private GameObject effect;
void Start()
{
// void Start()
// {
}
// }
// Update is called once per frame
void Update()
{
// // Update is called once per frame
// void Update()
// {
}
// }
public async void OnInit(string url, Actor actor)
{
// Ëæ»ú×Ô¼ºµÄλÖÃ
await AsyncImageDownload.Instance.SetAsyncImage(url, spriteRenderer);
this.gameObject.transform.position = new Vector3(Random.Range(-50, 50), Random.Range(-60, 60));
this.gameObject.SetActive(true);
this.transform.DOScale(1.5f, 3f);
this.transform.DOMove(actor.m_Go.transform.position, 3f).OnComplete(async () =>
{
effect.gameObject.SetActive(true);
await UniTask.Delay(1000);
Destroy(gameObject);
});
}
}
}
// public async void OnInit(string url, Actor actor)
// {
// // <20><><EFBFBD><EFBFBD>Լ<EFBFBD><D4BC><EFBFBD>λ<EFBFBD><CEBB>
// await AsyncImageDownload.Instance.SetAsyncImage(url, spriteRenderer);
// this.gameObject.transform.position = new Vector3(Random.Range(-50, 50), Random.Range(-60, 60));
// this.gameObject.SetActive(true);
// this.transform.DOScale(1.5f, 3f);
// this.transform.DOMove(actor.m_Go.transform.position, 3f).OnComplete(async () =>
// {
// effect.gameObject.SetActive(true);
// await UniTask.Delay(1000);
// Destroy(gameObject);
// });
// }
// }
// }

266
UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/HItemActor.cs
View File

@ -1,148 +1,148 @@
using GameLogic;
using TEngine;
using UnityEngine;
using UnityEngine.UI;
// using GameLogic;
// using TEngine;
// using UnityEngine;
// using UnityEngine.UI;
public class HItemActor : MonoBehaviour
{
private Image m_HImg;
private Text m_Value;
private RectTransform m_HeadList;
private GameObject m_HeadItem;
private GameObject m_Item;
private Text m_Name;
private Text m_Rank;
public Actor m_Actor; // 映射的Actor
public int m_Index; // 当前排名
// public class HItemActor : MonoBehaviour
// {
// private Image m_HImg;
// private Text m_Value;
// private RectTransform m_HeadList;
// private GameObject m_HeadItem;
// private GameObject m_Item;
// private Text m_Name;
// private Text m_Rank;
// public Actor m_Actor; // 映射的Actor
// public int m_Index; // 当前排名
private bool isAddEvent = false;
private void Awake()
{
m_HImg = transform.Find("Image/HImg").GetComponent<Image>();
m_Value = transform.Find("Value").GetComponent<Text>();
m_HeadList = transform.Find("HeadList").GetComponent<RectTransform>();
m_Name = transform.Find("Name").GetComponent<Text>();
m_Rank = transform.Find("RankBg/Rank").GetComponent<Text>();
m_HeadItem = transform.Find("HeadList/HeadItem").gameObject;
m_Item = transform.Find("Image/Item/m_item").gameObject;
// private bool isAddEvent = false;
// private void Awake()
// {
// m_HImg = transform.Find("Image/HImg").GetComponent<Image>();
// m_Value = transform.Find("Value").GetComponent<Text>();
// m_HeadList = transform.Find("HeadList").GetComponent<RectTransform>();
// m_Name = transform.Find("Name").GetComponent<Text>();
// m_Rank = transform.Find("RankBg/Rank").GetComponent<Text>();
// m_HeadItem = transform.Find("HeadList/HeadItem").gameObject;
// m_Item = transform.Find("Image/Item/m_item").gameObject;
isAddEvent = true;
GameEvent.AddEventListener<UnitPlayerData>(EventConts.AddPlayer, AddTuanduiPlayer);
}
// isAddEvent = true;
// GameEvent.AddEventListener<UnitPlayerData>(EventConts.AddPlayer, AddTuanduiPlayer);
// }
public void OnInit(string id)
{
m_Actor = DataGameSceneManager.Instance.GetTeamActor(id);
if (EventConts.gameStateType == GameStateType.团队赛)
{
m_Name.text = string.Format("{0}.{1}", ((int.Parse(id) + 1).ToString()), DataGameSceneManager.Instance.GetStrs(int.Parse(id)));
string hexColor = "#" + EventConts.colorList[int.Parse(id)];
Color color;
if (ColorUtility.TryParseHtmlString(hexColor, out color))
{
m_HImg.color = color;
}
else
{
Debug.LogError("Invalid color code: " + hexColor);
}
}
else
{
int m_Id = DataGameSceneManager.Instance.GetUnitPlayerDatas().Count % 15;
string hexColor = "#" + EventConts.colorList[m_Id];
Color color;
if (ColorUtility.TryParseHtmlString(hexColor, out color))
{
m_HImg.color = color;
}
else
{
Debug.LogError("Invalid color code: " + hexColor);
}
m_Name.text = m_Actor.GetIndexRankUnityData().protCustMessageData.nickName.Length > 4 ? m_Actor.GetIndexRankUnityData().protCustMessageData.nickName.Substring(0, 4) : m_Actor.GetIndexRankUnityData().protCustMessageData.nickName;
}
m_Value.text = m_Actor.GetPush().ToString();
// public void OnInit(string id)
// {
// m_Actor = DataGameSceneManager.Instance.GetTeamActor(id);
// if (EventConts.gameStateType == GameStateType.团队赛)
// {
// m_Name.text = string.Format("{0}.{1}", ((int.Parse(id) + 1).ToString()), DataGameSceneManager.Instance.GetStrs(int.Parse(id)));
// string hexColor = "#" + EventConts.colorList[int.Parse(id)];
// Color color;
// if (ColorUtility.TryParseHtmlString(hexColor, out color))
// {
// m_HImg.color = color;
// }
// else
// {
// Debug.LogError("Invalid color code: " + hexColor);
// }
// }
// else
// {
// int m_Id = DataGameSceneManager.Instance.GetUnitPlayerDatas().Count % 15;
// string hexColor = "#" + EventConts.colorList[m_Id];
// Color color;
// if (ColorUtility.TryParseHtmlString(hexColor, out color))
// {
// m_HImg.color = color;
// }
// else
// {
// Debug.LogError("Invalid color code: " + hexColor);
// }
// m_Name.text = m_Actor.GetIndexRankUnityData().protCustMessageData.nickName.Length > 4 ? m_Actor.GetIndexRankUnityData().protCustMessageData.nickName.Substring(0, 4) : m_Actor.GetIndexRankUnityData().protCustMessageData.nickName;
// }
// m_Value.text = m_Actor.GetPush().ToString();
// 添加玩家头像
AddUnitPlayerData(m_Actor.GetIndexRankUnityData());
}
// // 添加玩家头像
// AddUnitPlayerData(m_Actor.GetIndexRankUnityData());
// }
public void OnUpdate(long allValue)
{
UpdateHImg(allValue);
}
// public void OnUpdate(long allValue)
// {
// UpdateHImg(allValue);
// }
public void AddTuanduiPlayer(UnitPlayerData unitPlayerData)
{
if (m_Actor.GetUnitPlayerDatas().Contains(unitPlayerData))
{
var headItem = Instantiate(m_Item);
headItem.transform.SetParent(transform.Find("Image/Item"));
headItem.transform.localScale = Vector3.one;
headItem.transform.localPosition = Vector3.zero;
headItem.gameObject.SetActive(true);
var img = headItem.GetComponent<Image>();
AsyncImageDownload.Instance.SetAsyncImage(unitPlayerData.protCustMessageData.imgURL, img);
}
}
// public void AddTuanduiPlayer(UnitPlayerData unitPlayerData)
// {
// if (m_Actor.GetUnitPlayerDatas().Contains(unitPlayerData))
// {
// var headItem = Instantiate(m_Item);
// headItem.transform.SetParent(transform.Find("Image/Item"));
// headItem.transform.localScale = Vector3.one;
// headItem.transform.localPosition = Vector3.zero;
// headItem.gameObject.SetActive(true);
// var img = headItem.GetComponent<Image>();
// AsyncImageDownload.Instance.SetAsyncImage(unitPlayerData.protCustMessageData.imgURL, img);
// }
// }
public void AddUnitPlayerData(UnitPlayerData unitPlayerData)
{
var headItem = Instantiate(m_HeadItem);
headItem.transform.SetParent(m_HeadList);
headItem.transform.localScale = Vector3.one * 0.33f;
headItem.transform.localPosition = Vector3.zero;
headItem.gameObject.SetActive(true);
// public void AddUnitPlayerData(UnitPlayerData unitPlayerData)
// {
// var headItem = Instantiate(m_HeadItem);
// headItem.transform.SetParent(m_HeadList);
// headItem.transform.localScale = Vector3.one * 0.33f;
// headItem.transform.localPosition = Vector3.zero;
// headItem.gameObject.SetActive(true);
Image rawImage = headItem.transform.Find("Mask/m_Icon").GetComponent<Image>();
// 团队赛的时候,创建是没玩家的
if (unitPlayerData != null)
{
AsyncImageDownload.Instance.SetAsyncImage(unitPlayerData.protCustMessageData.imgURL, rawImage);
}
else
{
rawImage.sprite = GameModule.Resource.LoadAsset<Sprite>("q_" + (int.Parse(m_Actor.m_Id) + 1));
}
}
// Image rawImage = headItem.transform.Find("Mask/m_Icon").GetComponent<Image>();
// // 团队赛的时候,创建是没玩家的
// if (unitPlayerData != null)
// {
// AsyncImageDownload.Instance.SetAsyncImage(unitPlayerData.protCustMessageData.imgURL, rawImage);
// }
// else
// {
// rawImage.sprite = GameModule.Resource.LoadAsset<Sprite>("q_" + (int.Parse(m_Actor.m_Id) + 1));
// }
// }
private void UpdateHImg(long allValue)
{
// 避免除0
if (allValue == 0)
{
return;
}
// private void UpdateHImg(long allValue)
// {
// // 避免除0
// if (allValue == 0)
// {
// return;
// }
// 设置H_Img Wdith
float minWidth = 10f; // Minimum width
float maxWidth = 150f; // Maximum width
float pushRatio = m_Actor.GetPush() / (float)allValue;
// Increase the scaling factor to make the width larger
float newWidth = Mathf.Clamp(minWidth + (maxWidth - minWidth) * pushRatio, minWidth, maxWidth);
m_HImg.rectTransform.sizeDelta = new Vector2(newWidth, m_HImg.rectTransform.sizeDelta.y);
m_Value.text = m_Actor.GetPush().ToString();
m_Rank.text = "No." + m_Index;
}
// // 设置H_Img Wdith
// float minWidth = 10f; // Minimum width
// float maxWidth = 150f; // Maximum width
// float pushRatio = m_Actor.GetPush() / (float)allValue;
// // Increase the scaling factor to make the width larger
// float newWidth = Mathf.Clamp(minWidth + (maxWidth - minWidth) * pushRatio, minWidth, maxWidth);
// m_HImg.rectTransform.sizeDelta = new Vector2(newWidth, m_HImg.rectTransform.sizeDelta.y);
// m_Value.text = m_Actor.GetPush().ToString();
// m_Rank.text = "No." + m_Index;
// }
public long GetScore()
{
return m_Actor.GetAllPlayerScore();
}
// public long GetScore()
// {
// return m_Actor.GetAllPlayerScore();
// }
public long GetAllPower()
{
return m_Actor.GetPush();
}
// public long GetAllPower()
// {
// return m_Actor.GetPush();
// }
public void OnRemove()
{
// if (isAddEvent)
// {
// GameEvent.RemoveEventListener<UnitPlayerData>(EventConts.AddPlayer, AddTuanduiPlayer);
// }
Destroy(gameObject);
}
}
// public void OnRemove()
// {
// // if (isAddEvent)
// // {
// // GameEvent.RemoveEventListener<UnitPlayerData>(EventConts.AddPlayer, AddTuanduiPlayer);
// // }
// Destroy(gameObject);
// }
// }

276
UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataDanMuSceneManager.cs
View File

@ -68,98 +68,98 @@ namespace GameLogic
}
}
if (EventConts.gameStateType == GameStateType.团队赛)
{
// 没有加入过阵营
if (data.teamId == "-1")
{
// 指令集操作
if (protCustMessageData.content.Contains("加入"))
{
var number = protCustMessageData.content.Where(c => char.IsDigit(c)).ToArray();
// if (EventConts.gameStateType == GameStateType.团队赛)
// {
// // 没有加入过阵营
// if (data.teamId == "-1")
// {
// // 指令集操作
// if (protCustMessageData.content.Contains("加入"))
// {
// var number = protCustMessageData.content.Where(c => char.IsDigit(c)).ToArray();
if (number.Length == 0)
{
// 检查是否输入姓氏
foreach (var surname in DataGameSceneManager.Instance.m_Strs)
{
if (protCustMessageData.content.Contains(surname))
{
int index = DataGameSceneManager.Instance.m_Strs.IndexOf(surname);
var actor = DataGameSceneManager.Instance.GetTeamActor(index.ToString());
actor.AddUnitPlayer(data);
return;
}
}
}
else
{
// if (number.Length == 0)
// {
// // 检查是否输入姓氏
// foreach (var surname in DataGameSceneManager.Instance.m_Strs)
// {
// if (protCustMessageData.content.Contains(surname))
// {
// int index = DataGameSceneManager.Instance.m_Strs.IndexOf(surname);
// var actor = DataGameSceneManager.Instance.GetTeamActor(index.ToString());
// actor.AddUnitPlayer(data);
// return;
// }
// }
// }
// else
// {
int targetId = int.Parse(new string(number));
// 超过最大数
if (targetId > EventConts.MaxPlayerIds)
{
targetId = Random.Range(targetId, EventConts.MaxPlayerIds);
}
var actor = DataGameSceneManager.Instance.GetTeamActor((targetId - 1).ToString());
actor.AddUnitPlayer(data);
}
// int targetId = int.Parse(new string(number));
// // 超过最大数
// if (targetId > EventConts.MaxPlayerIds)
// {
// targetId = Random.Range(targetId, EventConts.MaxPlayerIds);
// }
// var actor = DataGameSceneManager.Instance.GetTeamActor((targetId - 1).ToString());
// actor.AddUnitPlayer(data);
// }
}
else if (protCustMessageData.content.Contains("666"))
{
int targetId = Random.Range(1, EventConts.MaxPlayerIds);
var actor = DataGameSceneManager.Instance.GetTeamActor((targetId - 1).ToString());
if (actor == null)
{
Log.Error("没有获取到实体玩家,tid = {0}", targetId);
return;
}
actor.AddUnitPlayer(data);
}
else
{
// }
// else if (protCustMessageData.content.Contains("666"))
// {
// int targetId = Random.Range(1, EventConts.MaxPlayerIds);
// var actor = DataGameSceneManager.Instance.GetTeamActor((targetId - 1).ToString());
// if (actor == null)
// {
// Log.Error("没有获取到实体玩家,tid = {0}", targetId);
// return;
// }
// actor.AddUnitPlayer(data);
// }
// else
// {
// 直接数字
var number = protCustMessageData.content.Where(c => char.IsDigit(c)).ToArray();
// // 直接数字
// var number = protCustMessageData.content.Where(c => char.IsDigit(c)).ToArray();
if (number.Length == 0)
{
Log.Error("No digits found in content: {0}", protCustMessageData.content);
return; // or handle the error as needed
}
int targetId = -1;
// if (number.Length == 0)
// {
// Log.Error("No digits found in content: {0}", protCustMessageData.content);
// return; // or handle the error as needed
// }
// int targetId = -1;
if (int.TryParse(new string(number), out targetId))
{
// 超过最大数
if (targetId > EventConts.MaxPlayerIds)
{
targetId = Random.Range(targetId, EventConts.MaxPlayerIds);
}
// if (int.TryParse(new string(number), out targetId))
// {
// // 超过最大数
// if (targetId > EventConts.MaxPlayerIds)
// {
// targetId = Random.Range(targetId, EventConts.MaxPlayerIds);
// }
var actor = DataGameSceneManager.Instance.GetTeamActor((targetId - 1).ToString());
actor.AddUnitPlayer(data);
// var actor = DataGameSceneManager.Instance.GetTeamActor((targetId - 1).ToString());
// actor.AddUnitPlayer(data);
Log.Info("玩家 {0} , 进攻 {1}", data.protCustMessageData.nickName, targetId);
}
}
}
else
{
// 加入过阵营
var actor = DataGameSceneManager.Instance.GetTeamActor(data.teamId);
}
}
else if (EventConts.gameStateType == GameStateType.个人赛)
{
var actor = DataGameSceneManager.Instance.GetTeamActor(data.teamId);
if (actor == null)
{
actor = DataGameSceneManager.Instance.CraeteTeamActor(data);
actor.AddUnitPlayer(data);
}
}
// Log.Info("玩家 {0} , 进攻 {1}", data.protCustMessageData.nickName, targetId);
// }
// }
// }
// else
// {
// // 加入过阵营
// var actor = DataGameSceneManager.Instance.GetTeamActor(data.teamId);
// }
// }
// else if (EventConts.gameStateType == GameStateType.个人赛)
// {
// var actor = DataGameSceneManager.Instance.GetTeamActor(data.teamId);
// if (actor == null)
// {
// actor = DataGameSceneManager.Instance.CraeteTeamActor(data);
// actor.AddUnitPlayer(data);
// }
// }
}
@ -177,45 +177,45 @@ namespace GameLogic
return;
}
// 随机落座
if (EventConts.gameStateType == GameStateType.团队赛)
{
int targetId = Random.Range(1, EventConts.MaxPlayerIds);
var actor = DataGameSceneManager.Instance.GetTeamActor((targetId - 1).ToString());
if (actor == null)
{
Log.Error("没有获取到实体玩家,tid = {0}", targetId);
return;
}
actor.AddUnitPlayer(data);
}
else if (EventConts.gameStateType == GameStateType.个人赛)
{
var actor = DataGameSceneManager.Instance.GetTeamActor(data.teamId);
if (actor == null)
{
actor = DataGameSceneManager.Instance.CraeteTeamActor(data);
actor.AddUnitPlayer(data);
}
}
// // 随机落座
// if (EventConts.gameStateType == GameStateType.团队赛)
// {
// int targetId = Random.Range(1, EventConts.MaxPlayerIds);
// var actor = DataGameSceneManager.Instance.GetTeamActor((targetId - 1).ToString());
// if (actor == null)
// {
// Log.Error("没有获取到实体玩家,tid = {0}", targetId);
// return;
// }
// actor.AddUnitPlayer(data);
// }
// else if (EventConts.gameStateType == GameStateType.个人赛)
// {
// var actor = DataGameSceneManager.Instance.GetTeamActor(data.teamId);
// if (actor == null)
// {
// actor = DataGameSceneManager.Instance.CraeteTeamActor(data);
// actor.AddUnitPlayer(data);
// }
// }
}
if (data.teamId == "-1")
{
// 随机落座
if (EventConts.gameStateType == GameStateType.团队赛)
{
int targetId = Random.Range(1, EventConts.MaxPlayerIds);
var actor = DataGameSceneManager.Instance.GetTeamActor((targetId - 1).ToString());
if (actor == null)
{
Log.Error("没有获取到实体玩家,tid = {0}", targetId);
return;
}
actor.AddUnitPlayer(data);
}
}
// if (data.teamId == "-1")
// {
// // 随机落座
// if (EventConts.gameStateType == GameStateType.团队赛)
// {
// int targetId = Random.Range(1, EventConts.MaxPlayerIds);
// var actor = DataGameSceneManager.Instance.GetTeamActor((targetId - 1).ToString());
// if (actor == null)
// {
// Log.Error("没有获取到实体玩家,tid = {0}", targetId);
// return;
// }
// actor.AddUnitPlayer(data);
// }
// }
foreach (var item in m_GiftIds)
@ -280,27 +280,27 @@ namespace GameLogic
}
else
{
// 增加点赞数量
data.m_LikeCount += int.Parse(protCustMessageData.Count);
// // 增加点赞数量
// data.m_LikeCount += int.Parse(protCustMessageData.Count);
var actor = DataGameSceneManager.Instance.GetTeamActor(data.teamId);
// var actor = DataGameSceneManager.Instance.GetTeamActor(data.teamId);
if (actor != null)
{
GiftConfig giftConfig = ConfigSystem.Instance.Tables.TbGiftConfig.Get(1);
if (giftConfig == null)
{
Log.Error("礼物配置表Id异常 {0}", 1);
return;
}
Log.Debug("点赞:" + data.teamId);
DataGameSceneManager.Instance.OnGiftFunc(giftConfig, int.Parse(protCustMessageData.Count), data);
// if (actor != null)
// {
// GiftConfig giftConfig = ConfigSystem.Instance.Tables.TbGiftConfig.Get(1);
// if (giftConfig == null)
// {
// Log.Error("礼物配置表Id异常 {0}", 1);
// return;
// }
// Log.Debug("点赞:" + data.teamId);
// DataGameSceneManager.Instance.OnGiftFunc(giftConfig, int.Parse(protCustMessageData.Count), data);
var a = GameModule.Resource.LoadAsset<GameObject>("Actor_Item");
var go = GameObject.Instantiate(a, null);
go.gameObject.SetActive(false);
go.GetComponent<ActorItem>().OnInit(data.protCustMessageData.imgURL, actor);
}
// var a = GameModule.Resource.LoadAsset<GameObject>("Actor_Item");
// var go = GameObject.Instantiate(a, null);
// go.gameObject.SetActive(false);
// go.GetComponent<ActorItem>().OnInit(data.protCustMessageData.imgURL, actor);
// }
}
}

350
UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameModelManager.cs
View File

@ -39,101 +39,101 @@ public class DataGameModelManager : GameBase.Singleton<DataGameModelManager>
/// </summary>
private void OneGameRankEnd()
{
var datas = DataGameSceneManager.Instance.GetAllRankUnityPlayerData();
datas.Sort((a, b) =>
{
if (a.GetIndexRankUnityData().m_Score > b.GetIndexRankUnityData().m_Score)
{
return -1;
}
else
{
return 1;
}
});
// var datas = DataGameSceneManager.Instance.GetAllRankUnityPlayerData();
// datas.Sort((a, b) =>
// {
// if (a.GetIndexRankUnityData().m_Score > b.GetIndexRankUnityData().m_Score)
// {
// return -1;
// }
// else
// {
// return 1;
// }
// });
List<PostPlayRankData> rankInfos = new List<PostPlayRankData>();
// List<PostPlayRankData> rankInfos = new List<PostPlayRankData>();
for (int i = 0; i < datas.Count; i++)
{
var d = datas[i].GetIndexRankUnityData();
int scale = EventConts.allScoreScale[i >= EventConts.allScoreScale.Length - 1 ? EventConts.allScoreScale.Length - 1 : i];
long scoreScale = (long)(DataGameSceneManager.Instance.ScoreAllValue * (scale / 100.0f));
// for (int i = 0; i < datas.Count; i++)
// {
// var d = datas[i].GetIndexRankUnityData();
// int scale = EventConts.allScoreScale[i >= EventConts.allScoreScale.Length - 1 ? EventConts.allScoreScale.Length - 1 : i];
// long scoreScale = (long)(DataGameSceneManager.Instance.ScoreAllValue * (scale / 100.0f));
// Log.Debug("玩家{0},分配所得积分:{1},当前玩家排名:{2}", d.protCustMessageData.nickName, scoreScale, i);
// // Log.Debug("玩家{0},分配所得积分:{1},当前玩家排名:{2}", d.protCustMessageData.nickName, scoreScale, i);
// 增加玩家当局积分
d.m_Score += scoreScale;
// // 增加玩家当局积分
// d.m_Score += scoreScale;
// 分配胜点
if (i < 3)
{
// Use Math.Ceiling to round up the winScale
long winScale = (long)Math.Ceiling(DataGameSceneManager.Instance.WinAllValue * (EventConts.allWinScale[i] / 100.0f));
Log.Debug("玩家{0},分配所得胜点:{1}", d.protCustMessageData.nickName, winScale);
d.m_AllWinCount = (int)winScale;
}
}
// // 分配胜点
// if (i < 3)
// {
// // Use Math.Ceiling to round up the winScale
// long winScale = (long)Math.Ceiling(DataGameSceneManager.Instance.WinAllValue * (EventConts.allWinScale[i] / 100.0f));
// Log.Debug("玩家{0},分配所得胜点:{1}", d.protCustMessageData.nickName, winScale);
// d.m_AllWinCount = (int)winScale;
// }
// }
// 上报排行榜数据
var allDatas = DataGameSceneManager.Instance.GetUnitPlayerDatas();
foreach (var item in allDatas)
{
PostPlayRankData postPlayRankData = new PostPlayRankData();
postPlayRankData.uid = item.Key;
postPlayRankData.name = item.Value.protCustMessageData.nickName;
postPlayRankData.score = item.Value.m_Score;
postPlayRankData.pay = 0;
//postPlayRankData.winCount = item.Value.m_AllWinCount;
postPlayRankData.extData1 = item.Value.m_AllWinCount.ToString();
// Log.Debug($"上传排行榜胜点数据:{postPlayRankData.name}====>{postPlayRankData.winCount}");
postPlayRankData.avatar = item.Value.protCustMessageData.imgURL;
// postPlayRankData.extraInfo = item.Value.m_PlayGameInfoData != null ? item.Value.m_PlayGameInfoData.ToJson() : "";
postPlayRankData.exp = item.Value.protCustMessageData.rankRo.exp;
postPlayRankData.lv = item.Value.protCustMessageData.rankRo.lv;
rankInfos.Add(postPlayRankData);
}
// // 上报排行榜数据
// var allDatas = DataGameSceneManager.Instance.GetUnitPlayerDatas();
// foreach (var item in allDatas)
// {
// PostPlayRankData postPlayRankData = new PostPlayRankData();
// postPlayRankData.uid = item.Key;
// postPlayRankData.name = item.Value.protCustMessageData.nickName;
// postPlayRankData.score = item.Value.m_Score;
// postPlayRankData.pay = 0;
// //postPlayRankData.winCount = item.Value.m_AllWinCount;
// postPlayRankData.extData1 = item.Value.m_AllWinCount.ToString();
// // Log.Debug($"上传排行榜胜点数据:{postPlayRankData.name}====>{postPlayRankData.winCount}");
// postPlayRankData.avatar = item.Value.protCustMessageData.imgURL;
// // postPlayRankData.extraInfo = item.Value.m_PlayGameInfoData != null ? item.Value.m_PlayGameInfoData.ToJson() : "";
// postPlayRankData.exp = item.Value.protCustMessageData.rankRo.exp;
// postPlayRankData.lv = item.Value.protCustMessageData.rankRo.lv;
// rankInfos.Add(postPlayRankData);
// }
rankInfos.Sort((a, b) =>
{
if (a.score > b.score)
{
return -1;
}
else
{
return 1;
}
});
// rankInfos.Sort((a, b) =>
// {
// if (a.score > b.score)
// {
// return -1;
// }
// else
// {
// return 1;
// }
// });
Log.Debug($"上传排行榜数据:{rankInfos.ToJson()}");
string m_Json = EventConts.PlatformType == PlatformType.None ? HttpSendHelper.HttpPostRequest(EventConts.UploadScoreTest, rankInfos.ToJson()) : HttpSendHelper.HttpPostRequest(EventConts.UploadScore, rankInfos.ToJson());
Log.Debug($"收到排行榜数据:{m_Json}");
// Log.Debug($"上传排行榜数据:{rankInfos.ToJson()}");
// string m_Json = EventConts.PlatformType == PlatformType.None ? HttpSendHelper.HttpPostRequest(EventConts.UploadScoreTest, rankInfos.ToJson()) : HttpSendHelper.HttpPostRequest(EventConts.UploadScore, rankInfos.ToJson());
// Log.Debug($"收到排行榜数据:{m_Json}");
PlayRankRootData playRankRootData = JsonHelper.Deserialize<PlayRankRootData>(m_Json);
if (playRankRootData != null && playRankRootData.code == 200)
{
// // 清理礼物队列
// DataGameManager.Instance.m_VipItemDatas.Clear();
// DataGameManager.Instance.m_GiftItemDatas.Clear();
// PlayRankRootData playRankRootData = JsonHelper.Deserialize<PlayRankRootData>(m_Json);
// if (playRankRootData != null && playRankRootData.code == 200)
// {
// // // 清理礼物队列
// // DataGameManager.Instance.m_VipItemDatas.Clear();
// // DataGameManager.Instance.m_GiftItemDatas.Clear();
// 打开结算界面
object[] objects = new object[2];
objects[0] = GameRankType.当局排行榜;
objects[1] = playRankRootData.data;
GameModule.UI.ShowUI<UIGameRankForm>(objects);
}
else
{
UITip.ShowMessageBox("排行榜结算异常,请联系管理员!!Code:" + playRankRootData.code, MessageShowType.TwoButton, () =>
{
// // 打开结算界面
// object[] objects = new object[2];
// objects[0] = GameRankType.当局排行榜;
// objects[1] = playRankRootData.data;
// GameModule.UI.ShowUI<UIGameRankForm>(objects);
// }
// else
// {
// UITip.ShowMessageBox("排行榜结算异常,请联系管理员!!Code:" + playRankRootData.code, MessageShowType.TwoButton, () =>
// {
}, () =>
{
// }, () =>
// {
});
}
// });
// }
}
/// <summary>
@ -141,116 +141,116 @@ public class DataGameModelManager : GameBase.Singleton<DataGameModelManager>
/// </summary>
private void GameRankEnd()
{
var datas = DataGameSceneManager.Instance.GetTeamActors();
List<Actor> actors = new List<Actor>();
foreach (var item in datas)
{
actors.Add(item.Value);
}
// var datas = DataGameSceneManager.Instance.GetTeamActors();
// List<Actor> actors = new List<Actor>();
// foreach (var item in datas)
// {
// actors.Add(item.Value);
// }
// 排序
actors.Sort((a, b) =>
{
if (a.GetAllPlayerScore() > b.GetAllPlayerScore())
{
return -1;
}
else
{
return 1;
}
});
// // 排序
// actors.Sort((a, b) =>
// {
// if (a.GetAllPlayerScore() > b.GetAllPlayerScore())
// {
// return -1;
// }
// else
// {
// return 1;
// }
// });
// 获取获胜阵营玩家数据
var us = actors[0].GetUnitPlayerDatas();
// // 获取获胜阵营玩家数据
// var us = actors[0].GetUnitPlayerDatas();
// 分配
for (int i = 0; i < us.Count; i++)
{
var d = us[i];
int scale = EventConts.allScoreScale[i >= EventConts.allScoreScale.Length ? EventConts.allScoreScale.Length - 1 : i];
long scoreScale = (long)(DataGameSceneManager.Instance.ScoreAllValue * (scale / 100.0f));
// // 分配
// for (int i = 0; i < us.Count; i++)
// {
// var d = us[i];
// int scale = EventConts.allScoreScale[i >= EventConts.allScoreScale.Length ? EventConts.allScoreScale.Length - 1 : i];
// long scoreScale = (long)(DataGameSceneManager.Instance.ScoreAllValue * (scale / 100.0f));
//Log.Debug("玩家{0},分配所得积分:{1}", d.protCustMessageData.nickName, scoreScale);
// //Log.Debug("玩家{0},分配所得积分:{1}", d.protCustMessageData.nickName, scoreScale);
// 增加玩家当局积分
d.m_Score += scoreScale;
// // 增加玩家当局积分
// d.m_Score += scoreScale;
// 分配胜点
//if (i < 3)
//{
// // 分配胜点
// //if (i < 3)
// //{
// // // Use Math.Ceiling to round up the winScale
// // long winScale = (long)Math.Ceiling(DataGameSceneManager.Instance.WinAllValue * (EventConts.allWinScale[i] / 100.0f));
// // Log.Debug("玩家{0},分配所得胜点:{1}", d.protCustMessageData.nickName, winScale);
// // d.m_AllWinCount = (int)winScale;
// //}
// if (i == 0 )
// {
// // Use Math.Ceiling to round up the winScale
// long winScale = (long)Math.Ceiling(DataGameSceneManager.Instance.WinAllValue * (EventConts.allWinScale[i] / 100.0f));
// long winScale = DataGameSceneManager.Instance.WinAllValue;
// Log.Debug("玩家{0},分配所得胜点:{1}", d.protCustMessageData.nickName, winScale);
// d.m_AllWinCount = (int)winScale;
//}
if (i == 0 )
{
// Use Math.Ceiling to round up the winScale
long winScale = DataGameSceneManager.Instance.WinAllValue;
Log.Debug("玩家{0},分配所得胜点:{1}", d.protCustMessageData.nickName, winScale);
d.m_AllWinCount = (int)winScale;
}
}
// }
// }
List<PostPlayRankData> rankInfos = new List<PostPlayRankData>();
// 上报排行榜数据
var allDatas = DataGameSceneManager.Instance.GetUnitPlayerDatas();
foreach (var item in allDatas)
{
PostPlayRankData postPlayRankData = new PostPlayRankData();
postPlayRankData.uid = item.Key;
postPlayRankData.name = item.Value.protCustMessageData.nickName;
postPlayRankData.score = item.Value.m_Score;
postPlayRankData.pay = 0;
postPlayRankData.winCount = item.Value.m_AllWinCount;
//postPlayRankData.useClientData = "1";
postPlayRankData.avatar = item.Value.protCustMessageData.imgURL;
postPlayRankData.exp = item.Value.protCustMessageData.rankRo.exp;
postPlayRankData.lv = item.Value.protCustMessageData.rankRo.lv;
rankInfos.Add(postPlayRankData);
}
// List<PostPlayRankData> rankInfos = new List<PostPlayRankData>();
// // 上报排行榜数据
// var allDatas = DataGameSceneManager.Instance.GetUnitPlayerDatas();
// foreach (var item in allDatas)
// {
// PostPlayRankData postPlayRankData = new PostPlayRankData();
// postPlayRankData.uid = item.Key;
// postPlayRankData.name = item.Value.protCustMessageData.nickName;
// postPlayRankData.score = item.Value.m_Score;
// postPlayRankData.pay = 0;
// postPlayRankData.winCount = item.Value.m_AllWinCount;
// //postPlayRankData.useClientData = "1";
// postPlayRankData.avatar = item.Value.protCustMessageData.imgURL;
// postPlayRankData.exp = item.Value.protCustMessageData.rankRo.exp;
// postPlayRankData.lv = item.Value.protCustMessageData.rankRo.lv;
// rankInfos.Add(postPlayRankData);
// }
rankInfos.Sort((a, b) =>
{
if (a.score > b.score)
{
return -1;
}
else
{
return 1;
}
});
// rankInfos.Sort((a, b) =>
// {
// if (a.score > b.score)
// {
// return -1;
// }
// else
// {
// return 1;
// }
// });
Log.Debug($"上传排行榜数据:{rankInfos.ToJson()}");
string m_Json = EventConts.PlatformType == PlatformType.None ? HttpSendHelper.HttpPostRequest(EventConts.UploadScoreTest, rankInfos.ToJson()) : HttpSendHelper.HttpPostRequest(EventConts.UploadScore, rankInfos.ToJson());
Log.Debug($"收到排行榜数据:{m_Json}");
// Log.Debug($"上传排行榜数据:{rankInfos.ToJson()}");
// string m_Json = EventConts.PlatformType == PlatformType.None ? HttpSendHelper.HttpPostRequest(EventConts.UploadScoreTest, rankInfos.ToJson()) : HttpSendHelper.HttpPostRequest(EventConts.UploadScore, rankInfos.ToJson());
// Log.Debug($"收到排行榜数据:{m_Json}");
PlayRankRootData playRankRootData = JsonHelper.Deserialize<PlayRankRootData>(m_Json);
if (playRankRootData != null && playRankRootData.code == 200)
{
// // 清理礼物队列
// DataGameManager.Instance.m_VipItemDatas.Clear();
// DataGameManager.Instance.m_GiftItemDatas.Clear();
// PlayRankRootData playRankRootData = JsonHelper.Deserialize<PlayRankRootData>(m_Json);
// if (playRankRootData != null && playRankRootData.code == 200)
// {
// // // 清理礼物队列
// // DataGameManager.Instance.m_VipItemDatas.Clear();
// // DataGameManager.Instance.m_GiftItemDatas.Clear();
// 打开结算界面
object[] objects = new object[2];
objects[0] = GameRankType.当局排行榜;
objects[1] = playRankRootData.data;
GameModule.UI.ShowUI<UIGameRankForm>(objects);
}
else
{
UITip.ShowMessageBox("排行榜结算异常,请联系管理员!!Code:" + playRankRootData.code, MessageShowType.TwoButton, () =>
{
// // 打开结算界面
// object[] objects = new object[2];
// objects[0] = GameRankType.当局排行榜;
// objects[1] = playRankRootData.data;
// GameModule.UI.ShowUI<UIGameRankForm>(objects);
// }
// else
// {
// UITip.ShowMessageBox("排行榜结算异常,请联系管理员!!Code:" + playRankRootData.code, MessageShowType.TwoButton, () =>
// {
}, () =>
{
// }, () =>
// {
});
}
// });
// }
}

361
UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs
View File

@ -15,8 +15,7 @@ namespace GameLogic
private Transform teamList;
private Dictionary<string, UnitPlayerData> m_DicUnitPlayerDatas = new Dictionary<string, UnitPlayerData>(); //局内玩家数据
private Dictionary<string, Actor> m_TeamLists = new Dictionary<string, Actor>();
private List<Actor> m_TeamSortList = new List<Actor>(); // 用于排序的阵营列表数据
// private List<Actor> m_TeamSortList = new List<Actor>(); // 用于排序的阵营列表数据
public float m_GameTimerLen = 0;
public List<string> m_Strs = new List<string>() { "陈", "王", "李", "张", "刘", "杨", "黄", "赵", "吴", "周",
"徐", "孙", "马", "朱", "胡","何","林","高","罗","郑",
@ -40,6 +39,7 @@ namespace GameLogic
{
FindGameComponent();
InitGameData();
InitGameTeam();
}
@ -63,10 +63,14 @@ namespace GameLogic
m_PanelBg = GameObject.Find("Plane").GetComponent<MeshRenderer>();
}
public void InitGameTeam()
private void InitGameTeam()
{
// 根据配置表注册,注册初始化阵营
for (int i = 0; i < m_Strs.Count; i++)
{
}
}
#endregion
@ -100,71 +104,7 @@ namespace GameLogic
return m_Strs[key];
}
public Actor GetTeamActor(string key)
{
Actor actor = null;
if (m_TeamLists.ContainsKey(key))
{
actor = m_TeamLists[key];
}
return actor;
}
public Actor CraeteTeamActor(UnitPlayerData unitPlayerData)
{
Actor actor = new Actor();
if (m_TeamLists.ContainsKey(unitPlayerData.protCustMessageData.openId))
{
Log.Error("已经存在Actor!!!");
return null;
}
actor.OnInit(unitPlayerData.protCustMessageData.openId.ToString());
m_TeamLists.Add(unitPlayerData.protCustMessageData.openId, actor);
m_TeamSortList.Add(actor);
return actor;
}
/// <summary>
/// 返回当局最高排名的玩家
/// </summary>
/// <returns></returns>
public UnitPlayerData GetOneRankUnitPlayerData()
{
UnitPlayerData data = null;
if (m_TeamSortList.Count <= 0)
{
Log.Error("异常获取.");
return data;
}
data = m_TeamSortList[0].GetIndexRankUnityData();
return data;
}
/// <summary>
/// 返回当前排名最高的阵营
/// </summary>
/// <returns></returns>
public Actor GetTopActor()
{
// m_TeamSortList.Sort((a, b) =>
// {
// return a.GetIndexRankUnityData() == null ? 1 :
// b.GetIndexRankUnityData() == null ? -1 :
// a.GetIndexRankUnityData().m_Score.CompareTo(b.GetIndexRankUnityData().m_Score) * -1;
// });
return m_TeamSortList[0];
}
public List<Actor> GetAllRankUnityPlayerData()
{
return m_TeamSortList;
}
public Dictionary<string, Actor> GetTeamActors()
{
return m_TeamLists;
}
public UnitPlayerData CreateUnitPlayerData(ProtCustMessageData protCustMessageData)
{
@ -294,22 +234,22 @@ namespace GameLogic
long allValue = 0;
// 更新阵营当前总值大小
foreach (var item in m_TeamLists)
{
// 执行内部更新
item.Value.OnUpdate();
// // 更新阵营当前总值大小
// foreach (var item in m_TeamLists)
// {
// // 执行内部更新
// item.Value.OnUpdate();
// 计算总值
allValue += item.Value.GetPush();
}
// // 计算总值
// allValue += item.Value.GetPush();
// }
// 在遍历一次，求出总值后,各自计算一次自己的scale
foreach (var item in m_TeamLists)
{
// 执行内部更新
item.Value.UpdateScale(allValue);
}
// // 在遍历一次，求出总值后,各自计算一次自己的scale
// foreach (var item in m_TeamLists)
// {
// // 执行内部更新
// item.Value.UpdateScale(allValue);
// }
// // Determine the scale for the top team
@ -411,47 +351,55 @@ namespace GameLogic
}
// 处理音效
if (buff.addPower > 0)
{
// GameModule.Audio.Play(TEngine.AudioType.UISound, "数字跳动的音效", false);
// 加速特效
m_SpeefEffectTimer += buff.m_AllTimer;
}
else
{
m_SnowEffectTimer += buff.m_AllTimer;
}
// // 处理音效
// if (buff.addPower > 0)
// {
// // GameModule.Audio.Play(TEngine.AudioType.UISound, "数字跳动的音效", false);
// // 加速特效
// m_SpeefEffectTimer += buff.m_AllTimer;
// }
// else
// {
// m_SnowEffectTimer += buff.m_AllTimer;
// }
// 特殊Buff处理
if (buff.isZoneTimer)
{
// 除了我自己以外,都挂这个Buff
var d = GetTeamActors();
var actor = DataGameSceneManager.Instance.GetTeamActor(unitPlayerData.teamId);
foreach (var item in d)
{
if (item.Value != actor)
{
item.Value.AddBuff(buff, unitPlayerData);
}
else
{
item.Value.ShowGift5Emoji();
}
}
}
else
{
// 减速Buff的处理
if (buff.addPower < 0)
{
// 获取加速最快的星球
var actors = GetAllRankUnityPlayerData();
actors.Sort((a, b) =>
{
// 减速加速最高的
// if (a.GetAddPush() > b.GetAddPush())
// // 特殊Buff处理
// if (buff.isZoneTimer)
// {
// // 除了我自己以外,都挂这个Buff
// var d = GetTeamActors();
// var actor = DataGameSceneManager.Instance.GetTeamActor(unitPlayerData.teamId);
// foreach (var item in d)
// {
// if (item.Value != actor)
// {
// item.Value.AddBuff(buff, unitPlayerData);
// }
// else
// {
// item.Value.ShowGift5Emoji();
// }
// }
// }
// else
// {
// // 减速Buff的处理
// if (buff.addPower < 0)
// {
// // 获取加速最快的星球
// var actors = GetAllRankUnityPlayerData();
// actors.Sort((a, b) =>
// {
// // 减速加速最高的
// // if (a.GetAddPush() > b.GetAddPush())
// // {
// // return -1;
// // }
// // else
// // {
// // return 1;
// // }
// if (a.GetPush() > b.GetPush())
// {
// return -1;
// }
@ -459,85 +407,77 @@ namespace GameLogic
// {
// return 1;
// }
if (a.GetPush() > b.GetPush())
{
return -1;
}
else
{
return 1;
}
});
var actor = DataGameSceneManager.Instance.GetTeamActor(unitPlayerData.teamId);
// 减速Buff不能给自己挂
if (actor != actors[0])
{
// 只减速一次
actors[0].AddAllPush(buff.addPower);
actors[0].AddBuff(buff, unitPlayerData);
}
else
{
// 往下依次找
for (int i = 1; i < actors.Count; i++)
{
// 只减速一次
actors[i].AddAllPush(buff.addPower);
actors[i].AddBuff(buff, unitPlayerData);
break;
}
}
// });
// var actor = DataGameSceneManager.Instance.GetTeamActor(unitPlayerData.teamId);
// // 减速Buff不能给自己挂
// if (actor != actors[0])
// {
// // 只减速一次
// actors[0].AddAllPush(buff.addPower);
// actors[0].AddBuff(buff, unitPlayerData);
// }
// else
// {
// // 往下依次找
// for (int i = 1; i < actors.Count; i++)
// {
// // 只减速一次
// actors[i].AddAllPush(buff.addPower);
// actors[i].AddBuff(buff, unitPlayerData);
// break;
// }
// }
var d = GetTeamActors();
var m_actor = DataGameSceneManager.Instance.GetTeamActor(unitPlayerData.teamId);
foreach (var item in d)
{
if (item.Value == actor)
{
// 自己身上增加总值
item.Value.AddAllPush(Math.Abs(buff.addPower) / 2);
// var d = GetTeamActors();
// var m_actor = DataGameSceneManager.Instance.GetTeamActor(unitPlayerData.teamId);
// foreach (var item in d)
// {
// if (item.Value == actor)
// {
// // 自己身上增加总值
// item.Value.AddAllPush(Math.Abs(buff.addPower) / 2);
if (buff.m_Id == 3)
{
item.Value.ShowGift2Emoji();
}
else
{
// 自己Actor播放表情
item.Value.ShowGift4Emoji();
}
}
}
}
else
{
var actor = DataGameSceneManager.Instance.GetTeamActor(unitPlayerData.teamId);
if (actor != null)
{
// actor.m_Go.transform.DOScale(actor.m_Go.transform.localScale.x + 2f, 1f);
actor.AddBuff(buff, unitPlayerData);
}
else
{
Log.Error("没有找到自己对应的阵营:{0}", unitPlayerData.teamId);
}
}
}
// if (buff.m_Id == 3)
// {
// item.Value.ShowGift2Emoji();
// }
// else
// {
// // 自己Actor播放表情
// item.Value.ShowGift4Emoji();
// }
// }
// }
// }
// else
// {
// var actor = DataGameSceneManager.Instance.GetTeamActor(unitPlayerData.teamId);
// if (actor != null)
// {
// // actor.m_Go.transform.DOScale(actor.m_Go.transform.localScale.x + 2f, 1f);
// actor.AddBuff(buff, unitPlayerData);
// }
// else
// {
// Log.Error("没有找到自己对应的阵营:{0}", unitPlayerData.teamId);
// }
// }
// }
if (giftConfig.Id != 1)
{
// 发送玩家送礼事件
GameEvent.Send(EventConts.AddGiftMessage, unitPlayerData, giftConfig, num);
}
// if (giftConfig.Id != 1)
// {
// // 发送玩家送礼事件
// GameEvent.Send(EventConts.AddGiftMessage, unitPlayerData, giftConfig, num);
// }
// 每次积分变动
m_TeamSortList.Sort((a, b) =>
{
return a.GetIndexRankUnityData() == null ? 1 :
b.GetIndexRankUnityData() == null ? -1 :
a.GetIndexRankUnityData().m_Score.CompareTo(b.GetIndexRankUnityData().m_Score) * -1;
});
// // 每次积分变动
// m_TeamSortList.Sort((a, b) =>
// {
// return a.GetIndexRankUnityData() == null ? 1 :
// b.GetIndexRankUnityData() == null ? -1 :
// a.GetIndexRankUnityData().m_Score.CompareTo(b.GetIndexRankUnityData().m_Score) * -1;
// });
}
@ -569,15 +509,14 @@ namespace GameLogic
m_SnowEffectTimer = 0;
WinAllValue = 0;
ScoreAllValue = 0;
m_SpeedEffect?.gameObject.SetActive(false);
m_SnowEffect?.gameObject.SetActive(false);
// 重置基地数据
foreach (var item in m_TeamLists)
{
item.Value.OnDestroy();
}
m_TeamLists.Clear();
m_TeamSortList.Clear();
// // 重置基地数据
// foreach (var item in m_TeamLists)
// {
// item.Value.OnDestroy();
// }
// m_TeamLists.Clear();
// m_TeamSortList.Clear();
// 重新执行初始化数据流程
OnInit();
@ -666,13 +605,13 @@ namespace GameLogic
// 重置玩家数据
m_DicUnitPlayerDatas.Clear();
// 重置基地数据
foreach (var item in m_TeamLists)
{
item.Value.OnDestroy();
}
m_TeamLists.Clear();
m_TeamSortList.Clear();
// // 重置基地数据
// foreach (var item in m_TeamLists)
// {
// item.Value.OnDestroy();
// }
// m_TeamLists.Clear();
// m_TeamSortList.Clear();
m_GiftItemDatas.Clear();
m_VipItemDatas.Clear();
m_SpeefEffectTimer = 0;