tschesky/AppleHillsProduction
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added cementmachine with animated states

Browse Source
This commit is contained in:
AlexanderT
2025-12-01 18:36:17 +01:00
parent 789ffcf929
commit e9ba3b7431
10 changed files with 146 additions and 846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Assets/Art/Levels/CementFactory/Animation/CementMachine/NormalState/CardPrintingMachine_Printing.anim
View File

@@ -213,4 +213,11 @@ AnimationClip:
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
m_Events:
- time: 1.6
functionName: WorkingAnimationDone
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0

113
Assets/Prefabs/Levels/CementFactory/CardMachine.prefab
View File

@@ -29,7 +29,11 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Children:
- {fileID: 3111710571448952061}
- {fileID: 3953654171218162169}
- {fileID: 2200039860192678593}
- {fileID: 4907884058974367606}
m_Father: {fileID: 8930188423169058064}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &239658593309924751
@@ -90,51 +94,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &620982098998015832
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2884047949235669482}
- component: {fileID: 2331246574009630412}
m_Layer: 0
m_Name: Working
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &2884047949235669482
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 620982098998015832}
serializedVersion: 2
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: 8319369019620638839}
m_Father: {fileID: 1914547076524583993}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2331246574009630412
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 620982098998015832}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 95e46aacea5b42888ee7881894193c11, type: 3}
m_Name:
m_EditorClassIdentifier: AppleHillsScripts::Core.SaveLoad.AppleState
--- !u!1 &3083594724729558494
GameObject:
m_ObjectHideFlags: 0
@@ -166,10 +125,6 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1914547076524583993}
- {fileID: 3111710571448952061}
- {fileID: 3953654171218162169}
- {fileID: 2200039860192678593}
- {fileID: 4907884058974367606}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &7323973786548402901
@@ -189,7 +144,19 @@ MonoBehaviour:
- {fileID: 11400000, guid: 28e77acad35e7f84987d025a04bb7bb0, type: 2}
m_Events:
- m_PersistentCalls:
m_Calls: []
m_Calls:
- m_Target: {fileID: 4349144095261672277}
m_TargetAssemblyTypeName: Core.SaveLoad.AppleMachine, AppleHillsScripts
m_MethodName: ChangeState
m_Mode: 5
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument: Broken
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &4719742874103500163
GameObject:
m_ObjectHideFlags: 0
@@ -206,7 +173,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &8930188423169058064
Transform:
m_ObjectHideFlags: 0
@@ -253,7 +220,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &4134567645280552272
Transform:
m_ObjectHideFlags: 0
@@ -317,13 +284,14 @@ GameObject:
- component: {fileID: 8319369019620638839}
- component: {fileID: 209748223923144383}
- component: {fileID: 3035588724321947031}
- component: {fileID: 2429074051491030959}
m_Layer: 0
m_Name: MachineSprites
m_Name: Working
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &8319369019620638839
Transform:
m_ObjectHideFlags: 0
@@ -337,7 +305,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2884047949235669482}
m_Father: {fileID: 1914547076524583993}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &209748223923144383
Animator:
@@ -419,6 +387,19 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &2429074051491030959
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5637859103962238792}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 782eafa5850294b4d91ca3632d93ab19, type: 3}
m_Name:
m_EditorClassIdentifier: '::'
stateMachine: {fileID: 4349144095261672277}
--- !u!1 &6250741417003874177
GameObject:
m_ObjectHideFlags: 0
@@ -676,7 +657,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2884047949235669482}
- {fileID: 8319369019620638839}
- {fileID: 4134567645280552272}
- {fileID: 8930188423169058064}
m_Father: {fileID: 1262417946682301225}
@@ -705,7 +686,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6f56763d30b94bf6873d395a6c116eb5, type: 3}
m_Name:
m_EditorClassIdentifier: AppleHillsScripts::Core.SaveLoad.AppleMachine
defaultState: {fileID: 620982098998015832}
defaultState: {fileID: 5637859103962238792}
currentState: {fileID: 0}
_unityEventsFolded: 1
verbose: 0
@@ -849,7 +830,7 @@ PrefabInstance:
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1262417946682301225}
m_TransformParent: {fileID: 9076375528679299737}
m_Modifications:
- target: {fileID: 256864889908838801, guid: c1d303b98816509419952f8c9df142ed, type: 3}
propertyPath: m_IsActive
@@ -889,7 +870,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5535419726138739440, guid: c1d303b98816509419952f8c9df142ed, type: 3}
propertyPath: m_LocalPosition.y
value: 10.8
value: 10.800003
objectReference: {fileID: 0}
- target: {fileID: 5535419726138739440, guid: c1d303b98816509419952f8c9df142ed, type: 3}
propertyPath: m_LocalPosition.z
@@ -943,7 +924,7 @@ PrefabInstance:
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1262417946682301225}
m_TransformParent: {fileID: 9076375528679299737}
m_Modifications:
- target: {fileID: 256864889908838801, guid: c1d303b98816509419952f8c9df142ed, type: 3}
propertyPath: m_IsActive
@@ -975,7 +956,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5535419726138739440, guid: c1d303b98816509419952f8c9df142ed, type: 3}
propertyPath: m_LocalPosition.y
value: 9.26
value: 9.260002
objectReference: {fileID: 0}
- target: {fileID: 5535419726138739440, guid: c1d303b98816509419952f8c9df142ed, type: 3}
propertyPath: m_LocalPosition.z
@@ -1029,7 +1010,7 @@ PrefabInstance:
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1262417946682301225}
m_TransformParent: {fileID: 9076375528679299737}
m_Modifications:
- target: {fileID: 256864889908838801, guid: c1d303b98816509419952f8c9df142ed, type: 3}
propertyPath: m_IsActive
@@ -1053,7 +1034,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5535419726138739440, guid: c1d303b98816509419952f8c9df142ed, type: 3}
propertyPath: m_LocalPosition.y
value: 5.52
value: 5.5199966
objectReference: {fileID: 0}
- target: {fileID: 5535419726138739440, guid: c1d303b98816509419952f8c9df142ed, type: 3}
propertyPath: m_LocalPosition.z
@@ -1107,7 +1088,7 @@ PrefabInstance:
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1262417946682301225}
m_TransformParent: {fileID: 9076375528679299737}
m_Modifications:
- target: {fileID: 256864889908838801, guid: c1d303b98816509419952f8c9df142ed, type: 3}
propertyPath: m_IsActive
@@ -1131,7 +1112,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5535419726138739440, guid: c1d303b98816509419952f8c9df142ed, type: 3}
propertyPath: m_LocalPosition.y
value: 6.12
value: 6.1200027
objectReference: {fileID: 0}
- target: {fileID: 5535419726138739440, guid: c1d303b98816509419952f8c9df142ed, type: 3}
propertyPath: m_LocalPosition.z

