diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/Actor.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/Actor.cs index d0032208..b7cbb984 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/Actor.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/Actor.cs @@ -1,817 +1,817 @@ -using System.Collections.Generic; -using GameLogic; -using TEngine; -using TMPro; -using UnityEngine; -using UnityEngine.Rendering; -using System.Linq; -using Cysharp.Threading.Tasks; -using DG.Tweening; - -public class Actor -{ - public string m_Id; - - public GameObject m_Go; - public SpriteRenderer m_HeadImg; - public SpriteRenderer m_Bk; - private SpriteMask m_SpriteMask; - private SpriteMask m_SpriteMask1; - private SpriteRenderer m_HeadImg1; - private int m_AddPush = 0; // 初始推力值 - private long m_AllPush = 0; // 当前总值 - private int m_AllAddPush = 0;//永久增加推力值 - private Rigidbody2D rigidbody2D; - public TextMeshPro m_NameMesh; - public Transform m_ParentGo; - private TextMeshPro m_ValueMesh; - private Dictionary unityPlayers = new Dictionary(); // 加入该阵营的玩家列表 - private Dictionary> m_Buffs = new Dictionary>(); //自身Buff列表 - private Buff m_ZoneTimerBuff = null; - private Transform m_EffectTr; - private Transform m_Trail; - private int m_ScaleActor = EventConts.actorScaleConst; - - private int m_UpdateId = -1; - public void OnInit(string id) - { - m_Id = id; - - m_AddPush = EventConts.InitPower; - - // 场景中创建自己 - var a = GameModule.Resource.LoadAsset("Actor"); - var go = GameObject.Instantiate(a, null, false); - m_Go = go; - - rigidbody2D = m_Go.GetComponent(); - - // 随机一个x、y - int x = Random.Range(-20, 0); - int y = Random.Range(-10, 10); - m_Go.transform.position = new Vector3(x, y, 0); - - - m_HeadImg = m_Go.transform.Find("ParentGo/Mask/HeadImg").GetComponent(); - m_HeadImg1 = m_Go.transform.Find("ParentGo/Mask1/HeadImg1").GetComponent(); - m_SpriteMask1 = m_Go.transform.Find("ParentGo/Mask1").GetComponent(); - m_Bk = m_Go.transform.Find("ParentGo/Bk").GetComponent(); - m_SpriteMask = m_Go.transform.Find("ParentGo/Mask").GetComponent(); - m_NameMesh = m_Go.transform.Find("ParentGo/NameMesh").GetComponent(); - m_ValueMesh = m_Go.transform.Find("ParentGo/ValueMesh").GetComponent(); - m_ParentGo = m_Go.transform.Find("ParentGo"); - m_EffectTr = m_Go.transform.Find("ParentGo/EffectList"); - m_Trail = m_Go.transform.Find("ParentGo/Trail"); - - - // 动态设置下Mask层级针对分层渲染 - m_SpriteMask.frontSortingOrder = DataGameSceneManager.Instance.GetTeamActors().Count + 1; - m_SpriteMask.backSortingOrder = DataGameSceneManager.Instance.GetTeamActors().Count; - - m_SpriteMask1.frontSortingOrder = DataGameSceneManager.Instance.GetTeamActors().Count + 32; - m_SpriteMask1.backSortingOrder = DataGameSceneManager.Instance.GetTeamActors().Count + 31; - - m_HeadImg.sortingOrder = DataGameSceneManager.Instance.GetTeamActors().Count + 1; - m_HeadImg1.sortingOrder = DataGameSceneManager.Instance.GetTeamActors().Count + 32; - m_Bk.sortingOrder = DataGameSceneManager.Instance.GetTeamActors().Count + 5; - m_ValueMesh.GetComponent().sortingOrder = DataGameSceneManager.Instance.GetTeamActors().Count + 5; - m_NameMesh.GetComponent().sortingOrder = DataGameSceneManager.Instance.GetTeamActors().Count + 5; - - if (EventConts.gameStateType == GameStateType.团队赛) - { - string hexColor = "#" + EventConts.colorList[int.Parse(id)]; - Color color; - ColorUtility.TryParseHtmlString(hexColor, out color); - m_NameMesh.text = string.Format("{0}.{1}", int.Parse(id) + 1, DataGameSceneManager.Instance.GetStrs(int.Parse(id))); - m_NameMesh.outlineColor = color; - m_ValueMesh.outlineColor = color; - m_HeadImg.sprite = GameModule.Resource.LoadAsset("q_" + (int.Parse(id) + 1)); - - m_SpriteMask1.gameObject.SetActive(false); - m_Bk.gameObject.SetActive(false); - - // // 加载头像 - // AsyncImageDownload.Instance.SetAsyncImage(GetIndexRankUnityData().protCustMessageData.imgURL, m_HeadImg1); - - m_HeadImg.transform.localScale = Vector3.one * 0.46f; - } - else if (EventConts.gameStateType == GameStateType.个人赛) - { - - int m_Id = DataGameSceneManager.Instance.GetUnitPlayerDatas().Count % 15; - string hexColor = "#" + EventConts.colorList[m_Id]; - Color color; - ColorUtility.TryParseHtmlString(hexColor, out color); - m_NameMesh.outlineColor = color; - m_ValueMesh.outlineColor = color; - m_HeadImg.transform.localScale = Vector3.one; - var data = DataGameSceneManager.Instance.GetUnitPlayerData(id); - string nickName = data.protCustMessageData.nickName; - m_NameMesh.text = nickName.Length > 4 ? nickName.Substring(0, 4) : nickName; - - // 加载头像 - AsyncImageDownload.Instance.SetAsyncImage(data.protCustMessageData.imgURL, m_HeadImg); - } - - m_ValueMesh.text = GetPush().ToString(); - - go.transform.gameObject.SetActive(true); - go.transform.localScale = Vector3.one * 6; - - UpdateActorBk(); - - m_UpdateId = GameModule.Timer.AddTimer((e) => - { - OnUpdateBuff(); - }, 0.05f, true); - - var i = Random.Range(0, m_Trail.transform.childCount); - m_Trail.GetChild(i).gameObject.SetActive(true); - - // 注册监听 - GameEvent.AddEventListener(EventConts.PlayerUpdateLv, UpdateActorBk); - } - - public void OnUpdate() - { - //OnUpdateBuff(); - - m_ParentGo.rotation = Quaternion.identity; // 不受父节点旋转影响 - - // 上限阈值结算 - if (m_AllPush + m_AddPush >= int.MaxValue) - { - Log.Error("超过最大值上限,强制结算"); - return; - } - - m_AllPush += m_AddPush; - - // 先把中间挤的问题处理 - Vector2 randomDirection = Random.insideUnitCircle.normalized; // Generate a random direction - rigidbody2D.AddForce(randomDirection * 5); // Apply force in the random direction - - m_ValueMesh.text = GetPush().ToString(); - } - - public string GetMyStr() - { - if (EventConts.gameStateType == GameStateType.团队赛) - { - return string.Format("{0}.{1}", m_Id + 1, DataGameSceneManager.Instance.GetStrs(int.Parse(m_Id))); - } - else if (EventConts.gameStateType == GameStateType.个人赛) - { - return GetIndexRankUnityData().protCustMessageData.nickName; - } - else - { - return "不支持的模式"; - } - } - - private void UpdateActorBk() - { - // if (GetIndexRankUnityData().protCustMessageData.rankRo.lv == 0) - // { - // GetIndexRankUnityData().protCustMessageData.rankRo.lv = 1; - // } - - if (GetIndexRankUnityData() == null) - { - return; - } - - string str = ConfigSystem.Instance.Tables.TbPlayerLevelConfig.Get(GetIndexRankUnityData().protCustMessageData.rankRo.lv).TitleIconName; - // m_Bk.sprite = GameModule.Resource.LoadAsset(str); - } - - private float sclaeAdd = 1; - - private float m_OldScale = 0; - public void UpdateScale(long m_AllPush) - { - // 避免除0 - if (m_AllPush == 0) - { - return; - } - - - // 基于当前总值,计算自己scale大小 - var results = this.m_AllPush / (float)m_AllPush; - - // 求出实际值 - // var s = EventConts.MaxActorScale * results; - var s = results * EventConts.actorScaleConst + sclaeAdd; - - if (s < EventConts.MinActorScale) - { - s = EventConts.MinActorScale; - } - else if (s >= EventConts.MaxActorScale) - { - s = EventConts.MaxActorScale; - } - - // 每次都更新 - - // 两者相差值超过 - if (Mathf.Abs(this.m_Go.transform.localScale.x - s) > 0.05f) - { - m_OldScale = s; - this.m_Go.transform.DOScale(m_OldScale, 0.5f); - } - - //this.m_Go.transform.localScale = Vector3.one * s; - } - - /// - /// 阵营加入玩家 - /// - /// - public void AddUnitPlayer(UnitPlayerData unitPlayerData) - { - unitPlayerData.teamId = m_Id; - unityPlayers.Add(unitPlayerData.protCustMessageData.openId, unitPlayerData); - - if (oldUnitPlayedater == null) - { - oldUnitPlayedater = GetIndexRankUnityData(); - AsyncImageDownload.Instance.SetAsyncImage(GetIndexRankUnityData().protCustMessageData.imgURL, m_HeadImg1); - m_SpriteMask1.gameObject.SetActive(true); - m_Bk.gameObject.SetActive(true); - } - - var a = GameModule.Resource.LoadAsset("Actor_Item"); - var go = GameObject.Instantiate(a, null); - go.gameObject.SetActive(false); - go.GetComponent().OnInit(unitPlayerData.protCustMessageData.imgURL, this); - - GameEvent.Send(EventConts.AddPlayer, unitPlayerData); - } - - /// - /// 返回积分最高的玩家 - /// - /// - public UnitPlayerData GetIndexRankUnityData() - { - UnitPlayerData data = null; - - // 简单的一个排序 - foreach (var item in unityPlayers) - { - if (data == null) - { - data = item.Value; - } - else - { - data = item.Value.m_Score > data.m_Score ? item.Value : data; - } - } - - return data; - } - - public long GetPush() - { - return m_AllPush; - } - - public long GetAddPush() - { - return m_AddPush; - } - - /// - /// 返回当前阵营玩家的全部积分 - /// - /// - public long GetAllPlayerScore() - { - long v = 0; - foreach (var item in unityPlayers) - { - v += item.Value.m_Score; - } - return v; - } - - public List GetUnitPlayerDatas() - { - List datas = new List(); - foreach (var item in unityPlayers) - { - datas.Add(item.Value); - } - - datas.Sort((a, b) => - { - if (a.m_Score > b.m_Score) - { - return -1; - } - else - { - return 1; - } - }); - - return datas; - } - - private int timerId = -1; - private int m_likeTimerId = -1; - private int m_Gift2TimerId = -1; - private int m_Gfit5TimerId = -1; - private int m_Gift6TimerId = -1; - private int m_Gift7TimerId = -1; - private int m_ZomeTimerId = -1; - private UnitPlayerData oldUnitPlayedater = null; - public void AddBuff(Buff buff, UnitPlayerData unitPlayerData) - { - if (buff.isZoneTimer) - { - if (m_ZoneTimerBuff != null) - { - // 增加时长 - m_ZoneTimerBuff.m_AllTimer += buff.m_AllTimer; - } - else - { - // 特殊Buff处理 - m_ZoneTimerBuff = buff; - } - } - else if (buff.isAllPower) - { - // 永久增加推力,不参与计算 - m_AllAddPush += buff.addPower; - m_EffectTr.GetChild(5).gameObject.SetActive(true); - m_EffectTr.GetChild(8).gameObject.SetActive(true); - - if (timerId != 0) - { - GameModule.Timer.RemoveTimer(timerId); - } - - timerId = GameModule.Timer.AddTimer((e) => - { - if (m_EffectTr != null) - { - m_EffectTr.GetChild(8).gameObject.SetActive(false); - } - }, 10, false); - - if (m_ZoneTimerBuff != null) - { - // 破冰 - m_ZoneTimerBuff = null; - m_EffectTr.GetChild(4).gameObject.SetActive(false); - m_EffectTr.GetChild(15).gameObject.SetActive(false); - m_EffectTr.GetChild(12).gameObject.SetActive(true); - - if (m_ZomeTimerId != 0) - { - GameModule.Timer.RemoveTimer(m_ZomeTimerId); - } - - m_ZomeTimerId = GameModule.Timer.AddTimer((e) => - { - if (m_EffectTr != null) - { - m_EffectTr.GetChild(12).gameObject.SetActive(false); - } - }, 5, false); - } - } - else - { - if (m_Buffs.ContainsKey(unitPlayerData.protCustMessageData.openId)) - { - // // 存在相同BuffId,目前设计是增加时常? - // foreach (var item in m_Buffs[unitPlayerData.protCustMessageData.openId]) - // { - // // 相同类型 - // if (item.m_Id == buff.m_Id) - // { - // // 增加时常 - // item.m_AllTimer += buff.m_AllTimer; - // return; - // } - // } - - // 累加设计 - // 没有该Buff,则新增这个Buff - m_Buffs[unitPlayerData.protCustMessageData.openId].Add(buff); - } - else - { - // 初始化这个列表Buff - m_Buffs.Add(unitPlayerData.protCustMessageData.openId, new List()); - m_Buffs[unitPlayerData.protCustMessageData.openId].Add(buff); - } - } - - // 处理各类特效表现 - if (buff.m_Id == 1) - { - if (unitPlayerData.m_LikeCount >= 100) - { - unitPlayerData.m_LikeCount -= 100; - if (m_likeTimerId != -1) - { - GameModule.Timer.Restart(m_likeTimerId); - } - else - { - // 触发礼物特效 - m_EffectTr.GetChild(9).gameObject.SetActive(true); - - //// 随机播放 - //GameModule.Audio.Play(TEngine.AudioType.UISound, "点赞" + Random.Range(1, 3)); - - // 向上的力 - Vector2 randomDirection = Vector2.down; // Generate a random direction - rigidbody2D.AddForce(randomDirection * 5); // Apply force in the random direction - m_likeTimerId = GameModule.Timer.AddTimer(EffectShowFunc, 7, false, args: 9); - } - } - } - else if (buff.m_Id == 3) - { - // 拳头特效 - if (m_Gift2TimerId != -1) - { - m_EffectTr.GetChild(10).gameObject.SetActive(true); - GameModule.Audio.Play(TEngine.AudioType.UISound, "脚踩和拳头"); - m_EffectTr.GetChild(1).transform.GetChild(3).gameObject.SetActive(true); - // 向上的力 - Vector2 randomDirection = Vector2.down; // Generate a random direction - rigidbody2D.AddForce(randomDirection * 150); // Apply force in the random direction - - - - //GameModule.Timer.Restart(m_Gift2TimerId); - GameModule.Timer.RemoveTimer(m_Gift2TimerId); - m_Gift2TimerId = GameModule.Timer.AddTimer(EffectShowFunc, 7, false, args: 10); - } - else - { - // 触发礼物特效 - m_EffectTr.GetChild(10).gameObject.SetActive(true); - GameModule.Audio.Play(TEngine.AudioType.UISound, "脚踩和拳头"); - m_EffectTr.GetChild(1).transform.GetChild(3).gameObject.SetActive(true); - // 向上的力 - Vector2 randomDirection = Vector2.down; // Generate a random direction - rigidbody2D.AddForce(randomDirection * 150); // Apply force in the random direction - - - - m_Gift2TimerId = GameModule.Timer.AddTimer(EffectShowFunc, 7, false, args: 10); - - } - } - else if (buff.m_Id == 4) - { - GameModule.Audio.Play(TEngine.AudioType.UISound, "礼物3New"); - } - else if (buff.m_Id == 5) - { - // 脚特效 - if (m_Gfit5TimerId != -1) - { - // 触发礼物特效 - m_EffectTr.GetChild(11).gameObject.SetActive(true); - m_EffectTr.GetChild(3).transform.GetChild(4).gameObject.SetActive(true); - // 向上的力 - Vector2 randomDirection = Vector2.down; // Generate a random direction - rigidbody2D.AddForce(randomDirection * 5); // Apply force in the random direction - - GameModule.Audio.Play(TEngine.AudioType.UISound, "脚踩和拳头"); - //GameModule.Timer.Restart(m_Gfit5TimerId); - GameModule.Timer.RemoveTimer(m_Gfit5TimerId); - m_Gfit5TimerId = GameModule.Timer.AddTimer(EffectShowFunc, 7, false, args: 11); - } - else - { - // 触发礼物特效 - m_EffectTr.GetChild(11).gameObject.SetActive(true); - m_EffectTr.GetChild(3).transform.GetChild(4).gameObject.SetActive(true); - // 向上的力 - Vector2 randomDirection = Vector2.down; // Generate a random direction - rigidbody2D.AddForce(randomDirection * 5); // Apply force in the random direction - - GameModule.Audio.Play(TEngine.AudioType.UISound, "脚踩和拳头"); - - m_Gfit5TimerId = GameModule.Timer.AddTimer(EffectShowFunc, 7, false, args: 11); - - } - } - else if (buff.m_Id == 6) - { - //冰冻表情 - if (m_Gift6TimerId != -1) - { - GameModule.Timer.Restart(m_Gift6TimerId); - } - else - { - // 触发礼物特效 - m_EffectTr.GetChild(15).gameObject.SetActive(true); - m_Gift6TimerId = GameModule.Timer.AddTimer(EffectShowFunc, 5, false, args: 15); - - } - } - else if (buff.m_Id == 7) - { - // 脚特效 - if (m_Gift7TimerId != -1) - { - GameModule.Timer.Restart(m_Gift7TimerId); - } - else - { - // 触发礼物特效 - m_EffectTr.GetChild(13).gameObject.SetActive(true); - m_Gift7TimerId = GameModule.Timer.AddTimer(EffectShowFunc, 7, false, args: 13); - } - } - - - if (oldUnitPlayedater != GetIndexRankUnityData()) - { - oldUnitPlayedater = GetIndexRankUnityData(); - - // 更新 - AsyncImageDownload.Instance.SetAsyncImage(GetIndexRankUnityData().protCustMessageData.imgURL, m_HeadImg1); - } - - Log.Info("Actor Id:{0} 添加Buff:{1}", m_Id, buff.m_Id); - } - - public async void ShowEmoji() - { - // 第一名常驻特效 - int id = Random.Range(17, 21); - m_EffectTr.GetChild(id).gameObject.SetActive(true); - GameModule.Audio.Play(TEngine.AudioType.UISound, "表情01"); - await UniTask.Delay(7000); - if (m_EffectTr != null) - { - m_EffectTr.GetChild(id).gameObject.SetActive(false); - } - } - - public async void ShowGift2Emoji() - { - m_EffectTr.GetChild(16).gameObject.SetActive(true); - GameModule.Audio.Play(TEngine.AudioType.UISound, "礼物三"); - await UniTask.Delay(7000); - if (m_EffectTr != null) - { - m_EffectTr.GetChild(16).gameObject.SetActive(false); - } - } - - public async void ShowGift4Emoji() - { - m_EffectTr.GetChild(14).gameObject.SetActive(true); - GameModule.Audio.Play(TEngine.AudioType.UISound, "礼物四"); - await UniTask.Delay(7000); - if (m_EffectTr != null) - { - m_EffectTr.GetChild(14).gameObject.SetActive(false); - } - } - - public async void ShowGift5Emoji() - { - m_EffectTr.GetChild(16).gameObject.SetActive(true); - GameModule.Audio.Play(TEngine.AudioType.UISound, "礼物一"); - await UniTask.Delay(7000); - if (m_EffectTr != null) - { - m_EffectTr.GetChild(16).gameObject.SetActive(false); - } - } - - - private void EffectShowFunc(object[] args) - { - if (m_EffectTr != null) - { - m_EffectTr.GetChild((int)args[0]).gameObject.SetActive(false); - - if ((int)args[0] == 11) - { - m_EffectTr.GetChild(3).transform.GetChild(4).gameObject.SetActive(false); - } - else if ((int)args[0] == 10) - { - m_EffectTr.GetChild(1).transform.GetChild(3).gameObject.SetActive(false); - } - else if ((int)args[0] == 9) - { - m_EffectTr.GetChild(0).transform.GetChild(3).gameObject.SetActive(false); - } - } - } - - public void AddAllPush(int value) - { - m_AllPush += value; - m_AllPush = m_AllPush <= 0 ? 0 : m_AllPush; - } - - /// - /// 计算身上的Buff效果 - /// - private void OnUpdateBuff() - { - if (m_ZoneTimerBuff != null) - { - m_AddPush = 0; - - // 冻结特效取反 - m_EffectTr.GetChild(4).gameObject.SetActive(!(Time.time - m_ZoneTimerBuff.m_CraeteTimer >= m_ZoneTimerBuff.m_AllTimer)); - - // 判断是否超时 - if (Time.time - m_ZoneTimerBuff.m_CraeteTimer >= m_ZoneTimerBuff.m_AllTimer) - { - m_ZoneTimerBuff = null; - } - - - bool isShowEffect01 = false; - bool isShowEffect02 = false; - bool SlowEffect01 = false; - bool SlowEffect02 = false; - - foreach (var item in m_Buffs) - { - foreach (var buff in item.Value) - { - if (buff.m_Id == 1) - { - // 点赞 - isShowEffect01 = true; - } - else if (buff.m_Id == 2) - { - // 仙女棒 - isShowEffect01 = true; - } - else if (buff.m_Id == 3) - { - // 能力药丸 - SlowEffect01 = true; - } - else if (buff.m_Id == 4) - { - // 魔法 - isShowEffect02 = true; - } - else if (buff.m_Id == 5) - { - // 甜甜圈 - SlowEffect02 = true; - } - else if (buff.m_Id == 7) - { - // // 炸弹 - // isShowEffect03 = true; - } - } - } - - m_EffectTr.GetChild(0).gameObject.SetActive(isShowEffect01); - m_EffectTr.GetChild(1).gameObject.SetActive(SlowEffect01); - m_EffectTr.GetChild(2).gameObject.SetActive(isShowEffect02); - m_EffectTr.GetChild(3).gameObject.SetActive(SlowEffect02); - } - else - { - // 最终结果值 = 初始推力+玩家数量 + 永久增加推力值 - m_AddPush = EventConts.InitPower + unityPlayers.Count + m_AllAddPush; - m_ScaleActor = EventConts.actorScaleConst; - - sclaeAdd = 1; - - foreach (var item in m_Buffs) - { - // 临时准备移除的Buff列表 - List m_tempBuffList = new List(); - - // 两层遍历,计算Buff效果 - foreach (var buff in item.Value) - { - sclaeAdd += 2f; - - // 增加Buff耗时开销 - buff.m_CraeteTimer += 0.05f; - - // 计算Buff时常 - if (buff.m_CraeteTimer >= buff.m_AllTimer) - { - // 超时移除 - m_tempBuffList.Add(buff); - } - else - { - // 增加推力 - if (buff.addPower > 0) - { - m_AddPush += buff.addPower; - } - - - m_ScaleActor += buff.addScale; - } - } - - // 移除超时的Buff - foreach (var buff in m_tempBuffList) - { - Log.Debug("移除Buff列表:" + buff.m_Id); - item.Value.Remove(buff); - } - } - - // 跳动比例 - m_AddPush = Mathf.CeilToInt(m_AddPush * 0.01f); - - // 减速也不能减到负数 - if (m_AddPush <= 0) - { - m_AddPush = 0; - sclaeAdd = 1; - } - - bool isShowEffect01 = false; - bool isShowEffect02 = false; - bool SlowEffect01 = false; - bool SlowEffect02 = false; - - foreach (var item in m_Buffs) - { - foreach (var buff in item.Value) - { - if (buff.m_Id == 1) - { - // 点赞 - isShowEffect01 = true; - } - else if (buff.m_Id == 2) - { - // 仙女棒 - isShowEffect01 = true; - } - else if (buff.m_Id == 3) - { - // 能力药丸 - SlowEffect01 = true; - } - else if (buff.m_Id == 4) - { - // 魔法 - isShowEffect02 = true; - } - else if (buff.m_Id == 5) - { - // 甜甜圈 - SlowEffect02 = true; - } - else if (buff.m_Id == 7) - { - // // 炸弹 - // isShowEffect03 = true; - } - } - } - - m_EffectTr.GetChild(0).gameObject.SetActive(isShowEffect01); - m_EffectTr.GetChild(1).gameObject.SetActive(SlowEffect01); - m_EffectTr.GetChild(2).gameObject.SetActive(isShowEffect02); - m_EffectTr.GetChild(3).gameObject.SetActive(SlowEffect02); - - // m_EffectTr.GetChild(5).gameObject.SetActive(isShowEffect03); - } - } - - - - public void OnDestroy() - { - - GameModule.Timer.RemoveTimer(m_UpdateId); - - GameEvent.RemoveEventListener(EventConts.PlayerUpdateLv, UpdateActorBk); - - // 卸载这个Go - GameObject.Destroy(m_Go); - } - -} \ No newline at end of file +// using System.Collections.Generic; +// using GameLogic; +// using TEngine; +// using TMPro; +// using UnityEngine; +// using UnityEngine.Rendering; +// using System.Linq; +// using Cysharp.Threading.Tasks; +// using DG.Tweening; + +// public class Actor +// { +// public string m_Id; + +// public GameObject m_Go; +// public SpriteRenderer m_HeadImg; +// public SpriteRenderer m_Bk; +// private SpriteMask m_SpriteMask; +// private SpriteMask m_SpriteMask1; +// private SpriteRenderer m_HeadImg1; +// private int m_AddPush = 0; // 初始推力值 +// private long m_AllPush = 0; // 当前总值 +// private int m_AllAddPush = 0;//永久增加推力值 +// private Rigidbody2D rigidbody2D; +// public TextMeshPro m_NameMesh; +// public Transform m_ParentGo; +// private TextMeshPro m_ValueMesh; +// private Dictionary unityPlayers = new Dictionary(); // 加入该阵营的玩家列表 +// private Dictionary> m_Buffs = new Dictionary>(); //自身Buff列表 +// private Buff m_ZoneTimerBuff = null; +// private Transform m_EffectTr; +// private Transform m_Trail; +// private int m_ScaleActor = EventConts.actorScaleConst; + +// private int m_UpdateId = -1; +// public void OnInit(string id) +// { +// m_Id = id; + +// m_AddPush = EventConts.InitPower; + +// // 场景中创建自己 +// var a = GameModule.Resource.LoadAsset("Actor"); +// var go = GameObject.Instantiate(a, null, false); +// m_Go = go; + +// rigidbody2D = m_Go.GetComponent(); + +// // 随机一个x、y +// int x = Random.Range(-20, 0); +// int y = Random.Range(-10, 10); +// m_Go.transform.position = new Vector3(x, y, 0); + + +// m_HeadImg = m_Go.transform.Find("ParentGo/Mask/HeadImg").GetComponent(); +// m_HeadImg1 = m_Go.transform.Find("ParentGo/Mask1/HeadImg1").GetComponent(); +// m_SpriteMask1 = m_Go.transform.Find("ParentGo/Mask1").GetComponent(); +// m_Bk = m_Go.transform.Find("ParentGo/Bk").GetComponent(); +// m_SpriteMask = m_Go.transform.Find("ParentGo/Mask").GetComponent(); +// m_NameMesh = m_Go.transform.Find("ParentGo/NameMesh").GetComponent(); +// m_ValueMesh = m_Go.transform.Find("ParentGo/ValueMesh").GetComponent(); +// m_ParentGo = m_Go.transform.Find("ParentGo"); +// m_EffectTr = m_Go.transform.Find("ParentGo/EffectList"); +// m_Trail = m_Go.transform.Find("ParentGo/Trail"); + + +// // 动态设置下Mask层级针对分层渲染 +// m_SpriteMask.frontSortingOrder = DataGameSceneManager.Instance.GetTeamActors().Count + 1; +// m_SpriteMask.backSortingOrder = DataGameSceneManager.Instance.GetTeamActors().Count; + +// m_SpriteMask1.frontSortingOrder = DataGameSceneManager.Instance.GetTeamActors().Count + 32; +// m_SpriteMask1.backSortingOrder = DataGameSceneManager.Instance.GetTeamActors().Count + 31; + +// m_HeadImg.sortingOrder = DataGameSceneManager.Instance.GetTeamActors().Count + 1; +// m_HeadImg1.sortingOrder = DataGameSceneManager.Instance.GetTeamActors().Count + 32; +// m_Bk.sortingOrder = DataGameSceneManager.Instance.GetTeamActors().Count + 5; +// m_ValueMesh.GetComponent().sortingOrder = DataGameSceneManager.Instance.GetTeamActors().Count + 5; +// m_NameMesh.GetComponent().sortingOrder = DataGameSceneManager.Instance.GetTeamActors().Count + 5; + +// if (EventConts.gameStateType == GameStateType.团队赛) +// { +// string hexColor = "#" + EventConts.colorList[int.Parse(id)]; +// Color color; +// ColorUtility.TryParseHtmlString(hexColor, out color); +// m_NameMesh.text = string.Format("{0}.{1}", int.Parse(id) + 1, DataGameSceneManager.Instance.GetStrs(int.Parse(id))); +// m_NameMesh.outlineColor = color; +// m_ValueMesh.outlineColor = color; +// m_HeadImg.sprite = GameModule.Resource.LoadAsset("q_" + (int.Parse(id) + 1)); + +// m_SpriteMask1.gameObject.SetActive(false); +// m_Bk.gameObject.SetActive(false); + +// // // 加载头像 +// // AsyncImageDownload.Instance.SetAsyncImage(GetIndexRankUnityData().protCustMessageData.imgURL, m_HeadImg1); + +// m_HeadImg.transform.localScale = Vector3.one * 0.46f; +// } +// else if (EventConts.gameStateType == GameStateType.个人赛) +// { + +// int m_Id = DataGameSceneManager.Instance.GetUnitPlayerDatas().Count % 15; +// string hexColor = "#" + EventConts.colorList[m_Id]; +// Color color; +// ColorUtility.TryParseHtmlString(hexColor, out color); +// m_NameMesh.outlineColor = color; +// m_ValueMesh.outlineColor = color; +// m_HeadImg.transform.localScale = Vector3.one; +// var data = DataGameSceneManager.Instance.GetUnitPlayerData(id); +// string nickName = data.protCustMessageData.nickName; +// m_NameMesh.text = nickName.Length > 4 ? nickName.Substring(0, 4) : nickName; + +// // 加载头像 +// AsyncImageDownload.Instance.SetAsyncImage(data.protCustMessageData.imgURL, m_HeadImg); +// } + +// m_ValueMesh.text = GetPush().ToString(); + +// go.transform.gameObject.SetActive(true); +// go.transform.localScale = Vector3.one * 6; + +// UpdateActorBk(); + +// m_UpdateId = GameModule.Timer.AddTimer((e) => +// { +// OnUpdateBuff(); +// }, 0.05f, true); + +// var i = Random.Range(0, m_Trail.transform.childCount); +// m_Trail.GetChild(i).gameObject.SetActive(true); + +// // 注册监听 +// GameEvent.AddEventListener(EventConts.PlayerUpdateLv, UpdateActorBk); +// } + +// public void OnUpdate() +// { +// //OnUpdateBuff(); + +// m_ParentGo.rotation = Quaternion.identity; // 不受父节点旋转影响 + +// // 上限阈值结算 +// if (m_AllPush + m_AddPush >= int.MaxValue) +// { +// Log.Error("超过最大值上限,强制结算"); +// return; +// } + +// m_AllPush += m_AddPush; + +// // 先把中间挤的问题处理 +// Vector2 randomDirection = Random.insideUnitCircle.normalized; // Generate a random direction +// rigidbody2D.AddForce(randomDirection * 5); // Apply force in the random direction + +// m_ValueMesh.text = GetPush().ToString(); +// } + +// public string GetMyStr() +// { +// if (EventConts.gameStateType == GameStateType.团队赛) +// { +// return string.Format("{0}.{1}", m_Id + 1, DataGameSceneManager.Instance.GetStrs(int.Parse(m_Id))); +// } +// else if (EventConts.gameStateType == GameStateType.个人赛) +// { +// return GetIndexRankUnityData().protCustMessageData.nickName; +// } +// else +// { +// return "不支持的模式"; +// } +// } + +// private void UpdateActorBk() +// { +// // if (GetIndexRankUnityData().protCustMessageData.rankRo.lv == 0) +// // { +// // GetIndexRankUnityData().protCustMessageData.rankRo.lv = 1; +// // } + +// if (GetIndexRankUnityData() == null) +// { +// return; +// } + +// string str = ConfigSystem.Instance.Tables.TbPlayerLevelConfig.Get(GetIndexRankUnityData().protCustMessageData.rankRo.lv).TitleIconName; +// // m_Bk.sprite = GameModule.Resource.LoadAsset(str); +// } + +// private float sclaeAdd = 1; + +// private float m_OldScale = 0; +// public void UpdateScale(long m_AllPush) +// { +// // 避免除0 +// if (m_AllPush == 0) +// { +// return; +// } + + +// // 基于当前总值,计算自己scale大小 +// var results = this.m_AllPush / (float)m_AllPush; + +// // 求出实际值 +// // var s = EventConts.MaxActorScale * results; +// var s = results * EventConts.actorScaleConst + sclaeAdd; + +// if (s < EventConts.MinActorScale) +// { +// s = EventConts.MinActorScale; +// } +// else if (s >= EventConts.MaxActorScale) +// { +// s = EventConts.MaxActorScale; +// } + +// // 每次都更新 + +// // 两者相差值超过 +// if (Mathf.Abs(this.m_Go.transform.localScale.x - s) > 0.05f) +// { +// m_OldScale = s; +// this.m_Go.transform.DOScale(m_OldScale, 0.5f); +// } + +// //this.m_Go.transform.localScale = Vector3.one * s; +// } + +// /// +// /// 阵营加入玩家 +// /// +// /// +// public void AddUnitPlayer(UnitPlayerData unitPlayerData) +// { +// unitPlayerData.teamId = m_Id; +// unityPlayers.Add(unitPlayerData.protCustMessageData.openId, unitPlayerData); + +// if (oldUnitPlayedater == null) +// { +// oldUnitPlayedater = GetIndexRankUnityData(); +// AsyncImageDownload.Instance.SetAsyncImage(GetIndexRankUnityData().protCustMessageData.imgURL, m_HeadImg1); +// m_SpriteMask1.gameObject.SetActive(true); +// m_Bk.gameObject.SetActive(true); +// } + +// var a = GameModule.Resource.LoadAsset("Actor_Item"); +// var go = GameObject.Instantiate(a, null); +// go.gameObject.SetActive(false); +// go.GetComponent().OnInit(unitPlayerData.protCustMessageData.imgURL, this); + +// GameEvent.Send(EventConts.AddPlayer, unitPlayerData); +// } + +// /// +// /// 返回积分最高的玩家 +// /// +// /// +// public UnitPlayerData GetIndexRankUnityData() +// { +// UnitPlayerData data = null; + +// // 简单的一个排序 +// foreach (var item in unityPlayers) +// { +// if (data == null) +// { +// data = item.Value; +// } +// else +// { +// data = item.Value.m_Score > data.m_Score ? item.Value : data; +// } +// } + +// return data; +// } + +// public long GetPush() +// { +// return m_AllPush; +// } + +// public long GetAddPush() +// { +// return m_AddPush; +// } + +// /// +// /// 返回当前阵营玩家的全部积分 +// /// +// /// +// public long GetAllPlayerScore() +// { +// long v = 0; +// foreach (var item in unityPlayers) +// { +// v += item.Value.m_Score; +// } +// return v; +// } + +// public List GetUnitPlayerDatas() +// { +// List datas = new List(); +// foreach (var item in unityPlayers) +// { +// datas.Add(item.Value); +// } + +// datas.Sort((a, b) => +// { +// if (a.m_Score > b.m_Score) +// { +// return -1; +// } +// else +// { +// return 1; +// } +// }); + +// return datas; +// } + +// private int timerId = -1; +// private int m_likeTimerId = -1; +// private int m_Gift2TimerId = -1; +// private int m_Gfit5TimerId = -1; +// private int m_Gift6TimerId = -1; +// private int m_Gift7TimerId = -1; +// private int m_ZomeTimerId = -1; +// private UnitPlayerData oldUnitPlayedater = null; +// public void AddBuff(Buff buff, UnitPlayerData unitPlayerData) +// { +// if (buff.isZoneTimer) +// { +// if (m_ZoneTimerBuff != null) +// { +// // 增加时长 +// m_ZoneTimerBuff.m_AllTimer += buff.m_AllTimer; +// } +// else +// { +// // 特殊Buff处理 +// m_ZoneTimerBuff = buff; +// } +// } +// else if (buff.isAllPower) +// { +// // 永久增加推力,不参与计算 +// m_AllAddPush += buff.addPower; +// m_EffectTr.GetChild(5).gameObject.SetActive(true); +// m_EffectTr.GetChild(8).gameObject.SetActive(true); + +// if (timerId != 0) +// { +// GameModule.Timer.RemoveTimer(timerId); +// } + +// timerId = GameModule.Timer.AddTimer((e) => +// { +// if (m_EffectTr != null) +// { +// m_EffectTr.GetChild(8).gameObject.SetActive(false); +// } +// }, 10, false); + +// if (m_ZoneTimerBuff != null) +// { +// // 破冰 +// m_ZoneTimerBuff = null; +// m_EffectTr.GetChild(4).gameObject.SetActive(false); +// m_EffectTr.GetChild(15).gameObject.SetActive(false); +// m_EffectTr.GetChild(12).gameObject.SetActive(true); + +// if (m_ZomeTimerId != 0) +// { +// GameModule.Timer.RemoveTimer(m_ZomeTimerId); +// } + +// m_ZomeTimerId = GameModule.Timer.AddTimer((e) => +// { +// if (m_EffectTr != null) +// { +// m_EffectTr.GetChild(12).gameObject.SetActive(false); +// } +// }, 5, false); +// } +// } +// else +// { +// if (m_Buffs.ContainsKey(unitPlayerData.protCustMessageData.openId)) +// { +// // // 存在相同BuffId,目前设计是增加时常? +// // foreach (var item in m_Buffs[unitPlayerData.protCustMessageData.openId]) +// // { +// // // 相同类型 +// // if (item.m_Id == buff.m_Id) +// // { +// // // 增加时常 +// // item.m_AllTimer += buff.m_AllTimer; +// // return; +// // } +// // } + +// // 累加设计 +// // 没有该Buff,则新增这个Buff +// m_Buffs[unitPlayerData.protCustMessageData.openId].Add(buff); +// } +// else +// { +// // 初始化这个列表Buff +// m_Buffs.Add(unitPlayerData.protCustMessageData.openId, new List()); +// m_Buffs[unitPlayerData.protCustMessageData.openId].Add(buff); +// } +// } + +// // 处理各类特效表现 +// if (buff.m_Id == 1) +// { +// if (unitPlayerData.m_LikeCount >= 100) +// { +// unitPlayerData.m_LikeCount -= 100; +// if (m_likeTimerId != -1) +// { +// GameModule.Timer.Restart(m_likeTimerId); +// } +// else +// { +// // 触发礼物特效 +// m_EffectTr.GetChild(9).gameObject.SetActive(true); + +// //// 随机播放 +// //GameModule.Audio.Play(TEngine.AudioType.UISound, "点赞" + Random.Range(1, 3)); + +// // 向上的力 +// Vector2 randomDirection = Vector2.down; // Generate a random direction +// rigidbody2D.AddForce(randomDirection * 5); // Apply force in the random direction +// m_likeTimerId = GameModule.Timer.AddTimer(EffectShowFunc, 7, false, args: 9); +// } +// } +// } +// else if (buff.m_Id == 3) +// { +// // 拳头特效 +// if (m_Gift2TimerId != -1) +// { +// m_EffectTr.GetChild(10).gameObject.SetActive(true); +// GameModule.Audio.Play(TEngine.AudioType.UISound, "脚踩和拳头"); +// m_EffectTr.GetChild(1).transform.GetChild(3).gameObject.SetActive(true); +// // 向上的力 +// Vector2 randomDirection = Vector2.down; // Generate a random direction +// rigidbody2D.AddForce(randomDirection * 150); // Apply force in the random direction + + + +// //GameModule.Timer.Restart(m_Gift2TimerId); +// GameModule.Timer.RemoveTimer(m_Gift2TimerId); +// m_Gift2TimerId = GameModule.Timer.AddTimer(EffectShowFunc, 7, false, args: 10); +// } +// else +// { +// // 触发礼物特效 +// m_EffectTr.GetChild(10).gameObject.SetActive(true); +// GameModule.Audio.Play(TEngine.AudioType.UISound, "脚踩和拳头"); +// m_EffectTr.GetChild(1).transform.GetChild(3).gameObject.SetActive(true); +// // 向上的力 +// Vector2 randomDirection = Vector2.down; // Generate a random direction +// rigidbody2D.AddForce(randomDirection * 150); // Apply force in the random direction + + + +// m_Gift2TimerId = GameModule.Timer.AddTimer(EffectShowFunc, 7, false, args: 10); + +// } +// } +// else if (buff.m_Id == 4) +// { +// GameModule.Audio.Play(TEngine.AudioType.UISound, "礼物3New"); +// } +// else if (buff.m_Id == 5) +// { +// // 脚特效 +// if (m_Gfit5TimerId != -1) +// { +// // 触发礼物特效 +// m_EffectTr.GetChild(11).gameObject.SetActive(true); +// m_EffectTr.GetChild(3).transform.GetChild(4).gameObject.SetActive(true); +// // 向上的力 +// Vector2 randomDirection = Vector2.down; // Generate a random direction +// rigidbody2D.AddForce(randomDirection * 5); // Apply force in the random direction + +// GameModule.Audio.Play(TEngine.AudioType.UISound, "脚踩和拳头"); +// //GameModule.Timer.Restart(m_Gfit5TimerId); +// GameModule.Timer.RemoveTimer(m_Gfit5TimerId); +// m_Gfit5TimerId = GameModule.Timer.AddTimer(EffectShowFunc, 7, false, args: 11); +// } +// else +// { +// // 触发礼物特效 +// m_EffectTr.GetChild(11).gameObject.SetActive(true); +// m_EffectTr.GetChild(3).transform.GetChild(4).gameObject.SetActive(true); +// // 向上的力 +// Vector2 randomDirection = Vector2.down; // Generate a random direction +// rigidbody2D.AddForce(randomDirection * 5); // Apply force in the random direction + +// GameModule.Audio.Play(TEngine.AudioType.UISound, "脚踩和拳头"); + +// m_Gfit5TimerId = GameModule.Timer.AddTimer(EffectShowFunc, 7, false, args: 11); + +// } +// } +// else if (buff.m_Id == 6) +// { +// //冰冻表情 +// if (m_Gift6TimerId != -1) +// { +// GameModule.Timer.Restart(m_Gift6TimerId); +// } +// else +// { +// // 触发礼物特效 +// m_EffectTr.GetChild(15).gameObject.SetActive(true); +// m_Gift6TimerId = GameModule.Timer.AddTimer(EffectShowFunc, 5, false, args: 15); + +// } +// } +// else if (buff.m_Id == 7) +// { +// // 脚特效 +// if (m_Gift7TimerId != -1) +// { +// GameModule.Timer.Restart(m_Gift7TimerId); +// } +// else +// { +// // 触发礼物特效 +// m_EffectTr.GetChild(13).gameObject.SetActive(true); +// m_Gift7TimerId = GameModule.Timer.AddTimer(EffectShowFunc, 7, false, args: 13); +// } +// } + + +// if (oldUnitPlayedater != GetIndexRankUnityData()) +// { +// oldUnitPlayedater = GetIndexRankUnityData(); + +// // 更新 +// AsyncImageDownload.Instance.SetAsyncImage(GetIndexRankUnityData().protCustMessageData.imgURL, m_HeadImg1); +// } + +// Log.Info("Actor Id:{0} 添加Buff:{1}", m_Id, buff.m_Id); +// } + +// public async void ShowEmoji() +// { +// // 第一名常驻特效 +// int id = Random.Range(17, 21); +// m_EffectTr.GetChild(id).gameObject.SetActive(true); +// GameModule.Audio.Play(TEngine.AudioType.UISound, "表情01"); +// await UniTask.Delay(7000); +// if (m_EffectTr != null) +// { +// m_EffectTr.GetChild(id).gameObject.SetActive(false); +// } +// } + +// public async void ShowGift2Emoji() +// { +// m_EffectTr.GetChild(16).gameObject.SetActive(true); +// GameModule.Audio.Play(TEngine.AudioType.UISound, "礼物三"); +// await UniTask.Delay(7000); +// if (m_EffectTr != null) +// { +// m_EffectTr.GetChild(16).gameObject.SetActive(false); +// } +// } + +// public async void ShowGift4Emoji() +// { +// m_EffectTr.GetChild(14).gameObject.SetActive(true); +// GameModule.Audio.Play(TEngine.AudioType.UISound, "礼物四"); +// await UniTask.Delay(7000); +// if (m_EffectTr != null) +// { +// m_EffectTr.GetChild(14).gameObject.SetActive(false); +// } +// } + +// public async void ShowGift5Emoji() +// { +// m_EffectTr.GetChild(16).gameObject.SetActive(true); +// GameModule.Audio.Play(TEngine.AudioType.UISound, "礼物一"); +// await UniTask.Delay(7000); +// if (m_EffectTr != null) +// { +// m_EffectTr.GetChild(16).gameObject.SetActive(false); +// } +// } + + +// private void EffectShowFunc(object[] args) +// { +// if (m_EffectTr != null) +// { +// m_EffectTr.GetChild((int)args[0]).gameObject.SetActive(false); + +// if ((int)args[0] == 11) +// { +// m_EffectTr.GetChild(3).transform.GetChild(4).gameObject.SetActive(false); +// } +// else if ((int)args[0] == 10) +// { +// m_EffectTr.GetChild(1).transform.GetChild(3).gameObject.SetActive(false); +// } +// else if ((int)args[0] == 9) +// { +// m_EffectTr.GetChild(0).transform.GetChild(3).gameObject.SetActive(false); +// } +// } +// } + +// public void AddAllPush(int value) +// { +// m_AllPush += value; +// m_AllPush = m_AllPush <= 0 ? 0 : m_AllPush; +// } + +// /// +// /// 计算身上的Buff效果 +// /// +// private void OnUpdateBuff() +// { +// if (m_ZoneTimerBuff != null) +// { +// m_AddPush = 0; + +// // 冻结特效取反 +// m_EffectTr.GetChild(4).gameObject.SetActive(!(Time.time - m_ZoneTimerBuff.m_CraeteTimer >= m_ZoneTimerBuff.m_AllTimer)); + +// // 判断是否超时 +// if (Time.time - m_ZoneTimerBuff.m_CraeteTimer >= m_ZoneTimerBuff.m_AllTimer) +// { +// m_ZoneTimerBuff = null; +// } + + +// bool isShowEffect01 = false; +// bool isShowEffect02 = false; +// bool SlowEffect01 = false; +// bool SlowEffect02 = false; + +// foreach (var item in m_Buffs) +// { +// foreach (var buff in item.Value) +// { +// if (buff.m_Id == 1) +// { +// // 点赞 +// isShowEffect01 = true; +// } +// else if (buff.m_Id == 2) +// { +// // 仙女棒 +// isShowEffect01 = true; +// } +// else if (buff.m_Id == 3) +// { +// // 能力药丸 +// SlowEffect01 = true; +// } +// else if (buff.m_Id == 4) +// { +// // 魔法 +// isShowEffect02 = true; +// } +// else if (buff.m_Id == 5) +// { +// // 甜甜圈 +// SlowEffect02 = true; +// } +// else if (buff.m_Id == 7) +// { +// // // 炸弹 +// // isShowEffect03 = true; +// } +// } +// } + +// m_EffectTr.GetChild(0).gameObject.SetActive(isShowEffect01); +// m_EffectTr.GetChild(1).gameObject.SetActive(SlowEffect01); +// m_EffectTr.GetChild(2).gameObject.SetActive(isShowEffect02); +// m_EffectTr.GetChild(3).gameObject.SetActive(SlowEffect02); +// } +// else +// { +// // 最终结果值 = 初始推力+玩家数量 + 永久增加推力值 +// m_AddPush = EventConts.InitPower + unityPlayers.Count + m_AllAddPush; +// m_ScaleActor = EventConts.actorScaleConst; + +// sclaeAdd = 1; + +// foreach (var item in m_Buffs) +// { +// // 临时准备移除的Buff列表 +// List m_tempBuffList = new List(); + +// // 两层遍历,计算Buff效果 +// foreach (var buff in item.Value) +// { +// sclaeAdd += 2f; + +// // 增加Buff耗时开销 +// buff.m_CraeteTimer += 0.05f; + +// // 计算Buff时常 +// if (buff.m_CraeteTimer >= buff.m_AllTimer) +// { +// // 超时移除 +// m_tempBuffList.Add(buff); +// } +// else +// { +// // 增加推力 +// if (buff.addPower > 0) +// { +// m_AddPush += buff.addPower; +// } + + +// m_ScaleActor += buff.addScale; +// } +// } + +// // 移除超时的Buff +// foreach (var buff in m_tempBuffList) +// { +// Log.Debug("移除Buff列表:" + buff.m_Id); +// item.Value.Remove(buff); +// } +// } + +// // 跳动比例 +// m_AddPush = Mathf.CeilToInt(m_AddPush * 0.01f); + +// // 减速也不能减到负数 +// if (m_AddPush <= 0) +// { +// m_AddPush = 0; +// sclaeAdd = 1; +// } + +// bool isShowEffect01 = false; +// bool isShowEffect02 = false; +// bool SlowEffect01 = false; +// bool SlowEffect02 = false; + +// foreach (var item in m_Buffs) +// { +// foreach (var buff in item.Value) +// { +// if (buff.m_Id == 1) +// { +// // 点赞 +// isShowEffect01 = true; +// } +// else if (buff.m_Id == 2) +// { +// // 仙女棒 +// isShowEffect01 = true; +// } +// else if (buff.m_Id == 3) +// { +// // 能力药丸 +// SlowEffect01 = true; +// } +// else if (buff.m_Id == 4) +// { +// // 魔法 +// isShowEffect02 = true; +// } +// else if (buff.m_Id == 5) +// { +// // 甜甜圈 +// SlowEffect02 = true; +// } +// else if (buff.m_Id == 7) +// { +// // // 炸弹 +// // isShowEffect03 = true; +// } +// } +// } + +// m_EffectTr.GetChild(0).gameObject.SetActive(isShowEffect01); +// m_EffectTr.GetChild(1).gameObject.SetActive(SlowEffect01); +// m_EffectTr.GetChild(2).gameObject.SetActive(isShowEffect02); +// m_EffectTr.GetChild(3).gameObject.SetActive(SlowEffect02); + +// // m_EffectTr.GetChild(5).gameObject.SetActive(isShowEffect03); +// } +// } + + + +// public void OnDestroy() +// { + +// GameModule.Timer.RemoveTimer(m_UpdateId); + +// GameEvent.RemoveEventListener(EventConts.PlayerUpdateLv, UpdateActorBk); + +// // 卸载这个Go +// GameObject.Destroy(m_Go); +// } + +// } \ No newline at end of file diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorItem.cs index ae6823bf..e3c53866 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorItem.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorItem.cs @@ -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) +// { +// // ����Լ���λ�� +// 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); +// }); +// } +// } +// } diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/HItemActor.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/HItemActor.cs index 0da6708c..1fedf0be 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/HItemActor.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/HItemActor.cs @@ -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(); - m_Value = transform.Find("Value").GetComponent(); - m_HeadList = transform.Find("HeadList").GetComponent(); - m_Name = transform.Find("Name").GetComponent(); - m_Rank = transform.Find("RankBg/Rank").GetComponent(); - 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(); +// m_Value = transform.Find("Value").GetComponent(); +// m_HeadList = transform.Find("HeadList").GetComponent(); +// m_Name = transform.Find("Name").GetComponent(); +// m_Rank = transform.Find("RankBg/Rank").GetComponent(); +// m_HeadItem = transform.Find("HeadList/HeadItem").gameObject; +// m_Item = transform.Find("Image/Item/m_item").gameObject; - isAddEvent = true; - GameEvent.AddEventListener(EventConts.AddPlayer, AddTuanduiPlayer); - } +// isAddEvent = true; +// GameEvent.AddEventListener(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(); - 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(); +// 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(); - // 团队赛的时候,创建是没玩家的 - if (unitPlayerData != null) - { - AsyncImageDownload.Instance.SetAsyncImage(unitPlayerData.protCustMessageData.imgURL, rawImage); - } - else - { - rawImage.sprite = GameModule.Resource.LoadAsset("q_" + (int.Parse(m_Actor.m_Id) + 1)); - } - } +// Image rawImage = headItem.transform.Find("Mask/m_Icon").GetComponent(); +// // 团队赛的时候,创建是没玩家的 +// if (unitPlayerData != null) +// { +// AsyncImageDownload.Instance.SetAsyncImage(unitPlayerData.protCustMessageData.imgURL, rawImage); +// } +// else +// { +// rawImage.sprite = GameModule.Resource.LoadAsset("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(EventConts.AddPlayer, AddTuanduiPlayer); - // } - Destroy(gameObject); - } -} \ No newline at end of file +// public void OnRemove() +// { +// // if (isAddEvent) +// // { +// // GameEvent.RemoveEventListener(EventConts.AddPlayer, AddTuanduiPlayer); +// // } +// Destroy(gameObject); +// } +// } \ No newline at end of file diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataDanMuSceneManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataDanMuSceneManager.cs index fc299012..2add52be 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataDanMuSceneManager.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataDanMuSceneManager.cs @@ -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("Actor_Item"); - var go = GameObject.Instantiate(a, null); - go.gameObject.SetActive(false); - go.GetComponent().OnInit(data.protCustMessageData.imgURL, actor); - } + // var a = GameModule.Resource.LoadAsset("Actor_Item"); + // var go = GameObject.Instantiate(a, null); + // go.gameObject.SetActive(false); + // go.GetComponent().OnInit(data.protCustMessageData.imgURL, actor); + // } } } diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameModelManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameModelManager.cs index 3220120b..9a651b57 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameModelManager.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameModelManager.cs @@ -39,101 +39,101 @@ public class DataGameModelManager : GameBase.Singleton /// 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 rankInfos = new List(); + // List rankInfos = new List(); - 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(m_Json); - if (playRankRootData != null && playRankRootData.code == 200) - { - // // 清理礼物队列 - // DataGameManager.Instance.m_VipItemDatas.Clear(); - // DataGameManager.Instance.m_GiftItemDatas.Clear(); + // PlayRankRootData playRankRootData = JsonHelper.Deserialize(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(objects); - } - else - { - UITip.ShowMessageBox("排行榜结算异常,请联系管理员!!Code:" + playRankRootData.code, MessageShowType.TwoButton, () => - { + // // 打开结算界面 + // object[] objects = new object[2]; + // objects[0] = GameRankType.当局排行榜; + // objects[1] = playRankRootData.data; + // GameModule.UI.ShowUI(objects); + // } + // else + // { + // UITip.ShowMessageBox("排行榜结算异常,请联系管理员!!Code:" + playRankRootData.code, MessageShowType.TwoButton, () => + // { - }, () => - { + // }, () => + // { - }); - } + // }); + // } } /// @@ -141,116 +141,116 @@ public class DataGameModelManager : GameBase.Singleton /// private void GameRankEnd() { - var datas = DataGameSceneManager.Instance.GetTeamActors(); - List actors = new List(); - foreach (var item in datas) - { - actors.Add(item.Value); - } + // var datas = DataGameSceneManager.Instance.GetTeamActors(); + // List actors = new List(); + // 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) - //{ - // // 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 = DataGameSceneManager.Instance.WinAllValue; - 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; + // //} + // 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 rankInfos = new List(); - // 上报排行榜数据 - 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 rankInfos = new List(); + // // 上报排行榜数据 + // 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(m_Json); - if (playRankRootData != null && playRankRootData.code == 200) - { - // // 清理礼物队列 - // DataGameManager.Instance.m_VipItemDatas.Clear(); - // DataGameManager.Instance.m_GiftItemDatas.Clear(); + // PlayRankRootData playRankRootData = JsonHelper.Deserialize(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(objects); - } - else - { - UITip.ShowMessageBox("排行榜结算异常,请联系管理员!!Code:" + playRankRootData.code, MessageShowType.TwoButton, () => - { + // // 打开结算界面 + // object[] objects = new object[2]; + // objects[0] = GameRankType.当局排行榜; + // objects[1] = playRankRootData.data; + // GameModule.UI.ShowUI(objects); + // } + // else + // { + // UITip.ShowMessageBox("排行榜结算异常,请联系管理员!!Code:" + playRankRootData.code, MessageShowType.TwoButton, () => + // { - }, () => - { + // }, () => + // { - }); - } + // }); + // } } diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs index 63bc8b26..20aa3991 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs @@ -15,8 +15,7 @@ namespace GameLogic private Transform teamList; private Dictionary m_DicUnitPlayerDatas = new Dictionary(); //局内玩家数据 - private Dictionary m_TeamLists = new Dictionary(); - private List m_TeamSortList = new List(); // 用于排序的阵营列表数据 + // private List m_TeamSortList = new List(); // 用于排序的阵营列表数据 public float m_GameTimerLen = 0; public List m_Strs = new List() { "陈", "王", "李", "张", "刘", "杨", "黄", "赵", "吴", "周", "徐", "孙", "马", "朱", "胡","何","林","高","罗","郑", @@ -40,6 +39,7 @@ namespace GameLogic { FindGameComponent(); InitGameData(); + InitGameTeam(); } @@ -63,9 +63,13 @@ namespace GameLogic m_PanelBg = GameObject.Find("Plane").GetComponent(); } - 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; - } - - /// - /// 返回当局最高排名的玩家 - /// - /// - public UnitPlayerData GetOneRankUnitPlayerData() - { - UnitPlayerData data = null; - if (m_TeamSortList.Count <= 0) - { - Log.Error("异常获取."); - return data; - } - - data = m_TeamSortList[0].GetIndexRankUnityData(); - return data; - } - - /// - /// 返回当前排名最高的阵营 - /// - /// - 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 GetAllRankUnityPlayerData() - { - return m_TeamSortList; - } - - public Dictionary 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,133 +351,133 @@ 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()) - // { - // return -1; - // } - // else - // { - // 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; - } - } + // // 特殊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; + // } + // 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 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;