Skip to content

Commit e0ae167

Browse files
nearnshawdalkia
nearnshaw
and
dalkia
authored
Fix hummingbird scene & Simple NFT & reward-claim (#213)
* Changing bird scene wait logic * place ground via visual editor * fix hummingbird scene * fix conflicts * fix hummingbirds * fix Simple NFT * lint * lint * fix rewards claim --------- Signed-off-by: Nicolas Earnshaw <nearnshaw@decentraland.org> Co-authored-by: Juan Ignacio Molteni <juanignaciomolteni@gmail.com>
1 parent 25f5173 commit e0ae167

File tree

22 files changed

+1277
-224
lines changed

22 files changed

+1277
-224
lines changed

‎Hummingbirds/assets/scene/main.composite

+370
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,370 @@
1+
{
2+
"version": 1,
3+
"components": [
4+
{
5+
"name": "inspector::SceneMetadata",
6+
"jsonSchema": {
7+
"type": "object",
8+
"properties": {
9+
"name": {
10+
"type": "string",
11+
"serializationType": "optional",
12+
"optionalJsonSchema": {
13+
"type": "string",
14+
"serializationType": "utf8-string"
15+
}
16+
},
17+
"description": {
18+
"type": "string",
19+
"serializationType": "optional",
20+
"optionalJsonSchema": {
21+
"type": "string",
22+
"serializationType": "utf8-string"
23+
}
24+
},
25+
"thumbnail": {
26+
"type": "string",
27+
"serializationType": "optional",
28+
"optionalJsonSchema": {
29+
"type": "string",
30+
"serializationType": "utf8-string"
31+
}
32+
},
33+
"ageRating": {
34+
"type": "string",
35+
"serializationType": "optional",
36+
"optionalJsonSchema": {
37+
"type": "string",
38+
"enum": [
39+
"T",
40+
"A"
41+
],
42+
"default": "T",
43+
"serializationType": "enum-string",
44+
"enumObject": {
45+
"Teen": "T",
46+
"Adult": "A"
47+
}
48+
}
49+
},
50+
"categories": {
51+
"type": "array",
52+
"serializationType": "optional",
53+
"optionalJsonSchema": {
54+
"type": "array",
55+
"items": {
56+
"type": "string",
57+
"enum": [
58+
"art",
59+
"game",
60+
"casino",
61+
"social",
62+
"music",
63+
"fashion",
64+
"crypto",
65+
"education",
66+
"shop",
67+
"business",
68+
"sports"
69+
],
70+
"default": "game",
71+
"serializationType": "enum-string",
72+
"enumObject": {
73+
"ART": "art",
74+
"GAME": "game",
75+
"CASINO": "casino",
76+
"SOCIAL": "social",
77+
"MUSIC": "music",
78+
"FASHION": "fashion",
79+
"CRYPTO": "crypto",
80+
"EDUCATION": "education",
81+
"SHOP": "shop",
82+
"BUSINESS": "business",
83+
"SPORTS": "sports"
84+
}
85+
},
86+
"serializationType": "array"
87+
}
88+
},
89+
"author": {
90+
"type": "string",
91+
"serializationType": "optional",
92+
"optionalJsonSchema": {
93+
"type": "string",
94+
"serializationType": "utf8-string"
95+
}
96+
},
97+
"email": {
98+
"type": "string",
99+
"serializationType": "optional",
100+
"optionalJsonSchema": {
101+
"type": "string",
102+
"serializationType": "utf8-string"
103+
}
104+
},
105+
"tags": {
106+
"type": "array",
107+
"serializationType": "optional",
108+
"optionalJsonSchema": {
109+
"type": "array",
110+
"items": {
111+
"type": "string",
112+
"serializationType": "utf8-string"
113+
},
114+
"serializationType": "array"
115+
}
116+
},
117+
"layout": {
118+
"type": "object",
119+
"properties": {
120+
"base": {
121+
"type": "object",
122+
"properties": {
123+
"x": {
124+
"type": "integer",
125+
"serializationType": "int32"
126+
},
127+
"y": {
128+
"type": "integer",
129+
"serializationType": "int32"
130+
}
131+
},
132+
"serializationType": "map"
133+
},
134+
"parcels": {
135+
"type": "array",
136+
"items": {
137+
"type": "object",
138+
"properties": {
139+
"x": {
140+
"type": "integer",
141+
"serializationType": "int32"
142+
},
143+
"y": {
144+
"type": "integer",
145+
"serializationType": "int32"
146+
}
147+
},
148+
"serializationType": "map"
149+
},
150+
"serializationType": "array"
151+
}
152+
},
153+
"serializationType": "map"
154+
},
155+
"silenceVoiceChat": {
156+
"type": "boolean",
157+
"serializationType": "optional",
158+
"optionalJsonSchema": {
159+
"type": "boolean",
160+
"serializationType": "boolean"
161+
}
162+
},
163+
"disablePortableExperiences": {
164+
"type": "boolean",
165+
"serializationType": "optional",
166+
"optionalJsonSchema": {
167+
"type": "boolean",
168+
"serializationType": "boolean"
169+
}
170+
},
171+
"spawnPoints": {
172+
"type": "array",
173+
"serializationType": "optional",
174+
"optionalJsonSchema": {
175+
"type": "array",
176+
"items": {
177+
"type": "object",
178+
"properties": {
179+
"name": {
180+
"type": "string",
181+
"serializationType": "utf8-string"
182+
},
183+
"default": {
184+
"type": "boolean",
185+
"serializationType": "optional",
186+
"optionalJsonSchema": {
187+
"type": "boolean",
188+
"serializationType": "boolean"
189+
}
190+
},
191+
"position": {
192+
"type": "object",
193+
"properties": {
194+
"x": {
195+
"type": "object",
196+
"properties": {
197+
"single": {
198+
"type": "integer",
199+
"serializationType": "int32"
200+
},
201+
"range": {
202+
"type": "array",
203+
"items": {
204+
"type": "integer",
205+
"serializationType": "int32"
206+
},
207+
"serializationType": "array"
208+
}
209+
},
210+
"serializationType": "one-of"
211+
},
212+
"y": {
213+
"type": "object",
214+
"properties": {
215+
"single": {
216+
"type": "integer",
217+
"serializationType": "int32"
218+
},
219+
"range": {
220+
"type": "array",
221+
"items": {
222+
"type": "integer",
223+
"serializationType": "int32"
224+
},
225+
"serializationType": "array"
226+
}
227+
},
228+
"serializationType": "one-of"
229+
},
230+
"z": {
231+
"type": "object",
232+
"properties": {
233+
"single": {
234+
"type": "integer",
235+
"serializationType": "int32"
236+
},
237+
"range": {
238+
"type": "array",
239+
"items": {
240+
"type": "integer",
241+
"serializationType": "int32"
242+
},
243+
"serializationType": "array"
244+
}
245+
},
246+
"serializationType": "one-of"
247+
}
248+
},
249+
"serializationType": "map"
250+
},
251+
"cameraTarget": {
252+
"type": "object",
253+
"serializationType": "optional",
254+
"optionalJsonSchema": {
255+
"type": "object",
256+
"properties": {
257+
"x": {
258+
"type": "integer",
259+
"serializationType": "int32"
260+
},
261+
"y": {
262+
"type": "integer",
263+
"serializationType": "int32"
264+
},
265+
"z": {
266+
"type": "integer",
267+
"serializationType": "int32"
268+
}
269+
},
270+
"serializationType": "map"
271+
}
272+
}
273+
},
274+
"serializationType": "map"
275+
},
276+
"serializationType": "array"
277+
}
278+
}
279+
},
280+
"serializationType": "map"
281+
},
282+
"data": {
283+
"0": {
284+
"json": {
285+
"name": "Test Scene",
286+
"description": "This is a test scene",
287+
"thumbnail": "assets/scene/thumbnail.png",
288+
"ageRating": "T",
289+
"categories": [],
290+
"author": "",
291+
"email": "",
292+
"tags": [],
293+
"layout": {
294+
"base": {
295+
"x": 0,
296+
"y": 0
297+
},
298+
"parcels": [
299+
{
300+
"x": 0,
301+
"y": 0
302+
}
303+
]
304+
}
305+
}
306+
}
307+
}
308+
},
309+
{
310+
"name": "inspector::Nodes",
311+
"jsonSchema": {
312+
"type": "object",
313+
"properties": {
314+
"value": {
315+
"type": "array",
316+
"items": {
317+
"type": "object",
318+
"properties": {
319+
"entity": {
320+
"type": "integer",
321+
"serializationType": "entity"
322+
},
323+
"open": {
324+
"type": "boolean",
325+
"serializationType": "optional",
326+
"optionalJsonSchema": {
327+
"type": "boolean",
328+
"serializationType": "boolean"
329+
}
330+
},
331+
"children": {
332+
"type": "array",
333+
"items": {
334+
"type": "integer",
335+
"serializationType": "entity"
336+
},
337+
"serializationType": "array"
338+
}
339+
},
340+
"serializationType": "map"
341+
},
342+
"serializationType": "array"
343+
}
344+
},
345+
"serializationType": "map"
346+
},
347+
"data": {
348+
"0": {
349+
"json": {
350+
"value": [
351+
{
352+
"entity": 0,
353+
"children": [],
354+
"open": true
355+
},
356+
{
357+
"entity": 1,
358+
"children": []
359+
},
360+
{
361+
"entity": 2,
362+
"children": []
363+
}
364+
]
365+
}
366+
}
367+
}
368+
}
369+
]
370+
}

‎Hummingbirds/main.crdt

13.1 KB
Binary file not shown.

‎Hummingbirds/package.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@
44
"version": "1.0.0",
55
"dependencies": {
66
"@dcl-sdk/utils": "latest",
7+
"@dcl/js-runtime": "latest",
78
"@dcl/sdk": "latest"
89
},
9-
"devDependencies": {},
10+
"devDependencies": {
11+
"@dcl/asset-packs": "latest"
12+
},
1013
"scripts": {
1114
"build": "sdk-commands build --skip-install",
1215
"deploy": "sdk-commands deploy",

‎Hummingbirds/src/index.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ export function main() {
4040
states: [
4141
{
4242
clip: 'Tree_Action',
43-
shouldReset: true
43+
shouldReset: true,
44+
loop: false
4445
}
4546
]
4647
})

‎Simple-NFT/assets/builder/wood/FloorBaseWood_01/FloorBaseWood_01.glb

3.61 KB
Binary file not shown.

‎Simple-NFT/assets/builder/wood/FloorBaseWood_01/Floor_Wood.png.001.png

41.6 KB
Loading

0 commit comments

Comments
 (0)