Skip to content

Commit

Permalink
Update to Zenject 7.2.0, reorder build settings so Splash is first sc…
Browse files Browse the repository at this point in the history
…ene, tweak SceneService transition duration.
  • Loading branch information
Zesix committed Sep 22, 2018
1 parent b8d4bd5 commit 895650a
Show file tree
Hide file tree
Showing 473 changed files with 16,106 additions and 8,455 deletions.
19 changes: 15 additions & 4 deletions Assets/02_Prefabs/MainSystem/SceneService/SceneService.prefab
Expand Up @@ -295,7 +295,6 @@ MonoBehaviour:
_autoRun: 1
_parentNewObjectsUnderRoot: 0
_contractNames: []
_parentContractName:
_parentContractNames: []
--- !u!114 &114189533320609256
MonoBehaviour:
Expand All @@ -312,12 +311,24 @@ MonoBehaviour:
SplashObj: {fileID: 122168, guid: c7cf8a20471682f49acf75a97f98d405, type: 2}
Interpolation:
serializedVersion: 2
m_Curve: []
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
- serializedVersion: 2
time: 1
value: 1
inSlope: 2
outSlope: 2
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_RotationOrder: 0
InitialSplashDuration: 3
Duration: 2
Duration: 1
InTransition: 0
TransitionPercent: 0
BlackOverlay: {fileID: 225707431815244660}
Expand Down
8 changes: 8 additions & 0 deletions Assets/AssetLocationEditor.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
158 changes: 158 additions & 0 deletions Assets/AssetLocationEditor/DiskUtils/x86_64/DiskUtilsWinAPI.dll.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 34 additions & 0 deletions Assets/AssetLocationEditor/README.txt
@@ -0,0 +1,34 @@
The Asset Location Editor
=========================

Use this tool to move your downloaded Unity3D Assets to a different folder or hard drive on your computer and still access them through Unity in the normal way.
If like me, you find that your downloaded Assets are taking up valuable space on your C:\ drive you can use this tool to move your assets to another drive, Unity will not know any difference.

For further help please go to http://www.oakbox.co.uk/Unity3d/AssetLocationEditor
If you are having issues please contact support@oakbox.co.uk

Please add a review of the asset on the asset store. Thanks!

Prerequisites
=============
* Currently only tested on Windows 7 and 10.
* Windows Vista or above should be supported but not tested.
* Network Drive locations are not supported.
* MacOS currently not supported.
* Linux currently not supported.

Instructions
============
1) Import the tool into a Unity project.
2) Go to Edit -> Edit Asset Location...
3) Create or select a folder where you would like your asset store items to be moved to. This must be an empty folder.
4) Click OK. The Console will print out some information and tell you when it is complete. Please note that if you have a large amount of assets this process might take some time.

1) Import the tool into a Unity project.
2) Go to Edit -> Edit Assets Location...
3) Click the [Move] button next to the asset location you wish to move, there may be more than one location if you also used an earlier version of Unity3D.
4) Choose or create an EMPTY folder where you would like to move your assets to.
5) Check and confirm the details in the obligatory "Are you sure..." message box.
6) Wait until all of your assets have been moved. A progress bar gives you an idea of how long this will take, if you have a large asset collection this could take a long time...
7) Once complete, you will see the "Current Location:" of your assets change to your newly selected location.
8) You can now delete the asset from your project, it is not needed any more unless you want to move your assets to a new location again.
8 changes: 8 additions & 0 deletions Assets/AssetLocationEditor/README.txt.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions Assets/Plugins/Zenject/OptionalExtras.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 895650a

Please sign in to comment.