From 73ca9a4619f22a9c6f4ddca919a16d5ecb87d4ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A3=AE2003?= <2384017988@qq.com> Date: Tue, 9 Jun 2026 15:59:11 +0800 Subject: [PATCH] cun --- .../Windows/addressables_content_state.bin | Bin 3825 -> 3825 bytes .../Net/WebResponses/RoomKillNotice.cs | 4 ++- .../MyGame/aa/Game/DefaultDieEffect/BJBase.cs | 6 ++-- .../aa/Game/FLZY/BOSS/JL/FLZY_JL_Boss.cs | 2 +- .../BOSS/RYGZ/6004_Timeline Variant.prefab | 30 +++++++++++++++++- .../aa/Game/FLZY/BOSS/RYGZ/FLZY_Boss_RYGZ.cs | 2 +- .../aa/Game/FLZY/BOSS/RYGZ/RYGZDieEvent.cs | 23 +------------- .../Game/FLZY/BOSS/TSK/171_1 Variant.prefab | 2 +- 8 files changed, 39 insertions(+), 30 deletions(-) diff --git a/Assets/AddressableAssetsData/Windows/addressables_content_state.bin b/Assets/AddressableAssetsData/Windows/addressables_content_state.bin index 27f2bf4302b6e6265a293df95abc3998754219f3..f42aa12cb598ea178ed9caf5339ed608c4c5c1a1 100644 GIT binary patch delta 384 zcmaivtxm*15P+fO|H2&!K^A(1aL8__d%G*{(nmmmM9l2YCP)N| q$^QTHk6-Opc-pL|@1N^`#NjW|{1CfdJ3g9cVbrga)3}%d%2P1jGTTCZ=PJiiA==peD^F)aj|5Rt^Pu7o`?d zb4kKcjKI-w0#w0sYl_p8*7iol o;s5f!yn9P8+s)+hbMucl{3V(nV%KZ)*}Y2Rep7tCrt|*IH$xF+Z2$lO diff --git a/Assets/MyGame/Scripts/Net/WebResponses/RoomKillNotice.cs b/Assets/MyGame/Scripts/Net/WebResponses/RoomKillNotice.cs index 3d1068a1a..3979c81ce 100644 --- a/Assets/MyGame/Scripts/Net/WebResponses/RoomKillNotice.cs +++ b/Assets/MyGame/Scripts/Net/WebResponses/RoomKillNotice.cs @@ -34,7 +34,9 @@ namespace Assets.MyGame.Scripts.Net.WebResponses public long timespan; public int killtime; public string msg; - public JObject param; + public int skillsGold; + public int fishScore; + public object param; } } diff --git a/Assets/MyGame/aa/Game/DefaultDieEffect/BJBase.cs b/Assets/MyGame/aa/Game/DefaultDieEffect/BJBase.cs index cce1b9fd1..a49b7b745 100644 --- a/Assets/MyGame/aa/Game/DefaultDieEffect/BJBase.cs +++ b/Assets/MyGame/aa/Game/DefaultDieEffect/BJBase.cs @@ -17,15 +17,15 @@ public class BJBase : MonoBehaviour public int coinCount; public string userID; public int sitID; - public JObject jobj; + public object obj; - public void Init(int coin,Vector3 endPoint, string userID="", int sitID=999, JObject jobj=null) + public void Init(int coin,Vector3 endPoint, string userID="", int sitID=999, object jobj=null) { coinCount = coin; this.userID = userID; this.sitID = sitID; this.endPoint = endPoint; - this.jobj = jobj; + this.obj = jobj; } public virtual void SetCoinCount() diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/JL/FLZY_JL_Boss.cs b/Assets/MyGame/aa/Game/FLZY/BOSS/JL/FLZY_JL_Boss.cs index fce3cff40..b0b8ff7e2 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/JL/FLZY_JL_Boss.cs +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/JL/FLZY_JL_Boss.cs @@ -53,7 +53,7 @@ public class FLZY_JL_Boss : MonsterControl_BossBase if (obj.param != null) { - LeiLongkillObj leiLongData = obj.param.ToObject(); + LeiLongkillObj leiLongData = obj.param as LeiLongkillObj; if (leiLongData?.res != null) { if (leiLongData.res.Count > 0) diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004_Timeline Variant.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004_Timeline Variant.prefab index 2e6e86d60..ded3eeaf4 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004_Timeline Variant.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004_Timeline Variant.prefab @@ -8,6 +8,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1009748915925975, guid: d010f951e5cccd143bdfc3407b72f99d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1587425138453686, guid: d010f951e5cccd143bdfc3407b72f99d, type: 3} propertyPath: m_Name value: 6004_Timeline Variant @@ -67,5 +71,29 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1587425138453686, guid: d010f951e5cccd143bdfc3407b72f99d, + type: 3} + insertIndex: -1 + addedObject: {fileID: 3423558555436395860} m_SourcePrefab: {fileID: 100100000, guid: d010f951e5cccd143bdfc3407b72f99d, type: 3} +--- !u!1 &4026047422854857574 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1587425138453686, guid: d010f951e5cccd143bdfc3407b72f99d, + type: 3} + m_PrefabInstance: {fileID: 4024748079672995792} + m_PrefabAsset: {fileID: 0} +--- !u!114 &3423558555436395860 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4026047422854857574} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f30ac91814a8f1f46bbf291b5c75d4f8, type: 3} + m_Name: + m_EditorClassIdentifier: + playable: {fileID: 0} + bJ_BeiShu: [] diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/FLZY_Boss_RYGZ.cs b/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/FLZY_Boss_RYGZ.cs index 3364664a4..672ce235a 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/FLZY_Boss_RYGZ.cs +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/FLZY_Boss_RYGZ.cs @@ -46,7 +46,7 @@ public class FLZY_Boss_RYGZ : MonsterControl_BossBase if (obj.param != null) { - LeiLongkillObj leiLongData = obj.param.ToObject(); + LeiLongkillObj leiLongData = obj.param as LeiLongkillObj; if (leiLongData?.res != null) { if (leiLongData.res.Count > 0) diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/RYGZDieEvent.cs b/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/RYGZDieEvent.cs index 1d5128aa8..d55cfdd1a 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/RYGZDieEvent.cs +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/RYGZDieEvent.cs @@ -7,7 +7,7 @@ public class RYGZDieEvent : MonoBehaviour { public PlayableDirector playable; public LayeredPool layeredPool; - + public List bJ_BeiShu; private void Awake() { playable.Play(); @@ -17,25 +17,4 @@ public class RYGZDieEvent : MonoBehaviour { Destroy(gameObject); } - - //public void GoldEffect() - //{ - // //开始加分 - // BigPrize(); - //} - //public List BigPrize(int min = 10, int max = 15) - //{ - // //if (layeredPool == null) - // //{ - // // layeredPool = new LayeredPool(maxScore, 1); // 初始化LayeredPool，假设5个人，10000分 - // //} - - // //var v = layeredPool.BossGlodCoinRandrom(tMP_Score.transform.position, min, max); - // //return v; - //} - // Update is called once per frame - void Update() - { - - } } diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/TSK/171_1 Variant.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/TSK/171_1 Variant.prefab index d5149c26a..ca2b6976e 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/TSK/171_1 Variant.prefab +++ b/Assets/MyGame/aa/Game/FLZY/BOSS/TSK/171_1 Variant.prefab @@ -1681,7 +1681,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4899283280599034, guid: 9af7049c3ad41f243aa0a4bd10e52a76, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 200 objectReference: {fileID: 0} - target: {fileID: 4899283280599034, guid: 9af7049c3ad41f243aa0a4bd10e52a76, type: 3} propertyPath: m_LocalRotation.w