Cal
/
Frame
forked from zxl/Frame
1
0
Fork 0
Code Pull Requests Activity

add boss

master
zxl 2024-04-09 14:05:45 +08:00
parent 756b5fcae9
commit 1583496887
3 changed files with 16 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
.idea/.idea.TestF/.idea/workspace.xml
View File

@ -6,68 +6,8 @@
<component name="ChangeListManager">
<list default="true" id="d018256f-8250-4025-b60e-7cdf03f0e7e0" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.idea/.idea.TestF/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.TestF/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Hotfix/Prefabs/Role/boss1.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Hotfix/Prefabs/Role/boss1.prefab" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Hotfix/Prefabs/Role/player1.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Hotfix/Prefabs/Role/player1.prefab" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Hotfix/Prefabs/Room/伏龙阁.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Hotfix/Prefabs/Room/伏龙阁.prefab" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Resources/Fonts/MSYH SDF.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/Fonts/MSYH SDF.asset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scenes/Init.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/Init.unity" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/BFS/BFSManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/BFS/BFSManager.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Game.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Game.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Player/PlayerInfo.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Player/PlayerInfo.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Procedure/Logic/GameSceneLogicProcedure.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Procedure/Logic/GameSceneLogicProcedure.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Procedure/ProcedureType.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Procedure/ProcedureType.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/RayCast/MouseInput.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/RayCast/MouseInput.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Room/IRoomManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Room/IRoomManager.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Room/Room.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Room/Room.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Room/RoomInfo.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Room/RoomInfo.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Test.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Test.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/Logic/GameSceneMainUI.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/Logic/GameSceneMainUI.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/0470e0c9747601c944e9fcd8c21d0428.bundle.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/0470e0c9747601c944e9fcd8c21d0428.bundle.meta" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/140ec779b88e739833faf19363e7dd08.bundle" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/140ec779b88e739833faf19363e7dd08.bundle.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/15c39a94d7605ef521f97f4326e193d1.bundle" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/15c39a94d7605ef521f97f4326e193d1.bundle.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/3897104ae886d6c2e39ccd386d5b3d51.bundle" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/3897104ae886d6c2e39ccd386d5b3d51.bundle.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/47f64afc9f111ad3c55740ddc8f7571d.bundle" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/47f64afc9f111ad3c55740ddc8f7571d.bundle.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/5927094d0371f62e9c2213fc6a90386d.bundle" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/5927094d0371f62e9c2213fc6a90386d.bundle.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/PackageManifest_DefaultPackage.version" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/PackageManifest_DefaultPackage.version" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/PackageManifest_DefaultPackage_2024-04-08-1261.bytes" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/PackageManifest_DefaultPackage_2024-04-08-1261.bytes.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/PackageManifest_DefaultPackage_2024-04-08-1261.hash" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/StreamingAssets/yoo/DefaultPackage/PackageManifest_DefaultPackage_2024-04-08-1261.hash.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-08-1261/0470e0c9747601c944e9fcd8c21d0428.bundle" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-08-1261/140ec779b88e739833faf19363e7dd08.bundle" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-08-1261/15c39a94d7605ef521f97f4326e193d1.bundle" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-08-1261/3897104ae886d6c2e39ccd386d5b3d51.bundle" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-08-1261/41c13f94697dc3468089cf891a0a2139.bundle" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-08-1261/47f64afc9f111ad3c55740ddc8f7571d.bundle" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-08-1261/5927094d0371f62e9c2213fc6a90386d.bundle" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-08-1261/BuildReport_DefaultPackage_2024-04-08-1261.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-08-1261/OutputCache" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-08-1261/OutputCache.manifest" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-08-1261/PackageManifest_DefaultPackage.version" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-08-1261/PackageManifest_DefaultPackage_2024-04-08-1261.bytes" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-08-1261/PackageManifest_DefaultPackage_2024-04-08-1261.hash" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-08-1261/PackageManifest_DefaultPackage_2024-04-08-1261.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/2024-04-08-1261/dcdc2272c3b34e3679c8eb51ff19c17c.bundle" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/OutputCache" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/OutputCache" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/OutputCache.manifest" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/OutputCache.manifest" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_hotfix_animator.bundle.manifest" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_hotfix_animator.bundle.manifest" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_hotfix_art_da_tao_sha.bundle" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_hotfix_art_da_tao_sha.bundle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_hotfix_art_da_tao_sha.bundle.manifest" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_hotfix_art_da_tao_sha.bundle.manifest" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_hotfix_material.bundle.manifest" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_hotfix_material.bundle.manifest" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_hotfix_prefabs_role.bundle" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_hotfix_prefabs_role.bundle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_hotfix_prefabs_role.bundle.manifest" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_hotfix_prefabs_role.bundle.manifest" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_hotfix_prefabs_room.bundle" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_hotfix_prefabs_room.bundle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_hotfix_prefabs_room.bundle.manifest" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_hotfix_prefabs_room.bundle.manifest" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_hotfix_prefabs_ui.bundle" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_hotfix_prefabs_ui.bundle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_hotfix_prefabs_ui.bundle.manifest" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_hotfix_prefabs_ui.bundle.manifest" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_hotfix_scene.bundle" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_hotfix_scene.bundle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_hotfix_scene.bundle.manifest" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_assets_hotfix_scene.bundle.manifest" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_unityshaders.bundle.manifest" beforeDir="false" afterPath="$PROJECT_DIR$/Bundles/Android/DefaultPackage/OutputCache/defaultpackage_unityshaders.bundle.manifest" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/BFS/BFS.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/BFS/BFS.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Boss/IBoss.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Boss/IBoss.cs" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -197,7 +137,7 @@
<workItem from="1712395298180" duration="2519000" />
<workItem from="1712539677704" duration="455000" />
<workItem from="1712540418256" duration="28695000" />
<workItem from="1712624714801" duration="12209000" />
<workItem from="1712624714801" duration="14476000" />
</task>
<servers />
</component>
@ -240,26 +180,13 @@
</line-breakpoint>
<line-breakpoint enabled="true" type="DotNet Breakpoints">
<url>file://$PROJECT_DIR$/Assets/Scripts/Boss/IBoss.cs</url>
<line>53</line>
<properties documentPath="D:\UnityProject\TestF\Assets\Scripts\Boss\IBoss.cs" initialLine="53" containingFunctionPresentation="Method 'SetGameObject'">
<startOffsets>
<option value="1140" />
</startOffsets>
<endOffsets>
<option value="1164" />
</endOffsets>
</properties>
<option name="timeStamp" value="7" />
</line-breakpoint>
<line-breakpoint enabled="true" type="DotNet Breakpoints">
<url>file://$PROJECT_DIR$/Assets/Scripts/Boss/IBoss.cs</url>
<line>83</line>
<line>84</line>
<properties documentPath="D:\UnityProject\TestF\Assets\Scripts\Boss\IBoss.cs" initialLine="83" containingFunctionPresentation="Method 'Kill'">
<startOffsets>
<option value="2094" />
<option value="2125" />
</startOffsets>
<endOffsets>
<option value="2123" />
<option value="2154" />
</endOffsets>
</properties>
<option name="timeStamp" value="8" />

10
Assets/Scripts/BFS/BFS.cs
View File

@ -214,14 +214,22 @@ public class BFS<T>
isTrue = false;
Debug.LogError("没找到路径卡死了，强制跳出的");
}
});
}).Forget();
Node<T> node = end;
while (isTrue)
{
if (this._nodeMap.TryGetValue(node, out node))
{
if (node != null)
{
Debug.Log($"{node.index} is null");
isTrue = false;
break;
}
if (!this.ids.Contains(node.index))
{
Debug.Log($"正在查询的点{node.index}");
this.ids.Add(node.index);
path.AddNode(new PathNode<T>(node.index, node.data));
}

1
Assets/Scripts/Boss/IBoss.cs
View File

@ -55,6 +55,7 @@ public class Boss : IBoss
this._name = room.roomName;
this._room = room;
this._info = gameObject.GetComponent<BossInfo>();
this._isMoving = true;
}
public async UniTask<float> WaitMoveRoomAndKillAsync(CancellationToken token)