This commit is contained in:
DESKTOP-SAJ6RKV\Administrator 2025-06-13 03:44:37 +08:00
parent ae765e2a8a
commit 9637da9a27
7 changed files with 488 additions and 20 deletions

View File

@ -4900,6 +4900,7 @@ GameObject:
- component: {fileID: 6524373898151789043}
- component: {fileID: 606825954046105934}
- component: {fileID: 8409430068189589483}
- component: {fileID: 3529448308105864447}
m_Layer: 5
m_Name: JSZ
m_TagString: Untagged
@ -4988,3 +4989,24 @@ Canvas:
m_SortingLayerID: -645527231
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!95 &3529448308105864447
Animator:
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8823429392423874210}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 295a8c079a7236a41b2ceb1251dd091f, 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

View File

@ -37297,7 +37297,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1950349943801813264
RectTransform:
m_ObjectHideFlags: 0
@ -77913,6 +77913,7 @@ RectTransform:
- {fileID: 7233518126495376741}
- {fileID: 1504160176133512822}
- {fileID: 3672185223540818530}
- {fileID: 5223830087769806674}
m_Father: {fileID: 1814839733780877975}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -98765,6 +98766,108 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3}
m_PrefabInstance: {fileID: 2309859779378909824}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &2672558080485270583
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 688984147342290442}
m_Modifications:
- target: {fileID: 7883569443071652709, guid: ae4c7da5a394bea4ab264d6b8592bd41, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7883569443071652709, guid: ae4c7da5a394bea4ab264d6b8592bd41, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7883569443071652709, guid: ae4c7da5a394bea4ab264d6b8592bd41, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7883569443071652709, guid: ae4c7da5a394bea4ab264d6b8592bd41, type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7883569443071652709, guid: ae4c7da5a394bea4ab264d6b8592bd41, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7883569443071652709, guid: ae4c7da5a394bea4ab264d6b8592bd41, type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7883569443071652709, guid: ae4c7da5a394bea4ab264d6b8592bd41, type: 3}
propertyPath: m_SizeDelta.x
value: 765
objectReference: {fileID: 0}
- target: {fileID: 7883569443071652709, guid: ae4c7da5a394bea4ab264d6b8592bd41, type: 3}
propertyPath: m_SizeDelta.y
value: 1360
objectReference: {fileID: 0}
- target: {fileID: 7883569443071652709, guid: ae4c7da5a394bea4ab264d6b8592bd41, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7883569443071652709, guid: ae4c7da5a394bea4ab264d6b8592bd41, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7883569443071652709, guid: ae4c7da5a394bea4ab264d6b8592bd41, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7883569443071652709, guid: ae4c7da5a394bea4ab264d6b8592bd41, type: 3}
propertyPath: m_LocalRotation.w
value: 0.8433914
objectReference: {fileID: 0}
- target: {fileID: 7883569443071652709, guid: ae4c7da5a394bea4ab264d6b8592bd41, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7883569443071652709, guid: ae4c7da5a394bea4ab264d6b8592bd41, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7883569443071652709, guid: ae4c7da5a394bea4ab264d6b8592bd41, type: 3}
propertyPath: m_LocalRotation.z
value: -0.53729963
objectReference: {fileID: 0}
- target: {fileID: 7883569443071652709, guid: ae4c7da5a394bea4ab264d6b8592bd41, type: 3}
propertyPath: m_AnchoredPosition.x
value: 560
objectReference: {fileID: 0}
- target: {fileID: 7883569443071652709, guid: ae4c7da5a394bea4ab264d6b8592bd41, type: 3}
propertyPath: m_AnchoredPosition.y
value: 261
objectReference: {fileID: 0}
- target: {fileID: 7883569443071652709, guid: ae4c7da5a394bea4ab264d6b8592bd41, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7883569443071652709, guid: ae4c7da5a394bea4ab264d6b8592bd41, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7883569443071652709, guid: ae4c7da5a394bea4ab264d6b8592bd41, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -65
objectReference: {fileID: 0}
- target: {fileID: 8823429392423874210, guid: ae4c7da5a394bea4ab264d6b8592bd41, type: 3}
propertyPath: m_Name
value: JSZ
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ae4c7da5a394bea4ab264d6b8592bd41, type: 3}
--- !u!224 &5223830087769806674 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 7883569443071652709, guid: ae4c7da5a394bea4ab264d6b8592bd41, type: 3}
m_PrefabInstance: {fileID: 2672558080485270583}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &2708602225140092782
PrefabInstance:
m_ObjectHideFlags: 0

