浏览代码

bunch of fixes based on feedback, adding changelog

galo 1 年之前
父节点
当前提交
e91cf3fa22
共有 9 个文件被更改,包括 40 次插入15 次删除
  1. 1 1
      Client.gd
  2. 4 2
      Server.gd
  3. 1 0
      Textures.gd
  4. 1 1
      enemie/new_spriteframes.tres
  5. 13 8
      enemie/newai.gd
  6. 1 1
      enemie/tankboss.tscn
  7. 1 0
      enemie/tankcanonball.tscn
  8. 3 0
      enemycount.gd
  9. 15 2
      main.tscn

+ 1 - 1
Client.gd

@@ -244,7 +244,7 @@ remote func _on_usernames(arg):
 var spriter = preload('res://enemie/enemyspriter.tscn')
 var sprite_list = {}
 
-remote func add_sprite(anim, pos, id):
+remote func add_sprite(anim, pos, id, auto):
 	if not sprite_list.keys().has(id):
 		var instancer = spriter.instance()
 		add_child(instancer)

+ 4 - 2
Server.gd

@@ -198,8 +198,8 @@ func level_up(lv, maxhp, gain, dmgup, id):
 	$players.get_node(str(id)).dmg += dmgup
 	rpc_id( 0,'atr_update', {id:{'maxhp':maxhp}})
 
-func spriter_request(anim, pos, id):
-	rpc_id( 0,'add_sprite', anim, pos, id)
+func spriter_request(anim, pos, id, auto):
+	rpc_id( 0,'add_sprite', anim, pos, id, auto)
 
 func spriter_nuke_request(time, id):
 	yield(get_tree().create_timer(time),"timeout")
@@ -208,3 +208,5 @@ func spriter_nuke_request(time, id):
 func flash_spriter(id):
 	print('flash')
 	rpc_id( 0,'flash_spriter', id)
+
+var enemy_counter

+ 1 - 0
Textures.gd

@@ -8,3 +8,4 @@ func _ready():
 	pass # Replace with function body.
 
 
+

+ 1 - 1
enemie/new_spriteframes.tres

@@ -170,7 +170,7 @@ animations = [ {
 "speed": 24.0
 }, {
 "frames": [ ExtResource( 139 ), ExtResource( 128 ), ExtResource( 133 ), ExtResource( 121 ), ExtResource( 140 ), ExtResource( 137 ), ExtResource( 141 ), ExtResource( 122 ), ExtResource( 136 ), ExtResource( 130 ), ExtResource( 123 ), ExtResource( 131 ), ExtResource( 132 ), ExtResource( 126 ), ExtResource( 127 ), ExtResource( 124 ), ExtResource( 134 ), ExtResource( 138 ), ExtResource( 125 ), ExtResource( 135 ), ExtResource( 129 ) ],
-"loop": true,
+"loop": false,
 "name": "explosion",
 "speed": 24.0
 } ]

+ 13 - 8
enemie/newai.gd

@@ -18,7 +18,7 @@ func damage(arg, id):
 		queue_free()
 
 var enemy_id = 0
-var type = 0
+export var type = 4
 var fliph = 0
 export var vida = 2
 # Called when the node enters the scene tree for the first time.
@@ -36,8 +36,11 @@ func find_target():
 		return data[0]
 
 func _ready(): 
-	enemy_id = get_tree().get_nodes_in_group('enemy').size()+1
-	find_target()
+	for x in get_tree().get_nodes_in_group('enemycount'):
+		x.enemycount += 1
+		enemy_id = x.enemycount
+		print(enemy_id)
+		find_target()
 
 var bullet = preload('res://bullet.tscn')
 var firerate = 30
@@ -61,9 +64,9 @@ export var gen = ['walkleft','walkright','idle','canon']
 var clock = 1
 var onceacycle = true
 
-func sprite_loader(anim,pos,id):
+func sprite_loader(anim,pos,id, auto = false):
 	for x in get_tree().get_nodes_in_group('server'):
-		x.spriter_request(anim,pos,id)
+		x.spriter_request(anim,pos,id, auto)
 
 func nuker_loader(time):
 	for x in get_tree().get_nodes_in_group('server'):
@@ -118,13 +121,15 @@ func _physics_process(delta):
 
 
 func _on_Area2D_body_entered(body):
-	sprite_loader('explosion',global_position,enemy_id)
+#	sprite_loader('explosion',global_position,enemy_id, true)
 	if body.is_in_group('player'):
+		sprite_loader('explosion',global_position,enemy_id, true)
 		body.damage(-20, enemy_id)
-		nuker_loader(1.0)
+#		nuker_loader(1.0)
 		queue_free()
 	if body.is_in_group('terrain'):
-		nuker_loader(1.0)
+		sprite_loader('explosion',global_position,enemy_id, true)
+#		nuker_loader(1.0)
 		queue_free()
 	pass # Replace with function body.
 

+ 1 - 1
enemie/tankboss.tscn

@@ -5,7 +5,7 @@
 [sub_resource type="RectangleShape2D" id=23]
 extents = Vector2( 128.34, 81.3173 )
 
-[node name="tank" type="KinematicBody2D" groups=["enemy"]]
+[node name="tank" type="KinematicBody2D" groups=["enemy", "ennemy"]]
 position = Vector2( 689.688, 214.579 )
 collision_layer = 12
 collision_mask = 0

+ 1 - 0
enemie/tankcanonball.tscn

@@ -10,6 +10,7 @@ position = Vector2( 689.688, 214.579 )
 collision_layer = 12
 collision_mask = 0
 script = ExtResource( 1 )
+type = 5
 gen = [ "followtarget" ]
 
 [node name="Area2D" type="Area2D" parent="."]

+ 3 - 0
enemycount.gd

@@ -0,0 +1,3 @@
+extends Node
+
+var enemycount = 0

文件差异内容过多而无法显示
+ 15 - 2
main.tscn


部分文件因为文件数量过多而无法显示