Main/Component/UI/Decorate/Tweens/Tween.cs
@@ -208,6 +208,11 @@ doTween = false; } public void Resume() { doTween = true; } public enum DelayMode { OneFrame, Main/Core/NetworkPackage/ClientPack/CB4_FightDefine.meta
New file @@ -0,0 +1,8 @@ fileFormatVersion: 2 guid: be673b8fc2be042498eeea013114a945 folderAsset: yes DefaultImporter: externalObjects: {} userData: assetBundleName: assetBundleVariant: Main/Core/NetworkPackage/ClientPack/CB4_FightDefine/CB410_tagCMTurnFight.cs.meta
New file @@ -0,0 +1,11 @@ fileFormatVersion: 2 guid: 69e99ae964836ee468cd0df93489b867 MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Main/Core/NetworkPackage/ClientPack/CB4_FightDefine/CB412_tagCSHeroLineupSave.cs.meta
New file @@ -0,0 +1,11 @@ fileFormatVersion: 2 guid: 8ff0757ee65a0424b85f9b54feb78c40 MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Main/Core/NetworkPackage/ClientPack/CB4_FightDefine/CB413_tagCSMainFightReq.cs.meta
New file @@ -0,0 +1,11 @@ fileFormatVersion: 2 guid: 14690d6ee6c40934e8f5fcfdd6aaff0b MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Main/Core/NetworkPackage/ClientPack/CB4_FightDefine/CB414_tagCSTurnFightReportView.cs.meta
New file @@ -0,0 +1,11 @@ fileFormatVersion: 2 guid: 949326f72ec68c1478c57590cb974c16 MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Main/Core/NetworkPackage/DTCFile/ClientPack.meta
New file @@ -0,0 +1,8 @@ fileFormatVersion: 2 guid: ca5cb78cdbfcd124896d149f0087c4e2 folderAsset: yes DefaultImporter: externalObjects: {} userData: assetBundleName: assetBundleVariant: Main/Core/NetworkPackage/DTCFile/ClientPack/CB4_FightDefine.meta
New file @@ -0,0 +1,8 @@ fileFormatVersion: 2 guid: 38c3d32cc0f30b94fa6c38128fefa3c8 folderAsset: yes DefaultImporter: externalObjects: {} userData: assetBundleName: assetBundleVariant: Main/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0407_tagNPCDisappear.cs.meta
New file @@ -0,0 +1,11 @@ fileFormatVersion: 2 guid: f2d7f250630a07b4ca8bcca027e92e3a MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Main/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0423_tagObjPropertyRefreshView.cs.meta
New file @@ -0,0 +1,11 @@ fileFormatVersion: 2 guid: a684ee13a4781a84f90648f120768a0f MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Main/Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0602_tagObjBaseAttack.cs.meta
New file @@ -0,0 +1,11 @@ fileFormatVersion: 2 guid: d552ea2be2de457479d2b005af75b862 MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Main/Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0604_tagUseSkillAttack.cs.meta
New file @@ -0,0 +1,11 @@ fileFormatVersion: 2 guid: 549309953c5bf6840905da3884455347 MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine.meta
New file @@ -0,0 +1,8 @@ fileFormatVersion: 2 guid: d5d98e8beeb19154690df9fa8d3ce805 folderAsset: yes DefaultImporter: externalObjects: {} userData: assetBundleName: assetBundleVariant: Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB420_tagMCTurnFightState.cs.meta
New file @@ -0,0 +1,11 @@ fileFormatVersion: 2 guid: a9738107bf1e12e42ab452e6c70c8e50 MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB421_tagMCTurnFightObjAction.cs.meta
New file @@ -0,0 +1,11 @@ fileFormatVersion: 2 guid: 17811ac8270d5f9468f599497cb222f3 MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB422_tagMCTurnFightObjDead.cs.meta
New file @@ -0,0 +1,11 @@ fileFormatVersion: 2 guid: 99e092fe441ff5043ac4169e8d499e2a MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB423_tagMCTurnFightObjReborn.cs.meta
New file @@ -0,0 +1,11 @@ fileFormatVersion: 2 guid: e3390e5827cc38f47af587056c252dc8 MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB424_tagSCTurnFightInit.cs.meta
New file @@ -0,0 +1,11 @@ fileFormatVersion: 2 guid: eeac1c5982c38cd48b7a081558276598 MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB425_tagSCTurnFightReportSign.cs.meta
New file @@ -0,0 +1,11 @@ fileFormatVersion: 2 guid: 729d3d7b4ad772c4eabc95c63d696d1a MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB430_tagSCTurnFightReport.cs.meta
New file @@ -0,0 +1,11 @@ fileFormatVersion: 2 guid: 1f7dfaaa7e7472549ab98460e51c8e9d MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Main/Core/NetworkPackage/ServerPack/H04_Scene/H0407_tagNPCDisappear.cs.meta
New file @@ -0,0 +1,11 @@ fileFormatVersion: 2 guid: f7e5eb982a7147c4382a24b0571ad0f2 MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Main/Core/NetworkPackage/ServerPack/H04_Scene/H0423_tagObjPropertyRefreshView.cs.meta
New file @@ -0,0 +1,11 @@ fileFormatVersion: 2 guid: 48ce6558ac407c34f8988dbe9b810da4 MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Main/Core/NetworkPackage/ServerPack/H06_PlayerVsNPC/H0602_tagObjBaseAttack.cs.meta
New file @@ -0,0 +1,11 @@ fileFormatVersion: 2 guid: 0c39e10c6d11822409ee2e39b684f89d MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Main/Core/NetworkPackage/ServerPack/H06_PlayerVsNPC/H0604_tagUseSkillAttack.cs.meta
New file @@ -0,0 +1,11 @@ fileFormatVersion: 2 guid: 4e187e9798104844f924234a78385c0d MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Main/Core/NetworkPackage/ServerPack/HB4_FightDefine.meta
New file @@ -0,0 +1,8 @@ fileFormatVersion: 2 guid: 0d149c694ca640e4191e3bfd7adb9c0d folderAsset: yes DefaultImporter: externalObjects: {} userData: assetBundleName: assetBundleVariant: Main/Core/NetworkPackage/ServerPack/HB4_FightDefine/HB420_tagMCTurnFightState.cs.meta
New file @@ -0,0 +1,11 @@ fileFormatVersion: 2 guid: ff739588e10970a4b8f7b31c0f39a3a4 MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Main/Core/NetworkPackage/ServerPack/HB4_FightDefine/HB421_tagMCTurnFightObjAction.cs.meta
New file @@ -0,0 +1,11 @@ fileFormatVersion: 2 guid: 77541bc1f4a8aa24ab97df615d02afa0 MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Main/Core/NetworkPackage/ServerPack/HB4_FightDefine/HB422_tagMCTurnFightObjDead.cs.meta
New file @@ -0,0 +1,11 @@ fileFormatVersion: 2 guid: c7e714470a234b3449523360a983a9d6 MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Main/Core/NetworkPackage/ServerPack/HB4_FightDefine/HB423_tagMCTurnFightObjReborn.cs.meta
New file @@ -0,0 +1,11 @@ fileFormatVersion: 2 guid: ad7d859323674a245a6ac5aed1b63b0d MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Main/Core/NetworkPackage/ServerPack/HB4_FightDefine/HB424_tagSCTurnFightInit.cs.meta
New file @@ -0,0 +1,11 @@ fileFormatVersion: 2 guid: c6d90ddfd424f6b4cb6dfa57d56c47c4 MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Main/Core/NetworkPackage/ServerPack/HB4_FightDefine/HB425_tagSCTurnFightReportSign.cs.meta
New file @@ -0,0 +1,11 @@ fileFormatVersion: 2 guid: 5c2a6d783447968488d56efa34d0b0aa MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Main/Core/NetworkPackage/ServerPack/HB4_FightDefine/HB430_tagSCTurnFightReport.cs.meta
New file @@ -0,0 +1,11 @@ fileFormatVersion: 2 guid: 5193f10912f87a740b92011d9247ef8b MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Main/System/Battle/BattleField/BattleField.cs
@@ -1,5 +1,6 @@ using System.Collections.Generic; using UnityEngine; using System; public class BattleField { @@ -39,7 +40,7 @@ { return m_IsPause; } protected set set { m_IsPause = value; @@ -51,12 +52,16 @@ { ResumeGame(); } OnBattlePause?.Invoke(m_IsPause); } } public BattleRootNode battleRootNode; private BattleMode battleMode; public Action<bool> OnBattlePause; public virtual void Init(TeamBase _redTeam, TeamBase _blueTeam) { @@ -147,6 +152,8 @@ protected virtual void PauseGame() { // 怎么通知界面暂停了呢? battleObjMgr.PauseGame(); recordPlayer.PauseGame(); } Main/System/Battle/BattleHUDWin.cs
@@ -26,6 +26,10 @@ public Transform buffLabelNode; private BattleField battleField; private List<DamageContent> damageContentList = new List<DamageContent>(); // 生命周期 protected override void InitComponent() { @@ -60,6 +64,8 @@ protected override void OnClose() { base.OnClose(); battleField.OnBattlePause -= OnBattlePause; battleField = null; } protected override void NextFrameAfterOpen() @@ -72,13 +78,20 @@ base.CompleteClose(); } private void RemoveDamageContent(DamageContent content) { damageContentList.Remove(content); damagePrefabPool.Release(content.gameObject); } private void OnDamageTaken(BattleObject bo, List<int> damageList) { GameObject damageContent = damagePrefabPool.Request(); DamageContent content = damageContent.GetComponent<DamageContent>(); damageContent.transform.SetParent(damageNode, false); damageContent.transform.localPosition = new Vector3(damageContent.transform.localPosition.x, damageContent.transform.localPosition.y, 0); content.SetDamage(damageList, () => damagePrefabPool.Release(damageContent)); content.SetDamage(damageList, () => RemoveDamageContent(content)); damageContentList.Add(content); // heroGo 的 parent 作为参考节点 var heroGo = bo.heroGo; @@ -116,4 +129,35 @@ { } public void SetBattleField(BattleField _battleField) { if (battleField != null) { battleField.OnBattlePause -= OnBattlePause; } battleField = _battleField; battleField.OnBattlePause += OnBattlePause; } private void OnBattlePause(bool isPause) { // 游戏暂停 if (isPause) { foreach (var content in damageContentList) { content.Stop(); } } // 游戏恢复 else { foreach (var content in damageContentList) { content.Resume(); } } } } Main/System/Battle/BattleWin.cs
@@ -12,11 +12,28 @@ private BattleRootNode battleRootNode = null; public Button btnStop; private BattleField battleField; // 生命周期 protected override void InitComponent() { base.InitComponent(); // 初始化组件引用 绑定按钮等UI组件事件 btnStop.AddListener(PauseGame); } private void PauseGame() { Debug.LogError("PauseeGame"); if (null == battleField) return; battleField.IsPause = !battleField.IsPause; Debug.LogError(" is pause " + battleField.IsPause.ToString()); } protected override void OnPreOpen() @@ -25,8 +42,7 @@ SetBattleField(BattleManager.Instance.storyBattleField); if (!UIManager.Instance.GetUI<BattleHUDWin>()) UIManager.Instance.OpenWindow<BattleHUDWin>(); } protected override void OnPreClose() @@ -48,6 +64,8 @@ { battleRootNode.transform.SetParent(null); } battleField = null; } protected override void NextFrameAfterOpen() @@ -60,8 +78,9 @@ base.CompleteClose(); } public void SetBattleField(BattleField battleField) public void SetBattleField(BattleField _battleField) { battleField = _battleField; if (battleRootNode != null) { battleRootNode.transform.SetParent(Launch.Instance.transform); @@ -72,5 +91,14 @@ battleRootNode.transform.SetParent(mountPoint); battleRootNode.transform.localPosition = Vector3.zero; battleRootNode.transform.localScale = Vector3.one; BattleHUDWin ui = UIManager.Instance.GetUI<BattleHUDWin>(); if (null == ui) { ui = UIManager.Instance.OpenWindow<BattleHUDWin>(); } ui.SetBattleField(battleField); } } Main/System/Battle/UIComp/DamageContent.cs
@@ -38,4 +38,14 @@ posTween.Play(_onComplete); } public void Stop() { posTween.Stop(); } public void Resume() { posTween.Resume(); } }