darknight/puzzle-quest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'Fix anim HUD' (#84) from bugfix/hud-object-list-anim into dev

Browse Source 
Reviewed-on: Athena/game-source#84
This commit is contained in:
darknight
2021-06-26 15:59:05 +02:00
parent a33ecafb81 301ef3f916
commit d48940296f
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scenes/levels/Levels.gd
+3 -4
View File
@@ -223,15 +223,14 @@ func _node_object_list(key):
for child in $ListObjects/ListContainer.get_children(): for child in $ListObjects/ListContainer.get_children():
if child.has_meta("name"): if child.has_meta("name"):
name = var2str(child.get_meta("name")) if child.get_meta("name") == meshes[key].label():
if name == meshes[key].label():
child.set_meta("counted", child.get_meta("counted") + 1) child.set_meta("counted", child.get_meta("counted") + 1)
if child.get_meta("counter") == child.get_meta("counted"): if child.get_meta("counter") == child.get_meta("counted"):
animation_played = name animation_played = child.get_meta("name")
else: else:
var diff = child.get_meta("counter") - child.get_meta("counted") var diff = child.get_meta("counter") - child.get_meta("counted")
var txt = name var txt = child.get_meta("name")
if diff != 1: if diff != 1:
txt = txt + " " + String(diff) txt = txt + " " + String(diff)
animation_played = child.get_meta("animation") animation_played = child.get_meta("animation")
scenes/levels/warcraft/WarCraft.tscn
+1 -1
View File
@@ -553,7 +553,7 @@ cell_center_y = false
cell_center_z = false cell_center_z = false
baked_meshes = [ SubResource( 17 ) ] baked_meshes = [ SubResource( 17 ) ]
data = { data = {
"cells": PoolIntArray( 0, 0, 536870912, 65531, 0, 536870915, 65532, 0, 536870912, 65533, 0, 0, 65534, 0, 0, 65535, 0, 536870912, 0, 1, 536870912, 65531, 1, 536870915, 65532, 1, 0, 65533, 1, 0, 65534, 1, 536870912, 65535, 1, 0, 0, 2, 0, 65531, 2, 536870915, 65532, 2, 536870912, 65533, 2, 536870912, 65534, 2, 536870912, 65535, 2, 536870912, 0, 65533, 0, 65532, 65533, 0, 65533, 65533, 536870912, 65534, 65533, 536870912, 65535, 65533, 536870912, 0, 65534, 536870912, 65531, 65534, 536870915, 65532, 65534, 536870912, 65533, 65534, 536870912, 65534, 65534, 536870912, 65535, 65534, 536870912, 0, 65535, 536870912, 65531, 65535, 3, 65532, 65535, 0, 65533, 65535, 0, 65534, 65535, 0, 65535, 65535, 0 ) "cells": PoolIntArray( 0, 0, 536870912, 65531, 0, 536870915, 65532, 0, 536870912, 65533, 0, 1073741824, 65534, 0, 0, 65535, 0, 0, 0, 1, 536870912, 65531, 1, 536870915, 65532, 1, 0, 65533, 1, 536870912, 65534, 1, 536870912, 65535, 1, 0, 0, 2, 536870912, 65531, 2, 536870915, 65532, 2, 536870912, 65533, 2, 536870912, 65534, 2, 0, 65535, 2, 0, 0, 65533, 0, 65532, 65533, 0, 65533, 65533, 536870912, 65534, 65533, 0, 65535, 65533, 536870912, 0, 65534, 0, 65531, 65534, 3, 65532, 65534, 536870912, 65533, 65534, 536870912, 65534, 65534, 536870912, 65535, 65534, 536870912, 0, 65535, 536870912, 65531, 65535, 536870915, 65532, 65535, 0, 65533, 65535, 1073741824, 65534, 65535, 1073741824, 65535, 65535, 1073741824 )
} }
__meta__ = { __meta__ = {
"_editor_clip_": 0, "_editor_clip_": 0,