Merged
Conversation
-Changed LogWarning to Log when no furniture is voted to sell -Changed LogWarning to LogError when gamefurniture definitions are missing
…ring the countdown -Modified PollObject.cs to allow for the timer to be changed to show the end time, and back
-Removed unnecessary system usages from PollPopup -Organized and added headers for variables in PollObject -Added PollPopup to Votes_List object (Functionality WIP)
-Cleaned up PollObject.cs -Added logic to retrieve furniture data from the poll and forward it to PollInfoPopup -Created PollInfoPopupWindow gameobject -Created PollInfoPopup.cs to apply data to PollInfoPopupWindow Notes: -The logic for the PollInfoPopup Awake needs to be changed due to the current logic requiring PollInfoPopupWindow to be active during the start. -The button that changes the clock in the PollObject needs to be moved from the timer text to an invisible one on top of the text
-Added ColorMultiplier to the time text in PollObject to allow for the color to remain the same after the poll had ended -Removed ForcedUpdateCanvas on OnDisable from PollObject.cs due to errors -Added logic to PollMonitor to Initialize PollInfoPopupWindow in order to fix the problem of needing to have PollInfoPopupWindow open at the start -Added a method to receive the initialization call from PollMonitor to PollInfoPopup.cs
-Added logic to ItemMover, KojuSorting and KojuTrayPopulator that causes the first slot in the panel to be reserved for the ad poster, and be unaffected by changes made in koju -Made the Koju Panel bigger Notes: -Koju Cards need to be remade due to their scale being broken in the larger cards
-Simplified the way value shows in the Furniture Cards in koju -Fixed KojuCard asset to scale text and images properly regardless of the size -Changed the background color in PollInfoPopupWindow and KojuPopupWindow due to recent changes to the original background asset
…ts voting -Added simple fix to PollInfoPopup still having the "info" page open after closing and reopening the popup -Added a method to ClanData to assign the role of "Member" to those with their role as "none" Added a debugger that does the following: -Logs the user's playerData ID, clanID and name as well as Clan role and rights -Fetches and logs all the clan members of the user and data related to them (ID, Role, Name) -Calls the AssignDefaultRoles() from ClanData in order to assign default role to those that have their role as "none"
-Added a button to start a Poll for the user to be promoted to officer -Added debug buttons to check every player in clan, their name, id and role -Cleaned multiple scripts -Created ClanPollmanager and ClanRolePollData to handle the poll process (Methods from these could be later migrated to other poll systems)
…or a chosen role -Made a popup for selecting member and role to vote on -Created ClanRolePopup.cs for the feature of polling on a specific member -Added debugs for checking when certain things happen (remove them later) Notes: -Endpoll in pollamanger requires some work to integrate the system for role polls properly. -The role polls should be integrated to poll amanger and pollmonitor as a whole, just like with the other polls. -Currently, only changes to officer despite what you set in the dropdown menu (this was due to testing)
-Removed method to assign default roles to all clan members -Changed Admin role to be enum 3 instead of 4 -Removed Test Promotion poll coroutine -Removed a courotine that promoted the user to officer -Adjusted ClanMainView to accommodate the changes of removing test buttons
-Removed ClanPollManager (Kinda) -Changed ClanRolePopup.cs location from poco/clan to scripts/voting -Changed ClanVoteDebugger location from poco/clan to scripts/voting -Integrated ClanPollManager to PollManager
-Improved the Clan polls in pollmanager -Info page now properly works with clan polls (currently shows the voted member, their current role and the role voted on for them
…Org/Altzone into origin/UI/Varasto/Add/Stall
-Fixed errors related to clan polls -Fixed clan polls not working properly -Visual update to Clan Poll Popup -Fixed Poll info popup to work properly again with clan polls
…during Clan Poll -Added a situation to PollObject.cs where if the poll type is clan poll, it will show the players name and their current rank instead
-Added a method to PollObject.cs that fetches avatar visual data for the player, and then pastes it to a CharacterHeadImage object
-Made a pollmonitor prefab and added it to level as a monitor that doesn't get destroyed in order to track polls more efficiently -Made few changes to poll monitoring
Local copy of the poll is still created incorrectly.
Polls and Stalls are now fetched after storage id fetched. This is needed as some of the data in polls requires to match with the storage data.
This method is currently a little rudimentary and should be cleaned later.
Added the stock fetching back that I accidentally removed. Now the fetch waits until the furniture fetching is finished.
Ones are now used to send message to server and the others are used to create the poll clientside.
…data from clandata. Also these methods are now called when polldata changes.
These were causing a lot of issues with data not updating properly.
Also had to add a check if the furniture can be found due to the data format from server and that returning furniture to the stock changes the id.
BillTheBeast
approved these changes
Dec 8, 2025
This was
linked to
issues
Dec 8, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changes:
-Added an info popup for polls, that shows furniture related info during a furniture poll, and clan related info during clan promotion polls
-Poll Object info button now shows player name, their avatar head and current rank when poll type is clan promotion
-Poll Objects now show the end time in them
-Changed Koju panel to have the first slot be taken by the ad poster, and removed the ad poster from the side
-Fixed scaling problems in Koju, and remade few game objects related to it to work better with the UI
-Added and integrated a clan promotion type poll to poll manager and its system
-Changed poll monitor to work as an object that is always on, and made some additional changes to its logic
Known Issues:
-When an uneven amount of polls finish, the poll window doesn't properly update the headers