foldcc/taptap2024_GJ_chidouren
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update core 完善核心游戏循环

Browse Source
This commit is contained in:
Foldcc_b1
2024-10-26 21:50:45 +08:00
parent a5ae3c79dc
commit 6c3690c802
7 changed files with 61 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Assets/GameRes/AlwaysRes/CGScene/BossScene.prefab
View File

@@ -11039,7 +11039,7 @@ ParticleSystem:
boxThickness: {x: 0, y: 0, z: 0}
radiusThickness: 1
donutRadius: 0.2
m_Position: {x: 0, y: 0, z: 0}
m_Position: {x: 0, y: 3, z: 0}
m_Rotation: {x: 90, y: 0, z: 0}
m_Scale: {x: 8.08, y: 1, z: 1}
placementMode: 0
@@ -11677,9 +11677,9 @@ ParticleSystem:
maxColor: {r: 1, g: 1, b: 1, a: 1}
maxGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 0.61960787}
key1: {r: 1, g: 1, b: 1, a: 0.54509807}
key2: {r: 0, g: 0, b: 0, a: 0}
key0: {r: 1, g: 1, b: 1, a: 0}
key1: {r: 1, g: 1, b: 1, a: 0.5137255}
key2: {r: 0, g: 0, b: 0, a: 0.54509807}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
@@ -11694,9 +11694,9 @@ ParticleSystem:
ctime6: 0
ctime7: 0
atime0: 0
atime1: 34618
atime2: 65535
atime3: 0
atime1: 10717
atime2: 34618
atime3: 65535
atime4: 0
atime5: 0
atime6: 0
@@ -11704,7 +11704,7 @@ ParticleSystem:
m_Mode: 0
m_ColorSpace: 0
m_NumColorKeys: 2
m_NumAlphaKeys: 3
m_NumAlphaKeys: 4
minGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 1}
@@ -16871,7 +16871,7 @@ Transform:
m_GameObject: {fileID: 2988816821785696221}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.27281284, y: 16.10269, z: -50}
m_LocalPosition: {x: -0.27281284, y: 117.10269, z: -50}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@@ -17148,7 +17148,7 @@ Transform:
m_GameObject: {fileID: 3131916376551262510}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 1.0911365, z: -10}
m_LocalPosition: {x: 0, y: 181.09114, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@@ -23056,7 +23056,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &3314739321817583476
Transform:
m_ObjectHideFlags: 0
@@ -44016,7 +44016,7 @@ PlayableDirector:
m_Enabled: 1
serializedVersion: 3
m_PlayableAsset: {fileID: 11400000, guid: 7fd9f28b65007c54c84491dcb3c72335, type: 2}
m_InitialState: 1
m_InitialState: 0
m_WrapMode: 2
m_DirectorUpdateMode: 1
m_InitialTime: 0
@@ -54602,7 +54602,7 @@ Transform:
m_GameObject: {fileID: 7843590756034422425}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -1, z: -40.39}
m_LocalPosition: {x: 0, y: 100, z: -40.39}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@@ -55286,6 +55286,10 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2783966503281588806, guid: 121fd30183d15fd41b7db01d2d435331, type: 3}
propertyPath: m_Time
value: 0.75
objectReference: {fileID: 0}
- target: {fileID: 3335032672341537623, guid: 121fd30183d15fd41b7db01d2d435331, type: 3}
propertyPath: m_IsActive
value: 0

30
Assets/GameRes/AutoSource/BossSceneTimeline.playable
View File

@@ -492,8 +492,8 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 72.86667
value: 0
time: 69.28333
value: 0.02332306
inSlope: -0.24292076
outSlope: -0.24292076
tangentMode: 0
@@ -522,7 +522,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 72.86667
m_StopTime: 69.28333
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@@ -570,8 +570,8 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 72.86667
value: 0
time: 69.28333
value: 0.02332306
inSlope: -0.24292076
outSlope: -0.24292076
tangentMode: 0
@@ -708,7 +708,7 @@ MonoBehaviour:
m_Start: 9.883333333333333
m_ClipIn: 0
m_Asset: {fileID: -6184723543947167654}
m_Duration: 63.083333333333336
m_Duration: 59.37300959695131
m_TimeScale: 1
m_ParentTrack: {fileID: -7053742041988943133}
m_EaseInDuration: 0
@@ -2779,6 +2779,15 @@ AnimationClip:
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: 4.366667
value: 1
inSlope: 0
outSlope: 0
@@ -3649,6 +3658,15 @@ AnimationClip:
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: 4.366667
value: 1
inSlope: 0
outSlope: 0

67
Assets/GameRes/Scenes/InitScene.unity
View File

