diff --git a/sceen/people/Player.gd b/sceen/people/Player.gd index 14e0815..10b1b87 100644 --- a/sceen/people/Player.gd +++ b/sceen/people/Player.gd @@ -77,3 +77,6 @@ func _on_people_front_area_3d_area_exited(area: Area3D) -> void: var peopleWalkFollow = area.get_parent().get_parent() if ( area.is_in_group('player') and peopleWalkFollow.id != self.get_parent().id ) or area.is_in_group('needStopWalk') : frontPeople -= 1 + +func changeAreaRadius(radius:int) -> void: + $Area3D/CollisionShape3D.shape.radius = radius diff --git a/sceen/people/people.tscn b/sceen/people/people.tscn index 40fa45b..77ffced 100644 --- a/sceen/people/people.tscn +++ b/sceen/people/people.tscn @@ -159,6 +159,7 @@ bind/40/pose = Transform3D(-97.367, -1.63355, -22.7345, -22.721, -0.909508, 97.3 [sub_resource type="Animation" id="Animation_wnlof"] resource_name = "idle" length = 13.9667 +loop_mode = 1 tracks/0/type = "position_3d" tracks/0/imported = true tracks/0/enabled = true @@ -927,43 +928,43 @@ bones/0/name = "mixamorig_Hips" bones/0/parent = -1 bones/0/rest = Transform3D(1, 0, 0, 0, 0, 1, 0, -1, 0, 1.27157e-06, 0.727185, -101.106) bones/0/enabled = true -bones/0/position = Vector3(-0.029206, 0.592033, -100.715) -bones/0/rotation = Quaternion(-0.737665, 0.0189519, -0.00153328, 0.6749) +bones/0/position = Vector3(0.112986, -2.09532, -101.51) +bones/0/rotation = Quaternion(-0.745377, 0.052507, -0.0344321, 0.66368) bones/0/scale = Vector3(1, 1, 1) bones/1/name = "mixamorig_Spine" bones/1/parent = 0 bones/1/rest = Transform3D(1, 0, 0, 0, 0.993338, 0.115241, 0, -0.115241, 0.993338, 0, 8.18411, -0.949465) bones/1/enabled = true bones/1/position = Vector3(0, 8.18411, -0.949465) -bones/1/rotation = Quaternion(-0.00699776, -0.0193548, -0.0361133, 0.999136) +bones/1/rotation = Quaternion(0.00601875, -0.00439419, -0.0754152, 0.997124) bones/1/scale = Vector3(1, 1, 1) bones/2/name = "mixamorig_Spine1" bones/2/parent = 1 bones/2/rest = Transform3D(1, -1.0349e-14, -5.98303e-16, 1.0349e-14, 1, -1.11759e-07, 5.98304e-16, 1.11759e-07, 1, 1.13687e-13, 9.61215, 1.90735e-06) bones/2/enabled = true bones/2/position = Vector3(1.13687e-13, 9.61215, 1.90735e-06) -bones/2/rotation = Quaternion(0.0390021, -0.00691349, 0.00206464, 0.999213) +bones/2/rotation = Quaternion(0.0394391, -0.0032945, 0.00436015, 0.999207) bones/2/scale = Vector3(1, 1, 1) bones/3/name = "mixamorig_Spine2" bones/3/parent = 2 bones/3/rest = Transform3D(1, 2.00153e-14, 1.15714e-15, -2.00153e-14, 1, 3.35276e-08, -1.15714e-15, -3.35276e-08, 1, -1.33596e-13, 10.9853, -1.43051e-06) bones/3/enabled = true bones/3/position = Vector3(-1.33596e-13, 10.9853, -1.43051e-06) -bones/3/rotation = Quaternion(0.00946232, -0.00776925, 0.00198813, 0.999923) +bones/3/rotation = Quaternion(0.0101316, -0.00402832, 0.00446572, 0.999931) bones/3/scale = Vector3(1, 1, 1) bones/4/name = "mixamorig_Neck" bones/4/parent = 3 bones/4/rest = Transform3D(1, -9.66636e-15, 5.5884e-16, 9.66636e-15, 0.993338, -0.11524, 5.5884e-16, 0.11524, 0.993338, 1.02805e-13, 12.3585, 1.43051e-06) bones/4/enabled = true bones/4/position = Vector3(1.02805e-13, 12.3585, 1.43051e-06) -bones/4/rotation = Quaternion(0.0108383, 0.0120508, 0.0298303, 0.999424) +bones/4/rotation = Quaternion(0.0257098, 0.0421002, 0.0250387, 0.998469) bones/4/scale = Vector3(1, 1, 1) bones/5/name = "mixamorig_Head" bones/5/parent = 4 bones/5/rest = Transform3D(1, -1.78671e-22, -4.12717e-30, 1.78671e-22, 1, 1.43623e-08, 1.56105e-30, -1.43623e-08, 1, -2.60463e-20, 3.21729, 0.763869) bones/5/enabled = true bones/5/position = Vector3(-2.60463e-20, 3.21729, 0.763869) -bones/5/rotation = Quaternion(0.0280221, -0.0141492, -0.00915139, 0.999465) +bones/5/rotation = Quaternion(0.0550361, 0.199552, -0.0662985, 0.976092) bones/5/scale = Vector3(1, 1, 1) bones/6/name = "mixamorig_HeadTop_End" bones/6/parent = 5 @@ -977,49 +978,49 @@ bones/7/parent = 3 bones/7/rest = Transform3D(-0.0483947, 0.916197, -0.397796, 0.000189304, -0.398254, -0.917275, -0.998828, -0.0444665, 0.0190999, 5.94212, 9.79612, -0.286048) bones/7/enabled = true bones/7/position = Vector3(5.94212, 9.79612, -0.286048) -bones/7/rotation = Quaternion(-0.602851, -0.379777, 0.594292, -0.373037) +bones/7/rotation = Quaternion(-0.605231, -0.382331, 0.599175, -0.358479) bones/7/scale = Vector3(1, 1, 1) bones/8/name = "mixamorig_LeftArm" bones/8/parent = 7 bones/8/rest = Transform3D(0.999595, 0.0275357, 0.00711127, -0.0284391, 0.96784, 0.249953, 6.0536e-08, -0.250054, 0.968232, -4.17233e-07, 12.9189, -4.73857e-06) bones/8/enabled = true bones/8/position = Vector3(-1.94986e-07, 12.9189, 7.48976e-06) -bones/8/rotation = Quaternion(0.462087, 0.146171, -0.0121153, 0.874621) +bones/8/rotation = Quaternion(0.440541, 0.121029, -0.00304633, 0.889531) bones/8/scale = Vector3(1, 1, 1) bones/9/name = "mixamorig_LeftForeArm" bones/9/parent = 8 bones/9/rest = Transform3D(0.974116, -0.22605, 3.06096e-05, 0.22605, 0.974116, -0.000130785, -2.53494e-07, 0.000134319, 1, 2.38419e-07, 28.2068, 8.64267e-06) bones/9/enabled = true bones/9/position = Vector3(2.38419e-07, 28.2068, 8.64267e-06) -bones/9/rotation = Quaternion(0.0187419, 7.8445e-06, 0.163364, 0.986388) +bones/9/rotation = Quaternion(0.01244, 7.74355e-06, 0.108431, 0.994026) bones/9/scale = Vector3(1, 1, 1) bones/10/name = "mixamorig_LeftHand" bones/10/parent = 9 bones/10/rest = Transform3D(0.672626, -0.0502253, 0.738277, 0.0329363, 0.998737, 0.0379371, -0.73925, -0.00120131, 0.67343, 2.6226e-06, 19.5645, -1.3411e-05) bones/10/enabled = true -bones/10/position = Vector3(2.41404e-06, 19.5645, -1.93954e-06) -bones/10/rotation = Quaternion(0.0100723, 0.203831, -0.0502553, 0.977664) +bones/10/position = Vector3(2.41404e-06, 19.5645, -1.93955e-06) +bones/10/rotation = Quaternion(-0.0302754, 0.193006, 0.00500751, 0.980718) bones/10/scale = Vector3(1, 1, 1) bones/11/name = "mixamorig_LeftHandThumb1" bones/11/parent = 10 bones/11/rest = Transform3D(0.92986, -0.367914, 1.13472e-07, 0.367914, 0.92986, 2.62925e-07, -2.02247e-07, -2.02736e-07, 1, -2.8623, 4.99384, -2.08616e-05) bones/11/enabled = true bones/11/position = Vector3(-2.86231, 4.99385, 1.78814e-06) -bones/11/rotation = Quaternion(-0.00865349, 0.075381, 0.114051, 0.990573) +bones/11/rotation = Quaternion(-0.00804857, 0.0756082, 0.112801, 0.990704) bones/11/scale = Vector3(1, 1, 1) bones/12/name = "mixamorig_LeftHandThumb2" bones/12/parent = 11 bones/12/rest = Transform3D(1, 6.86049e-07, -4.61938e-07, -8.04067e-07, 0.937232, -0.348707, 1.93713e-07, 0.348707, 0.937232, -0.659386, 4.55735, -7.15256e-07) bones/12/enabled = true bones/12/position = Vector3(-0.659386, 4.55735, -7.15256e-07) -bones/12/rotation = Quaternion(0.0771765, -0.00608619, -0.011706, 0.99693) +bones/12/rotation = Quaternion(0.0780182, -0.00599014, -0.0131289, 0.996848) bones/12/scale = Vector3(1, 1, 1) bones/13/name = "mixamorig_LeftHandThumb3" bones/13/parent = 12 bones/13/rest = Transform3D(1, -4.89617e-07, 9.77094e-07, 4.93859e-07, 0.99999, -0.00434566, -9.74958e-07, 0.00434566, 0.999991, 0.0914857, 3.57954, 2.16961e-05) bones/13/enabled = true bones/13/position = Vector3(0.0914769, 3.57953, -2.76897e-07) -bones/13/rotation = Quaternion(-0.204663, 0.0501497, 0.183947, 0.960084) +bones/13/rotation = Quaternion(-0.203937, 0.0498635, 0.18264, 0.960503) bones/13/scale = Vector3(1, 1, 1) bones/14/name = "mixamorig_LeftHandThumb4" bones/14/parent = 13 @@ -1033,21 +1034,21 @@ bones/15/parent = 10 bones/15/rest = Transform3D(0.924797, -0.346208, 0.157768, 0.380461, 0.841537, -0.383491, 1.19209e-07, 0.414676, 0.909969, 3.94881e-06, 9.14785, -0.182659) bones/15/enabled = true bones/15/position = Vector3(7.25207e-06, 9.14784, -0.182642) -bones/15/rotation = Quaternion(0.102314, 0.054643, 0.188849, 0.975132) +bones/15/rotation = Quaternion(0.0879947, 0.0569687, 0.177331, 0.978553) bones/15/scale = Vector3(1, 1, 1) bones/16/name = "mixamorig_LeftHandIndex2" bones/16/parent = 15 bones/16/rest = Transform3D(1, -8.77798e-07, 5.35353e-07, 9.10341e-07, 0.997939, -0.0641656, -4.77926e-07, 0.0641656, 0.997939, 0.827006, 3.03702, 1.23009e-05) bones/16/enabled = true bones/16/position = Vector3(0.826986, 3.03702, -2.78339e-07) -bones/16/rotation = Quaternion(0.0642837, -0.00376718, -0.0871217, 0.994114) +bones/16/rotation = Quaternion(0.0507432, -0.00216426, -0.10011, 0.993679) bones/16/scale = Vector3(1, 1, 1) bones/17/name = "mixamorig_LeftHandIndex3" bones/17/parent = 16 bones/17/rest = Transform3D(1, 1.26158e-06, -9.56248e-07, -5.71261e-07, 0.850945, 0.525255, 1.47637e-06, -0.525255, 0.850945, -0.119586, 3.85442, -1.43051e-06) bones/17/enabled = true bones/17/position = Vector3(-0.119586, 3.85442, -1.43051e-06) -bones/17/rotation = Quaternion(0.0475478, 0.0686669, -0.106216, 0.990829) +bones/17/rotation = Quaternion(0.0349806, 0.0661709, -0.119994, 0.989949) bones/17/scale = Vector3(1, 1, 1) bones/18/name = "mixamorig_LeftHandIndex4" bones/18/parent = 17 @@ -1061,35 +1062,35 @@ bones/19/parent = 3 bones/19/rest = Transform3D(-0.0521172, -0.916197, 0.397325, -0.000196516, -0.397856, -0.917448, 0.998641, -0.047893, 0.0205553, -5.94212, 9.79867, -0.308181) bones/19/enabled = true bones/19/position = Vector3(-5.94212, 9.79867, -0.308181) -bones/19/rotation = Quaternion(0.640335, -0.329232, 0.606156, 0.337865) +bones/19/rotation = Quaternion(0.637859, -0.346237, 0.595645, 0.344185) bones/19/scale = Vector3(1, 1, 1) bones/20/name = "mixamorig_RightArm" bones/20/parent = 19 bones/20/rest = Transform3D(0.99987, -0.0156158, -0.00400995, 0.0161225, 0.968446, 0.248702, -2.74042e-07, -0.248734, 0.968572, -3.57628e-07, 12.9189, 6.49691e-06) bones/20/enabled = true bones/20/position = Vector3(8.83041e-07, 12.9189, -1.25181e-05) -bones/20/rotation = Quaternion(0.41907, 0.00906144, 0.0840924, 0.904006) +bones/20/rotation = Quaternion(0.445611, 0.0328768, 0.0879669, 0.890288) bones/20/scale = Vector3(1, 1, 1) bones/21/name = "mixamorig_RightForeArm" bones/21/parent = 20 bones/21/rest = Transform3D(0.979893, 0.199524, 0.000452532, -0.199524, 0.97989, 0.00222315, 1.39757e-07, -0.00226874, 0.999997, -4.76837e-07, 28.1944, 3.57628e-06) bones/21/enabled = true bones/21/position = Vector3(-4.76837e-07, 28.1944, 3.57628e-06) -bones/21/rotation = Quaternion(0.013398, 0.000113473, -0.11297, 0.993508) +bones/21/rotation = Quaternion(0.00930459, 0.000113859, -0.0784563, 0.996874) bones/21/scale = Vector3(1, 1, 1) bones/22/name = "mixamorig_RightHand" bones/22/parent = 21 bones/22/rest = Transform3D(0.676448, 0.133752, -0.724243, -0.117997, 0.99035, 0.072686, 0.726976, 0.03629, 0.685703, -9.53674e-07, 19.5044, 1.97887e-05) bones/22/enabled = true bones/22/position = Vector3(-3.29553e-06, 19.5044, -3.1323e-08) -bones/22/rotation = Quaternion(-0.178787, -0.35121, -0.00804681, 0.919033) +bones/22/rotation = Quaternion(-0.166773, -0.358016, -0.0573332, 0.91691) bones/22/scale = Vector3(1, 1, 1) bones/23/name = "mixamorig_RightHandThumb1" bones/23/parent = 22 bones/23/rest = Transform3D(0.949865, 0.31266, 9.69002e-07, -0.31266, 0.949865, 9.85212e-07, -6.12384e-07, -1.23879e-06, 1, 2.50966, 5.0724, 1.18911e-05) bones/23/enabled = true bones/23/position = Vector3(2.50966, 5.0724, 1.18911e-05) -bones/23/rotation = Quaternion(0.116791, -0.114428, -0.239112, 0.957127) +bones/23/rotation = Quaternion(0.116791, -0.114428, -0.239113, 0.957126) bones/23/scale = Vector3(1, 1, 1) bones/24/name = "mixamorig_RightHandThumb2" bones/24/parent = 23 @@ -1117,7 +1118,7 @@ bones/27/parent = 22 bones/27/rest = Transform3D(0.953689, 0.300519, 0.0128826, -0.300795, 0.952814, 0.0408458, 1.99769e-07, -0.0428292, 0.999082, -9.49949e-06, 9.31042, 0.427974) bones/27/enabled = true bones/27/position = Vector3(-9.49949e-06, 9.31042, 0.427974) -bones/27/rotation = Quaternion(0.456885, 0.121951, -0.461941, 0.75033) +bones/27/rotation = Quaternion(0.456885, 0.121951, -0.461942, 0.75033) bones/27/scale = Vector3(1, 1, 1) bones/28/name = "mixamorig_RightHandIndex2" bones/28/parent = 27 @@ -1145,28 +1146,28 @@ bones/31/parent = 0 bones/31/rest = Transform3D(-0.997092, 0.0763429, -2.1921e-07, -0.0763027, -0.996547, -0.0327371, -0.00249948, -0.0326414, 0.999466, 7.19464, -4.53866, -0.735134) bones/31/enabled = true bones/31/position = Vector3(7.19464, -4.53866, -0.735134) -bones/31/rotation = Quaternion(0.0532877, 0.00100961, 0.998539, -0.00893181) +bones/31/rotation = Quaternion(0.057758, 0.0291411, 0.997898, -0.00388327) bones/31/scale = Vector3(1.00001, 1, 1) bones/32/name = "mixamorig_LeftLeg" bones/32/parent = 31 bones/32/rest = Transform3D(0.99716, 0.0752341, 0.00333475, -0.0753079, 0.996184, 0.0441067, -3.70014e-06, -0.0442326, 0.999021, -1.96625e-06, 43.8643, -1.95982e-07) bones/32/enabled = true bones/32/position = Vector3(-1.96625e-06, 43.8643, -1.95982e-07) -bones/32/rotation = Quaternion(-0.108521, 0.0218102, -0.0377058, 0.993139) +bones/32/rotation = Quaternion(-0.152169, 0.067284, -0.0319369, 0.985544) bones/32/scale = Vector3(1, 1, 1) bones/33/name = "mixamorig_LeftFoot" bones/33/parent = 32 bones/33/rest = Transform3D(0.978181, -0.186946, -0.0906231, -1.63913e-06, 0.4362, -0.89985, 0.207753, 0.880217, 0.426682, -3.98722e-09, 44.8171, -9.49047e-07) bones/33/enabled = true bones/33/position = Vector3(-3.98722e-09, 44.8171, -9.49047e-07) -bones/33/rotation = Quaternion(0.549274, -0.0769577, 0.0724353, 0.828932) +bones/33/rotation = Quaternion(0.545918, -0.0718913, 0.073233, 0.83153) bones/33/scale = Vector3(1, 1, 1) bones/34/name = "mixamorig_LeftToeBase" bones/34/parent = 33 bones/34/rest = Transform3D(0.999267, -0.0189316, -0.033264, -2.42144e-07, 0.869099, -0.494638, 0.038274, 0.494276, 0.868462, -4.60073e-07, 16.231, 3.892e-06) bones/34/enabled = true bones/34/position = Vector3(-4.60073e-07, 16.231, 3.892e-06) -bones/34/rotation = Quaternion(0.271161, -0.0219152, 0.00396661, 0.962276) +bones/34/rotation = Quaternion(0.278234, -0.023488, 0.00353699, 0.96022) bones/34/scale = Vector3(1, 1, 1) bones/35/name = "mixamorig_LeftToe_End" bones/35/parent = 34 @@ -1180,28 +1181,28 @@ bones/36/parent = 0 bones/36/rest = Transform3D(-0.997092, -0.0763401, 9.43664e-07, 0.0762971, -0.996511, -0.0338389, 0.00258423, -0.03374, 0.999429, -7.19464, -4.53866, -0.802633) bones/36/enabled = true bones/36/position = Vector3(-7.19464, -4.53866, -0.802633) -bones/36/rotation = Quaternion(-0.137467, 0.0274989, 0.987271, 0.0751175) +bones/36/rotation = Quaternion(-0.139571, 0.0228653, 0.98705, 0.0756988) bones/36/scale = Vector3(1.00001, 1, 1) bones/37/name = "mixamorig_RightLeg" bones/37/parent = 36 bones/37/rest = Transform3D(0.99716, -0.0752396, -0.00314144, 0.0753051, 0.996294, 0.0415524, 3.40841e-06, -0.041671, 0.999131, 1.29687e-06, 43.8659, -2.47222e-07) bones/37/enabled = true bones/37/position = Vector3(1.29687e-06, 43.8659, -2.47222e-07) -bones/37/rotation = Quaternion(-0.123149, -0.0551508, 0.0332863, 0.990295) +bones/37/rotation = Quaternion(-0.127688, -0.012135, 0.027282, 0.991365) bones/37/scale = Vector3(1, 1, 1) bones/38/name = "mixamorig_RightFoot" bones/38/parent = 37 bones/38/rest = Transform3D(0.977899, 0.187771, 0.0919542, 1.41561e-06, 0.439803, -0.898094, -0.209077, 0.878245, 0.430083, 6.05767e-07, 44.8121, -1.40339e-07) bones/38/enabled = true bones/38/position = Vector3(6.05767e-07, 44.8121, -1.40339e-07) -bones/38/rotation = Quaternion(0.534828, 0.0981449, -0.0426536, 0.838157) +bones/38/rotation = Quaternion(0.527911, 0.0987846, -0.0390325, 0.842631) bones/38/scale = Vector3(1, 1, 1) bones/39/name = "mixamorig_RightToeBase" bones/39/parent = 38 bones/39/rest = Transform3D(0.999264, 0.0190586, 0.033292, -5.40167e-08, 0.867855, -0.496818, -0.0383613, 0.496452, 0.867216, 2.71521e-06, 16.1597, 3.90131e-06) bones/39/enabled = true bones/39/position = Vector3(2.71521e-06, 16.1597, 3.90131e-06) -bones/39/rotation = Quaternion(0.274112, 0.0223625, -0.00387957, 0.96143) +bones/39/rotation = Quaternion(0.273644, 0.0222576, -0.0039085, 0.961566) bones/39/scale = Vector3(1, 1, 1) bones/40/name = "mixamorig_RightToe_End" bones/40/parent = 39 diff --git a/sceen/totalOfLargePassengerFlow.gd b/sceen/totalOfLargePassengerFlow.gd index 38b675a..e6e5104 100644 --- a/sceen/totalOfLargePassengerFlow.gd +++ b/sceen/totalOfLargePassengerFlow.gd @@ -76,7 +76,7 @@ const areaInfo = { 'ticketingArea':[Vector3(-11.27,5.22,18.74)], 'entranceGateArea':[Vector3(-11.27,5.22,17.25),Vector3(36,5.22,17.25),Vector3(36,5.22,14.48)], 'assignArea':[Vector3(36,5.22,11.11),Vector3(33.9,5.22,11.11)], - 'gangwayUpArea':[Vector3(33.9,5.22,7.45),Vector3(31,5.22,7.45)], + 'gangwayUpArea':[Vector3(33.9,5.22,7.45),Vector3(31,5.22,7.45),Vector3(22.95,3.17,7.45),Vector3(20.87,3.17,7.45)], 'gangwayDownArea': [Vector3(14.12,0.85,7.45),Vector3(11.6,0.85,7.45)], 'elevatorUpArea': [Vector3(30.22,5.22,11.11)], 'elevatorDownArea': [Vector3(14.12,0.85,11.11)], @@ -95,8 +95,8 @@ const areaInfo = { 'stationHallExit':Vector3(93.38,5.22,21.04), 'ticketingArea':[Vector3(99,5.22,14.25),Vector3(99,5.22,7.86),Vector3(109.26,5.22,7.86)], 'entranceGateArea':[Vector3(109.26,5.22,6.86),Vector3(92,5.22,6.86),Vector3(92,5.22,12.98),Vector3(78.33,5.22,17.29),Vector3(56.29,5.22,17.29),Vector3(56.29,5.22,14.48)], - 'gangwayUpArea':[Vector3(56,5.22,7.45),Vector3(61.46,5.22,7.45)], - 'gangwayDownArea': [Vector3(77,0.85,7.45),Vector3(81.2,0.85,7.45)] + 'gangwayUpArea':[Vector3(56,5.22,7.45),Vector3(61.46,5.22,7.45),Vector3(68.44,3.47,7.45),Vector3(68.44,3.47,7.45)], + 'gangwayDownArea': [Vector3(77,0.85,7.45),Vector3(96.7,0.85,7.45)] } } @@ -144,9 +144,10 @@ func playerGoToNextArea(peopleWalkFollow:PlayerPathFollow,nextArea: PlayerWalkAr PlayerWalkArea3D.assignArea: walkByPathFollow(targetAreaInfo.assignArea,peopleWalkFollow) await peopleWalkFollow.player.ArriveTargetPos - var zhao = false + await get_tree().create_timer(0.2).timeout + var zhao = true if zhao : - playerGoToNextArea(peopleWalkFollow,PlayerWalkArea3D.gangwayDownArea) + playerGoToNextArea(peopleWalkFollow,PlayerWalkArea3D.gangwayUpArea) else : playerGoToNextArea(peopleWalkFollow,PlayerWalkArea3D.elevatorUpArea) PlayerWalkArea3D.gangwayUpArea: @@ -154,6 +155,8 @@ func playerGoToNextArea(peopleWalkFollow:PlayerPathFollow,nextArea: PlayerWalkAr await peopleWalkFollow.player.ArriveTargetPos playerGoToNextArea(peopleWalkFollow,PlayerWalkArea3D.gangwayDownArea) PlayerWalkArea3D.gangwayDownArea: + peopleWalkFollow.playerRotate(false) + await get_tree().create_timer(0.2).timeout walkByPathFollow(targetAreaInfo.gangwayDownArea,peopleWalkFollow) await peopleWalkFollow.player.ArriveTargetPos peopleWalkFollow.queue_free() @@ -211,14 +214,16 @@ func playerBackGoToNextArea(peopleWalkFollow:PlayerPathFollow,nextArea: PlayerWa peopleWalkFollow.player.setTargetPos(targetAreaInfo.passage,0.1) peopleWalkFollow.player.goToTarget() await peopleWalkFollow.player.ArriveTargetPos - playerBackGoToNextArea(peopleWalkFollow,PlayerWalkArea3D.entrance) + if peopleWalkFollow.generateArea == 'B' and !loopAntBEntrance : + peopleWalkFollow.queue_free() + else : + playerBackGoToNextArea(peopleWalkFollow,PlayerWalkArea3D.entrance) PlayerWalkArea3D.entrance: walkByPathFollow(targetAreaInfo.entrance,peopleWalkFollow) await peopleWalkFollow.player.ArriveTargetPos - if peopleWalkFollow.generateArea == 'C' or peopleWalkFollow.generateArea == 'D': + if peopleWalkFollow.generateArea == 'C' or peopleWalkFollow.generateArea == 'D' : peopleWalkFollow.queue_free() - elif peopleWalkFollow.generateArea == 'B' and loopAntBEntrance: - playerGoToNextArea(peopleWalkFollow,PlayerWalkArea3D.entrance) + playerGoToNextArea(peopleWalkFollow,PlayerWalkArea3D.entrance) ##演示排队的区域 @@ -286,6 +291,7 @@ func startGeneratePeople() -> void: $AllTimer/generatePeopleAEntranceTimer.start() $AllTimer/generatePeopleBEntranceTimer.start() $AllTimer/generatePeopleAtBTicketingArea.start() + $AllTimer/generatePeopleDownPlatformTimer.start() func startGeneratePeopleAtCD() -> void: $AllTimer/generatePeopleCEntranceTimer.start() @@ -330,10 +336,6 @@ func generatePeopleAtBTVM() -> void: var peoplePosition = Vector3(-11.27,5.22,17.66) generatePeopleAtDesignatedArea(peoplePosition,PlayerWalkArea3D.entranceGateArea,'A','BTVM{0}'.format([totalOfBTVM])) -##B端电梯生成 -func letPeopleTakeTheElevator() -> void: - $AllTimer/generatePeopleAtBElevatorUpArea.start() - ##售票厅循环排队 @@ -355,12 +357,14 @@ func generatePeopleAtBTicketingArea() -> void: ##下行站台生成 func letPeopleWaitTrainAtDownPlatform() -> void: + currentNeedGenerate = 16 $AllTimer/generatePeopleDownPlatformTimer.start() -var totalOfDownPlatform = 16 +var totalOfDownPlatform = 0 +var currentNeedGenerate = 4 func generatePeopleAtDownPlatform() -> void: - if totalOfDownPlatform > 0: - totalOfDownPlatform -= 1 + if totalOfDownPlatform < currentNeedGenerate : + totalOfDownPlatform += 1 var peoplePosition = Vector3(6.12,0.85,7.62) generatePeopleAtDesignatedArea(peoplePosition,PlayerWalkArea3D.screenDoorWaitArea,'A','A{0}'.format([totalOfDownPlatform])) else : @@ -372,7 +376,7 @@ func generatePeopleAtBEntrance() -> void: if totalOfBEntrance> 0: totalOfBEntrance -= 1 var peoplePosition = Vector3(-54.8,9.8,-61) - generatePeopleAtDesignatedArea(peoplePosition,PlayerWalkArea3D.entrance,'B','B{0}'.format([totalOfDownPlatform])) + generatePeopleAtDesignatedArea(peoplePosition,PlayerWalkArea3D.entrance,'B','B{0}'.format([totalOfBEntrance])) else : $AllTimer/generatePeopleBEntranceTimer.stop() @@ -381,7 +385,7 @@ var totalOfCEntrance = 21 func generatePeopleAtCEntrance() -> void: totalOfCEntrance += 1 var peoplePosition = Vector3(146.12,9.8,-60) - generatePeopleAtDesignatedArea(peoplePosition,PlayerWalkArea3D.entrance,'C','C{0}'.format([totalOfDownPlatform])) + generatePeopleAtDesignatedArea(peoplePosition,PlayerWalkArea3D.entrance,'C','C{0}'.format([totalOfCEntrance])) ##D入口生成 var totalOfDEntrance = 0 @@ -390,7 +394,7 @@ func generatePeopleAtDEntrance() -> void: if totalOfDEntrance > 10: $AllTimer/generatePeopleDEntranceTimer.wait_time = 6 var peoplePosition = Vector3(146.12,9.8,46) - generatePeopleAtDesignatedArea(peoplePosition,PlayerWalkArea3D.entrance,'D','D{0}'.format([totalOfDownPlatform])) + generatePeopleAtDesignatedArea(peoplePosition,PlayerWalkArea3D.entrance,'D','D{0}'.format([totalOfDEntrance])) ##在指定区域增加人 func generatePeopleAtDesignatedArea(peoplePosition:Vector3, goToNextArea: PlayerWalkArea3D,generateArea:String, peopleId:String='0A') -> void: @@ -418,6 +422,7 @@ func peopleAtDownPlatformDecreased() -> void: var allPeopleAtDownPlatform = $AllNoMovePeople/AllPeopleAtDownPlatform.get_children() for child in allPeopleAtDownPlatform : child.position.y = 0.85 + child.get_node('Player').state_machine.change_state("Idle") func temporaryTicketOfficeComing() -> void: diff --git a/trainings/trainingLargePassengerFlow/trainingLargePassengerFlow.gd b/trainings/trainingLargePassengerFlow/trainingLargePassengerFlow.gd index 8d551ed..dbaf0cf 100644 --- a/trainings/trainingLargePassengerFlow/trainingLargePassengerFlow.gd +++ b/trainings/trainingLargePassengerFlow/trainingLargePassengerFlow.gd @@ -835,9 +835,12 @@ func allTimerStopAndShowRedStripe() -> void: $total.allTimerStopAndShowRedStripe() ##提示弹框点确定触发下一步 +var hasShowPlatformCrowd = false func showFaultTipDialogAfterPlatformCrowd() -> void: - await get_tree().create_timer(15).timeout - $FaultTipDialog.show() + if !hasShowPlatformCrowd : + hasShowPlatformCrowd = true + await get_tree().create_timer(15).timeout + $FaultTipDialog.show() func showFaultTipDialogAfterPlatformNotCrowd(currentStep) -> void: await get_tree().create_timer(currentStep.waitTime).timeout