From 71f5735a23452ed8299a19342625a1c0b4cf5b2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A3=AE2003?= <2384017988@qq.com> Date: Sat, 25 Apr 2026 18:53:04 +0800 Subject: [PATCH] 1 --- Assets/Art/HHWK/anim/coin/diaoluo.anim | 9 +- .../Framework/Tool/RedPacket/LayeredPool.cs | 8 +- Assets/MyGame/Scenes/UIScene.unity | 14 +- .../Characters/Monster/MonsterContral.cs | 5 +- .../Monster/MonsterControl_BossBase.cs | 27 +- .../Scripts/Manager/CreateFishManager.cs | 78 +++-- Assets/MyGame/Scripts/Manager/GameManager.cs | 7 +- .../Scripts/Net/WebResponses/SyncGameData.cs | 6 +- .../aa/Game/DefaultDieEffect/AnimEvent.meta | 8 + .../AnimEvent/ScoreNumEvent.cs | 19 + .../AnimEvent/ScoreNumEvent.cs.meta | 11 + .../DefaultDieEffect/AnimEvent/coinEvent.cs | 31 ++ .../AnimEvent/coinEvent.cs.meta | 11 + .../aa/Game/DefaultDieEffect/Coin.prefab | 326 ++++++++++-------- .../aa/Game/DefaultDieEffect/CoinScript.cs | 38 +- .../aa/Game/DefaultDieEffect}/ScoreNum.anim | 9 +- .../Game/DefaultDieEffect}/ScoreNum.anim.meta | 0 .../DefaultDieEffect}/ScoreNum.controller | 0 .../ScoreNum.controller.meta | 0 .../aa/Game/DefaultDieEffect}/ScoreNum.prefab | 0 .../DefaultDieEffect}/ScoreNum.prefab.meta | 0 .../DefaultDieEffect}/ScoreNumScroll.prefab | 0 .../ScoreNumScroll.prefab.meta | 0 .../aa/Game/HHWK/Boss/ChangE/HHWK_CE_Boss.cs | 1 + Assets/MyGame/aa/Game/HHWK/Boss/Image.prefab | 2 +- .../Game177_tieshangongzhu.prefab | 58 ++++ .../Boss/TieShanGongZhu/HHWK_TSGZ_Boss.cs | 82 +++++ .../TieShanGongZhu/HHWK_TSGZ_Boss.cs.meta | 11 + .../HHWK/Boss/XiaoBaiLong/HHWK_BLM_Boss.cs | 2 +- .../aa/UI/Game/GameMainPanel_FishBase.cs | 2 +- .../SelectGameLeave/HHWK/Leave2.renderTexture | 2 +- .../SelectGameLeave/HHWK/Leave3.renderTexture | 2 +- .../aa/UI/Home/Sub/SelectRoomPanel.prefab | 130 +------ .../Assembly-CSharp/Eff_changE_SkillEvent.cs | 1 + 34 files changed, 585 insertions(+), 315 deletions(-) create mode 100644 Assets/MyGame/aa/Game/DefaultDieEffect/AnimEvent.meta create mode 100644 Assets/MyGame/aa/Game/DefaultDieEffect/AnimEvent/ScoreNumEvent.cs create mode 100644 Assets/MyGame/aa/Game/DefaultDieEffect/AnimEvent/ScoreNumEvent.cs.meta create mode 100644 Assets/MyGame/aa/Game/DefaultDieEffect/AnimEvent/coinEvent.cs create mode 100644 Assets/MyGame/aa/Game/DefaultDieEffect/AnimEvent/coinEvent.cs.meta rename Assets/{Art/HHWK/anim/coin => MyGame/aa/Game/DefaultDieEffect}/ScoreNum.anim (98%) rename Assets/{Art/HHWK/anim/coin => MyGame/aa/Game/DefaultDieEffect}/ScoreNum.anim.meta (100%) rename Assets/{Art/HHWK/anim/coin => MyGame/aa/Game/DefaultDieEffect}/ScoreNum.controller (100%) rename Assets/{Art/HHWK/anim/coin => MyGame/aa/Game/DefaultDieEffect}/ScoreNum.controller.meta (100%) rename Assets/{Art/HHWK/prefab/ui => MyGame/aa/Game/DefaultDieEffect}/ScoreNum.prefab (100%) rename Assets/{Art/HHWK/prefab/ui => MyGame/aa/Game/DefaultDieEffect}/ScoreNum.prefab.meta (100%) rename Assets/{Art/HHWK/prefab/ui => MyGame/aa/Game/DefaultDieEffect}/ScoreNumScroll.prefab (100%) rename Assets/{Art/HHWK/prefab/ui => MyGame/aa/Game/DefaultDieEffect}/ScoreNumScroll.prefab.meta (100%) create mode 100644 Assets/MyGame/aa/Game/HHWK/Boss/TieShanGongZhu/HHWK_TSGZ_Boss.cs create mode 100644 Assets/MyGame/aa/Game/HHWK/Boss/TieShanGongZhu/HHWK_TSGZ_Boss.cs.meta diff --git a/Assets/Art/HHWK/anim/coin/diaoluo.anim b/Assets/Art/HHWK/anim/coin/diaoluo.anim index e89af63f0..400f55df3 100644 --- a/Assets/Art/HHWK/anim/coin/diaoluo.anim +++ b/Assets/Art/HHWK/anim/coin/diaoluo.anim @@ -474,4 +474,11 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 1 + functionName: HuiShou + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Framework/Tool/RedPacket/LayeredPool.cs b/Assets/Framework/Tool/RedPacket/LayeredPool.cs index cca8938d8..fc653c3b7 100644 --- a/Assets/Framework/Tool/RedPacket/LayeredPool.cs +++ b/Assets/Framework/Tool/RedPacket/LayeredPool.cs @@ -8,7 +8,7 @@ public class LayeredPool game = new CascadeRedPacketInt(poolNum, prizeCount); } CascadeRedPacketInt game; - public List BossGlodCoin(int count) + public List BossGlodCoin(int count,Vector3 v3Point) { if (game.HasNext()) { @@ -19,12 +19,12 @@ public class LayeredPool // 传入动态的个数 List result = game.GrabFullCycle(currentSubCount); - CreateFishManager.Instance.SyncGameData_SendRendromDieFishID(currentSubCount, result); + CreateFishManager.Instance.SyncGameData_SendRendromDieFishID(currentSubCount, result, v3Point); return result; } return null; } - public List BossGlodCoinRandrom(int min=3,int max=8) + public List BossGlodCoinRandrom(Vector3 v3Point, int min=3,int max=8) { if (game.HasNext()) { @@ -35,7 +35,7 @@ public class LayeredPool // 传入动态的个数 List result = game.GrabFullCycle(currentSubCount); - CreateFishManager.Instance.SyncGameData_SendRendromDieFishID(currentSubCount, result); + CreateFishManager.Instance.SyncGameData_SendRendromDieFishID(currentSubCount, result, v3Point); return result; } return null; diff --git a/Assets/MyGame/Scenes/UIScene.unity b/Assets/MyGame/Scenes/UIScene.unity index 1dbad4405..e0f18d398 100644 --- a/Assets/MyGame/Scenes/UIScene.unity +++ b/Assets/MyGame/Scenes/UIScene.unity @@ -16360,6 +16360,7 @@ MonoBehaviour: diamondShopConfigs: [] scene: m_Handle: 0 + cameraShake: {fileID: 0} btn_Skip: {fileID: 1819495568} startVideoClip: {fileID: 32900000, guid: 029dc73b392ceec4fbde610235b81a08, type: 3} --- !u!114 &2075409198 @@ -16404,7 +16405,8 @@ MonoBehaviour: currGameType: {fileID: 0} dieFXPrefab: {fileID: 6304718870697136037, guid: 81d9913b840dd1e4d9801e06ed16d14e, type: 3} - dieFXPrefabAward: {fileID: 0} + dieFXPrefabAward: {fileID: 8222732459988217625, guid: eff863ba1247d8e4d8a936331777e1c8, + type: 3} dieFXPrefabAwardTmp: {fileID: 6975063179180105496, guid: 3098188d5a351294099bcec3fd687086, type: 3} fishRoot: {fileID: 0} @@ -16503,6 +16505,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1096182889} m_Modifications: + - target: {fileID: -3572846485862770458, guid: eff863ba1247d8e4d8a936331777e1c8, + type: 3} + propertyPath: tMP_CoinCount + value: + objectReference: {fileID: 0} - target: {fileID: 4465188864695660331, guid: eff863ba1247d8e4d8a936331777e1c8, type: 3} propertyPath: m_AnchorMax.y @@ -16548,6 +16555,11 @@ PrefabInstance: propertyPath: m_Name value: Coin objectReference: {fileID: 0} + - target: {fileID: 8222732459988217625, guid: eff863ba1247d8e4d8a936331777e1c8, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8236831357060171625, guid: eff863ba1247d8e4d8a936331777e1c8, type: 3} propertyPath: m_Name diff --git a/Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs b/Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs index ea637f6fd..d2c392d0a 100644 --- a/Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs +++ b/Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs @@ -90,7 +90,6 @@ public class MonsterContral : MonoBehaviour default: break; } - fishenum = (FishTypeEnum)monsterData.fishTypeConfig.fishType; switch (fishenum) { case FishTypeEnum.普通鱼: @@ -110,7 +109,7 @@ public class MonsterContral : MonoBehaviour break; } } - public void OnDestroy() + public virtual void OnDestroy() { if (CreateFishManager.Instance.fishDatas_hashCodekey.ContainsKey(guid)) { @@ -137,7 +136,6 @@ public class MonsterContral : MonoBehaviour hurt = t.gameObject; hurt.SetActive(false); } - } public void OnHurt() { @@ -168,6 +166,7 @@ public class MonsterContral : MonoBehaviour ChangeState(CharacterStateType.move); uirootRect = UIManager.Instance.uiRoot.GetComponent(); mainCamera = Camera.main; + fishenum = (FishTypeEnum)monsterData.fishTypeConfig.fishType; } public virtual void OnMoveEnter() { diff --git a/Assets/MyGame/Scripts/Characters/Monster/MonsterControl_BossBase.cs b/Assets/MyGame/Scripts/Characters/Monster/MonsterControl_BossBase.cs index be5a2a3f5..9ffc4192e 100644 --- a/Assets/MyGame/Scripts/Characters/Monster/MonsterControl_BossBase.cs +++ b/Assets/MyGame/Scripts/Characters/Monster/MonsterControl_BossBase.cs @@ -1,10 +1,14 @@ -using System.Collections; +using Assets.MyGame.Scripts.Net.APIResponses.Enum; +using DG.Tweening; +using System; +using System.Collections; using System.Collections.Generic; using TMPro; using UnityEngine; using UnityEngine.AddressableAssets; using UnityEngine.ResourceManagement.AsyncOperations; using static MonsterMoveLine; +using Random = UnityEngine.Random; public class MonsterControl_BossBase : MonsterContral { @@ -17,6 +21,7 @@ public class MonsterControl_BossBase : MonsterContral public long bossScoreValue=0;//boss分数 public int poolNum;//奖池 public int prizeCount;//奖励数量 + public Action JiaFen; public override void Awake() { @@ -33,7 +38,8 @@ public class MonsterControl_BossBase : MonsterContral { tMP_CurrBossScore = Instantiate(CreateFishManager.Instance.dieFXPrefabAwardTmp, CreateFishManager.Instance.currGameType.subPanelParent).transform.GetChild(0).GetComponent(); } - var v = layeredPool.BossGlodCoinRandrom(); + + var v = layeredPool.BossGlodCoinRandrom(tMP_CurrBossScore.transform.position); foreach (var item in v) { bossScoreValue += item.Amount; @@ -53,7 +59,7 @@ public class MonsterControl_BossBase : MonsterContral { tMP_CurrBossScore = Instantiate(CreateFishManager.Instance.dieFXPrefabAwardTmp, CreateFishManager.Instance.currGameType.subPanelParent).transform.GetChild(0).GetComponent(); } - var v = layeredPool.BossGlodCoin(sss); + var v = layeredPool.BossGlodCoin(sss, tMP_CurrBossScore.transform.position); foreach (var item in v) { bossScoreValue += item.Amount; @@ -62,7 +68,7 @@ public class MonsterControl_BossBase : MonsterContral } IEnumerator ShowBigPrize(long turretNum) { - + yield return new WaitForSeconds(1); turretNum =Random.Range((int)(turretNum/2), (int)turretNum+1); while (currBossScoreValue < bossScoreValue) { @@ -82,10 +88,11 @@ public class MonsterControl_BossBase : MonsterContral } public async override void Init(string pathId, float Time, bool isyuzhen = false, string yzID = "") { + isyz = isyuzhen; this.yzID = yzID; - + //播报 switch (GameManager.Instance.gameData.currGameType) { @@ -140,5 +147,15 @@ public class MonsterControl_BossBase : MonsterContral BezierCurveData bezierCurveData = MonsterMoveLine.dic_BezierCurveDatas[bossName + pathId]; monsterData.moveLine.Init(bezierCurveData, Time); } + public override void OnDestroy() + { + base.OnDestroy(); + tMP_CurrBossScore.transform.parent.DOMove(CreateFishManager.Instance.currGameType.currSitData.tMP_GoldNum.transform.position, 0.5f).OnComplete(() => + { + JiaFen?.Invoke(); + + Destroy(tMP_CurrBossScore.transform.parent.gameObject); + }); + } } diff --git a/Assets/MyGame/Scripts/Manager/CreateFishManager.cs b/Assets/MyGame/Scripts/Manager/CreateFishManager.cs index 988f21734..1d4722523 100644 --- a/Assets/MyGame/Scripts/Manager/CreateFishManager.cs +++ b/Assets/MyGame/Scripts/Manager/CreateFishManager.cs @@ -920,7 +920,7 @@ public class CreateFishManager : MonoSingleton /// /// /// - public List SyncGameData_SendRendromDieFishID(int count,List coinNum) + public List SyncGameData_SendRendromDieFishID(int count,List coinNum,Vector3 v3Point) { @@ -958,6 +958,9 @@ public class CreateFishManager : MonoSingleton time = BeijingTimeManager.Instance.CurrentTimestampMs, frameData = new FrameData_RandomDieFish { + x=v3Point.x, + y=v3Point.y, + z=v3Point.z, guids = list, coinNum= coinNum, count = count @@ -979,7 +982,7 @@ public class CreateFishManager : MonoSingleton fishDatas_hashCodekey.Remove(fishId); } } - public void Id_DieFish_FX(string fishId, RedPacketRecord coinNum) + public void Id_DieFish_FX(string fishId, RedPacketRecord coinNum, Vector3 v3Point) { if (fishDatas_hashCodekey.ContainsKey(fishId)) { @@ -992,7 +995,14 @@ public class CreateFishManager : MonoSingleton { var award = Instantiate(monster.effect_DieAward == null ? dieFXPrefabAward : monster.effect_DieAward, currGameType.subPanelParent.parent); award.GetComponent().anchoredPosition =CoordinateTransformation.WorldPos_ToCanvas(monster.transform.position, UIManager.Instance.uiRoot.GetComponent()); - award.transform.GetChild(2).GetComponent().text = coinNum.Amount.ToString(); + var coinScript = award.GetComponent(); + Transform tra= new GameObject().transform; + tra.position = v3Point; + tra.parent = coinScript.transform; + coinScript.endPoint = tra; + coinScript.isBoss=true; + coinScript.SetCoinCount(coinNum.Amount); + //award.transform.GetChild(2).GetComponent().text = coinNum.Amount.ToString(); } @@ -1018,11 +1028,11 @@ public class CreateFishManager : MonoSingleton } } - public void Id_DieListFish_FX(List ids, List coinNum) + public void Id_DieListFish_FX(List ids, List coinNum,Vector3 v3Point) { for (int i = 0; i < ids.Count; i++) { - Id_DieFish_FX(ids[i], coinNum[i]); + Id_DieFish_FX(ids[i], coinNum[i], v3Point); } } @@ -1030,27 +1040,10 @@ public class CreateFishManager : MonoSingleton { var killFish = JsonConvert.DeserializeObject>(msg).arguments[0]; Debug.Log("时间123：" + (DateTimeOffset.Now.ToUnixTimeSeconds() - killFish.timespan) + "秒"); - if (fishDatas_hashCodekey.ContainsKey(killFish.fishId)) + List list = null; + + Action a = () => { - AudioManager.Instance.PlayerFX(60004); - var monster = fishDatas_hashCodekey[killFish.fishId]; - Instantiate(monster.effect_Die == null ? dieFXPrefab : monster.effect_Die, monster.transform.position, Quaternion.identity, transform.parent); - if (monster.effect_DieAward == null&& monster.fishenum != FishTypeEnum.Boss鱼) - { - var award = Instantiate(monster.effect_DieAward == null ? dieFXPrefabAward : monster.effect_DieAward, currGameType.subPanelParent.parent); - award.GetComponent().anchoredPosition = CoordinateTransformation.WorldPos_ToCanvas(monster.transform.position, UIManager.Instance.uiRoot.GetComponent()); - award.transform.GetChild(2).GetComponent().text = killFish.gold.ToString(); - - } - - MonsterDieList.Instance.SmallHuangYiHuang(monster.transform.position, monster.monsterData.fishTypeConfig.fishNumber, 1000); - //Destroy(monster.gameObject); - monster.DieFish(killFish); - - fishDatas_hashCodekey.Remove(killFish.fishId); - - //GameManager.Instance.gameData.roomJoinNotice.gold += killFish.gold; - List list = null; switch (GameManager.Instance.gameData.currGameType) { @@ -1091,6 +1084,41 @@ public class CreateFishManager : MonoSingleton } } } + }; + if (fishDatas_hashCodekey.ContainsKey(killFish.fishId)) + { + AudioManager.Instance.PlayerFX(60004); + var monster = fishDatas_hashCodekey[killFish.fishId]; + Instantiate(monster.effect_Die == null ? dieFXPrefab : monster.effect_Die, monster.transform.position, Quaternion.identity, transform.parent); + if (monster.fishenum != FishTypeEnum.Boss鱼) + { + + + var award = Instantiate(monster.effect_DieAward == null ? dieFXPrefabAward : monster.effect_DieAward, currGameType.subPanelParent.parent); + award.GetComponent().anchoredPosition = CoordinateTransformation.WorldPos_ToCanvas(monster.transform.position, UIManager.Instance.uiRoot.GetComponent()); + var coinScript = award.GetComponent(); + coinScript.endPoint = currGameType.currSitData.transform; + coinScript.isBoss = false; + coinScript.SetCoinCount(killFish.gold); + coinScript.JiaFen = a; + + } + else + { + ((MonsterControl_BossBase)monster).tMP_CurrBossScore = Instantiate(monster.effect_DieAward == null ? dieFXPrefabAwardTmp : monster.effect_DieAward, currGameType.subPanelParent.parent).transform.GetChild(0).GetComponent(); + ((MonsterControl_BossBase)monster).JiaFen = a; + + } + + + MonsterDieList.Instance.SmallHuangYiHuang(monster.transform.position, monster.monsterData.fishTypeConfig.fishNumber, 1000); + //Destroy(monster.gameObject); + monster.DieFish(killFish); + + fishDatas_hashCodekey.Remove(killFish.fishId); + + //GameManager.Instance.gameData.roomJoinNotice.gold += killFish.gold; + } } diff --git a/Assets/MyGame/Scripts/Manager/GameManager.cs b/Assets/MyGame/Scripts/Manager/GameManager.cs index 7e61f3384..7126e6e8c 100644 --- a/Assets/MyGame/Scripts/Manager/GameManager.cs +++ b/Assets/MyGame/Scripts/Manager/GameManager.cs @@ -1,6 +1,6 @@ using Assets.MyGame.Scripts.Net; using Assets.MyGame.Scripts.Net.API; -// using CameraShake; +using CameraShake; using Newtonsoft.Json; using System; using UnityEngine; @@ -16,7 +16,7 @@ public class GameManager : MonoSingleton public UserData user; public GameData gameData = new GameData(); public Scene scene; - // public CameraShaker cameraShake; + public CameraShaker cameraShake; // // 指定此方法在加载时立即调用，在显示启动动画前之前执行 // [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSplashScreen)] // private static void BeforeSplashScreen() @@ -49,10 +49,9 @@ public class GameManager : MonoSingleton Application.runInBackground = true; base.Awake(); - // cameraShake = Camera.main.GetComponent(); + cameraShake = Camera.main.GetComponent(); gameData.currUser = "123"; //string json = Resources.Load("Config/GameConfig").text; - //gameConfig = JsonConvert.DeserializeObject>(json).data; APIManager.Response(APIType.GameConfig_Get, res => { gameConfig = res; var v = CreateFishManager.Instance.CreateDic; }); diff --git a/Assets/MyGame/Scripts/Net/WebResponses/SyncGameData.cs b/Assets/MyGame/Scripts/Net/WebResponses/SyncGameData.cs index ee6b39215..c213da38f 100644 --- a/Assets/MyGame/Scripts/Net/WebResponses/SyncGameData.cs +++ b/Assets/MyGame/Scripts/Net/WebResponses/SyncGameData.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using UnityEngine; namespace Assets.MyGame.Scripts.Net.WebResponses { @@ -29,7 +30,7 @@ namespace Assets.MyGame.Scripts.Net.WebResponses public int sitPos; public FrameDataType frameType; public long time; - public Object frameData; + public object frameData; } [Serializable] @@ -68,6 +69,9 @@ namespace Assets.MyGame.Scripts.Net.WebResponses [Serializable] public class FrameData_RandomDieFish : FrameData { + public float x; + public float y; + public float z; public List guids=new List(); public List coinNum=new List(); public int count; diff --git a/Assets/MyGame/aa/Game/DefaultDieEffect/AnimEvent.meta b/Assets/MyGame/aa/Game/DefaultDieEffect/AnimEvent.meta new file mode 100644 index 000000000..4456bd339 --- /dev/null +++ b/Assets/MyGame/aa/Game/DefaultDieEffect/AnimEvent.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d5599c7f870ffd344b930e235ad446a8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/DefaultDieEffect/AnimEvent/ScoreNumEvent.cs b/Assets/MyGame/aa/Game/DefaultDieEffect/AnimEvent/ScoreNumEvent.cs new file mode 100644 index 000000000..1d28f885d --- /dev/null +++ b/Assets/MyGame/aa/Game/DefaultDieEffect/AnimEvent/ScoreNumEvent.cs @@ -0,0 +1,19 @@ +using DG.Tweening; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ScoreNumEvent : MonoBehaviour +{ + CoinScript coinScript; + + private void Awake() + { + coinScript =transform.parent. GetComponent(); + } + public void eventShowCoin() + { + gameObject.SetActive(false); + coinScript.gold.SetActive(true); + } +} diff --git a/Assets/MyGame/aa/Game/DefaultDieEffect/AnimEvent/ScoreNumEvent.cs.meta b/Assets/MyGame/aa/Game/DefaultDieEffect/AnimEvent/ScoreNumEvent.cs.meta new file mode 100644 index 000000000..87e4835b5 --- /dev/null +++ b/Assets/MyGame/aa/Game/DefaultDieEffect/AnimEvent/ScoreNumEvent.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e68406c654e4a624bbfaf6191094ba67 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/DefaultDieEffect/AnimEvent/coinEvent.cs b/Assets/MyGame/aa/Game/DefaultDieEffect/AnimEvent/coinEvent.cs new file mode 100644 index 000000000..ab65aa903 --- /dev/null +++ b/Assets/MyGame/aa/Game/DefaultDieEffect/AnimEvent/coinEvent.cs @@ -0,0 +1,31 @@ +using DG.Tweening; +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class coinEvent : MonoBehaviour +{ + CoinScript coinScript; + + private void Awake() + { + coinScript =transform.parent. GetComponent(); + } + public void HuiShou() + { + //回收 + coinScript.transform.DOMove(coinScript.endPoint.position, 0.5f).OnComplete(() => + { + //加分 + if (coinScript.isBoss) + { + } + else + { + coinScript.JiaFen?.Invoke(); + } + Destroy(coinScript.gameObject); + }); + } +} diff --git a/Assets/MyGame/aa/Game/DefaultDieEffect/AnimEvent/coinEvent.cs.meta b/Assets/MyGame/aa/Game/DefaultDieEffect/AnimEvent/coinEvent.cs.meta new file mode 100644 index 000000000..ea6057fa1 --- /dev/null +++ b/Assets/MyGame/aa/Game/DefaultDieEffect/AnimEvent/coinEvent.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f72b9819c54a5cb4782b1aefe4753be6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/DefaultDieEffect/Coin.prefab b/Assets/MyGame/aa/Game/DefaultDieEffect/Coin.prefab index 9570d1111..bfe6f8636 100644 --- a/Assets/MyGame/aa/Game/DefaultDieEffect/Coin.prefab +++ b/Assets/MyGame/aa/Game/DefaultDieEffect/Coin.prefab @@ -12,13 +12,14 @@ GameObject: - component: {fileID: 7617333372803733935} - component: {fileID: 2327506323784387051} - component: {fileID: 8948124406826948487} + - component: {fileID: 1666793737026763570} m_Layer: 5 m_Name: Gold m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3252193072664515267 RectTransform: m_ObjectHideFlags: 0 @@ -94,6 +95,18 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &1666793737026763570 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 261762419476206530} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f72b9819c54a5cb4782b1aefe4753be6, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2042861085145573955 GameObject: m_ObjectHideFlags: 0 @@ -362,141 +375,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!1 &3495483622868585844 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5005789075103606374} - - component: {fileID: 8767147459659216070} - - component: {fileID: 1053237780911962701} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5005789075103606374 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3495483622868585844} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8802702133347106559} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.0000038146973, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8767147459659216070 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3495483622868585844} - m_CullTransparentMesh: 1 ---- !u!114 &1053237780911962701 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3495483622868585844} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: 1234567890 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2} - m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 11400000, guid: aa8990c831ea83645802f2c34dd9db45, type: 2} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 38.72 - m_fontSizeBase: 38.72 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &8222732459988217625 GameObject: m_ObjectHideFlags: 0 @@ -528,7 +406,7 @@ RectTransform: m_Children: - {fileID: 3252193072664515267} - {fileID: 4141654619161611748} - - {fileID: 5005789075103606374} + - {fileID: 5505894292012839837} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -548,6 +426,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 540f6a1a7e166cb4eb9be92d7fa80066, type: 3} m_Name: m_EditorClassIdentifier: + tMP_CoinCount: {fileID: 5050591925468082569} + gold: {fileID: 261762419476206530} + silver: {fileID: 2042861085145573955} + endPoint: {fileID: 0} + isBoss: 0 --- !u!1 &8236831357060171625 GameObject: m_ObjectHideFlags: 0 @@ -581,9 +464,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 3252193072664515267} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 214.5436, y: -50} m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4330466387219907929 @@ -742,3 +625,166 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!1001 &8737050817608563627 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8802702133347106559} + m_Modifications: + - target: {fileID: 3830558608624355382, guid: 9ba3090b45c21ec46931e999ea1fe73f, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3830558608624355382, guid: 9ba3090b45c21ec46931e999ea1fe73f, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3830558608624355382, guid: 9ba3090b45c21ec46931e999ea1fe73f, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3830558608624355382, guid: 9ba3090b45c21ec46931e999ea1fe73f, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3830558608624355382, guid: 9ba3090b45c21ec46931e999ea1fe73f, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3830558608624355382, guid: 9ba3090b45c21ec46931e999ea1fe73f, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3830558608624355382, guid: 9ba3090b45c21ec46931e999ea1fe73f, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3830558608624355382, guid: 9ba3090b45c21ec46931e999ea1fe73f, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3830558608624355382, guid: 9ba3090b45c21ec46931e999ea1fe73f, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3830558608624355382, guid: 9ba3090b45c21ec46931e999ea1fe73f, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3830558608624355382, guid: 9ba3090b45c21ec46931e999ea1fe73f, + type: 3} + propertyPath: m_LocalPosition.z + value: -41.857994 + objectReference: {fileID: 0} + - target: {fileID: 3830558608624355382, guid: 9ba3090b45c21ec46931e999ea1fe73f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3830558608624355382, guid: 9ba3090b45c21ec46931e999ea1fe73f, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3830558608624355382, guid: 9ba3090b45c21ec46931e999ea1fe73f, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3830558608624355382, guid: 9ba3090b45c21ec46931e999ea1fe73f, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3830558608624355382, guid: 9ba3090b45c21ec46931e999ea1fe73f, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 101 + objectReference: {fileID: 0} + - target: {fileID: 3830558608624355382, guid: 9ba3090b45c21ec46931e999ea1fe73f, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -197 + objectReference: {fileID: 0} + - target: {fileID: 3830558608624355382, guid: 9ba3090b45c21ec46931e999ea1fe73f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3830558608624355382, guid: 9ba3090b45c21ec46931e999ea1fe73f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3830558608624355382, guid: 9ba3090b45c21ec46931e999ea1fe73f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4564244244925188642, guid: 9ba3090b45c21ec46931e999ea1fe73f, + type: 3} + propertyPath: m_text + value: + objectReference: {fileID: 0} + - target: {fileID: 7044512090211664971, guid: 9ba3090b45c21ec46931e999ea1fe73f, + type: 3} + propertyPath: m_Name + value: ScoreNum + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7044512090211664971, guid: 9ba3090b45c21ec46931e999ea1fe73f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8960668438892312864} + m_SourcePrefab: {fileID: 100100000, guid: 9ba3090b45c21ec46931e999ea1fe73f, type: 3} +--- !u!1 &1766289570986131424 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7044512090211664971, guid: 9ba3090b45c21ec46931e999ea1fe73f, + type: 3} + m_PrefabInstance: {fileID: 8737050817608563627} + m_PrefabAsset: {fileID: 0} +--- !u!114 &8960668438892312864 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1766289570986131424} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e68406c654e4a624bbfaf6191094ba67, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &5050591925468082569 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4564244244925188642, guid: 9ba3090b45c21ec46931e999ea1fe73f, + type: 3} + m_PrefabInstance: {fileID: 8737050817608563627} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &5505894292012839837 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3830558608624355382, guid: 9ba3090b45c21ec46931e999ea1fe73f, + type: 3} + m_PrefabInstance: {fileID: 8737050817608563627} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/MyGame/aa/Game/DefaultDieEffect/CoinScript.cs b/Assets/MyGame/aa/Game/DefaultDieEffect/CoinScript.cs index f3adc793b..8c80c72b3 100644 --- a/Assets/MyGame/aa/Game/DefaultDieEffect/CoinScript.cs +++ b/Assets/MyGame/aa/Game/DefaultDieEffect/CoinScript.cs @@ -1,8 +1,44 @@ +using System; using System.Collections; using System.Collections.Generic; +using TMPro; using UnityEngine; public class CoinScript : MonoBehaviour { - + public TextMeshProUGUI tMP_CoinCount; + public GameObject gold; + public GameObject silver; + public Transform endPoint; + public bool isBoss; + public Action JiaFen; + public void SetCoinCount(int count) + { + tMP_CoinCount.text = NumAdd(count.ToString()); + } + public static string NumAdd(string num) + { + string str= $""; + int a = num.Length; + bool isDouHao= false ; + if (a >= 4) + { + //""; + a-=3; + isDouHao = true; + } + for (int i = 0; i < num.Length; i++) + { + if (isDouHao) + { + if (i == a) + { + str += ""; + } + } + + str += $"" ; + } + return str; + } } diff --git a/Assets/Art/HHWK/anim/coin/ScoreNum.anim b/Assets/MyGame/aa/Game/DefaultDieEffect/ScoreNum.anim similarity index 98% rename from Assets/Art/HHWK/anim/coin/ScoreNum.anim rename to Assets/MyGame/aa/Game/DefaultDieEffect/ScoreNum.anim index a85f70349..45761dc63 100644 --- a/Assets/Art/HHWK/anim/coin/ScoreNum.anim +++ b/Assets/MyGame/aa/Game/DefaultDieEffect/ScoreNum.anim @@ -405,4 +405,11 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.8666667 + functionName: eventShowCoin + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Art/HHWK/anim/coin/ScoreNum.anim.meta b/Assets/MyGame/aa/Game/DefaultDieEffect/ScoreNum.anim.meta similarity index 100% rename from Assets/Art/HHWK/anim/coin/ScoreNum.anim.meta rename to Assets/MyGame/aa/Game/DefaultDieEffect/ScoreNum.anim.meta diff --git a/Assets/Art/HHWK/anim/coin/ScoreNum.controller b/Assets/MyGame/aa/Game/DefaultDieEffect/ScoreNum.controller similarity index 100% rename from Assets/Art/HHWK/anim/coin/ScoreNum.controller rename to Assets/MyGame/aa/Game/DefaultDieEffect/ScoreNum.controller diff --git a/Assets/Art/HHWK/anim/coin/ScoreNum.controller.meta b/Assets/MyGame/aa/Game/DefaultDieEffect/ScoreNum.controller.meta similarity index 100% rename from Assets/Art/HHWK/anim/coin/ScoreNum.controller.meta rename to Assets/MyGame/aa/Game/DefaultDieEffect/ScoreNum.controller.meta diff --git a/Assets/Art/HHWK/prefab/ui/ScoreNum.prefab b/Assets/MyGame/aa/Game/DefaultDieEffect/ScoreNum.prefab similarity index 100% rename from Assets/Art/HHWK/prefab/ui/ScoreNum.prefab rename to Assets/MyGame/aa/Game/DefaultDieEffect/ScoreNum.prefab diff --git a/Assets/Art/HHWK/prefab/ui/ScoreNum.prefab.meta b/Assets/MyGame/aa/Game/DefaultDieEffect/ScoreNum.prefab.meta similarity index 100% rename from Assets/Art/HHWK/prefab/ui/ScoreNum.prefab.meta rename to Assets/MyGame/aa/Game/DefaultDieEffect/ScoreNum.prefab.meta diff --git a/Assets/Art/HHWK/prefab/ui/ScoreNumScroll.prefab b/Assets/MyGame/aa/Game/DefaultDieEffect/ScoreNumScroll.prefab similarity index 100% rename from Assets/Art/HHWK/prefab/ui/ScoreNumScroll.prefab rename to Assets/MyGame/aa/Game/DefaultDieEffect/ScoreNumScroll.prefab diff --git a/Assets/Art/HHWK/prefab/ui/ScoreNumScroll.prefab.meta b/Assets/MyGame/aa/Game/DefaultDieEffect/ScoreNumScroll.prefab.meta similarity index 100% rename from Assets/Art/HHWK/prefab/ui/ScoreNumScroll.prefab.meta rename to Assets/MyGame/aa/Game/DefaultDieEffect/ScoreNumScroll.prefab.meta diff --git a/Assets/MyGame/aa/Game/HHWK/Boss/ChangE/HHWK_CE_Boss.cs b/Assets/MyGame/aa/Game/HHWK/Boss/ChangE/HHWK_CE_Boss.cs index 02aacb3de..d36a71b10 100644 --- a/Assets/MyGame/aa/Game/HHWK/Boss/ChangE/HHWK_CE_Boss.cs +++ b/Assets/MyGame/aa/Game/HHWK/Boss/ChangE/HHWK_CE_Boss.cs @@ -13,6 +13,7 @@ public class HHWK_CE_Boss : MonsterControl_BossBase string pathId="2"; public override void DieFish(RoomKillNotice obj = null) { + GameManager.Instance.cameraShake.ShakePresets.Explosion2D(3f, 4f, 1f); if (obj!=null) { poolNum = obj.gold; diff --git a/Assets/MyGame/aa/Game/HHWK/Boss/Image.prefab b/Assets/MyGame/aa/Game/HHWK/Boss/Image.prefab index 203b9c308..a9042d6ea 100644 --- a/Assets/MyGame/aa/Game/HHWK/Boss/Image.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Boss/Image.prefab @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: New Textdadadadadad + m_text: 0 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2} m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a, diff --git a/Assets/MyGame/aa/Game/HHWK/Boss/TieShanGongZhu/Game177_tieshangongzhu.prefab b/Assets/MyGame/aa/Game/HHWK/Boss/TieShanGongZhu/Game177_tieshangongzhu.prefab index af8cf991b..5e79019c0 100644 --- a/Assets/MyGame/aa/Game/HHWK/Boss/TieShanGongZhu/Game177_tieshangongzhu.prefab +++ b/Assets/MyGame/aa/Game/HHWK/Boss/TieShanGongZhu/Game177_tieshangongzhu.prefab @@ -146,6 +146,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3718238474006946628} + - component: {fileID: 2645628529724974914} m_Layer: 0 m_Name: Game177_tieshangongzhu m_TagString: Untagged @@ -170,6 +171,51 @@ Transform: - {fileID: 1654237602664076065} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2645628529724974914 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8237207011005549913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2235b06d58970cb48b252db67d544e70, type: 3} + m_Name: + m_EditorClassIdentifier: + guid: + monsterData: + die_Score: 0 + isDie: 0 + fishTypeConfig: + fishNumber: + fishName: + fishType: 0 + fishScore: 0 + killWeight: 0 + pathList: + skeleton: {fileID: 0} + isSpine: 1 + fishTypeID: + currState: 0 + HP: 5 + effect_Die: {fileID: 0} + effect_DieAward: {fileID: 0} + isMove: 1 + is3D: 0 + forwordXYZ: + fishenum: 0 + moveTime: 0 + isyz: 0 + yzID: + bossName: + tMP_CurrBossScore: {fileID: 0} + currBossScoreValue: 0 + bossScoreValue: 0 + poolNum: 0 + prizeCount: 0 + defaultAnim: {fileID: 5596313341512249453} + skillAnim: {fileID: 1690992969017980382} --- !u!1001 &1655676627107907063 PrefabInstance: m_ObjectHideFlags: 0 @@ -1993,6 +2039,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1655676627107907063} m_PrefabAsset: {fileID: 0} +--- !u!111 &1690992969017980382 stripped +Animation: + m_CorrespondingSourceObject: {fileID: 111948132087033897, guid: d23d6e1670cd5a84ab17f3a17bf2029e, + type: 3} + m_PrefabInstance: {fileID: 1655676627107907063} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5487451525180360845 PrefabInstance: m_ObjectHideFlags: 0 @@ -3836,3 +3888,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5487451525180360845} m_PrefabAsset: {fileID: 0} +--- !u!111 &5596313341512249453 stripped +Animation: + m_CorrespondingSourceObject: {fileID: 111817325062191328, guid: 5a583fd179bb19e4693bdbb25c336cc0, + type: 3} + m_PrefabInstance: {fileID: 5487451525180360845} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/MyGame/aa/Game/HHWK/Boss/TieShanGongZhu/HHWK_TSGZ_Boss.cs b/Assets/MyGame/aa/Game/HHWK/Boss/TieShanGongZhu/HHWK_TSGZ_Boss.cs new file mode 100644 index 000000000..e14558139 --- /dev/null +++ b/Assets/MyGame/aa/Game/HHWK/Boss/TieShanGongZhu/HHWK_TSGZ_Boss.cs @@ -0,0 +1,82 @@ +using Assets.MyGame.Scripts.Net.WebResponses; +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class HHWK_TSGZ_Boss : MonsterControl_BossBase +{ + public Animation defaultAnim; + public Animation skillAnim; + public Action init; + string pathId="2"; + public override void DieFish(RoomKillNotice obj = null) + { + GameManager.Instance.cameraShake.ShakePresets.Explosion2D(3f, 4f, 1f); + if (obj!=null) + { + poolNum = obj.gold; + + } + isMove =false; + //base.DieFish(obj); + transform.position = new Vector3(0, 0, 0); + defaultAnim.transform.parent.gameObject.SetActive(false); + skillAnim.transform.parent.gameObject.SetActive(true); + } + public override void Awake() + { + base.Awake(); + defaultAnim.transform.parent.gameObject.SetActive(true); + skillAnim.transform.parent.gameObject.SetActive(false); + //if (UnityEngine.Random.Range(0,1f)>0.5f) + //{ + // defaultAnim.transform.parent.gameObject.SetActive(true); + // stageAnim.transform.parent.gameObject.SetActive(false); + // skillAnim.transform.parent.gameObject.SetActive(false); + //} + //else + //{ + // defaultAnim.transform.parent.gameObject.SetActive(false); + // stageAnim.transform.parent.gameObject.SetActive(true); + // skillAnim.transform.parent.gameObject.SetActive(false); + //} + } + float setMoveTime=20; + public override void Init(string pathId, float Time, bool isyuzhen = false, string yzID = "") + { + transform.position = new Vector3(0,0,0); + init=(a)=>{ + moveTime = 0; + base.Init(a, setMoveTime, isyuzhen, yzID); + }; + + } + bool isEnd=false; + public override void OnMoveUpdata() + { + + base.OnMoveUpdata(); + if (moveTime>= setMoveTime && pathId=="2") + { + pathId = "3"; + var v = defaultAnim.transform.localScale;v.x=Mathf.Abs(v.x)* -1; + defaultAnim.transform.localScale = v; + init?.Invoke("3"); + + + } + if (moveTime >= setMoveTime&& pathId == "3") + { + if (isEnd) + { + Destroy(gameObject); + } + isEnd=true; + isMove = false; + defaultAnim.CrossFade("leave", 0.3f); + + pathId = "2"; + } + } +} diff --git a/Assets/MyGame/aa/Game/HHWK/Boss/TieShanGongZhu/HHWK_TSGZ_Boss.cs.meta b/Assets/MyGame/aa/Game/HHWK/Boss/TieShanGongZhu/HHWK_TSGZ_Boss.cs.meta new file mode 100644 index 000000000..b469a8e17 --- /dev/null +++ b/Assets/MyGame/aa/Game/HHWK/Boss/TieShanGongZhu/HHWK_TSGZ_Boss.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2235b06d58970cb48b252db67d544e70 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/HHWK/Boss/XiaoBaiLong/HHWK_BLM_Boss.cs b/Assets/MyGame/aa/Game/HHWK/Boss/XiaoBaiLong/HHWK_BLM_Boss.cs index e67a503fa..0ffbf2d5a 100644 --- a/Assets/MyGame/aa/Game/HHWK/Boss/XiaoBaiLong/HHWK_BLM_Boss.cs +++ b/Assets/MyGame/aa/Game/HHWK/Boss/XiaoBaiLong/HHWK_BLM_Boss.cs @@ -43,7 +43,7 @@ public class HHWK_BLM_Boss : MonsterControl_BossBase } public override void DieFish(RoomKillNotice obj = null) { - // GameManager.Instance.cameraShake.ShakePresets.Explosion2D(3f, 4f, 1f); + GameManager.Instance.cameraShake.ShakePresets.Explosion2D(3f, 4f, 1f); ani_LongToLM.SetActive(false); ani_LMDefault.SetActive(false); diff --git a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs index ad06637f4..c67178d7b 100644 --- a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs +++ b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs @@ -651,7 +651,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base { var fireBullet = JsonConvert.DeserializeObject(syncGameData.frameData.ToString()); - CreateFishManager.Instance.Id_DieListFish_FX(fireBullet.guids, fireBullet.coinNum); + CreateFishManager.Instance.Id_DieListFish_FX(fireBullet.guids, fireBullet.coinNum, new Vector3(fireBullet.x, fireBullet.y, fireBullet.z)); } diff --git a/Assets/MyGame/aa/UI/Home/Sub/SelectGameLeave/HHWK/Leave2.renderTexture b/Assets/MyGame/aa/UI/Home/Sub/SelectGameLeave/HHWK/Leave2.renderTexture index 380157add..8b9cf06a7 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/SelectGameLeave/HHWK/Leave2.renderTexture +++ b/Assets/MyGame/aa/UI/Home/Sub/SelectGameLeave/HHWK/Leave2.renderTexture @@ -19,7 +19,7 @@ RenderTexture: m_AntiAliasing: 1 m_MipCount: -1 m_DepthStencilFormat: 94 - m_ColorFormat: 8 + m_ColorFormat: 59 m_MipMap: 0 m_GenerateMips: 1 m_SRGB: 0 diff --git a/Assets/MyGame/aa/UI/Home/Sub/SelectGameLeave/HHWK/Leave3.renderTexture b/Assets/MyGame/aa/UI/Home/Sub/SelectGameLeave/HHWK/Leave3.renderTexture index 0cdba7398..41139e1ff 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/SelectGameLeave/HHWK/Leave3.renderTexture +++ b/Assets/MyGame/aa/UI/Home/Sub/SelectGameLeave/HHWK/Leave3.renderTexture @@ -30,7 +30,7 @@ RenderTexture: m_TextureSettings: serializedVersion: 2 m_FilterMode: 1 - m_Aniso: 1 + m_Aniso: 0 m_MipBias: 0 m_WrapU: 1 m_WrapV: 1 diff --git a/Assets/MyGame/aa/UI/Home/Sub/SelectRoomPanel.prefab b/Assets/MyGame/aa/UI/Home/Sub/SelectRoomPanel.prefab index 1ad2f7dbb..0e9b9e30d 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/SelectRoomPanel.prefab +++ b/Assets/MyGame/aa/UI/Home/Sub/SelectRoomPanel.prefab @@ -513,7 +513,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &9121793279951611368 RectTransform: m_ObjectHideFlags: 0 @@ -1127,7 +1127,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2917311460998279981 RectTransform: m_ObjectHideFlags: 0 @@ -3581,123 +3581,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &4343573450615511109 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2585826173234576045} - - component: {fileID: 5585965331317210970} - - component: {fileID: 3639550495997008779} - - component: {fileID: 8084822276886485941} - m_Layer: 5 - m_Name: RawImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2585826173234576045 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4343573450615511109} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -231} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2396431562569537747} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 471, y: 29} - m_SizeDelta: {x: 250, y: 296} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5585965331317210970 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4343573450615511109} - m_CullTransparentMesh: 1 ---- !u!114 &3639550495997008779 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4343573450615511109} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 8084822276886485941} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &8084822276886485941 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4343573450615511109} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 8400000, guid: 9159ccd05f14e3148acb34306144ae4e, type: 2} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 --- !u!1 &4375718351431026253 GameObject: m_ObjectHideFlags: 0 @@ -3939,7 +3822,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6826483301251516954 RectTransform: m_ObjectHideFlags: 0 @@ -4105,7 +3988,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -284.4, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &853405457746008115 @@ -5792,7 +5675,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5481283056198906482} - - {fileID: 2585826173234576045} m_Father: {fileID: 784280979606033562} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -6878,7 +6760,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3202516677072458269 RectTransform: m_ObjectHideFlags: 0 @@ -8023,7 +7905,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4040551977549150708 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Assembly-CSharp/Eff_changE_SkillEvent.cs b/Assets/Scripts/Assembly-CSharp/Eff_changE_SkillEvent.cs index ae469b0d0..cbdedc593 100644 --- a/Assets/Scripts/Assembly-CSharp/Eff_changE_SkillEvent.cs +++ b/Assets/Scripts/Assembly-CSharp/Eff_changE_SkillEvent.cs @@ -41,6 +41,7 @@ public class Eff_changE_SkillEvent : MonoBehaviour { transform.parent.GetChild(2).gameObject.SetActive(true); hHWK_CE_Boss.BigPrizeAll(); + GameManager.Instance.cameraShake.ShakePresets.Explosion2D(3f, 4f, 1f); } public void eventSkill2End() {