@@ -11253,7 +11253,6 @@ Transform:
- {fileID: 1230494200}
- {fileID: 355335390}
- {fileID: 629963848}
- {fileID: 3470085374461086368}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1344272199
@@ -11430,8 +11429,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1575124293}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 3.83, z: -11}
m_LocalRotation: {x: 0.00000001560446, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -11.879971}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@@ -12370,68 +12369,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4df116eebd24a984d949044a8237c142, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &3470085374461086368 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 577306181614254600, guid: 0c56cdd90f840a04cb9178bac4b7aada, type: 3}
m_PrefabInstance: {fileID: 6431367739991220425}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6431367739991220425
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1344272198}
m_Modifications:
- target: {fileID: 577306181614254600, guid: 0c56cdd90f840a04cb9178bac4b7aada, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 577306181614254600, guid: 0c56cdd90f840a04cb9178bac4b7aada, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 577306181614254600, guid: 0c56cdd90f840a04cb9178bac4b7aada, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 577306181614254600, guid: 0c56cdd90f840a04cb9178bac4b7aada, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 577306181614254600, guid: 0c56cdd90f840a04cb9178bac4b7aada, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 577306181614254600, guid: 0c56cdd90f840a04cb9178bac4b7aada, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 577306181614254600, guid: 0c56cdd90f840a04cb9178bac4b7aada, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 577306181614254600, guid: 0c56cdd90f840a04cb9178bac4b7aada, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 577306181614254600, guid: 0c56cdd90f840a04cb9178bac4b7aada, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 577306181614254600, guid: 0c56cdd90f840a04cb9178bac4b7aada, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7191663945364267832, guid: 0c56cdd90f840a04cb9178bac4b7aada, type: 3}
propertyPath: m_Name
value: BossScene
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0c56cdd90f840a04cb9178bac4b7aada, type: 3}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0

2
Assets/Scripts/Game/Component/ScenePart.cs
View File

@@ -23,6 +23,8 @@ namespace Game.Component
private List<EnemyEntity> _enemyEntities;
private List<BaseProp> _baseProps;
public SuccessProp SuccessProp => this.successProp;
public float CurProgress => this._currentConditionNumber * 1f / completeConditionNumber;
public bool IsCondition => _currentConditionNumber >= completeConditionNumber;

17
Assets/Scripts/Game/RoomManager.cs
View File

@@ -17,6 +17,7 @@ using IcecreamView;
using StateSystem;
using UniFramework.Event;
using UnityEngine;
using UnityEngine.Playables;
using Views;
using Object = UnityEngine.Object;
@@ -33,10 +34,11 @@ namespace Game
public class RoomManager : MgrBase<RoomManager>
{
private EventGroup _eventGroup;
private GameFsm _gameFsm;
private RoomGlobalData _roomGlobalData;
public bool HasLock { get ; private set; }
private EventGroup _eventGroup;
private GameFsm _gameFsm;
private RoomGlobalData _roomGlobalData;
public PlayableDirector _BossSceneDirector;
public bool HasLock { get ; private set; }
public GameState CurrentGameState => this._gameFsm.CurrentState;
@@ -109,6 +111,13 @@ namespace Game
var scenePart = AssetManager.Instance.LoadAsset<GameObject> (loadName).GetComponent<ScenePart> ();
var instantiate = Object.Instantiate (scenePart, MapContent.Instance.transform, true);
MapContent.Instance.SetPart (instantiate);
if (partIndex == 3)
{
//额外加载boss场景
var bossScene = AssetManager.Instance.LoadAsset<GameObject>("");
var gameObject = Object.Instantiate (bossScene , MapContent.Instance.ScenePart.SuccessProp.transform.position , Quaternion.identity);
this._BossSceneDirector = gameObject.GetComponent<PlayableDirector> ();
}
}
#region 事件

2
Assets/Scripts/System/GameSetup.cs
View File

@@ -37,7 +37,7 @@ namespace System
{
if (stateChange == PlayModeStateChange.EnteredPlayMode)
{
// GameStateManager.Instance.Active(StateSystem.GameGlobalState.GameBegin);
GameStateManager.Instance.Active(StateSystem.GameGlobalState.GameBegin);
}
}

3
Assets/Scripts/Views/SuccessPanel.cs
View File

@@ -53,7 +53,6 @@ namespace Views{
rightFragment.effectFactor = 1;
}
await UniTask.Delay (500);
UpdateAnim (index);
}
@@ -79,6 +78,7 @@ namespace Views{
else
{
//播放结尾gc动画
RoomManager.Instance._BossSceneDirector.Play();
}
});
});
@@ -152,6 +152,7 @@ namespace Views{
3 => this.bluePoint,
_ => null
};
await UniTask.Delay (500);
await AnimOpen (effects , point);
if (index >= 3)
{