Administrator approval is now required for registering new accounts. If you are registering a new account, and are external to the University, please ask the repository owner to contact ServiceLine to request your account be approved. Repository owners must include the newly registered email address, and specific repository in the request for approval.

Commit 4fd247ee authored by Jenny's avatar Jenny
Browse files

imported new houyu house, changed materials and lights, etc.

also fixed pick up system list bug, changed houyu house to red, moved statue a bit, changed talisman and feather collider sizes and changed archive lights
parent 0e7fa8c7
fileFormatVersion: 2
guid: 6edf279967659eb47ae4499962417707
ModelImporter:
serializedVersion: 20200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:
title: Start
tags:
colorID: 0
position: 562,143
---
Houyu: People have been going missing lately in the village. They were last seen on their way to collect resources near the caves. Dear mystic, please help us find them.
===
fileFormatVersion: 2
guid: e16deee2eaece9e468790b18b40fa0b5
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3}
baseLanguageID:
stringIDs:
- Houyu Dialogue-Start-0
compilationStatus: 1
isSuccesfullyCompiled: 1
compilationErrorMessage:
baseLanguage: {instanceID: 0}
localizations: []
......@@ -73,6 +73,6 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 0.5294118, g: 0.9150943, b: 0.14713275, a: 1}
- _Color: {r: 0.754717, g: 0.03951398, b: 0, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
......@@ -1887,10 +1887,10 @@ MonoBehaviour:
- {x: -11.4359455, y: 14.9987755}
- {x: -0.9298153, y: 30.068342}
- {x: -11.437101, y: 30.19853}
- {x: 24.448006, y: 16.068502}
- {x: 24.448004, y: 16.068502}
- {x: 10.787938, y: 16.068735}
- {x: 22.312729, y: 32.396095}
- {x: 10.791014, y: 30.14158}
- {x: 10.791013, y: 30.14158}
- {x: -11.278753, y: 14.992429}
- {x: -20.789104, y: 14.992369}
- {x: -11.281771, y: 30.192244}
......@@ -2194,10 +2194,10 @@ MonoBehaviour:
- {x: 0.51425105, y: -0.0030341344, z: -0.85763437, w: -1}
- {x: 0.23474953, y: 0.07661728, z: -0.9690317, w: -1}
- {x: 0.38237965, y: -0.098414674, z: -0.9187494, w: -1}
- {x: -0.94975144, y: 0.031128619, z: 0.31145337, w: -1}
- {x: -0.48509246, y: -0.0978292, z: 0.86897343, w: -1}
- {x: -0.6515317, y: -0.3652923, z: 0.664882, w: -1}
- {x: -0.2259004, y: -0.084709056, z: 0.9704605, w: -1}
- {x: -0.9497515, y: 0.031128623, z: 0.31145334, w: -1}
- {x: -0.4850924, y: -0.097829185, z: 0.86897343, w: -1}
- {x: -0.6515317, y: -0.36529225, z: 0.66488194, w: -1}
- {x: -0.22590038, y: -0.08470905, z: 0.9704605, w: -1}
- {x: 0.5143562, y: -0.020586658, z: -0.8573295, w: -1}
- {x: 0.9306714, y: -0.020082856, z: -0.36530462, w: -1}
- {x: 0.5503492, y: 0.067586064, z: -0.8321946, w: -1}
......@@ -2374,6 +2374,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -2398,6 +2399,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1837626735706945490
MeshFilter:
m_ObjectHideFlags: 0
......@@ -4318,10 +4320,10 @@ MonoBehaviour:
- {x: -11.4359455, y: 14.9987755}
- {x: -0.9298153, y: 30.068342}
- {x: -11.437101, y: 30.19853}
- {x: 24.448006, y: 16.068502}
- {x: 24.448004, y: 16.068502}
- {x: 10.787938, y: 16.068735}
- {x: 22.312729, y: 32.396095}
- {x: 10.791014, y: 30.14158}
- {x: 10.791013, y: 30.14158}
- {x: -11.278753, y: 14.992429}
- {x: -20.789104, y: 14.992369}
- {x: -11.281771, y: 30.192244}
......@@ -4625,10 +4627,10 @@ MonoBehaviour:
- {x: 0.51425105, y: -0.0030341344, z: -0.85763437, w: -1}
- {x: 0.23474953, y: 0.07661728, z: -0.9690317, w: -1}
- {x: 0.38237965, y: -0.098414674, z: -0.9187494, w: -1}
- {x: -0.94975144, y: 0.031128619, z: 0.31145337, w: -1}
- {x: -0.48509246, y: -0.0978292, z: 0.86897343, w: -1}
- {x: -0.6515317, y: -0.3652923, z: 0.664882, w: -1}
- {x: -0.2259004, y: -0.084709056, z: 0.9704605, w: -1}
- {x: -0.9497515, y: 0.031128623, z: 0.31145334, w: -1}
- {x: -0.4850924, y: -0.097829185, z: 0.86897343, w: -1}
- {x: -0.6515317, y: -0.36529225, z: 0.66488194, w: -1}
- {x: -0.22590038, y: -0.08470905, z: 0.9704605, w: -1}
- {x: 0.5143562, y: -0.020586658, z: -0.8573295, w: -1}
- {x: 0.9306714, y: -0.020082856, z: -0.36530462, w: -1}
- {x: 0.5503492, y: 0.067586064, z: -0.8321946, w: -1}
......@@ -4805,6 +4807,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
......@@ -4829,6 +4832,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1837626735884029875
MeshFilter:
m_ObjectHideFlags: 0
......
This source diff could not be displayed because it is too large. You can view the blob instead.
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class BestiaryUIScript : MonoBehaviour
{
public static bool BestiaryIsUp = false;
public GameObject bestiaryUI;
public GameObject bestiaryIcon;
void Update()
{
if (Input.GetKeyDown(KeyCode.Tab))
{
if (BestiaryIsUp)
{
ExitBestiary();
}
else
{
OpenBestiary();
}
}
}
private void OpenBestiary()
{
BestiaryIsUp = true;
bestiaryUI.SetActive(true);
bestiaryIcon.SetActive(false);
Cursor.visible = true;
Cursor.lockState = CursorLockMode.None;
}
private void ExitBestiary()
{
bestiaryUI.SetActive(false);
bestiaryIcon.SetActive(true);
BestiaryIsUp = false;
Cursor.visible = false;
Cursor.lockState = CursorLockMode.Locked;
BestiaryIsUp = false;
}
}
fileFormatVersion: 2
guid: 0ec25eb7b92c1d04caa9db0a8aee9e4a
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
using System.Collections;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
using Yarn.Unity.Example;
public class DialogueScript : MonoBehaviour
{
public bool inDialog;
public List<GameObject> NPCs;
public GameObject interactiveNPC;
public GameObject DialogueUI;
#pragma warning disable 0649
[SerializeField] Image speakerPortrait;
[SerializeField] TextMeshProUGUI txt_Dialog, txt_SpeakerName;
#pragma warning restore 0649
public static NPC ActiveNPC { get; private set; }
#pragma warning disable 0649
[SerializeField] GameObject chatBubble;
#pragma warning restore 0649
void Update()
{
if (inDialog)
{
GetComponent<SCTPSController>().enabled = false;
GameObject.Find("Capsule").GetComponent<PlayerPickUp>().enabled = false;
}
else if (!inDialog)
{
GetComponent<SCTPSController>().enabled = true;
GameObject.Find("Capsule").GetComponent<PlayerPickUp>().enabled = true;
}
if (Input.GetKeyDown(KeyCode.Space))
{
TalkToNPC();
}
}
public void TalkToNPC()
{
interactiveNPC = GetClosestNPC();
inDialog = true;
DialogueUI.SetActive(true);
}
public void OnDialogEnd()
{
inDialog = false;
}
private void Start()
{
Hide();
}
public void Show()
{
gameObject.SetActive(true);
}
public void Hide()
{
gameObject.SetActive(false);
}
private void OnTriggerEnter(Collider other)
{
if (other.gameObject.layer == 12)
{
//NPCs.Add(other.gameObject);
SetActiveNPC(true);
}
}
private void OnTriggerExit(Collider other)
{
if (NPCs.Contains(other.gameObject))
{
//NPCs.Remove(other.gameObject);
SetActiveNPC(false);
}
}
private GameObject GetClosestNPC()
{
int s = 0;
float compare = Mathf.Infinity;
for (int i = 0; i < NPCs.Count; i++)
{
float distance = (NPCs[i].transform.position - transform.position).magnitude;
if (distance < compare)
{
s = i;
compare = distance;
}
}
return NPCs[s];
}
void SetActiveNPC(bool set)
{
chatBubble.SetActive(set);
//ActiveNPC = set ? this : null;
}
}
fileFormatVersion: 2
guid: 7c846727599deb645b517e4c17d11bb5
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
......@@ -2,7 +2,7 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
[RequireComponent(typeof(SpringJoint))]
public class PickupObject : MonoBehaviour
public class NewPickupObject : MonoBehaviour
{
public float throwForce;
......@@ -49,7 +49,7 @@ public class PickupObject : MonoBehaviour
private void OnTriggerStay(Collider c)
{
if(c.gameObject.layer == 8 && !possibleItems.Contains(c.gameObject))
if(c.gameObject.layer == 10 && !possibleItems.Contains(c.gameObject))
{
possibleItems.Add(c.gameObject);
}
......
......@@ -68,7 +68,9 @@ public class PlayerPickUp : MonoBehaviour
ObjectIWantToPickUp.GetComponent<Rigidbody>().constraints = RigidbodyConstraints.None;
hasItem = false;
interactiveobjects.Clear();
Cursor.visible = false;
Cursor.lockState = CursorLockMode.Locked;
}
......@@ -98,6 +100,8 @@ public class PlayerPickUp : MonoBehaviour
Cursor.visible = false;
hasItem = false;
interactiveobjects.Clear();
}
void FixedUpdate()
......@@ -122,7 +126,6 @@ public class PlayerPickUp : MonoBehaviour
if (interactiveobjects.Contains(other.gameObject))
{
interactiveobjects.Remove(other.gameObject);
anim.SetBool("PickUp", false);
}
}
......
fileFormatVersion: 2
guid: dbe7fce405a69b14fb82ac2426b14082
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: db38f614066883d46a090d609ca95844
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 0
lightmap: 0