Skip to content

Commit 7899c10

Browse files
committed
Attempt to fix build bug
Final build
1 parent 59152ad commit 7899c10

6 files changed

Lines changed: 24 additions & 23 deletions

File tree

Assets/Resources/Prefabs/UI/NPCDialog.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ RectTransform:
296296
m_GameObject: {fileID: 267126952570764559}
297297
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
298298
m_LocalPosition: {x: 0, y: 0, z: 0}
299-
m_LocalScale: {x: 1, y: 1, z: 1}
299+
m_LocalScale: {x: 1.3, y: 1.3, z: 1}
300300
m_Children:
301301
- {fileID: 267126952371675077}
302302
- {fileID: 267126952681964811}

Assets/Scripts/ClockController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class ClockController : MonoBehaviour
99
private GameObject ClockHand;
1010
private GameObject Light;
1111

12-
private const float TIME_PER_DAY = 30f;
12+
private const float TIME_PER_DAY = 150f;
1313

1414
private const float ROTATE_OFFSET_CLOCK = -90f;
1515
private const float ROTATE_OFFSET_LIGHT = 35f;

Assets/Scripts/GameController.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using UnityEngine.SceneManagement;
66
using UnityEngine.UI;
77
using Random = UnityEngine.Random;
8+
using System.Linq;
89

