From ff88e535a5e70bf16d1a3a65290bac7e3ad9735d Mon Sep 17 00:00:00 2001 From: "DESKTOP-SAJ6RKV\\Administrator" Date: Tue, 27 May 2025 20:57:48 +0800 Subject: [PATCH] 1 --- .../XNB/{XNB_Red01.prefab => XNB_Red1.prefab} | 2 +- ...XNB_Red01.prefab.meta => XNB_Red1.prefab.meta} | 0 .../XNB/{XNB_Red02.prefab => XNB_Red2.prefab} | 2 +- ...XNB_Red02.prefab.meta => XNB_Red2.prefab.meta} | 0 .../XNB/{XNB_Red03.prefab => XNB_Red3.prefab} | 2 +- ...XNB_Red03.prefab.meta => XNB_Red3.prefab.meta} | 0 .../XNB/{XNB_Red04.prefab => XNB_Red4.prefab} | 2 +- ...XNB_Red04.prefab.meta => XNB_Red4.prefab.meta} | 0 .../XNB/{XNB_Red05.prefab => XNB_Red5.prefab} | 2 +- ...XNB_Red05.prefab.meta => XNB_Red5.prefab.meta} | 0 .../XNB/{XNB_Red06.prefab => XNB_Red6.prefab} | 2 +- ...XNB_Red06.prefab.meta => XNB_Red6.prefab.meta} | 0 .../XNB/{XNB_Red07.prefab => XNB_Red7.prefab} | 2 +- ...XNB_Red07.prefab.meta => XNB_Red7.prefab.meta} | 0 .../XNB/{XNB_Red08.prefab => XNB_Red8.prefab} | 2 +- ...XNB_Red08.prefab.meta => XNB_Red8.prefab.meta} | 0 .../XNB/{XNB_Red09.prefab => XNB_Red9.prefab} | 2 +- ...XNB_Red09.prefab.meta => XNB_Red9.prefab.meta} | 0 .../HotFix/GameLogic/Actor/ActorHItem.cs | 15 ++++++++++++++- 19 files changed, 23 insertions(+), 10 deletions(-) rename UnityProject/Assets/AssetRaw/Effects/XNB/{XNB_Red01.prefab => XNB_Red1.prefab} (99%) rename UnityProject/Assets/AssetRaw/Effects/XNB/{XNB_Red01.prefab.meta => XNB_Red1.prefab.meta} (100%) rename UnityProject/Assets/AssetRaw/Effects/XNB/{XNB_Red02.prefab => XNB_Red2.prefab} (99%) rename UnityProject/Assets/AssetRaw/Effects/XNB/{XNB_Red02.prefab.meta => XNB_Red2.prefab.meta} (100%) rename UnityProject/Assets/AssetRaw/Effects/XNB/{XNB_Red03.prefab => XNB_Red3.prefab} (99%) rename UnityProject/Assets/AssetRaw/Effects/XNB/{XNB_Red03.prefab.meta => XNB_Red3.prefab.meta} (100%) rename UnityProject/Assets/AssetRaw/Effects/XNB/{XNB_Red04.prefab => XNB_Red4.prefab} (99%) rename UnityProject/Assets/AssetRaw/Effects/XNB/{XNB_Red04.prefab.meta => XNB_Red4.prefab.meta} (100%) rename UnityProject/Assets/AssetRaw/Effects/XNB/{XNB_Red05.prefab => XNB_Red5.prefab} (99%) rename UnityProject/Assets/AssetRaw/Effects/XNB/{XNB_Red05.prefab.meta => XNB_Red5.prefab.meta} (100%) rename UnityProject/Assets/AssetRaw/Effects/XNB/{XNB_Red06.prefab => XNB_Red6.prefab} (99%) rename UnityProject/Assets/AssetRaw/Effects/XNB/{XNB_Red06.prefab.meta => XNB_Red6.prefab.meta} (100%) rename UnityProject/Assets/AssetRaw/Effects/XNB/{XNB_Red07.prefab => XNB_Red7.prefab} (99%) rename UnityProject/Assets/AssetRaw/Effects/XNB/{XNB_Red07.prefab.meta => XNB_Red7.prefab.meta} (100%) rename UnityProject/Assets/AssetRaw/Effects/XNB/{XNB_Red08.prefab => XNB_Red8.prefab} (99%) rename UnityProject/Assets/AssetRaw/Effects/XNB/{XNB_Red08.prefab.meta => XNB_Red8.prefab.meta} (100%) rename UnityProject/Assets/AssetRaw/Effects/XNB/{XNB_Red09.prefab => XNB_Red9.prefab} (99%) rename UnityProject/Assets/AssetRaw/Effects/XNB/{XNB_Red09.prefab.meta => XNB_Red9.prefab.meta} (100%) diff --git a/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red01.prefab b/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red1.prefab similarity index 99% rename from UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red01.prefab rename to UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red1.prefab index 3ee17eec..0d86e301 100644 --- a/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red01.prefab +++ b/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red1.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 9146820759231616599} - component: {fileID: 3358918908062264225} m_Layer: 5 - m_Name: XNB_Red01 + m_Name: XNB_Red1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red01.prefab.meta b/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red1.prefab.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red01.prefab.meta rename to UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red1.prefab.meta diff --git a/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red02.prefab b/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red2.prefab similarity index 99% rename from UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red02.prefab rename to UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red2.prefab index d60bc8a1..8c1910c5 100644 --- a/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red02.prefab +++ b/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red2.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 2239782812203008887} - component: {fileID: 8414835811250276661} m_Layer: 5 - m_Name: XNB_Red02 + m_Name: XNB_Red2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red02.prefab.meta b/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red2.prefab.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red02.prefab.meta rename to UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red2.prefab.meta diff --git a/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red03.prefab b/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red3.prefab similarity index 99% rename from UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red03.prefab rename to UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red3.prefab index 83c4fefc..5fdd9779 100644 --- a/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red03.prefab +++ b/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red3.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 6453053631939641651} - component: {fileID: 2348814759658048765} m_Layer: 5 - m_Name: XNB_Red03 + m_Name: XNB_Red3 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red03.prefab.meta b/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red3.prefab.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red03.prefab.meta rename to UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red3.prefab.meta diff --git a/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red04.prefab b/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red4.prefab similarity index 99% rename from UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red04.prefab rename to UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red4.prefab index 376e68fb..afdccb58 100644 --- a/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red04.prefab +++ b/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red4.prefab @@ -4904,7 +4904,7 @@ GameObject: - component: {fileID: 138480953419190619} - component: {fileID: 3316313878214217391} m_Layer: 5 - m_Name: XNB_Red04 + m_Name: XNB_Red4 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red04.prefab.meta b/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red4.prefab.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red04.prefab.meta rename to UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red4.prefab.meta diff --git a/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red05.prefab b/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red5.prefab similarity index 99% rename from UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red05.prefab rename to UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red5.prefab index 314392ef..a2295c9b 100644 --- a/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red05.prefab +++ b/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red5.prefab @@ -4904,7 +4904,7 @@ GameObject: - component: {fileID: 3815935217341769355} - component: {fileID: 6360125362484183504} m_Layer: 5 - m_Name: XNB_Red05 + m_Name: XNB_Red5 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red05.prefab.meta b/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red5.prefab.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red05.prefab.meta rename to UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red5.prefab.meta diff --git a/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red06.prefab b/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red6.prefab similarity index 99% rename from UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red06.prefab rename to UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red6.prefab index c168447e..ed1376d7 100644 --- a/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red06.prefab +++ b/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red6.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 2492210341951760127} - component: {fileID: 8748526308978716122} m_Layer: 5 - m_Name: XNB_Red06 + m_Name: XNB_Red6 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red06.prefab.meta b/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red6.prefab.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red06.prefab.meta rename to UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red6.prefab.meta diff --git a/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red07.prefab b/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red7.prefab similarity index 99% rename from UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red07.prefab rename to UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red7.prefab index 3fcd3e29..5ca107b0 100644 --- a/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red07.prefab +++ b/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red7.prefab @@ -4904,7 +4904,7 @@ GameObject: - component: {fileID: 4911581481183985409} - component: {fileID: 6605927696101510220} m_Layer: 5 - m_Name: XNB_Red07 + m_Name: XNB_Red7 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red07.prefab.meta b/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red7.prefab.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red07.prefab.meta rename to UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red7.prefab.meta diff --git a/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red08.prefab b/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red8.prefab similarity index 99% rename from UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red08.prefab rename to UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red8.prefab index ba0b1f64..c3016703 100644 --- a/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red08.prefab +++ b/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red8.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 5233973000204382431} - component: {fileID: 8904130379661810033} m_Layer: 5 - m_Name: XNB_Red08 + m_Name: XNB_Red8 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red08.prefab.meta b/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red8.prefab.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red08.prefab.meta rename to UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red8.prefab.meta diff --git a/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red09.prefab b/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red9.prefab similarity index 99% rename from UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red09.prefab rename to UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red9.prefab index 4bbabedc..2feb6bbb 100644 --- a/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red09.prefab +++ b/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red9.prefab @@ -4904,7 +4904,7 @@ GameObject: - component: {fileID: 4559170727979941198} - component: {fileID: 2365138952552482324} m_Layer: 5 - m_Name: XNB_Red09 + m_Name: XNB_Red9 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red09.prefab.meta b/UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red9.prefab.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red09.prefab.meta rename to UnityProject/Assets/AssetRaw/Effects/XNB/XNB_Red9.prefab.meta diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs index 31e7cbfa..2c3caa20 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs @@ -41,6 +41,7 @@ namespace GameLogic private float m_AddPush = 0.1f; // 初始推力值 private double m_AllPush = 0; // 当前总值 private int m_AllAddPush = 0;//永久增加推力值 + private int m_AssetID = 0; // 资源ID,用于加载资源 private int textureId = 0; @@ -79,7 +80,7 @@ namespace GameLogic m_tmpValue.text = ((int)(i + 1)).ToString(); int assetsId = (i + 1) % 10 == 0 ? 1 : (i + 1) % 10; - + m_AssetID = assetsId; m_imgSign.sprite = GameModule.Resource.LoadAsset("zjm_mz_" + assetsId); m_imgValue.sprite = GameModule.Resource.LoadAsset("zjm_jdt_" + assetsId); @@ -278,6 +279,18 @@ namespace GameLogic GameObject.Destroy(eGo); }); + // 速度线 + var speedLineGo = GameModule.Resource.LoadGameObject("XNB_Red" + m_AssetID); + speedLineGo.transform.SetParent(m_rectCar.transform); + speedLineGo.transform.localPosition = new Vector3(-1500, 0, 0); + speedLineGo.transform.localScale = Vector3.one; + speedLineGo.gameObject.SetActive(true); + + GameModule.Timer.AddTimer((e) => + { + GameObject.Destroy(speedLineGo); + }, 10); + //// 加载常规特效 //LoadEffectGo(giftConfig, buff);