Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

map update #11

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
190 changes: 95 additions & 95 deletions sheildmaiden/Library/CurrentLayout.dwlt

Large diffs are not rendered by default.

202 changes: 101 additions & 101 deletions sheildmaiden/Library/CurrentMaximizeLayout.dwlt

Large diffs are not rendered by default.

Binary file modified sheildmaiden/Library/EditorUserBuildSettings.asset
Binary file not shown.
Binary file modified sheildmaiden/Library/LastBuild.buildreport
Binary file not shown.
Binary file not shown.
Binary file not shown.
6 changes: 3 additions & 3 deletions sheildmaiden/Library/PlayerDataCache/Data/boot.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
player-connection-mode=Listen
player-connection-guid=4046526898
player-connection-guid=2771672259
player-connection-debug=0
player-connection-ip=169.254.6.89
player-connection-ip=192.168.0.47
player-connection-ip=192.168.56.1
player-connection-ip=130.157.61.175
wait-for-native-debugger=0
Binary file modified sheildmaiden/Library/PlayerDataCache/Data/globalgamemanagers
Binary file not shown.
Binary file modified sheildmaiden/Library/PlayerDataCache/Data/globalgamemanagers.assets
Binary file not shown.
Binary file modified sheildmaiden/Library/PlayerDataCache/Data/level0
Binary file not shown.
Binary file modified sheildmaiden/Library/PlayerDataCache/Data/level1
Binary file not shown.
Binary file modified sheildmaiden/Library/PlayerDataCache/Data/sharedassets0.assets
Binary file not shown.
Binary file not shown.
Binary file modified sheildmaiden/Library/PlayerDataCache/Data/sharedassets1.assets
Binary file not shown.
Binary file not shown.
20 changes: 15 additions & 5 deletions sheildmaiden/Library/PlayerDataCache/ScriptLayoutHashes.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
WindowsStandalone
PlayerPath?
C:/Users/Admin/Desktop/Shieldmaiden.exe
C:/Users/greco/Desktop/current.exe
SceneListBegin?
Assets/Scenes/NeverUnload.unity
Assets/Scenes/mainScene.unity
Assets/Scenes/level2.unity
Assets/Scenes/level 3.unity
SceneListEnd?
20c5b8f1fc21aaa0bbb1fb1a635fe31b Assembly-CSharp.dll:.Change_Level
800106048df92dda6587c8b109001a8a Assembly-CSharp.dll:.Change_Level
05524b8f659e7bfe5756d1335fec24ba UnityEngine.Timeline.dll:UnityEngine.Timeline.ActivationPlayableAsset
dbc29a6f2739d277c10da432d73adb6d UnityEngine.Timeline.dll:UnityEngine.Timeline.ActivationTrack
8144169769d51429c4aedc8b0f92d47b UnityEngine.Timeline.dll:UnityEngine.Timeline.AnimationPlayableAsset
Expand Down Expand Up @@ -83,7 +85,7 @@ c63db43c730fa2cbb8ca07de15898cb6 UnityEngine.UI.dll:UnityEngine.UI.Toggle
f61c0793411f10cf5fbfa1473fef5ef2 UnityEngine.UI.dll:UnityEngine.UI.ToggleGroup
86d36c43c53541d667100dc90b89cfba UnityEngine.UI.dll:UnityEngine.EventSystems.TouchInputModule
1b8c02d0aa82fbf036a2b9b2d713eec3 UnityEngine.UI.dll:UnityEngine.UI.VerticalLayoutGroup
8253b174d3c69224213097b9ca9b24ef Assembly-CSharp.dll:.SkelyAI
ee9899fbf66ce5ad92c850ef03a01d78 Assembly-CSharp.dll:.SkelyAI
05524b8f659e7bfe5756d1335fec24ba UnityEngine.Timeline.dll:UnityEngine.Timeline.ActivationPlayableAsset
dbc29a6f2739d277c10da432d73adb6d UnityEngine.Timeline.dll:UnityEngine.Timeline.ActivationTrack
8144169769d51429c4aedc8b0f92d47b UnityEngine.Timeline.dll:UnityEngine.Timeline.AnimationPlayableAsset
Expand Down Expand Up @@ -111,17 +113,20 @@ e9bdabf9265d758d56f01bb188916fa8 UnityEngine.Networking.dll:UnityEngine.Networki
73843688b51256aed059f049c540bca8 UnityEngine.Networking.dll:UnityEngine.Networking.NetworkTransformChild
528ea1fd7c01796fc60c4e2f172ea229 UnityEngine.Networking.dll:UnityEngine.Networking.NetworkTransformVisualizer
9de3a22eca9aefadba2d10d5987cefe3 UnityEngine.SpatialTracking.dll:UnityEngine.SpatialTracking.TrackedPoseDriver
05524b8f659e7bfe5756d1335fec24ba Assembly-CSharp.dll:.Global
322cb40e1e282f28af980cbef7922a90 UnityEngine.Analytics.dll:UnityEngine.Analytics.AnalyticsEventTracker
dc07d7ad69b399a46e92c483bf1c04ca UnityEngine.Analytics.dll:UnityEngine.Analytics.AnalyticsTracker
bc68edb0af574bf79f9550ead8ebae5c UnityEngine.HoloLens.dll:UnityEngine.Audio.AudioSpatializerMicrosoft
05524b8f659e7bfe5756d1335fec24ba UnityEngine.HoloLens.dll:UnityEngine.EventSystems.HoloLensInput
463516d5b5fe8e67a0a24c48f2095b04 UnityEngine.HoloLens.dll:UnityEngine.EventSystems.HoloLensInputModule
c2275a8bfbb9f9942cad75ecdfded41d UnityEngine.HoloLens.dll:UnityEngine.XR.WSA.SpatialMappingCollider
45f3431f0103c41611e8d4eec3d439df UnityEngine.HoloLens.dll:UnityEngine.XR.WSA.SpatialMappingRenderer
2aee6e9118332b2a23b895fc676d92ba Assembly-CSharp.dll:.On_Hit
05524b8f659e7bfe5756d1335fec24ba Assembly-CSharp.dll:.On_Hit
168fc39dd067fd379cc472346180833f Assembly-CSharp.dll:.HeartUI
05524b8f659e7bfe5756d1335fec24ba UnityEngine.Advertisements.dll:UnityEngine.Advertisements.CallbackExecutor
05524b8f659e7bfe5756d1335fec24ba UnityEngine.Advertisements.dll:UnityEngine.Advertisements.Editor.Placeholder
dd5481137759597d614818793c90a7fe Assembly-CSharp.dll:.Player
88103eda1154f086b5b59f9a76d89089 Assembly-CSharp.dll:.Player
e07a21ae56164277ebc042ae27da99ce Assembly-CSharp.dll:.HeartIcon
7c93e6d3b5f85405caf649bddbd6a5b3 Assembly-CSharp.dll:.Attack_Trigger
fc1e0f4d8439d9928083474691511a13 UnityEngine.Networking.dll:UnityEngine.Networking.NetworkAnimator
05524b8f659e7bfe5756d1335fec24ba UnityEngine.Networking.dll:UnityEngine.Networking.NetworkBehaviour
Expand All @@ -141,6 +146,7 @@ b73a5aa8774e69a66143bcaec14db4e0 Assembly-CSharp.dll:.Camera_Follow
05524b8f659e7bfe5756d1335fec24ba UnityEngine.TestRunner.dll:UnityEngine.TestTools.TestRunner.Callbacks.PlayModeRunnerCallback
96d0fbde9fd209878a0a291f82c9bcdd UnityEngine.TestRunner.dll:UnityEngine.TestTools.TestRunner.PlaymodeTestsController
64eb32cc721b1cc68a91ed57461e188c UnityEngine.TestRunner.dll:UnityEngine.TestTools.TestRunner.Callbacks.RemoteTestResultSender
1449ad16651f9066fb6078e9b57835ea Assembly-CSharp.dll:.PlayerH
9e0ef5bf862444b5dc48b5a99554ce7c UnityEngine.GoogleAudioSpatializer.dll:UnityEngine.Experimental.Audio.Google.GvrAudioListenerExtension
e0f7ffd5d5c2abe4b2e16569a21163da UnityEngine.GoogleAudioSpatializer.dll:UnityEngine.Experimental.Audio.Google.GvrAudioRoom
67a5f2c97205d2e41a8ed7c7ce898f6e UnityEngine.GoogleAudioSpatializer.dll:UnityEngine.Experimental.Audio.Google.GvrAudioSoundfieldExtension
Expand All @@ -154,4 +160,8 @@ bc68edb0af574bf79f9550ead8ebae5c UnityEngine.HoloLens.dll:UnityEngine.Audio.Audi
463516d5b5fe8e67a0a24c48f2095b04 UnityEngine.HoloLens.dll:UnityEngine.EventSystems.HoloLensInputModule
c2275a8bfbb9f9942cad75ecdfded41d UnityEngine.HoloLens.dll:UnityEngine.XR.WSA.SpatialMappingCollider
45f3431f0103c41611e8d4eec3d439df UnityEngine.HoloLens.dll:UnityEngine.XR.WSA.SpatialMappingRenderer
70b01dca55977c21e9766a1eb55af589 Assembly-CSharp.dll:.AnyManager
9de3a22eca9aefadba2d10d5987cefe3 UnityEngine.SpatialTracking.dll:UnityEngine.SpatialTracking.TrackedPoseDriver
05524b8f659e7bfe5756d1335fec24ba Assembly-CSharp.dll:.heart
ee60d502a53637d6f918e8daaebda471 Assembly-CSharp.dll:.HeartPiece
05524b8f659e7bfe5756d1335fec24ba Assembly-CSharp.dll:.Key
Binary file modified sheildmaiden/Library/assetDatabase3
Binary file not shown.
Binary file not shown.
Binary file not shown.
3 changes: 3 additions & 0 deletions sheildmaiden/ProjectSettings/EditorBuildSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/level2.unity
guid: b9a2f5552904b68408816678964924ad
- enabled: 1
path: Assets/Scenes/level 3.unity
guid: d2bf256abe8079745934156110da7170