15
Assets/Prefabs/Levels/CementFactory/MissingPart.prefab
View File

@@ -11,6 +11,7 @@ GameObject:
- component: {fileID: 983258108420874730}
- component: {fileID: 4571626757107076529}
- component: {fileID: 846269202557674750}
- component: {fileID: 8879177737632019491}
m_Layer: 10
m_Name: Missing
m_TagString: Untagged
@@ -131,6 +132,20 @@ MonoBehaviour:
interactionComplete:
m_PersistentCalls:
m_Calls: []
--- !u!114 &8879177737632019491
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 256864889908838801}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 584ce0be859902849a74d3d2f13d0e64, type: 3}
m_Name:
m_EditorClassIdentifier: '::'
targetScale: 0.8
scaleDuration: 1
--- !u!1 &601827097522699570
GameObject:
m_ObjectHideFlags: 0

787
Assets/Resources/Fonts/ApplehillsFont/AppleHills01 SDF.asset
View File

File diff suppressed because one or more lines are too long

8
Assets/Scripts/StateMachines/CementFactory.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f3d9ad0c1618ed342b04c0f2297109b1
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

14
Assets/Scripts/StateMachines/CementFactory/MachineWorkingState.cs Normal file
View File

@@ -0,0 +1,14 @@
using Core.SaveLoad;
using UnityEngine;
public class MachineWorkingBehavior : MonoBehaviour
{
public AppleMachine stateMachine;
public void WorkingAnimationDone()
{
stateMachine.ChangeState("Exploding");
}
}

2
Assets/Scripts/StateMachines/CementFactory/MachineWorkingState.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 782eafa5850294b4d91ca3632d93ab19

22
Assets/Scripts/StateMachines/CementFactory/MissingPartVisualBehavior.cs Normal file
View File

@@ -0,0 +1,22 @@
using UnityEngine;
using DG.Tweening;
public class MissingPartVisualBehavior : MonoBehaviour
{
public float targetScale;
public float scaleDuration;
// Start is called once before the first execution of Update after the MonoBehaviour is created
void Start()
{
transform.DOScale(targetScale, scaleDuration).SetLoops(-1, LoopType.Yoyo);
}
// Update is called once per frame
void Update()
{
}
}

2
Assets/Scripts/StateMachines/CementFactory/MissingPartVisualBehavior.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 584ce0be859902849a74d3d2f13d0e64

20
ProjectSettings/ProjectSettings.asset
View File

@@ -846,8 +846,24 @@ PlayerSettings:
webWasm2023: 0
webEnableSubmoduleStrippingCompatibility: 0
scriptingDefineSymbols:
Android: ENABLE_LOG
iPhone:
Android: ENABLE_LOG;DOTWEEN
EmbeddedLinux: DOTWEEN
GameCoreScarlett: DOTWEEN
GameCoreXboxOne: DOTWEEN
Kepler: DOTWEEN
LinuxHeadlessSimulation: DOTWEEN
Nintendo Switch: DOTWEEN
PS4: DOTWEEN
PS5: DOTWEEN
QNX: DOTWEEN
ReservedCFE: DOTWEEN
Standalone: DOTWEEN
VisionOS: DOTWEEN
WebGL: DOTWEEN
Windows Store Apps: DOTWEEN
XboxOne: DOTWEEN
iPhone: DOTWEEN
tvOS: DOTWEEN
additionalCompilerArguments: {}
platformArchitecture: {}
scriptingBackend: