Merge branch 'main' of https://git.ranaze.com/admin/GGJ2026 into get-tricky

2026-01-31 19:24:32 -06:00
parent c0b64e371b 4d777f1c77
commit e4e385c5c2
9 changed files with 575 additions and 6 deletions
@@ -199,6 +199,7 @@ MonoBehaviour:
  moveActionName: Move
  jumpActionName: Jump
  controlSchemeName: Keyboard&Mouse
+  gamepadIndex: -1
  moveSpeed: 6
  jumpImpulse: 10
  groundMask:
@@ -221,6 +222,7 @@ MonoBehaviour:
  actionMapName: Player
  interactActionName: Crouch
  controlSchemeName: Keyboard&Mouse
+  gamepadIndex: -1
  holdPoint: {fileID: 5569302833446856119}
  pickupRange: 1
 --- !u!1 &6898135930931977916
@@ -83,8 +83,8 @@ SpriteRenderer:
  m_SortingLayer: 0
  m_SortingOrder: 0
  m_MaskInteraction: 0
-  m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3}
-  m_Color: {r: 0.4018334, g: 0.8113208, b: 0.46312103, a: 1}
+  m_Sprite: {fileID: -3366272070310193754, guid: dc90badfe9725d24aacabda7750ad3a4, type: 3}
+  m_Color: {r: 0.8773585, g: 0.26072446, b: 0.8517005, a: 1}
  m_FlipX: 0
  m_FlipY: 0
  m_DrawMode: 0