Skip to content

feat: Modify the new room#17

Merged
Thomlam merged 1 commit intodevelopfrom
feat/new_room
Oct 23, 2024
Merged

feat: Modify the new room#17
Thomlam merged 1 commit intodevelopfrom
feat/new_room

Conversation

@AyakorK
Copy link
Copy Markdown
Contributor

@AyakorK AyakorK commented Oct 23, 2024

Summary by CodeRabbit

  • Nouvelles fonctionnalités

    • Amélioration de la gestion de la santé du joueur avec l'ajout d'un nouveau champ heartPrefab et mise à jour de maxHealth.
    • Restructuration du prefab de la salle avec de nouvelles configurations de Tilemap et des modifications dans la hiérarchie des GameObjects.
  • Corrections de bogues

    • Suppression de GameObject Trap et ajout de Uncollided Walls pour une meilleure interaction dans l'environnement de jeu.

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Oct 23, 2024

Walkthrough

Les modifications apportées dans cette demande de tirage concernent principalement deux fichiers prefab dans un projet Unity : Player.prefab et Room.prefab. Pour Player.prefab, des ajustements ont été effectués sur les propriétés du SpriteRenderer et des champs dans les scripts MonoBehaviour, notamment la suppression du champ mainCamera, l'ajout de heartPrefab et la mise à jour de maxHealth. Pour Room.prefab, des changements significatifs incluent l'ajout et la modification de composants, notamment dans le système de Tilemap, ainsi que la suppression d'un GameObject nommé Trap et l'introduction de Uncollided Walls.

Changes

Fichier Changements résumés
Assets/Prefabs/Player.prefab - Champ supprimé : mainCamera
- Champ ajouté : heartPrefab
- Champ mis à jour : maxHealth à 5
Assets/Prefabs/RoomSystem/Corridor/Room.prefab - GameObject supprimé : Trap
- GameObject ajouté : Uncollided Walls
- GameObject mis à jour : Walls renommé en Trap
- Composants ajoutés : Tilemap, TilemapRenderer
- Composant mis à jour : Tilemap (configurations de tuiles modifiées)
- Composant mis à jour : TilemapRenderer (couche de tri et ordre modifiés)

Poem

Dans le jardin des sprites, un joueur s'éveille,
Son cœur bat fort, une nouvelle merveille.
Les murs se transforment, les pièges s'envolent,
Avec des tuiles dansent, les rêves s'enrôlent.
Oh, joie des changements, une fête à la clé,
Un monde à explorer, prêt à s'éveiller! 🐇✨


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@Thomlam Thomlam merged commit 4b36cf4 into develop Oct 23, 2024
Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (1)
Assets/Prefabs/Player.prefab (1)

Line range hint 214-217: Système de santé amélioré avec représentation visuelle

L'ajout du heartPrefab et la définition de maxHealth à 5 suggèrent une amélioration du système de santé avec une représentation visuelle. Cependant, le healthBar n'est pas assigné.

Assurez-vous d'assigner la référence healthBar dans l'éditeur Unity pour éviter des erreurs potentielles lors de l'exécution.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between bc8b9a5 and 054633a.

📒 Files selected for processing (2)
  • Assets/Prefabs/Player.prefab (1 hunks)
  • Assets/Prefabs/RoomSystem/Corridor/Room.prefab (29 hunks)
🧰 Additional context used
🔇 Additional comments (4)
Assets/Prefabs/Player.prefab (2)

Line range hint 98-108: Vérifier le fonctionnement de la caméra après la suppression de mainCamera

La suppression du champ mainCamera suggère une modification dans la gestion de la caméra. Assurez-vous que le suivi de la caméra fonctionne toujours correctement avec les limites définies (minCameraPosition et maxCameraPosition).

#!/bin/bash
# Description: Rechercher où la référence de la caméra a été déplacée
rg -A 5 "Camera.main" "Assets/Scripts/"

79-80: Vérifier la cohérence des couches de rendu

La modification des propriétés de tri (SortingLayerID et SortingLayer) peut affecter la façon dont le joueur est rendu par rapport aux autres éléments du jeu.

✅ Verification successful

Let's gather more information about the sorting layers in the Unity project to better verify this change.

The previous search was too specific looking for an exact ID. Let's broaden our search to understand the overall sorting layer setup in the project.


D'après l'analyse des résultats, je peux maintenant générer une réponse finale concernant les modifications des couches de tri.

La modification de la couche de tri est cohérente avec l'architecture du jeu

La configuration m_SortingLayer: 2 et m_SortingLayerID: -1234118259 est utilisée de manière cohérente dans le projet :

  • Le joueur partage la même couche de tri (2) que certains éléments de la salle (Room.prefab)
  • Les éléments de décor et le sol utilisent la couche 0
  • Les éléments interactifs (portes, pièges, etc.) utilisent la couche 3
  • L'interface utilisateur utilise une couche dédiée (-1791178601)

Cette hiérarchie de rendu assure que le joueur s'affiche correctement par rapport aux autres éléments du jeu.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Vérifier si d'autres prefabs utilisent la même couche de tri
rg -l "m_SortingLayerID: -1234118259" "Assets/Prefabs/"

Length of output: 1426


Script:

#!/bin/bash
# Search for sorting layer configurations in all prefabs
rg -A 2 "m_SortingLayer:" "Assets/Prefabs/"

# Search for any sorting layer related configurations in other Unity files
rg -A 2 "SortingLayer" "Assets/"

Length of output: 50271

Assets/Prefabs/RoomSystem/Corridor/Room.prefab (2)

2350-2351: Vérifier la cohérence des couches de tri (Sorting Layers).

Les identifiants des couches de tri ont été modifiés dans les composants TilemapRenderer. Assurez-vous que ces changements sont alignés avec la gestion globale des couches de tri dans le projet pour un rendu correct des éléments.

Also applies to: 2683-2684


2702-2742: ⚠️ Potential issue

Vérifier les références au GameObject 'Trap' dans le code.

Le GameObject Trap a été supprimé du prefab. Assurez-vous que toutes les références à Trap dans le code ou d'autres prefabs ont été mises à jour pour éviter des erreurs potentielles.

Voici un script pour vérifier les références au GameObject Trap dans le codebase :

✅ Verification successful

Let me gather more information about the trap system to better understand its usage.


La suppression du GameObject 'Trap' est sécurisée

D'après l'analyse du code, le GameObject 'Trap' dans le prefab Room fait partie d'un système de gestion des pièges qui fonctionne correctement :

  • Le TrapManager gère l'instanciation des pièges via une liste de prefabs et un dictionnaire
  • Les références aux prefabs de pièges sont maintenues dans le composant
  • Le système de communication socket pour la gestion des pièges est en place

La suppression est sans danger car :

  • Les prefabs de pièges individuels restent référencés
  • La logique de gestion des pièges est indépendante de ce GameObject
  • Le système continue de fonctionner via le TrapManager et les événements socket
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description : Rechercher les références au GameObject 'Trap' dans les scripts et prefabs.

# Rechercher 'Trap' dans les scripts C#
rg 'Trap' -g '*.cs'

# Rechercher 'Trap' dans les fichiers prefab
rg 'm_Name: Trap' -g '*.prefab'

Length of output: 1477


Script:

#!/bin/bash
# Search for trap prefabs references and trap-related code
rg -A 5 'trapPrefabs' -g '*.cs'

# Search for any trap instantiation or references in other prefabs
rg -A 3 'guid: 127c53d14a0062f41a16963a87a85dc5|guid: 40bc1f37707e62f4297f85bf5c7b01b4|guid: d7c2a5ac1f23afe428f872343ed56d71' -g '*.prefab'

# Search for any trap-related socket events
rg -A 3 'trap.*:.*' -g '*.cs'

Length of output: 3013

Thomlam added a commit that referenced this pull request Oct 23, 2024
* Feature/initialization (#1)

* feature: Init repository

* chore: add git ignore

* chore: Upgrade .gitignore

* chore: Remove all ignored files

* chore: Removed all files that are in the .gitignore

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>

* docs: Update README.md

* Feature/global map (#3)

* feature: Add Timelap and player

* fix: fix error with tilemap

* feat: First version of Player Movements

* feat: First version of animation of the player movements

* fix: Update Player prefab to add the animator

* feat: Add collisions + modify player prefab

* chore: Remove useless folder Art

* feature: Add socket connection and linking it to the back-end

* fix(player_movement): Fix call between backend and game

* feature: Ajout de nombreux assets, modifications de la taille, découpage assets

* fix: Global Fixes about the blurring of the components imported

* feat: Add first rooms

* fix: Fix animations and player asset

* feat: Create Third room

* fix: Reduce player's hitbox

* feature: Ajouts des systèmes de pièges, connections et manager des pièges, animations de la crossbow, ajouts des sprites de l'arrow et de ces effets puis damages, changements tags du joueurs et des walls, changement et ajouts des systèmes de vie du joueurs, changements première phase de l'ui et création de celui-ci

* fix: compression des images retirer

* revert: Revert changes on the ground.png.meta

* revert: Revert changes made on the furnitures

* fix: Fix position of map 1 and player collision

* fix: Fix rooms placement

* fix: Fix arrow physics

* feature: Add doors and animations

* feature: add door system end remove multiple commentary

---------

Co-authored-by: AyakorK <guillaume.moret@yahoo.com>
Co-authored-by: Loule | Louis <35641311+Loule95450@users.noreply.github.com>

* Feature/addition of corridors (#4)

* feature: Add Timelap and player

* fix: fix error with tilemap

* feat: First version of Player Movements

* feat: First version of animation of the player movements

* fix: Update Player prefab to add the animator

* feat: Add collisions + modify player prefab

* chore: Remove useless folder Art

* feature: Add socket connection and linking it to the back-end

* fix(player_movement): Fix call between backend and game

* feature: Ajout de nombreux assets, modifications de la taille, découpage assets

* fix: Global Fixes about the blurring of the components imported

* feat: Add first rooms

* fix: Fix animations and player asset

* feat: Create Third room

* fix: Reduce player's hitbox

* feature: Ajouts des systèmes de pièges, connections et manager des pièges, animations de la crossbow, ajouts des sprites de l'arrow et de ces effets puis damages, changements tags du joueurs et des walls, changement et ajouts des systèmes de vie du joueurs, changements première phase de l'ui et création de celui-ci

* fix: compression des images retirer

* revert: Revert changes on the ground.png.meta

* revert: Revert changes made on the furnitures

* fix: Fix position of map 1 and player collision

* fix: Fix rooms placement

* fix: Fix arrow physics

* feature: Add doors and animations

* feat: Addition of corridors

* feature: add door system end remove multiple commentary

---------

Co-authored-by: AyakorK <guillaume.moret@yahoo.com>
Co-authored-by: Loule | Louis <35641311+Loule95450@users.noreply.github.com>

* feature: First try to add level move in Unity

* feat: fix Arrow, upgrade door system

* feat: Fix multiple problem

* fix: fix door teleport with disable player public selected

* feat: Add Menu system, update styling

* feat: Add Dialog system, add multiple coroutine for enable or disable dialog box

* feat: Level move (#7)

* feature: First try to add level move in Unity

* feat: fix Arrow, upgrade door system

* feat: Fix multiple problem

* fix: fix door teleport with disable player public selected

* feat: Addition of traps using sockets (#6)

* feat: Add auto implementation from website of traps

* chore: Add environment variables to UnityProject (#5)

* fix: Remove useless Log that was crashed

* fix(level_move): Replace hard-coded values ​​with variables for better flexibility

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* feat: Add and fix prefab, add DevRoom prefab

* fix: fix door

* feat: Add Socket to props to send them to back-end (#8)

* feature: First try to add level move in Unity

* feat: fix Arrow, upgrade door system

* feat: Fix multiple problem

* fix: fix door teleport with disable player public selected

* feat: Addition of traps using sockets (#6)

* feat: Add auto implementation from website of traps

* chore: Add environment variables to UnityProject (#5)

* fix: Remove useless Log that was crashed

* feat: Add link to props using sockets

* feat: Add a unique socket system manager

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>

* hotfix: Delete code duplication

* Feature/menu (#11)

* merge: Merge menu and develop and fix little issues (#10)

* merge: Merge develop to menu (#9)

* feat: Level move (#7)

* feature: First try to add level move in Unity

* feat: fix Arrow, upgrade door system

* feat: Fix multiple problem

* fix: fix door teleport with disable player public selected

* feat: Addition of traps using sockets (#6)

* feat: Add auto implementation from website of traps

* chore: Add environment variables to UnityProject (#5)

* fix: Remove useless Log that was crashed

* fix(level_move): Replace hard-coded values ​​with variables for better flexibility

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* feat: Add Socket to props to send them to back-end (#8)

* feature: First try to add level move in Unity

* feat: fix Arrow, upgrade door system

* feat: Fix multiple problem

* fix: fix door teleport with disable player public selected

* feat: Addition of traps using sockets (#6)

* feat: Add auto implementation from website of traps

* chore: Add environment variables to UnityProject (#5)

* fix: Remove useless Log that was crashed

* feat: Add link to props using sockets

* feat: Add a unique socket system manager

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* fix: Remove duplication of code

* fix: Fix Idle animation

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* revert: Revert changes from EmptyRoom that breaked doors

* feat:Some menu option had

* feat: Add pause system, return to menu and restart game, fix OnLoadScene in unity for hard reset player state

* chore: remove commentary for trap manager

---------

Co-authored-by: Guillaume MORET <90462045+AyakorK@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: AyakorK <guillaume.moret@yahoo.com>

* fix: remove duplicata room

* feat: Add a visual timer prefab (V.1.0) (#12)

Co-authored-by: AyakorK <guillaume.moret@yahoo.com>

* feat: Add dynamic environment interaction system and new events (#13)

- Implement player interaction system with the environment
- Add dynamic room system:
  - Events now added based on room number and corridor-specific stages
  - Dynamic event generation based on the current floor
- New events added:
  - "Blacksmith"
  - "Altar" event allowing players to take one item
- Introduced IsCorridor detection system for dynamic instantiation and removal of corridor events
- Enhance item saving system to persist data across rooms, including inventory, dialogues, and more
- Implement full inventory system
- Add multiple UI elements, animations, and canvas for visual feedback

* fix: add removed line

* feat: Add waiting screen and fix some behaviors (#14)

* merge: Merge menu and develop and fix little issues (#10)

* merge: Merge develop to menu (#9)

* feat: Level move (#7)

* feature: First try to add level move in Unity

* feat: fix Arrow, upgrade door system

* feat: Fix multiple problem

* fix: fix door teleport with disable player public selected

* feat: Addition of traps using sockets (#6)

* feat: Add auto implementation from website of traps

* chore: Add environment variables to UnityProject (#5)

* fix: Remove useless Log that was crashed

* fix(level_move): Replace hard-coded values ​​with variables for better flexibility

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* feat: Add Socket to props to send them to back-end (#8)

* feature: First try to add level move in Unity

* feat: fix Arrow, upgrade door system

* feat: Fix multiple problem

* fix: fix door teleport with disable player public selected

* feat: Addition of traps using sockets (#6)

* feat: Add auto implementation from website of traps

* chore: Add environment variables to UnityProject (#5)

* fix: Remove useless Log that was crashed

* feat: Add link to props using sockets

* feat: Add a unique socket system manager

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* fix: Remove duplication of code

* fix: Fix Idle animation

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* revert: Revert changes from EmptyRoom that breaked doors

* feat: V1.0 of WaitingScreen

* fix: Fix the way of sending props and remove the SocketManager from the player

* fix: Remove the Socket when leaving to the menu

* feat: Add the SocketManager to the Menu

* fix: Fix player animation and options text

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* feat: Add trap persistance through rooms (#15)

* feat: Camera Control & Room enlargement (#16)

* feat: Try to update the camera of the user (a bit of a disaster by now)

* fix: Add good tracker Y limit for camera move, synch HUD with camera move

* fix: Fix the camera adapting to the scene

* feat: Get the room bigger

---------

Co-authored-by: Thomlam <lamiablethomas@gmail.com>

* feat: Modify the new room (#17)

* fix: Add a missing pillar

* fix: Crossbow positions (#18)

* fix: Fix the placement of the crossbows

* feat: Add hitboxes to crossbows

* fix: Remove useless traps spawns

* fix: Reorder correctly the crossbow prefabs

* Feature/add traps (#19)

* feature: Update some animations and system for the player, and add new trap

* feat: update EmptyRoom2 for test

---------

Co-authored-by: Guillaume MORET <90462045+AyakorK@users.noreply.github.com>

---------

Co-authored-by: Loule | Louis <35641311+Loule95450@users.noreply.github.com>
Co-authored-by: AyakorK <guillaume.moret@yahoo.com>
Co-authored-by: Guillaume MORET <90462045+AyakorK@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Loule95450 added a commit that referenced this pull request Oct 23, 2024
* Feature/initialization (#1)

* feature: Init repository

* chore: add git ignore

* chore: Upgrade .gitignore

* chore: Remove all ignored files

* chore: Removed all files that are in the .gitignore

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>

* docs: Update README.md

* Feature/global map (#3)

* feature: Add Timelap and player

* fix: fix error with tilemap

* feat: First version of Player Movements

* feat: First version of animation of the player movements

* fix: Update Player prefab to add the animator

* feat: Add collisions + modify player prefab

* chore: Remove useless folder Art

* feature: Add socket connection and linking it to the back-end

* fix(player_movement): Fix call between backend and game

* feature: Ajout de nombreux assets, modifications de la taille, découpage assets

* fix: Global Fixes about the blurring of the components imported

* feat: Add first rooms

* fix: Fix animations and player asset

* feat: Create Third room

* fix: Reduce player's hitbox

* feature: Ajouts des systèmes de pièges, connections et manager des pièges, animations de la crossbow, ajouts des sprites de l'arrow et de ces effets puis damages, changements tags du joueurs et des walls, changement et ajouts des systèmes de vie du joueurs, changements première phase de l'ui et création de celui-ci

* fix: compression des images retirer

* revert: Revert changes on the ground.png.meta

* revert: Revert changes made on the furnitures

* fix: Fix position of map 1 and player collision

* fix: Fix rooms placement

* fix: Fix arrow physics

* feature: Add doors and animations

* feature: add door system end remove multiple commentary

---------

Co-authored-by: AyakorK <guillaume.moret@yahoo.com>
Co-authored-by: Loule | Louis <35641311+Loule95450@users.noreply.github.com>

* Feature/addition of corridors (#4)

* feature: Add Timelap and player

* fix: fix error with tilemap

* feat: First version of Player Movements

* feat: First version of animation of the player movements

* fix: Update Player prefab to add the animator

* feat: Add collisions + modify player prefab

* chore: Remove useless folder Art

* feature: Add socket connection and linking it to the back-end

* fix(player_movement): Fix call between backend and game

* feature: Ajout de nombreux assets, modifications de la taille, découpage assets

* fix: Global Fixes about the blurring of the components imported

* feat: Add first rooms

* fix: Fix animations and player asset

* feat: Create Third room

* fix: Reduce player's hitbox

* feature: Ajouts des systèmes de pièges, connections et manager des pièges, animations de la crossbow, ajouts des sprites de l'arrow et de ces effets puis damages, changements tags du joueurs et des walls, changement et ajouts des systèmes de vie du joueurs, changements première phase de l'ui et création de celui-ci

* fix: compression des images retirer

* revert: Revert changes on the ground.png.meta

* revert: Revert changes made on the furnitures

* fix: Fix position of map 1 and player collision

* fix: Fix rooms placement

* fix: Fix arrow physics

* feature: Add doors and animations

* feat: Addition of corridors

* feature: add door system end remove multiple commentary

---------

Co-authored-by: AyakorK <guillaume.moret@yahoo.com>
Co-authored-by: Loule | Louis <35641311+Loule95450@users.noreply.github.com>

* feature: First try to add level move in Unity

* feat: fix Arrow, upgrade door system

* feat: Fix multiple problem

* fix: fix door teleport with disable player public selected

* feat: Add Menu system, update styling

* feat: Add Dialog system, add multiple coroutine for enable or disable dialog box

* feat: Level move (#7)

* feature: First try to add level move in Unity

* feat: fix Arrow, upgrade door system

* feat: Fix multiple problem

* fix: fix door teleport with disable player public selected

* feat: Addition of traps using sockets (#6)

* feat: Add auto implementation from website of traps

* chore: Add environment variables to UnityProject (#5)

* fix: Remove useless Log that was crashed

* fix(level_move): Replace hard-coded values ​​with variables for better flexibility

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* feat: Add and fix prefab, add DevRoom prefab

* fix: fix door

* feat: Add Socket to props to send them to back-end (#8)

* feature: First try to add level move in Unity

* feat: fix Arrow, upgrade door system

* feat: Fix multiple problem

* fix: fix door teleport with disable player public selected

* feat: Addition of traps using sockets (#6)

* feat: Add auto implementation from website of traps

* chore: Add environment variables to UnityProject (#5)

* fix: Remove useless Log that was crashed

* feat: Add link to props using sockets

* feat: Add a unique socket system manager

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>

* hotfix: Delete code duplication

* Feature/menu (#11)

* merge: Merge menu and develop and fix little issues (#10)

* merge: Merge develop to menu (#9)

* feat: Level move (#7)

* feature: First try to add level move in Unity

* feat: fix Arrow, upgrade door system

* feat: Fix multiple problem

* fix: fix door teleport with disable player public selected

* feat: Addition of traps using sockets (#6)

* feat: Add auto implementation from website of traps

* chore: Add environment variables to UnityProject (#5)

* fix: Remove useless Log that was crashed

* fix(level_move): Replace hard-coded values ​​with variables for better flexibility

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* feat: Add Socket to props to send them to back-end (#8)

* feature: First try to add level move in Unity

* feat: fix Arrow, upgrade door system

* feat: Fix multiple problem

* fix: fix door teleport with disable player public selected

* feat: Addition of traps using sockets (#6)

* feat: Add auto implementation from website of traps

* chore: Add environment variables to UnityProject (#5)

* fix: Remove useless Log that was crashed

* feat: Add link to props using sockets

* feat: Add a unique socket system manager

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* fix: Remove duplication of code

* fix: Fix Idle animation

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* revert: Revert changes from EmptyRoom that breaked doors

* feat:Some menu option had

* feat: Add pause system, return to menu and restart game, fix OnLoadScene in unity for hard reset player state

* chore: remove commentary for trap manager

---------

Co-authored-by: Guillaume MORET <90462045+AyakorK@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: AyakorK <guillaume.moret@yahoo.com>

* fix: remove duplicata room

* feat: Add a visual timer prefab (V.1.0) (#12)

Co-authored-by: AyakorK <guillaume.moret@yahoo.com>

* feat: Add dynamic environment interaction system and new events (#13)

- Implement player interaction system with the environment
- Add dynamic room system:
  - Events now added based on room number and corridor-specific stages
  - Dynamic event generation based on the current floor
- New events added:
  - "Blacksmith"
  - "Altar" event allowing players to take one item
- Introduced IsCorridor detection system for dynamic instantiation and removal of corridor events
- Enhance item saving system to persist data across rooms, including inventory, dialogues, and more
- Implement full inventory system
- Add multiple UI elements, animations, and canvas for visual feedback

* fix: add removed line

* feat: Add waiting screen and fix some behaviors (#14)

* merge: Merge menu and develop and fix little issues (#10)

* merge: Merge develop to menu (#9)

* feat: Level move (#7)

* feature: First try to add level move in Unity

* feat: fix Arrow, upgrade door system

* feat: Fix multiple problem

* fix: fix door teleport with disable player public selected

* feat: Addition of traps using sockets (#6)

* feat: Add auto implementation from website of traps

* chore: Add environment variables to UnityProject (#5)

* fix: Remove useless Log that was crashed

* fix(level_move): Replace hard-coded values ​​with variables for better flexibility

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* feat: Add Socket to props to send them to back-end (#8)

* feature: First try to add level move in Unity

* feat: fix Arrow, upgrade door system

* feat: Fix multiple problem

* fix: fix door teleport with disable player public selected

* feat: Addition of traps using sockets (#6)

* feat: Add auto implementation from website of traps

* chore: Add environment variables to UnityProject (#5)

* fix: Remove useless Log that was crashed

* feat: Add link to props using sockets

* feat: Add a unique socket system manager

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* fix: Remove duplication of code

* fix: Fix Idle animation

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* revert: Revert changes from EmptyRoom that breaked doors

* feat: V1.0 of WaitingScreen

* fix: Fix the way of sending props and remove the SocketManager from the player

* fix: Remove the Socket when leaving to the menu

* feat: Add the SocketManager to the Menu

* fix: Fix player animation and options text

---------

Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* feat: Add trap persistance through rooms (#15)

* feat: Camera Control & Room enlargement (#16)

* feat: Try to update the camera of the user (a bit of a disaster by now)

* fix: Add good tracker Y limit for camera move, synch HUD with camera move

* fix: Fix the camera adapting to the scene

* feat: Get the room bigger

---------

Co-authored-by: Thomlam <lamiablethomas@gmail.com>

* feat: Modify the new room (#17)

* fix: Add a missing pillar

* fix: Crossbow positions (#18)

* fix: Fix the placement of the crossbows

* feat: Add hitboxes to crossbows

* fix: Remove useless traps spawns

* fix: Reorder correctly the crossbow prefabs

* Feature/add traps (#19)

* feature: Update some animations and system for the player, and add new trap

* feat: update EmptyRoom2 for test

---------

Co-authored-by: Guillaume MORET <90462045+AyakorK@users.noreply.github.com>

* fix: Trap management & improvements (#21)

* fix: Enlarge the gridSizeY to match the room and modify the level of the floor to fix traps

* feat: Improve doors and room and traps

* feat: Add walls on first room

* feat: Add bear_trap to trap manager

* hotfix: Remove bear_trap from the EmptyRoom

---------

Co-authored-by: Loule | Louis <35641311+Loule95450@users.noreply.github.com>
Co-authored-by: Thomas Lamiable <lamiablethomas@gmail.com>
Co-authored-by: Thomas Lamiable <86667484+Thomlam@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
@AyakorK AyakorK deleted the feat/new_room branch October 28, 2024 02:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants