Nicola/TalesOfNovariel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfixing after playtest; v1.4.0

Browse Source
This commit is contained in:
TAASONI3
2023-05-10 16:50:27 +02:00
parent 7387a4d9a5
commit 0b058f9248
12 changed files with 329 additions and 1079 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
Assets/Prefabs/House.prefab
View File

@@ -11,7 +11,12 @@ GameObject:
- component: {fileID: 2475709711252233216}
- component: {fileID: 1944602544116445065}
- component: {fileID: 7520107037247386643}
- component: {fileID: 4626187484870903098}
- component: {fileID: 954893319406625109}
- component: {fileID: 1767011682744252576}
- component: {fileID: 5010910893148806149}
- component: {fileID: 793041006294504099}
- component: {fileID: 3900849479010375039}
- component: {fileID: 1007100526981742462}
m_Layer: 0
m_Name: House
m_TagString: Object:House
@@ -86,8 +91,8 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &4626187484870903098
MeshCollider:
--- !u!65 &954893319406625109
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -96,10 +101,74 @@ MeshCollider:
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 4887216478360415443, guid: 8e16fe9f84a3b4074820e5e1000c8454, type: 3}
serializedVersion: 2
m_Size: {x: 0.02, y: 0.12, z: 0.020000005}
m_Center: {x: 0, y: 0.05, z: 0}
--- !u!65 &1767011682744252576
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7662282263901986782}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.12, y: 0.02, z: 0.020000005}
m_Center: {x: -0.05, y: 0.1, z: 0}
--- !u!65 &5010910893148806149
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7662282263901986782}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.02, y: 0.12, z: 0.020000005}
m_Center: {x: -0.1, y: 0.05, z: 0}
--- !u!65 &793041006294504099
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7662282263901986782}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.05, y: 0.02, z: 0.020000005}
m_Center: {x: -0.015, y: 0, z: 0}
--- !u!65 &3900849479010375039
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7662282263901986782}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.05, y: 0.02, z: 0.020000005}
m_Center: {x: -0.085, y: 0, z: 0}
--- !u!65 &1007100526981742462
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7662282263901986782}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.05, y: 0.02, z: 0.01}
m_Center: {x: -0.05, y: 0, z: 0.005}
--- !u!1 &7955543730560905336
GameObject:
m_ObjectHideFlags: 0
@@ -125,7 +194,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7955543730560905336}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -14.550851, y: 0.000005722046, z: 43.306564}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@@ -191,6 +260,7 @@ GameObject:
- component: {fileID: 7446729486537163711}
- component: {fileID: 6658625636071885056}
- component: {fileID: 115121537636242588}
- component: {fileID: 1282026774396919808}
m_Layer: 0
m_Name: Door
m_TagString: Object:Door
@@ -274,7 +344,7 @@ MeshCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 2619086233303812490, guid: 8e16fe9f84a3b4074820e5e1000c8454, type: 3}
--- !u!114 &6658625636071885056
@@ -289,6 +359,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 14e8c3bbd04c0574da570d1bc8d00649, type: 3}
m_Name:
m_EditorClassIdentifier:
hasInteracted: 0
--- !u!95 &115121537636242588
Animator:
serializedVersion: 5
@@ -310,6 +381,19 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!65 &1282026774396919808
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8263785157974351812}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.02, y: 0.04170223, z: 0.020000005}
m_Center: {x: 0, y: -0.010851122, z: 1.2354351e-17}
--- !u!1001 &8303087274738875168
PrefabInstance:
m_ObjectHideFlags: 0

1215
Assets/Scenes/GameScene.unity
View File

File diff suppressed because it is too large Load Diff

8
Assets/Scenes/MenuScene.unity
View File

@@ -8091,8 +8091,8 @@ RectTransform:
m_Father: {fileID: 1481292146}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.25, y: 0}
m_AnchorMax: {x: 0.45, y: 0.1}
m_AnchorMin: {x: 0.55, y: 0}
m_AnchorMax: {x: 0.75, y: 0.1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
@@ -14540,8 +14540,8 @@ RectTransform:
m_Father: {fileID: 1481292146}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.55, y: 0}
m_AnchorMax: {x: 0.75, y: 0.1}
m_AnchorMin: {x: 0.25, y: 0}
m_AnchorMax: {x: 0.45, y: 0.1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}

3
Assets/Scripts/Controls.cs
View File

@@ -3,6 +3,7 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
public class Controls : MonoBehaviour
{
@@ -136,4 +137,6 @@ public class Controls : MonoBehaviour
fight.GetComponent<Fight>().playerAction(6);
}
}
}

2
Assets/Scripts/Door.cs
View File

@@ -34,6 +34,7 @@ namespace Assets.Scripts
int openChance = new System.Random().Next(4);
if(openChance == 0){
gameObject.GetComponent<Animator>().Play("DoorOpen");
Destroy(gameObject.GetComponent<BoxCollider>());
isOpen = true;
}
else{
@@ -58,6 +59,7 @@ namespace Assets.Scripts
transform.parent.Find("chest").Find("Body").GetComponent<Chest>().loadChest(bool.Parse(json["gotItem"].ToString()));
if(isOpen){
gameObject.GetComponent<Animator>().Play("DoorOpen");
Destroy(gameObject.GetComponent<BoxCollider>());
}
}
}

