Skip to content
Merged
Show file tree
Hide file tree
Changes from 39 commits
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
768c6f7
Implement raid matchmaking lobby and shared loot
Davetsa Jun 8, 2026
02591c1
Anchor raid inventory layout and wrapper prefab
Davetsa Jun 9, 2026
240d33a
Added raid event log layout
Davetsa Jun 9, 2026
9ab91a1
Merge branch 'Ui/Raid/Implement/Traps' into Ui/Raid/Implament/OnlineMode
Davetsa Jun 10, 2026
c61f9a4
Fix Raid surrender button layout
Davetsa Jun 10, 2026
eb98dbb
Refactor eventlog layout
Davetsa Jun 10, 2026
889a8e9
Show event log dividers from prefab
Davetsa Jun 11, 2026
76c5271
Adde Raid timer fill
Davetsa Jun 11, 2026
f797da9
Added the images of picked up items to the heartpanel
Davetsa Jun 12, 2026
e5333c0
Merge branch 'main' into Ui/Raid/Implament/OnlineMode
Davetsa Jun 12, 2026
8abb5a6
Reset raid timer state on room exit
Davetsa Jun 12, 2026
36670da
Updated Fonts
Davetsa Jun 12, 2026
7288f23
Added a hand to Timer Background
Davetsa Jun 15, 2026
13276a9
Updated Raid visuals
Davetsa Jun 15, 2026
1ddf26b
Reversed the timerfill direction and made visual changes
Davetsa Jun 15, 2026
9f672fa
Adde a debug start to RaidMatchmaking
Davetsa Jun 15, 2026
4031703
Removed Old Heartpanel animation and seperated invetorycontet to be i…
Davetsa Jun 15, 2026
8797ab4
Added an Red Halo items in lose scenario
Davetsa Jun 16, 2026
b448cd1
Adjusted endmenu grid and redhalo conditions
Davetsa Jun 16, 2026
44a857c
Fixed Matchmaking views canvas setup and added more padding to hearti…
Davetsa Jun 17, 2026
a21e107
Added a red halo to texts at lose conditions
Davetsa Jun 17, 2026
6314ae8
Implemented raid UI prefab wiring cleanup
Davetsa Jun 17, 2026
d09ed6f
Added a live inventory to see and remove items during gameplay
Davetsa Jun 18, 2026
0c790ad
Added moving dots to matchmakingview and updated lobby panel
Davetsa Jun 18, 2026
9b9f787
Merge branch 'main' into Ui/Raid/Implament/OnlineMode
Davetsa Jun 18, 2026
479980e
Fixed debug inventory mode for raid restart
Davetsa Jun 22, 2026
fd2823d
changed the loot inventory to be personal instead of clan specific
Davetsa Jun 22, 2026
2d891cb
General cleanup and deleting unused stuff
Davetsa Jun 22, 2026
a23c4db
Disabled the bomb indicator
Davetsa Jun 22, 2026
68dc643
changed the ItemWeightPopup font
Davetsa Jun 22, 2026
4f31ce2
Merge branch 'main' into Ui/Raid/Implament/OnlineMode
Davetsa Jun 22, 2026
ecd18e6
Removed some runtimecreation that should already be in prefab
Davetsa Jun 22, 2026
b98f2d9
Removed changes to SDF.asset
Davetsa Jun 23, 2026
f46d336
Added more messages to the eventlog
Davetsa Jun 23, 2026
63f9154
Added a audio listener back
Davetsa Jun 23, 2026
5a97c63
Updated Eventlog and heartpanel visual and proportions
Davetsa Jun 23, 2026
474cd05
Make HeartScript tracker field serialized and private
Davetsa Jun 29, 2026
9f2ab25
Removed remnant of shared clan item inventory and cleaned up lootTra…
Davetsa Jun 29, 2026
2058113
Updated the redhalo to be in prefab
Davetsa Jun 29, 2026
930f787
Changet the playericons in Raidlobby to be charaterheads and changed …
Davetsa Jun 30, 2026
df84f80
Simplify raid lobby clan text localization
Davetsa Jun 30, 2026
f22e8b5
Refactor raid reference resolution
Davetsa Jun 30, 2026
6c3b147
Clamp timer circle thickness to outer radius
Davetsa Jun 30, 2026
e3042c6
Seperated the Split logic to methods
Davetsa Jul 1, 2026
37986e4
Use raid references to resolve event logs
Davetsa Jul 1, 2026
ec47db9
Refactor raid end menu to use lobby navigation
Davetsa Jul 1, 2026
63b4e9a
Fixed a bug when clickin the palloimage during its animtion opened th…
Davetsa Jul 1, 2026
1d2df39
Tighten raid shared loot validation
Davetsa Jul 2, 2026
77b76ae
Merge branch 'main' into Ui/Raid/Implament/OnlineMode
Davetsa Jul 2, 2026
3b4ccd9
Optimize raid control visibility handling
Davetsa Jul 2, 2026
8991996
Reuse collected loot items in live inventory
Davetsa Jul 2, 2026
05696e1
Refactor raid inventory randomization
Davetsa Jul 2, 2026
1b39ed6
Refactor raid inventory shared reference setup
Davetsa Jul 2, 2026
17ff2fe
Handle raid lobby countdown state updates
Davetsa Jul 2, 2026
d4a86e1
Optimize raid UI item reuse and timer updates
Davetsa Jul 2, 2026
8350ab5
Localize raid system messages and remove template activation
Davetsa Jul 3, 2026
c9a5c36
Refactor raid event log avatar entry handling
Davetsa Jul 3, 2026
1fb261b
Make raid event popup countdown configurable
Davetsa Jul 3, 2026
a943da0
Use raid references for timer lookup
Davetsa Jul 3, 2026
5eeac72
Refactor raid inventory trap fields to typed enums
Davetsa Jul 6, 2026
16f8b66
Fix raid trap effects blocking other players' looting Refactor share…
Davetsa Jul 6, 2026
4e988ee
Remove CanvasGroup from live inventory visibility handling
Davetsa Jul 6, 2026
f71b6d4
Refactor raid player icon data handling
Davetsa Jul 6, 2026
4004f75
Serialize raid trap slots as binary payload
Davetsa Jul 6, 2026
94b5652
Update raid and furniture assets scale handling
Davetsa Jul 8, 2026
87f9613
Refactor live inventory remove button handling
Davetsa Jul 8, 2026
bdfa03d
Remove live inventory loot grid configuration
Davetsa Jul 8, 2026
a86a1f4
Move raid controls to dedicated canvases
Davetsa Jul 8, 2026
22bdaeb
Move loot remove button handling into inventory item
Davetsa Jul 8, 2026
2302c5e
Move exit raid button visibility into ExitRaid
Davetsa Jul 8, 2026
9690466
Wire raid timer controls to gameplay release state
Davetsa Jul 8, 2026
624dbe7
Refactor raid timer views and visibility handling
Davetsa Jul 8, 2026
1272a58
Fix raid timer initialization and warning handling
Davetsa Jul 8, 2026
acfc306
Cache Raid_References instance when available
Davetsa Jul 8, 2026
8b647bf
Refactor raid matchmaking UI updates into view routines
Davetsa Jul 13, 2026
65fadc7
Show countdown visuals during raid start timer
Davetsa Jul 13, 2026
0e4ee41
Split raid loss halo targets for timer background and clock
Davetsa Jul 13, 2026
94cadf8
Harden raid matchmaking data loading and refresh UI assets
Davetsa Jul 15, 2026
a1c6982
Fix raid matchmaking room validation
Davetsa Jul 15, 2026
1dd31f9
Expand raid lobby matchmaking flow
Davetsa Jul 15, 2026
c167c89
Fix raid matchmaking readiness and clan count lookup
Davetsa Jul 15, 2026
c1f8dfc
Guard raid property setup and abort when local player is unavailable
Davetsa Jul 15, 2026
78f24ca
Use RaidState enum for matchmaking room status
Davetsa Jul 15, 2026
6cf136f
Use millisecond raid countdown timing
Davetsa Jul 15, 2026
d2b73cb
Use SetCustomProperty for raid room state updates
Davetsa Jul 15, 2026
72878ae
Update raid lobby countdown to tick on second boundaries
Davetsa Jul 15, 2026
d58ca6b
Preserve raid timer registration when resetting countdown
Davetsa Jul 15, 2026
dd8a822
Simplify raid loot request eligibility check
Davetsa Jul 15, 2026
7c6b088
Fix loot slot tracking in raid matchmaking
Davetsa Jul 15, 2026
c8909ff
Serialize raid loot events and tighten matchmaking helpers
Davetsa Jul 15, 2026
dec84d1
Move matchmaking dot spacing into views prefab
Davetsa Jul 15, 2026
a2b84de
Fix raid matchmaking prefab clan list template reference
Davetsa Jul 15, 2026
9ea53ad
Split raid matchmaking view activation from text updates
Davetsa Jul 16, 2026
bbf6f73
Simplify raid clan row projection in matchmaking
Davetsa Jul 16, 2026
241955e
Assign raid matchmaking views via serialized reference
Davetsa Jul 16, 2026
1990c0c
Resolve raid references earlier and wire inventory page
Davetsa Jul 16, 2026
c7a8687
Localize Raid matchmaking debug start messages
Davetsa Jul 16, 2026
787ced1
Rename raid surrender flow to exit raid
Davetsa Jul 16, 2026
2d58647
Refactor raid matchmaking state handling into switch
Davetsa Jul 16, 2026
53675ea
Merge branch 'main' into UI/Raid/Implament/OnlineMode
Davetsa Jul 17, 2026
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
36 changes: 20 additions & 16 deletions Assets/Raid/Animations/BombAnimation.anim
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ AnimationClip:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: BombAnimation
serializedVersion: 6
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
Expand All @@ -18,25 +18,27 @@ AnimationClip:
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- curve:
- serializedVersion: 2
curve:
- time: 0
value: {fileID: 497160379, guid: 49307a2248260be42ae19f7c1c476051, type: 3}
value: {fileID: 0}
- time: 0.083333336
value: {fileID: 497160379, guid: 49307a2248260be42ae19f7c1c476051, type: 3}
value: {fileID: 0}
- time: 0.16666667
value: {fileID: 1545126307, guid: 49307a2248260be42ae19f7c1c476051, type: 3}
value: {fileID: 0}
- time: 0.25
value: {fileID: 1545126307, guid: 49307a2248260be42ae19f7c1c476051, type: 3}
value: {fileID: 0}
- time: 0.33333334
value: {fileID: 2036252253, guid: 49307a2248260be42ae19f7c1c476051, type: 3}
value: {fileID: 0}
- time: 0.41666666
value: {fileID: 2036252253, guid: 49307a2248260be42ae19f7c1c476051, type: 3}
value: {fileID: 0}
- time: 0.5
value: {fileID: 2036252253, guid: 49307a2248260be42ae19f7c1c476051, type: 3}
value: {fileID: 0}
attribute: m_Sprite
path:
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
flags: 2
m_SampleRate: 12
m_WrapMode: 0
m_Bounds:
Expand All @@ -51,14 +53,16 @@ AnimationClip:
typeID: 114
customType: 0
isPPtrCurve: 1
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping:
- {fileID: 497160379, guid: 49307a2248260be42ae19f7c1c476051, type: 3}
- {fileID: 497160379, guid: 49307a2248260be42ae19f7c1c476051, type: 3}
- {fileID: 1545126307, guid: 49307a2248260be42ae19f7c1c476051, type: 3}
- {fileID: 1545126307, guid: 49307a2248260be42ae19f7c1c476051, type: 3}
- {fileID: 2036252253, guid: 49307a2248260be42ae19f7c1c476051, type: 3}
- {fileID: 2036252253, guid: 49307a2248260be42ae19f7c1c476051, type: 3}
- {fileID: 2036252253, guid: 49307a2248260be42ae19f7c1c476051, type: 3}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
Expand Down
3 changes: 3 additions & 0 deletions Assets/Raid/Graphics/EventLogBox.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
179 changes: 179 additions & 0 deletions Assets/Raid/Graphics/EventLogBox.png.meta

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

3 changes: 3 additions & 0 deletions Assets/Raid/Graphics/ItemMinusButton.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading