Skip to content

Commit 9bfa393

Browse files
authored
feat: final touches (#96)
1 parent 4c08d85 commit 9bfa393

File tree

4 files changed

+41
-18
lines changed

4 files changed

+41
-18
lines changed

Assets/Player/Models/PlayerAnimator.controller

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ AnimatorController:
1111
m_AnimatorParameters:
1212
- m_Name: speed
1313
m_Type: 1
14-
m_DefaultFloat: 1
14+
m_DefaultFloat: 0
1515
m_DefaultInt: 0
1616
m_DefaultBool: 0
1717
m_Controller: {fileID: 0}
@@ -50,11 +50,11 @@ AnimatorState:
5050
m_CycleOffsetParameterActive: 0
5151
m_TimeParameterActive: 0
5252
m_Motion: {fileID: 8149319799317669181}
53-
m_Tag:
54-
m_SpeedParameter:
55-
m_MirrorParameter:
56-
m_CycleOffsetParameter:
57-
m_TimeParameter:
53+
m_Tag:
54+
m_SpeedParameter:
55+
m_MirrorParameter:
56+
m_CycleOffsetParameter:
57+
m_TimeParameter:
5858
--- !u!206 &1510578230492688263
5959
BlendTree:
6060
m_ObjectHideFlags: 1
@@ -111,18 +111,18 @@ AnimatorState:
111111
m_TimeParameterActive: 0
112112
m_Motion: {fileID: -203655887218126122, guid: 0b87f89d01130104cb97229365e5a116,
113113
type: 3}
114-
m_Tag:
115-
m_SpeedParameter:
116-
m_MirrorParameter:
117-
m_CycleOffsetParameter:
118-
m_TimeParameter:
114+
m_Tag:
115+
m_SpeedParameter:
116+
m_MirrorParameter:
117+
m_CycleOffsetParameter:
118+
m_TimeParameter:
119119
--- !u!1101 &5511037503630015393
120120
AnimatorStateTransition:
121121
m_ObjectHideFlags: 1
122122
m_CorrespondingSourceObject: {fileID: 0}
123123
m_PrefabInstance: {fileID: 0}
124124
m_PrefabAsset: {fileID: 0}
125-
m_Name:
125+
m_Name:
126126
m_Conditions:
127127
- m_ConditionMode: 3
128128
m_ConditionEvent: speed
@@ -172,7 +172,7 @@ AnimatorStateTransition:
172172
m_CorrespondingSourceObject: {fileID: 0}
173173
m_PrefabInstance: {fileID: 0}
174174
m_PrefabAsset: {fileID: 0}
175-
m_Name:
175+
m_Name:
176176
m_Conditions:
177177
- m_ConditionMode: 4
178178
m_ConditionEvent: speed

Assets/Player/PlayerController.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,11 @@ public void DrivenUpdate(bool isCurrent) {
164164
Config.RotationSpeed * Time.deltaTime
165165
);
166166

167-
var speed = Agent.velocity.magnitude;
167+
var velocity = Agent.velocity;
168+
velocity.y = 0;
169+
var speed = velocity.magnitude;
168170
if (Agent.remainingDistance > Agent.stoppingDistance + 1) {
169-
speed = (Agent.velocity.magnitude + Agent.desiredVelocity.magnitude)
170-
/ 2f;
171+
speed = (speed + Agent.desiredVelocity.magnitude) / 2f;
171172
}
172173

173174
_speedFactor = Mathf.Lerp(

Assets/Typewriter/Tables/LoadingDocs.asset

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Typewriter/Tables/LoadingDocs.tw

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,9 @@ L_ask_bay_2_box_dark_here_2",bay_2_R_saw_box < 1,,,1,
543543
L_ask_bay_2_box_dark_learns_2,speech,dialogue,RT,,FALSE,FALSE,"Back up a bit, let me look at this.",,,,,0,
544544
L_ask_bay_2_box_dark_learns_3,speech,dialogue,LT,,FALSE,FALSE,"Oh, sorry.",,,,,0,
545545
L_ask_bay_2_box_dark_learns_4,speech,dialogue,RT,,FALSE,FALSE,"Mm. Right, let's see...",,,,,0,
546-
L_ask_bay_2_box_dark_learns_A_1,thought,dialogue,RT,,FALSE,FALSE,It looks like this could be a way to get into the building.,L_ask_bay_2_box_dark_learns_4,bay_R_identified_bays = 0,bay_R_identified_bays = 1,,1,
546+
L_ask_bay_2_box_dark_learns_A_1,thought,dialogue,RT,,FALSE,FALSE,It looks like this could be a way to get into the building.,L_ask_bay_2_box_dark_learns_4,"bay_R_identified_bays = 0
547+
bay_R_identified = 0","bay_R_identified_bays = 1
548+
bay_R_identified = 1",,2,
547549
L_ask_bay_2_box_dark_learns_A_2,thought,dialogue,RT,,FALSE,FALSE,"The wall here is replaced by a garage door, which is covered by a scissor gate.",,,,,0,
548550
L_ask_bay_2_box_dark_learns_A_3,thought,dialogue,RT,,FALSE,FALSE,"Judging by the lights, it's powered, but... faulty, in some way.",,,,,0,
549551
L_ask_bay_2_box_dark_learns_A_4,thought,dialogue,RT,,FALSE,FALSE,Which <i>would</i> explain why this service box is open.,,,bay_2_R_saw_box = 1,,0,
@@ -633,7 +635,9 @@ R_ask_bay_2_box_dark_knows_2,speech,dialogue,LT,,FALSE,FALSE,Oh. In the box?,,,,
633635
R_ask_bay_2_box_dark_learns_1,speech,dialogue,LT,,FALSE,FALSE,Uhh... Gimme a sec.,"R_ask_bay_2_box_dark_away_4
634636
R_ask_bay_2_box_dark_here_4",bay_2_L_saw_box < 1,,,1,
635637
R_ask_bay_2_box_dark_learns_2,thought,dialogue,LT,,FALSE,FALSE,"What's going on, here?",,,,,0,
636-
R_ask_bay_2_box_dark_learns_A_1,thought,dialogue,LT,,FALSE,FALSE,Looks like one of those gates they use for shipping-and-receiving stuff.,R_ask_bay_2_box_dark_learns_2,bay_L_identified_bays = 0,bay_L_identified_bays = 1,,1,
638+
R_ask_bay_2_box_dark_learns_A_1,thought,dialogue,LT,,FALSE,FALSE,Looks like one of those gates they use for shipping-and-receiving stuff.,R_ask_bay_2_box_dark_learns_2,"bay_L_identified_bays = 0
639+
bay_L_identified = 0","bay_L_identified_bays = 1
640+
bay_L_identified = 1",,2,
637641
R_ask_bay_2_box_dark_learns_A_2,thought,dialogue,LT,,FALSE,FALSE,"You back a big-rig into it, and the trailer slots right in.",,,,,0,
638642
R_ask_bay_2_box_dark_learns_A_3,thought,dialogue,LT,,FALSE,FALSE,Lets 'em load and unload straight into the building.,,,,,0,
639643
R_ask_bay_2_box_dark_learns_A_4,thought,dialogue,LT,,FALSE,FALSE,The gate's closed...,,,,,0,

0 commit comments

Comments
 (0)