10
Assets/Scripts/Handler/UIHandler.cs
View File

@@ -23,7 +23,6 @@ namespace Assets.Scripts
public GameObject introduction;
public GameObject tooltip;
public GameObject tutorial;
public GameObject buttonsHUD;
public GameObject inventory;
public GameObject waterLayer;
@@ -107,7 +106,7 @@ namespace Assets.Scripts
introduction.transform.localScale = new Vector3(0, 0, 0);
tutorial.transform.localScale = new Vector3(1, 1, 1);
showHUD();
state = UIState.GAME;
state = UIState.TUTORIAL;
}
public void switchCharactersheet()
@@ -171,6 +170,7 @@ namespace Assets.Scripts
public void closeInventory()
{
inventory.GetComponent<Inventory>().OnMouseUp();
inventory.transform.localScale = new Vector3(0, 0, 0);
showHUD();
state = UIState.GAME;
@@ -194,7 +194,6 @@ namespace Assets.Scripts
{
playerHUD.transform.localScale = new Vector3(1,1,1);
compass.transform.localScale = new Vector3(1, 1, 1);
buttonsHUD.transform.localScale = new Vector3(1, 1, 1);
}
public void openMainMenu()
@@ -204,7 +203,7 @@ namespace Assets.Scripts
public void switchPauseMenu()
{
if (state == UIState.GAME || state == UIState.CHARACTER || state == UIState.PAUSE || state == UIState.QUEST)
if (state == UIState.GAME || state == UIState.CHARACTER || state == UIState.PAUSE || state == UIState.QUEST || state == UIState.INVENTORY || state == UIState.INTRODUCTION)
{
if (state == UIState.PAUSE)
{
@@ -533,7 +532,7 @@ namespace Assets.Scripts
GameObject.Find("Player").GetComponent<Player>().generatePlayer();
GameObject.Find("Player").GetComponent<Player>().finishPlayerCreation();
hideOtherElements(introduction);
state = UIState.TUTORIAL;
state = UIState.INTRODUCTION;
}
else
{
@@ -550,6 +549,7 @@ namespace Assets.Scripts
public void closeTutorial()
{
tutorial.transform.localScale = new Vector3(0,0,0);
state = UIState.GAME;
}
}
}

7
Assets/Scripts/Inventory.cs
View File

@@ -382,5 +382,12 @@ namespace Assets.Scripts
}
}
}
public void OnMouseUp(){
if(dragImage.GetComponent<RawImage>().texture != null){
dragImage.GetComponent<RawImage>().color = new Color(0,0,0,0);
dragImage.GetComponent<RawImage>().texture = null;
dragImage.transform.position = new Vector3(0,0,0);
}
}
}
}

2
Assets/Scripts/InventorySlot.cs
View File

@@ -110,7 +110,7 @@ namespace Assets.Scripts
{
inventory.dragImage.GetComponent<RawImage>().color = toMove.rarityColor;
inventory.dragImage.GetComponent<RawImage>().texture = toMove.image;
inventory.dragImage.transform.position = new Vector3(Input.mousePosition.x - 50, Input.mousePosition.y - 50, 0);
inventory.dragImage.transform.position = new Vector3(Input.mousePosition.x + 50, Input.mousePosition.y - 50, 0);
}
}

10
Assets/Scripts/PlayerCamera.cs
View File

@@ -11,8 +11,8 @@ namespace Assets.Scripts
GameObject player;
Vector2 rotation = Vector2.zero;
public float speed = 1; //the sensibility
public float xMaxLimit = 25.0f;
public float xMinLimit = -25.0f;
public float xMaxLimit = 5.0f;
public float xMinLimit = -5.0f;
GameObject interact;
// Start is called before the first frame update
@@ -26,13 +26,17 @@ namespace Assets.Scripts
// Update is called once per frame
void Update()
{
{
if(uihandler.canPlayerRotate()){
Cursor.lockState = CursorLockMode.Locked;
rotation.y += Input.GetAxis("Mouse X");
rotation.x += -Input.GetAxis("Mouse Y");
rotation.x = Mathf.Clamp(rotation.x, xMinLimit, xMaxLimit);
transform.eulerAngles = (Vector2)rotation * speed;
}
else{
Cursor.lockState = CursorLockMode.Confined;
}
transform.position = new Vector3(transform.parent.transform.position.x, transform.position.y, transform.parent.transform.position.z);
}

3
Assets/Scripts/UIState.cs
View File

@@ -17,6 +17,7 @@ namespace Assets.Scripts
PAUSEOPTIONS,
TUTORIAL,
QUEST,
INVENTORY
INVENTORY,
INTRODUCTION
}
}