View File

@ -0,0 +1,72 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1107 &-6332660359809431470
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: -5380531647985356030}
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: -5380531647985356030}
--- !u!1102 &-5380531647985356030
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: New Animation
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: f7d55b690733ff344a4ceed742866fb6, 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: JSZ
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -6332660359809431470}
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}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 295a8c079a7236a41b2ceb1251dd091f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,260 @@
%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: New Animation
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path:
classID: 224
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 779
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 300
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_AnchoredPosition.x
path:
classID: 224
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 364
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 140
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_AnchoredPosition.y
path:
classID: 224
script: {fileID: 0}
flags: 0
m_PPtrCurves: []
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: 1460864421
script: {fileID: 0}
typeID: 224
customType: 28
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 538195251
script: {fileID: 0}
typeID: 224
customType: 28
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 2033536083
script: {fileID: 0}
typeID: 224
customType: 28
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
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:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path:
classID: 224
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 779
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 300
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_AnchoredPosition.x
path:
classID: 224
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 364
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 140
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_AnchoredPosition.y
path:
classID: 224
script: {fileID: 0}
flags: 0
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f7d55b690733ff344a4ceed742866fb6
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -856,18 +856,10 @@ namespace GameLogic
actor.AddBuff(m_Buff, unitPlayerData, giftConfig);
List<ActorHItem> m_TempList = new List<ActorHItem>();
foreach (var item in m_DicTeamList)
{
if (item.Value != actor)
{
m_TempList.Add(item.Value);
}
}
await UniTask.Delay(2000);
// 排序
m_TempList.Sort((a, b) =>
DataGameSceneManager.Instance.m_TeamSortList.Sort((a, b) =>
{
if (a.GetAllPower() > b.GetAllPower())
{
@ -880,13 +872,14 @@ namespace GameLogic
});
// 生成手指特效
if (m_TempList[0] == actor)
if (DataGameSceneManager.Instance.m_TeamSortList[0] == actor)
{
// 自己是第一名,则给第二名生成一个特效
Log.Debug("?!!!");
// 添加减速Buff给到
var eGo = GameModule.Resource.LoadGameObject("JSZ");
eGo.transform.SetParent(m_TempList[1].GetRect().transform);
eGo.transform.SetParent(DataGameSceneManager.Instance.m_TeamSortList[1].GetRect().transform);
eGo.transform.localPosition = new Vector3(0, 0, 0);
eGo.transform.localScale = Vector3.one * 0.5f;
@ -898,10 +891,11 @@ namespace GameLogic
}
else
{
Log.Debug("?!!!312321321");
// 给第一名生成一个特效
// 添加减速Buff给到
var eGo = GameModule.Resource.LoadGameObject("JSZ");
eGo.transform.SetParent(m_TempList[0].GetRect().transform);
eGo.transform.SetParent(DataGameSceneManager.Instance.m_TeamSortList[0].GetRect().transform);
eGo.transform.localPosition = new Vector3(0, 0, 0);
eGo.transform.localScale = Vector3.one * 0.5f;
@ -913,18 +907,19 @@ namespace GameLogic
}
for (int i = 0; i < m_TempList.Count; i++)
for (int i = 0; i < DataGameSceneManager.Instance.m_TeamSortList.Count; i++)
{
//if (m_TempList[i] == actor)
//{
// continue;
//}
if (DataGameSceneManager.Instance.m_TeamSortList[i] == actor)
{
continue;
}
await UniTask.Delay(500);
// 添加减速Buff
Buff m_Buff1 = new Buff();
m_Buff1.OnInit(giftConfig.Id, giftConfig.AddPower * num, giftConfig.TimerLen, giftConfig.AddGiftScore, num);
m_TempList[i].AddBuff(m_Buff1, unitPlayerData, giftConfig);
DataGameSceneManager.Instance.m_TeamSortList[i].AddBuff(m_Buff1, unitPlayerData, giftConfig);
}