Skip to content

Commit a0a4610

Browse files
committed
Adding missing items + missing questline to a finite quest. Fixing errors.
Use TestingInventory with TestingGround_Questline scene to test the full quest
1 parent 73fea22 commit a0a4610

File tree

70 files changed

+1341
-1029
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1341
-1029
lines changed
Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 6
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: GoldenEgg
11+
m_Shader: {fileID: -6465566751694194690, guid: 6308ea4821d1aeb4cbe77aa991079282,
12+
type: 3}
13+
m_ShaderKeywords:
14+
m_LightmapFlags: 4
15+
m_EnableInstancingVariants: 0
16+
m_DoubleSidedGI: 0
17+
m_CustomRenderQueue: -1
18+
stringTagMap: {}
19+
disabledShaderPasses: []
20+
m_SavedProperties:
21+
serializedVersion: 3
22+
m_TexEnvs:
23+
- Texture2D_300EB541:
24+
m_Texture: {fileID: 0}
25+
m_Scale: {x: 1, y: 1}
26+
m_Offset: {x: 0, y: 0}
27+
- _AlphaTex:
28+
m_Texture: {fileID: 0}
29+
m_Scale: {x: 1, y: 1}
30+
m_Offset: {x: 0, y: 0}
31+
- _BaseMap:
32+
m_Texture: {fileID: 0}
33+
m_Scale: {x: 1, y: 1}
34+
m_Offset: {x: 0, y: 0}
35+
- _BumpMap:
36+
m_Texture: {fileID: 0}
37+
m_Scale: {x: 1, y: 1}
38+
m_Offset: {x: 0, y: 0}
39+
- _EmissionMap:
40+
m_Texture: {fileID: 0}
41+
m_Scale: {x: 1, y: 1}
42+
m_Offset: {x: 0, y: 0}
43+
- _MainTex:
44+
m_Texture: {fileID: 0}
45+
m_Scale: {x: 1, y: 1}
46+
m_Offset: {x: 0, y: 0}
47+
- _MainTexture:
48+
m_Texture: {fileID: 2800000, guid: ae898a3f2fcb4cc4799b161672460846, type: 3}
49+
m_Scale: {x: 1, y: 1}
50+
m_Offset: {x: 0, y: 0}
51+
- _MetallicGlossMap:
52+
m_Texture: {fileID: 0}
53+
m_Scale: {x: 1, y: 1}
54+
m_Offset: {x: 0, y: 0}
55+
- _OcclusionMap:
56+
m_Texture: {fileID: 0}
57+
m_Scale: {x: 1, y: 1}
58+
m_Offset: {x: 0, y: 0}
59+
- _SpecGlossMap:
60+
m_Texture: {fileID: 0}
61+
m_Scale: {x: 1, y: 1}
62+
m_Offset: {x: 0, y: 0}
63+
- _SpecularMap:
64+
m_Texture: {fileID: 0}
65+
m_Scale: {x: 1, y: 1}
66+
m_Offset: {x: 0, y: 0}
67+
- unity_Lightmaps:
68+
m_Texture: {fileID: 0}
69+
m_Scale: {x: 1, y: 1}
70+
m_Offset: {x: 0, y: 0}
71+
- unity_LightmapsInd:
72+
m_Texture: {fileID: 0}
73+
m_Scale: {x: 1, y: 1}
74+
m_Offset: {x: 0, y: 0}
75+
- unity_ShadowMasks:
76+
m_Texture: {fileID: 0}
77+
m_Scale: {x: 1, y: 1}
78+
m_Offset: {x: 0, y: 0}
79+
m_Floats:
80+
- PixelSnap: 0
81+
- Vector1_398E6F7F: 0.5
82+
- Vector1_8606F96E: 0
83+
- _AlphaClip: 0
84+
- _Blend: 0
85+
- _BumpScale: 1
86+
- _Cull: 2
87+
- _Cutoff: 0.5
88+
- _DstBlend: 0
89+
- _EnableExternalAlpha: 0
90+
- _EnvironmentReflections: 1
91+
- _FresnelOpacity: 0.5
92+
- _Fresnel_Power: 3
93+
- _GlossMapScale: 0
94+
- _Glossiness: 0
95+
- _GlossyReflections: 0
96+
- _Metallic: 0
97+
- _OcclusionStrength: 1
98+
- _OutlineDepthSensitivity: 1
99+
- _OutlineNormalsSensitivity: 1
100+
- _OutlineThickness: 1
101+
- _QueueOffset: 0
102+
- _ReceiveShadows: 1
103+
- _Smoothness: 0.5
104+
- _SmoothnessTextureChannel: 0
105+
- _SpecularHighlights: 1
106+
- _SrcBlend: 1
107+
- _Surface: 0
108+
- _WorkflowMode: 1
109+
- _ZWrite: 1
110+
m_Colors:
111+
- Color_9BF846A1: {r: 0.8962264, g: 0.80365604, b: 0, a: 0.2705882}
112+
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
113+
- _Color: {r: 1, g: 1, b: 1, a: 1}
114+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
115+
- _Flip: {r: 1, g: 1, b: 1, a: 1}
116+
- _MainColor: {r: 1, g: 1, b: 1, a: 0}
117+
- _Offset: {r: 0, g: 0, b: 0, a: 0}
118+
- _RendererColor: {r: 1, g: 1, b: 1, a: 1}
119+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
120+
- _SpecularColor: {r: 0, g: 0, b: 0, a: 0}
121+
- _Tiling: {r: 1, g: 1, b: 0, a: 0}
122+
m_BuildTextureStacks: []
123+
--- !u!114 &1993555791081402199
124+
MonoBehaviour:
125+
m_ObjectHideFlags: 11
126+
m_CorrespondingSourceObject: {fileID: 0}
127+
m_PrefabInstance: {fileID: 0}
128+
m_PrefabAsset: {fileID: 0}
129+
m_GameObject: {fileID: 0}
130+
m_Enabled: 1
131+
m_EditorHideFlags: 0
132+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
133+
m_Name:
134+
m_EditorClassIdentifier:
135+
version: 2

UOP1_Project/Assets/Art/Props/Food/CritterEggs/GoldenEgg.mat.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UOP1_Project/Assets/LocalizationFiles/AssetTables/Inventory/Inventory Item Description Shared Data.asset

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,10 @@ MonoBehaviour:
131131
m_Key: Onion
132132
m_Metadata:
133133
m_Items: []
134+
- m_Id: 85948406991544320
135+
m_Key: SavoryCakeWithPepper_Dish
136+
m_Metadata:
137+
m_Items: []
134138
m_Metadata:
135139
m_Items: []
136140
m_KeyGenerator:

UOP1_Project/Assets/LocalizationFiles/AssetTables/Inventory/Inventory Item Description_en.asset

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,5 +140,9 @@ MonoBehaviour:
140140
m_Localized: This is Onion
141141
m_Metadata:
142142
m_Items: []
143+
- m_Id: 85948406991544320
144+
m_Localized: This is a savory Cake with pepper
145+
m_Metadata:
146+
m_Items: []
143147
references:
144148
version: 1

UOP1_Project/Assets/LocalizationFiles/AssetTables/Inventory/Inventory Item Name Shared Data.asset

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,10 @@ MonoBehaviour:
135135
m_Key: Onion
136136
m_Metadata:
137137
m_Items: []
138+
- m_Id: 85964404536762368
139+
m_Key: SavoryCakeWithPepper_Dish
140+
m_Metadata:
141+
m_Items: []
138142
m_Metadata:
139143
m_Items: []
140144
m_KeyGenerator:

UOP1_Project/Assets/LocalizationFiles/AssetTables/Inventory/Inventory Item Name_en.asset

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,10 @@ MonoBehaviour:
141141
m_Localized: Onion
142142
m_Metadata:
143143
m_Items: []
144+
- m_Id: 85964404536762368
145+
m_Localized: Savory Cake with pepper
146+
m_Metadata:
147+
m_Items: []
144148
references:
145149
version: 1
146150
00000000:

0 commit comments

Comments
 (0)