From c0ee537e966d7d96d5b9dcfc5ef53d18a545ae08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A3=AE2003?= <2384017988@qq.com> Date: Sun, 19 Jul 2026 14:27:00 +0800 Subject: [PATCH] 1 --- .../AnimEvent/ScoreNumEvent.cs | 2 +- .../Animator/Image.controller | 2 +- .../Animator/Imagesilver.controller | 72 ++++++ .../Animator/Imagesilver.controller.meta | 8 + .../DefaultDieEffect/Animator/Silver.anim | 105 +++++++++ .../Animator/Silver.anim.meta | 8 + .../aa/Game/DefaultDieEffect/Coin.prefab | 218 +++--------------- .../Game/DefaultDieEffect/Coin/CoinScript.cs | 8 + .../aa/UI/Game/GameMainPanel_FishBase.cs | 23 +- .../aa/UI/Home/Sub/SelectRoomPanel.prefab | 12 +- 10 files changed, 252 insertions(+), 206 deletions(-) create mode 100644 Assets/MyGame/aa/Game/DefaultDieEffect/Animator/Imagesilver.controller create mode 100644 Assets/MyGame/aa/Game/DefaultDieEffect/Animator/Imagesilver.controller.meta create mode 100644 Assets/MyGame/aa/Game/DefaultDieEffect/Animator/Silver.anim create mode 100644 Assets/MyGame/aa/Game/DefaultDieEffect/Animator/Silver.anim.meta diff --git a/Assets/MyGame/aa/Game/DefaultDieEffect/AnimEvent/ScoreNumEvent.cs b/Assets/MyGame/aa/Game/DefaultDieEffect/AnimEvent/ScoreNumEvent.cs index 1d28f885d..0f0a6e5ae 100644 --- a/Assets/MyGame/aa/Game/DefaultDieEffect/AnimEvent/ScoreNumEvent.cs +++ b/Assets/MyGame/aa/Game/DefaultDieEffect/AnimEvent/ScoreNumEvent.cs @@ -14,6 +14,6 @@ public class ScoreNumEvent : MonoBehaviour public void eventShowCoin() { gameObject.SetActive(false); - coinScript.gold.SetActive(true); + //coinScript.gold.SetActive(true); } } diff --git a/Assets/MyGame/aa/Game/DefaultDieEffect/Animator/Image.controller b/Assets/MyGame/aa/Game/DefaultDieEffect/Animator/Image.controller index 1ffee5bb1..27a75a1bf 100644 --- a/Assets/MyGame/aa/Game/DefaultDieEffect/Animator/Image.controller +++ b/Assets/MyGame/aa/Game/DefaultDieEffect/Animator/Image.controller @@ -33,7 +33,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 7108131610123997277} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 270, y: 130, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/MyGame/aa/Game/DefaultDieEffect/Animator/Imagesilver.controller b/Assets/MyGame/aa/Game/DefaultDieEffect/Animator/Imagesilver.controller new file mode 100644 index 000000000..78590facb --- /dev/null +++ b/Assets/MyGame/aa/Game/DefaultDieEffect/Animator/Imagesilver.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-6175958183297652687 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Silver + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 69cff20153fb9af43a9809ac493f1bb0, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Imagesilver + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 5875356634959847201} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &5875356634959847201 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -6175958183297652687} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -6175958183297652687} diff --git a/Assets/MyGame/aa/Game/DefaultDieEffect/Animator/Imagesilver.controller.meta b/Assets/MyGame/aa/Game/DefaultDieEffect/Animator/Imagesilver.controller.meta new file mode 100644 index 000000000..07e8b3275 --- /dev/null +++ b/Assets/MyGame/aa/Game/DefaultDieEffect/Animator/Imagesilver.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aa2b3c9d94bfa8f40a4079f8ef92ddf5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/DefaultDieEffect/Animator/Silver.anim b/Assets/MyGame/aa/Game/DefaultDieEffect/Animator/Silver.anim new file mode 100644 index 000000000..e096b2bb7 --- /dev/null +++ b/Assets/MyGame/aa/Game/DefaultDieEffect/Animator/Silver.anim @@ -0,0 +1,105 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Silver + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: 77e3c85cda4dcef42947b6a496ad5bce, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: a10ec91a58d911543b10568983afc22e, type: 3} + - time: 0.18333334 + value: {fileID: 21300000, guid: 3a3876810f9170542bcd12dfffee0df6, type: 3} + - time: 0.26666668 + value: {fileID: 21300000, guid: 0046b4330e5807245ae1cb4bc009130e, type: 3} + - time: 0.36666667 + value: {fileID: 21300000, guid: c56ebffe105126549a17ca8953ecc19f, type: 3} + - time: 0.45 + value: {fileID: 21300000, guid: 6e45a0d7a453993469003dbbe637d7b8, type: 3} + - time: 0.55 + value: {fileID: 21300000, guid: 00626abd521f61a4ab63993b50eecca9, type: 3} + - time: 0.6333333 + value: {fileID: 21300000, guid: f7893be3e6ffd184a9355d6803c44f3c, type: 3} + - time: 0.73333335 + value: {fileID: 21300000, guid: 3374e6144c0c35944b23d009b06babd4, type: 3} + - time: 0.81666666 + value: {fileID: 21300000, guid: 91c6403eabfae5645be7c235ffc088e9, type: 3} + - time: 0.9166667 + value: {fileID: 21300000, guid: 5d1d3694551052e41828227a484f1de1, type: 3} + - time: 1 + value: {fileID: 21300000, guid: cae22a10220dd504da8de1dc65dda757, type: 3} + attribute: m_Sprite + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 2015549526 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: 77e3c85cda4dcef42947b6a496ad5bce, type: 3} + - {fileID: 21300000, guid: a10ec91a58d911543b10568983afc22e, type: 3} + - {fileID: 21300000, guid: 3a3876810f9170542bcd12dfffee0df6, type: 3} + - {fileID: 21300000, guid: 0046b4330e5807245ae1cb4bc009130e, type: 3} + - {fileID: 21300000, guid: c56ebffe105126549a17ca8953ecc19f, type: 3} + - {fileID: 21300000, guid: 6e45a0d7a453993469003dbbe637d7b8, type: 3} + - {fileID: 21300000, guid: 00626abd521f61a4ab63993b50eecca9, type: 3} + - {fileID: 21300000, guid: f7893be3e6ffd184a9355d6803c44f3c, type: 3} + - {fileID: 21300000, guid: 3374e6144c0c35944b23d009b06babd4, type: 3} + - {fileID: 21300000, guid: 91c6403eabfae5645be7c235ffc088e9, type: 3} + - {fileID: 21300000, guid: 5d1d3694551052e41828227a484f1de1, type: 3} + - {fileID: 21300000, guid: cae22a10220dd504da8de1dc65dda757, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.0166667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/MyGame/aa/Game/DefaultDieEffect/Animator/Silver.anim.meta b/Assets/MyGame/aa/Game/DefaultDieEffect/Animator/Silver.anim.meta new file mode 100644 index 000000000..dd63dcd0c --- /dev/null +++ b/Assets/MyGame/aa/Game/DefaultDieEffect/Animator/Silver.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 69cff20153fb9af43a9809ac493f1bb0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/DefaultDieEffect/Coin.prefab b/Assets/MyGame/aa/Game/DefaultDieEffect/Coin.prefab index f52643f2b..9cf24b2ee 100644 --- a/Assets/MyGame/aa/Game/DefaultDieEffect/Coin.prefab +++ b/Assets/MyGame/aa/Game/DefaultDieEffect/Coin.prefab @@ -107,7 +107,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f72b9819c54a5cb4782b1aefe4753be6, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &2042861085145573955 +--- !u!1 &3594360202698095509 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -115,9 +115,11 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4141654619161611748} - - component: {fileID: 1470721072136584697} - - component: {fileID: 3861018608093821004} + - component: {fileID: 491913124893193419} + - component: {fileID: 4692052848163982545} + - component: {fileID: 2983602170299150742} + - component: {fileID: 1935130016510028785} + - component: {fileID: 6495841231262898365} m_Layer: 5 m_Name: Silver m_TagString: Untagged @@ -125,21 +127,19 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 ---- !u!224 &4141654619161611748 +--- !u!224 &491913124893193419 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2042861085145573955} + m_GameObject: {fileID: 3594360202698095509} 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: - {fileID: 4372411673547123201} - - {fileID: 979318475014299391} - - {fileID: 7738344323621080549} m_Father: {fileID: 8802702133347106559} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -147,21 +147,21 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 429.0872, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1470721072136584697 +--- !u!222 &4692052848163982545 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2042861085145573955} + m_GameObject: {fileID: 3594360202698095509} m_CullTransparentMesh: 1 ---- !u!114 &3861018608093821004 +--- !u!114 &2983602170299150742 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2042861085145573955} + m_GameObject: {fileID: 3594360202698095509} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} @@ -181,93 +181,17 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!1 &2538281198944851063 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 979318475014299391} - - component: {fileID: 912700432193402747} - - component: {fileID: 2593873166346434752} - - component: {fileID: 4038664274124918743} - m_Layer: 5 - m_Name: Image (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &979318475014299391 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2538281198944851063} - 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: 4141654619161611748} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 214.5436, y: -50} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &912700432193402747 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2538281198944851063} - m_CullTransparentMesh: 1 ---- !u!114 &2593873166346434752 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2538281198944851063} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4f84a65ffddb6cc43a280cab2ed65ca2, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!95 &4038664274124918743 +--- !u!95 &1935130016510028785 Animator: serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2538281198944851063} + m_GameObject: {fileID: 3594360202698095509} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: b5d7feff55f4f7645b9ae1236893c22a, type: 2} + m_Controller: {fileID: 9100000, guid: 511c4432221009540948656fcedd6d1e, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -278,103 +202,18 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!1 &3147743461488168077 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7738344323621080549} - - component: {fileID: 8981513626728869875} - - component: {fileID: 8779754129444433511} - - component: {fileID: 5568840849783861202} - m_Layer: 5 - m_Name: Image (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7738344323621080549 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3147743461488168077} - 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: 4141654619161611748} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 314.54358, y: -50} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8981513626728869875 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3147743461488168077} - m_CullTransparentMesh: 1 ---- !u!114 &8779754129444433511 +--- !u!114 &6495841231262898365 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3147743461488168077} + m_GameObject: {fileID: 3594360202698095509} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: f72b9819c54a5cb4782b1aefe4753be6, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4f84a65ffddb6cc43a280cab2ed65ca2, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!95 &5568840849783861202 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3147743461488168077} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: b5d7feff55f4f7645b9ae1236893c22a, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 --- !u!1 &8222732459988217625 GameObject: m_ObjectHideFlags: 0 @@ -405,7 +244,7 @@ RectTransform: m_ConstrainProportionsScale: 1 m_Children: - {fileID: 3252193072664515267} - - {fileID: 4141654619161611748} + - {fileID: 491913124893193419} - {fileID: 5505894292012839837} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -428,10 +267,13 @@ MonoBehaviour: m_EditorClassIdentifier: tMP_CoinCount: {fileID: 5050591925468082569} gold: {fileID: 261762419476206530} - silver: {fileID: 2042861085145573955} - endPoint: {fileID: 0} + silver: {fileID: 3594360202698095509} + endPoint: {x: 0, y: 0, z: 0} isBoss: 0 coinCount: 0 + userID: + sitID: 0 + startPoint: {x: 0, y: 0, z: 0} --- !u!1 &8236831357060171625 GameObject: m_ObjectHideFlags: 0 @@ -465,9 +307,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 @@ -560,11 +402,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4141654619161611748} + m_Father: {fileID: 491913124893193419} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 114.543594, y: -50} + m_AnchoredPosition: {x: 214.5436, y: -50} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &705544785280321304 @@ -615,7 +457,7 @@ Animator: m_GameObject: {fileID: 8270801063428910123} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: b5d7feff55f4f7645b9ae1236893c22a, type: 2} + m_Controller: {fileID: 9100000, guid: aa2b3c9d94bfa8f40a4079f8ef92ddf5, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 diff --git a/Assets/MyGame/aa/Game/DefaultDieEffect/Coin/CoinScript.cs b/Assets/MyGame/aa/Game/DefaultDieEffect/Coin/CoinScript.cs index c7e082777..6d8f904f9 100644 --- a/Assets/MyGame/aa/Game/DefaultDieEffect/Coin/CoinScript.cs +++ b/Assets/MyGame/aa/Game/DefaultDieEffect/Coin/CoinScript.cs @@ -9,5 +9,13 @@ public class CoinScript : BJBase public override void SetCoinCount() { tMP_CoinCount.text = NumAdd(coinCount.ToString()); + + // 自己爆奖显示金，别人显示银 + bool isMine = !string.IsNullOrEmpty(userID) + && GameManager.Instance != null + && GameManager.Instance.user != null + && userID == GameManager.Instance.user.id; + if (gold != null) gold.SetActive(isMine); + if (silver != null) silver.SetActive(!isMine); } } diff --git a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs index c2df6f1bf..ceb3c342d 100644 --- a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs +++ b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs @@ -720,6 +720,9 @@ public class GameMainPanel_FishBase : GameMainPanel_Base private void HandleInput() { + // ⭐ 退出倒计时期间屏蔽本地玩家手动输入(旋转/开火/锁定),其他玩家和机器人不受影响 + if (_isLeavingCountdown) return; + CrossPlatformInput input = GetInput(); if (!input.isPressed && !input.wasPressedThisFrame && !input.wasReleasedThisFrame) @@ -927,6 +930,8 @@ public class GameMainPanel_FishBase : GameMainPanel_Base private void HandleAutoRotate() { + // ⭐ 退出倒计时期间屏蔽本地玩家自动旋转,其他玩家和机器人不受影响 + if (_isLeavingCountdown) return; // 锁定模式优先 @@ -1163,6 +1168,8 @@ public class GameMainPanel_FishBase : GameMainPanel_Base private void HandleAutoFire() { if (currSitData == null) return; + // ⭐ 退出倒计时期间屏蔽本地玩家自动开火,其他玩家和机器人不受影响 + if (_isLeavingCountdown) return; bool needAutoFire = toggle_SkillAuto.isOn || (toggle_Lock.isOn && currSitData.isLock && currSitData.lockFX.gameObject.activeSelf); if (!needAutoFire) @@ -1413,6 +1420,9 @@ public class GameMainPanel_FishBase : GameMainPanel_Base //} private void HandleLock() { + // ⭐ 退出倒计时期间屏蔽本地玩家手动锁定,其他玩家和机器人不受影响 + if (_isLeavingCountdown) return; + CrossPlatformInput input = GetInput(); if (!toggle_Lock.isOn) return; if (!input.wasPressedThisFrame && !input.wasReleasedThisFrame) return; @@ -1530,6 +1540,9 @@ public class GameMainPanel_FishBase : GameMainPanel_Base private void HandleAutoLock() { + // ⭐ 退出倒计时期间屏蔽本地玩家自动锁定,其他玩家和机器人不受影响 + if (_isLeavingCountdown) return; + // 自动锁定必须满足：自动开火 + 锁定开关开启 if (!toggle_SkillAuto.isOn) return; if (!toggle_Lock.isOn) return; // ✔ 自动锁定必须在锁定开关开启时才工作 @@ -1822,7 +1835,6 @@ public class GameMainPanel_FishBase : GameMainPanel_Base #region ⑦ 服务器广播处理（NetReceiveModule） public void SyncGameData_Rotate(SyncGameData sync) { - if (_isLeavingCountdown) return; if (sync.sitPos == currSitData.posID) return; var data = FrameDataParser.Parse(sync.frameData); @@ -1831,7 +1843,6 @@ public class GameMainPanel_FishBase : GameMainPanel_Base public void SyncGameData_FireBullit(FireCannonSendData sync) { - if (_isLeavingCountdown) return; // ⭐ 跳过本地玩家(本地玩家开火由 SyncFire → 服务器广播回来后创建子弹, // 但如果服务器不回广播给开火者,本地玩家需要在 SyncFire 里直接 FireBullet) @@ -1871,7 +1882,6 @@ public class GameMainPanel_FishBase : GameMainPanel_Base /// public void SyncGameData_BotFireAngle(SyncGameData sync) { - if (_isLeavingCountdown) return; if (sync == null || sync.frameData == null) return; if (sync.sitPos < 0 || sync.sitPos >= list_Sits.Count) return; @@ -1887,7 +1897,6 @@ public class GameMainPanel_FishBase : GameMainPanel_Base public void SyncGameData_ChangeTargetMonster(SyncGameData sync) { - if (_isLeavingCountdown) return; if (sync.sitPos == currSitData.posID) return; var data = FrameDataParser.Parse(sync.frameData); @@ -1910,7 +1919,6 @@ public class GameMainPanel_FishBase : GameMainPanel_Base public void SyncGameData_RendromDieFish(SyncGameData sync) { - if (_isLeavingCountdown) return; var data = JsonConvert.DeserializeObject(sync.frameData.ToString()); CreateFishManager.Instance.Id_DieListFish_FX( @@ -1924,7 +1932,6 @@ public class GameMainPanel_FishBase : GameMainPanel_Base public void SyncGameData_TurretState(SyncGameData sync) { - if (_isLeavingCountdown) return; if (sync.sitPos == currSitData.posID) return; var data = FrameDataParser.Parse(sync.frameData); @@ -1935,7 +1942,6 @@ public class GameMainPanel_FishBase : GameMainPanel_Base public void SyncGameData_ChangeTurret(SyncGameData sync) { - if (_isLeavingCountdown) return; if (sync.sitPos == currSitData.posID) return; var data = FrameDataParser.Parse(sync.frameData); @@ -1944,7 +1950,6 @@ public class GameMainPanel_FishBase : GameMainPanel_Base public void SyncGameData_ChangeWing(SyncGameData sync) { - if (_isLeavingCountdown) return; if (sync.sitPos == currSitData.posID) return; var data = FrameDataParser.Parse(sync.frameData); @@ -1953,7 +1958,6 @@ public class GameMainPanel_FishBase : GameMainPanel_Base public void SyncGameData_ChangeCannonMultiple(SyncGameData sync) { - if (_isLeavingCountdown) return; if (sync.sitPos == currSitData.posID) return; var data = FrameDataParser.Parse(sync.frameData); @@ -1977,7 +1981,6 @@ public class GameMainPanel_FishBase : GameMainPanel_Base public void SyncGameData_FreezeFish(SyncGameData sync) { - if (_isLeavingCountdown) return; if (sync.sitPos == currSitData.posID) return; // 自己发的不管 var data = FrameDataParser.Parse(sync.frameData); diff --git a/Assets/MyGame/aa/UI/Home/Sub/SelectRoomPanel.prefab b/Assets/MyGame/aa/UI/Home/Sub/SelectRoomPanel.prefab index 56f866ed4..01d4b55aa 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/SelectRoomPanel.prefab +++ b/Assets/MyGame/aa/UI/Home/Sub/SelectRoomPanel.prefab @@ -15304,7 +15304,7 @@ PrefabInstance: type: 3} propertyPath: skeletonDataAsset value: - objectReference: {fileID: 11400000, guid: 3e1011cbf44838442990134aeb3142f9, + objectReference: {fileID: 11400000, guid: 03f212b1acce12742aa3c78f4fc77b86, type: 2} - target: {fileID: 310515316105668945, guid: fa8b75719d4e08c40a788ca49fe54755, type: 3} @@ -15324,12 +15324,12 @@ PrefabInstance: - target: {fileID: 5993261829150408421, guid: fa8b75719d4e08c40a788ca49fe54755, type: 3} propertyPath: m_LocalScale.x - value: 0.2 + value: 0.08 objectReference: {fileID: 0} - target: {fileID: 5993261829150408421, guid: fa8b75719d4e08c40a788ca49fe54755, type: 3} propertyPath: m_LocalScale.y - value: 0.2 + value: 0.08 objectReference: {fileID: 0} - target: {fileID: 6464046321297487490, guid: fa8b75719d4e08c40a788ca49fe54755, type: 3} @@ -15745,7 +15745,7 @@ PrefabInstance: type: 3} propertyPath: skeletonDataAsset value: - objectReference: {fileID: 11400000, guid: 03f212b1acce12742aa3c78f4fc77b86, + objectReference: {fileID: 11400000, guid: 3e1011cbf44838442990134aeb3142f9, type: 2} - target: {fileID: 3533890186723288735, guid: 549505ae8fc5b9b46abe07999836645d, type: 3} @@ -16010,12 +16010,12 @@ PrefabInstance: - target: {fileID: 7379602703728537899, guid: 549505ae8fc5b9b46abe07999836645d, type: 3} propertyPath: m_LocalScale.x - value: 0.08 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 7379602703728537899, guid: 549505ae8fc5b9b46abe07999836645d, type: 3} propertyPath: m_LocalScale.y - value: 0.08 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 7850105720768952652, guid: 549505ae8fc5b9b46abe07999836645d, type: 3}