diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 000000000..c047ee27f
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,264 @@
+stages:
+ - prepare
+ - build_and_test
+ - deploy
+
+# If you are looking for a place where to add 'UNITY_LICENSE_FILE' and other secrets, please visit your project's gitlab page:
+# settings > CI/CD > Variables instead
+variables:
+ BUILD_NAME: CaperMoive
+ UNITY_ACTIVATION_FILE: ./unity3d.alf
+ IMAGE: unityci/editor # https://hub.docker.com/r/unityci/editor
+ IMAGE_VERSION: 1 # This will automatically use latest v1.x.x, see https://github.com/game-ci/docker/releases
+ UNITY_DIR: $CI_PROJECT_DIR # this needs to be an absolute path. Defaults to the root of your tree.
+ # You can expose this in Unity via Application.version
+ VERSION_NUMBER_VAR: $CI_COMMIT_REF_SLUG-$CI_PIPELINE_ID-$CI_JOB_ID
+ VERSION_BUILD_VAR: $CI_PIPELINE_IID
+
+image: $IMAGE:$UNITY_VERSION-base-$IMAGE_VERSION
+
+get-unity-version:
+ image: alpine
+ stage: prepare
+ variables:
+ GIT_DEPTH: 1
+ script:
+ - apk add --no-cache grep gawk coreutils
+ - echo UNITY_VERSION=$(cat $UNITY_DIR/ProjectSettings/ProjectVersion.txt | grep "m_EditorVersion:.*" | awk '{ print $2}') | tee prepare.env
+ artifacts:
+ reports:
+ dotenv: prepare.env
+
+.unity_before_script: &unity_before_script
+ before_script:
+ - chmod +x ./ci/before_script.sh && ./ci/before_script.sh
+ needs:
+ - job: get-unity-version
+ artifacts: true
+
+.cache: &cache
+ cache:
+ key: "$CI_PROJECT_NAMESPACE-$CI_PROJECT_NAME-$CI_COMMIT_REF_SLUG-$TEST_PLATFORM"
+ paths:
+ - $UNITY_DIR/Library/
+
+.license: &license
+ rules:
+ - if: '$UNITY_LICENSE != null'
+ when: always
+
+.unity_defaults: &unity_defaults
+ <<:
+ - *unity_before_script
+ - *cache
+ - *license
+
+# run this job when you need to request a license
+# you may need to follow activation steps from documentation
+get-activation-file:
+ <<: *unity_before_script
+ rules:
+ - if: '$UNITY_LICENSE == null'
+ when: manual
+ stage: prepare
+ script:
+ - chmod +x ./ci/get_activation_file.sh && ./ci/get_activation_file.sh
+ artifacts:
+ paths:
+ - $UNITY_ACTIVATION_FILE
+ expire_in: 10 min # Expiring this as artifacts may contain sensitive data and should not be kept public
+
+.test: &test
+ stage: build_and_test
+ <<: *unity_defaults
+ script:
+ - chmod +x ./ci/test.sh && ./ci/test.sh
+ artifacts:
+ when: always
+ expire_in: 2 weeks
+ # https://gitlab.com/gableroux/unity3d-gitlab-ci-example/-/issues/83
+ # you may need to remove or replace these to fit your need if you are using your own runners
+ tags:
+ - gitlab-org
+ coverage: /(.*?)/
+
+# Tests without junit reporting results in GitLab
+# test-playmode:
+# <<: *test
+# variables:
+# TEST_PLATFORM: playmode
+# TESTING_TYPE: NUNIT
+
+# test-editmode:
+# <<: *test
+# variables:
+# TEST_PLATFORM: editmode
+# TESTING_TYPE: NUNIT
+
+# uncomment the following blocks if you'd like to have junit reporting unity test results in gitlab
+# We currently have the following issue which prevents it from working right now, but you can give
+# a hand if you're interested in this feature:
+# https://gitlab.com/gableroux/unity3d-gitlab-ci-example/-/issues/151
+
+.test-with-junit-reports: &test-with-junit-reports
+ stage: build_and_test
+ <<: *unity_defaults
+ script:
+ # This could be made faster by adding these packages to base image or running in a separate job (and step)
+ # We could use an image with these two depencencies only and only do the saxonb-xslt command on
+ # previous job's artifacts
+ - apt-get update && apt-get install -y default-jre libsaxonb-java
+ - chmod +x ./ci/test.sh && ./ci/test.sh
+ - saxonb-xslt -s $UNITY_DIR/$TEST_PLATFORM-results.xml -xsl $CI_PROJECT_DIR/ci/nunit-transforms/nunit3-junit.xslt >$UNITY_DIR/$TEST_PLATFORM-junit-results.xml
+ artifacts:
+ when: always
+ paths:
+ # This is exported to allow viewing the Coverage Report in detail if needed
+ - $UNITY_DIR/$TEST_PLATFORM-coverage/
+ reports:
+ junit:
+ - $UNITY_DIR/$TEST_PLATFORM-junit-results.xml
+ - "$UNITY_DIR/$TEST_PLATFORM-coverage/coverage.xml"
+ expire_in: 2 weeks
+ # https://gitlab.com/gableroux/unity3d-gitlab-ci-example/-/issues/83
+ # you may need to remove or replace these to fit your need if you are using your own runners
+ tags:
+ - gitlab-org
+ coverage: /(.*?)/
+
+test-playmode-with-junit-reports:
+ <<: *test-with-junit-reports
+ variables:
+ TEST_PLATFORM: playmode
+ TESTING_TYPE: JUNIT
+
+test-editmode-with-junit-reports:
+ <<: *test-with-junit-reports
+ variables:
+ TEST_PLATFORM: editmode
+ TESTING_TYPE: JUNIT
+
+.build: &build
+ stage: build_and_test
+ <<: *unity_defaults
+ script:
+ - chmod +x ./ci/build.sh && ./ci/build.sh
+ artifacts:
+ paths:
+ - $UNITY_DIR/Builds/
+ # https://gitlab.com/gableroux/unity3d-gitlab-ci-example/-/issues/83
+ # you may need to remove or replace these to fit your need if you are using your own runners
+ tags:
+ - gitlab-org
+
+# build-StandaloneLinux64:
+# <<: *build
+# variables:
+# BUILD_TARGET: StandaloneLinux64
+
+# build-StandaloneLinux64-il2cpp:
+# <<: *build
+# image: $IMAGE:$UNITY_VERSION-linux-il2cpp-$IMAGE_VERSION
+# variables:
+# BUILD_TARGET: StandaloneLinux64
+# SCRIPTING_BACKEND: IL2CPP
+
+build-StandaloneOSX:
+ <<: *build
+ image: $IMAGE:$UNITY_VERSION-mac-mono-$IMAGE_VERSION
+ variables:
+ BUILD_TARGET: StandaloneOSX
+
+#Note: build target names changed in recent versions, use this for versions < 2017.2:
+# build-StandaloneOSXUniversal:
+# <<: *build
+# variables:
+# BUILD_TARGET: StandaloneOSXUniversal
+
+build-StandaloneWindows64:
+ <<: *build
+ image: $IMAGE:$UNITY_VERSION-windows-mono-$IMAGE_VERSION
+ variables:
+ BUILD_TARGET: StandaloneWindows64
+
+# For webgl support, you need to set Compression Format to Disabled for v0.9. See https://github.com/game-ci/docker/issues/75
+build-WebGL:
+ <<: *build
+ image: $IMAGE:$UNITY_VERSION-webgl-$IMAGE_VERSION
+ # Temporary workaround for https://github.com/game-ci/docker/releases/tag/v0.9 and webgl support in current project to prevent errors with missing ffmpeg
+ before_script:
+ - chmod +x ./ci/before_script.sh && ./ci/before_script.sh
+ - apt-get update && apt-get install ffmpeg -y
+ variables:
+ BUILD_TARGET: WebGL
+
+# build-android:
+# <<: *build
+# image: $IMAGE:$UNITY_VERSION-android-$IMAGE_VERSION
+# variables:
+# BUILD_TARGET: Android
+# BUILD_APP_BUNDLE: "false"
+
+# build-android-il2cpp:
+# <<: *build
+# image: $IMAGE:$UNITY_VERSION-android-$IMAGE_VERSION
+# variables:
+# BUILD_TARGET: Android
+# BUILD_APP_BUNDLE: "false"
+# SCRIPTING_BACKEND: IL2CPP
+
+#deploy-android:
+# stage: deploy
+# image: ruby
+# script:
+# - cd $UNITY_DIR/Builds/Android
+# - echo $GPC_TOKEN > gpc_token.json
+# - gem install bundler
+# - bundle install
+# - fastlane supply --aab "${BUILD_NAME}.aab" --track internal --package_name com.youcompany.yourgame --json_key ./gpc_token.json
+# needs: ["build-android"]
+
+# build-ios-xcode:
+# <<: *build
+# image: $IMAGE:$UNITY_VERSION-ios-$IMAGE_VERSION
+# variables:
+# BUILD_TARGET: iOS
+
+#build-and-deploy-ios:
+# stage: deploy
+# script:
+# - cd $UNITY_DIR/Builds/iOS/$BUILD_NAME
+# - pod install
+# - fastlane ios beta
+# tags:
+# - ios
+# - mac
+# needs: ["build-ios-xcode"]
+
+pages:
+ image: alpine:latest
+ stage: deploy
+ script:
+ - mv "$UNITY_DIR/Builds/WebGL/${BUILD_NAME}" public
+ artifacts:
+ paths:
+ - public
+ only:
+ - $CI_DEFAULT_BRANCH
+
+
+workflow:
+ rules:
+ - if: '$CI_COMMIT_MESSAGE =~ /RunJob/'
+ when: always
+ - when: never
+
+
+# workflow:
+# rules:
+# # - if: $CI_MERGE_REQUEST_ID
+# - if: $CI_COMMIT_BRANCH == "release"
+# when: always
+# # - if: $CI_COMMIT_TAG
+# # when: never
+# - when: never
diff --git a/BlueWater/Assets/01.Scenes/02.Main.unity b/BlueWater/Assets/01.Scenes/02.Main.unity
index 3f4ad7e21..8ad74a9c1 100644
--- a/BlueWater/Assets/01.Scenes/02.Main.unity
+++ b/BlueWater/Assets/01.Scenes/02.Main.unity
@@ -8609,13 +8609,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 65525724}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6204677065579339558}
- m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &65525726
MonoBehaviour:
@@ -43583,13 +43583,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 293023542}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9160692602282674359}
- m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &293023544
MonoBehaviour:
@@ -51686,6 +51686,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 353560940}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: -0.38412404, z: 0, w: 0.9232815}
m_LocalPosition: {x: -171, y: 0, z: 98}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -52046,7 +52047,6 @@ Transform:
- {fileID: 849350600}
- {fileID: 2048972772}
m_Father: {fileID: 0}
- m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &354721021
PrefabInstance:
@@ -56468,13 +56468,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 392096315}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0, y: 0, z: 0}
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 22
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &392728162
PrefabInstance:
@@ -73404,6 +73404,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 538331747}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -73416,7 +73417,6 @@ Transform:
- {fileID: 209946916}
- {fileID: 1782189023}
m_Father: {fileID: 0}
- m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &538365989
PrefabInstance:
@@ -82512,13 +82512,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 608298000}
+ serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0.29, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9160692602282674359}
- m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!64 &608298002
MeshCollider:
@@ -85431,6 +85431,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 632884040}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: -0.8660256, z: 0, w: 0.49999973}
m_LocalPosition: {x: 96, y: 0, z: -414}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -85909,7 +85910,6 @@ Transform:
- {fileID: 1260024673}
- {fileID: 1232963431}
m_Father: {fileID: 0}
- m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &633162742
PrefabInstance:
@@ -104600,13 +104600,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 776161953}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: -0.707106, z: 0, w: 0.7071076}
m_LocalPosition: {x: 66.8, y: 1, z: 35}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &776161959
MonoBehaviour:
@@ -107807,6 +107807,12 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 799921710}
m_PrefabAsset: {fileID: 0}
+--- !u!4 &800345034 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 4205475610388718, guid: 966e2f16b31f5294b9575e889d70cf4e,
+ type: 3}
+ m_PrefabInstance: {fileID: 1731318518}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &800859837
PrefabInstance:
m_ObjectHideFlags: 0
@@ -112296,7 +112302,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!114 &840095403
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -112369,13 +112375,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 840095402}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 53.13422, y: -0.4, z: 97.5045}
m_LocalScale: {x: 10, y: 10, z: 10}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 24
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &840095407
MonoBehaviour:
@@ -117921,6 +117927,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 884373866}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -117940,7 +117947,6 @@ Transform:
- {fileID: 773777660}
- {fileID: 1866224970}
m_Father: {fileID: 0}
- m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &885063756
PrefabInstance:
@@ -121121,6 +121127,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 911403264}
+ serializedVersion: 2
m_LocalRotation: {x: -0, y: 0.050559867, z: -0, w: 0.99872106}
m_LocalPosition: {x: 174.25, y: -1.15, z: 49.3}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -121128,7 +121135,6 @@ Transform:
m_Children:
- {fileID: 4365313378825808833}
m_Father: {fileID: 1502400192}
- m_RootOrder: 22
m_LocalEulerAnglesHint: {x: 0, y: 5.796, z: 0}
--- !u!33 &912436434
MeshFilter:
@@ -147462,6 +147468,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1124606660}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0.17345181, z: 0, w: 0.98484236}
m_LocalPosition: {x: -215, y: 0, z: -105}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -147695,7 +147702,6 @@ Transform:
- {fileID: 17583063}
- {fileID: 2089412601}
m_Father: {fileID: 0}
- m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1125476191
PrefabInstance:
@@ -152086,6 +152092,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1163513066}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0.25881913, z: 0, w: 0.9659258}
m_LocalPosition: {x: -100, y: 0, z: 79}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -152289,7 +152296,6 @@ Transform:
- {fileID: 186889761}
- {fileID: 116827592}
m_Father: {fileID: 0}
- m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1163593216
PrefabInstance:
@@ -161547,13 +161553,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1234264506}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -187.1454, y: 12.477399, z: -121.38537}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1234695685
PrefabInstance:
@@ -171229,13 +171235,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1313203057}
+ serializedVersion: 2
m_LocalRotation: {x: -0, y: 0.2729548, z: -0, w: 0.9620269}
m_LocalPosition: {x: 51.772285, y: 0.832, z: 26.245562}
m_LocalScale: {x: 2, y: 2, z: 2}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 25
m_LocalEulerAnglesHint: {x: 0, y: 31.68, z: 0}
--- !u!1001 &1313357512
PrefabInstance:
@@ -175582,13 +175588,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1341654434}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 23
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1342068784
PrefabInstance:
@@ -179377,6 +179383,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1372856004}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -179384,7 +179391,6 @@ Transform:
m_Children:
- {fileID: 1254086303}
m_Father: {fileID: 0}
- m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1372986056
PrefabInstance:
@@ -192239,13 +192245,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1469028826}
+ serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9160692602282674359}
- m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1469028828
MonoBehaviour:
@@ -197134,7 +197140,7 @@ MonoBehaviour:
calculateWaterHeights: 1
calculateWaterNormals: 1
calculateWaterFlows: 1
- fluidDensity: 1030
+ fluidDensity: 500
buoyantForceCoefficient: 1
slamForceCoefficient: 1
suctionForceCoefficient: 1
@@ -200992,11 +200998,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1502400191}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
+ - {fileID: 800345034}
- {fileID: 9160692602282674359}
- {fileID: 6204677065579339558}
- {fileID: 1541844116}
@@ -201037,7 +201045,6 @@ Transform:
- {fileID: 987539894}
- {fileID: 1682069943}
m_Father: {fileID: 0}
- m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1503007987
PrefabInstance:
@@ -207324,7 +207331,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!1 &1541653098
GameObject:
m_ObjectHideFlags: 0
@@ -207467,13 +207474,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1541605808}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.799264e-16, y: 1.8470232, z: 0.40515822}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1541844116}
- m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1541838430
Transform:
@@ -207482,13 +207489,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1541432330}
+ serializedVersion: 2
m_LocalRotation: {x: -0.0343506, y: 0, z: 0, w: 0.99940985}
m_LocalPosition: {x: 0, y: 2.451, z: 4.83}
m_LocalScale: {x: 1.2426131, y: 1.242613, z: 1.2426137}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1541905354}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1541843188
Transform:
@@ -207497,13 +207504,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1541418876}
+ serializedVersion: 2
m_LocalRotation: {x: -0.59359676, y: 0.35160276, z: -0.2534505, w: 0.6780718}
m_LocalPosition: {x: 2.193, y: 3.698, z: -4.418}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1541905354}
- m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1541844116
Transform:
@@ -207512,6 +207519,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1541647582}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0.074857816, z: 0, w: 0.99719423}
m_LocalPosition: {x: 189.5, y: -4.1, z: 51.5}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -207521,7 +207529,6 @@ Transform:
- {fileID: 1541827734}
- {fileID: 1541905354}
m_Father: {fileID: 1502400192}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1541847966
Transform:
@@ -207530,13 +207537,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1541433664}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.2297059, y: 8.957437, z: 1.3015066}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1541922962}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1541859150
Transform:
@@ -207545,13 +207552,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1541653098}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: -0.63191915, z: 0, w: 0.77503437}
m_LocalPosition: {x: -1.673, y: 2.335, z: 1.984}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1541905354}
- m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1541861394
Transform:
@@ -207560,13 +207567,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1541659772}
+ serializedVersion: 2
m_LocalRotation: {x: -0.023357872, y: 0, z: 0, w: 0.9997272}
m_LocalPosition: {x: -0.984, y: 2.391, z: 4.131}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1541905354}
- m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1541872310
Transform:
@@ -207575,13 +207582,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1541627716}
+ serializedVersion: 2
m_LocalRotation: {x: -0.5486078, y: 0.24537067, z: -0.34003478, w: 0.723325}
m_LocalPosition: {x: -2.233, y: 3.665, z: -4.377}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1541905354}
- m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1541877660
Transform:
@@ -207590,13 +207597,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1541412686}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0.0000017732382}
m_LocalPosition: {x: 0, y: 4.505, z: -4.563}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1541905354}
- m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1541877740
Transform:
@@ -207605,13 +207612,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1541655070}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0.62267095, z: 0, w: 0.7824838}
m_LocalPosition: {x: 1.314, y: 2.381, z: 2.779}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1541905354}
- m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1541887464
Transform:
@@ -207620,13 +207627,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1541434896}
+ serializedVersion: 2
m_LocalRotation: {x: 0.7128785, y: 0, z: 0, w: 0.7012875}
m_LocalPosition: {x: 2.506, y: 2.704, z: -3.659}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1541905354}
- m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1541893020
Transform:
@@ -207635,13 +207642,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1541436802}
+ serializedVersion: 2
m_LocalRotation: {x: -0.60893214, y: 0.20548023, z: -0.3514105, w: 0.68080115}
m_LocalPosition: {x: 2.446, y: 2.335, z: 3.584}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1541905354}
- m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1541898872
Transform:
@@ -207650,13 +207657,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1541654818}
+ serializedVersion: 2
m_LocalRotation: {x: 0.71231, y: -0.028003804, z: 0.028466668, w: 0.7007281}
m_LocalPosition: {x: -2.633, y: 2.7, z: -3.66}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1541905354}
- m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1541901882
Transform:
@@ -207665,13 +207672,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1541626432}
+ serializedVersion: 2
m_LocalRotation: {x: 0.18181537, y: -0.6044111, z: -0.67914, w: 0.3746991}
m_LocalPosition: {x: -2.44, y: 2.42, z: 3.77}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1541905354}
- m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1541905354
Transform:
@@ -207680,6 +207687,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1541635236}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -207697,7 +207705,6 @@ Transform:
- {fileID: 1541861394}
- {fileID: 1541877660}
m_Father: {fileID: 1541844116}
- m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1541922962
Transform:
@@ -207706,6 +207713,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1541419010}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.7992548e-16, y: 2.1307924, z: 0.40515617}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -207713,7 +207721,6 @@ Transform:
m_Children:
- {fileID: 1541847966}
m_Father: {fileID: 1541844116}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1542007673
PrefabInstance:
@@ -208541,6 +208548,153 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1549451003}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1549546633
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1549546636}
+ - component: {fileID: 1549546634}
+ - component: {fileID: 1549546637}
+ - component: {fileID: 1549546638}
+ m_Layer: 0
+ m_Name: Water Object
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &1549546634
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1549546633}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: eb53c12498f48724b925c6750aaaa631, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!4 &1549546636
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1549546633}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 619.69946, y: -1, z: 292.20862}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1549546637
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1549546633}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: dde37eff0f7685f41902f400d1de0c6c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ _version: 0
+ _globalWindSpeed: 11.1
+ _viewpoint: {fileID: 0}
+ _camera: {fileID: 0}
+ _teleportThreshold: 10
+ _timeProvider: {fileID: 0}
+ _primaryLight: {fileID: 1861343895}
+ _searchForPrimaryLightOnStartup: 1
+ _material: {fileID: 2100000, guid: 9def92ac79181fe41b238e91663f0fad, type: 2}
+ _waterTilePrefab: {fileID: 0}
+ _layerName:
+ _layer: 4
+ _gravityMultiplier: 1
+ _waterBodyCulling: 1
+ _minScale: 8
+ _maxScale: 256
+ _dropDetailHeightBasedOnWaves: 0.2
+ _lodDataResolution: 384
+ _geometryDownSampleFactor: 2
+ _lodCount: 7
+ _extentsSizeMultiplier: 100
+ _renderingLayerMask: 255
+ _simSettingsAnimatedWaves: {fileID: 0}
+ _createSeaFloorDepthData: 1
+ _simSettingsSeaFloorDepth: {fileID: 0}
+ _createFoamSim: 1
+ _simSettingsFoam: {fileID: 0}
+ _createDynamicWaveSim: 0
+ _simSettingsDynamicWaves: {fileID: 0}
+ _createFlowSim: 0
+ _simSettingsFlow: {fileID: 0}
+ _createShadowData: 0
+ _simSettingsShadow: {fileID: 0}
+ _createClipSurfaceData: 0
+ _simSettingsClipSurface: {fileID: 0}
+ _defaultClippingState: 0
+ _createAlbedoData: 0
+ _settingsAlbedo: {fileID: 0}
+ _surfaceSelfIntersectionFixMode: 2
+ _underwaterCullLimit: 0.001
+ _verifyOpaqueAndDepthTexturesEnabled: 1
+ _showOceanProxyPlane: 0
+ _editModeFPS: 30
+ _followSceneCamera: 1
+ _heightQueries: 1
+ _debug:
+ _attachDebugGUI: 0
+ _showOceanTileGameObjects: 0
+ _disableFollowViewpoint: 0
+ _destroyResourcesInOnDisable: 0
+ _forceBatchMode: 0
+ _forceNoGPU: 0
+--- !u!114 &1549546638
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1549546633}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 7a57126133720c243a7af00a156c9ee8, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ _spectrum: {fileID: 0}
+ _spectrumFixedAtRuntime: 1
+ _waveDirectionHeadingAngle: 0
+ _overrideGlobalWindSpeed: 0
+ _windSpeed: 20
+ _respectShallowWaterAttenuation: 1
+ _weight: 1
+ _blendMode: 0
+ _queue: 0
+ _resolution: 128
+ _overrideSplineSettings: 0
+ _radius: 50
+ _subdivisions: 1
+ _featherWaveStart: 0.1
+ _version: 0
+ _windTurbulence: 0.145
+ _maxVerticalDisplacement: 10
+ _maxHorizontalDisplacement: 15
+ _enableBakedCollision: 0
+ _timeResolution: 4
+ _smallestWavelengthRequired: 2
+ _timeLoopLength: 32
+ _debug:
+ _drawBounds: 0
+ _drawSlicesInEditor: 0
--- !u!1001 &1549731095
PrefabInstance:
m_ObjectHideFlags: 0
@@ -220422,6 +220576,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1638571427}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0.37588692, z: 0, w: 0.92666554}
m_LocalPosition: {x: -30, y: 0, z: 109}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -221533,7 +221688,6 @@ Transform:
- {fileID: 970553715}
- {fileID: 1515029867}
m_Father: {fileID: 0}
- m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1639295644
PrefabInstance:
@@ -224492,13 +224646,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1655789840}
+ serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -4, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 26
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1656748819
PrefabInstance:
@@ -227759,6 +227913,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1683538874}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -81, y: -117, z: -104}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -227768,7 +227923,6 @@ Transform:
- {fileID: 1626516202}
- {fileID: 1584975757}
m_Father: {fileID: 0}
- m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1684167101
PrefabInstance:
@@ -234722,6 +234876,106 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1730473200}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1731318518
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 1502400192}
+ m_Modifications:
+ - target: {fileID: 1731383977504930, guid: 966e2f16b31f5294b9575e889d70cf4e, type: 3}
+ propertyPath: m_Name
+ value: TorpedoBoat
+ objectReference: {fileID: 0}
+ - target: {fileID: 1731383977504930, guid: 966e2f16b31f5294b9575e889d70cf4e, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4205475610388718, guid: 966e2f16b31f5294b9575e889d70cf4e, type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4205475610388718, guid: 966e2f16b31f5294b9575e889d70cf4e, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -93.1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4205475610388718, guid: 966e2f16b31f5294b9575e889d70cf4e, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 4.5528517
+ objectReference: {fileID: 0}
+ - target: {fileID: 4205475610388718, guid: 966e2f16b31f5294b9575e889d70cf4e, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -27.4
+ objectReference: {fileID: 0}
+ - target: {fileID: 4205475610388718, guid: 966e2f16b31f5294b9575e889d70cf4e, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.9544491
+ objectReference: {fileID: 0}
+ - target: {fileID: 4205475610388718, guid: 966e2f16b31f5294b9575e889d70cf4e, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.022425853
+ objectReference: {fileID: 0}
+ - target: {fileID: 4205475610388718, guid: 966e2f16b31f5294b9575e889d70cf4e, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.29752716
+ objectReference: {fileID: 0}
+ - target: {fileID: 4205475610388718, guid: 966e2f16b31f5294b9575e889d70cf4e, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.0012451881
+ objectReference: {fileID: 0}
+ - target: {fileID: 4205475610388718, guid: 966e2f16b31f5294b9575e889d70cf4e, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: -2.496
+ objectReference: {fileID: 0}
+ - target: {fileID: 4205475610388718, guid: 966e2f16b31f5294b9575e889d70cf4e, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 34.641003
+ objectReference: {fileID: 0}
+ - target: {fileID: 4205475610388718, guid: 966e2f16b31f5294b9575e889d70cf4e, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: -0.629
+ objectReference: {fileID: 0}
+ - target: {fileID: 1553114556191684984, guid: 966e2f16b31f5294b9575e889d70cf4e,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.2280159
+ objectReference: {fileID: 0}
+ - target: {fileID: 1553114556191684984, guid: 966e2f16b31f5294b9575e889d70cf4e,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 20.768848
+ objectReference: {fileID: 0}
+ - target: {fileID: 1553114556191684984, guid: 966e2f16b31f5294b9575e889d70cf4e,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -63.155384
+ objectReference: {fileID: 0}
+ - target: {fileID: 1553114556191684984, guid: 966e2f16b31f5294b9575e889d70cf4e,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.9906523
+ objectReference: {fileID: 0}
+ - target: {fileID: 1553114556191684984, guid: 966e2f16b31f5294b9575e889d70cf4e,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0.13630043
+ objectReference: {fileID: 0}
+ - target: {fileID: 1553114556191684984, guid: 966e2f16b31f5294b9575e889d70cf4e,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.00100407
+ objectReference: {fileID: 0}
+ - target: {fileID: 1553114556191684984, guid: 966e2f16b31f5294b9575e889d70cf4e,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.005413986
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 966e2f16b31f5294b9575e889d70cf4e, type: 3}
--- !u!1001 &1731745758
PrefabInstance:
m_ObjectHideFlags: 0
@@ -249977,13 +250231,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1861343894}
+ serializedVersion: 2
m_LocalRotation: {x: 0.6827491, y: -0.512345, z: 0.100895435, w: 0.5110543}
m_LocalPosition: {x: 56.8, y: 3, z: 35}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1861343897
MonoBehaviour:
@@ -281302,7 +281556,6 @@ RectTransform:
- {fileID: 126818807}
- {fileID: 814348287}
m_Father: {fileID: 0}
- m_RootOrder: 21
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -285738,6 +285991,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2141404811}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 6, y: 0, z: 85}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -286423,7 +286677,6 @@ Transform:
- {fileID: 2103339500}
- {fileID: 1887352740}
m_Father: {fileID: 0}
- m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &2141409596
PrefabInstance:
@@ -286760,13 +287013,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1731280164726553}
+ serializedVersion: 2
m_LocalRotation: {x: 0.15493013, y: 0.00000002980232, z: 0.0000000065192576, w: 0.98792547}
m_LocalPosition: {x: 0, y: 5.98, z: -12.11}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4365313378825808833}
- m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 17.825, y: 0, z: 0}
--- !u!4 &4553179050393607
Transform:
@@ -286775,13 +287028,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1641722768409915}
+ serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0.8399999, z: -0.26000023}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4365313378825808833}
- m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &20260231426159079
Camera:
@@ -287564,13 +287817,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1150786507246107615}
+ serializedVersion: 2
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: -0, y: 0.408, z: -0.063}
m_LocalScale: {x: 0.76479983, y: 1.4747154, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9160692602282674359}
- m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!1 &1150786507246107615
GameObject:
@@ -287609,13 +287862,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1383500870007188319}
+ serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 8.72, y: -0.87599945, z: 35.13}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8675600832282337780}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1383500870007188314
MonoBehaviour:
@@ -288096,6 +288349,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1900259331961727819}
+ serializedVersion: 2
m_LocalRotation: {x: 0.09209261, y: -0.000000022351742, z: 0.0000000023283064, w: 0.9957505}
m_LocalPosition: {x: 0.0000047683716, y: 1.61, z: -6.5000014}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -288103,7 +288357,6 @@ Transform:
m_Children:
- {fileID: 4987846705542258219}
m_Father: {fileID: 4365313378825808833}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 18.435, y: 0, z: 0}
--- !u!81 &3484334030082836477
AudioListener:
@@ -288311,13 +288564,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4181890489017826510}
+ serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 8.72, y: -0.87599945, z: 35.13}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5863631146230789733}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4181890489017826506
MonoBehaviour:
@@ -288480,6 +288733,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7126889405912510061}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -288489,7 +288743,6 @@ Transform:
- {fileID: 4326819072279077}
- {fileID: 4553179050393607}
m_Father: {fileID: 911734872}
- m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &4837726983096862541
Camera:
@@ -288549,6 +288802,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2150089763194391695}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -288558,7 +288812,6 @@ Transform:
- {fileID: 9168823206826516679}
- {fileID: 9160680148384277221}
m_Father: {fileID: 9160692602282674359}
- m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4987846705235277608
MonoBehaviour:
@@ -288741,13 +288994,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4987846705542258220}
+ serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 8.72, y: -0.87599945, z: 35.13}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3345794561196659847}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &4987846705542258220
GameObject:
@@ -288885,14 +289138,14 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7308912095120853417}
- m_LocalRotation: {x: 0.3709924, y: -1e-45, z: 1e-45, w: 0.92863595}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0.3709924, y: 3e-45, z: -1e-45, w: 0.92863595}
m_LocalPosition: {x: 0, y: 6.73, z: -6.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4181890489017826505}
m_Father: {fileID: 4874546793249179939}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 18.435, y: 0, z: 0}
--- !u!4 &6198102802678789974
Transform:
@@ -288901,13 +289154,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6200731043473101418}
+ serializedVersion: 2
m_LocalRotation: {x: 0.15493013, y: 0.00000002980232, z: 0.0000000065192576, w: 0.98792547}
m_LocalPosition: {x: 0, y: 5.98, z: -12.11}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7683140909883858610}
- m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 17.825, y: 0, z: 0}
--- !u!1 &6199413975761941508
GameObject:
@@ -289203,13 +289456,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6201069331114389576}
+ serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0.8399999, z: -0.26000023}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7683140909883858610}
- m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &6204677065579339558
Transform:
@@ -289218,6 +289471,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6199413975761941508}
+ serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 51.658783, y: 0.121436566, z: 27.37697}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -289227,7 +289481,6 @@ Transform:
- {fileID: 65525725}
- {fileID: 7683140909883858610}
m_Father: {fileID: 1502400192}
- m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &6216092871577470330
Camera:
@@ -289790,6 +290043,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3813571106256902942}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -289799,7 +290053,6 @@ Transform:
- {fileID: 6198102802678789974}
- {fileID: 6204666743050204532}
m_Father: {fileID: 6204677065579339558}
- m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8112576447857707387
MonoBehaviour:
@@ -289962,6 +290215,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5500119295330950712}
+ serializedVersion: 2
m_LocalRotation: {x: 0.32624146, y: -0.000000022713659, z: 0.00000000783904, w: 0.94528645}
m_LocalPosition: {x: 0, y: 5.61, z: -6.5}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -289969,7 +290223,6 @@ Transform:
m_Children:
- {fileID: 1383500870007188312}
m_Father: {fileID: 7683140909883858610}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 18.435, y: 0, z: 0}
--- !u!124 &8788600358762689889
Behaviour:
@@ -290445,13 +290698,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9166107766717448083}
+ serializedVersion: 2
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0.156, z: -1.774}
m_LocalScale: {x: 1.1786879, y: 0.38266304, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9169264360427945269}
- m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!4 &9160347786685630377
Transform:
@@ -290460,13 +290713,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9166445576936863321}
+ serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: -0.1250534, y: 0.46774793, z: -0.68214417}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9169264360427945269}
- m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &9160430816859697087
Transform:
@@ -290475,13 +290728,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9166888617127438831}
+ serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0.008152008, y: 0.36760902, z: 0.22891998}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9169264360427945269}
- m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &9160536085204606575
Transform:
@@ -290490,13 +290743,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9166205779752090877}
+ serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.13960266, y: 0.12573236, z: 0.620452}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9160688381172865841}
- m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &9160567735497919675
Transform:
@@ -290505,6 +290758,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9166118883730877065}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.26, y: 0.086, z: -2.14}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -290512,7 +290766,6 @@ Transform:
m_Children:
- {fileID: 9160688381172865841}
m_Father: {fileID: 9160692602282674359}
- m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &9160601586241623025
Transform:
@@ -290521,13 +290774,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9166026697385737995}
+ serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: -0.314, y: 0.1372664, z: -2.0099792}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9169264360427945269}
- m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &9160615298774581071
Transform:
@@ -290536,13 +290789,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9165614202526870955}
+ serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0.27905273, y: 0.069905534, z: 0.118118286}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9169264360427945269}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &9160680148384277221
Transform:
@@ -290551,13 +290804,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9166160304447514585}
+ serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0.8399999, z: -0.26000023}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4874546793249179939}
- m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &9160688381172865841
Transform:
@@ -290566,6 +290819,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9166061702611259661}
+ serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: -0.000000059604638, z: -0.000000014435498, w: 0.7071068}
m_LocalPosition: {x: 0, y: -0.01, z: 0.015}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -290576,7 +290830,6 @@ Transform:
- {fileID: 9160707311804971221}
- {fileID: 9169097127178866053}
m_Father: {fileID: 9160567735497919675}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &9160692602282674359
Transform:
@@ -290585,6 +290838,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9165563711675753365}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 51.658783, y: -0.47, z: 27.37697}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -290604,7 +290858,6 @@ Transform:
- {fileID: 9165224470898666401}
- {fileID: 4874546793249179939}
m_Father: {fileID: 1502400192}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &9160700503627919395
Transform:
@@ -290613,13 +290866,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9166947839119314667}
+ serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: -0.8805504, y: 0.29499972, z: 1.0051498}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9169264360427945269}
- m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &9160707311804971221
Transform:
@@ -290628,13 +290881,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9166137518848225453}
+ serializedVersion: 2
m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5}
m_LocalPosition: {x: 0, y: 0.266, z: -0.656}
m_LocalScale: {x: 0.002, y: 0.5, z: 0.92}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9160688381172865841}
- m_RootOrder: 2
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 90}
--- !u!4 &9160736956454614115
Transform:
@@ -290643,13 +290896,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9166230870287949239}
+ serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0.2041893, y: 0.021567538, z: 0.21105194}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9169264360427945269}
- m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &9160756017183815393
Transform:
@@ -290658,13 +290911,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9165554849322353931}
+ serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: -0, y: 0.1751, z: -0.3451}
m_LocalScale: {x: 0.014982552, y: 1.07815, z: 0.50823253}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9169262158300684177}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!4 &9160772052887880861
Transform:
@@ -290673,13 +290926,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9166313822546665975}
+ serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0.53747153, z: -1.7152023}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9160692602282674359}
- m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &9160776576976136621
Transform:
@@ -290688,13 +290941,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9166378048182099287}
+ serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: -0, y: 0.1767, z: -0.344}
m_LocalScale: {x: 0.014982552, y: 1.07815, z: 0.50823253}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9160688381172865841}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!4 &9160789605834046129
Transform:
@@ -290703,13 +290956,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9166031418347443591}
+ serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0.2041893, y: 0.021567538, z: 0.21105194}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9169264360427945269}
- m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &9165224469877011777
MonoBehaviour:
@@ -290962,13 +291215,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9165224470284038100}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0, y: -0.5223, z: -0.7747}
m_LocalScale: {x: 0.009286939, y: 0.09698676, z: 2.3543737}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9160692602282674359}
- m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &9165224470399756138
MonoBehaviour:
@@ -291115,13 +291368,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9165224470898666406}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9160692602282674359}
- m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &9165224470898666403
MonoBehaviour:
@@ -292050,13 +292303,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9166626868909862597}
+ serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.13960266, y: 0.12573236, z: 0.620452}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9169262158300684177}
- m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &9168819771354021101
Transform:
@@ -292065,13 +292318,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9166267521311334771}
+ serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0.8502426, y: 0.21234834, z: 0.99007416}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9169264360427945269}
- m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &9168823206826516679
Transform:
@@ -292080,13 +292333,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9166880846495778299}
+ serializedVersion: 2
m_LocalRotation: {x: 0.15493013, y: 0.00000002980232, z: 0.0000000065192576, w: 0.98792547}
m_LocalPosition: {x: 0, y: 5.98, z: -12.11}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4874546793249179939}
- m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 17.825, y: 0, z: 0}
--- !u!4 &9168838835965667607
Transform:
@@ -292095,13 +292348,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9166085944989044075}
+ serializedVersion: 2
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0.379, z: -0.211}
m_LocalScale: {x: 0.80492324, y: 1.4304771, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9160692602282674359}
- m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!4 &9168858357739025271
Transform:
@@ -292110,13 +292363,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9166182577537846509}
+ serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: -0.016853333, y: 0.404626, z: 1.5124359}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9169264360427945269}
- m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &9168888478692902815
Transform:
@@ -292125,13 +292378,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9166244463297057357}
+ serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0.2041893, y: 0.021567538, z: 0.21105194}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9169264360427945269}
- m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &9168892585357378517
Transform:
@@ -292140,13 +292393,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9166258158143233487}
+ serializedVersion: 2
m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9169257887102135377}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 90}
--- !u!4 &9168901111534398295
Transform:
@@ -292155,13 +292408,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9166919952803155693}
+ serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0.3514862, y: 0.08124749, z: 0.11843109}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9169264360427945269}
- m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &9168912669377334013
Transform:
@@ -292170,13 +292423,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9166861457204277657}
+ serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0.2041893, y: 0.021567538, z: 0.21105194}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9169264360427945269}
- m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &9168980149832767053
Transform:
@@ -292185,6 +292438,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9167046790482179383}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.26, y: 0.086, z: -2.14}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -292192,7 +292446,6 @@ Transform:
m_Children:
- {fileID: 9169262158300684177}
m_Father: {fileID: 9160692602282674359}
- m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &9169027830397806793
Transform:
@@ -292201,13 +292454,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9166179195698643879}
+ serializedVersion: 2
m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5}
m_LocalPosition: {x: 0, y: 0.266, z: -0.656}
m_LocalScale: {x: 0.002, y: 0.5, z: 0.92}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9169262158300684177}
- m_RootOrder: 2
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 90}
--- !u!4 &9169041851925626741
Transform:
@@ -292216,13 +292469,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9167003443817077033}
+ serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0.463, y: 0.1372664, z: -2.0099792}
m_LocalScale: {x: 1, y: 1.0000005, z: 1.0000005}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9169264360427945269}
- m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &9169080744999359467
Transform:
@@ -292231,13 +292484,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9166332642026289215}
+ serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0.97037506, y: 0.20424151, z: -0.73404694}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9169264360427945269}
- m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &9169097127178866053
Transform:
@@ -292246,6 +292499,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9165580164473847059}
+ serializedVersion: 2
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: -0.00023984311, y: 0.39775681, z: -0.65404534}
m_LocalScale: {x: 24.867477, y: 24.867434, z: 24.867481}
@@ -292253,7 +292507,6 @@ Transform:
m_Children:
- {fileID: 9169301000995029225}
m_Father: {fileID: 9160688381172865841}
- m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!4 &9169141504097228669
Transform:
@@ -292262,13 +292515,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9166960051361955673}
+ serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0.2041893, y: 0.021567538, z: 0.21105194}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9160692602282674359}
- m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &9169219581337598143
Transform:
@@ -292277,13 +292530,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9166273408745789161}
+ serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0.2041893, y: 0.021567538, z: 0.21105194}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9169264360427945269}
- m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &9169257887102135377
Transform:
@@ -292292,6 +292545,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9166903617838131567}
+ serializedVersion: 2
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: -0.0002409756, y: 0.3977573, z: -0.65404534}
m_LocalScale: {x: 24.867477, y: 24.867493, z: 24.86746}
@@ -292299,7 +292553,6 @@ Transform:
m_Children:
- {fileID: 9168892585357378517}
m_Father: {fileID: 9169262158300684177}
- m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!4 &9169262158300684177
Transform:
@@ -292308,6 +292561,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9166124320180742431}
+ serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: -0.000000059604638, z: -0.000000014435498, w: 0.7071068}
m_LocalPosition: {x: 0.00000025733607, y: -0.0100000575, z: 0.0149990255}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -292318,7 +292572,6 @@ Transform:
- {fileID: 9169027830397806793}
- {fileID: 9169257887102135377}
m_Father: {fileID: 9168980149832767053}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &9169264360427945269
Transform:
@@ -292327,6 +292580,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9166039233366530047}
+ serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -292349,7 +292603,6 @@ Transform:
- {fileID: 9160346371344076355}
- {fileID: 9169041851925626741}
m_Father: {fileID: 9160692602282674359}
- m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &9169301000995029225
Transform:
@@ -292358,13 +292611,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9167013431287888641}
+ serializedVersion: 2
m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9169097127178866053}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 90}
--- !u!33 &9170485340369916921
MeshFilter:
@@ -293967,3 +294220,35 @@ Rigidbody:
m_Interpolate: 1
m_Constraints: 0
m_CollisionDetection: 0
+--- !u!1660057539 &9223372036854775807
+SceneRoots:
+ m_ObjectHideFlags: 0
+ m_Roots:
+ - {fileID: 776161958}
+ - {fileID: 1861343896}
+ - {fileID: 632884041}
+ - {fileID: 2141404812}
+ - {fileID: 353560941}
+ - {fileID: 1124606661}
+ - {fileID: 1638571428}
+ - {fileID: 1163513067}
+ - {fileID: 1372856005}
+ - {fileID: 1683538875}
+ - {fileID: 538331748}
+ - {fileID: 1555303302}
+ - {fileID: 1502400192}
+ - {fileID: 884373867}
+ - {fileID: 1686310384}
+ - {fileID: 1081941391}
+ - {fileID: 1234264508}
+ - {fileID: 1159632678}
+ - {fileID: 1369204175}
+ - {fileID: 499270727}
+ - {fileID: 1646060060}
+ - {fileID: 2105062291}
+ - {fileID: 392096320}
+ - {fileID: 1341654437}
+ - {fileID: 840095406}
+ - {fileID: 1313203059}
+ - {fileID: 1655789842}
+ - {fileID: 1549546636}
diff --git a/BlueWater/Assets/AddressableAssetsData.meta b/BlueWater/Assets/AddressableAssetsData.meta
new file mode 100644
index 000000000..35090b4c7
--- /dev/null
+++ b/BlueWater/Assets/AddressableAssetsData.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 41e2ee40285c0402d8c2f912ce2b5bd3
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/BlueWater/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/BlueWater/Assets/AddressableAssetsData/AddressableAssetSettings.asset
new file mode 100644
index 000000000..b5f8af8be
--- /dev/null
+++ b/BlueWater/Assets/AddressableAssetsData/AddressableAssetSettings.asset
@@ -0,0 +1,109 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 468a46d0ae32c3544b7d98094e6448a9, type: 3}
+ m_Name: AddressableAssetSettings
+ m_EditorClassIdentifier:
+ m_DefaultGroup: 84c68c72d64fe49b4a85c32c0eaeab8b
+ m_currentHash:
+ serializedVersion: 2
+ Hash: 00000000000000000000000000000000
+ m_OptimizeCatalogSize: 0
+ m_BuildRemoteCatalog: 0
+ m_BundleLocalCatalog: 0
+ m_CatalogRequestsTimeout: 0
+ m_DisableCatalogUpdateOnStart: 0
+ m_IgnoreUnsupportedFilesInBuild: 0
+ m_UniqueBundleIds: 0
+ m_NonRecursiveBuilding: 1
+ m_CCDEnabled: 0
+ m_maxConcurrentWebRequests: 3
+ m_ContiguousBundles: 1
+ m_StripUnityVersionFromBundleBuild: 0
+ m_DisableVisibleSubAssetRepresentations: 0
+ m_ShaderBundleNaming: 0
+ m_ShaderBundleCustomNaming:
+ m_MonoScriptBundleNaming: 0
+ m_CheckForContentUpdateRestrictionsOption: 0
+ m_MonoScriptBundleCustomNaming:
+ m_RemoteCatalogBuildPath:
+ m_Id:
+ m_RemoteCatalogLoadPath:
+ m_Id:
+ m_ContentStateBuildPathProfileVariableName:
+ m_CustomContentStateBuildPath:
+ m_ContentStateBuildPath:
+ m_BuildAddressablesWithPlayerBuild: 0
+ m_overridePlayerVersion: '[UnityEditor.PlayerSettings.bundleVersion]'
+ m_GroupAssets:
+ - {fileID: 11400000, guid: 2c37f0ef7084841f296bbd0e51caeaad, type: 2}
+ - {fileID: 11400000, guid: 923dc60ba1f704952b558228228d4e8b, type: 2}
+ m_BuildSettings:
+ m_CompileScriptsInVirtualMode: 0
+ m_CleanupStreamingAssetsAfterBuilds: 1
+ m_LogResourceManagerExceptions: 1
+ m_BundleBuildPath: Temp/com.unity.addressables/AssetBundles
+ m_ProfileSettings:
+ m_Profiles:
+ - m_InheritedParent:
+ m_Id: 803cb393e1ba44d13b8a99db308b84af
+ m_ProfileName: Default
+ m_Values:
+ - m_Id: f976e802859f042bcbf93445e0074b55
+ m_Value: '[UnityEditor.EditorUserBuildSettings.activeBuildTarget]'
+ - m_Id: 1f7171e531b2e45589a60a1df6e16b4b
+ m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]'
+ - m_Id: 5cd6c13456d604e5e9a6ad8db28c86ce
+ m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]'
+ - m_Id: 8e88d36ff360e4cf8a9dc477780bba2c
+ m_Value: ServerData/[BuildTarget]
+ - m_Id: 9c569ce3bfc1f4483b0ddb5a8f38f962
+ m_Value: http://[PrivateIpAddress]:[HostingServicePort]
+ m_ProfileEntryNames:
+ - m_Id: f976e802859f042bcbf93445e0074b55
+ m_Name: BuildTarget
+ m_InlineUsage: 0
+ - m_Id: 1f7171e531b2e45589a60a1df6e16b4b
+ m_Name: Local.BuildPath
+ m_InlineUsage: 0
+ - m_Id: 5cd6c13456d604e5e9a6ad8db28c86ce
+ m_Name: Local.LoadPath
+ m_InlineUsage: 0
+ - m_Id: 8e88d36ff360e4cf8a9dc477780bba2c
+ m_Name: Remote.BuildPath
+ m_InlineUsage: 0
+ - m_Id: 9c569ce3bfc1f4483b0ddb5a8f38f962
+ m_Name: Remote.LoadPath
+ m_InlineUsage: 0
+ m_ProfileVersion: 1
+ m_LabelTable:
+ m_LabelNames:
+ - default
+ m_SchemaTemplates: []
+ m_GroupTemplateObjects:
+ - {fileID: 11400000, guid: f72684a31ef7c4eb4bcbb392351d8f1b, type: 2}
+ m_InitializationObjects: []
+ m_CertificateHandlerType:
+ m_AssemblyName:
+ m_ClassName:
+ m_ActivePlayerDataBuilderIndex: 3
+ m_DataBuilders:
+ - {fileID: 11400000, guid: 8154ac46c760246ebab7bb0f7b17ce89, type: 2}
+ - {fileID: 11400000, guid: e1e69ee250d254e0db33b5ba87dd2884, type: 2}
+ - {fileID: 11400000, guid: 3a012a3e780ad4e6ab0d7d33f619b83e, type: 2}
+ - {fileID: 11400000, guid: 1ba54363b401b443589906a05c077e98, type: 2}
+ m_ActiveProfileId: 803cb393e1ba44d13b8a99db308b84af
+ m_HostingServicesManager:
+ m_HostingServiceInfos: []
+ m_Settings: {fileID: 11400000}
+ m_NextInstanceId: 0
+ m_RegisteredServiceTypeRefs: []
+ m_PingTimeoutInMilliseconds: 5000
diff --git a/BlueWater/Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta b/BlueWater/Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta
new file mode 100644
index 000000000..900828273
--- /dev/null
+++ b/BlueWater/Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 245b0b1b67d1746a3abd2cd19556c98e
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/BlueWater/Assets/AddressableAssetsData/AssetGroupTemplates.meta b/BlueWater/Assets/AddressableAssetsData/AssetGroupTemplates.meta
new file mode 100644
index 000000000..4fa25a421
--- /dev/null
+++ b/BlueWater/Assets/AddressableAssetsData/AssetGroupTemplates.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a041a9f8dc90d4976853d9e751d1c32a
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/BlueWater/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset b/BlueWater/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset
new file mode 100644
index 000000000..27bfee54b
--- /dev/null
+++ b/BlueWater/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset
@@ -0,0 +1,76 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-6835223638048365940
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
+ m_Name: BundledAssetGroupSchema
+ m_EditorClassIdentifier:
+ m_Group: {fileID: 0}
+ m_InternalBundleIdMode: 1
+ m_Compression: 1
+ m_IncludeAddressInCatalog: 1
+ m_IncludeGUIDInCatalog: 1
+ m_IncludeLabelsInCatalog: 1
+ m_InternalIdNamingMode: 0
+ m_CacheClearBehavior: 0
+ m_IncludeInBuild: 1
+ m_BundledAssetProviderType:
+ m_AssemblyName:
+ m_ClassName:
+ m_ForceUniqueProvider: 0
+ m_UseAssetBundleCache: 1
+ m_UseAssetBundleCrc: 1
+ m_UseAssetBundleCrcForCachedBundles: 1
+ m_UseUWRForLocalBundles: 0
+ m_Timeout: 0
+ m_ChunkedTransfer: 0
+ m_RedirectLimit: -1
+ m_RetryCount: 0
+ m_BuildPath:
+ m_Id:
+ m_LoadPath:
+ m_Id:
+ m_BundleMode: 0
+ m_AssetBundleProviderType:
+ m_AssemblyName:
+ m_ClassName:
+ m_BundleNaming: 0
+ m_AssetLoadMode: 0
+--- !u!114 &-2928358181662964713
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
+ m_Name: ContentUpdateGroupSchema
+ m_EditorClassIdentifier:
+ m_Group: {fileID: 0}
+ m_StaticContent: 0
+--- !u!114 &11400000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 1a3c5d64ac83548c09dd1678b9f6f1cd, type: 3}
+ m_Name: Packed Assets
+ m_EditorClassIdentifier:
+ m_SchemaObjects:
+ - {fileID: -6835223638048365940}
+ - {fileID: -2928358181662964713}
+ m_Description: Pack assets into asset bundles.
+ m_Settings: {fileID: 11400000, guid: 245b0b1b67d1746a3abd2cd19556c98e, type: 2}
diff --git a/BlueWater/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta b/BlueWater/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta
new file mode 100644
index 000000000..44104e07c
--- /dev/null
+++ b/BlueWater/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f72684a31ef7c4eb4bcbb392351d8f1b
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/BlueWater/Assets/AddressableAssetsData/AssetGroups.meta b/BlueWater/Assets/AddressableAssetsData/AssetGroups.meta
new file mode 100644
index 000000000..a058de121
--- /dev/null
+++ b/BlueWater/Assets/AddressableAssetsData/AssetGroups.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1afea4179854644d3b2190cf9540b8bd
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/BlueWater/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset b/BlueWater/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset
new file mode 100644
index 000000000..44c0cf5ba
--- /dev/null
+++ b/BlueWater/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset
@@ -0,0 +1,34 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
+ m_Name: Built In Data
+ m_EditorClassIdentifier:
+ m_GroupName: Built In Data
+ m_Data:
+ m_SerializedData: []
+ m_GUID: 6245b25990c9346dbba03572316826cb
+ m_SerializeEntries:
+ - m_GUID: Resources
+ m_Address: Resources
+ m_ReadOnly: 1
+ m_SerializedLabels: []
+ FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: EditorSceneList
+ m_Address: EditorSceneList
+ m_ReadOnly: 1
+ m_SerializedLabels: []
+ FlaggedDuringContentUpdateRestriction: 0
+ m_ReadOnly: 1
+ m_Settings: {fileID: 11400000, guid: 245b0b1b67d1746a3abd2cd19556c98e, type: 2}
+ m_SchemaSet:
+ m_Schemas:
+ - {fileID: 11400000, guid: 80d5fd8f47ee24ee6b17d9562c6790a0, type: 2}
diff --git a/BlueWater/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta b/BlueWater/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta
new file mode 100644
index 000000000..18c1b7ed9
--- /dev/null
+++ b/BlueWater/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2c37f0ef7084841f296bbd0e51caeaad
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/BlueWater/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/BlueWater/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
new file mode 100644
index 000000000..1ca32f57d
--- /dev/null
+++ b/BlueWater/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
@@ -0,0 +1,25 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
+ m_Name: Default Local Group
+ m_EditorClassIdentifier:
+ m_GroupName: Default Local Group
+ m_Data:
+ m_SerializedData: []
+ m_GUID: 84c68c72d64fe49b4a85c32c0eaeab8b
+ m_SerializeEntries: []
+ m_ReadOnly: 0
+ m_Settings: {fileID: 11400000, guid: 245b0b1b67d1746a3abd2cd19556c98e, type: 2}
+ m_SchemaSet:
+ m_Schemas:
+ - {fileID: 11400000, guid: 9093d20baf9784535bd4fce16ba06da2, type: 2}
+ - {fileID: 11400000, guid: 7fcc2cdffc0c1483ea0ee8b44b37a627, type: 2}
diff --git a/BlueWater/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset.meta b/BlueWater/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset.meta
new file mode 100644
index 000000000..1217450ee
--- /dev/null
+++ b/BlueWater/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 923dc60ba1f704952b558228228d4e8b
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/BlueWater/Assets/AddressableAssetsData/AssetGroups/Schemas.meta b/BlueWater/Assets/AddressableAssetsData/AssetGroups/Schemas.meta
new file mode 100644
index 000000000..0b33e2839
--- /dev/null
+++ b/BlueWater/Assets/AddressableAssetsData/AssetGroups/Schemas.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c5a6796bc06c34ed68072b718ac9bd95
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/BlueWater/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset b/BlueWater/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset
new file mode 100644
index 000000000..fe6949540
--- /dev/null
+++ b/BlueWater/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset
@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: b1487f5d688e4f94f828f879d599dbdc, type: 3}
+ m_Name: Built In Data_PlayerDataGroupSchema
+ m_EditorClassIdentifier:
+ m_Group: {fileID: 11400000, guid: 2c37f0ef7084841f296bbd0e51caeaad, type: 2}
+ m_IncludeResourcesFolders: 1
+ m_IncludeBuildSettingsScenes: 1
diff --git a/BlueWater/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset.meta b/BlueWater/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset.meta
new file mode 100644
index 000000000..d63b32ff4
--- /dev/null
+++ b/BlueWater/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 80d5fd8f47ee24ee6b17d9562c6790a0
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/BlueWater/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset b/BlueWater/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset
new file mode 100644
index 000000000..5b64162dc
--- /dev/null
+++ b/BlueWater/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset
@@ -0,0 +1,45 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
+ m_Name: Default Local Group_BundledAssetGroupSchema
+ m_EditorClassIdentifier:
+ m_Group: {fileID: 11400000, guid: 923dc60ba1f704952b558228228d4e8b, type: 2}
+ m_InternalBundleIdMode: 1
+ m_Compression: 1
+ m_IncludeAddressInCatalog: 1
+ m_IncludeGUIDInCatalog: 1
+ m_IncludeLabelsInCatalog: 1
+ m_InternalIdNamingMode: 0
+ m_CacheClearBehavior: 0
+ m_IncludeInBuild: 1
+ m_BundledAssetProviderType:
+ m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
+ m_ForceUniqueProvider: 0
+ m_UseAssetBundleCache: 1
+ m_UseAssetBundleCrc: 1
+ m_UseAssetBundleCrcForCachedBundles: 1
+ m_UseUWRForLocalBundles: 0
+ m_Timeout: 0
+ m_ChunkedTransfer: 0
+ m_RedirectLimit: -1
+ m_RetryCount: 0
+ m_BuildPath:
+ m_Id: 1f7171e531b2e45589a60a1df6e16b4b
+ m_LoadPath:
+ m_Id: 5cd6c13456d604e5e9a6ad8db28c86ce
+ m_BundleMode: 0
+ m_AssetBundleProviderType:
+ m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
+ m_BundleNaming: 0
+ m_AssetLoadMode: 0
diff --git a/BlueWater/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset.meta b/BlueWater/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset.meta
new file mode 100644
index 000000000..940f5220c
--- /dev/null
+++ b/BlueWater/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7fcc2cdffc0c1483ea0ee8b44b37a627
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/BlueWater/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset b/BlueWater/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset
new file mode 100644
index 000000000..9da3660e8
--- /dev/null
+++ b/BlueWater/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset
@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
+ m_Name: Default Local Group_ContentUpdateGroupSchema
+ m_EditorClassIdentifier:
+ m_Group: {fileID: 11400000, guid: 923dc60ba1f704952b558228228d4e8b, type: 2}
+ m_StaticContent: 0
diff --git a/BlueWater/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta b/BlueWater/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta
new file mode 100644
index 000000000..c77b562d3
--- /dev/null
+++ b/BlueWater/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9093d20baf9784535bd4fce16ba06da2
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/BlueWater/Assets/AddressableAssetsData/DataBuilders.meta b/BlueWater/Assets/AddressableAssetsData/DataBuilders.meta
new file mode 100644
index 000000000..38a74dd08
--- /dev/null
+++ b/BlueWater/Assets/AddressableAssetsData/DataBuilders.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8ed38878caeb14daf8f8872cfe0a7f91
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/BlueWater/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset b/BlueWater/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset
new file mode 100644
index 000000000..50d30dc58
--- /dev/null
+++ b/BlueWater/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset
@@ -0,0 +1,20 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 88d21199f5d473f4db36845f2318f180, type: 3}
+ m_Name: BuildScriptFastMode
+ m_EditorClassIdentifier:
+ instanceProviderType:
+ m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider
+ sceneProviderType:
+ m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.SceneProvider
diff --git a/BlueWater/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta b/BlueWater/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta
new file mode 100644
index 000000000..c7c8bc2f2
--- /dev/null
+++ b/BlueWater/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8154ac46c760246ebab7bb0f7b17ce89
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/BlueWater/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset b/BlueWater/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset
new file mode 100644
index 000000000..ec875f943
--- /dev/null
+++ b/BlueWater/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset
@@ -0,0 +1,20 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 3e2e0ffa088c91d41a086d0b8cb16bdc, type: 3}
+ m_Name: BuildScriptPackedMode
+ m_EditorClassIdentifier:
+ instanceProviderType:
+ m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider
+ sceneProviderType:
+ m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.SceneProvider
diff --git a/BlueWater/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta b/BlueWater/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta
new file mode 100644
index 000000000..5e3e6d862
--- /dev/null
+++ b/BlueWater/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1ba54363b401b443589906a05c077e98
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/BlueWater/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset b/BlueWater/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset
new file mode 100644
index 000000000..762884519
--- /dev/null
+++ b/BlueWater/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset
@@ -0,0 +1,20 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: ad8c280d42ee0ed41a27db23b43dd2bf, type: 3}
+ m_Name: BuildScriptPackedPlayMode
+ m_EditorClassIdentifier:
+ instanceProviderType:
+ m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider
+ sceneProviderType:
+ m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.SceneProvider
diff --git a/BlueWater/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta b/BlueWater/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta
new file mode 100644
index 000000000..2ccd74381
--- /dev/null
+++ b/BlueWater/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3a012a3e780ad4e6ab0d7d33f619b83e
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/BlueWater/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset b/BlueWater/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset
new file mode 100644
index 000000000..dfb2d5825
--- /dev/null
+++ b/BlueWater/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset
@@ -0,0 +1,20 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: bb0e4994b34add1409fd8ccaf4a82de5, type: 3}
+ m_Name: BuildScriptVirtualMode
+ m_EditorClassIdentifier:
+ instanceProviderType:
+ m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider
+ sceneProviderType:
+ m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.SceneProvider
diff --git a/BlueWater/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset.meta b/BlueWater/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset.meta
new file mode 100644
index 000000000..c400429d9
--- /dev/null
+++ b/BlueWater/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e1e69ee250d254e0db33b5ba87dd2884
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/BlueWater/Assets/AddressableAssetsData/DefaultObject.asset b/BlueWater/Assets/AddressableAssetsData/DefaultObject.asset
new file mode 100644
index 000000000..499adf1d5
--- /dev/null
+++ b/BlueWater/Assets/AddressableAssetsData/DefaultObject.asset
@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 3a189bb168d8d90478a09ea08c2f3d72, type: 3}
+ m_Name: DefaultObject
+ m_EditorClassIdentifier:
+ m_AddressableAssetSettingsGuid: 245b0b1b67d1746a3abd2cd19556c98e
diff --git a/BlueWater/Assets/AddressableAssetsData/DefaultObject.asset.meta b/BlueWater/Assets/AddressableAssetsData/DefaultObject.asset.meta
new file mode 100644
index 000000000..8ca4a98ff
--- /dev/null
+++ b/BlueWater/Assets/AddressableAssetsData/DefaultObject.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 52ef95baf252a46f2979b3dff5d5a7fa
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Harbor/Lighthouse/Materials/3td_Stone_08.mat b/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Harbor/Lighthouse/Materials/3td_Stone_08.mat
index 60ca6d8fe..3a90513ab 100644
--- a/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Harbor/Lighthouse/Materials/3td_Stone_08.mat
+++ b/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Harbor/Lighthouse/Materials/3td_Stone_08.mat
@@ -62,7 +62,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 0}
+ m_Texture: {fileID: 2800000, guid: 5a97e0eee0607964ba063b9a29ff4e8c, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
diff --git a/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Harbor/Lighthouse/Materials/3td_WhiteBrick_02.mat b/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Harbor/Lighthouse/Materials/3td_WhiteBrick_02.mat
index 5d9d489c7..fe5431ee2 100644
--- a/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Harbor/Lighthouse/Materials/3td_WhiteBrick_02.mat
+++ b/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Harbor/Lighthouse/Materials/3td_WhiteBrick_02.mat
@@ -49,7 +49,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 0}
+ m_Texture: {fileID: 2800000, guid: 65a9bcaf36f44ce4b960338a2139b288, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
diff --git a/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Harbor/WarfStand/Materials/3td_MossWood_04.mat b/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Harbor/WarfStand/Materials/3td_MossWood_04.mat
index 64329b49e..9aa177ec0 100644
--- a/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Harbor/WarfStand/Materials/3td_MossWood_04.mat
+++ b/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Harbor/WarfStand/Materials/3td_MossWood_04.mat
@@ -62,7 +62,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 0}
+ m_Texture: {fileID: 2800000, guid: 6efac308c5d97444c8b0c4f8bdbc6b75, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
diff --git a/BlueWater/Assets/NWH/Dynamic Water Physics 2/NWH.DWP2.asmdef b/BlueWater/Assets/NWH/Dynamic Water Physics 2/NWH.DWP2.asmdef
index bbd0360e8..d52b653d1 100644
--- a/BlueWater/Assets/NWH/Dynamic Water Physics 2/NWH.DWP2.asmdef
+++ b/BlueWater/Assets/NWH/Dynamic Water Physics 2/NWH.DWP2.asmdef
@@ -3,7 +3,8 @@
"rootNamespace": "",
"references": [
"GUID:75469ad4d38634e559750d17036d5f7c",
- "GUID:c76e28da8ce572043b1fb2da95817e18"
+ "GUID:c76e28da8ce572043b1fb2da95817e18",
+ "GUID:5b35af79ebbe89647a157055d52c59d3"
],
"includePlatforms": [],
"excludePlatforms": [],
diff --git a/BlueWater/Assets/Settings/URP-HighFidelity-Renderer.asset b/BlueWater/Assets/Settings/URP-HighFidelity-Renderer.asset
index 54f426212..d9cfc00ad 100644
--- a/BlueWater/Assets/Settings/URP-HighFidelity-Renderer.asset
+++ b/BlueWater/Assets/Settings/URP-HighFidelity-Renderer.asset
@@ -74,6 +74,8 @@ MonoBehaviour:
type: 3}
objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486,
type: 3}
+ dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92,
+ type: 3}
m_AssetVersion: 2
m_OpaqueLayerMask:
serializedVersion: 2
diff --git a/BlueWater/Assets/Settings/URP-HighFidelity.asset b/BlueWater/Assets/Settings/URP-HighFidelity.asset
index 210a7b81d..1831aa76f 100644
--- a/BlueWater/Assets/Settings/URP-HighFidelity.asset
+++ b/BlueWater/Assets/Settings/URP-HighFidelity.asset
@@ -19,8 +19,8 @@ MonoBehaviour:
m_RendererDataList:
- {fileID: 11400000, guid: c40be3174f62c4acf8c1216858c64956, type: 2}
m_DefaultRendererIndex: 0
- m_RequireDepthTexture: 0
- m_RequireOpaqueTexture: 0
+ m_RequireDepthTexture: 1
+ m_RequireOpaqueTexture: 1
m_OpaqueDownsampling: 1
m_SupportsTerrainHoles: 1
m_SupportsHDR: 1
@@ -72,6 +72,7 @@ MonoBehaviour:
m_ColorGradingMode: 0
m_ColorGradingLutSize: 32
m_UseFastSRGBLinearConversion: 0
+ m_SupportDataDrivenLensFlare: 1
m_ShadowType: 1
m_LocalShadowsSupported: 0
m_LocalShadowsAtlasResolution: 256
diff --git a/BlueWater/Assets/StylizedWater2/Materials/StylizedWater2_Mobile.mat b/BlueWater/Assets/StylizedWater2/Materials/StylizedWater2_Mobile.mat
index c34de56d0..92548cd41 100644
--- a/BlueWater/Assets/StylizedWater2/Materials/StylizedWater2_Mobile.mat
+++ b/BlueWater/Assets/StylizedWater2/Materials/StylizedWater2_Mobile.mat
@@ -19,6 +19,7 @@ Material:
- _RECEIVE_SHADOWS_OFF
- _SHARP_INERSECTION
- _UNLIT
+ - _WAVES
m_InvalidKeywords:
- ADVANCED_LIGHTING
- _CROSSPAN_INTERSECTION
@@ -239,14 +240,14 @@ Material:
- _VertexColorDepth: 0
- _VertexColorFoam: 0
- _VertexColorWaveFlattening: 0
- - _WaveCount: 1
- - _WaveDistance: 0.763
- - _WaveHeight: 0.39
+ - _WaveCount: 5
+ - _WaveDistance: 0.509
+ - _WaveHeight: 5.48
- _WaveNormalStr: 0.291
- _WaveSpeed: 1
- _WaveSteepness: 0
- _WaveTint: 0.029
- - _WavesOn: 0
+ - _WavesOn: 1
- _WorkflowMode: 1
- _WorldSpaceUV: 1
- _ZClip: 1
diff --git a/BlueWater/Packages/manifest.json b/BlueWater/Packages/manifest.json
index f3ce801df..d2ac00dec 100644
--- a/BlueWater/Packages/manifest.json
+++ b/BlueWater/Packages/manifest.json
@@ -2,8 +2,8 @@
"dependencies": {
"com.unity.addressables": "1.21.14",
"com.unity.cinemachine": "2.9.5",
- "com.unity.collab-proxy": "2.0.4",
- "com.unity.feature.2d": "1.0.0",
+ "com.unity.collab-proxy": "2.0.5",
+ "com.unity.feature.2d": "2.0.0",
"com.unity.ide.rider": "3.0.24",
"com.unity.ide.visualstudio": "2.0.18",
"com.unity.ide.vscode": "1.2.5",
@@ -12,7 +12,7 @@
"com.unity.render-pipelines.universal": "14.0.8",
"com.unity.test-framework": "1.1.33",
"com.unity.textmeshpro": "3.0.6",
- "com.unity.timeline": "1.7.4",
+ "com.unity.timeline": "1.7.5",
"com.unity.ugui": "1.0.0",
"com.unity.visualscripting": "1.8.0",
"com.unity.modules.ai": "1.0.0",
diff --git a/BlueWater/Packages/packages-lock.json b/BlueWater/Packages/packages-lock.json
index 21289b406..f1e8fc49e 100644
--- a/BlueWater/Packages/packages-lock.json
+++ b/BlueWater/Packages/packages-lock.json
@@ -13,6 +13,18 @@
},
"url": "https://packages.unity.com"
},
+ "com.unity.2d.aseprite": {
+ "version": "1.0.0",
+ "depth": 1,
+ "source": "registry",
+ "dependencies": {
+ "com.unity.2d.sprite": "1.0.0",
+ "com.unity.2d.common": "6.0.6",
+ "com.unity.mathematics": "1.2.6",
+ "com.unity.modules.animation": "1.0.0"
+ },
+ "url": "https://packages.unity.com"
+ },
"com.unity.2d.common": {
"version": "8.0.1",
"depth": 2,
@@ -71,7 +83,7 @@
}
},
"com.unity.2d.tilemap.extras": {
- "version": "3.1.0",
+ "version": "3.1.1",
"depth": 1,
"source": "registry",
"dependencies": {
@@ -97,7 +109,7 @@
"url": "https://packages.unity.com"
},
"com.unity.burst": {
- "version": "1.8.4",
+ "version": "1.8.7",
"depth": 1,
"source": "registry",
"dependencies": {
@@ -115,7 +127,7 @@
"url": "https://packages.unity.com"
},
"com.unity.collab-proxy": {
- "version": "2.0.4",
+ "version": "2.0.5",
"depth": 0,
"source": "registry",
"dependencies": {},
@@ -139,7 +151,7 @@
"url": "https://packages.unity.com"
},
"com.unity.feature.2d": {
- "version": "1.0.0",
+ "version": "2.0.0",
"depth": 0,
"source": "builtin",
"dependencies": {
@@ -149,7 +161,8 @@
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.spriteshape": "9.0.2",
"com.unity.2d.tilemap": "1.0.0",
- "com.unity.2d.tilemap.extras": "3.1.0"
+ "com.unity.2d.tilemap.extras": "3.1.1",
+ "com.unity.2d.aseprite": "1.0.0"
}
},
"com.unity.ide.rider": {
@@ -268,7 +281,7 @@
"url": "https://packages.unity.com"
},
"com.unity.timeline": {
- "version": "1.7.4",
+ "version": "1.7.5",
"depth": 0,
"source": "registry",
"dependencies": {
diff --git a/BlueWater/ProjectSettings/EditorBuildSettings.asset b/BlueWater/ProjectSettings/EditorBuildSettings.asset
index ea88784fb..2732353ea 100644
--- a/BlueWater/ProjectSettings/EditorBuildSettings.asset
+++ b/BlueWater/ProjectSettings/EditorBuildSettings.asset
@@ -8,4 +8,6 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/SampleScene.unity
guid: 99c9720ab356a0642a771bea13969a05
- m_configObjects: {}
+ m_configObjects:
+ com.unity.addressableassets: {fileID: 11400000, guid: 52ef95baf252a46f2979b3dff5d5a7fa,
+ type: 2}
diff --git a/BlueWater/ProjectSettings/ProjectSettings.asset b/BlueWater/ProjectSettings/ProjectSettings.asset
index e1c39e1e4..4fb27b112 100644
--- a/BlueWater/ProjectSettings/ProjectSettings.asset
+++ b/BlueWater/ProjectSettings/ProjectSettings.asset
@@ -159,6 +159,7 @@ PlayerSettings:
iPhone: com.Unity-Technologies.com.unity.template.urp-blank
buildNumber:
Standalone: 0
+ VisionOS: 0
iPhone: 0
tvOS: 0
overrideDefaultApplicationIdentifier: 1
@@ -183,6 +184,8 @@ PlayerSettings:
tvOSSdkVersion: 0
tvOSRequireExtendedGameController: 0
tvOSTargetOSVersionString: 12.0
+ VisionOSSdkVersion: 0
+ VisionOSTargetOSVersionString: 1.0
uIPrerenderedIcon: 0
uIRequiresPersistentWiFi: 0
uIRequiresFullScreen: 1
@@ -230,8 +233,10 @@ PlayerSettings:
appleDeveloperTeamID:
iOSManualSigningProvisioningProfileID:
tvOSManualSigningProvisioningProfileID:
+ VisionOSManualSigningProvisioningProfileID:
iOSManualSigningProvisioningProfileType: 0
tvOSManualSigningProvisioningProfileType: 0
+ VisionOSManualSigningProvisioningProfileType: 0
appleEnableAutomaticSigning: 0
iOSRequireARKit: 0
iOSAutomaticallyDetectAndAddCapabilities: 1
@@ -805,7 +810,8 @@ PlayerSettings:
PS5: UNITY_POST_PROCESSING_STACK_V2
QNX: UNITY_POST_PROCESSING_STACK_V2
Stadia: UNITY_POST_PROCESSING_STACK_V2
- Standalone: CROSS_PLATFORM_INPUT;UNITY_POST_PROCESSING_STACK_V2;NWH_DWP2;CREST_OCEAN
+ Standalone: CROSS_PLATFORM_INPUT;UNITY_POST_PROCESSING_STACK_V2;NWH_DWP2;CREST_OCEAN;DWP_CREST
+ VisionOS: UNITY_POST_PROCESSING_STACK_V2
WebGL: UNITY_POST_PROCESSING_STACK_V2
Windows Store Apps: UNITY_POST_PROCESSING_STACK_V2
XboxOne: UNITY_POST_PROCESSING_STACK_V2
@@ -834,7 +840,6 @@ PlayerSettings:
suppressCommonWarnings: 1
allowUnsafeCode: 0
useDeterministicCompilation: 1
- selectedPlatform: 0
additionalIl2CppArgs:
scriptingRuntimeVersion: 1
gcIncremental: 0
diff --git a/BlueWater/ProjectSettings/ProjectVersion.txt b/BlueWater/ProjectSettings/ProjectVersion.txt
index 8fcd9947d..0a60761e0 100644
--- a/BlueWater/ProjectSettings/ProjectVersion.txt
+++ b/BlueWater/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2022.3.1f1
-m_EditorVersionWithRevision: 2022.3.1f1 (f18e0c1b5784)
+m_EditorVersion: 2022.3.5f1
+m_EditorVersionWithRevision: 2022.3.5f1 (9674261d40ee)