910
public class GameController : MonoBehaviour
1011
{
@@ -194,7 +195,7 @@ public void SetPromptText(Interactable i)
194195
/// <param name="index"></param>
195196
public void HighlightInventorySlot(int index)
196197
{
197-
GameObject[] slots = GameObject.FindGameObjectsWithTag("InventorySlot");
198+
GameObject[] slots = GameObject.FindGameObjectsWithTag("InventorySlot").OrderByDescending(go => go.transform.position.y).ToArray();
198199
int count = 0;
199200
foreach (var s in slots)
200201
{
@@ -253,7 +254,7 @@ public void OpenShopMenu(List<ITEMS_MAP> stock)
253254
ShopMenu.SetActive(true);
254255
SetMoveablesActive(false);
255256

256-
GameObject[] slots = GameObject.FindGameObjectsWithTag("ShopInventorySlot");
257+
GameObject[] slots = GameObject.FindGameObjectsWithTag("ShopInventorySlot").OrderByDescending(go => go.transform.position.y).ToArray();
257258
int count = 0;
258259
foreach (var i in stock)
259260
{

Assets/StreamingAssets/Databases/TRANSLATIONS.csv

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ GREETING_NICE_3_AFTERNOON,"""Enjoy your afternoon""","""Mwynhewch eich prynhawn"
1414
GREETING_NEUTRAL_1_AFTERNOON,"""Good afternoon""","""Prynhawn da"""
1515
GREETING_NEUTRAL_2_AFTERNOON,"""Hey""","""S'mae"""
1616
GREETING_NEUTRAL_3_AFTERNOON,"""Alright?""","""Awreit?"""
17-
GREETING_MEAN_1_AFTERNOON,GREETING_MEAN_1_AFTERNOON,GREETING_MEAN_1_AFTERNOON
18-
GREETING_MEAN_2_AFTERNOON,GREETING_MEAN_2_AFTERNOON,GREETING_MEAN_2_AFTERNOON
19-
GREETING_MEAN_3_AFTERNOON,GREETING_MEAN_3_AFTERNOON,GREETING_MEAN_3_AFTERNOON
20-
GREETING_NICE_1_NIGHT,GREETING_NICE_1_NIGHT,GREETING_NICE_1_NIGHT
21-
GREETING_NICE_2_NIGHT,GREETING_NICE_2_NIGHT,GREETING_NICE_2_NIGHT
22-
GREETING_NICE_3_NIGHT,GREETING_NICE_3_NIGHT,GREETING_NICE_3_NIGHT
23-
GREETING_NEUTRAL_1_NIGHT,GREETING_NEUTRAL_1_NIGHT,GREETING_NEUTRAL_1_NIGHT
24-
GREETING_NEUTRAL_2_NIGHT,GREETING_NEUTRAL_2_NIGHT,GREETING_NEUTRAL_2_NIGHT
25-
GREETING_NEUTRAL_3_NIGHT,GREETING_NEUTRAL_3_NIGHT,GREETING_NEUTRAL_3_NIGHT
26-
GREETING_MEAN_1_NIGHT,GREETING_MEAN_1_NIGHT,GREETING_MEAN_1_NIGHT
27-
GREETING_MEAN_2_NIGHT,GREETING_MEAN_2_NIGHT,GREETING_MEAN_2_NIGHT
28-
GREETING_MEAN_3_NIGHT,GREETING_MEAN_3_NIGHT,GREETING_MEAN_3_NIGHT
17+
GREETING_MEAN_1_AFTERNOON,"""Yeah whatever. Afternoon.""","""Ie beth bynnag. Prynhawn."""
18+
GREETING_MEAN_2_AFTERNOON,"""I hate the sun today""","""Rwy'n casáu'r haul heddiw"""
19+
GREETING_MEAN_3_AFTERNOON,"""Go away!""","""Ewch i ffwrdd!"""
20+
GREETING_NICE_1_NIGHT,"""It's nice to see you this evening!""","""Mae'n braf eich gweld chi heno!"""
21+
GREETING_NICE_2_NIGHT,"""I love how the moon looks tonight!""","""Dwi wrth fy modd gyda sut mae'r lleuad yn edrych heno!"""
22+
GREETING_NICE_3_NIGHT,"""Enjoy your evening!""","""Mwynhewch eich noson!"""
23+
GREETING_NEUTRAL_1_NIGHT,"""Good Evening.""","""Noson Dda."""
24+
GREETING_NEUTRAL_2_NIGHT,"""I'm getting tired…""","""Rwy'n blino..."""
25+
GREETING_NEUTRAL_3_NIGHT,"""See you tomorrow""","""Welwn ni chi yfory"""
26+
GREETING_MEAN_1_NIGHT,"""I'm too tired for this""","""Rwy'n rhy flinedig am hyn"""
27+
GREETING_MEAN_2_NIGHT,"""Night.""","""Nos."""
28+
GREETING_MEAN_3_NIGHT,"""Had enough of you for one day""","""Wedi cael digon ohonoch chi am un diwrnod"""
2929
END_NICE_1,END_NICE_1,END_NICE_1
3030
END_NICE_2,END_NICE_2,END_NICE_2
3131
END_NICE_3,END_NICE_3,END_NICE_3
@@ -51,17 +51,17 @@ LOAD,"""Load""","""Llwytho"""
5151
CREDITS,"""Credits""","""Credydau"""
5252
SETTINGS,"""Settings""","""Gosodiadau"""
5353
CREDITS_CONTENT,CREDITS_CONTENT,CREDITS_CONTENT
54-
FLOWERPURPLE,Purple Flower,Blod Porffor
55-
FLOWERRED,Red Flower,Blod Coch
56-
FLOWERYELLOW,Yellow Flower,Blod Melyn
54+
FLOWERPURPLE,Purple Flower,Blodau Porffor
55+
FLOWERRED,Red Flower,Blodau Coch
56+
FLOWERYELLOW,Yellow Flower,Blodau Melyn
5757
CHAIRDESK,Desk Chair,Cadair desg
5858
CHAIRROUND,Round Chair,Cadair rownd
59-
LOUNGESOFA,Sofa,Sofa
60-
SMALLTREE,Small Tree,Coedwig fach
59+
LOUNGESOFA,Sofa,Soffa
60+
SMALLTREE,Small Tree,Coeden Fach
6161
SMALLCACTUS,Small Cactus,Cactus fach
6262
TABLECROSS,Cross Table,Bwrdd croesu
6363
TOILET,Toilet,Toiled
6464
SHOP_CLOSED,"Sorry, the shop is not open at night","Sori, Dyw'r siop ddim yn agor trwy'r nos"
65-
TREE,Tree,Coedwig
66-
TENT,Tent,Tent
65+
TREE,Tree,Coeden
66+
TENT,Tent,Pabell
6767
SHOP,Shop,Siop

docs/Documentation Website.lnk

1.64 KB
Binary file not shown.

docs/index.html - Shortcut.lnk

-1.28 KB
Binary file not shown.

0 commit comments

Comments
 (0)