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.

Sign up for GitHub

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

Jump to bottom

Move part of reworked UI from test-build branch #193

Merged
merged 3 commits into from
Aug 31, 2024
Merged

Move part of reworked UI from test-build branch #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
adac1e7
Add new firing button
Kiuh Aug 27, 2024
89fdf64
Add new daily bill
Kiuh Aug 27, 2024
73f0b55
Add new extended employee info
Kiuh Aug 27, 2024
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
5 changes: 1 addition & 4 deletions JamGame/Assets/AddressableAssetsData/AddressableAssetSettings.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ MonoBehaviour:
m_DefaultGroup: 614b556afece2ce489487c17643346f0
m_currentHash:
serializedVersion: 2
Hash: 35bdf2cc42f48a4a33576056e0f321ce
Hash: a8e28e796a375ef708cfd2b0558b6498
m_OptimizeCatalogSize: 0
m_BuildRemoteCatalog: 0
m_BundleLocalCatalog: 0
Expand Down Expand Up @@ -88,12 +88,9 @@ MonoBehaviour:
m_LabelTable:
m_LabelNames:
- TileUnion
- InventoryView
- CoreModel
- GameSettings
- ProjectedTilesSettings
- ExtendedInfoQuirkView
- ExtendedInfoBuffView
- Quirk
m_SchemaTemplates: []
m_GroupTemplateObjects:
Expand Down
12 changes: 0 additions & 12 deletions JamGame/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,6 @@ MonoBehaviour:
m_SerializedLabels:
- ProjectedTilesSettings
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 68680d91ed582704d9f18c6d755f15c6
m_Address: Assets/Prefabs/UI/Quirks/Variants
m_ReadOnly: 0
m_SerializedLabels:
- ExtendedInfoQuirkView
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 84d4a152c4d3f3d44aceda957d2bafd8
m_Address: Assets/Prefabs/Unions/Terrain
m_ReadOnly: 0
Expand All @@ -80,12 +74,6 @@ MonoBehaviour:
m_SerializedLabels:
- Quirk
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: b90efc1d6ac4cae44b24d32bd7beaa99
m_Address: Assets/Prefabs/UI/Buffs/Variants
m_ReadOnly: 0
m_SerializedLabels:
- ExtendedInfoBuffView
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: 048fc504cb5ff494ca42e8cab0fa903e, type: 2}
m_SchemaSet:
Expand Down
30 changes: 24 additions & 6 deletions JamGame/Assets/Animations/UI/DailyBillPanel/Hidden.anim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,23 @@ AnimationClip:
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: Background
path: UIBlocker
classID: 1
script: {fileID: 0}
flags: 0
flags: 16
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
Expand All @@ -47,7 +56,7 @@ AnimationClip:
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 4080383872
path: 2488168802
attribute: 2086281974
script: {fileID: 0}
typeID: 1
Expand All @@ -61,7 +70,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
Expand Down Expand Up @@ -90,14 +99,23 @@ AnimationClip:
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: Background
path: UIBlocker
classID: 1
script: {fileID: 0}
flags: 0
flags: 16
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
Expand Down
30 changes: 24 additions & 6 deletions JamGame/Assets/Animations/UI/DailyBillPanel/Showed.anim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,23 @@ AnimationClip:
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: Background
path: UIBlocker
classID: 1
script: {fileID: 0}
flags: 0
flags: 16
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
Expand All @@ -47,7 +56,7 @@ AnimationClip:
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 4080383872
path: 2488168802
attribute: 2086281974
script: {fileID: 0}
typeID: 1
Expand All @@ -61,7 +70,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
Expand Down Expand Up @@ -90,14 +99,23 @@ AnimationClip:
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: Background
path: UIBlocker
classID: 1
script: {fileID: 0}
flags: 0
flags: 16
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
Expand Down
Loading
Loading