Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge fast-track/70.2.0 into development #3243

Merged
merged 68 commits into from
Oct 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
9f1d144
icon change update
jonny-jeahyunchoi Oct 16, 2023
3cd2df7
Replace Video Resources
tyrosine1153 Oct 16, 2023
6604c41
Add sudo apt-get install ubuntu-restricted-extras
Akamig Oct 16, 2023
bdc4710
Fix intro screen animation, update loading image
tyrosine1153 Oct 16, 2023
33c1070
Replace HEVC -> VP8
Akamig Oct 16, 2023
2fa2cac
Fix video resources
tyrosine1153 Oct 17, 2023
d93e43f
Revert "Add sudo apt-get install ubuntu-restricted-extras"
tyrosine1153 Oct 17, 2023
519ecee
Merge pull request #3197 from planetarium/feature/encodeing-video-res…
tyrosine1153 Oct 17, 2023
7acb5db
edit tutorial
hyejin-bropark Oct 17, 2023
932690d
add mobile clo switch for platform
jonny-jeahyunchoi Oct 17, 2023
1af0aa6
Update Arena Medal L10n Add
NineSyu Oct 17, 2023
e4e60d7
Update nekoyume/Assets/_Scripts/Game/LiveAsset/LiveAssetManager.cs
jonny-jeahyunchoi Oct 17, 2023
50227d6
Merge pull request #3203 from planetarium/feature/mobile-clo-switch-p…
jonny-jeahyunchoi Oct 17, 2023
ee00325
fix mobile platform condition
jonny-jeahyunchoi Oct 17, 2023
26a113c
Merge pull request #3210 from planetarium/feature/mobile-clo-switch-p…
jonny-jeahyunchoi Oct 17, 2023
df05cf2
fix: remove battle tutorial(105)
sonohoshi Oct 17, 2023
73ac776
Merge pull request #3205 from planetarium/70.2.0-l10n
tyrosine1153 Oct 17, 2023
f7ddcc3
Edit main canvas initialize
tyrosine1153 Oct 17, 2023
fd6c325
chore: add tutorial for guiding animation accellation
sonohoshi Oct 17, 2023
59a9eb2
feat: add Tutorial.PlayOnlyGuideArrow()
sonohoshi Oct 17, 2023
869b1f5
feat: add guide arrow for animation accellation
sonohoshi Oct 17, 2023
261fb73
Merge pull request #3206 from planetarium/hotfix/70.1.2
sonohoshi Oct 18, 2023
f10bdbc
Merge pull request #3195 from planetarium/feature/70.2.0-icon-change
sonohoshi Oct 18, 2023
7a93804
Edit GrayLoadingScreen slider animation
tyrosine1153 Oct 17, 2023
f30a4d6
Edit login system bg to UIBacground from Blur
tyrosine1153 Oct 17, 2023
06c7040
Fix GrayLoadingScreen animation
tyrosine1153 Oct 17, 2023
091e98b
Update GrayLoadingScreen to call ShowProgress() in Game,Start()
tyrosine1153 Oct 17, 2023
c73d016
Refactor EventReleaseNotePopup, unread check
tyrosine1153 Oct 17, 2023
9f50423
Update show patrol popup at room entering
tyrosine1153 Oct 17, 2023
f1e8873
Refactor patrol reward popup
tyrosine1153 Oct 17, 2023
b1bee45
Add mixpanel analyzer
tyrosine1153 Oct 17, 2023
b797fb1
Merge pull request #3211 from planetarium/feature/patrol-popup
tyrosine1153 Oct 18, 2023
ae692ce
Merge pull request #3213 from planetarium/feature/gray-loading-screen
tyrosine1153 Oct 18, 2023
4a45a82
edit tutorial
Ninehyejin Oct 18, 2023
e102985
Merge branch 'fast-track/70.2.0' of https://github.com/planetarium/Ni…
Ninehyejin Oct 18, 2023
72452fc
feat: reduce crafting tutorial
sonohoshi Oct 18, 2023
a836816
Merge pull request #3212 from planetarium/feature/battle-tutorial-hig…
sonohoshi Oct 18, 2023
7d1c476
Merge pull request #3217 from planetarium/feature/reduce-craft-tutorial
sonohoshi Oct 18, 2023
39fc937
Update portal tutorial : trigger stage 5->7
tyrosine1153 Oct 18, 2023
187bf81
Update summon tutorial : trigger stage 10->5
tyrosine1153 Oct 18, 2023
e575bc5
fix: move PlaySfx invoking to PlayAnimation
sonohoshi Oct 18, 2023
e7da776
Merge pull request #3218 from planetarium/feature/update-tutorial
tyrosine1153 Oct 18, 2023
fc5c82a
Merge pull request #3219 from planetarium/bugfix/unused-reward-screen…
sonohoshi Oct 18, 2023
00696c8
feat: change RequiredStageForExitButton to 10
sonohoshi Oct 19, 2023
b9b0668
fix: RequiredStageForExitButton handling about accel button
sonohoshi Oct 19, 2023
f19e1dd
feat: remove crating tutorial
sonohoshi Oct 19, 2023
6d9e8e3
edd tutorial translate
Ninehyejin Oct 19, 2023
18c68c7
Merge pull request #3225 from planetarium/feature/battle-result-button
sonohoshi Oct 19, 2023
1f44cb6
add tutorial translate about patrol rewards
Ninehyejin Oct 19, 2023
a281941
add mini dialog
Ninehyejin Oct 19, 2023
0ab29e2
add tutorial key 07_005
Ninehyejin Oct 19, 2023
be9959e
Add patrol reward tutorial after 10
tyrosine1153 Oct 19, 2023
3c3c835
Add unlockstage condition stage 10 to main menu
tyrosine1153 Oct 19, 2023
67be95f
Add start button step to tutorial stage 7
tyrosine1153 Oct 19, 2023
7f59224
fix: remove accelerationToggle disabling at tutorial
sonohoshi Oct 19, 2023
2a0f735
Merge pull request #3230 from planetarium/bugfix/accel-toggle-ui
sonohoshi Oct 19, 2023
61c26c7
Fix
tyrosine1153 Oct 19, 2023
17dc208
change portal reward level condition
jonny-jeahyunchoi Oct 19, 2023
294238d
Merge pull request #3232 from planetarium/feature/70.2.0-portal-rewar…
jonny-jeahyunchoi Oct 19, 2023
01cb696
Merge pull request #3231 from planetarium/feature/tutorial-patrol-reward
jonny-jeahyunchoi Oct 19, 2023
b10ace0
chore: update version to 70.2.0
sonohoshi Oct 19, 2023
8e1308a
feat: enable header and guide quest when clear stage 3
sonohoshi Oct 20, 2023
3aec7d7
Merge pull request #3234 from planetarium/bugfix/tutorial-header-enable
sonohoshi Oct 20, 2023
9a42924
edit tutorial
Ninehyejin Oct 20, 2023
9cd4b81
fix: remove waiting about guide quest animation
sonohoshi Oct 20, 2023
f0f78fa
Merge pull request #3236 from planetarium/fix/skip-animation-wating-b…
sonohoshi Oct 20, 2023
9e3cb88
Add Tutorial Dummy for patrol reward tutorial
tyrosine1153 Oct 20, 2023
bd76e5b
Merge pull request #3235 from planetarium/bugfix/summon-tutorial
tyrosine1153 Oct 20, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-338780788768140887
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: LightHandler_Idle
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: 109462fb9ff25e14e810a2c3172bf78c, 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: LightHandler
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 4538503625239338235}
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 &4538503625239338235
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: -338780788768140887}
m_Position: {x: 330, y: 110, 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: -338780788768140887}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,277 @@
%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: LightHandler_Idle
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0.525, y: 0.525, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.75
value: {x: 0.7, y: 0.7, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1.5
value: {x: 0.525, y: 0.525, z: 1}
inSlope: {x: -0.23333333, y: -0.23333333, z: 0}
outSlope: {x: -0.23333333, y: -0.23333333, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 2.25
value: {x: 0.35, y: 0.35, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 3
value: {x: 0.525, y: 0.525, z: 1}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path:
m_FloatCurves: []
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: 3
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 3
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:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.525
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
value: 0.7
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5
value: 0.525
inSlope: -0.23333333
outSlope: -0.23333333
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.25
value: 0.35
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3
value: 0.525
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_LocalScale.x
path:
classID: 224
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.525
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
value: 0.7
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5
value: 0.525
inSlope: -0.23333333
outSlope: -0.23333333
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.25
value: 0.35
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3
value: 0.525
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_LocalScale.y
path:
classID: 224
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.75
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.25
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 3
value: 1
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_LocalScale.z
path:
classID: 224
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading