diff --git a/.github/workflows/activation.yml b/.github/workflows/activation.yml new file mode 100644 index 000000000..653a7db72 --- /dev/null +++ b/.github/workflows/activation.yml @@ -0,0 +1,18 @@ +name: Acquire activation file +on: + workflow_dispatch +jobs: + activation: + name: Request manual activation file 🔑 + runs-on: ubuntu-latest + steps: + # Request manual activation file + - name: Request manual activation file + id: getManualLicenseFile + uses: game-ci/unity-request-activation-file@v2 + # Upload artifact (Unity_v20XX.X.XXXX.alf) + - name: Expose as artifact + uses: actions/upload-artifact@v2 + with: + name: ${{ steps.getManualLicenseFile.outputs.filePath }} + path: ${{ steps.getManualLicenseFile.outputs.filePath }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 000000000..5862ba34a --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,167 @@ +name: Build CYF & Notify + +on: [push, pull_request, workflow_dispatch] + +jobs: + buildWindows: + name: Build CYF (Windows) + runs-on: ubuntu-latest + steps: + # Checkout + - name: Checkout repository + uses: actions/checkout@v2 + with: + lfs: true + + # Cache + - uses: actions/cache@v2 + with: + path: Library + key: Library-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }} + restore-keys: | + Library- + + # Build + - name: Build project + uses: game-ci/unity-builder@v2 + env: + UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} + UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} + UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} + with: + targetPlatform: StandaloneWindows64 + buildMethod: UnityBuilderAction.BuildScript.Build + buildName: CreateYourFrisk-win64 + + # Copy Assets to Build + - run: sudo mkdir -v "${{ github.workspace }}/build/StandaloneWindows64/Default" "${{ github.workspace }}/build/StandaloneWindows64/Mods" + - run: sudo cp -Rv "${{ github.workspace }}/Assets/Default/" "${{ github.workspace }}/build/StandaloneWindows64/" + - run: sudo cp -Rv "${{ github.workspace }}/Assets/Mods/" "${{ github.workspace }}/build/StandaloneWindows64/" + - run: sudo cp -Rv "${{ github.workspace }}/Documentation CYF 1.0/" "${{ github.workspace }}/build" + - run: sudo find ${{ github.workspace }}/build/StandaloneWindows64/ -name "*.meta" -type f -delete + - run: sudo mv ${{ github.workspace }}/build/StandaloneWindows64/ ${{ github.workspace }}/build/CreateYourFrisk/ + + # Output + - uses: actions/upload-artifact@v2 + with: + name: CreateYourFrisk-win64 + path: build + + buildMacOS: + name: Build CYF (MacOS) + runs-on: ubuntu-latest + steps: + # Checkout + - name: Checkout repository + uses: actions/checkout@v2 + with: + lfs: true + + # Cache + - uses: actions/cache@v2 + with: + path: Library + key: Library-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }} + restore-keys: | + Library- + + # Build + - name: Build project + uses: game-ci/unity-builder@v2 + env: + UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} + UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} + UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} + with: + targetPlatform: StandaloneOSX + buildMethod: UnityBuilderAction.BuildScript.Build + buildName: CreateYourFrisk-macos64 + + # Copy Assets to Build + - run: sudo mkdir -v "${{ github.workspace }}/build/StandaloneOSX/Default" "${{ github.workspace }}/build/StandaloneOSX/Mods" + - run: sudo cp -Rv "${{ github.workspace }}/Assets/Default/" "${{ github.workspace }}/build/StandaloneOSX/" + - run: sudo cp -Rv "${{ github.workspace }}/Assets/Mods/" "${{ github.workspace }}/build/StandaloneOSX/" + - run: sudo cp -Rv "${{ github.workspace }}/Documentation CYF 1.0/" "${{ github.workspace }}/build" + - run: sudo cp "${{ github.workspace }}/How to use CYF and add mods (Mac).txt" "${{ github.workspace }}/build/StandaloneOSX/" + - run: sudo find ${{ github.workspace }}/build/StandaloneOSX/ -name "*.meta" -type f -delete + - run: sudo mv ${{ github.workspace }}/build/StandaloneOSX/ ${{ github.workspace }}/build/CreateYourFrisk/ + + # Output + - uses: actions/upload-artifact@v2 + with: + name: CreateYourFrisk-macos64 + path: build + + buildLinux: + name: Build CYF (Linux) + runs-on: ubuntu-latest + steps: + # Checkout + - name: Checkout repository + uses: actions/checkout@v2 + with: + lfs: true + + # Cache + - uses: actions/cache@v2 + with: + path: Library + key: Library-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }} + restore-keys: | + Library- + + # Build + - name: Build project + uses: game-ci/unity-builder@v2 + env: + UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} + UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} + UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} + with: + targetPlatform: StandaloneLinux64 + buildMethod: UnityBuilderAction.BuildScript.Build + buildName: CreateYourFrisk-lin64 + + # Copy Assets to Build + - run: sudo mkdir -v "${{ github.workspace }}/build/StandaloneLinux64/Default" "${{ github.workspace }}/build/StandaloneLinux64/Mods" + - run: sudo cp -Rv "${{ github.workspace }}/Assets/Default/" "${{ github.workspace }}/build/StandaloneLinux64/" + - run: sudo cp -Rv "${{ github.workspace }}/Assets/Mods/" "${{ github.workspace }}/build/StandaloneLinux64/" + - run: sudo cp -Rv "${{ github.workspace }}/Documentation CYF 1.0/" "${{ github.workspace }}/build" + - run: sudo find ${{ github.workspace }}/build/StandaloneLinux64/ -name "*.meta" -type f -delete + - run: sudo mv ${{ github.workspace }}/build/StandaloneLinux64/ ${{ github.workspace }}/build/CreateYourFrisk/ + + # Output + - uses: actions/upload-artifact@v2 + with: + name: CreateYourFrisk-lin64 + path: build + + message-success: + runs-on: ubuntu-latest + needs: [buildWindows, buildMacOS, buildLinux] + if: success() + steps: + - name: Send Success Message + uses: tsickert/discord-webhook@v5.3.0 + with: + webhook-url: ${{ secrets.NIGHTLY_WEBHOOK_LINK }} + username: Poseur Mail Service + avatar-url: https://assets.git.ttaallkk.top/assets/GitHub-Mark-ea2971cee799.png + content: | + The last CYF nightly is ready to be used! Enjoy! + The links are stored here: https://discord.com/channels/110129114882543616/220238710271115265/1129795830317064314 + + message-failure: + runs-on: ubuntu-latest + needs: [buildWindows, buildMacOS, buildLinux] + if: failure() + steps: + - name: Send Failure Message + uses: tsickert/discord-webhook@v5.3.0 + with: + webhook-url: ${{ secrets.NIGHTLY_WEBHOOK_LINK }} + username: Poseur Mail Service + avatar-url: https://assets.git.ttaallkk.top/assets/GitHub-Mark-ea2971cee799.png + content: | + Oh no! The last CYF build failed! You're bad at your job! + The run's details are here: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} diff --git a/.github/workflows/nightly_notification.yml b/.github/workflows/nightly_notification.yml new file mode 100644 index 000000000..056fbb1e2 --- /dev/null +++ b/.github/workflows/nightly_notification.yml @@ -0,0 +1,23 @@ +name: Send a message to the channel cyf-nightly + +on: + workflow_run: + workflows: ["Build CYF"] + types: + - completed + workflow_dispatch: + +jobs: + message: + runs-on: ubuntu-latest + steps: + - name: Discord Webhook Action + uses: tsickert/discord-webhook@v5.3.0 + with: + webhook-url: ${{ secrets.NIGHTLY_WEBHOOK_LINK }} + username: Poseur Mail Service + avatar-url: https://assets.git.ttaallkk.top/assets/GitHub-Mark-ea2971cee799.png + content: | + The last CYF nightly is ready to be used! Enjoy! + The links are stored here: https://discord.com/channels/110129114882543616/220238710271115265/1129795830317064314 + diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml deleted file mode 100644 index f71ee027a..000000000 --- a/.github/workflows/pages.yml +++ /dev/null @@ -1,42 +0,0 @@ -# Simple workflow for deploying static content to GitHub Pages -name: Deploy static content to Pages - -on: - # Runs on pushes targeting the default branch - push: - branches: ["master"] - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - -# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages -permissions: - contents: read - pages: write - id-token: write - -# Allow one concurrent deployment -concurrency: - group: "pages" - cancel-in-progress: true - -jobs: - # Single deploy job since we're just deploying - deploy: - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Setup Pages - uses: actions/configure-pages@v2 - - name: Upload artifact - uses: actions/upload-pages-artifact@v1 - with: - # Upload entire repository - path: 'Documentation CYF 1.0' - - name: Deploy to GitHub Pages - id: deployment - uses: actions/deploy-pages@v1 diff --git a/.gitignore b/.gitignore index 2042bfecd..55bf0627d 100644 --- a/.gitignore +++ b/.gitignore @@ -68,8 +68,7 @@ sysinfo.txt /.vs/* /.vscode/* /.bin/* -/.github # GIMP project files *.xcf -*.xcf.meta \ No newline at end of file +*.xcf.meta diff --git a/.vsconfig b/.vsconfig new file mode 100644 index 000000000..3286efb85 --- /dev/null +++ b/.vsconfig @@ -0,0 +1,6 @@ +{ + "version": "1.0", + "components": [ + "Microsoft.VisualStudio.Workload.ManagedGame" + ] +} \ No newline at end of file diff --git a/Assets/Default/Sprites/UI/Fonts/uibattlesmall.xml b/Assets/Default/Sprites/UI/Fonts/uibattlesmall.xml index bf2c21b90..c50dd1418 100644 --- a/Assets/Default/Sprites/UI/Fonts/uibattlesmall.xml +++ b/Assets/Default/Sprites/UI/Fonts/uibattlesmall.xml @@ -1,7 +1,6 @@ ffffff -12 @@ -55,7 +54,7 @@ - + @@ -148,7 +147,7 @@ - + diff --git a/Assets/Scripts/Discord.meta b/Assets/Editor/UnityBuilderAction.meta similarity index 77% rename from Assets/Scripts/Discord.meta rename to Assets/Editor/UnityBuilderAction.meta index 6c83a5135..bb14573f5 100644 --- a/Assets/Scripts/Discord.meta +++ b/Assets/Editor/UnityBuilderAction.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3a53e6e16055cb9469f1e41d77ff5ea0 +guid: cabb474da3dd3bd4a8795e61b4256e1d folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Editor/UnityBuilderAction/BuildScript.cs b/Assets/Editor/UnityBuilderAction/BuildScript.cs new file mode 100644 index 000000000..1218b09a5 --- /dev/null +++ b/Assets/Editor/UnityBuilderAction/BuildScript.cs @@ -0,0 +1,94 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using UnityEditor; +using UnityEditor.Build.Reporting; + +namespace UnityBuilderAction { + public static class BuildScript { + private static readonly string Eol = Environment.NewLine; + + private static readonly string[] Secrets = + {"androidKeystorePass", "androidKeyaliasName", "androidKeyaliasPass"}; + + public static void Build() { + // Gather values from args + Dictionary options = GetValidatedOptions(); + + // Set version for this build + PlayerSettings.bundleVersion = options["buildVersion"]; + PlayerSettings.macOS.buildNumber = options["buildVersion"]; + PlayerSettings.Android.bundleVersionCode = int.Parse(options["androidVersionCode"]); + + // Apply build target + var buildTarget = (BuildTarget) Enum.Parse(typeof(BuildTarget), options["buildTarget"]); + + // Determine subtarget + int buildSubtarget = 0; + + // Custom build + Build(buildTarget, buildSubtarget, options["customBuildPath"]); + } + + private static Dictionary GetValidatedOptions() { + Dictionary validatedOptions = ParseCommandLineArguments(); + return validatedOptions; + } + + private static Dictionary ParseCommandLineArguments() { + var providedArguments = new Dictionary(); + string[] args = Environment.GetCommandLineArgs(); + + // Extract flags with optional values + for (int current = 0, next = 1; current < args.Length; current++, next++) { + // Parse flag + bool isFlag = args[current].StartsWith("-"); + if (!isFlag) continue; + string flag = args[current].TrimStart('-'); + + // Parse optional value + bool flagHasValue = next < args.Length && !args[next].StartsWith("-"); + string value = flagHasValue ? args[next].TrimStart('-') : ""; + bool secret = Secrets.Contains(flag); + + // Assign + providedArguments.Add(flag, value); + } + return providedArguments; + } + + private static void Build(BuildTarget buildTarget, int buildSubtarget, string filePath) { + string[] scenes = EditorBuildSettings.scenes.Where(scene => scene.enabled).Select(s => s.path).ToArray(); + var buildPlayerOptions = new BuildPlayerOptions { + scenes = scenes, + target = buildTarget, + locationPathName = filePath, + }; + + BuildSummary buildSummary = BuildPipeline.BuildPlayer(buildPlayerOptions).summary; + ExitWithResult(buildSummary.result); + } + + private static void ExitWithResult(BuildResult result) { + switch (result) { + case BuildResult.Succeeded: + Console.WriteLine("Build succeeded!"); + EditorApplication.Exit(0); + break; + case BuildResult.Failed: + Console.WriteLine("Build failed!"); + EditorApplication.Exit(101); + break; + case BuildResult.Cancelled: + Console.WriteLine("Build cancelled!"); + EditorApplication.Exit(102); + break; + case BuildResult.Unknown: + default: + Console.WriteLine("Build result is unknown!"); + EditorApplication.Exit(103); + break; + } + } + } +} \ No newline at end of file diff --git a/Assets/Editor/UnityBuilderAction/BuildScript.cs.meta b/Assets/Editor/UnityBuilderAction/BuildScript.cs.meta new file mode 100644 index 000000000..4bcade184 --- /dev/null +++ b/Assets/Editor/UnityBuilderAction/BuildScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e2fdd24de7d7c2d498a7ef5ddb681155 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Animations/ScruffleAnim.lua b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Animations/ScruffleAnim.lua new file mode 100644 index 000000000..510873ae3 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Animations/ScruffleAnim.lua @@ -0,0 +1,345 @@ +scruffleFalseUpperBody = CreateSprite("empty") +scruffleLArmTop = CreateSprite("Scruffle/leftarmtop") +scruffleLHand = CreateSprite("Scruffle/lefthand") +scruffleLArmBot = CreateSprite("Scruffle/leftarmbot") + +scruffleLLeg = CreateSprite("Scruffle/leftleg") +scruffleRLeg = CreateSprite("Scruffle/rightleg") + +scruffleUpperBody = CreateSprite("empty") +scruffleHood = CreateSprite("Scruffle/hoodtail") +scruffleTorso = CreateSprite("Scruffle/torso") +scruffleHead = CreateSprite("Scruffle/head") +scruffleBlush = CreateSprite("Scruffle/blush") + +scruffleRArmTop = CreateSprite("Scruffle/rightarmtop") +scruffleRHand = CreateSprite("Scruffle/righthand") +scruffleRArmBot = CreateSprite("Scruffle/rightarmbot") + +scruffleHurt = CreateSprite("Scruffle/hurt") +scruffleSpared = CreateSprite("Scruffle/spared") + +scruffleFalseUpperBody.Scale(scruffleTorso.width * 2, scruffleTorso.height * 2) +scruffleLArmTop.Scale(2, 2) +scruffleLHand.Scale(2, 2) +scruffleLArmBot.Scale(2, 2) +scruffleLLeg.Scale(2, 2) +scruffleRLeg.Scale(2, 2) +scruffleUpperBody.Scale(scruffleTorso.width * 2, scruffleTorso.height * 2) +scruffleHood.Scale(2, 2) +scruffleTorso.Scale(2, 2) +scruffleHead.Scale(2, 2) +scruffleBlush.Scale(2, 2) +scruffleRArmTop.Scale(2, 2) +scruffleRHand.Scale(2, 2) +scruffleRArmBot.Scale(2, 2) +scruffleHurt.Scale(2, 2) + +--[[ +Parenting tree: + +deathParent +monstersprite + scruffleFalseUpperBody + scruffleLArmTop + scruffleLHand + scruffleLArmBot + scruffleLLeg + scruffleRLeg + scruffleUpperBody + scruffleHood + scruffleTorso + scruffleHead + scruffleBlush + scruffleRArmTop + scruffleRHand + scruffleRArmBot + scruffleHurt + scruffleSpared +]] + +scruffleFalseUpperBody.SetParent(monstersprite) +scruffleLArmTop.SetParent(scruffleFalseUpperBody) +scruffleLHand.SetParent(scruffleLArmTop) +scruffleLArmBot.SetParent(scruffleLArmTop) + +scruffleLLeg.SetParent(monstersprite) +scruffleRLeg.SetParent(monstersprite) + +scruffleUpperBody.SetParent(monstersprite) +scruffleHood.SetParent(scruffleUpperBody) +scruffleTorso.SetParent(scruffleUpperBody) +scruffleHead.SetParent(scruffleTorso) +scruffleBlush.SetParent(scruffleHead) + +scruffleRArmTop.SetParent(scruffleTorso) +scruffleRHand.SetParent(scruffleRArmTop) +scruffleRArmBot.SetParent(scruffleRArmTop) + +scruffleHurt.SetParent(monstersprite) +scruffleSpared.SetParent(monstersprite) + + + +scruffleFalseUpperBody.MoveToAbs(monstersprite.absx - 4, monstersprite.absy + 80) +scruffleLArmTop.MoveTo(-13, 64) +scruffleLArmTop.SetPivot(0.7, 0.88) +scruffleLHand.MoveTo(-20, -18) +scruffleLHand.SetPivot(0.67, 0.96) +scruffleLArmBot.MoveTo(7, 18) +scruffleLArmBot.SetPivot(0.7, 0.88) + +scruffleLLeg.SetPivot(0.5, 0) +scruffleLLeg.MoveToAbs(monstersprite.absx - 31, monstersprite.absy) +scruffleRLeg.SetPivot(0.5, 0) +scruffleRLeg.MoveToAbs(monstersprite.absx + 27, monstersprite.absy) + +scruffleUpperBody.MoveToAbs(monstersprite.absx - 4, monstersprite.absy + 80) +scruffleHood.MoveTo(11, 90) +scruffleHood.SetPivot(0.105, 0.6) +scruffleTorso.MoveTo(0, 0) +scruffleTorso.SetPivot(0.5, 0.25) +scruffleHead.MoveTo(5, 56) +scruffleHead.SetPivot(0.7, 0.22) +scruffleBlush.MoveTo(0, 0) +scruffleBlush.alpha = 0 + +scruffleRArmTop.MoveTo(22, 26) +scruffleRArmTop.SetPivot(0.22, 0.85) +scruffleRHand.MoveTo(13, -15) +scruffleRHand.SetPivot(0.39, 0.96) +scruffleRArmBot.MoveTo(-12, 19) +scruffleRArmBot.SetPivot(0.22, 0.85) + +scruffleHurt.SetPivot(.5, 0) +scruffleHurt.SetAnchor(.5, 0) +scruffleHurt.MoveTo(0, 0) +scruffleHurt.alpha = 0 + +scruffleSpared.SetPivot(.5, 0) +scruffleSpared.SetAnchor(.5, 0) +scruffleSpared.MoveTo(2, -4) +scruffleSpared.color = { 0.5, 0.5, 0.5, 0 } + +local time = 0 +local timer = 0 + +animation = "Idle" + +function SwitchAnimation(anim) + -- Reset the anim properly + ResetScruffle() + time = 0 + + -- Differences between the Idle and Death animation + if anim == "Death" then + scruffleLLeg.Set("Scruffle/Death/leftleg") + scruffleRLeg.Set("Scruffle/Death/rightleg") + + scruffleRArmTop.Set("Scruffle/leftarm") + scruffleRArmTop.SetPivot(0.7, 0.88) + scruffleRArmTop.Move(-17, -34) + scruffleRArmBot.Set("empty") + + scruffleRHand.Set("Scruffle/Death/righthand") + scruffleRHand.MoveTo(-4, -18) + scruffleRHand.SetPivot(0.66, 0.06) + + scruffleFalseUpperBody.SetParent(deathParent) + scruffleLLeg.SetParent(deathParent) + scruffleRLeg.SetParent(deathParent) + scruffleUpperBody.SetParent(deathParent) + scruffleHurt.SetParent(deathParent) + end + + animation = anim +end + +function AnimateScruffle() + -- Idle looped animation + if animation == "Idle" then + scruffleHood.rotation = 10 * math.sin(time * 2) + scruffleHead.MoveTo(5, 56 + 1.5 * math.sin(time * 1.5)) + scruffleHead.rotation = 5 * math.sin(time) + + scruffleLArmTop.rotation = 5 * math.sin(time * 1.75) + scruffleLArmBot.rotation = 5 * math.sin(time * 1.75) + scruffleLHand.rotation = -10 + 6 * math.sin(time / 1.25) + + scruffleRArmTop.rotation = 4 * math.sin(time) + scruffleRArmBot.rotation = 4 * math.sin(time) + scruffleRHand.rotation = -4 + 6 * math.sin(time / 1.4) + + scruffleFalseUpperBody.rotation = 3 * math.sin(time / 1.3) + scruffleFalseUpperBody.MoveToAbs(monstersprite.absx - 4, monstersprite.absy + 81 + 2 * math.sin(time * 1.1)) + scruffleUpperBody.rotation = 3 * math.sin(time / 1.3) + scruffleUpperBody.MoveToAbs(monstersprite.absx - 4, monstersprite.absy + 81 + 2 * math.sin(time * 1.1)) + if scruffleHood.alpha > 0 then + time = time + Time.dt + end + -- Death oneshot animation + elseif animation == "Death" then + -- Right arm detaches from the body (hahaha) + if timer == 0 then + scruffleRArmTop.SetParent(deathParent) + scruffleRArmTop.SetPivot(0.23, 0.17) + Audio.PlaySound("spear") + -- Right arm falls on the ground + elseif timer < 45 then + scruffleRArmTop.Move(1.4, -timer * 4.2 / 45) + scruffleRArmTop.rotation = scruffleRArmTop.rotation + 2.5 + scruffleRHand.rotation = scruffleRHand.rotation + 6 + -- Scruffle squeaks and looks at his missing arm + elseif timer == 90 then + scruffleHead.Move(14, 0) + scruffleHead.Set("Scruffle/Death/head2") + Audio.PlaySound("squeak") + -- All the parts of the body are detached from the monster (hahahahaha) + elseif timer == 135 then + scruffleHead.Set("Scruffle/Death/head3") + scruffleLArmTop.SetParent(deathParent) + scruffleTorso.SetParent(deathParent) + scruffleHood.SetParent(deathParent) + scruffleLLeg.SetPivot(0.5, 0.5) + scruffleLLeg.Move(0, scruffleLLeg.height) + scruffleLLeg.SendToTop() + scruffleRLeg.SetPivot(0.5, 0.5) + scruffleRLeg.Move(0, scruffleRLeg.height) + scruffleRLeg.SendToTop() + scruffleRArmTop.SendToTop() + scruffleHead.SetParent(deathParent) + Audio.PlaySound("sudden") + -- All the parts fall on the ground + elseif timer > 135 and timer < 180 then + scruffleLArmTop.rotation = scruffleLArmTop.rotation - 1.5 + scruffleLArmTop.Move(0.5, -(timer - 135) * 5.4 / 45) + + scruffleLLeg.rotation = scruffleLLeg.rotation - 1.8 + scruffleLLeg.Move(0, -(timer - 135) * 0.5 / 45) + + scruffleRLeg.rotation = scruffleRLeg.rotation + 1.8 + scruffleRLeg.Move(0.5, -(timer - 135) * 0.5 / 45) + + scruffleHood.rotation = scruffleHood.rotation + 3.9 + scruffleHood.Move(1.5, -(timer - 135) * 7 / 45) + + scruffleTorso.rotation = scruffleTorso.rotation + 1.9 + scruffleTorso.Move(0.75, -(timer - 135) * 2 / 45) + + scruffleHead.Move(0.5, -(timer - 135) * 6 / 45) + -- Destroy the entire animation, replace deathParent by a unique dusting sprite + elseif timer == 180 then + deathParent.Set("Scruffle/Death/dustingmess") + deathParent.alpha = 1 + deathParent.Move(13, -8) + DeleteAnimation() + deathParent.Dust(true, true) + end + + timer = timer + 1 + end +end + +-- Reset the animation to its starting Idle animation positions +function ResetScruffle() + if animation == "Idle" then + scruffleHood.rotation = 0 + scruffleHead.MoveTo(5, 56) + scruffleHead.rotation = 0 + + scruffleLArmTop.rotation = 0 + scruffleLArmBot.rotation = 0 + scruffleLHand.rotation = 0 + + scruffleRArmTop.rotation = 0 + scruffleRArmBot.rotation = 0 + scruffleRHand.rotation = 0 + + scruffleFalseUpperBody.rotation = 0 + scruffleFalseUpperBody.MoveToAbs(monstersprite.absx - 4, monstersprite.absy + 80) + scruffleUpperBody.rotation = 0 + scruffleUpperBody.MoveToAbs(monstersprite.absx - 4, monstersprite.absy + 80) + end +end + +blushAlpha = 0 +-- Makes the blushing sprite visible with a given alpha value +function Blush(alpha) + scruffleBlush.alpha = alpha + blushAlpha = alpha +end + +-- It hurts to be knifed +function AnimateHurt(hurt) + local animAlpha = hurt and 0 or 1 + + scruffleLArmTop.alpha = animAlpha + scruffleLHand.alpha = animAlpha + scruffleLArmBot.alpha = animAlpha + + scruffleLLeg.alpha = animAlpha + scruffleRLeg.alpha = animAlpha + + scruffleHood.alpha = animAlpha + scruffleTorso.alpha = animAlpha + scruffleHead.alpha = animAlpha + scruffleBlush.alpha = animAlpha == 0 and 0 or blushAlpha + + scruffleRArmTop.alpha = animAlpha + scruffleRHand.alpha = animAlpha + scruffleRArmBot.alpha = animAlpha + + scruffleHurt.alpha = 1 - animAlpha + + ResetScruffle() + time = 0 +end + +-- It's nice to be spared +function AnimateSpare(spare) + local animAlpha = spare and 0 or 1 + + scruffleLArmTop.alpha = animAlpha + scruffleLHand.alpha = animAlpha + scruffleLArmBot.alpha = animAlpha + + scruffleLLeg.alpha = animAlpha + scruffleRLeg.alpha = animAlpha + + scruffleHood.alpha = animAlpha + scruffleTorso.alpha = animAlpha + scruffleHead.alpha = animAlpha + scruffleBlush.alpha = animAlpha == 0 and 0 or blushAlpha + + scruffleRArmTop.alpha = animAlpha + scruffleRHand.alpha = animAlpha + scruffleRArmBot.alpha = animAlpha + + scruffleSpared.alpha = 1 - animAlpha + + ResetScruffle() + time = 0 +end + +-- Destroy it all +function DeleteAnimation() + scruffleHurt.Remove() + + scruffleRArmBot.Remove() + scruffleRHand.Remove() + scruffleRArmTop.Remove() + + scruffleBlush.Remove() + scruffleHead.Remove() + scruffleTorso.Remove() + scruffleHood.Remove() + scruffleUpperBody.Remove() + + scruffleRLeg.Remove() + scruffleLLeg.Remove() + + scruffleLArmBot.Remove() + scruffleLHand.Remove() + scruffleLArmTop.Remove() + scruffleFalseUpperBody.Remove() +end \ No newline at end of file diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/poseur.lua.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Animations/ScruffleAnim.lua.meta similarity index 74% rename from Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/poseur.lua.meta rename to Assets/Mods/@0.5.0_SEE_CRATE/Lua/Animations/ScruffleAnim.lua.meta index e760e8575..87813526c 100644 --- a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/poseur.lua.meta +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Animations/ScruffleAnim.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2e354a1ed8b18c0498601981ea656334 +guid: 51e457d5c7af401468079cba485e5c60 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Animations/StaticAnim.lua b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Animations/StaticAnim.lua new file mode 100644 index 000000000..479b364e1 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Animations/StaticAnim.lua @@ -0,0 +1,621 @@ +staticFalseUpperBody = CreateSprite("empty") +staticTail = CreateSprite("Static/tail") +staticTailMask = CreateSprite("Static/tailmask") +staticTailStatic = CreateSprite("Static/staticeffect") + +staticLArm = CreateSprite("Static/larm") +staticLHand = CreateSprite("Static/lhand") + +staticLegs = CreateSprite("Static/legs") +staticTorso = CreateSprite("Static/torso") + +staticRArm = CreateSprite("Static/rarm") +staticRHand = CreateSprite("Static/rhand") + +staticFluff = CreateSprite("Static/fluff") +staticFluffMask = CreateSprite("Static/fluffmask") +staticFluffStatic = CreateSprite("Static/staticeffect") + +staticFalseHeadBase = CreateSprite("empty") +staticHeadBase = CreateSprite("Static/headbase") +staticFace = CreateSprite("Static/face") +staticFaceMask = CreateSprite("Static/facemask") +staticFaceStatic = CreateSprite("Static/staticeffect") + +staticDeathExplosion = CreateSprite("empty") +staticDeathSmokes = { } + +staticLEar = CreateSprite("Static/lear") +staticLEarMask = CreateSprite("Static/learmask") +staticLEarStatic = CreateSprite("Static/staticeffect") + +staticREar = CreateSprite("Static/rear") +staticREarMask = CreateSprite("Static/rearmask") +staticREarStatic = CreateSprite("Static/staticeffect") + +staticHurt = CreateSprite("Static/Hurt/hurt") + +staticHurtFluffMask = CreateSprite("Static/Hurt/fluffmask") +staticHurtFluffStatic = CreateSprite("Static/staticeffect") + +staticHurtTailMask = CreateSprite("Static/Hurt/tailmask") +staticHurtTailStatic = CreateSprite("Static/staticeffect") + +staticHurtFaceMask = CreateSprite("Static/Hurt/facemask") +staticHurtFaceStatic = CreateSprite("Static/staticeffect") + +staticHurtLEarMask = CreateSprite("Static/Hurt/learmask") +staticHurtLEarStatic = CreateSprite("Static/staticeffect") + +staticHurtREarMask = CreateSprite("Static/Hurt/rearmask") +staticHurtREarStatic = CreateSprite("Static/staticeffect") + +staticSpared = CreateSprite("Static/spared") + + + +staticFalseUpperBody.Scale(staticTorso.width * 2, staticTorso.height * 2) +staticTail.Scale(2, 2) +staticTailMask.Scale(2, 2) +staticLArm.Scale(2, 2) +staticLHand.Scale(2, 2) +staticLegs.Scale(2, 2) +staticTorso.Scale(2, 2) +staticRArm.Scale(2, 2) +staticRHand.Scale(2, 2) +staticFluff.Scale(2, 2) +staticFluffMask.Scale(2, 2) +staticFalseHeadBase.Scale(staticHeadBase.width * 2, staticHeadBase.height * 2) +staticHeadBase.Scale(2, 2) +staticFace.Scale(2, 2) +staticFaceMask.Scale(2, 2) +staticDeathExplosion.Scale(2, 2) +staticLEar.Scale(2, 2) +staticLEarMask.Scale(2, 2) +staticREar.Scale(2, 2) +staticREarMask.Scale(2, 2) +staticHurt.Scale(2, 2) +staticHurtFluffMask.Scale(2, 2) +staticHurtTailMask.Scale(2, 2) +staticHurtFaceMask.Scale(2, 2) +staticHurtLEarMask.Scale(2, 2) +staticHurtREarMask.Scale(2, 2) + + + +--[[ +Parenting tree: + +deathparent +monstersprite + staticFalseUpperBody +1 + staticTail + staticTailMask ^ + staticTailStatic X + staticLArm + staticLHand + staticLegs + staticTorso +1 + staticRArm + staticRHand + staticFluff + staticFluffMask ^ + staticFluffStatic X + staticHeadBase + staticLEar + staticLEarMask ^ + staticLEarStatic X + staticREar + staticREarMask ^ + staticREarStatic X + staticFace ^ + staticFaceMask ^ + staticFaceStatic X + staticDeathExplosion + staticHurt ^ + staticHurtFluffMask + staticHurtFluffStatic X + staticHurtTailMask + staticHurtTailStatic X + staticHurtFaceMask + staticHurtFaceStatic X + staticHurtLEarMask + staticHurtLEarStatic X + staticHurtREarMask + staticHurtREarStatic X + staticSpared ^ + +^ = same position as parent +X = static sprite ++1 = same position +]] + +staticFalseUpperBody.SetParent(monstersprite) +staticTail.SetParent(staticFalseUpperBody) +staticTailMask.SetParent(staticTail) +staticTailStatic.SetParent(staticTailMask) + +staticLArm.SetParent(staticFalseUpperBody) +staticLHand.SetParent(staticLArm) + +staticLegs.SetParent(monstersprite) +staticTorso.SetParent(staticLegs) + +staticRArm.SetParent(staticTorso) +staticRHand.SetParent(staticRArm) + +staticFluff.SetParent(staticTorso) +staticFluffMask.SetParent(staticFluff) +staticFluffStatic.SetParent(staticFluffMask) + +staticHeadBase.SetParent(staticTorso) + +staticLEar.SetParent(staticHeadBase) +staticLEarMask.SetParent(staticLEar) +staticLEarStatic.SetParent(staticLEarMask) + +staticREar.SetParent(staticHeadBase) +staticREarMask.SetParent(staticREar) +staticREarStatic.SetParent(staticREarMask) + +staticFace.SetParent(staticHeadBase) +staticFaceMask.SetParent(staticFace) +staticFaceStatic.SetParent(staticFaceMask) +staticDeathExplosion.SetParent(staticFace) + +staticHurt.SetParent(monstersprite) + +staticHurtFluffMask.SetParent(staticHurt) +staticHurtFluffStatic.SetParent(staticHurtFluffMask) + +staticHurtTailMask.SetParent(staticHurt) +staticHurtTailStatic.SetParent(staticHurtTailMask) + +staticHurtFaceMask.SetParent(staticHurt) +staticHurtFaceStatic.SetParent(staticHurtFaceMask) + +staticHurtLEarMask.SetParent(staticHurt) +staticHurtLEarStatic.SetParent(staticHurtLEarMask) + +staticHurtREarMask.SetParent(staticHurt) +staticHurtREarStatic.SetParent(staticHurtREarMask) + +staticSpared.SetParent(monstersprite) + + + +staticLegs.SetPivot(0.5, 0) +staticLegs.MoveToAbs(monstersprite.absx - 22, monstersprite.absy) +staticTorso.SetAnchor(0.5, 0.9) +staticTorso.SetPivot(0.5, 0.13) +staticTorso.MoveTo(7, 3) +staticFalseUpperBody.SetPivot(0.5, 0.13) +staticFalseUpperBody.MoveToAbs(staticTorso.absx, staticTorso.absy) + +staticTail.SetPivot(0.2, 0.17) +staticTail.MoveTo(28, -45) +staticTailMask.MoveTo(0, 0) +staticTailMask.Mask("stencil") +staticTailStatic.MoveTo(0, 0) + +staticLArm.SetPivot(0.86, 0.85) +staticLArm.MoveTo(-16, 26) +staticLHand.SetPivot(0.73, 0.22) +staticLHand.MoveTo(-15, -15) + +staticRArm.SetPivot(0.23, 0.8) +--staticRArm.MoveToAbs(monstersprite.absx + 5, monstersprite.absy + 154) +staticRArm.MoveTo(20, 26) +staticRHand.SetPivot(0.81, 0.85) +staticRHand.MoveTo(18, -6) + +staticFluff.MoveTo(5, 26) +staticFluffMask.MoveTo(0, 0) +staticFluffMask.Mask("stencil") +staticFluffStatic.MoveTo(0, 0) + +staticHeadBase.SetPivot(0.45, 0.13) +staticHeadBase.MoveTo(2, 46) + +staticLEar.SetPivot(0.75, 0.42) +staticLEar.MoveTo(-30, 12) +staticLEarMask.MoveTo(0, 0) +staticLEarMask.Mask("stencil") +staticLEarStatic.MoveTo(0, 0) + +staticREar.SetPivot(0.29, 0.38) +staticREar.MoveTo(40, 10) +staticREarMask.MoveTo(0, 0) +staticREarMask.Mask("stencil") +staticREarStatic.MoveTo(100, 0) + +staticFace.SetPivot(0, 0.5) +staticFace.SetAnchor(0, 0.5) +staticFace.MoveTo(0, 0) +staticFaceMask.MoveTo(0, 0) +staticFaceMask.Mask("stencil") +staticFaceStatic.MoveTo(0, 0) + +staticDeathExplosion.SetAnchor(0.84, 0.83) +staticDeathExplosion.MoveTo(0, 0) +staticDeathExplosion.loopmode = "ONESHOTEMPTY" + +staticHurt.SetPivot(0.5, 0) +staticHurt.MoveToAbs(monstersprite.absx, monstersprite.absy) +staticHurt.alpha = 0 + +staticHurtFluffMask.MoveTo(5, 18) +staticHurtFluffMask.Mask("stencil") +staticHurtFluffStatic.MoveTo(0, 0) +staticHurtFluffStatic.alpha = 0 + +staticHurtTailMask.MoveTo(50, -1) +staticHurtTailMask.Mask("stencil") +staticHurtTailStatic.MoveTo(0, 0) +staticHurtTailStatic.alpha = 0 + +staticHurtFaceMask.MoveTo(1, 64) +staticHurtFaceMask.Mask("stencil") +staticHurtFaceStatic.MoveTo(0, 0) +staticHurtFaceStatic.alpha = 0 + +staticHurtLEarMask.MoveTo(-26, 93) +staticHurtLEarMask.Mask("stencil") +staticHurtLEarStatic.MoveTo(0, 0) +staticHurtLEarStatic.alpha = 0 + +staticHurtREarMask.MoveTo(48, 81) +staticHurtREarMask.Mask("stencil") +staticHurtREarStatic.MoveTo(0, 0) +staticHurtREarStatic.alpha = 0 + +staticSpared.SetPivot(0.5, 0) +staticSpared.MoveToAbs(monstersprite.absx, monstersprite.absy) +staticSpared.color = { 0.5, 0.5, 0.5, 0 } + +-- Animation used for the explosion +explosionAnimation = { } +for i = 1, 5 do + table.insert(explosionAnimation, "Waves/SSLaserPoint/Boom/" .. i) +end + +-- Used to know which sprites to update to create a static effect +local staticSprites = { + { staticTailStatic, 98, 86 }, + { staticFaceStatic, 72, 60 }, + { staticFluffStatic, 94, 64 }, + { staticLEarStatic, 32, 38 }, + { staticREarStatic, 34, 42 }, + { staticHurtFluffStatic, 108, 54 }, + { staticHurtTailStatic, 70, 80 }, + { staticHurtFaceStatic, 40, 34 }, + { staticHurtLEarStatic, 14, 28 }, + { staticHurtREarStatic, 22, 28 } +} + +-- Compute how much leeway pixels we have to move the static image around +for _, staticEffect in pairs(staticSprites) do + staticEffect["diffX"] = 180 - staticEffect[2] + staticEffect["halfDiffX"] = staticEffect["diffX"] / 2 + staticEffect["diffY"] = 180 - staticEffect[3] + staticEffect["halfDiffY"] = staticEffect["diffY"] / 2 +end + +local time = 0 +local timer = 0 +animation = "Idle" + +function SwitchAnimation(anim) + -- Reset the anim properly + ResetStatic() + time = 0 + timer = 0 + + -- Differences between the Idle and Death animation + if anim == "Death" then + staticSprites[2]["diffX"] = 256 - staticSprites[2][2] + staticSprites[2]["halfDiffX"] = staticSprites[2]["diffX"] / 2 + staticSprites[2]["diffY"] = 256 - staticSprites[2][3] + staticSprites[2]["halfDiffY"] = staticSprites[2]["diffY"] / 2 + + staticFace.Set("Static/Death/face") + staticFaceMask.Set("Static/Death/facemask") + + staticDeathExplosion.SetAnimation(explosionAnimation, 1/15) + Audio.PlaySound("boom") + + staticFalseUpperBody.SetParent(deathParent) + staticLegs.SetParent(deathParent) + staticHurt.SetParent(deathParent) + staticSpared.SetParent(deathParent) + end + + animation = anim +end + +function AnimateStatic() + -- Update all static sprites so they look random + if staticSprites[1][1].isactive and timer % 5 == 0 then + for _, staticEffect in pairs(staticSprites) do + staticEffect[1].rotation = staticEffect[1].rotation + math.random(1, 3) * 90 + staticEffect[1].Scale(math.random() < .5 and -1 or 1, math.random() < .5 and -1 or 1) + staticEffect[1].MoveTo(math.random(0, staticEffect["diffX"]) - staticEffect["halfDiffX"], + math.random(0, staticEffect["diffY"]) - staticEffect["halfDiffY"]) + end + end + + -- Idle looped animation + if animation == "Idle" then + staticLegs.yscale = 1.9 + 0.1 * math.cos(time / 2) + + staticTail.rotation = -15 * math.sin(time * 3) + + staticTorso.MoveTo(7, 3 + 2 * math.cos(time * 1.2)) + staticTorso.rotation = -4 * math.sin(time / 1.2) + staticFalseUpperBody.MoveToAbs(staticTorso.absx, staticTorso.absy) + + staticLArm.rotation = -6 * math.sin(time / 1.5) + staticLHand.rotation = -8 * math.sin(time / 1.3) + + staticRArm.rotation = 2 - 2 * math.cos(time / 3) + staticRHand.rotation = 2 - 2 * math.cos(time / 3) + + staticHeadBase.rotation = -5 * math.sin(time) + staticHeadBase.MoveTo(2, 46 + -3 * math.sin(time / 2)) + + staticLEar.rotation = 10 * math.sin(time * 1.5) + staticREar.rotation = -10 * math.sin(time * 1.5) + + if staticTorso.alpha > 0 then + time = time + Time.dt + end + else + -- Death oneshot animation + if timer <= 115 then + -- Update the face's static sprite + if timer % 5 == 0 then + staticSprites[2][1].Set("Static/Death/staticeffect" .. math.random(1, 3)) + staticSprites[2][1].rotation = math.random(0, 1) * 180 + staticSprites[2][1].MoveTo(math.random(0, staticSprites[2]["diffX"]) - staticSprites[2]["halfDiffX"], + math.random(0, staticSprites[2]["diffY"]) - staticSprites[2]["halfDiffY"]) + end + + -- Spawn smoke + if timer % 15 == 14 then + local smoke = CreateSprite("Static/Death/smoke", "BelowArena") + smoke.MoveToAbs(staticDeathExplosion.absx + math.random(-15, 15), staticDeathExplosion.absy + math.random(-15, 15)) + smoke.alpha = 0.5 + smoke.Scale(0, 0) + smoke["timer"] = timer + table.insert(staticDeathSmokes, smoke) + end + + -- Play static sound + if timer == 30 then + NewAudio.CreateChannel("static") + NewAudio.PlaySound("static", "static", false, 0.2) + end + + -- Ouch! Explosions hurt! + if timer < 10 then staticHeadBase.rotation = staticHeadBase.rotation + 1.5 + elseif timer >= 30 and timer < 60 then staticHeadBase.rotation = staticHeadBase.rotation - 0.5 + -- Drooping arms + elseif timer >= 90 and timer < 100 then staticLHand.rotation = staticLHand.rotation + 5 + staticRHand.rotation = staticRHand.rotation + 2 + -- Replace a few hand sprites + elseif timer == 100 then + staticLHand.Set("Static/Death/rhand") + staticLHand.SetPivot(0.33, 0.8) + staticLHand.xscale = -2 + staticLHand.rotation = 75 + staticLHand.Move(7, -4) + + staticRArm.Move(0, -6) + staticRHand.Set("Static/Death/rhand") + staticRHand.SetPivot(0.33, 0.8) + staticRHand.rotation = -45 + staticRHand.Move(-4, -6) + -- Life slowly leaves the body as all body parts start to dangle + elseif timer > 100 and timer < 115 then staticLHand.rotation = staticLHand.rotation - 5 + staticLArm.rotation = staticLArm.rotation + 2 + staticRHand.rotation = staticRHand.rotation + 2 + staticRArm.rotation = staticRArm.rotation - 2 + staticTail.yscale = staticTail.yscale - 2/7 + staticLEar.rotation = staticLEar.rotation + 1.5 + staticREar.rotation = staticREar.rotation - 1.5 + -- ded + elseif timer == 115 then + deathParent.Set("Static/Death/dustingmess") + deathParent.alpha = 1 + deathParent.Move(13, 0) + DeleteAnimation() + deathParent.Dust(true, true) + NewAudio.DestroyChannel("static") + end + end + + -- Update smoke + for i = #staticDeathSmokes, 1, -1 do + local smoke = staticDeathSmokes[i] + local time = timer - smoke["timer"] + + smoke.Move(0, 0.5) + if time < 30 then smoke.Scale((time + 1) / 30, (time + 1) / 30) + else smoke.alpha = smoke.alpha - 0.5 / 30 + end + + if smoke.alpha == 0 then + table.remove(staticDeathSmokes, i) + smoke.Remove() + end + end + end + + timer = timer + 1 +end + +-- Reset the animation to its starting Idle animation positions +function ResetStatic() + staticLegs.yscale = 2 + + staticTail.rotation = 0 + + staticTorso.MoveTo(7, 3) + staticTorso.rotation = 0 + staticFalseUpperBody.MoveToAbs(staticTorso.absx, staticTorso.absy) + + staticLArm.rotation = 0 + staticLHand.rotation = 0 + + staticRArm.rotation = 0 + staticRHand.rotation = 0 + + staticHeadBase.rotation = 0 + staticHeadBase.MoveTo(2, 46) + + staticLEar.rotation = 0 + staticREar.rotation = 0 +end + +-- It hurts to be knifed +function AnimateHurt(hurt) + local animAlpha = hurt and 0 or 1 + + staticTail.alpha = animAlpha + staticTailStatic.alpha = animAlpha + + staticLArm.alpha = animAlpha + staticLHand.alpha = animAlpha + + staticLegs.alpha = animAlpha + staticTorso.alpha = animAlpha + + staticRArm.alpha = animAlpha + staticRHand.alpha = animAlpha + + staticFluff.alpha = animAlpha + staticFluffStatic.alpha = animAlpha + + staticHeadBase.alpha = animAlpha + staticFace.alpha = animAlpha + staticFaceStatic.alpha = animAlpha + + staticLEar.alpha = animAlpha + staticLEarStatic.alpha = animAlpha + + staticREar.alpha = animAlpha + staticREarStatic.alpha = animAlpha + + staticHurt.alpha = 1 - animAlpha + staticHurtFluffStatic.alpha = 1 - animAlpha + staticHurtTailStatic.alpha = 1 - animAlpha + staticHurtFaceStatic.alpha = 1 - animAlpha + staticHurtLEarStatic.alpha = 1 - animAlpha + staticHurtREarStatic.alpha = 1 - animAlpha + + ResetStatic() + time = 0 +end + +-- It's nice to be spared +function AnimateSpare(spare) + local animAlpha = spare and 0 or 1 + + staticTail.alpha = animAlpha + staticTailStatic.alpha = animAlpha + + staticLArm.alpha = animAlpha + staticLHand.alpha = animAlpha + + staticLegs.alpha = animAlpha + staticTorso.alpha = animAlpha + + staticRArm.alpha = animAlpha + staticRHand.alpha = animAlpha + + staticFluff.alpha = animAlpha + staticFluffStatic.alpha = animAlpha + + staticHeadBase.alpha = animAlpha + staticFace.alpha = animAlpha + staticFaceStatic.alpha = animAlpha + + staticLEar.alpha = animAlpha + staticLEarStatic.alpha = animAlpha + + staticREar.alpha = animAlpha + staticREarStatic.alpha = animAlpha + + staticSpared.alpha = 1 - animAlpha + + ResetStatic() + time = 0 +end + +-- Change Static's TV screen so it displays a quick Mettaton animation +function ChangeChannel() + table.remove(staticSprites, 2) + staticFaceStatic.Scale(2, 2) + staticFaceStatic.rotation = staticFace.rotation + staticFaceStatic.MoveTo(0, 0) + + local a = "Static/faceMTT1" + local b = "Static/faceMTT2" + staticFaceStatic.SetAnimation({ a, a, a, b, b, b, a, b, a, b }, 1 / 8) +end + +-- Destroy it all +function DeleteAnimation() + staticSpared.Remove() + + staticHurtREarStatic.Remove() + staticHurtREarMask.Remove() + + staticHurtLEarStatic.Remove() + staticHurtLEarMask.Remove() + + staticHurtFaceStatic.Remove() + staticHurtFaceMask.Remove() + + staticHurtTailStatic.Remove() + staticHurtTailMask.Remove() + + staticHurtFluffStatic.Remove() + staticHurtFluffMask.Remove() + + staticHurt.Remove() + + staticREarStatic.Remove() + staticREarMask.Remove() + staticREar.Remove() + + staticLEarStatic.Remove() + staticLEarMask.Remove() + staticLEar.Remove() + + staticDeathExplosion.Remove() + + staticFaceStatic.Remove() + staticFaceMask.Remove() + staticFace.Remove() + staticHeadBase.Remove() + staticFalseHeadBase.Remove() + + staticFluffStatic.Remove() + staticFluffMask.Remove() + staticFluff.Remove() + + staticRHand.Remove() + staticRArm.Remove() + + staticTorso.Remove() + staticLegs.Remove() + + staticLHand.Remove() + staticLArm.Remove() + + staticTailStatic.Remove() + staticTailMask.Remove() + staticTail.Remove() + staticFalseUpperBody.Remove() +end \ No newline at end of file diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Animations/StaticAnim.lua.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Animations/StaticAnim.lua.meta new file mode 100644 index 000000000..2e673f48c --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Animations/StaticAnim.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fb974ffc7f5ca5e46b64f1ec68b4bd54 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Encounters/Story1.lua b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Encounters/Story1.lua index b22b33507..8f2f429df 100644 --- a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Encounters/Story1.lua +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Encounters/Story1.lua @@ -29,7 +29,7 @@ function EncounterStarting() "[noskip]If you came here,[w:10] it must be for a good reason.[w:30][next]", "[noskip]We'll tell you the story of Create Your Frisk.[w:30][next]", "[noskip]In February 2016,[w:10] RhenaudTheLukark,[w:10] the creator of Create Your Frisk decided,[w:10] with some of their friends,[w:10] to create their own AU.[w:30][next]", - "[noskip]They concluded that Unitale was the easiest way to do it.[w:30][next]", + "[noskip]They concluded that Unitale was the easiest way to make it.[w:30][next]", "[noskip]If we had told him what would have happened,[w:10] he'd have laughed at it.[w:30][next]", "[noskip][func:LaunchFade, false][w:35][func:State,DONE]"} require "Waves/bullettest_touhou" diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Encounters/Story2.lua b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Encounters/Story2.lua index a6f00f386..7e53bcf5c 100644 --- a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Encounters/Story2.lua +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Encounters/Story2.lua @@ -25,13 +25,13 @@ function EncounterStarting() fade.y = 240 fade.Scale(640, 480) fade.alpha = 1 - enemies[2]["currentdialogue"] = {"[noskip][func:LaunchFade, true][w:30][next]", + enemies[2]["currentdialogue"] = {"[noskip][func:LaunchFade, true][w:30][next]", "[noskip][effect:none]But,[w:10] after some time playing around with the engine,[w:10] he found out that lots of features were missing.[w:30][next]", "[noskip][effect:none]First of all,[w:10] there was no overworld.[w:15] To make an AU with his friends,[w:10] Rhenaud needed one.[w:30][next]", "[noskip][effect:none]Thus,[w:10] after contacting lvkuln,[w:10] he got access to the Unitale sources a bit before the release of its open-source version.[w:30][next]", "[noskip][effect:none]Having been a complete beginner in Unity,[w:10] he first tried to fix the bugs related to the open-source version of the engine...[w:15] and succeeded.[w:30][next]",} - enemies[1]["currentdialogue"] = {"", "", "", "", "", - "[noskip][effect:none]After fixing these bugs,[w:10] he felt something new,[w:10] as if he had done something extraordinary.[w:15] At this moment,[w:10] he knew he would have to resume lvkuln's work.[w:30][next]", + enemies[1]["currentdialogue"] = {"", "", "", "", "", + "[noskip][effect:none]After fixing these bugs,[w:10] he felt something new,[w:10] as if he had done something extraordinary.[w:15] At this moment,[w:10] he knew he'd have to keep going.[w:30][next]", "[noskip][effect:none]He then tried to contact the original developer,[w:10] but in vain:[w:15] it was already too late.[w:15] IRL matters took lvkuln away from the project.[w:30][next]", "[noskip][effect:none]Thus,[w:10] he tried to create something on his own,[w:10] even if he had never followed any tutorials on using Unity or even C#.[w:30][next]", "[noskip][func:LaunchFade, false][w:35][func:State,DONE]"} diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Encounters/Story3.lua b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Encounters/Story3.lua index 74dd7b69a..8b9b7101f 100644 --- a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Encounters/Story3.lua +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Encounters/Story3.lua @@ -12,8 +12,8 @@ beginfade = false endfade = false alphaup = false -enemies = {"poseur"} -enemypositions = { {0, 0} } +enemies = {"scruffle", "static"} +enemypositions = {{-80, 2}, {80, 0}} possible_attacks = {"bullettest_bouncy", "bullettest_chaserorb", "bullettest_touhou"} @@ -24,10 +24,16 @@ function EncounterStarting() fade.x = 320 fade.y = 240 fade.Scale(640, 480) - fade.alpha = 1 - enemies[1]["currentdialogue"] = {"[noskip][func:LaunchFade, true][w:30][next]", + + for i = 1, #enemies do + enemies[i].Call("EncounterStarting") + enemies[i]["enemyNumber"] = i + end + + enemies[1]["currentdialogue"] = {"[noskip][func:LaunchFade, true][w:30][next]", "[noskip][effect:none]After two months of hard work,[w:10] RhenaudTheLukark released CYF 0.1.[w:30][next]", - "[noskip][effect:none]He did everything he could to keep the upcoming engine a secret,[w:10] but was too excited about showing it to the world.[w:30][next]", + "[noskip][effect:none]He did everything he could to keep the upcoming engine a secret,[w:10] but was too excited about showing it to the world.[w:30][next]"} + enemies[2]["currentdialogue"] = {"", "", "", "[noskip][effect:none]This new engine wasn't very well known,[w:10] as the official Unitale 0.2.1a version was still used by a good part of the community.[w:30][next]", "[noskip][effect:none]The only new thing was the overworld system,[w:10] but it was unusable without giving away the sources.[w:30][next]", "[noskip][effect:none]Then,[w:10] the developer decided to extend his engine to make it more useful for the community.[w:30][next]", @@ -62,6 +68,9 @@ function Update() if fade.alpha > 1 then fade.alpha = 1 end if fade.alpha < 0 then fade.alpha = 0 end end + for i = 1, #enemies do + enemies[i].Call("Update") + end end require "Waves/bullettest_bouncy" diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Encounters/Story5.lua b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Encounters/Story5.lua index c19fdbb26..0b8e17d11 100644 --- a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Encounters/Story5.lua +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Encounters/Story5.lua @@ -25,49 +25,50 @@ function EncounterStarting() fade.y = 240 fade.Scale(640, 480) fade.alpha = 1 - require "Animations/lukark_anim" - enemies[1]["currentdialogue"] = {"[noskip][func:LaunchFade, true][w:30][next]", - "[noskip][effect:none]Time has flown by.[w:15] Mentalities have changed.[w:30][next]", - "[noskip][effect:none]Back then,[w:10] when I first wrote this message,[w:10] I thought I was close to the end.[w:30][next]", - "[noskip][effect:none]But now,[w:10] after more than 3 years of work on this engine,[w:10][func:Animate,sad] I realize that it won't ever happen.[w:30][next]", - "[noskip][effect:none]Even if this engine will never be completely finished,[w:10] completely perfect...[w:30][next]", - "[noskip][effect:none][func:Animate,smile]I still hope you'll have a great time with it.[w:30][next]", - "[noskip][effect:none][func:Animate,normal]I could have stopped everything and quit as Unitale's creator did...[w:30][next]", - "[noskip][effect:none][func:Animate,happy]But I am still here.[w:30][next]", - "[noskip][effect:none]And it's all thanks to everyone around me.[w:15][func:Animate,smile] Including YOU,[w:10] who is currently running this engine.[w:30][next]", - "[noskip][effect:none][func:Animate,normal]Without all of you,[w:10] I'd have stopped a long time ago,[w:10][func:Animate,smile] and I'm very proud about giving you this new version of Create Your Frisk.[w:30][next]", - "[noskip][effect:none][func:Animate,normal]Maybe this message might be a little bit...[w:15][func:Animate,sad]odd[w:5] for you.[w:30][next]", - "[noskip][effect:none]But...[w:15]it's my way to[w:5][func:Animate,smile] express my gratitude.[w:15] For making this engine an experience that lived much longer than I hoped it would.[w:30][next]", - "[noskip][effect:none][func:Animate,normal]So,[w:10] all in all...[w:30][next]", - "[noskip][effect:none][func:Animate,happy]Thank you.[w:30][next]", - "[noskip][func:LaunchFade, false][w:35][func:State,DONE]"} - require "Waves/bullettest_touhou" + require "Animations/lukark_anim" + enemies[1].Call("SetBubbleOffset", {30, 0}) + enemies[1]["currentdialogue"] = {"[noskip][func:LaunchFade, true][w:30][next]", + "[noskip][effect:none]Time has flown by. [w:15]Mentalities have changed.[w:30][next]", + "[noskip][effect:none]Back then, [w:10]when I first wrote this message, [w:10]I thought I was close to the end.[w:30][next]", + "[noskip][effect:none]But now, [w:10]after more than 8 years of work on this engine, [w:10][func:Animate,sad]I realize that it won't ever happen.[w:30][next]", + "[noskip][effect:none]Even if this engine will never be completely finished, [w:10]completely perfect...[w:30][next]", + "[noskip][effect:none][func:Animate,smile]I still hope you'll have a great time with it.[w:30][next]", + "[noskip][effect:none][func:Animate,normal]I could have stopped everything and quit as Unitale's creator did...[w:30][next]", + "[noskip][effect:none][func:Animate,happy]But I am still here.[w:30][next]", + "[noskip][effect:none]And it's all thanks to everyone around me. [w:15][func:Animate,smile]Including YOU, [w:10]who is currently running this engine.[w:30][next]", + "[noskip][effect:none][func:Animate,normal]Without all of you, [w:10]I'd have stopped a long time ago, [w:10][func:Animate,smile]and I'm very proud about giving you this new version of Create Your Frisk.[w:30][next]", + "[noskip][effect:none][func:Animate,normal]Maybe this message might be a little bit...[w:15][func:Animate,sad]odd[w:5] for you.[w:30][next]", + "[noskip][effect:none]But...[w:15]it's my way to [w:5][func:Animate,smile]express my gratitude. [w:15]For making this engine an experience that lived much longer than I hoped it would.[w:30][next]", + "[noskip][effect:none][func:Animate,normal]So, [w:10]all in all...[w:30][next]", + "[noskip][effect:none][func:Animate,happy]Thank you.[w:30][next]", + "[noskip][func:LaunchFade, false][w:35][func:State,DONE]"} + require "Waves/bullettest_touhou" State("ENEMYDIALOGUE") end function LaunchFade(begin) - if begin then - beginfade = true - fade.alpha = 1 + if begin then + beginfade = true + fade.alpha = 1 else - endfade = true - fade.alpha = 0 - end + endfade = true + fade.alpha = 0 + end end function Update() - AnimateLukark() + AnimateLukark() if (beginfade or endfade) and Time.time - currentTime >= 1/3 then - alphaup = endfade + alphaup = endfade endfade = false beginfade = false if alphaup then fade.alpha = fade.alpha + Time.dt - else fade.alpha = fade.alpha - Time.dt + else fade.alpha = fade.alpha - Time.dt end end if (fade.alpha * 1000) % 1000 ~= 1000 and (fade.alpha * 1000) % 1000 ~= 0 then if alphaup then fade.alpha = fade.alpha + Time.dt - else fade.alpha = fade.alpha - Time.dt + else fade.alpha = fade.alpha - Time.dt end if fade.alpha > 1 then fade.alpha = 1 end if fade.alpha < 0 then fade.alpha = 0 end @@ -85,17 +86,17 @@ function EnemyDialogueStarting() end function EnemyDialogueEnding() - nextwaves = { possible_attacks[math.random(#possible_attacks)] } + nextwaves = { possible_attacks[math.random(#possible_attacks)] } end function DefenseEnding() - encountertext = RandomEncounterText() --This built-in function gets a random encounter text from a random enemy. + encountertext = RandomEncounterText() --This built-in function gets a random encounter text from a random enemy. end function HandleSpare() - State("ENEMYDIALOGUE") + State("ENEMYDIALOGUE") end function HandleItem(ItemID) - BattleDialog({"Selected item " .. ItemID .. "."}) + BattleDialog({"Selected item " .. ItemID .. "."}) end \ No newline at end of file diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Encounters/TheFinalChoice.lua b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Encounters/TheFinalChoice.lua index dd85562d5..a2625300d 100644 --- a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Encounters/TheFinalChoice.lua +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Encounters/TheFinalChoice.lua @@ -25,54 +25,54 @@ function EncounterStarting() fade.x = 320 fade.y = 240 fade.Scale(640, 480) - fade.alpha = 1 - enemies[1].Call("SetSprite", "Punderbolt/normal") - enemies[2]["currentdialogue"] = {"[noskip][func:LaunchFade, true][w:30][next]", - "[noskip][func:Animate, smile]Here we are.[w:30][next]", - "[noskip][func:Animate, normal]Now that we're together,[w:10] what will you do?[w:30][next]", - "[noskip][func:Animate, angry]Will you attempt to fight me?[w:30][next]", - "[noskip][func:Animate, happy]Or will you leave me alone?[w:30][next]", - "[noskip][func:Animate, normal][func:Unpause]It's your choice,[w:10] now.[w:30][next]", + enemies[1].Call("SetSprite", "Punderbolt/normal") + enemies[2].Call("SetBubbleOffset", {0, 30}) + enemies[2]["currentdialogue"] = {"[noskip][func:LaunchFade, true][w:30][next]", + "[noskip][effect:none][func:Animate, smile]Here we are.[w:30][next]", + "[noskip][effect:none][func:Animate, normal]Now that we're together,[w:10] what will you do?[w:30][next]", + "[noskip][effect:none][func:Animate, angry]Will you attempt to fight me?[w:30][next]", + "[noskip][effect:none][func:Animate, happy]Or will you leave me alone?[w:30][next]", + "[noskip][effect:none][func:Animate, normal][func:Unpause]It's your choice,[w:10] now.[w:30][next]", "[func:State, DEFENDING][next]"} enemies[1]["randomdialogue"] = {""} require "Waves/bullettest_touhou" - State("ENEMYDIALOGUE") + State("ENEMYDIALOGUE") end function LaunchFade(begin, whitee) - if whitee == nil then whitee = false end - white = whitee - if whitee then fade.Set("white") end - if begin then - beginfade = true - fade.alpha = 1 + if whitee == nil then whitee = false end + white = whitee + if whitee then fade.Set("white") end + if begin then + beginfade = true + fade.alpha = 1 else - endfade = true - fade.alpha = 0 - end + endfade = true + fade.alpha = 0 + end end function Update() if (beginfade or endfade) and Time.time - currentTime >= 1/3 then - alphaup = endfade + alphaup = endfade endfade = false beginfade = false - if alphaup then fade.alpha = fade.alpha + Time.dt - else fade.alpha = fade.alpha - Time.dt + if alphaup then fade.alpha = fade.alpha + Time.dt + else fade.alpha = fade.alpha - Time.dt end end if (fade.alpha * 1000) % 1000 ~= 1000 and (fade.alpha * 1000) % 1000 ~= 0 then - if alphaup then fade.alpha = fade.alpha + Time.dt - else fade.alpha = fade.alpha - Time.dt + if alphaup then fade.alpha = fade.alpha + Time.dt + else fade.alpha = fade.alpha - Time.dt end if fade.alpha > 1 then fade.alpha = 1 end if fade.alpha < 0 then fade.alpha = 0 end - if white and (fade.alpha * 1000) % 1000 > 500 and enemies[1]["name"] == "Punderbolt" then enemies[1].Call("Kill") enemies[2].Call("Kill") end + if white and (fade.alpha * 1000) % 1000 > 500 then enemies[1].Call("Kill") enemies[2].Call("Kill") end elseif white then - count = count + 1 + count = count + 1 if count == 30 then - SetAlMightyGlobal("CrateYourFrisk", true) - Misc.DestroyWindow() + SetAlMightyGlobal("CrateYourFrisk", true) + Misc.DestroyWindow() end end end diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Events/MusicWarper.lua b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Events/MusicWarper.lua new file mode 100644 index 000000000..a5f208e7f --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Events/MusicWarper.lua @@ -0,0 +1,17 @@ +function EventPage1() + Audio.PlaySound("glitch") + Event.SetPage("MusicWarper", 2) +end + +function EventPage2() + local vBegin = 2040 + local vEnd = 3320 + local volume = 1 - math.max(0, math.min(1, (Event.GetPosition("Player")[1] - vBegin) / (vEnd - vBegin))) + NewAudio.SetVolume("StaticKeptAudio", volume) +end + +function EventPage3() + if GetAlMightyGlobal("CrateYourFrisk") then Event.SetPage("MusicWarper", -1) + else Event.SetPage("MusicWarper", 1) + end +end \ No newline at end of file diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Events/MusicWarper.lua.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Events/MusicWarper.lua.meta new file mode 100644 index 000000000..680250559 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Events/MusicWarper.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1e2ffeb05212baa42a9e3da23c5d8597 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/claribel.lua b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/claribel.lua index c118c1592..d979a0a1a 100644 --- a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/claribel.lua +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/claribel.lua @@ -7,7 +7,7 @@ hp = 2 atk = 1 def = 1 check = "You shouldn't see this." -dialogbubble = "leftlargeminus" -- See documentation for what bubbles you have available. +dialogbubble = "claribel" -- See documentation for what bubbles you have available. canspare = false cancheck = false voice = "claribel" diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/ellie.lua b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/ellie.lua index 392b5e350..2e607d32e 100644 --- a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/ellie.lua +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/ellie.lua @@ -7,7 +7,7 @@ hp = 180 atk = 3 def = 999 check = "You shouldn't see this." -dialogbubble = "rightlargeminus" -- See documentation for what bubbles you have available. +dialogbubble = "ellie" -- See documentation for what bubbles you have available. canspare = false cancheck = false voice = "ellie" diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/exrumia.lua b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/exrumia.lua index 582f4a3c8..c2901c48d 100644 --- a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/exrumia.lua +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/exrumia.lua @@ -7,7 +7,7 @@ hp = 1150 atk = 20 def = 20 check = "Another Monster to Kill." -dialogbubble = "rightlargeminus" -- See documentation for what bubbles you have available. +dialogbubble = "exrumia" -- See documentation for what bubbles you have available. cancheck = true canspare = false voice = "rum" diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/lukark.lua b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/lukark.lua index 3ecfd4d92..578534bce 100644 --- a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/lukark.lua +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/lukark.lua @@ -7,7 +7,7 @@ hp = 1000 atk = 5 def = 1 check = "The Overworld Creator.[w:10]\nJust destroy him." -dialogbubble = "rightlargeminus" -- See documentation for what bubbles you have available. +dialogbubble = "lukark" -- See documentation for what bubbles you have available. cancheck = true canspare = false voice = "lukark" diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/mionn.lua b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/mionn.lua index 4e7ba4cec..6eee4d512 100644 --- a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/mionn.lua +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/mionn.lua @@ -7,7 +7,7 @@ hp = 3000 atk = 20 def = -15 check = "" -dialogbubble = "rightlargeminus" +dialogbubble = "mionn" cancheck = false canspare = false voice = "mionn" diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/poseur.lua b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/poseur.lua deleted file mode 100644 index 5fed77007..000000000 --- a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/poseur.lua +++ /dev/null @@ -1,18 +0,0 @@ -comments = {"Smells like the work\rof an enemy stand.", "Poseur is posing like his\rlife depends on it.", "Poseur's limbs shouldn't be\rmoving in this way."} -commands = {} -randomdialogue = {"Random\nDialogue\n1.", "Random\nDialogue\n2.", "Random\nDialogue\n3."} -sprite = "poseur" --Always PNG. Extension is added automatically. -name = "Poseur" -hp = 100 -atk = 1 -def = 1 -check = "Check message goes here." -dialogbubble = "rightlargeminus" -- See documentation for what bubbles you have available. -cancheck = true -canspare = false - -function HandleAttack(attackstatus) end - -function LaunchFade(begin) Encounter.Call("LaunchFade", begin) end - -function HandleCustomCommand(command) end \ No newline at end of file diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/punderbolt.lua b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/punderbolt.lua index 290ee1974..03ca77379 100644 --- a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/punderbolt.lua +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/punderbolt.lua @@ -6,40 +6,30 @@ name = "Punderbolt" hp = 1000 atk = 2 def = 0 -check = "The Overworld Creator.\nCalled RTL too." +check = "One of the Overworld Creator's\nmany forms.\nCalled RTL too." dialogbubble = "rightwide" -- See documentation for what bubbles you have available. cancheck = true canspare = false voice = "punderbolt" -function HandleAttack(attackstatus) Animate("death1") end +function HandleAttack(attackstatus) + Animate("Death/1") + Encounter["enemies"][2].Call("SetBubbleOffset", {0, 6}) +end function LaunchFade(begin) Encounter.Call("LaunchFade", begin) end -function Unpause() - if not unpaused then - Audio.LoadFile("thechoice") - unpaused = true - Audio.Play() +function Unpause() + if not unpaused then + Audio.LoadFile("thechoice") + unpaused = true + Audio.Play() else - Audio.Unpause() + Audio.Unpause() end end -function Pause() Audio.Pause() end - -function LaunchAnim() - Encounter["enemies"][3].Call("Hide") - Encounter["enemies"][1]["monstersprite"].SetAnimation({"WDSpecial/1", "WDSpecial/2", "WDSpecial/3", "WDSpecial/2"}, 1/2) - Encounter["enemies"][1]["monstersprite"].x = 20.5 -end - -function EndAnim() - Encounter["enemies"][3].Call("Show") - Encounter["enemies"][1]["monstersprite"].StopAnimation() - Animate("happy") - Encounter["enemies"][1]["monstersprite"].x = 0 -end +function Pause() Audio.Pause() end function SetBubble(bubble) dialogbubble = bubble end @@ -49,15 +39,29 @@ function GetFurther() Encounter["getfurther"] = true end function Happening() Audio.PlaySound("happening") end -function Animate(animation) Encounter["enemies"][1].Call("SetSprite","Punderbolt/" .. animation) end +function Animate(animation) + if safe and string.sub(animation, 1, 5) == "Death" then + local split = string.split(animation, "/") + animation = split[1] .. "/Safe/" .. split[2] + end + Encounter["enemies"][1].Call("SetSprite", "Punderbolt/" .. animation) +end function forceattack(number, damage) Player.ForceAttack(number, damage) end function AnimEnd() Audio.PlaySound("happening") - Encounter.Call("LaunchFade", {false, true}) + Encounter.Call("LaunchFade", {false, true}) end function WindowClose() Audio.PlaySound("hitsound") Misc.DestroyWindow() end -function HandleCustomCommand(command) end \ No newline at end of file +function HandleCustomCommand(command) end + +function string.split(inputstr, sep) + local t = { } + for str in string.gmatch(inputstr, "([^" .. sep .. "]+)") do + table.insert(t, str) + end + return t +end diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/scruffle.lua b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/scruffle.lua new file mode 100644 index 000000000..254feaaa1 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/scruffle.lua @@ -0,0 +1,47 @@ +comments = { + "Smells like stuffing.", + "Scruffle looks you up and down, watching your movements intensely.", + "A little bit of cotton falls from an opening in Scruffle's side, which he covers with his big hand." +} + +commands = {} + +randomdialogue = { "[effect:none]..." } + +sprite = "Scruffle/hollow" +name = "Scruffle" +hp = 100 +atk = 0 +def = 0 +fakeatk = 2 +fakedef = 5 +check = "Tired of being mistaken for pajamas." +dialogbubble = "scruffle" +canspare = false +cancheck = false +effect = "none" + +gold = 12 +xp = 100 + +function EncounterStarting() + SetBubbleOffset(10, 60) + + -- Parent sprite used for the death animation, since the actual monstersprite is destroyed as soon as the enemy is killed + deathParent = CreateSprite("Scruffle/hollow", "BelowArena") + deathParent.SetPivot(0.5, 0) + deathParent.MoveToAbs(monstersprite.absx, monstersprite.absy) + + require "Animations/ScruffleAnim" +end + +function Update() + AnimateScruffle() +end + +function HandleAttack(attackstatus) +end + +function LaunchFade(begin) Encounter.Call("LaunchFade", begin) end + +function HandleCustomCommand(command) end \ No newline at end of file diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/scruffle.lua.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/scruffle.lua.meta new file mode 100644 index 000000000..7e205e9f2 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/scruffle.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0e4c18f500842a547bcaf59c339cf5d5 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/static.lua b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/static.lua new file mode 100644 index 000000000..395a91d76 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/static.lua @@ -0,0 +1,52 @@ +comments = { + "Smells like a lack of HDMI connection.", + "Static stamps her paw in the ground, barely missing you with her claws.", + "Static looks away. It's not polite to stare, and looking too closely will hurt your eyes, after all." +} + +commands = {} + +randomdialogue = { + "[effect:none]Don't get too ruff!", + "[effect:none]Quit staring!", + "[effect:shake]*static noises*", + "[effect:shake]*crackles*", + "[effect:none]Distant connection..." +} + +sprite = "Static/hollow" +name = "Static" +hp = 80 +atk = 0 +def = 0 +fakeatk = 4 +fakedef = 2 +check = "Both their fur and their face are fuzzy." +dialogbubble = "static" +canspare = false +cancheck = false + +gold = 100 +xp = 110 + +function EncounterStarting() + SetBubbleOffset(-10, 60) + + -- Parent sprite used for the death animation, since the actual monstersprite is destroyed as soon as the enemy is killed + deathParent = CreateSprite("Static/hollow", "BelowArena") + deathParent.SetPivot(0.5, 0) + deathParent.MoveToAbs(monstersprite.absx, monstersprite.absy) + + require "Animations/StaticAnim" +end + +function Update() + AnimateStatic() +end + +function HandleAttack(attackstatus) +end + +function LaunchFade(begin) Encounter.Call("LaunchFade", begin) end + +function HandleCustomCommand(command) end \ No newline at end of file diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/static.lua.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/static.lua.meta new file mode 100644 index 000000000..4a14b862d --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Monsters/static.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6513cbeb2f5d94849b356b1d46cdbee5 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Waves/thechoice.lua b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Waves/thechoice.lua index f8dcc7637..fb16a35d7 100644 --- a/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Waves/thechoice.lua +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Lua/Waves/thechoice.lua @@ -6,51 +6,51 @@ finish = false inButton = false function Update() - if not bullet1.isColliding() and not bullet2.isColliding() then inButton = false end + if not bullet1.isColliding() and not bullet2.isColliding() then inButton = false end if bullet1.isColliding() then - bullet1.sprite.Set("UI/Buttons/fightbt_1") + bullet1.sprite.Set("UI/Buttons/fightbt_1") if not inButton then - inButton = true + inButton = true Audio.PlaySound("menumove") end if Input.Confirm == 1 then Audio.PlaySound("menuconfirm") - Encounter["enemies"][2]["currentdialogue"] = {"[noskip][func:Animate,happy]Goo...[func:Animate,surprised]what?![w:10][next]", - "[noskip][func:Animate,bracing][func:forceattack,1," .. 54302+math.random(32592) .. "][w:80][next]", - "[noskip][func:Animate,death2]I[waitall:5]...[w:20][waitall:1]I am this engine's creator and you just killed me[waitall:5]...?[w:40][next]", - "[noskip][func:Animate,deathangry]What kind of psycho are you?![w:40][next]", - "[noskip][func:Animate,deatheyesclosed][waitall:5]...[w:20][waitall:1][func:Animate,deathsmile]heh.[w:40][next]", - "[noskip][func:Animate,deathnormal]I have one last trick[waitall:5]...[w:40][next]", + Encounter["enemies"][2]["currentdialogue"] = {"[noskip][effect:none][func:Animate,happy]Goo...[func:Animate,surprised]what?![w:10][next]", + "[noskip][effect:none][func:Animate,bracing][func:forceattack,1," .. 54302+math.random(32592) .. "][w:80][next]", + "[noskip][effect:none][func:Animate,Death/2]I[waitall:5]...[w:20][waitall:1]I am this engine's creator and you just assaulted me[waitall:5]...?[w:40][next]", + "[noskip][effect:none][func:Animate,Death/angry]What kind of psycho are you?![w:40][next]", + "[noskip][effect:none][func:Animate,Death/eyesclosed][waitall:5]...[w:20][waitall:1][func:Animate,Death/smile]heh.[w:40][next]", + "[noskip][effect:none][func:Animate,Death/normal]I have one last trick[waitall:5]...[w:40][next]", "[noskip][waitall:2]Just for you[waitall:6]...[w:40][next]", - "[noskip][func:Animate,deathhurt][waitall:3]Before I die[waitall:7]...[w:40][next]", - "[noskip][func:Animate,deathcontorted][waitall:4]I won't like it,[w:15] but[waitall:8]...[w:40][next]", - "[noskip][func:Animate,deathdeath][waitall:5]Take th[func:AnimEnd]is![w:999]"} - bullet1.Remove() - bullet2.Remove() + "[noskip][effect:none][func:Animate,Death/hurt][waitall:3]Before I die[waitall:7]...[w:40][next]", + "[noskip][effect:none][func:Animate,Death/contorted][waitall:4]I won't like it,[w:15] but[waitall:8]...[w:40][next]", + "[noskip][effect:none][func:Animate,Death/death][waitall:5]Take th[func:AnimEnd]is![w:999]"} + bullet1.Remove() + bullet2.Remove() finish = true - Audio.Pause() - State("ENEMYDIALOGUE") + Audio.Pause() + State("ENEMYDIALOGUE") Encounter["cover"].MoveTo(Encounter["cover"].x, Encounter["cover"].y+150) end else bullet1.sprite.Set("UI/Buttons/fightbt_0") end if bullet2.isColliding() and not finish then - bullet2.sprite.Set("UI/Buttons/mercybt_1") + bullet2.sprite.Set("UI/Buttons/mercybt_1") if not inButton then - inButton = true + inButton = true Audio.PlaySound("menumove") end if Input.Confirm == 1 then Audio.PlaySound("menuconfirm") - Encounter["enemies"][2]["currentdialogue"] = {"[noskip][func:Animate,happy]Good![w:40][next]", - "[noskip]Thanks for sparing me![w:40][next]", - "[noskip][func:Animate,normal][waitall:5]...[w:40][next]", - "[noskip][func:Animate,pensive]What would have happened if you had killed me?[w:40][next]", - "[noskip][func:Animate,dunno]I dunno.[w:40][func:WindowClose][w:999]"} - bullet1.Remove() - bullet2.Remove() - Audio.Pause() - State("ENEMYDIALOGUE") + Encounter["enemies"][2]["currentdialogue"] = {"[noskip][effect:none][func:Animate,happy]Good![w:40][next]", + "[noskip][effect:none]Thanks for sparing me![w:40][next]", + "[noskip][effect:none][func:Animate,normal][waitall:5]...[w:40][next]", + "[noskip][effect:none][func:Animate,pensive]What would have happened if you had killed me?[w:40][next]", + "[noskip][effect:none][func:Animate,dunno]I dunno.[w:40][func:WindowClose][w:999]"} + bullet1.Remove() + bullet2.Remove() + Audio.Pause() + State("ENEMYDIALOGUE") Encounter["cover"].MoveTo(Encounter["cover"].x, Encounter["cover"].y+150) end else bullet2.sprite.Set("UI/Buttons/mercybt_0") diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sounds/Voices/claribel.wav b/Assets/Mods/@0.5.0_SEE_CRATE/Sounds/Voices/claribel-orig.wav similarity index 100% rename from Assets/Mods/@0.5.0_SEE_CRATE/Sounds/Voices/claribel.wav rename to Assets/Mods/@0.5.0_SEE_CRATE/Sounds/Voices/claribel-orig.wav diff --git a/Assets/Mods/Examples/Sounds/sm64_impact.ogg.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sounds/Voices/claribel-orig.wav.meta similarity index 91% rename from Assets/Mods/Examples/Sounds/sm64_impact.ogg.meta rename to Assets/Mods/@0.5.0_SEE_CRATE/Sounds/Voices/claribel-orig.wav.meta index daee5b914..2c20fb864 100644 --- a/Assets/Mods/Examples/Sounds/sm64_impact.ogg.meta +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sounds/Voices/claribel-orig.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7ea7ddd081073e5438a17f30c6d5d98c +guid: 0f1e0f50e1e607542a0a9a45aa876aad AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sounds/Voices/claribel.ogg b/Assets/Mods/@0.5.0_SEE_CRATE/Sounds/Voices/claribel.ogg new file mode 100644 index 000000000..3b094f889 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sounds/Voices/claribel.ogg differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sounds/Voices/claribel.wav.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sounds/Voices/claribel.ogg.meta similarity index 91% rename from Assets/Mods/@0.5.0_SEE_CRATE/Sounds/Voices/claribel.wav.meta rename to Assets/Mods/@0.5.0_SEE_CRATE/Sounds/Voices/claribel.ogg.meta index f85a3f0bc..657ef1796 100644 --- a/Assets/Mods/@0.5.0_SEE_CRATE/Sounds/Voices/claribel.wav.meta +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sounds/Voices/claribel.ogg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 097acf7e8875db34d81b1fb8def6d0d6 +guid: 964841423ee662b4a98d93a283ba5256 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sounds/glitch.ogg b/Assets/Mods/@0.5.0_SEE_CRATE/Sounds/glitch.ogg new file mode 100644 index 000000000..5fcf29809 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sounds/glitch.ogg differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sounds/glitch.ogg.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sounds/glitch.ogg.meta new file mode 100644 index 000000000..581c4b5ce --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sounds/glitch.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 5045d9ddf3451cf48af39b96d451eabe +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death.meta new file mode 100644 index 000000000..33af4525c --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6f3e33d33254a984c89e2b0509b037f1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/1.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/1.png new file mode 100644 index 000000000..c4078a9dd Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/1.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/death1.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/1.png.meta similarity index 81% rename from Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/death1.png.meta rename to Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/1.png.meta index 9cd4c7dd4..81c2282d9 100644 --- a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/death1.png.meta +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/1.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: cc2bd47aa72bf664a8c18997fa5b3535 +guid: fbcaaea6217b2b34d86425cc8bfd93f7 TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 7 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 0 + filterMode: -1 aniso: -1 mipBias: -100 wrapU: 1 @@ -69,24 +69,13 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: c21493c746106674bb5d9f6bf1a79598 + spriteID: fe6cc64676536c048b2099e7e6eb839a vertices: [] indices: edges: [] diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/2.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/2.png new file mode 100644 index 000000000..15430fb3d Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/2.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/death2.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/2.png.meta similarity index 81% rename from Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/death2.png.meta rename to Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/2.png.meta index 7302a1e65..c5e9cde1f 100644 --- a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/death2.png.meta +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/2.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 2579c284b4c8f3747a6e7bc39cd887d8 +guid: dd7b9bb2614f46a4791f0426088aa7de TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 7 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 0 + filterMode: -1 aniso: -1 mipBias: -100 wrapU: 1 @@ -69,24 +69,13 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: f9d6234f60f1d97488375f7f5f1c5169 + spriteID: d9e264200d8fcc749914e1f4fd0fcd92 vertices: [] indices: edges: [] diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe.meta new file mode 100644 index 000000000..6416c5b65 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 306b0b0f25f6aa340b69e995f9a25da4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/1.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/1.png new file mode 100644 index 000000000..bd5b68332 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/1.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deathangry.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/1.png.meta similarity index 81% rename from Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deathangry.png.meta rename to Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/1.png.meta index 8cc46876f..7aeecd61d 100644 --- a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deathangry.png.meta +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/1.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: bf94de28a29d74e4491bc64ffb9932bf +guid: f70622e92fc561e44a012b87d03389fa TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 7 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 0 + filterMode: -1 aniso: -1 mipBias: -100 wrapU: 1 @@ -69,24 +69,13 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: c67c4c636997be64c82ff625580f1c33 + spriteID: 30fb90f8afc7a8d47aa8b8ff44483f39 vertices: [] indices: edges: [] diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/2.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/2.png new file mode 100644 index 000000000..4e42c9799 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/2.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deathcontorted.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/2.png.meta similarity index 81% rename from Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deathcontorted.png.meta rename to Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/2.png.meta index eb11d1b0b..ded7f3373 100644 --- a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deathcontorted.png.meta +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/2.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 223cd2e79dc89994ab4a93d1c747028c +guid: ed84adf8674d31c45b5b337af07f2b72 TextureImporter: fileIDToRecycleName: {} externalObjects: {} - serializedVersion: 7 + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 0 + filterMode: -1 aniso: -1 mipBias: -100 wrapU: 1 @@ -69,24 +69,13 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: bd196c14c9da11e428b8e8d01ae9f710 + spriteID: 66f60dc6c48f36746b438709f680c0da vertices: [] indices: edges: [] diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/angry.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/angry.png new file mode 100644 index 000000000..46a2e6389 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/angry.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/angry.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/angry.png.meta new file mode 100644 index 000000000..c472be58a --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/angry.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 8a7097cc810c01e4a94e8e5d50f70bb6 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 73fd718211fc6a748ba9ffc304fd708d + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/contorted.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/contorted.png new file mode 100644 index 000000000..a56dc29cd Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/contorted.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/contorted.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/contorted.png.meta new file mode 100644 index 000000000..f973efd57 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/contorted.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 3b5d4e86082170844b743a1b5c45dada +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 88b2e35df08914c479ad400e65718a6a + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/death.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/death.png new file mode 100644 index 000000000..ed6c37b44 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/death.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/death.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/death.png.meta new file mode 100644 index 000000000..2b6455b18 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/death.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 1138c2ce285fd034293e2fa7ab8dfe26 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 038a30bafc3eebf4988a5071f64c7f34 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/eyesclosed.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/eyesclosed.png new file mode 100644 index 000000000..22a21135c Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/eyesclosed.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/eyesclosed.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/eyesclosed.png.meta new file mode 100644 index 000000000..783fc0806 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/eyesclosed.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 869062d8b5bf8dc48ae3683f1d9f486b +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 43499369223c03b49977f3deeb1d1825 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/hurt.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/hurt.png new file mode 100644 index 000000000..e8f0e4c15 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/hurt.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/hurt.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/hurt.png.meta new file mode 100644 index 000000000..0c21f26ea --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/hurt.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 06e24a52da05d9f458a57fbb825d309f +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 2416b4ed920a7ad45b622f84cf61032d + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/normal.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/normal.png new file mode 100644 index 000000000..44babfc60 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/normal.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/normal.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/normal.png.meta new file mode 100644 index 000000000..d2a0e7442 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/normal.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: ff4f4a59c5df36e4a89c0f9d4f8862ee +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 88e13a81eebaf154aa842529d79ad811 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/smile.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/smile.png new file mode 100644 index 000000000..ca4ba62db Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/smile.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/smile.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/smile.png.meta new file mode 100644 index 000000000..ae5f7675c --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/Safe/smile.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 61c12dc139728974cbd57194a01aa61f +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 11ed7de801cce7448bb1abb623c386eb + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deathangry.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/angry.png similarity index 100% rename from Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deathangry.png rename to Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/angry.png diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/angry.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/angry.png.meta new file mode 100644 index 000000000..2a30a3aba --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/angry.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 706466960173164479001743a45b570b +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 1fbb9630995c886489d989592985803e + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deathcontorted.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/contorted.png similarity index 100% rename from Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deathcontorted.png rename to Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/contorted.png diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/contorted.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/contorted.png.meta new file mode 100644 index 000000000..eec58d058 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/contorted.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: c36e5f716076d744cbfc6429f1ecbeec +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 4bf5b46e6a5a63a4b8b06e8327a70ec6 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deathdeath.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/death.png similarity index 100% rename from Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deathdeath.png rename to Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/death.png diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/death.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/death.png.meta new file mode 100644 index 000000000..41f830781 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/death.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: c28dc756f9dd37343b0e429805fed699 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: a81956c458161064282c54151dd856bc + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deatheyesclosed.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/eyesclosed.png similarity index 100% rename from Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deatheyesclosed.png rename to Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/eyesclosed.png diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/eyesclosed.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/eyesclosed.png.meta new file mode 100644 index 000000000..e99175148 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/eyesclosed.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 615f719c0239d7d4b871c46a71cd8923 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 62ba9f00ac8a35843a314aef746df394 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deathhurt.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/hurt.png similarity index 100% rename from Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deathhurt.png rename to Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/hurt.png diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/hurt.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/hurt.png.meta new file mode 100644 index 000000000..bf8e02e15 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/hurt.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 4b78f5e93ae2c334ca206afbbecdd8d1 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: be8ce4fb4bf422e4cb2f2f047bd1e940 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deathnormal.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/normal.png similarity index 100% rename from Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deathnormal.png rename to Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/normal.png diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/normal.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/normal.png.meta new file mode 100644 index 000000000..b7cf2f3da --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/normal.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: a1bad026773185b428c2aae66eb994f1 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: e1ed508b6dab9f240947496ff3e6e350 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deathsmile.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/smile.png similarity index 100% rename from Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deathsmile.png rename to Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/smile.png diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/smile.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/smile.png.meta new file mode 100644 index 000000000..fd0dcb935 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/Death/smile.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: da79990e578da14489c6076123d92edc +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: e1eb7a28c91330d4fbead1d3e9986fdd + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/death1.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/death1.png deleted file mode 100644 index fe0f8dd1e..000000000 Binary files a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/death1.png and /dev/null differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/death2.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/death2.png deleted file mode 100644 index 88618b16a..000000000 Binary files a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/death2.png and /dev/null differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deathdeath.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deathdeath.png.meta deleted file mode 100644 index 79fd95670..000000000 --- a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deathdeath.png.meta +++ /dev/null @@ -1,99 +0,0 @@ -fileFormatVersion: 2 -guid: e6d305d470e430f458491c87a9b6a535 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 7 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 0 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: a8d7d60a671af5242a3d615893891e47 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deatheyesclosed.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deatheyesclosed.png.meta deleted file mode 100644 index 6feb84caa..000000000 --- a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deatheyesclosed.png.meta +++ /dev/null @@ -1,99 +0,0 @@ -fileFormatVersion: 2 -guid: 34639434ea62168429db7a7ce56aa242 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 7 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 0 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 8f1c71d3f4cf11240b81061a0f34582e - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deathhurt.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deathhurt.png.meta deleted file mode 100644 index 9ad21f0c2..000000000 --- a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deathhurt.png.meta +++ /dev/null @@ -1,99 +0,0 @@ -fileFormatVersion: 2 -guid: 0b0f0dc95726a8949873ec2207c89de1 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 7 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 0 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 4e3a8e8f9fa786e4e8482e1b1fff40f3 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deathnormal.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deathnormal.png.meta deleted file mode 100644 index 86a944849..000000000 --- a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deathnormal.png.meta +++ /dev/null @@ -1,99 +0,0 @@ -fileFormatVersion: 2 -guid: 6efe32e1227361d468bb9100297a6af5 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 7 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 0 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 52216f61347d7a14aaa405200221b82c - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deathsmile.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deathsmile.png.meta deleted file mode 100644 index c11a60402..000000000 --- a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Punderbolt/deathsmile.png.meta +++ /dev/null @@ -1,99 +0,0 @@ -fileFormatVersion: 2 -guid: ceccad31be4adc549a9fb21af7d88cc1 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 7 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 0 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 1db88181f8dacfe4a985f02c37fefc7b - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle.meta new file mode 100644 index 000000000..2eb086f53 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 547d093319ebdd54bae667da59174560 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death.meta new file mode 100644 index 000000000..e0e696c90 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2c6b57965a52bc247a519fcce112bae1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/dustingmess.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/dustingmess.png new file mode 100644 index 000000000..e0e4cdd8e Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/dustingmess.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/dustingmess.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/dustingmess.png.meta new file mode 100644 index 000000000..0c1f68918 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/dustingmess.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: fff4e0cacf82d7a4983f2ef62f4f48ae +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 2d2955ab4b295a940b9377f0b3f45c24 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/head2.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/head2.png new file mode 100644 index 000000000..2c214e15e Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/head2.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/head2.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/head2.png.meta new file mode 100644 index 000000000..9b351e715 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/head2.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 4d169a2efe247d94da25b09afdca35cd +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 6ada82f54265b904ab6b27dd66f15c71 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/head3.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/head3.png new file mode 100644 index 000000000..d9cfaa1be Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/head3.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/head3.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/head3.png.meta new file mode 100644 index 000000000..b8cca6e3b --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/head3.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 0cd71bdd2d26c0245a70d223d84b6f1b +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 61e1933c0ca0d3d498159437ee364503 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/head4.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/head4.png new file mode 100644 index 000000000..cc3b69e30 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/head4.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/head4.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/head4.png.meta new file mode 100644 index 000000000..f7521993f --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/head4.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 127834e9b87009046b3f416dd967b4e4 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: b207fc10bdb8af342a46608718490285 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/leftleg.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/leftleg.png new file mode 100644 index 000000000..8cd063c19 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/leftleg.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/leftleg.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/leftleg.png.meta new file mode 100644 index 000000000..88e64058f --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/leftleg.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 6045aa6a03148b742b9b1cc9c0612823 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 2fcdb6c9f0851ea47a80e169bda17b8f + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/righthand.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/righthand.png new file mode 100644 index 000000000..181e65a8a Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/righthand.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/righthand.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/righthand.png.meta new file mode 100644 index 000000000..7d8572958 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/righthand.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 584939b67f88f3544b858a5f83909d38 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: d69336aecf216564d92b3f8433bfd7c9 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/rightleg.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/rightleg.png new file mode 100644 index 000000000..c31d10a0f Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/rightleg.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/rightleg.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/rightleg.png.meta new file mode 100644 index 000000000..eec0ae495 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/rightleg.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 3be9369e6a761bb4481ee0aec4676cf4 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 87139f8a66cf80842827f52ec9310d29 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/surprise.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/surprise.png new file mode 100644 index 000000000..ada867757 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/surprise.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/surprise.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/surprise.png.meta new file mode 100644 index 000000000..efa91d2ff --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/Death/surprise.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 33786192417d93e469f27ef9f71e8a93 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 8d09c01cf746ec94e8ab9cc18c08a27d + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/blush.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/blush.png new file mode 100644 index 000000000..bebd77978 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/blush.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/blush.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/blush.png.meta new file mode 100644 index 000000000..120f2e73b --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/blush.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: cd9f048ce8dc4154d8139d986c716092 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: c8101c4594b19074b8eacdc00d5a2d06 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/head.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/head.png new file mode 100644 index 000000000..cc4a547af Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/head.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/head.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/head.png.meta new file mode 100644 index 000000000..8e21c240d --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/head.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: ec76f2f9520ad224f978db97c61d572d +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: c2ba45b4ab3246240bce615338aa9618 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/hollow.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/hollow.png new file mode 100644 index 000000000..b47f8cc88 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/hollow.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/hollow.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/hollow.png.meta new file mode 100644 index 000000000..a262e895b --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/hollow.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 739de9e80b0f25e48904d02adb0c956e +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 6868b1c4b350a124fb047a39c0f6a897 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/hoodtail.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/hoodtail.png new file mode 100644 index 000000000..62de42883 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/hoodtail.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/hoodtail.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/hoodtail.png.meta new file mode 100644 index 000000000..184ad3ba2 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/hoodtail.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 7e13459b3293bd546bf6d13b86fbcee5 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 43755006a22a8db41b6e7226e0d1b4ea + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/hurt.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/hurt.png new file mode 100644 index 000000000..1a38af1e4 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/hurt.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/hurt.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/hurt.png.meta new file mode 100644 index 000000000..b7b2e1309 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/hurt.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 9aff4a8a02cecb54db86e78efd97866b +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 9dfcb0d83fbc905429c09c247a60926c + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/hurtOld.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/hurtOld.png new file mode 100644 index 000000000..414042bbd Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/hurtOld.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/hurtOld.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/hurtOld.png.meta new file mode 100644 index 000000000..3829edaa3 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/hurtOld.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 324f6ad99102152408e85ecfe9f1093c +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: ef4c98b487464be48bc8b15ac1525c34 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/leftarm.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/leftarm.png new file mode 100644 index 000000000..815e86fbf Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/leftarm.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/leftarm.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/leftarm.png.meta new file mode 100644 index 000000000..3389c6723 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/leftarm.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 675b00d7d1e7b5d4f8a0492c6cd6f293 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: dc3ac7e9f59d1d9449d219c49a77387a + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/leftarmbot.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/leftarmbot.png new file mode 100644 index 000000000..ff149452e Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/leftarmbot.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/leftarmbot.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/leftarmbot.png.meta new file mode 100644 index 000000000..d9b7f75ac --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/leftarmbot.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: e20deea191599d840948068a8f8696ad +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 013f18780d572754e9e20cfbe7ade1a5 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/leftarmtop.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/leftarmtop.png new file mode 100644 index 000000000..cf5aa6704 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/leftarmtop.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/leftarmtop.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/leftarmtop.png.meta new file mode 100644 index 000000000..5f4b7420e --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/leftarmtop.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: a0d6432f23d27c4408fbea504970b14a +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 016415561b7753a4f8be6c68f7596a25 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/lefthand.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/lefthand.png new file mode 100644 index 000000000..5362ce853 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/lefthand.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/lefthand.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/lefthand.png.meta new file mode 100644 index 000000000..d18b5be55 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/lefthand.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: c94f218f621269d44ba4567dd65ca415 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: bdef5e835b82f104a87d8eef02daf95e + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/leftleg.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/leftleg.png new file mode 100644 index 000000000..d12e262c2 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/leftleg.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/leftleg.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/leftleg.png.meta new file mode 100644 index 000000000..05d772c3f --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/leftleg.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 8da3c4d7aa9742142ba2846855f08f70 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: d56c61037b0e8c74a85f0dc72e3b2e10 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/preview.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/preview.png new file mode 100644 index 000000000..4b64fb98d Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/preview.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/preview.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/preview.png.meta new file mode 100644 index 000000000..539df9f47 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/preview.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 0341bdccf89d3b446b2a8988a5ba2dfe +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 0e307691d4f1eab42a4e738907f3b2f7 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/rightarm.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/rightarm.png new file mode 100644 index 000000000..c53b07661 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/rightarm.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/rightarm.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/rightarm.png.meta new file mode 100644 index 000000000..ef6bba500 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/rightarm.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 86da463544354f441af9180ba5bcae36 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 1eb79839ac020dd49a15c5206c547ff7 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/rightarmbot.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/rightarmbot.png new file mode 100644 index 000000000..eda61afee Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/rightarmbot.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/rightarmbot.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/rightarmbot.png.meta new file mode 100644 index 000000000..ac6d3f07e --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/rightarmbot.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 7d7fb9c3035c7bf428540efb8174a616 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 7ab314bed080f6f4ba269358dc67a328 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/rightarmtop.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/rightarmtop.png new file mode 100644 index 000000000..dec1e4580 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/rightarmtop.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/rightarmtop.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/rightarmtop.png.meta new file mode 100644 index 000000000..f0e1d7bfc --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/rightarmtop.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 00edfbfbd2bc9f94fb48c09f939f9a93 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 87a6f796fd503924f8bbf1123755e61f + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/righthand.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/righthand.png new file mode 100644 index 000000000..15c3d4236 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/righthand.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/righthand.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/righthand.png.meta new file mode 100644 index 000000000..e313cd2ee --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/righthand.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 37f9fb5433ce2ae4688d8c80a41bebb8 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 2ea9a9673bab960479deb99a2e29f87d + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/rightleg.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/rightleg.png new file mode 100644 index 000000000..0c7fb9d17 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/rightleg.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/rightleg.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/rightleg.png.meta new file mode 100644 index 000000000..83b5ecb20 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/rightleg.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 0d4d70e17a653ea428a5a858a70c3adc +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 3fc09a260d1aea84b9beb01bedb6b6a5 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/spared.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/spared.png new file mode 100644 index 000000000..23aaeb65e Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/spared.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/spared.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/spared.png.meta new file mode 100644 index 000000000..04501fdce --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/spared.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 3f50b9275736ffb448db0b447bad6791 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 2c7d95dff2eb3a74087843bf9d427023 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/torso.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/torso.png new file mode 100644 index 000000000..24b106b03 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/torso.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/torso.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/torso.png.meta new file mode 100644 index 000000000..1e6fa2511 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Scruffle/torso.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 2005fe9c58780a64094773b7970dfffe +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: aaf9e4efdb6b4f549958c415b6fd83e8 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static.meta new file mode 100644 index 000000000..597a57e4a --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dcbbfa49644239e4ca5fece8a4f6dc18 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death.meta new file mode 100644 index 000000000..66d38dae9 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ba4fae5a2566da846910f29b2e4d5126 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/dustingmess.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/dustingmess.png new file mode 100644 index 000000000..b764ffed0 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/dustingmess.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/dustingmess.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/dustingmess.png.meta new file mode 100644 index 000000000..36ecd6c85 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/dustingmess.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: eb014888db8a50a44a5ce3118be23806 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 955c13610e34d764ea7cf0915d85ce0d + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/face - Copy.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/face - Copy.png new file mode 100644 index 000000000..acee59348 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/face - Copy.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/face - Copy.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/face - Copy.png.meta new file mode 100644 index 000000000..7c3d63054 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/face - Copy.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: cd43a9f784eae6a46ab565a5304ab0bb +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 9f115217caba06144a0f880b609056b9 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/face.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/face.png new file mode 100644 index 000000000..f67caecc5 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/face.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/face.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/face.png.meta new file mode 100644 index 000000000..267923b32 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/face.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 335d34789634a5244a878adeebc327be +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 89101802d74420c4891856e10a81af4e + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/facemask.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/facemask.png new file mode 100644 index 000000000..cdb92e9e0 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/facemask.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/facemask.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/facemask.png.meta new file mode 100644 index 000000000..a7ed6e836 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/facemask.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 81766e023cf08224e8342e563f4b035c +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: c755fd04d7f1fa849958a69b70fdc26d + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/rhand.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/rhand.png new file mode 100644 index 000000000..2ebbc57d4 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/rhand.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/rhand.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/rhand.png.meta new file mode 100644 index 000000000..7e797a5d0 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/rhand.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: d640a8f3a50076c4bb85fe008557519c +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: dcb364975388f794cbe887434fdf0e7b + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/smoke.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/smoke.png new file mode 100644 index 000000000..9e4ea93d3 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/smoke.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/smoke.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/smoke.png.meta new file mode 100644 index 000000000..4dad34176 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/smoke.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: f1885bc9f2caeb14b8dffc03e7e78c89 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 8f5fecb1eaf0a52498e3078d89a87714 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/staticeffect1.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/staticeffect1.png new file mode 100644 index 000000000..844fe81d8 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/staticeffect1.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/staticeffect1.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/staticeffect1.png.meta new file mode 100644 index 000000000..5392b6d10 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/staticeffect1.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 8f1bafa1f64b6a84dbf09c9b437f6eb1 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: c0daa1309ddf77b48833505ec7b51227 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/staticeffect2.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/staticeffect2.png new file mode 100644 index 000000000..8c0a2dc43 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/staticeffect2.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/staticeffect2.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/staticeffect2.png.meta new file mode 100644 index 000000000..7b5c5cf91 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/staticeffect2.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: be179fed7bd7f0745ae7cee1263f6070 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 8b82d7e4760f1f04f84da0d9ffa0dcaa + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/staticeffect3.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/staticeffect3.png new file mode 100644 index 000000000..9153c02fd Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/staticeffect3.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/staticeffect3.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/staticeffect3.png.meta new file mode 100644 index 000000000..8139cc6e6 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/staticeffect3.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: be4f9dc92a30f6546ba8351d43e01e1d +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 4c21900513a3b654ca9a58062c4a382f + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/x.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/x.png new file mode 100644 index 000000000..56ebb0890 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/x.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/x.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/x.png.meta new file mode 100644 index 000000000..88ce45e24 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Death/x.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 7b489a30a38df5b4bb95c51be2e0f577 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 27d9721aa03b3ff49941298d512aadfc + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt.meta new file mode 100644 index 000000000..e9e7dbb89 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ca2460bb32cebe54a97bc3f0d7722874 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/Hurt.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/Hurt.png new file mode 100644 index 000000000..f2c3331e6 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/Hurt.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/Hurt.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/Hurt.png.meta new file mode 100644 index 000000000..d6260429a --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/Hurt.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 44cbc9852785b8a41b6eb582b87ca2cb +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 34d2a345e5fc75148b1d70d206ae4935 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/facemask.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/facemask.png new file mode 100644 index 000000000..0a7e7c3f2 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/facemask.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/facemask.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/facemask.png.meta new file mode 100644 index 000000000..cd939033c --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/facemask.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: f7e4f49d49c33024488e831ee8acf824 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 7f5f81ac750ef614b94ad9f6f3a91ee7 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/fluffmask.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/fluffmask.png new file mode 100644 index 000000000..288a9a186 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/fluffmask.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/fluffmask.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/fluffmask.png.meta new file mode 100644 index 000000000..bc6550c90 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/fluffmask.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: cdf87408213c8ad498fe4605e16d0822 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: a91ccc9f220f97a459474b36ac319e01 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/learmask.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/learmask.png new file mode 100644 index 000000000..6b9ec0b0d Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/learmask.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/learmask.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/learmask.png.meta new file mode 100644 index 000000000..fef7785d4 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/learmask.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: a79cecd83d7f61f46870c77dc8bfbbfd +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 91eb9b4e7208cf74eae00795cba180bf + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/rearmask.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/rearmask.png new file mode 100644 index 000000000..e44941115 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/rearmask.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/rearmask.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/rearmask.png.meta new file mode 100644 index 000000000..0cef47fc7 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/rearmask.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: edddedc32a153fa4cb93937b3969a6a9 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: c123e83a499a9914997cc98578879715 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/tailmask.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/tailmask.png new file mode 100644 index 000000000..57db1774f Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/tailmask.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/tailmask.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/tailmask.png.meta new file mode 100644 index 000000000..10262d4b6 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/Hurt/tailmask.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: cab445f3766203b448d5c1fb85922f9c +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: e37408557a322ff42979bffceb1de0f8 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/face.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/face.png new file mode 100644 index 000000000..5c7f3381c Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/face.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/face.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/face.png.meta new file mode 100644 index 000000000..5d0e0b2a6 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/face.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: bc1d567141ca1fe498e73d17d8d7086e +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 413767bdaa2f2e1478c972e14f906a5d + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/faceMTT1.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/faceMTT1.png new file mode 100644 index 000000000..f3e5e19f8 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/faceMTT1.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/faceMTT1.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/faceMTT1.png.meta new file mode 100644 index 000000000..fbfe54e92 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/faceMTT1.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 8674dde6329ff36419c5137d693f89a4 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: c9aed61b3f78d8c48a3472eef0cf7934 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/faceMTT2.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/faceMTT2.png new file mode 100644 index 000000000..758eda50b Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/faceMTT2.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/faceMTT2.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/faceMTT2.png.meta new file mode 100644 index 000000000..9d3ce73fc --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/faceMTT2.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: ce85efb6bd5619e4ca4cc91ade0337d5 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: ca9da258cd8f202468ba1b3520ec2478 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/facemask.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/facemask.png new file mode 100644 index 000000000..7d4bf228f Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/facemask.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/facemask.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/facemask.png.meta new file mode 100644 index 000000000..6037b803d --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/facemask.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: efaf1ad326e61d64ca8a2a9a793deab0 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 91e84d5d3c249154d988c5ebd9eeca04 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/fluff.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/fluff.png new file mode 100644 index 000000000..38e89c9fb Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/fluff.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/fluff.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/fluff.png.meta new file mode 100644 index 000000000..26a3d79bf --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/fluff.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: a60d1f036127bec4c8b81fa409782fb4 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: ebb7b844f82cef843b8d1a5eecfdceaa + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/fluffmask.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/fluffmask.png new file mode 100644 index 000000000..9f254528c Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/fluffmask.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/fluffmask.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/fluffmask.png.meta new file mode 100644 index 000000000..b2fdaf085 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/fluffmask.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 5e6c40603afc89a43a4bd8fddb84a4c2 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 7b0ab40ec632c744b9ddc1503f0d81b3 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/headbase.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/headbase.png new file mode 100644 index 000000000..f7040b642 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/headbase.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/headbase.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/headbase.png.meta new file mode 100644 index 000000000..abdc54584 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/headbase.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 8f6e0a45576244e4e9131110e685715d +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: bbdabbf3b8cd35f49bc086cb100e8fa8 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/hollow.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/hollow.png new file mode 100644 index 000000000..7513bf6e2 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/hollow.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/hollow.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/hollow.png.meta new file mode 100644 index 000000000..05b9235e8 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/hollow.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 4f396e3cf2fc9db44b26d2bc2755795a +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 66722cce46b6e3b4cbc263e7311d4f7a + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/larm.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/larm.png new file mode 100644 index 000000000..f5dd33fe1 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/larm.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/larm.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/larm.png.meta new file mode 100644 index 000000000..1ef509123 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/larm.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: e1ee84fc8b4ddc744b4d5f0153205023 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 6b3450917a7156847bf343029482be56 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/lear.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/lear.png new file mode 100644 index 000000000..ed652be4b Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/lear.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/lear.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/lear.png.meta new file mode 100644 index 000000000..e230cc799 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/lear.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 192829a8576aac8419b87ccc308973f6 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 0322a7be1cab568448cb1cb207eaa0ee + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/learmask.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/learmask.png new file mode 100644 index 000000000..a7701c862 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/learmask.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/learmask.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/learmask.png.meta new file mode 100644 index 000000000..d77768a7a --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/learmask.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: e15d453bd3bcbac43b9ea14f020fd10c +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 547d086c65f8cd84280b15964b6dcc3c + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/legs.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/legs.png new file mode 100644 index 000000000..9c945f1a9 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/legs.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/legs.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/legs.png.meta new file mode 100644 index 000000000..3ccd5c399 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/legs.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 90e6ab165f3ee424aaa07262f0e6818d +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 3a869b45f24d34f40bbe5a857fdd8fcd + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/lhand.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/lhand.png new file mode 100644 index 000000000..3522640b6 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/lhand.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/lhand.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/lhand.png.meta new file mode 100644 index 000000000..d0175f475 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/lhand.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: fbb2c231d6dba71488a599246db537f5 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 62bc4e0b2188f1c449ccf671a1b0d220 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/preview.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/preview.png new file mode 100644 index 000000000..cb8a22fa4 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/preview.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/preview.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/preview.png.meta new file mode 100644 index 000000000..ff6bbddba --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/preview.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 61e3160f577aa5e4797820dc302c2084 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 179edbdfb2a1de4458a1d2667aab5ef2 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/previewNoMask.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/previewNoMask.png new file mode 100644 index 000000000..380b76628 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/previewNoMask.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/previewNoMask.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/previewNoMask.png.meta new file mode 100644 index 000000000..bcd4e6180 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/previewNoMask.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: f9f7558c6a672aa4e938534b2a023dde +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 80238a2c9ffa01043a5793a822194a16 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/rarm.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/rarm.png new file mode 100644 index 000000000..acec976d4 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/rarm.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/rarm.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/rarm.png.meta new file mode 100644 index 000000000..e6d09b7a9 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/rarm.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 5360fce36e184ca4e951d139eae34573 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: d9bd9b3d638c13842a9f9b6ba4e1d307 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/rear.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/rear.png new file mode 100644 index 000000000..7ea131d82 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/rear.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/rear.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/rear.png.meta new file mode 100644 index 000000000..044512829 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/rear.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 2fa35af67bb67b144861804648a34014 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 8aea97302b647b34a997a9227cdffbc1 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/rearmask.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/rearmask.png new file mode 100644 index 000000000..8597007c6 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/rearmask.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/rearmask.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/rearmask.png.meta new file mode 100644 index 000000000..64ace2720 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/rearmask.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 249b6160598e2dd478f24b515a405b3f +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: cafa018a27914464ca4dd053ed361381 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/rhand.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/rhand.png new file mode 100644 index 000000000..ca8ceaa92 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/rhand.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/rhand.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/rhand.png.meta new file mode 100644 index 000000000..4613ae203 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/rhand.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 88af5c3413cf8a74999f2db70dcd1bcc +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: ce3fe631431d01e4387fc38aee695242 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/spared.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/spared.png new file mode 100644 index 000000000..088547aa2 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/spared.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/spared.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/spared.png.meta new file mode 100644 index 000000000..9320e193c --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/spared.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 2106f6cabcd5b384c828016982eaaae7 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 128ced9a97106d444b347b6b411a99df + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/staticeffect.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/staticeffect.png new file mode 100644 index 000000000..b6178e364 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/staticeffect.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/staticeffect.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/staticeffect.png.meta new file mode 100644 index 000000000..3b4f6aa1d --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/staticeffect.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: b0230084927ebff40a9179664f9bdf79 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 31d1898cbff323c458385dfa1df41088 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/tail.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/tail.png new file mode 100644 index 000000000..082ef29d1 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/tail.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/tail.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/tail.png.meta new file mode 100644 index 000000000..80cdcdd16 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/tail.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 6daff4a6cca25924c8d5266408dd8c51 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: c0ffe6cae852595428c23f5474e40629 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/tailmask.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/tailmask.png new file mode 100644 index 000000000..bb57d15fd Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/tailmask.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/tailmask.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/tailmask.png.meta new file mode 100644 index 000000000..257cca136 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/tailmask.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: e24152c91cbc6cf418c51bc3deed652c +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: f41a18e12d0e2bb4faa959a1666215d2 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/torso.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/torso.png new file mode 100644 index 000000000..10d76aebf Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/torso.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/torso.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/torso.png.meta new file mode 100644 index 000000000..32c6a2da2 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/Static/torso.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 699f1c3c18fba144dacaa7825d253443 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: db802684fc963dd458ab8b9c792cc203 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/claribel.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/claribel.png new file mode 100644 index 000000000..a00681b06 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/claribel.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/claribel.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/claribel.png.meta new file mode 100644 index 000000000..58b6d25aa --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/claribel.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: f25194271d7030043b10624da109ca97 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 45e22e50f5a98cb49969ed1209277967 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/claribel.xml b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/claribel.xml new file mode 100644 index 000000000..e30f9aa2f --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/claribel.xml @@ -0,0 +1,7 @@ + + + + + + 175 + \ No newline at end of file diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/claribel.xml.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/claribel.xml.meta new file mode 100644 index 000000000..248459b6c --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/claribel.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 76d371fb41e98394d92db5392da8335d +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/ellie.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/ellie.png new file mode 100644 index 000000000..5f0832d83 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/ellie.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/ellie.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/ellie.png.meta new file mode 100644 index 000000000..d8bd4f954 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/ellie.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 3dc54873f5b615f4babb640231e8210e +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 4a31efe6a9269c042a8e703267e71d81 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/ellie.xml b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/ellie.xml new file mode 100644 index 000000000..68eba5d8a --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/ellie.xml @@ -0,0 +1,7 @@ + + + + + + 175 + \ No newline at end of file diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/ellie.xml.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/ellie.xml.meta new file mode 100644 index 000000000..23cf5c205 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/ellie.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c8da040583da68c41875d7086638422c +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/exrumia.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/exrumia.png new file mode 100644 index 000000000..2f7a423f6 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/exrumia.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/exrumia.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/exrumia.png.meta new file mode 100644 index 000000000..5e9a3b031 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/exrumia.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: bfa16415fccb5c743b4afc23e8713d0b +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: ce695762aa962bc4eacb755abe0f5fae + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/exrumia.xml b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/exrumia.xml new file mode 100644 index 000000000..68eba5d8a --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/exrumia.xml @@ -0,0 +1,7 @@ + + + + + + 175 + \ No newline at end of file diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/exrumia.xml.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/exrumia.xml.meta new file mode 100644 index 000000000..95a2969b4 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/exrumia.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8cd918667961fb04196dd0be4b5fa4ba +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/lukark.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/lukark.png new file mode 100644 index 000000000..bf2016a0a Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/lukark.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/lukark.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/lukark.png.meta new file mode 100644 index 000000000..9071a0d12 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/lukark.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: f95cc5f20d7c77a4ca128d806c34eefd +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5f2d231a24e8c9745ae29a5a57b379fb + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/lukark.xml b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/lukark.xml new file mode 100644 index 000000000..e30f9aa2f --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/lukark.xml @@ -0,0 +1,7 @@ + + + + + + 175 + \ No newline at end of file diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/lukark.xml.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/lukark.xml.meta new file mode 100644 index 000000000..66dc3b260 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/lukark.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3ae1c2fd69a5a7e44bbee96d7e581a7a +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/mionn.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/mionn.png new file mode 100644 index 000000000..a2eaf0fa1 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/mionn.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/mionn.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/mionn.png.meta new file mode 100644 index 000000000..24e740695 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/mionn.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 095b4ddea25595640abfbfa4a652545d +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: a22beb0c3279953429a9d5c0db0b72df + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/mionn.xml b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/mionn.xml new file mode 100644 index 000000000..68eba5d8a --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/mionn.xml @@ -0,0 +1,7 @@ + + + + + + 175 + \ No newline at end of file diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/mionn.xml.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/mionn.xml.meta new file mode 100644 index 000000000..3f2c746b8 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/mionn.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ea2b9797c19a3e14790f415b0229db6d +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/scruffle.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/scruffle.png new file mode 100644 index 000000000..55913e54a Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/scruffle.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/scruffle.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/scruffle.png.meta new file mode 100644 index 000000000..de7340f0f --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/scruffle.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 61a302a1c26078a43ab0e07ed4d243ab +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: fdcb33481d5f33741baa23ea52c7fc25 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/scruffle.xml b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/scruffle.xml new file mode 100644 index 000000000..e30f9aa2f --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/scruffle.xml @@ -0,0 +1,7 @@ + + + + + + 175 + \ No newline at end of file diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/scruffle.xml.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/scruffle.xml.meta new file mode 100644 index 000000000..f66bf8157 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/scruffle.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 937cc307473c93142a1cbd2e06670b96 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/static.png b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/static.png new file mode 100644 index 000000000..5f0832d83 Binary files /dev/null and b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/static.png differ diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/static.png.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/static.png.meta new file mode 100644 index 000000000..5f96c5a5c --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/static.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 63f706b8a2bb5c844a0e7a2db74bf3e3 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 930f5a982774ffc4d8f50045857ae3ea + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/static.xml b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/static.xml new file mode 100644 index 000000000..68eba5d8a --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/static.xml @@ -0,0 +1,7 @@ + + + + + + 175 + \ No newline at end of file diff --git a/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/static.xml.meta b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/static.xml.meta new file mode 100644 index 000000000..828913061 --- /dev/null +++ b/Assets/Mods/@0.5.0_SEE_CRATE/Sprites/UI/SpeechBubbles/static.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7120fa2d01d1e2e4e93ed31ed637ddfa +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/@OverWorld Test/Lua/Events/Secret/8ba3f2c2.lua b/Assets/Mods/@OverWorld Test/Lua/Events/Secret/8ba3f2c2.lua index 2c2c2d60c..8aa5cb3a9 100644 --- a/Assets/Mods/@OverWorld Test/Lua/Events/Secret/8ba3f2c2.lua +++ b/Assets/Mods/@OverWorld Test/Lua/Events/Secret/8ba3f2c2.lua @@ -12,8 +12,8 @@ function EventPage1() Event.MoveToPoint("Player", 380, 200, true) Event.SetDirection("Player", 2) - General.SetDialog({"[noskip]Man, the Core is a nice place... [w:25][mugshot:MK/sad]but I'm very far away from home...", - "[noskip]I told my parents I went exploring the world, [w:25][mugshot:MK/sad2]but man, this place is scary...", + General.SetDialog({"[noskip]Man, [w:15]the Core is a nice place... [w:25][mugshot:MK/sad]but I'm very far away from home...", + "[noskip]I told my parents I went exploring the world, [w:15][mugshot:MK/sad2]but man, [w:15]this place is scary...", "[noskip]I better move on."}, true, {"MK/stars", "MK/normal", "MK/determined"}) Event.MoveToPoint("Player", 400, 200, true) Event.Teleport("8ba3f2c2 (1)", 40, 200) diff --git a/Assets/Mods/Examples 2/Lua/Events/Secret/bee6bcfc.lua b/Assets/Mods/Examples 2/Lua/Events/Secret/bee6bcfc.lua index 754cd1235..8cb07e6a9 100644 --- a/Assets/Mods/Examples 2/Lua/Events/Secret/bee6bcfc.lua +++ b/Assets/Mods/Examples 2/Lua/Events/Secret/bee6bcfc.lua @@ -31,7 +31,7 @@ function EventPage2() Event.SetDirection("Player", 6) Event.SetDirection(Event.GetName(), 4) General.Wait(30) - General.SetDialog({"[noskip][voice:punderbolt]Hello th[mugshot:Punder/intimidated][waitall:2]ere... [w:25][waitall:1]May I help you?"}, true, {"punder/normal"}) + General.SetDialog({"[noskip][voice:punderbolt]Hello th[mugshot:Punder/intimidated][waitall:2]ere... [w:25][waitall:1]May I help you?"}, true, {"Punder/normal"}) for i = 1, 30 do Audio.Volume((30 - i) / 30) General.Wait(1) @@ -148,10 +148,10 @@ function EventPage1() else text = "Hey...[w:25]you look kinda menacing...[w:25]\nBe good, [w:15]alright?" end - mugshot = "punder/intimidated" + mugshot = "Punder/intimidated" elseif Event.GetAnimHeader("Player") == "Asriel" then text = "Oh hi kid! [w:25]You're cute, [w:15]you know that?" - mugshot = "punder/veryHappy" + mugshot = "Punder/veryHappy" else text = "Hey, [w:15]how's it going?" end diff --git a/Assets/Mods/Examples 2/Lua/Events/Secret/caf144b2.lua b/Assets/Mods/Examples 2/Lua/Events/Secret/caf144b2.lua index e59600261..9e0e94e42 100644 --- a/Assets/Mods/Examples 2/Lua/Events/Secret/caf144b2.lua +++ b/Assets/Mods/Examples 2/Lua/Events/Secret/caf144b2.lua @@ -19,14 +19,14 @@ function EventPage1() General.SetDialog({"[noskip]Heeeeeeey!"}, true) Event.MoveToPoint("caf144b2 (1)", 900, playerPos[2], true) - General.SetDialog({"[noskip]I was running after you, [w:10]you know!", + General.SetDialog({"[noskip]I was looking for you, [w:10]you know!", "[noskip]ahem[next]", "[noskip]You're a human, [w:10]right?"}, true, {"Chara/angry", "Chara/ahem", "Chara/badsmile"}) General.SetChoice({"Yes", "No"}) if lastChoice == 0 then NewAudio.CreateChannel("temp") General.SetDialog({"[noskip]Oh, [w:10]cool!", - "[noskip]You know,[mugshot:Chara/normal] [w:10]I came by not a long time ago too.", + "[noskip]You know,[mugshot:Chara/normal] [w:10]I came by not long ago too.", "[noskip]I know the place a bit now, [w:10][mugshot:Chara/smile]would you like me to show you around?", "[noskip]No? [w:20]Excellent, [w:10]follow me!"}, true, {"Chara/smile", "Chara/thinking", "Chara/normal", "Chara/smile"}) Event.SetAnimHeader("caf144b2 (2)", "") diff --git a/Assets/Mods/Examples/Lua/Events/CharacterSelector.lua b/Assets/Mods/Examples/Lua/Events/CharacterSelector.lua index f79d6ea81..74ed56241 100644 --- a/Assets/Mods/Examples/Lua/Events/CharacterSelector.lua +++ b/Assets/Mods/Examples/Lua/Events/CharacterSelector.lua @@ -204,7 +204,7 @@ function EventPage1() phase = 6 elseif phase == 6 then for i = 1, #chars do - if chars[i]["cross"].alpha != 0 then + if chars[i]["cross"].alpha ~= 0 then chars[i]["cross"].alpha = fadeCount - 2 end chars[i]["sprite"].alpha = fadeCount - 2 @@ -269,13 +269,13 @@ function HandleInput(forcedInput) elseif Input.Left == 1 or forcedInput == "Left" then lastInput = "Left" local temp = (currentChar + 2) % 3 - if currentChar < 4 then ChangeTarget(temp != 0 and temp or 3) + if currentChar < 4 then ChangeTarget(temp ~= 0 and temp or 3) else ChangeTarget((currentChar - 3) % 2 + 1 + 3) end elseif Input.Down == 1 or Input.Up == 1 or forcedInput == "Down" or forcedInput == "Up" then lastInput = Input.Down == 1 or forcedInput == "Down" and "Down" or "Up" local temp = (currentChar + (currentChar > 3 and 2 or 3)) % 5 - ChangeTarget(currentChar != 3 and (temp != 0 and temp or 5) or 5) + ChangeTarget(currentChar ~= 3 and (temp ~= 0 and temp or 5) or 5) end end if Input.Confirm == 1 then diff --git a/Assets/Mods/Examples/Sounds/sm64_impact.ogg b/Assets/Mods/Examples/Sounds/sm64_impact.ogg deleted file mode 100644 index 41a3c63a4..000000000 Binary files a/Assets/Mods/Examples/Sounds/sm64_impact.ogg and /dev/null differ diff --git a/Assets/Mods/Examples/Sounds/sm64_impact.wav b/Assets/Mods/Examples/Sounds/sm64_impact.wav new file mode 100644 index 000000000..fae31120c Binary files /dev/null and b/Assets/Mods/Examples/Sounds/sm64_impact.wav differ diff --git a/Assets/Mods/Examples/Sounds/sm64_impact.wav.meta b/Assets/Mods/Examples/Sounds/sm64_impact.wav.meta new file mode 100644 index 000000000..f22ddddc5 --- /dev/null +++ b/Assets/Mods/Examples/Sounds/sm64_impact.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 815d2ab704bdcadc4b7b0703a0fe1f12 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mods/RTLGeno/Lua/Monsters/Lukark.lua b/Assets/Mods/RTLGeno/Lua/Monsters/Lukark.lua index fe34021c1..37cb3fb51 100644 --- a/Assets/Mods/RTLGeno/Lua/Monsters/Lukark.lua +++ b/Assets/Mods/RTLGeno/Lua/Monsters/Lukark.lua @@ -5,7 +5,7 @@ comments = { "Lukark is vengeful.", "Lukark prepares his next move.", "Lukark fr commands = { "Pardon" } randomdialogue = { "[effect:none][func:SetFace,angry]Come back here!", "[effect:none][func:SetFace,angry]You can't escape me now!", - "[effect:none][func:SetFace,angry]I'll get you no matter what.", + "[effect:none][func:SetFace,angry]I'll get you no matter what!", "[effect:none][func:SetFace,angry]Take this!" } sprite = "Lukark/full" --Always PNG. Extension is added automatically. @@ -25,13 +25,13 @@ anim = "normal" SetActive(false) effect = "none" --- Happens after the slash animation but before +-- Happens after the slash animation but before function HandleAttack(attackstatus) if attackstatus > 0 then SetFace("hurt") end end - + -- This handles the commands; all-caps versions of the commands list you have above. function HandleCustomCommand(command) if command == "PARDON" then @@ -45,7 +45,7 @@ function HandleCustomCommand(command) BattleDialog({ "A tear roll down your cheek as you bow in front of Lukark, pleading him to stop this nonsense." }) currentdialogue = { "[effect:none]......[noskip][w:20][func:SetFace,happy][noskip:off]Please stop. We both know this has gone too far by now.", "[next]" } else - BattleDialog({ "You ask for Lukark's forgiveness once more...", "But he ignores you." }) + BattleDialog({ "You ask for Lukark's forgiveness once more, but he ignores you." }) end pardonCount = pardonCount + 1 end diff --git a/Assets/Mods/RTLGeno/Lua/Monsters/RTL.lua b/Assets/Mods/RTLGeno/Lua/Monsters/RTL.lua index 3f343637a..da5b0c81d 100644 --- a/Assets/Mods/RTLGeno/Lua/Monsters/RTL.lua +++ b/Assets/Mods/RTLGeno/Lua/Monsters/RTL.lua @@ -20,7 +20,7 @@ function BeforeDamageCalculation() Encounter.Call("SetRTLAnimation", "attacked") end --- Happens after the slash animation but before +-- Happens after the slash animation but before function HandleAttack(attackstatus) if attackstatus == -1 then -- player pressed fight but didn't press Z afterwards @@ -31,7 +31,7 @@ function HandleAttack(attackstatus) Encounter.Call("SetRTLAnimation", "hurt") end end - + -- This handles the commands; all-caps versions of the commands list you have above. function HandleCustomCommand(command) if command == "CHECK" then @@ -46,15 +46,16 @@ function HandleCustomCommand(command) end function OnDeath() + SetAlMightyGlobal("RTLGenoIntro", false) hp = 30 def = 1 Audio.Pause() if not GetAlMightyGlobal("RTLGenoIntro") then SetAlMightyGlobal("RTLGenoIntro", true) currentdialogue = { "[noskip][effect:none]Heh... [w:15][func:SetAnimRTL,happy]Hahahaha![w:20][next]", - "[noskip][effect:none][func:SetAnimRTL,angry]You're pathetic. [w:15]Did you REALLY think I would just keel over and die against you?[w:20][next]", - "[noskip][effect:none][func:SetAnimRTL,angryhurt]Well you're [effect:shake][voice:v_floweymad][waitall:2]wrong,[waitall:1][voice:monsterfont][effect:none] [w:20]buckaroo.[w:20][next]", - "[noskip][effect:none]Now, I'll send you right where you belong, [w:10]and I'll do it by force if I have to!", + "[noskip][effect:none][func:SetAnimRTL,angry]You're pathetic. [w:15]Did you REALLY think I would just keel over and die like that?[w:20][next]", + "[noskip][effect:none][func:SetAnimRTL,angryhurt]Well you're [effect:shake][voice:v_floweymad][waitall:2]wrong,[waitall:1] [voice:monsterfont][effect:none][w:20]buckaroo.[w:20][next]", + "[noskip][effect:none]Now, I'll send you right where you belong, [w:10]and I'll do it by force if I have to![w:20][next]", "[noskip][func:PlaySE,Asriel TF][func:StartTransformation][w:80][next]", "[noskip][effect:shake][voice:v_floweymad][func:SetLukarkFace,mad]Your rampage will stop right now![w:20][func:SetLukark][func:State,ACTIONSELECT]" } --"[noskip][effect:none][func:SetAnimRTL,happy][func:PlaySE,mus_dogsong_tf]" .. "What were you expecting, seriously?\n[w:20]Well there's nothing here, I'll just die and that's it.[w:20][func:Unpause][func:Kill][next]"} @@ -72,7 +73,7 @@ function OnDeath() "Oh lawd he comin!", "Hey am I like at least 20% Sans if I can remember stuff? [w:15]Neat...?" } - currentdialogue = { "[effect:none]Gah, what's the point. [w:15]Let's just get it over with already.", + currentdialogue = { "[effect:none]Bah, what's the point. [w:15]Let's just get it over with already.", "[noskip][func:PlaySE,Asriel TF][func:StartTransformation][w:80][next]", "[noskip][effect:shake][voice:v_floweymad][func:SetLukarkFace,mad]" .. (math.random() < 0.04 and sillyShouts[math.random(#sillyShouts)] or shouts[math.random(#shouts)]) .. "[w:20][func:SetLukark][func:State,ACTIONSELECT]" } diff --git a/Assets/Plugins/DiscordSDK.meta b/Assets/Plugins/DiscordSDK.meta new file mode 100644 index 000000000..e1b98d72d --- /dev/null +++ b/Assets/Plugins/DiscordSDK.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 19da960c797ae6a4582d7412bd4e5b78 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/DiscordSDK/ActivityManager.cs b/Assets/Plugins/DiscordSDK/ActivityManager.cs new file mode 100644 index 000000000..048e3b4b4 --- /dev/null +++ b/Assets/Plugins/DiscordSDK/ActivityManager.cs @@ -0,0 +1,12 @@ +using System; + +namespace Discord +{ + public partial class ActivityManager + { + public void RegisterCommand() + { + RegisterCommand(null); + } + } +} diff --git a/Assets/Scripts/Discord/ActivityManager.cs.meta b/Assets/Plugins/DiscordSDK/ActivityManager.cs.meta similarity index 83% rename from Assets/Scripts/Discord/ActivityManager.cs.meta rename to Assets/Plugins/DiscordSDK/ActivityManager.cs.meta index 451e63271..a36589af3 100644 --- a/Assets/Scripts/Discord/ActivityManager.cs.meta +++ b/Assets/Plugins/DiscordSDK/ActivityManager.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b3c3cbc997b608b409b1ca3376037043 +guid: c206e52dea586f14f97228eb4e734a79 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Discord/Constants.cs b/Assets/Plugins/DiscordSDK/Constants.cs similarity index 61% rename from Assets/Scripts/Discord/Constants.cs rename to Assets/Plugins/DiscordSDK/Constants.cs index 967b2e8fe..8e77e1ba1 100644 --- a/Assets/Scripts/Discord/Constants.cs +++ b/Assets/Plugins/DiscordSDK/Constants.cs @@ -1,7 +1,9 @@ using System; -namespace Discord { - static class Constants { +namespace Discord +{ + static class Constants + { public const string DllName = "discord_game_sdk"; } } diff --git a/Assets/Scripts/Discord/Constants.cs.meta b/Assets/Plugins/DiscordSDK/Constants.cs.meta similarity index 83% rename from Assets/Scripts/Discord/Constants.cs.meta rename to Assets/Plugins/DiscordSDK/Constants.cs.meta index ced752b39..aa8850b7d 100644 --- a/Assets/Scripts/Discord/Constants.cs.meta +++ b/Assets/Plugins/DiscordSDK/Constants.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c05bbacfd7b3a9a46bedce14427547c9 +guid: d2ef8d8c5a46b21429abee41edc5905d MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Discord/Core.cs b/Assets/Plugins/DiscordSDK/Core.cs similarity index 71% rename from Assets/Scripts/Discord/Core.cs rename to Assets/Plugins/DiscordSDK/Core.cs index f8f91db58..aa496196b 100644 --- a/Assets/Scripts/Discord/Core.cs +++ b/Assets/Plugins/DiscordSDK/Core.cs @@ -2,8 +2,10 @@ using System.Runtime.InteropServices; using System.Text; -namespace Discord { - public enum Result { +namespace Discord +{ + public enum Result + { Ok = 0, ServiceUnavailable = 1, InvalidVersion = 2, @@ -48,21 +50,25 @@ public enum Result { InvalidGiftCode = 41, PurchaseError = 42, TransactionAborted = 43, + DrawingInitFailed = 44, } - public enum CreateFlags { + public enum CreateFlags + { Default = 0, NoRequireDiscord = 1, } - public enum LogLevel { + public enum LogLevel + { Error = 1, Warn, Info, Debug, } - public enum UserFlag { + public enum UserFlag + { Partner = 2, HypeSquadEvents = 4, HypeSquadHouse1 = 64, @@ -70,42 +76,62 @@ public enum UserFlag { HypeSquadHouse3 = 256, } - public enum PremiumType { + public enum PremiumType + { None = 0, Tier1 = 1, Tier2 = 2, } - public enum ImageType { + public enum ImageType + { User, } - public enum ActivityType { + public enum ActivityPartyPrivacy + { + Private = 0, + Public = 1, + } + + public enum ActivityType + { Playing, Streaming, Listening, Watching, } - public enum ActivityActionType { + public enum ActivityActionType + { Join = 1, Spectate, } - public enum ActivityJoinRequestReply { + public enum ActivitySupportedPlatformFlags + { + Desktop = 1, + Android = 2, + iOS = 4, + } + + public enum ActivityJoinRequestReply + { No, Yes, Ignore, } - public enum Status { + public enum Status + { Offline = 0, Online = 1, Idle = 2, DoNotDisturb = 3, } - public enum RelationshipType { + public enum RelationshipType + { None, Friend, Blocked, @@ -114,12 +140,14 @@ public enum RelationshipType { Implicit, } - public enum LobbyType { + public enum LobbyType + { Private = 1, Public, } - public enum LobbySearchComparison { + public enum LobbySearchComparison + { LessThanOrEqual = -2, LessThan, Equal, @@ -128,19 +156,36 @@ public enum LobbySearchComparison { NotEqual, } - public enum LobbySearchCast { + public enum LobbySearchCast + { String = 1, Number, } - public enum LobbySearchDistance { + public enum LobbySearchDistance + { Local, Default, Extended, Global, } - public enum EntitlementType { + public enum KeyVariant + { + Normal, + Right, + Left, + } + + public enum MouseButton + { + Left, + Middle, + Right, + } + + public enum EntitlementType + { Purchase = 1, PremiumSubscription, DeveloperGift, @@ -150,20 +195,23 @@ public enum EntitlementType { PremiumPurchase, } - public enum SkuType { + public enum SkuType + { Application = 1, DLC, Consumable, Bundle, } - public enum InputModeType { + public enum InputModeType + { VoiceActivity = 0, PushToTalk, } [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct User { + public partial struct User + { public Int64 Id; [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)] @@ -179,7 +227,8 @@ public partial struct User { } [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct OAuth2Token { + public partial struct OAuth2Token + { [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)] public string AccessToken; @@ -190,7 +239,8 @@ public partial struct OAuth2Token { } [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct ImageHandle { + public partial struct ImageHandle + { public ImageType Type; public Int64 Id; @@ -199,21 +249,24 @@ public partial struct ImageHandle { } [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct ImageDimensions { + public partial struct ImageDimensions + { public UInt32 Width; public UInt32 Height; } [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct ActivityTimestamps { + public partial struct ActivityTimestamps + { public Int64 Start; public Int64 End; } [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct ActivityAssets { + public partial struct ActivityAssets + { [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)] public string LargeImage; @@ -228,22 +281,27 @@ public partial struct ActivityAssets { } [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct PartySize { + public partial struct PartySize + { public Int32 CurrentSize; public Int32 MaxSize; } [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct ActivityParty { + public partial struct ActivityParty + { [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)] public string Id; public PartySize Size; + + public ActivityPartyPrivacy Privacy; } [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct ActivitySecrets { + public partial struct ActivitySecrets + { [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)] public string Match; @@ -255,7 +313,8 @@ public partial struct ActivitySecrets { } [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct Activity { + public partial struct Activity + { public ActivityType Type; public Int64 ApplicationId; @@ -278,17 +337,21 @@ public partial struct Activity { public ActivitySecrets Secrets; public bool Instance; + + public UInt32 SupportedPlatforms; } [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct Presence { + public partial struct Presence + { public Status Status; public Activity Activity; } [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct Relationship { + public partial struct Relationship + { public RelationshipType Type; public User User; @@ -297,7 +360,8 @@ public partial struct Relationship { } [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct Lobby { + public partial struct Lobby + { public Int64 Id; public LobbyType Type; @@ -313,7 +377,34 @@ public partial struct Lobby { } [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct FileStat { + public partial struct ImeUnderline + { + public Int32 From; + + public Int32 To; + + public UInt32 Color; + + public UInt32 BackgroundColor; + + public bool Thick; + } + + [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] + public partial struct Rect + { + public Int32 Left; + + public Int32 Top; + + public Int32 Right; + + public Int32 Bottom; + } + + [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] + public partial struct FileStat + { [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 260)] public string Filename; @@ -323,7 +414,8 @@ public partial struct FileStat { } [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct Entitlement { + public partial struct Entitlement + { public Int64 Id; public EntitlementType Type; @@ -332,7 +424,8 @@ public partial struct Entitlement { } [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct SkuPrice { + public partial struct SkuPrice + { public UInt32 Amount; [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 16)] @@ -340,7 +433,8 @@ public partial struct SkuPrice { } [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct Sku { + public partial struct Sku + { public Int64 Id; public SkuType Type; @@ -352,7 +446,8 @@ public partial struct Sku { } [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct InputMode { + public partial struct InputMode + { public InputModeType Type; [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)] @@ -360,7 +455,8 @@ public partial struct InputMode { } [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct UserAchievement { + public partial struct UserAchievement + { public Int64 UserId; public Int64 AchievementId; @@ -372,25 +468,27 @@ public partial struct UserAchievement { } [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct LobbyTransaction { + public partial struct LobbyTransaction + { [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods { - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + internal partial struct FFIMethods + { + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result SetTypeMethod(IntPtr methodsPtr, LobbyType type); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result SetOwnerMethod(IntPtr methodsPtr, Int64 ownerId); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result SetCapacityMethod(IntPtr methodsPtr, UInt32 capacity); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result SetMetadataMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string key, [MarshalAs(UnmanagedType.LPStr)]string value); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result DeleteMetadataMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string key); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result SetLockedMethod(IntPtr methodsPtr, bool locked); internal SetTypeMethod SetType; @@ -410,9 +508,12 @@ internal partial struct FFIMethods { internal Object MethodsStructure; - private FFIMethods Methods { - get { - if (MethodsStructure == null) { + private FFIMethods Methods + { + get + { + if (MethodsStructure == null) + { MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); } return (FFIMethods)MethodsStructure; @@ -420,55 +521,73 @@ private FFIMethods Methods { } - public void SetType(LobbyType type) { - if (MethodsPtr != IntPtr.Zero) { + public void SetType(LobbyType type) + { + if (MethodsPtr != IntPtr.Zero) + { var res = Methods.SetType(MethodsPtr, type); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } } - public void SetOwner(Int64 ownerId) { - if (MethodsPtr != IntPtr.Zero) { + public void SetOwner(Int64 ownerId) + { + if (MethodsPtr != IntPtr.Zero) + { var res = Methods.SetOwner(MethodsPtr, ownerId); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } } - public void SetCapacity(UInt32 capacity) { - if (MethodsPtr != IntPtr.Zero) { + public void SetCapacity(UInt32 capacity) + { + if (MethodsPtr != IntPtr.Zero) + { var res = Methods.SetCapacity(MethodsPtr, capacity); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } } - public void SetMetadata(string key, string value) { - if (MethodsPtr != IntPtr.Zero) { + public void SetMetadata(string key, string value) + { + if (MethodsPtr != IntPtr.Zero) + { var res = Methods.SetMetadata(MethodsPtr, key, value); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } } - public void DeleteMetadata(string key) { - if (MethodsPtr != IntPtr.Zero) { + public void DeleteMetadata(string key) + { + if (MethodsPtr != IntPtr.Zero) + { var res = Methods.DeleteMetadata(MethodsPtr, key); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } } - public void SetLocked(bool locked) { - if (MethodsPtr != IntPtr.Zero) { + public void SetLocked(bool locked) + { + if (MethodsPtr != IntPtr.Zero) + { var res = Methods.SetLocked(MethodsPtr, locked); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } @@ -476,13 +595,15 @@ public void SetLocked(bool locked) { } [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct LobbyMemberTransaction { + public partial struct LobbyMemberTransaction + { [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods { - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + internal partial struct FFIMethods + { + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result SetMetadataMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string key, [MarshalAs(UnmanagedType.LPStr)]string value); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result DeleteMetadataMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string key); internal SetMetadataMethod SetMetadata; @@ -494,9 +615,12 @@ internal partial struct FFIMethods { internal Object MethodsStructure; - private FFIMethods Methods { - get { - if (MethodsStructure == null) { + private FFIMethods Methods + { + get + { + if (MethodsStructure == null) + { MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); } return (FFIMethods)MethodsStructure; @@ -504,19 +628,25 @@ private FFIMethods Methods { } - public void SetMetadata(string key, string value) { - if (MethodsPtr != IntPtr.Zero) { + public void SetMetadata(string key, string value) + { + if (MethodsPtr != IntPtr.Zero) + { var res = Methods.SetMetadata(MethodsPtr, key, value); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } } - public void DeleteMetadata(string key) { - if (MethodsPtr != IntPtr.Zero) { + public void DeleteMetadata(string key) + { + if (MethodsPtr != IntPtr.Zero) + { var res = Methods.DeleteMetadata(MethodsPtr, key); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } @@ -524,19 +654,21 @@ public void DeleteMetadata(string key) { } [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct LobbySearchQuery { + public partial struct LobbySearchQuery + { [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods { - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + internal partial struct FFIMethods + { + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result FilterMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string key, LobbySearchComparison comparison, LobbySearchCast cast, [MarshalAs(UnmanagedType.LPStr)]string value); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result SortMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string key, LobbySearchCast cast, [MarshalAs(UnmanagedType.LPStr)]string value); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result LimitMethod(IntPtr methodsPtr, UInt32 limit); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result DistanceMethod(IntPtr methodsPtr, LobbySearchDistance distance); internal FilterMethod Filter; @@ -552,9 +684,12 @@ internal partial struct FFIMethods { internal Object MethodsStructure; - private FFIMethods Methods { - get { - if (MethodsStructure == null) { + private FFIMethods Methods + { + get + { + if (MethodsStructure == null) + { MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); } return (FFIMethods)MethodsStructure; @@ -562,101 +697,121 @@ private FFIMethods Methods { } - public void Filter(string key, LobbySearchComparison comparison, LobbySearchCast cast, string value) { - if (MethodsPtr != IntPtr.Zero) { + public void Filter(string key, LobbySearchComparison comparison, LobbySearchCast cast, string value) + { + if (MethodsPtr != IntPtr.Zero) + { var res = Methods.Filter(MethodsPtr, key, comparison, cast, value); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } } - public void Sort(string key, LobbySearchCast cast, string value) { - if (MethodsPtr != IntPtr.Zero) { + public void Sort(string key, LobbySearchCast cast, string value) + { + if (MethodsPtr != IntPtr.Zero) + { var res = Methods.Sort(MethodsPtr, key, cast, value); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } } - public void Limit(UInt32 limit) { - if (MethodsPtr != IntPtr.Zero) { + public void Limit(UInt32 limit) + { + if (MethodsPtr != IntPtr.Zero) + { var res = Methods.Limit(MethodsPtr, limit); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } } - public void Distance(LobbySearchDistance distance) { - if (MethodsPtr != IntPtr.Zero) { + public void Distance(LobbySearchDistance distance) + { + if (MethodsPtr != IntPtr.Zero) + { var res = Methods.Distance(MethodsPtr, distance); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } } } - public partial class ResultException: Exception { + public partial class ResultException : Exception + { public readonly Result Result; - public ResultException(Result result): base(result.ToString()) {} + public ResultException(Result result) : base(result.ToString()) + { + } } - public partial class Discord: IDisposable { + public partial class Discord : IDisposable + { [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIEvents {} + internal partial struct FFIEvents + { + + } [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods { - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + internal partial struct FFIMethods + { + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void DestroyHandler(IntPtr MethodsPtr); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result RunCallbacksMethod(IntPtr methodsPtr); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void SetLogHookCallback(IntPtr ptr, LogLevel level, [MarshalAs(UnmanagedType.LPStr)]string message); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void SetLogHookMethod(IntPtr methodsPtr, LogLevel minLevel, IntPtr callbackData, SetLogHookCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate IntPtr GetApplicationManagerMethod(IntPtr discordPtr); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate IntPtr GetUserManagerMethod(IntPtr discordPtr); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate IntPtr GetImageManagerMethod(IntPtr discordPtr); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate IntPtr GetActivityManagerMethod(IntPtr discordPtr); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate IntPtr GetRelationshipManagerMethod(IntPtr discordPtr); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate IntPtr GetLobbyManagerMethod(IntPtr discordPtr); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate IntPtr GetNetworkManagerMethod(IntPtr discordPtr); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate IntPtr GetOverlayManagerMethod(IntPtr discordPtr); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate IntPtr GetStorageManagerMethod(IntPtr discordPtr); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate IntPtr GetStoreManagerMethod(IntPtr discordPtr); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate IntPtr GetVoiceManagerMethod(IntPtr discordPtr); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate IntPtr GetAchievementManagerMethod(IntPtr discordPtr); internal DestroyHandler Destroy; @@ -691,7 +846,8 @@ internal partial struct FFIMethods { } [StructLayout(LayoutKind.Sequential)] - internal partial struct FFICreateParams { + internal partial struct FFICreateParams + { internal Int64 ClientId; internal UInt64 Flags; @@ -749,7 +905,7 @@ internal partial struct FFICreateParams { internal UInt32 AchievementVersion; } - [DllImport(Constants.DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)] + [DllImport(Constants.DllName, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] private static extern Result DiscordCreate(UInt32 version, ref FFICreateParams createParams, out IntPtr manager); public delegate void SetLogHookHandler(LogLevel level, string message); @@ -836,9 +992,12 @@ internal partial struct FFICreateParams { private Object MethodsStructure; - private FFIMethods Methods { - get { - if (MethodsStructure == null) { + private FFIMethods Methods + { + get + { + if (MethodsStructure == null) + { MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); } return (FFIMethods)MethodsStructure; @@ -846,9 +1005,10 @@ private FFIMethods Methods { } - private GCHandle ? setLogHook; + private GCHandle? setLogHook; - public Discord(Int64 clientId, UInt64 flags) { + public Discord(Int64 clientId, UInt64 flags) + { FFICreateParams createParams; createParams.ClientId = clientId; createParams.Flags = flags; @@ -888,7 +1048,7 @@ public Discord(Int64 clientId, UInt64 flags) { OverlayEvents = new OverlayManager.FFIEvents(); OverlayEventsPtr = Marshal.AllocHGlobal(Marshal.SizeOf(OverlayEvents)); createParams.OverlayEvents = OverlayEventsPtr; - createParams.OverlayVersion = 1; + createParams.OverlayVersion = 2; StorageEvents = new StorageManager.FFIEvents(); StorageEventsPtr = Marshal.AllocHGlobal(Marshal.SizeOf(StorageEvents)); createParams.StorageEvents = StorageEventsPtr; @@ -906,19 +1066,23 @@ public Discord(Int64 clientId, UInt64 flags) { createParams.AchievementEvents = AchievementEventsPtr; createParams.AchievementVersion = 1; InitEvents(EventsPtr, ref Events); - var result = DiscordCreate(2, ref createParams, out MethodsPtr); - if (result != Result.Ok) { + var result = DiscordCreate(3, ref createParams, out MethodsPtr); + if (result != Result.Ok) + { Dispose(); throw new ResultException(result); } } - private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) { + private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) + { Marshal.StructureToPtr(events, eventsPtr, false); } - public void Dispose() { - if (MethodsPtr != IntPtr.Zero) { + public void Dispose() + { + if (MethodsPtr != IntPtr.Zero) + { Methods.Destroy(MethodsPtr); } SelfHandle.Free(); @@ -936,183 +1100,219 @@ public void Dispose() { Marshal.FreeHGlobal(VoiceEventsPtr); Marshal.FreeHGlobal(AchievementEventsPtr); if (setLogHook.HasValue) { - setLogHook.Value.Free(); + setLogHook.Value.Free(); } } - public void RunCallbacks() { + public void RunCallbacks() + { var res = Methods.RunCallbacks(MethodsPtr); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } [MonoPInvokeCallback] - private static void SetLogHookCallbackImpl(IntPtr ptr, LogLevel level, string message) { + private static void SetLogHookCallbackImpl(IntPtr ptr, LogLevel level, string message) + { GCHandle h = GCHandle.FromIntPtr(ptr); SetLogHookHandler callback = (SetLogHookHandler)h.Target; callback(level, message); } - public void SetLogHook(LogLevel minLevel, SetLogHookHandler callback) { + public void SetLogHook(LogLevel minLevel, SetLogHookHandler callback) + { if (setLogHook.HasValue) { - setLogHook.Value.Free(); + setLogHook.Value.Free(); } - setLogHook = GCHandle.Alloc(callback); + setLogHook = GCHandle.Alloc(callback); Methods.SetLogHook(MethodsPtr, minLevel, GCHandle.ToIntPtr(setLogHook.Value), SetLogHookCallbackImpl); } - public ApplicationManager GetApplicationManager() { + public ApplicationManager GetApplicationManager() + { if (ApplicationManagerInstance == null) { ApplicationManagerInstance = new ApplicationManager( - Methods.GetApplicationManager(MethodsPtr), - ApplicationEventsPtr, - ref ApplicationEvents); + Methods.GetApplicationManager(MethodsPtr), + ApplicationEventsPtr, + ref ApplicationEvents + ); } return ApplicationManagerInstance; } - public UserManager GetUserManager() { + public UserManager GetUserManager() + { if (UserManagerInstance == null) { UserManagerInstance = new UserManager( - Methods.GetUserManager(MethodsPtr), - UserEventsPtr, - ref UserEvents); + Methods.GetUserManager(MethodsPtr), + UserEventsPtr, + ref UserEvents + ); } return UserManagerInstance; } - public ImageManager GetImageManager() { + public ImageManager GetImageManager() + { if (ImageManagerInstance == null) { ImageManagerInstance = new ImageManager( - Methods.GetImageManager(MethodsPtr), - ImageEventsPtr, - ref ImageEvents); + Methods.GetImageManager(MethodsPtr), + ImageEventsPtr, + ref ImageEvents + ); } return ImageManagerInstance; } - public ActivityManager GetActivityManager() { + public ActivityManager GetActivityManager() + { if (ActivityManagerInstance == null) { ActivityManagerInstance = new ActivityManager( - Methods.GetActivityManager(MethodsPtr), - ActivityEventsPtr, - ref ActivityEvents); + Methods.GetActivityManager(MethodsPtr), + ActivityEventsPtr, + ref ActivityEvents + ); } return ActivityManagerInstance; } - public RelationshipManager GetRelationshipManager() { + public RelationshipManager GetRelationshipManager() + { if (RelationshipManagerInstance == null) { RelationshipManagerInstance = new RelationshipManager( - Methods.GetRelationshipManager(MethodsPtr), - RelationshipEventsPtr, - ref RelationshipEvents); + Methods.GetRelationshipManager(MethodsPtr), + RelationshipEventsPtr, + ref RelationshipEvents + ); } return RelationshipManagerInstance; } - public LobbyManager GetLobbyManager() { + public LobbyManager GetLobbyManager() + { if (LobbyManagerInstance == null) { LobbyManagerInstance = new LobbyManager( - Methods.GetLobbyManager(MethodsPtr), - LobbyEventsPtr, - ref LobbyEvents); + Methods.GetLobbyManager(MethodsPtr), + LobbyEventsPtr, + ref LobbyEvents + ); } return LobbyManagerInstance; } - public NetworkManager GetNetworkManager() { + public NetworkManager GetNetworkManager() + { if (NetworkManagerInstance == null) { NetworkManagerInstance = new NetworkManager( - Methods.GetNetworkManager(MethodsPtr), - NetworkEventsPtr, - ref NetworkEvents); + Methods.GetNetworkManager(MethodsPtr), + NetworkEventsPtr, + ref NetworkEvents + ); } return NetworkManagerInstance; } - public OverlayManager GetOverlayManager() { + public OverlayManager GetOverlayManager() + { if (OverlayManagerInstance == null) { OverlayManagerInstance = new OverlayManager( - Methods.GetOverlayManager(MethodsPtr), - OverlayEventsPtr, - ref OverlayEvents); + Methods.GetOverlayManager(MethodsPtr), + OverlayEventsPtr, + ref OverlayEvents + ); } return OverlayManagerInstance; } - public StorageManager GetStorageManager() { + public StorageManager GetStorageManager() + { if (StorageManagerInstance == null) { StorageManagerInstance = new StorageManager( - Methods.GetStorageManager(MethodsPtr), - StorageEventsPtr, - ref StorageEvents); + Methods.GetStorageManager(MethodsPtr), + StorageEventsPtr, + ref StorageEvents + ); } return StorageManagerInstance; } - public StoreManager GetStoreManager() { + public StoreManager GetStoreManager() + { if (StoreManagerInstance == null) { StoreManagerInstance = new StoreManager( - Methods.GetStoreManager(MethodsPtr), - StoreEventsPtr, - ref StoreEvents); + Methods.GetStoreManager(MethodsPtr), + StoreEventsPtr, + ref StoreEvents + ); } return StoreManagerInstance; } - public VoiceManager GetVoiceManager() { + public VoiceManager GetVoiceManager() + { if (VoiceManagerInstance == null) { VoiceManagerInstance = new VoiceManager( - Methods.GetVoiceManager(MethodsPtr), - VoiceEventsPtr, - ref VoiceEvents); + Methods.GetVoiceManager(MethodsPtr), + VoiceEventsPtr, + ref VoiceEvents + ); } return VoiceManagerInstance; } - public AchievementManager GetAchievementManager() { + public AchievementManager GetAchievementManager() + { if (AchievementManagerInstance == null) { AchievementManagerInstance = new AchievementManager( - Methods.GetAchievementManager(MethodsPtr), - AchievementEventsPtr, - ref AchievementEvents); + Methods.GetAchievementManager(MethodsPtr), + AchievementEventsPtr, + ref AchievementEvents + ); } return AchievementManagerInstance; } } - internal partial class MonoPInvokeCallbackAttribute : Attribute {} + internal partial class MonoPInvokeCallbackAttribute : Attribute + { - public partial class ApplicationManager { + } + + public partial class ApplicationManager + { [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIEvents {} + internal partial struct FFIEvents + { + + } [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods { - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + internal partial struct FFIMethods + { + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void ValidateOrExitCallback(IntPtr ptr, Result result); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void ValidateOrExitMethod(IntPtr methodsPtr, IntPtr callbackData, ValidateOrExitCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void GetCurrentLocaleMethod(IntPtr methodsPtr, StringBuilder locale); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void GetCurrentBranchMethod(IntPtr methodsPtr, StringBuilder branch); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void GetOAuth2TokenCallback(IntPtr ptr, Result result, ref OAuth2Token oauth2Token); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void GetOAuth2TokenMethod(IntPtr methodsPtr, IntPtr callbackData, GetOAuth2TokenCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void GetTicketCallback(IntPtr ptr, Result result, [MarshalAs(UnmanagedType.LPStr)]ref string data); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void GetTicketMethod(IntPtr methodsPtr, IntPtr callbackData, GetTicketCallback callback); internal ValidateOrExitMethod ValidateOrExit; @@ -1136,9 +1336,12 @@ internal partial struct FFIMethods { private Object MethodsStructure; - private FFIMethods Methods { - get { - if (MethodsStructure == null) { + private FFIMethods Methods + { + get + { + if (MethodsStructure == null) + { MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); } return (FFIMethods)MethodsStructure; @@ -1146,7 +1349,8 @@ private FFIMethods Methods { } - internal ApplicationManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) { + internal ApplicationManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) + { if (eventsPtr == IntPtr.Zero) { throw new ResultException(Result.InternalError); } @@ -1157,86 +1361,98 @@ internal ApplicationManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) } } - private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) { + private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) + { Marshal.StructureToPtr(events, eventsPtr, false); } [MonoPInvokeCallback] - private static void ValidateOrExitCallbackImpl(IntPtr ptr, Result result) { + private static void ValidateOrExitCallbackImpl(IntPtr ptr, Result result) + { GCHandle h = GCHandle.FromIntPtr(ptr); ValidateOrExitHandler callback = (ValidateOrExitHandler)h.Target; h.Free(); callback(result); } - public void ValidateOrExit(ValidateOrExitHandler callback) { + public void ValidateOrExit(ValidateOrExitHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.ValidateOrExit(MethodsPtr, GCHandle.ToIntPtr(wrapped), ValidateOrExitCallbackImpl); } - public string GetCurrentLocale() { + public string GetCurrentLocale() + { var ret = new StringBuilder(128); Methods.GetCurrentLocale(MethodsPtr, ret); return ret.ToString(); } - public string GetCurrentBranch() { + public string GetCurrentBranch() + { var ret = new StringBuilder(4096); Methods.GetCurrentBranch(MethodsPtr, ret); return ret.ToString(); } [MonoPInvokeCallback] - private static void GetOAuth2TokenCallbackImpl(IntPtr ptr, Result result, ref OAuth2Token oauth2Token) { + private static void GetOAuth2TokenCallbackImpl(IntPtr ptr, Result result, ref OAuth2Token oauth2Token) + { GCHandle h = GCHandle.FromIntPtr(ptr); GetOAuth2TokenHandler callback = (GetOAuth2TokenHandler)h.Target; h.Free(); callback(result, ref oauth2Token); } - public void GetOAuth2Token(GetOAuth2TokenHandler callback) { + public void GetOAuth2Token(GetOAuth2TokenHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.GetOAuth2Token(MethodsPtr, GCHandle.ToIntPtr(wrapped), GetOAuth2TokenCallbackImpl); } [MonoPInvokeCallback] - private static void GetTicketCallbackImpl(IntPtr ptr, Result result, ref string data) { + private static void GetTicketCallbackImpl(IntPtr ptr, Result result, ref string data) + { GCHandle h = GCHandle.FromIntPtr(ptr); GetTicketHandler callback = (GetTicketHandler)h.Target; h.Free(); callback(result, ref data); } - public void GetTicket(GetTicketHandler callback) { + public void GetTicket(GetTicketHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.GetTicket(MethodsPtr, GCHandle.ToIntPtr(wrapped), GetTicketCallbackImpl); } } - public partial class UserManager { + public partial class UserManager + { [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIEvents { - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + internal partial struct FFIEvents + { + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void CurrentUserUpdateHandler(IntPtr ptr); internal CurrentUserUpdateHandler OnCurrentUserUpdate; } [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods { - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + internal partial struct FFIMethods + { + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result GetCurrentUserMethod(IntPtr methodsPtr, ref User currentUser); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void GetUserCallback(IntPtr ptr, Result result, ref User user); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void GetUserMethod(IntPtr methodsPtr, Int64 userId, IntPtr callbackData, GetUserCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result GetCurrentUserPremiumTypeMethod(IntPtr methodsPtr, ref PremiumType premiumType); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result CurrentUserHasFlagMethod(IntPtr methodsPtr, UserFlag flag, ref bool hasFlag); internal GetCurrentUserMethod GetCurrentUser; @@ -1256,9 +1472,12 @@ internal partial struct FFIMethods { private Object MethodsStructure; - private FFIMethods Methods { - get { - if (MethodsStructure == null) { + private FFIMethods Methods + { + get + { + if (MethodsStructure == null) + { MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); } return (FFIMethods)MethodsStructure; @@ -1268,7 +1487,8 @@ private FFIMethods Methods { public event CurrentUserUpdateHandler OnCurrentUserUpdate; - internal UserManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) { + internal UserManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) + { if (eventsPtr == IntPtr.Zero) { throw new ResultException(Result.InternalError); } @@ -1279,78 +1499,94 @@ internal UserManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) { } } - private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) { + private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) + { events.OnCurrentUserUpdate = OnCurrentUserUpdateImpl; Marshal.StructureToPtr(events, eventsPtr, false); } - public User GetCurrentUser() { + public User GetCurrentUser() + { var ret = new User(); var res = Methods.GetCurrentUser(MethodsPtr, ref ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } [MonoPInvokeCallback] - private static void GetUserCallbackImpl(IntPtr ptr, Result result, ref User user) { + private static void GetUserCallbackImpl(IntPtr ptr, Result result, ref User user) + { GCHandle h = GCHandle.FromIntPtr(ptr); GetUserHandler callback = (GetUserHandler)h.Target; h.Free(); callback(result, ref user); } - public void GetUser(Int64 userId, GetUserHandler callback) { + public void GetUser(Int64 userId, GetUserHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.GetUser(MethodsPtr, userId, GCHandle.ToIntPtr(wrapped), GetUserCallbackImpl); } - public PremiumType GetCurrentUserPremiumType() { + public PremiumType GetCurrentUserPremiumType() + { var ret = new PremiumType(); var res = Methods.GetCurrentUserPremiumType(MethodsPtr, ref ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } - public bool CurrentUserHasFlag(UserFlag flag) { + public bool CurrentUserHasFlag(UserFlag flag) + { var ret = new bool(); var res = Methods.CurrentUserHasFlag(MethodsPtr, flag, ref ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } [MonoPInvokeCallback] - private static void OnCurrentUserUpdateImpl(IntPtr ptr) { + private static void OnCurrentUserUpdateImpl(IntPtr ptr) + { GCHandle h = GCHandle.FromIntPtr(ptr); Discord d = (Discord)h.Target; - if (d.UserManagerInstance.OnCurrentUserUpdate != null) { + if (d.UserManagerInstance.OnCurrentUserUpdate != null) + { d.UserManagerInstance.OnCurrentUserUpdate.Invoke(); } } } - public partial class ImageManager { + public partial class ImageManager + { [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIEvents {} + internal partial struct FFIEvents + { + + } [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods { - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + internal partial struct FFIMethods + { + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void FetchCallback(IntPtr ptr, Result result, ImageHandle handleResult); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void FetchMethod(IntPtr methodsPtr, ImageHandle handle, bool refresh, IntPtr callbackData, FetchCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result GetDimensionsMethod(IntPtr methodsPtr, ImageHandle handle, ref ImageDimensions dimensions); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - internal delegate Result GetDataMethod(IntPtr methodsPtr, ImageHandle handle, byte[]data, Int32 dataLen); + [UnmanagedFunctionPointer(CallingConvention.Winapi)] + internal delegate Result GetDataMethod(IntPtr methodsPtr, ImageHandle handle, byte[] data, Int32 dataLen); internal FetchMethod Fetch; @@ -1365,9 +1601,12 @@ internal partial struct FFIMethods { private Object MethodsStructure; - private FFIMethods Methods { - get { - if (MethodsStructure == null) { + private FFIMethods Methods + { + get + { + if (MethodsStructure == null) + { MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); } return (FFIMethods)MethodsStructure; @@ -1375,7 +1614,8 @@ private FFIMethods Methods { } - internal ImageManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) { + internal ImageManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) + { if (eventsPtr == IntPtr.Zero) { throw new ResultException(Result.InternalError); } @@ -1386,53 +1626,62 @@ internal ImageManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) { } } - private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) { + private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) + { Marshal.StructureToPtr(events, eventsPtr, false); } [MonoPInvokeCallback] - private static void FetchCallbackImpl(IntPtr ptr, Result result, ImageHandle handleResult) { + private static void FetchCallbackImpl(IntPtr ptr, Result result, ImageHandle handleResult) + { GCHandle h = GCHandle.FromIntPtr(ptr); FetchHandler callback = (FetchHandler)h.Target; h.Free(); callback(result, handleResult); } - public void Fetch(ImageHandle handle, bool refresh, FetchHandler callback) { + public void Fetch(ImageHandle handle, bool refresh, FetchHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.Fetch(MethodsPtr, handle, refresh, GCHandle.ToIntPtr(wrapped), FetchCallbackImpl); } - public ImageDimensions GetDimensions(ImageHandle handle) { + public ImageDimensions GetDimensions(ImageHandle handle) + { var ret = new ImageDimensions(); var res = Methods.GetDimensions(MethodsPtr, handle, ref ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } - public void GetData(ImageHandle handle, byte[]data) { + public void GetData(ImageHandle handle, byte[] data) + { var res = Methods.GetData(MethodsPtr, handle, data, data.Length); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } } - public partial class ActivityManager { + public partial class ActivityManager + { [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIEvents { - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + internal partial struct FFIEvents + { + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void ActivityJoinHandler(IntPtr ptr, [MarshalAs(UnmanagedType.LPStr)]string secret); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void ActivitySpectateHandler(IntPtr ptr, [MarshalAs(UnmanagedType.LPStr)]string secret); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void ActivityJoinRequestHandler(IntPtr ptr, ref User user); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void ActivityInviteHandler(IntPtr ptr, ActivityActionType type, ref User user, ref Activity activity); internal ActivityJoinHandler OnActivityJoin; @@ -1445,41 +1694,42 @@ internal partial struct FFIEvents { } [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods { - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + internal partial struct FFIMethods + { + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result RegisterCommandMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string command); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result RegisterSteamMethod(IntPtr methodsPtr, UInt32 steamId); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void UpdateActivityCallback(IntPtr ptr, Result result); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void UpdateActivityMethod(IntPtr methodsPtr, ref Activity activity, IntPtr callbackData, UpdateActivityCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void ClearActivityCallback(IntPtr ptr, Result result); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void ClearActivityMethod(IntPtr methodsPtr, IntPtr callbackData, ClearActivityCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void SendRequestReplyCallback(IntPtr ptr, Result result); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void SendRequestReplyMethod(IntPtr methodsPtr, Int64 userId, ActivityJoinRequestReply reply, IntPtr callbackData, SendRequestReplyCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void SendInviteCallback(IntPtr ptr, Result result); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void SendInviteMethod(IntPtr methodsPtr, Int64 userId, ActivityActionType type, [MarshalAs(UnmanagedType.LPStr)]string content, IntPtr callbackData, SendInviteCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void AcceptInviteCallback(IntPtr ptr, Result result); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void AcceptInviteMethod(IntPtr methodsPtr, Int64 userId, IntPtr callbackData, AcceptInviteCallback callback); internal RegisterCommandMethod RegisterCommand; @@ -1519,9 +1769,12 @@ internal partial struct FFIMethods { private Object MethodsStructure; - private FFIMethods Methods { - get { - if (MethodsStructure == null) { + private FFIMethods Methods + { + get + { + if (MethodsStructure == null) + { MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); } return (FFIMethods)MethodsStructure; @@ -1537,7 +1790,8 @@ private FFIMethods Methods { public event ActivityInviteHandler OnActivityInvite; - internal ActivityManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) { + internal ActivityManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) + { if (eventsPtr == IntPtr.Zero) { throw new ResultException(Result.InternalError); } @@ -1548,7 +1802,8 @@ internal ActivityManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) { } } - private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) { + private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) + { events.OnActivityJoin = OnActivityJoinImpl; events.OnActivitySpectate = OnActivitySpectateImpl; events.OnActivityJoinRequest = OnActivityJoinRequestImpl; @@ -1556,129 +1811,153 @@ private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) { Marshal.StructureToPtr(events, eventsPtr, false); } - public void RegisterCommand(string command) { + public void RegisterCommand(string command) + { var res = Methods.RegisterCommand(MethodsPtr, command); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } - public void RegisterSteam(UInt32 steamId) { + public void RegisterSteam(UInt32 steamId) + { var res = Methods.RegisterSteam(MethodsPtr, steamId); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } [MonoPInvokeCallback] - private static void UpdateActivityCallbackImpl(IntPtr ptr, Result result) { + private static void UpdateActivityCallbackImpl(IntPtr ptr, Result result) + { GCHandle h = GCHandle.FromIntPtr(ptr); UpdateActivityHandler callback = (UpdateActivityHandler)h.Target; h.Free(); callback(result); } - public void UpdateActivity(Activity activity, UpdateActivityHandler callback) { + public void UpdateActivity(Activity activity, UpdateActivityHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.UpdateActivity(MethodsPtr, ref activity, GCHandle.ToIntPtr(wrapped), UpdateActivityCallbackImpl); } [MonoPInvokeCallback] - private static void ClearActivityCallbackImpl(IntPtr ptr, Result result) { + private static void ClearActivityCallbackImpl(IntPtr ptr, Result result) + { GCHandle h = GCHandle.FromIntPtr(ptr); ClearActivityHandler callback = (ClearActivityHandler)h.Target; h.Free(); callback(result); } - public void ClearActivity(ClearActivityHandler callback) { + public void ClearActivity(ClearActivityHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.ClearActivity(MethodsPtr, GCHandle.ToIntPtr(wrapped), ClearActivityCallbackImpl); } [MonoPInvokeCallback] - private static void SendRequestReplyCallbackImpl(IntPtr ptr, Result result) { + private static void SendRequestReplyCallbackImpl(IntPtr ptr, Result result) + { GCHandle h = GCHandle.FromIntPtr(ptr); SendRequestReplyHandler callback = (SendRequestReplyHandler)h.Target; h.Free(); callback(result); } - public void SendRequestReply(Int64 userId, ActivityJoinRequestReply reply, SendRequestReplyHandler callback) { + public void SendRequestReply(Int64 userId, ActivityJoinRequestReply reply, SendRequestReplyHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.SendRequestReply(MethodsPtr, userId, reply, GCHandle.ToIntPtr(wrapped), SendRequestReplyCallbackImpl); } [MonoPInvokeCallback] - private static void SendInviteCallbackImpl(IntPtr ptr, Result result) { + private static void SendInviteCallbackImpl(IntPtr ptr, Result result) + { GCHandle h = GCHandle.FromIntPtr(ptr); SendInviteHandler callback = (SendInviteHandler)h.Target; h.Free(); callback(result); } - public void SendInvite(Int64 userId, ActivityActionType type, string content, SendInviteHandler callback) { + public void SendInvite(Int64 userId, ActivityActionType type, string content, SendInviteHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.SendInvite(MethodsPtr, userId, type, content, GCHandle.ToIntPtr(wrapped), SendInviteCallbackImpl); } [MonoPInvokeCallback] - private static void AcceptInviteCallbackImpl(IntPtr ptr, Result result) { + private static void AcceptInviteCallbackImpl(IntPtr ptr, Result result) + { GCHandle h = GCHandle.FromIntPtr(ptr); AcceptInviteHandler callback = (AcceptInviteHandler)h.Target; h.Free(); callback(result); } - public void AcceptInvite(Int64 userId, AcceptInviteHandler callback) { + public void AcceptInvite(Int64 userId, AcceptInviteHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.AcceptInvite(MethodsPtr, userId, GCHandle.ToIntPtr(wrapped), AcceptInviteCallbackImpl); } [MonoPInvokeCallback] - private static void OnActivityJoinImpl(IntPtr ptr, string secret) { + private static void OnActivityJoinImpl(IntPtr ptr, string secret) + { GCHandle h = GCHandle.FromIntPtr(ptr); Discord d = (Discord)h.Target; - if (d.ActivityManagerInstance.OnActivityJoin != null) { + if (d.ActivityManagerInstance.OnActivityJoin != null) + { d.ActivityManagerInstance.OnActivityJoin.Invoke(secret); } } [MonoPInvokeCallback] - private static void OnActivitySpectateImpl(IntPtr ptr, string secret) { + private static void OnActivitySpectateImpl(IntPtr ptr, string secret) + { GCHandle h = GCHandle.FromIntPtr(ptr); Discord d = (Discord)h.Target; - if (d.ActivityManagerInstance.OnActivitySpectate != null) { + if (d.ActivityManagerInstance.OnActivitySpectate != null) + { d.ActivityManagerInstance.OnActivitySpectate.Invoke(secret); } } [MonoPInvokeCallback] - private static void OnActivityJoinRequestImpl(IntPtr ptr, ref User user) { + private static void OnActivityJoinRequestImpl(IntPtr ptr, ref User user) + { GCHandle h = GCHandle.FromIntPtr(ptr); Discord d = (Discord)h.Target; - if (d.ActivityManagerInstance.OnActivityJoinRequest != null) { + if (d.ActivityManagerInstance.OnActivityJoinRequest != null) + { d.ActivityManagerInstance.OnActivityJoinRequest.Invoke(ref user); } } [MonoPInvokeCallback] - private static void OnActivityInviteImpl(IntPtr ptr, ActivityActionType type, ref User user, ref Activity activity) { + private static void OnActivityInviteImpl(IntPtr ptr, ActivityActionType type, ref User user, ref Activity activity) + { GCHandle h = GCHandle.FromIntPtr(ptr); Discord d = (Discord)h.Target; - if (d.ActivityManagerInstance.OnActivityInvite != null) { + if (d.ActivityManagerInstance.OnActivityInvite != null) + { d.ActivityManagerInstance.OnActivityInvite.Invoke(type, ref user, ref activity); } } } - public partial class RelationshipManager { + public partial class RelationshipManager + { [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIEvents { - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + internal partial struct FFIEvents + { + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void RefreshHandler(IntPtr ptr); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void RelationshipUpdateHandler(IntPtr ptr, ref Relationship relationship); internal RefreshHandler OnRefresh; @@ -1687,20 +1966,21 @@ internal partial struct FFIEvents { } [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods { - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + internal partial struct FFIMethods + { + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate bool FilterCallback(IntPtr ptr, ref Relationship relationship); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void FilterMethod(IntPtr methodsPtr, IntPtr callbackData, FilterCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result CountMethod(IntPtr methodsPtr, ref Int32 count); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result GetMethod(IntPtr methodsPtr, Int64 userId, ref Relationship relationship); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result GetAtMethod(IntPtr methodsPtr, UInt32 index, ref Relationship relationship); internal FilterMethod Filter; @@ -1722,9 +2002,12 @@ internal partial struct FFIMethods { private Object MethodsStructure; - private FFIMethods Methods { - get { - if (MethodsStructure == null) { + private FFIMethods Methods + { + get + { + if (MethodsStructure == null) + { MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); } return (FFIMethods)MethodsStructure; @@ -1736,7 +2019,8 @@ private FFIMethods Methods { public event RelationshipUpdateHandler OnRelationshipUpdate; - internal RelationshipManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) { + internal RelationshipManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) + { if (eventsPtr == IntPtr.Zero) { throw new ResultException(Result.InternalError); } @@ -1747,96 +2031,111 @@ internal RelationshipManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) } } - private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) { + private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) + { events.OnRefresh = OnRefreshImpl; events.OnRelationshipUpdate = OnRelationshipUpdateImpl; Marshal.StructureToPtr(events, eventsPtr, false); } [MonoPInvokeCallback] - private static bool FilterCallbackImpl(IntPtr ptr, ref Relationship relationship) { + private static bool FilterCallbackImpl(IntPtr ptr, ref Relationship relationship) + { GCHandle h = GCHandle.FromIntPtr(ptr); FilterHandler callback = (FilterHandler)h.Target; return callback(ref relationship); } - public void Filter(FilterHandler callback) { + public void Filter(FilterHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.Filter(MethodsPtr, GCHandle.ToIntPtr(wrapped), FilterCallbackImpl); wrapped.Free(); } - public Int32 Count() { + public Int32 Count() + { var ret = new Int32(); var res = Methods.Count(MethodsPtr, ref ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } - public Relationship Get(Int64 userId) { + public Relationship Get(Int64 userId) + { var ret = new Relationship(); var res = Methods.Get(MethodsPtr, userId, ref ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } - public Relationship GetAt(UInt32 index) { + public Relationship GetAt(UInt32 index) + { var ret = new Relationship(); var res = Methods.GetAt(MethodsPtr, index, ref ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } [MonoPInvokeCallback] - private static void OnRefreshImpl(IntPtr ptr) { + private static void OnRefreshImpl(IntPtr ptr) + { GCHandle h = GCHandle.FromIntPtr(ptr); Discord d = (Discord)h.Target; - if (d.RelationshipManagerInstance.OnRefresh != null) { + if (d.RelationshipManagerInstance.OnRefresh != null) + { d.RelationshipManagerInstance.OnRefresh.Invoke(); } } [MonoPInvokeCallback] - private static void OnRelationshipUpdateImpl(IntPtr ptr, ref Relationship relationship) { + private static void OnRelationshipUpdateImpl(IntPtr ptr, ref Relationship relationship) + { GCHandle h = GCHandle.FromIntPtr(ptr); Discord d = (Discord)h.Target; - if (d.RelationshipManagerInstance.OnRelationshipUpdate != null) { + if (d.RelationshipManagerInstance.OnRelationshipUpdate != null) + { d.RelationshipManagerInstance.OnRelationshipUpdate.Invoke(ref relationship); } } } - public partial class LobbyManager { + public partial class LobbyManager + { [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIEvents { - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + internal partial struct FFIEvents + { + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void LobbyUpdateHandler(IntPtr ptr, Int64 lobbyId); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void LobbyDeleteHandler(IntPtr ptr, Int64 lobbyId, UInt32 reason); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void MemberConnectHandler(IntPtr ptr, Int64 lobbyId, Int64 userId); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void MemberUpdateHandler(IntPtr ptr, Int64 lobbyId, Int64 userId); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void MemberDisconnectHandler(IntPtr ptr, Int64 lobbyId, Int64 userId); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void LobbyMessageHandler(IntPtr ptr, Int64 lobbyId, Int64 userId, IntPtr dataPtr, Int32 dataLen); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void SpeakingHandler(IntPtr ptr, Int64 lobbyId, Int64 userId, bool speaking); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void NetworkMessageHandler(IntPtr ptr, Int64 lobbyId, Int64 userId, byte channelId, IntPtr dataPtr, Int32 dataLen); internal LobbyUpdateHandler OnLobbyUpdate; @@ -1857,138 +2156,139 @@ internal partial struct FFIEvents { } [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods { - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + internal partial struct FFIMethods + { + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result GetLobbyCreateTransactionMethod(IntPtr methodsPtr, ref IntPtr transaction); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result GetLobbyUpdateTransactionMethod(IntPtr methodsPtr, Int64 lobbyId, ref IntPtr transaction); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result GetMemberUpdateTransactionMethod(IntPtr methodsPtr, Int64 lobbyId, Int64 userId, ref IntPtr transaction); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void CreateLobbyCallback(IntPtr ptr, Result result, ref Lobby lobby); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void CreateLobbyMethod(IntPtr methodsPtr, IntPtr transaction, IntPtr callbackData, CreateLobbyCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void UpdateLobbyCallback(IntPtr ptr, Result result); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void UpdateLobbyMethod(IntPtr methodsPtr, Int64 lobbyId, IntPtr transaction, IntPtr callbackData, UpdateLobbyCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void DeleteLobbyCallback(IntPtr ptr, Result result); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void DeleteLobbyMethod(IntPtr methodsPtr, Int64 lobbyId, IntPtr callbackData, DeleteLobbyCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void ConnectLobbyCallback(IntPtr ptr, Result result, ref Lobby lobby); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void ConnectLobbyMethod(IntPtr methodsPtr, Int64 lobbyId, [MarshalAs(UnmanagedType.LPStr)]string secret, IntPtr callbackData, ConnectLobbyCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void ConnectLobbyWithActivitySecretCallback(IntPtr ptr, Result result, ref Lobby lobby); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void ConnectLobbyWithActivitySecretMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string activitySecret, IntPtr callbackData, ConnectLobbyWithActivitySecretCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void DisconnectLobbyCallback(IntPtr ptr, Result result); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void DisconnectLobbyMethod(IntPtr methodsPtr, Int64 lobbyId, IntPtr callbackData, DisconnectLobbyCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result GetLobbyMethod(IntPtr methodsPtr, Int64 lobbyId, ref Lobby lobby); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result GetLobbyActivitySecretMethod(IntPtr methodsPtr, Int64 lobbyId, StringBuilder secret); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result GetLobbyMetadataValueMethod(IntPtr methodsPtr, Int64 lobbyId, [MarshalAs(UnmanagedType.LPStr)]string key, StringBuilder value); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result GetLobbyMetadataKeyMethod(IntPtr methodsPtr, Int64 lobbyId, Int32 index, StringBuilder key); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result LobbyMetadataCountMethod(IntPtr methodsPtr, Int64 lobbyId, ref Int32 count); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result MemberCountMethod(IntPtr methodsPtr, Int64 lobbyId, ref Int32 count); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result GetMemberUserIdMethod(IntPtr methodsPtr, Int64 lobbyId, Int32 index, ref Int64 userId); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result GetMemberUserMethod(IntPtr methodsPtr, Int64 lobbyId, Int64 userId, ref User user); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result GetMemberMetadataValueMethod(IntPtr methodsPtr, Int64 lobbyId, Int64 userId, [MarshalAs(UnmanagedType.LPStr)]string key, StringBuilder value); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result GetMemberMetadataKeyMethod(IntPtr methodsPtr, Int64 lobbyId, Int64 userId, Int32 index, StringBuilder key); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result MemberMetadataCountMethod(IntPtr methodsPtr, Int64 lobbyId, Int64 userId, ref Int32 count); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void UpdateMemberCallback(IntPtr ptr, Result result); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void UpdateMemberMethod(IntPtr methodsPtr, Int64 lobbyId, Int64 userId, IntPtr transaction, IntPtr callbackData, UpdateMemberCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void SendLobbyMessageCallback(IntPtr ptr, Result result); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - internal delegate void SendLobbyMessageMethod(IntPtr methodsPtr, Int64 lobbyId, byte[]data, Int32 dataLen, IntPtr callbackData, SendLobbyMessageCallback callback); + [UnmanagedFunctionPointer(CallingConvention.Winapi)] + internal delegate void SendLobbyMessageMethod(IntPtr methodsPtr, Int64 lobbyId, byte[] data, Int32 dataLen, IntPtr callbackData, SendLobbyMessageCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result GetSearchQueryMethod(IntPtr methodsPtr, ref IntPtr query); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void SearchCallback(IntPtr ptr, Result result); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void SearchMethod(IntPtr methodsPtr, IntPtr query, IntPtr callbackData, SearchCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void LobbyCountMethod(IntPtr methodsPtr, ref Int32 count); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result GetLobbyIdMethod(IntPtr methodsPtr, Int32 index, ref Int64 lobbyId); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void ConnectVoiceCallback(IntPtr ptr, Result result); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void ConnectVoiceMethod(IntPtr methodsPtr, Int64 lobbyId, IntPtr callbackData, ConnectVoiceCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void DisconnectVoiceCallback(IntPtr ptr, Result result); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void DisconnectVoiceMethod(IntPtr methodsPtr, Int64 lobbyId, IntPtr callbackData, DisconnectVoiceCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result ConnectNetworkMethod(IntPtr methodsPtr, Int64 lobbyId); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result DisconnectNetworkMethod(IntPtr methodsPtr, Int64 lobbyId); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result FlushNetworkMethod(IntPtr methodsPtr); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result OpenNetworkChannelMethod(IntPtr methodsPtr, Int64 lobbyId, byte channelId, bool reliable); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - internal delegate Result SendNetworkMessageMethod(IntPtr methodsPtr, Int64 lobbyId, Int64 userId, byte channelId, byte[]data, Int32 dataLen); + [UnmanagedFunctionPointer(CallingConvention.Winapi)] + internal delegate Result SendNetworkMessageMethod(IntPtr methodsPtr, Int64 lobbyId, Int64 userId, byte channelId, byte[] data, Int32 dataLen); internal GetLobbyCreateTransactionMethod GetLobbyCreateTransaction; @@ -2089,19 +2389,22 @@ internal partial struct FFIMethods { public delegate void MemberDisconnectHandler(Int64 lobbyId, Int64 userId); - public delegate void LobbyMessageHandler(Int64 lobbyId, Int64 userId, byte[]data); + public delegate void LobbyMessageHandler(Int64 lobbyId, Int64 userId, byte[] data); public delegate void SpeakingHandler(Int64 lobbyId, Int64 userId, bool speaking); - public delegate void NetworkMessageHandler(Int64 lobbyId, Int64 userId, byte channelId, byte[]data); + public delegate void NetworkMessageHandler(Int64 lobbyId, Int64 userId, byte channelId, byte[] data); private IntPtr MethodsPtr; private Object MethodsStructure; - private FFIMethods Methods { - get { - if (MethodsStructure == null) { + private FFIMethods Methods + { + get + { + if (MethodsStructure == null) + { MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); } return (FFIMethods)MethodsStructure; @@ -2125,7 +2428,8 @@ private FFIMethods Methods { public event NetworkMessageHandler OnNetworkMessage; - internal LobbyManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) { + internal LobbyManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) + { if (eventsPtr == IntPtr.Zero) { throw new ResultException(Result.InternalError); } @@ -2136,7 +2440,8 @@ internal LobbyManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) { } } - private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) { + private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) + { events.OnLobbyUpdate = OnLobbyUpdateImpl; events.OnLobbyDelete = OnLobbyDeleteImpl; events.OnMemberConnect = OnMemberConnectImpl; @@ -2148,422 +2453,505 @@ private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) { Marshal.StructureToPtr(events, eventsPtr, false); } - public LobbyTransaction GetLobbyCreateTransaction() { + public LobbyTransaction GetLobbyCreateTransaction() + { var ret = new LobbyTransaction(); var res = Methods.GetLobbyCreateTransaction(MethodsPtr, ref ret.MethodsPtr); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } - public LobbyTransaction GetLobbyUpdateTransaction(Int64 lobbyId) { + public LobbyTransaction GetLobbyUpdateTransaction(Int64 lobbyId) + { var ret = new LobbyTransaction(); var res = Methods.GetLobbyUpdateTransaction(MethodsPtr, lobbyId, ref ret.MethodsPtr); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } - public LobbyMemberTransaction GetMemberUpdateTransaction(Int64 lobbyId, Int64 userId) { + public LobbyMemberTransaction GetMemberUpdateTransaction(Int64 lobbyId, Int64 userId) + { var ret = new LobbyMemberTransaction(); var res = Methods.GetMemberUpdateTransaction(MethodsPtr, lobbyId, userId, ref ret.MethodsPtr); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } [MonoPInvokeCallback] - private static void CreateLobbyCallbackImpl(IntPtr ptr, Result result, ref Lobby lobby) { + private static void CreateLobbyCallbackImpl(IntPtr ptr, Result result, ref Lobby lobby) + { GCHandle h = GCHandle.FromIntPtr(ptr); CreateLobbyHandler callback = (CreateLobbyHandler)h.Target; h.Free(); callback(result, ref lobby); } - public void CreateLobby(LobbyTransaction transaction, CreateLobbyHandler callback) { + public void CreateLobby(LobbyTransaction transaction, CreateLobbyHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.CreateLobby(MethodsPtr, transaction.MethodsPtr, GCHandle.ToIntPtr(wrapped), CreateLobbyCallbackImpl); transaction.MethodsPtr = IntPtr.Zero; } [MonoPInvokeCallback] - private static void UpdateLobbyCallbackImpl(IntPtr ptr, Result result) { + private static void UpdateLobbyCallbackImpl(IntPtr ptr, Result result) + { GCHandle h = GCHandle.FromIntPtr(ptr); UpdateLobbyHandler callback = (UpdateLobbyHandler)h.Target; h.Free(); callback(result); } - public void UpdateLobby(Int64 lobbyId, LobbyTransaction transaction, UpdateLobbyHandler callback) { + public void UpdateLobby(Int64 lobbyId, LobbyTransaction transaction, UpdateLobbyHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.UpdateLobby(MethodsPtr, lobbyId, transaction.MethodsPtr, GCHandle.ToIntPtr(wrapped), UpdateLobbyCallbackImpl); transaction.MethodsPtr = IntPtr.Zero; } [MonoPInvokeCallback] - private static void DeleteLobbyCallbackImpl(IntPtr ptr, Result result) { + private static void DeleteLobbyCallbackImpl(IntPtr ptr, Result result) + { GCHandle h = GCHandle.FromIntPtr(ptr); DeleteLobbyHandler callback = (DeleteLobbyHandler)h.Target; h.Free(); callback(result); } - public void DeleteLobby(Int64 lobbyId, DeleteLobbyHandler callback) { + public void DeleteLobby(Int64 lobbyId, DeleteLobbyHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.DeleteLobby(MethodsPtr, lobbyId, GCHandle.ToIntPtr(wrapped), DeleteLobbyCallbackImpl); } [MonoPInvokeCallback] - private static void ConnectLobbyCallbackImpl(IntPtr ptr, Result result, ref Lobby lobby) { + private static void ConnectLobbyCallbackImpl(IntPtr ptr, Result result, ref Lobby lobby) + { GCHandle h = GCHandle.FromIntPtr(ptr); ConnectLobbyHandler callback = (ConnectLobbyHandler)h.Target; h.Free(); callback(result, ref lobby); } - public void ConnectLobby(Int64 lobbyId, string secret, ConnectLobbyHandler callback) { + public void ConnectLobby(Int64 lobbyId, string secret, ConnectLobbyHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.ConnectLobby(MethodsPtr, lobbyId, secret, GCHandle.ToIntPtr(wrapped), ConnectLobbyCallbackImpl); } [MonoPInvokeCallback] - private static void ConnectLobbyWithActivitySecretCallbackImpl(IntPtr ptr, Result result, ref Lobby lobby) { + private static void ConnectLobbyWithActivitySecretCallbackImpl(IntPtr ptr, Result result, ref Lobby lobby) + { GCHandle h = GCHandle.FromIntPtr(ptr); ConnectLobbyWithActivitySecretHandler callback = (ConnectLobbyWithActivitySecretHandler)h.Target; h.Free(); callback(result, ref lobby); } - public void ConnectLobbyWithActivitySecret(string activitySecret, ConnectLobbyWithActivitySecretHandler callback) { + public void ConnectLobbyWithActivitySecret(string activitySecret, ConnectLobbyWithActivitySecretHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.ConnectLobbyWithActivitySecret(MethodsPtr, activitySecret, GCHandle.ToIntPtr(wrapped), ConnectLobbyWithActivitySecretCallbackImpl); } [MonoPInvokeCallback] - private static void DisconnectLobbyCallbackImpl(IntPtr ptr, Result result) { + private static void DisconnectLobbyCallbackImpl(IntPtr ptr, Result result) + { GCHandle h = GCHandle.FromIntPtr(ptr); DisconnectLobbyHandler callback = (DisconnectLobbyHandler)h.Target; h.Free(); callback(result); } - public void DisconnectLobby(Int64 lobbyId, DisconnectLobbyHandler callback) { + public void DisconnectLobby(Int64 lobbyId, DisconnectLobbyHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.DisconnectLobby(MethodsPtr, lobbyId, GCHandle.ToIntPtr(wrapped), DisconnectLobbyCallbackImpl); } - public Lobby GetLobby(Int64 lobbyId) { + public Lobby GetLobby(Int64 lobbyId) + { var ret = new Lobby(); var res = Methods.GetLobby(MethodsPtr, lobbyId, ref ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } - public string GetLobbyActivitySecret(Int64 lobbyId) { + public string GetLobbyActivitySecret(Int64 lobbyId) + { var ret = new StringBuilder(128); var res = Methods.GetLobbyActivitySecret(MethodsPtr, lobbyId, ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret.ToString(); } - public string GetLobbyMetadataValue(Int64 lobbyId, string key) { + public string GetLobbyMetadataValue(Int64 lobbyId, string key) + { var ret = new StringBuilder(4096); var res = Methods.GetLobbyMetadataValue(MethodsPtr, lobbyId, key, ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret.ToString(); } - public string GetLobbyMetadataKey(Int64 lobbyId, Int32 index) { + public string GetLobbyMetadataKey(Int64 lobbyId, Int32 index) + { var ret = new StringBuilder(256); var res = Methods.GetLobbyMetadataKey(MethodsPtr, lobbyId, index, ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret.ToString(); } - public Int32 LobbyMetadataCount(Int64 lobbyId) { + public Int32 LobbyMetadataCount(Int64 lobbyId) + { var ret = new Int32(); var res = Methods.LobbyMetadataCount(MethodsPtr, lobbyId, ref ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } - public Int32 MemberCount(Int64 lobbyId) { + public Int32 MemberCount(Int64 lobbyId) + { var ret = new Int32(); var res = Methods.MemberCount(MethodsPtr, lobbyId, ref ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } - public Int64 GetMemberUserId(Int64 lobbyId, Int32 index) { + public Int64 GetMemberUserId(Int64 lobbyId, Int32 index) + { var ret = new Int64(); var res = Methods.GetMemberUserId(MethodsPtr, lobbyId, index, ref ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } - public User GetMemberUser(Int64 lobbyId, Int64 userId) { + public User GetMemberUser(Int64 lobbyId, Int64 userId) + { var ret = new User(); var res = Methods.GetMemberUser(MethodsPtr, lobbyId, userId, ref ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } - public string GetMemberMetadataValue(Int64 lobbyId, Int64 userId, string key) { + public string GetMemberMetadataValue(Int64 lobbyId, Int64 userId, string key) + { var ret = new StringBuilder(4096); var res = Methods.GetMemberMetadataValue(MethodsPtr, lobbyId, userId, key, ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret.ToString(); } - public string GetMemberMetadataKey(Int64 lobbyId, Int64 userId, Int32 index) { + public string GetMemberMetadataKey(Int64 lobbyId, Int64 userId, Int32 index) + { var ret = new StringBuilder(256); var res = Methods.GetMemberMetadataKey(MethodsPtr, lobbyId, userId, index, ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret.ToString(); } - public Int32 MemberMetadataCount(Int64 lobbyId, Int64 userId) { + public Int32 MemberMetadataCount(Int64 lobbyId, Int64 userId) + { var ret = new Int32(); var res = Methods.MemberMetadataCount(MethodsPtr, lobbyId, userId, ref ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } [MonoPInvokeCallback] - private static void UpdateMemberCallbackImpl(IntPtr ptr, Result result) { + private static void UpdateMemberCallbackImpl(IntPtr ptr, Result result) + { GCHandle h = GCHandle.FromIntPtr(ptr); UpdateMemberHandler callback = (UpdateMemberHandler)h.Target; h.Free(); callback(result); } - public void UpdateMember(Int64 lobbyId, Int64 userId, LobbyMemberTransaction transaction, UpdateMemberHandler callback) { + public void UpdateMember(Int64 lobbyId, Int64 userId, LobbyMemberTransaction transaction, UpdateMemberHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.UpdateMember(MethodsPtr, lobbyId, userId, transaction.MethodsPtr, GCHandle.ToIntPtr(wrapped), UpdateMemberCallbackImpl); transaction.MethodsPtr = IntPtr.Zero; } [MonoPInvokeCallback] - private static void SendLobbyMessageCallbackImpl(IntPtr ptr, Result result) { + private static void SendLobbyMessageCallbackImpl(IntPtr ptr, Result result) + { GCHandle h = GCHandle.FromIntPtr(ptr); SendLobbyMessageHandler callback = (SendLobbyMessageHandler)h.Target; h.Free(); callback(result); } - public void SendLobbyMessage(Int64 lobbyId, byte[]data, SendLobbyMessageHandler callback) { + public void SendLobbyMessage(Int64 lobbyId, byte[] data, SendLobbyMessageHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.SendLobbyMessage(MethodsPtr, lobbyId, data, data.Length, GCHandle.ToIntPtr(wrapped), SendLobbyMessageCallbackImpl); } - public LobbySearchQuery GetSearchQuery() { + public LobbySearchQuery GetSearchQuery() + { var ret = new LobbySearchQuery(); var res = Methods.GetSearchQuery(MethodsPtr, ref ret.MethodsPtr); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } [MonoPInvokeCallback] - private static void SearchCallbackImpl(IntPtr ptr, Result result) { + private static void SearchCallbackImpl(IntPtr ptr, Result result) + { GCHandle h = GCHandle.FromIntPtr(ptr); SearchHandler callback = (SearchHandler)h.Target; h.Free(); callback(result); } - public void Search(LobbySearchQuery query, SearchHandler callback) { + public void Search(LobbySearchQuery query, SearchHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.Search(MethodsPtr, query.MethodsPtr, GCHandle.ToIntPtr(wrapped), SearchCallbackImpl); query.MethodsPtr = IntPtr.Zero; } - public Int32 LobbyCount() { + public Int32 LobbyCount() + { var ret = new Int32(); Methods.LobbyCount(MethodsPtr, ref ret); return ret; } - public Int64 GetLobbyId(Int32 index) { + public Int64 GetLobbyId(Int32 index) + { var ret = new Int64(); var res = Methods.GetLobbyId(MethodsPtr, index, ref ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } [MonoPInvokeCallback] - private static void ConnectVoiceCallbackImpl(IntPtr ptr, Result result) { + private static void ConnectVoiceCallbackImpl(IntPtr ptr, Result result) + { GCHandle h = GCHandle.FromIntPtr(ptr); ConnectVoiceHandler callback = (ConnectVoiceHandler)h.Target; h.Free(); callback(result); } - public void ConnectVoice(Int64 lobbyId, ConnectVoiceHandler callback) { + public void ConnectVoice(Int64 lobbyId, ConnectVoiceHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.ConnectVoice(MethodsPtr, lobbyId, GCHandle.ToIntPtr(wrapped), ConnectVoiceCallbackImpl); } [MonoPInvokeCallback] - private static void DisconnectVoiceCallbackImpl(IntPtr ptr, Result result) { + private static void DisconnectVoiceCallbackImpl(IntPtr ptr, Result result) + { GCHandle h = GCHandle.FromIntPtr(ptr); DisconnectVoiceHandler callback = (DisconnectVoiceHandler)h.Target; h.Free(); callback(result); } - public void DisconnectVoice(Int64 lobbyId, DisconnectVoiceHandler callback) { + public void DisconnectVoice(Int64 lobbyId, DisconnectVoiceHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.DisconnectVoice(MethodsPtr, lobbyId, GCHandle.ToIntPtr(wrapped), DisconnectVoiceCallbackImpl); } - public void ConnectNetwork(Int64 lobbyId) { + public void ConnectNetwork(Int64 lobbyId) + { var res = Methods.ConnectNetwork(MethodsPtr, lobbyId); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } - public void DisconnectNetwork(Int64 lobbyId) { + public void DisconnectNetwork(Int64 lobbyId) + { var res = Methods.DisconnectNetwork(MethodsPtr, lobbyId); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } - public void FlushNetwork() { + public void FlushNetwork() + { var res = Methods.FlushNetwork(MethodsPtr); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } - public void OpenNetworkChannel(Int64 lobbyId, byte channelId, bool reliable) { + public void OpenNetworkChannel(Int64 lobbyId, byte channelId, bool reliable) + { var res = Methods.OpenNetworkChannel(MethodsPtr, lobbyId, channelId, reliable); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } - public void SendNetworkMessage(Int64 lobbyId, Int64 userId, byte channelId, byte[]data) { + public void SendNetworkMessage(Int64 lobbyId, Int64 userId, byte channelId, byte[] data) + { var res = Methods.SendNetworkMessage(MethodsPtr, lobbyId, userId, channelId, data, data.Length); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } [MonoPInvokeCallback] - private static void OnLobbyUpdateImpl(IntPtr ptr, Int64 lobbyId) { + private static void OnLobbyUpdateImpl(IntPtr ptr, Int64 lobbyId) + { GCHandle h = GCHandle.FromIntPtr(ptr); Discord d = (Discord)h.Target; - if (d.LobbyManagerInstance.OnLobbyUpdate != null) { + if (d.LobbyManagerInstance.OnLobbyUpdate != null) + { d.LobbyManagerInstance.OnLobbyUpdate.Invoke(lobbyId); } } [MonoPInvokeCallback] - private static void OnLobbyDeleteImpl(IntPtr ptr, Int64 lobbyId, UInt32 reason) { + private static void OnLobbyDeleteImpl(IntPtr ptr, Int64 lobbyId, UInt32 reason) + { GCHandle h = GCHandle.FromIntPtr(ptr); Discord d = (Discord)h.Target; - if (d.LobbyManagerInstance.OnLobbyDelete != null) { + if (d.LobbyManagerInstance.OnLobbyDelete != null) + { d.LobbyManagerInstance.OnLobbyDelete.Invoke(lobbyId, reason); } } [MonoPInvokeCallback] - private static void OnMemberConnectImpl(IntPtr ptr, Int64 lobbyId, Int64 userId) { + private static void OnMemberConnectImpl(IntPtr ptr, Int64 lobbyId, Int64 userId) + { GCHandle h = GCHandle.FromIntPtr(ptr); Discord d = (Discord)h.Target; - if (d.LobbyManagerInstance.OnMemberConnect != null) { + if (d.LobbyManagerInstance.OnMemberConnect != null) + { d.LobbyManagerInstance.OnMemberConnect.Invoke(lobbyId, userId); } } [MonoPInvokeCallback] - private static void OnMemberUpdateImpl(IntPtr ptr, Int64 lobbyId, Int64 userId) { + private static void OnMemberUpdateImpl(IntPtr ptr, Int64 lobbyId, Int64 userId) + { GCHandle h = GCHandle.FromIntPtr(ptr); Discord d = (Discord)h.Target; - if (d.LobbyManagerInstance.OnMemberUpdate != null) { + if (d.LobbyManagerInstance.OnMemberUpdate != null) + { d.LobbyManagerInstance.OnMemberUpdate.Invoke(lobbyId, userId); } } [MonoPInvokeCallback] - private static void OnMemberDisconnectImpl(IntPtr ptr, Int64 lobbyId, Int64 userId) { + private static void OnMemberDisconnectImpl(IntPtr ptr, Int64 lobbyId, Int64 userId) + { GCHandle h = GCHandle.FromIntPtr(ptr); Discord d = (Discord)h.Target; - if (d.LobbyManagerInstance.OnMemberDisconnect != null) { + if (d.LobbyManagerInstance.OnMemberDisconnect != null) + { d.LobbyManagerInstance.OnMemberDisconnect.Invoke(lobbyId, userId); } } [MonoPInvokeCallback] - private static void OnLobbyMessageImpl(IntPtr ptr, Int64 lobbyId, Int64 userId, IntPtr dataPtr, Int32 dataLen) { + private static void OnLobbyMessageImpl(IntPtr ptr, Int64 lobbyId, Int64 userId, IntPtr dataPtr, Int32 dataLen) + { GCHandle h = GCHandle.FromIntPtr(ptr); Discord d = (Discord)h.Target; - if (d.LobbyManagerInstance.OnLobbyMessage != null) { - byte[]data = new byte[dataLen]; + if (d.LobbyManagerInstance.OnLobbyMessage != null) + { + byte[] data = new byte[dataLen]; Marshal.Copy(dataPtr, data, 0, (int)dataLen); d.LobbyManagerInstance.OnLobbyMessage.Invoke(lobbyId, userId, data); } } [MonoPInvokeCallback] - private static void OnSpeakingImpl(IntPtr ptr, Int64 lobbyId, Int64 userId, bool speaking) { + private static void OnSpeakingImpl(IntPtr ptr, Int64 lobbyId, Int64 userId, bool speaking) + { GCHandle h = GCHandle.FromIntPtr(ptr); Discord d = (Discord)h.Target; - if (d.LobbyManagerInstance.OnSpeaking != null) { + if (d.LobbyManagerInstance.OnSpeaking != null) + { d.LobbyManagerInstance.OnSpeaking.Invoke(lobbyId, userId, speaking); } } [MonoPInvokeCallback] - private static void OnNetworkMessageImpl(IntPtr ptr, Int64 lobbyId, Int64 userId, byte channelId, IntPtr dataPtr, Int32 dataLen) { + private static void OnNetworkMessageImpl(IntPtr ptr, Int64 lobbyId, Int64 userId, byte channelId, IntPtr dataPtr, Int32 dataLen) + { GCHandle h = GCHandle.FromIntPtr(ptr); Discord d = (Discord)h.Target; - if (d.LobbyManagerInstance.OnNetworkMessage != null) { - byte[]data = new byte[dataLen]; + if (d.LobbyManagerInstance.OnNetworkMessage != null) + { + byte[] data = new byte[dataLen]; Marshal.Copy(dataPtr, data, 0, (int)dataLen); d.LobbyManagerInstance.OnNetworkMessage.Invoke(lobbyId, userId, channelId, data); } } } - public partial class NetworkManager { + public partial class NetworkManager + { [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIEvents { - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + internal partial struct FFIEvents + { + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void MessageHandler(IntPtr ptr, UInt64 peerId, byte channelId, IntPtr dataPtr, Int32 dataLen); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void RouteUpdateHandler(IntPtr ptr, [MarshalAs(UnmanagedType.LPStr)]string routeData); internal MessageHandler OnMessage; @@ -2572,30 +2960,31 @@ internal partial struct FFIEvents { } [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods { - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + internal partial struct FFIMethods + { + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void GetPeerIdMethod(IntPtr methodsPtr, ref UInt64 peerId); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result FlushMethod(IntPtr methodsPtr); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result OpenPeerMethod(IntPtr methodsPtr, UInt64 peerId, [MarshalAs(UnmanagedType.LPStr)]string routeData); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result UpdatePeerMethod(IntPtr methodsPtr, UInt64 peerId, [MarshalAs(UnmanagedType.LPStr)]string routeData); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result ClosePeerMethod(IntPtr methodsPtr, UInt64 peerId); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result OpenChannelMethod(IntPtr methodsPtr, UInt64 peerId, byte channelId, bool reliable); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result CloseChannelMethod(IntPtr methodsPtr, UInt64 peerId, byte channelId); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - internal delegate Result SendMessageMethod(IntPtr methodsPtr, UInt64 peerId, byte channelId, byte[]data, Int32 dataLen); + [UnmanagedFunctionPointer(CallingConvention.Winapi)] + internal delegate Result SendMessageMethod(IntPtr methodsPtr, UInt64 peerId, byte channelId, byte[] data, Int32 dataLen); internal GetPeerIdMethod GetPeerId; @@ -2614,7 +3003,7 @@ internal partial struct FFIMethods { internal SendMessageMethod SendMessage; } - public delegate void MessageHandler(UInt64 peerId, byte channelId, byte[]data); + public delegate void MessageHandler(UInt64 peerId, byte channelId, byte[] data); public delegate void RouteUpdateHandler(string routeData); @@ -2622,9 +3011,12 @@ internal partial struct FFIMethods { private Object MethodsStructure; - private FFIMethods Methods { - get { - if (MethodsStructure == null) { + private FFIMethods Methods + { + get + { + if (MethodsStructure == null) + { MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); } return (FFIMethods)MethodsStructure; @@ -2636,7 +3028,8 @@ private FFIMethods Methods { public event RouteUpdateHandler OnRouteUpdate; - internal NetworkManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) { + internal NetworkManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) + { if (eventsPtr == IntPtr.Zero) { throw new ResultException(Result.InternalError); } @@ -2647,7 +3040,8 @@ internal NetworkManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) { } } - private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) { + private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) + { events.OnMessage = OnMessageImpl; events.OnRouteUpdate = OnRouteUpdateImpl; Marshal.StructureToPtr(events, eventsPtr, false); @@ -2656,7 +3050,8 @@ private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) { /// /// Get the local peer ID for this process. /// - public UInt64 GetPeerId() { + public UInt64 GetPeerId() + { var ret = new UInt64(); Methods.GetPeerId(MethodsPtr, ref ret); return ret; @@ -2665,9 +3060,11 @@ public UInt64 GetPeerId() { /// /// Send pending network messages. /// - public void Flush() { + public void Flush() + { var res = Methods.Flush(MethodsPtr); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } @@ -2675,9 +3072,11 @@ public void Flush() { /// /// Open a connection to a remote peer. /// - public void OpenPeer(UInt64 peerId, string routeData) { + public void OpenPeer(UInt64 peerId, string routeData) + { var res = Methods.OpenPeer(MethodsPtr, peerId, routeData); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } @@ -2685,9 +3084,11 @@ public void OpenPeer(UInt64 peerId, string routeData) { /// /// Update the route data for a connected peer. /// - public void UpdatePeer(UInt64 peerId, string routeData) { + public void UpdatePeer(UInt64 peerId, string routeData) + { var res = Methods.UpdatePeer(MethodsPtr, peerId, routeData); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } @@ -2695,9 +3096,11 @@ public void UpdatePeer(UInt64 peerId, string routeData) { /// /// Close the connection to a remote peer. /// - public void ClosePeer(UInt64 peerId) { + public void ClosePeer(UInt64 peerId) + { var res = Methods.ClosePeer(MethodsPtr, peerId); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } @@ -2705,9 +3108,11 @@ public void ClosePeer(UInt64 peerId) { /// /// Open a message channel to a connected peer. /// - public void OpenChannel(UInt64 peerId, byte channelId, bool reliable) { + public void OpenChannel(UInt64 peerId, byte channelId, bool reliable) + { var res = Methods.OpenChannel(MethodsPtr, peerId, channelId, reliable); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } @@ -2715,9 +3120,11 @@ public void OpenChannel(UInt64 peerId, byte channelId, bool reliable) { /// /// Close a message channel to a connected peer. /// - public void CloseChannel(UInt64 peerId, byte channelId) { + public void CloseChannel(UInt64 peerId, byte channelId) + { var res = Methods.CloseChannel(MethodsPtr, peerId, channelId); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } @@ -2725,75 +3132,129 @@ public void CloseChannel(UInt64 peerId, byte channelId) { /// /// Send a message to a connected peer over an opened message channel. /// - public void SendMessage(UInt64 peerId, byte channelId, byte[]data) { + public void SendMessage(UInt64 peerId, byte channelId, byte[] data) + { var res = Methods.SendMessage(MethodsPtr, peerId, channelId, data, data.Length); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } [MonoPInvokeCallback] - private static void OnMessageImpl(IntPtr ptr, UInt64 peerId, byte channelId, IntPtr dataPtr, Int32 dataLen) { + private static void OnMessageImpl(IntPtr ptr, UInt64 peerId, byte channelId, IntPtr dataPtr, Int32 dataLen) + { GCHandle h = GCHandle.FromIntPtr(ptr); Discord d = (Discord)h.Target; - if (d.NetworkManagerInstance.OnMessage != null) { - byte[]data = new byte[dataLen]; + if (d.NetworkManagerInstance.OnMessage != null) + { + byte[] data = new byte[dataLen]; Marshal.Copy(dataPtr, data, 0, (int)dataLen); d.NetworkManagerInstance.OnMessage.Invoke(peerId, channelId, data); } } [MonoPInvokeCallback] - private static void OnRouteUpdateImpl(IntPtr ptr, string routeData) { + private static void OnRouteUpdateImpl(IntPtr ptr, string routeData) + { GCHandle h = GCHandle.FromIntPtr(ptr); Discord d = (Discord)h.Target; - if (d.NetworkManagerInstance.OnRouteUpdate != null) { + if (d.NetworkManagerInstance.OnRouteUpdate != null) + { d.NetworkManagerInstance.OnRouteUpdate.Invoke(routeData); } } } - public partial class OverlayManager { + public partial class OverlayManager + { [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIEvents { - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + internal partial struct FFIEvents + { + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void ToggleHandler(IntPtr ptr, bool locked); internal ToggleHandler OnToggle; } [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods { - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + internal partial struct FFIMethods + { + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void IsEnabledMethod(IntPtr methodsPtr, ref bool enabled); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void IsLockedMethod(IntPtr methodsPtr, ref bool locked); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void SetLockedCallback(IntPtr ptr, Result result); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void SetLockedMethod(IntPtr methodsPtr, bool locked, IntPtr callbackData, SetLockedCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void OpenActivityInviteCallback(IntPtr ptr, Result result); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void OpenActivityInviteMethod(IntPtr methodsPtr, ActivityActionType type, IntPtr callbackData, OpenActivityInviteCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void OpenGuildInviteCallback(IntPtr ptr, Result result); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void OpenGuildInviteMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string code, IntPtr callbackData, OpenGuildInviteCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void OpenVoiceSettingsCallback(IntPtr ptr, Result result); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void OpenVoiceSettingsMethod(IntPtr methodsPtr, IntPtr callbackData, OpenVoiceSettingsCallback callback); + [UnmanagedFunctionPointer(CallingConvention.Winapi)] + internal delegate Result InitDrawingDxgiMethod(IntPtr methodsPtr, IntPtr swapchain, bool useMessageForwarding); + + [UnmanagedFunctionPointer(CallingConvention.Winapi)] + internal delegate void OnPresentMethod(IntPtr methodsPtr); + + [UnmanagedFunctionPointer(CallingConvention.Winapi)] + internal delegate void ForwardMessageMethod(IntPtr methodsPtr, IntPtr message); + + [UnmanagedFunctionPointer(CallingConvention.Winapi)] + internal delegate void KeyEventMethod(IntPtr methodsPtr, bool down, [MarshalAs(UnmanagedType.LPStr)]string keyCode, KeyVariant variant); + + [UnmanagedFunctionPointer(CallingConvention.Winapi)] + internal delegate void CharEventMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string character); + + [UnmanagedFunctionPointer(CallingConvention.Winapi)] + internal delegate void MouseButtonEventMethod(IntPtr methodsPtr, byte down, Int32 clickCount, MouseButton which, Int32 x, Int32 y); + + [UnmanagedFunctionPointer(CallingConvention.Winapi)] + internal delegate void MouseMotionEventMethod(IntPtr methodsPtr, Int32 x, Int32 y); + + [UnmanagedFunctionPointer(CallingConvention.Winapi)] + internal delegate void ImeCommitTextMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string text); + + [UnmanagedFunctionPointer(CallingConvention.Winapi)] + internal delegate void ImeSetCompositionMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string text, ref ImeUnderline underlines, Int32 from, Int32 to); + + [UnmanagedFunctionPointer(CallingConvention.Winapi)] + internal delegate void ImeCancelCompositionMethod(IntPtr methodsPtr); + + [UnmanagedFunctionPointer(CallingConvention.Winapi)] + internal delegate void SetImeCompositionRangeCallbackCallback(IntPtr ptr, Int32 from, Int32 to, ref Rect bounds); + + [UnmanagedFunctionPointer(CallingConvention.Winapi)] + internal delegate void SetImeCompositionRangeCallbackMethod(IntPtr methodsPtr, IntPtr callbackData, SetImeCompositionRangeCallbackCallback callback); + + [UnmanagedFunctionPointer(CallingConvention.Winapi)] + internal delegate void SetImeSelectionBoundsCallbackCallback(IntPtr ptr, Rect anchor, Rect focus, bool isAnchorFirst); + + [UnmanagedFunctionPointer(CallingConvention.Winapi)] + internal delegate void SetImeSelectionBoundsCallbackMethod(IntPtr methodsPtr, IntPtr callbackData, SetImeSelectionBoundsCallbackCallback callback); + + [UnmanagedFunctionPointer(CallingConvention.Winapi)] + internal delegate bool IsPointInsideClickZoneMethod(IntPtr methodsPtr, Int32 x, Int32 y); + internal IsEnabledMethod IsEnabled; internal IsLockedMethod IsLocked; @@ -2805,6 +3266,32 @@ internal partial struct FFIMethods { internal OpenGuildInviteMethod OpenGuildInvite; internal OpenVoiceSettingsMethod OpenVoiceSettings; + + internal InitDrawingDxgiMethod InitDrawingDxgi; + + internal OnPresentMethod OnPresent; + + internal ForwardMessageMethod ForwardMessage; + + internal KeyEventMethod KeyEvent; + + internal CharEventMethod CharEvent; + + internal MouseButtonEventMethod MouseButtonEvent; + + internal MouseMotionEventMethod MouseMotionEvent; + + internal ImeCommitTextMethod ImeCommitText; + + internal ImeSetCompositionMethod ImeSetComposition; + + internal ImeCancelCompositionMethod ImeCancelComposition; + + internal SetImeCompositionRangeCallbackMethod SetImeCompositionRangeCallback; + + internal SetImeSelectionBoundsCallbackMethod SetImeSelectionBoundsCallback; + + internal IsPointInsideClickZoneMethod IsPointInsideClickZone; } public delegate void SetLockedHandler(Result result); @@ -2815,15 +3302,22 @@ internal partial struct FFIMethods { public delegate void OpenVoiceSettingsHandler(Result result); + public delegate void SetImeCompositionRangeCallbackHandler(Int32 from, Int32 to, ref Rect bounds); + + public delegate void SetImeSelectionBoundsCallbackHandler(Rect anchor, Rect focus, bool isAnchorFirst); + public delegate void ToggleHandler(bool locked); private IntPtr MethodsPtr; private Object MethodsStructure; - private FFIMethods Methods { - get { - if (MethodsStructure == null) { + private FFIMethods Methods + { + get + { + if (MethodsStructure == null) + { MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); } return (FFIMethods)MethodsStructure; @@ -2833,7 +3327,8 @@ private FFIMethods Methods { public event ToggleHandler OnToggle; - internal OverlayManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) { + internal OverlayManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) + { if (eventsPtr == IntPtr.Zero) { throw new ResultException(Result.InternalError); } @@ -2844,131 +3339,238 @@ internal OverlayManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) { } } - private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) { + private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) + { events.OnToggle = OnToggleImpl; Marshal.StructureToPtr(events, eventsPtr, false); } - public bool IsEnabled() { + public bool IsEnabled() + { var ret = new bool(); Methods.IsEnabled(MethodsPtr, ref ret); return ret; } - public bool IsLocked() { + public bool IsLocked() + { var ret = new bool(); Methods.IsLocked(MethodsPtr, ref ret); return ret; } [MonoPInvokeCallback] - private static void SetLockedCallbackImpl(IntPtr ptr, Result result) { + private static void SetLockedCallbackImpl(IntPtr ptr, Result result) + { GCHandle h = GCHandle.FromIntPtr(ptr); SetLockedHandler callback = (SetLockedHandler)h.Target; h.Free(); callback(result); } - public void SetLocked(bool locked, SetLockedHandler callback) { + public void SetLocked(bool locked, SetLockedHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.SetLocked(MethodsPtr, locked, GCHandle.ToIntPtr(wrapped), SetLockedCallbackImpl); } [MonoPInvokeCallback] - private static void OpenActivityInviteCallbackImpl(IntPtr ptr, Result result) { + private static void OpenActivityInviteCallbackImpl(IntPtr ptr, Result result) + { GCHandle h = GCHandle.FromIntPtr(ptr); OpenActivityInviteHandler callback = (OpenActivityInviteHandler)h.Target; h.Free(); callback(result); } - public void OpenActivityInvite(ActivityActionType type, OpenActivityInviteHandler callback) { + public void OpenActivityInvite(ActivityActionType type, OpenActivityInviteHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.OpenActivityInvite(MethodsPtr, type, GCHandle.ToIntPtr(wrapped), OpenActivityInviteCallbackImpl); } [MonoPInvokeCallback] - private static void OpenGuildInviteCallbackImpl(IntPtr ptr, Result result) { + private static void OpenGuildInviteCallbackImpl(IntPtr ptr, Result result) + { GCHandle h = GCHandle.FromIntPtr(ptr); OpenGuildInviteHandler callback = (OpenGuildInviteHandler)h.Target; h.Free(); callback(result); } - public void OpenGuildInvite(string code, OpenGuildInviteHandler callback) { + public void OpenGuildInvite(string code, OpenGuildInviteHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.OpenGuildInvite(MethodsPtr, code, GCHandle.ToIntPtr(wrapped), OpenGuildInviteCallbackImpl); } [MonoPInvokeCallback] - private static void OpenVoiceSettingsCallbackImpl(IntPtr ptr, Result result) { + private static void OpenVoiceSettingsCallbackImpl(IntPtr ptr, Result result) + { GCHandle h = GCHandle.FromIntPtr(ptr); OpenVoiceSettingsHandler callback = (OpenVoiceSettingsHandler)h.Target; h.Free(); callback(result); } - public void OpenVoiceSettings(OpenVoiceSettingsHandler callback) { + public void OpenVoiceSettings(OpenVoiceSettingsHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.OpenVoiceSettings(MethodsPtr, GCHandle.ToIntPtr(wrapped), OpenVoiceSettingsCallbackImpl); } + public void InitDrawingDxgi(IntPtr swapchain, bool useMessageForwarding) + { + var res = Methods.InitDrawingDxgi(MethodsPtr, swapchain, useMessageForwarding); + if (res != Result.Ok) + { + throw new ResultException(res); + } + } + + public void OnPresent() + { + Methods.OnPresent(MethodsPtr); + } + + public void ForwardMessage(IntPtr message) + { + Methods.ForwardMessage(MethodsPtr, message); + } + + public void KeyEvent(bool down, string keyCode, KeyVariant variant) + { + Methods.KeyEvent(MethodsPtr, down, keyCode, variant); + } + + public void CharEvent(string character) + { + Methods.CharEvent(MethodsPtr, character); + } + + public void MouseButtonEvent(byte down, Int32 clickCount, MouseButton which, Int32 x, Int32 y) + { + Methods.MouseButtonEvent(MethodsPtr, down, clickCount, which, x, y); + } + + public void MouseMotionEvent(Int32 x, Int32 y) + { + Methods.MouseMotionEvent(MethodsPtr, x, y); + } + + public void ImeCommitText(string text) + { + Methods.ImeCommitText(MethodsPtr, text); + } + + public void ImeSetComposition(string text, ImeUnderline underlines, Int32 from, Int32 to) + { + Methods.ImeSetComposition(MethodsPtr, text, ref underlines, from, to); + } + + public void ImeCancelComposition() + { + Methods.ImeCancelComposition(MethodsPtr); + } + + [MonoPInvokeCallback] + private static void SetImeCompositionRangeCallbackCallbackImpl(IntPtr ptr, Int32 from, Int32 to, ref Rect bounds) + { + GCHandle h = GCHandle.FromIntPtr(ptr); + SetImeCompositionRangeCallbackHandler callback = (SetImeCompositionRangeCallbackHandler)h.Target; + h.Free(); + callback(from, to, ref bounds); + } + + public void SetImeCompositionRangeCallback(SetImeCompositionRangeCallbackHandler callback) + { + GCHandle wrapped = GCHandle.Alloc(callback); + Methods.SetImeCompositionRangeCallback(MethodsPtr, GCHandle.ToIntPtr(wrapped), SetImeCompositionRangeCallbackCallbackImpl); + } + [MonoPInvokeCallback] - private static void OnToggleImpl(IntPtr ptr, bool locked) { + private static void SetImeSelectionBoundsCallbackCallbackImpl(IntPtr ptr, Rect anchor, Rect focus, bool isAnchorFirst) + { + GCHandle h = GCHandle.FromIntPtr(ptr); + SetImeSelectionBoundsCallbackHandler callback = (SetImeSelectionBoundsCallbackHandler)h.Target; + h.Free(); + callback(anchor, focus, isAnchorFirst); + } + + public void SetImeSelectionBoundsCallback(SetImeSelectionBoundsCallbackHandler callback) + { + GCHandle wrapped = GCHandle.Alloc(callback); + Methods.SetImeSelectionBoundsCallback(MethodsPtr, GCHandle.ToIntPtr(wrapped), SetImeSelectionBoundsCallbackCallbackImpl); + } + + public bool IsPointInsideClickZone(Int32 x, Int32 y) + { + return Methods.IsPointInsideClickZone(MethodsPtr, x, y); + } + + [MonoPInvokeCallback] + private static void OnToggleImpl(IntPtr ptr, bool locked) + { GCHandle h = GCHandle.FromIntPtr(ptr); Discord d = (Discord)h.Target; - if (d.OverlayManagerInstance.OnToggle != null) { + if (d.OverlayManagerInstance.OnToggle != null) + { d.OverlayManagerInstance.OnToggle.Invoke(locked); } } } - public partial class StorageManager { + public partial class StorageManager + { [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIEvents {} + internal partial struct FFIEvents + { + + } [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods { - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - internal delegate Result ReadMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string name, byte[]data, Int32 dataLen, ref UInt32 read); + internal partial struct FFIMethods + { + [UnmanagedFunctionPointer(CallingConvention.Winapi)] + internal delegate Result ReadMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string name, byte[] data, Int32 dataLen, ref UInt32 read); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void ReadAsyncCallback(IntPtr ptr, Result result, IntPtr dataPtr, Int32 dataLen); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void ReadAsyncMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string name, IntPtr callbackData, ReadAsyncCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void ReadAsyncPartialCallback(IntPtr ptr, Result result, IntPtr dataPtr, Int32 dataLen); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void ReadAsyncPartialMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string name, UInt64 offset, UInt64 length, IntPtr callbackData, ReadAsyncPartialCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - internal delegate Result WriteMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string name, byte[]data, Int32 dataLen); + [UnmanagedFunctionPointer(CallingConvention.Winapi)] + internal delegate Result WriteMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string name, byte[] data, Int32 dataLen); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void WriteAsyncCallback(IntPtr ptr, Result result); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - internal delegate void WriteAsyncMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string name, byte[]data, Int32 dataLen, IntPtr callbackData, WriteAsyncCallback callback); + [UnmanagedFunctionPointer(CallingConvention.Winapi)] + internal delegate void WriteAsyncMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string name, byte[] data, Int32 dataLen, IntPtr callbackData, WriteAsyncCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result DeleteMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string name); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result ExistsMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string name, ref bool exists); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void CountMethod(IntPtr methodsPtr, ref Int32 count); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result StatMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string name, ref FileStat stat); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result StatAtMethod(IntPtr methodsPtr, Int32 index, ref FileStat stat); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result GetPathMethod(IntPtr methodsPtr, StringBuilder path); internal ReadMethod Read; @@ -2994,9 +3596,9 @@ internal partial struct FFIMethods { internal GetPathMethod GetPath; } - public delegate void ReadAsyncHandler(Result result, byte[]data); + public delegate void ReadAsyncHandler(Result result, byte[] data); - public delegate void ReadAsyncPartialHandler(Result result, byte[]data); + public delegate void ReadAsyncPartialHandler(Result result, byte[] data); public delegate void WriteAsyncHandler(Result result); @@ -3004,9 +3606,12 @@ internal partial struct FFIMethods { private Object MethodsStructure; - private FFIMethods Methods { - get { - if (MethodsStructure == null) { + private FFIMethods Methods + { + get + { + if (MethodsStructure == null) + { MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); } return (FFIMethods)MethodsStructure; @@ -3014,7 +3619,8 @@ private FFIMethods Methods { } - internal StorageManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) { + internal StorageManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) + { if (eventsPtr == IntPtr.Zero) { throw new ResultException(Result.InternalError); } @@ -3025,126 +3631,150 @@ internal StorageManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) { } } - private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) { + private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) + { Marshal.StructureToPtr(events, eventsPtr, false); } - public UInt32 Read(string name, byte[]data) { + public UInt32 Read(string name, byte[] data) + { var ret = new UInt32(); var res = Methods.Read(MethodsPtr, name, data, data.Length, ref ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } [MonoPInvokeCallback] - private static void ReadAsyncCallbackImpl(IntPtr ptr, Result result, IntPtr dataPtr, Int32 dataLen) { + private static void ReadAsyncCallbackImpl(IntPtr ptr, Result result, IntPtr dataPtr, Int32 dataLen) + { GCHandle h = GCHandle.FromIntPtr(ptr); ReadAsyncHandler callback = (ReadAsyncHandler)h.Target; h.Free(); - byte[]data = new byte[dataLen]; + byte[] data = new byte[dataLen]; Marshal.Copy(dataPtr, data, 0, (int)dataLen); callback(result, data); } - public void ReadAsync(string name, ReadAsyncHandler callback) { + public void ReadAsync(string name, ReadAsyncHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.ReadAsync(MethodsPtr, name, GCHandle.ToIntPtr(wrapped), ReadAsyncCallbackImpl); } [MonoPInvokeCallback] - private static void ReadAsyncPartialCallbackImpl(IntPtr ptr, Result result, IntPtr dataPtr, Int32 dataLen) { + private static void ReadAsyncPartialCallbackImpl(IntPtr ptr, Result result, IntPtr dataPtr, Int32 dataLen) + { GCHandle h = GCHandle.FromIntPtr(ptr); ReadAsyncPartialHandler callback = (ReadAsyncPartialHandler)h.Target; h.Free(); - byte[]data = new byte[dataLen]; + byte[] data = new byte[dataLen]; Marshal.Copy(dataPtr, data, 0, (int)dataLen); callback(result, data); } - public void ReadAsyncPartial(string name, UInt64 offset, UInt64 length, ReadAsyncPartialHandler callback) { + public void ReadAsyncPartial(string name, UInt64 offset, UInt64 length, ReadAsyncPartialHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.ReadAsyncPartial(MethodsPtr, name, offset, length, GCHandle.ToIntPtr(wrapped), ReadAsyncPartialCallbackImpl); } - public void Write(string name, byte[]data) { + public void Write(string name, byte[] data) + { var res = Methods.Write(MethodsPtr, name, data, data.Length); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } [MonoPInvokeCallback] - private static void WriteAsyncCallbackImpl(IntPtr ptr, Result result) { + private static void WriteAsyncCallbackImpl(IntPtr ptr, Result result) + { GCHandle h = GCHandle.FromIntPtr(ptr); WriteAsyncHandler callback = (WriteAsyncHandler)h.Target; h.Free(); callback(result); } - public void WriteAsync(string name, byte[]data, WriteAsyncHandler callback) { + public void WriteAsync(string name, byte[] data, WriteAsyncHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.WriteAsync(MethodsPtr, name, data, data.Length, GCHandle.ToIntPtr(wrapped), WriteAsyncCallbackImpl); } - public void Delete(string name) { + public void Delete(string name) + { var res = Methods.Delete(MethodsPtr, name); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } - public bool Exists(string name) { + public bool Exists(string name) + { var ret = new bool(); var res = Methods.Exists(MethodsPtr, name, ref ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } - public Int32 Count() { + public Int32 Count() + { var ret = new Int32(); Methods.Count(MethodsPtr, ref ret); return ret; } - public FileStat Stat(string name) { + public FileStat Stat(string name) + { var ret = new FileStat(); var res = Methods.Stat(MethodsPtr, name, ref ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } - public FileStat StatAt(Int32 index) { + public FileStat StatAt(Int32 index) + { var ret = new FileStat(); var res = Methods.StatAt(MethodsPtr, index, ref ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } - public string GetPath() { + public string GetPath() + { var ret = new StringBuilder(4096); var res = Methods.GetPath(MethodsPtr, ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret.ToString(); } } - public partial class StoreManager { + public partial class StoreManager + { [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIEvents { - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + internal partial struct FFIEvents + { + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void EntitlementCreateHandler(IntPtr ptr, ref Entitlement entitlement); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void EntitlementDeleteHandler(IntPtr ptr, ref Entitlement entitlement); internal EntitlementCreateHandler OnEntitlementCreate; @@ -3153,44 +3783,45 @@ internal partial struct FFIEvents { } [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods { - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + internal partial struct FFIMethods + { + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void FetchSkusCallback(IntPtr ptr, Result result); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void FetchSkusMethod(IntPtr methodsPtr, IntPtr callbackData, FetchSkusCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void CountSkusMethod(IntPtr methodsPtr, ref Int32 count); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result GetSkuMethod(IntPtr methodsPtr, Int64 skuId, ref Sku sku); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result GetSkuAtMethod(IntPtr methodsPtr, Int32 index, ref Sku sku); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void FetchEntitlementsCallback(IntPtr ptr, Result result); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void FetchEntitlementsMethod(IntPtr methodsPtr, IntPtr callbackData, FetchEntitlementsCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void CountEntitlementsMethod(IntPtr methodsPtr, ref Int32 count); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result GetEntitlementMethod(IntPtr methodsPtr, Int64 entitlementId, ref Entitlement entitlement); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result GetEntitlementAtMethod(IntPtr methodsPtr, Int32 index, ref Entitlement entitlement); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result HasSkuEntitlementMethod(IntPtr methodsPtr, Int64 skuId, ref bool hasEntitlement); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void StartPurchaseCallback(IntPtr ptr, Result result); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void StartPurchaseMethod(IntPtr methodsPtr, Int64 skuId, IntPtr callbackData, StartPurchaseCallback callback); internal FetchSkusMethod FetchSkus; @@ -3228,9 +3859,12 @@ internal partial struct FFIMethods { private Object MethodsStructure; - private FFIMethods Methods { - get { - if (MethodsStructure == null) { + private FFIMethods Methods + { + get + { + if (MethodsStructure == null) + { MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); } return (FFIMethods)MethodsStructure; @@ -3242,7 +3876,8 @@ private FFIMethods Methods { public event EntitlementDeleteHandler OnEntitlementDelete; - internal StoreManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) { + internal StoreManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) + { if (eventsPtr == IntPtr.Zero) { throw new ResultException(Result.InternalError); } @@ -3253,169 +3888,195 @@ internal StoreManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) { } } - private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) { + private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) + { events.OnEntitlementCreate = OnEntitlementCreateImpl; events.OnEntitlementDelete = OnEntitlementDeleteImpl; Marshal.StructureToPtr(events, eventsPtr, false); } [MonoPInvokeCallback] - private static void FetchSkusCallbackImpl(IntPtr ptr, Result result) { + private static void FetchSkusCallbackImpl(IntPtr ptr, Result result) + { GCHandle h = GCHandle.FromIntPtr(ptr); FetchSkusHandler callback = (FetchSkusHandler)h.Target; h.Free(); callback(result); } - public void FetchSkus(FetchSkusHandler callback) { + public void FetchSkus(FetchSkusHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.FetchSkus(MethodsPtr, GCHandle.ToIntPtr(wrapped), FetchSkusCallbackImpl); } - public Int32 CountSkus() { + public Int32 CountSkus() + { var ret = new Int32(); Methods.CountSkus(MethodsPtr, ref ret); return ret; } - public Sku GetSku(Int64 skuId) { + public Sku GetSku(Int64 skuId) + { var ret = new Sku(); var res = Methods.GetSku(MethodsPtr, skuId, ref ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } - public Sku GetSkuAt(Int32 index) { + public Sku GetSkuAt(Int32 index) + { var ret = new Sku(); var res = Methods.GetSkuAt(MethodsPtr, index, ref ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } [MonoPInvokeCallback] - private static void FetchEntitlementsCallbackImpl(IntPtr ptr, Result result) { + private static void FetchEntitlementsCallbackImpl(IntPtr ptr, Result result) + { GCHandle h = GCHandle.FromIntPtr(ptr); FetchEntitlementsHandler callback = (FetchEntitlementsHandler)h.Target; h.Free(); callback(result); } - public void FetchEntitlements(FetchEntitlementsHandler callback) { + public void FetchEntitlements(FetchEntitlementsHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.FetchEntitlements(MethodsPtr, GCHandle.ToIntPtr(wrapped), FetchEntitlementsCallbackImpl); } - public Int32 CountEntitlements() { + public Int32 CountEntitlements() + { var ret = new Int32(); Methods.CountEntitlements(MethodsPtr, ref ret); return ret; } - public Entitlement GetEntitlement(Int64 entitlementId) { + public Entitlement GetEntitlement(Int64 entitlementId) + { var ret = new Entitlement(); var res = Methods.GetEntitlement(MethodsPtr, entitlementId, ref ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } - public Entitlement GetEntitlementAt(Int32 index) { + public Entitlement GetEntitlementAt(Int32 index) + { var ret = new Entitlement(); var res = Methods.GetEntitlementAt(MethodsPtr, index, ref ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } - public bool HasSkuEntitlement(Int64 skuId) { + public bool HasSkuEntitlement(Int64 skuId) + { var ret = new bool(); var res = Methods.HasSkuEntitlement(MethodsPtr, skuId, ref ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } [MonoPInvokeCallback] - private static void StartPurchaseCallbackImpl(IntPtr ptr, Result result) { + private static void StartPurchaseCallbackImpl(IntPtr ptr, Result result) + { GCHandle h = GCHandle.FromIntPtr(ptr); StartPurchaseHandler callback = (StartPurchaseHandler)h.Target; h.Free(); callback(result); } - public void StartPurchase(Int64 skuId, StartPurchaseHandler callback) { + public void StartPurchase(Int64 skuId, StartPurchaseHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.StartPurchase(MethodsPtr, skuId, GCHandle.ToIntPtr(wrapped), StartPurchaseCallbackImpl); } [MonoPInvokeCallback] - private static void OnEntitlementCreateImpl(IntPtr ptr, ref Entitlement entitlement) { + private static void OnEntitlementCreateImpl(IntPtr ptr, ref Entitlement entitlement) + { GCHandle h = GCHandle.FromIntPtr(ptr); Discord d = (Discord)h.Target; - if (d.StoreManagerInstance.OnEntitlementCreate != null) { + if (d.StoreManagerInstance.OnEntitlementCreate != null) + { d.StoreManagerInstance.OnEntitlementCreate.Invoke(ref entitlement); } } [MonoPInvokeCallback] - private static void OnEntitlementDeleteImpl(IntPtr ptr, ref Entitlement entitlement) { + private static void OnEntitlementDeleteImpl(IntPtr ptr, ref Entitlement entitlement) + { GCHandle h = GCHandle.FromIntPtr(ptr); Discord d = (Discord)h.Target; - if (d.StoreManagerInstance.OnEntitlementDelete != null) { + if (d.StoreManagerInstance.OnEntitlementDelete != null) + { d.StoreManagerInstance.OnEntitlementDelete.Invoke(ref entitlement); } } } - public partial class VoiceManager { + public partial class VoiceManager + { [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIEvents { - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + internal partial struct FFIEvents + { + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void SettingsUpdateHandler(IntPtr ptr); internal SettingsUpdateHandler OnSettingsUpdate; } [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods { - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + internal partial struct FFIMethods + { + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result GetInputModeMethod(IntPtr methodsPtr, ref InputMode inputMode); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void SetInputModeCallback(IntPtr ptr, Result result); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void SetInputModeMethod(IntPtr methodsPtr, InputMode inputMode, IntPtr callbackData, SetInputModeCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result IsSelfMuteMethod(IntPtr methodsPtr, ref bool mute); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result SetSelfMuteMethod(IntPtr methodsPtr, bool mute); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result IsSelfDeafMethod(IntPtr methodsPtr, ref bool deaf); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result SetSelfDeafMethod(IntPtr methodsPtr, bool deaf); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result IsLocalMuteMethod(IntPtr methodsPtr, Int64 userId, ref bool mute); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result SetLocalMuteMethod(IntPtr methodsPtr, Int64 userId, bool mute); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result GetLocalVolumeMethod(IntPtr methodsPtr, Int64 userId, ref byte volume); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result SetLocalVolumeMethod(IntPtr methodsPtr, Int64 userId, byte volume); internal GetInputModeMethod GetInputMode; @@ -3447,9 +4108,12 @@ internal partial struct FFIMethods { private Object MethodsStructure; - private FFIMethods Methods { - get { - if (MethodsStructure == null) { + private FFIMethods Methods + { + get + { + if (MethodsStructure == null) + { MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); } return (FFIMethods)MethodsStructure; @@ -3459,7 +4123,8 @@ private FFIMethods Methods { public event SettingsUpdateHandler OnSettingsUpdate; - internal VoiceManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) { + internal VoiceManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) + { if (eventsPtr == IntPtr.Zero) { throw new ResultException(Result.InternalError); } @@ -3470,137 +4135,163 @@ internal VoiceManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) { } } - private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) { + private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) + { events.OnSettingsUpdate = OnSettingsUpdateImpl; Marshal.StructureToPtr(events, eventsPtr, false); } - public InputMode GetInputMode() { + public InputMode GetInputMode() + { var ret = new InputMode(); var res = Methods.GetInputMode(MethodsPtr, ref ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } [MonoPInvokeCallback] - private static void SetInputModeCallbackImpl(IntPtr ptr, Result result) { + private static void SetInputModeCallbackImpl(IntPtr ptr, Result result) + { GCHandle h = GCHandle.FromIntPtr(ptr); SetInputModeHandler callback = (SetInputModeHandler)h.Target; h.Free(); callback(result); } - public void SetInputMode(InputMode inputMode, SetInputModeHandler callback) { + public void SetInputMode(InputMode inputMode, SetInputModeHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.SetInputMode(MethodsPtr, inputMode, GCHandle.ToIntPtr(wrapped), SetInputModeCallbackImpl); } - public bool IsSelfMute() { + public bool IsSelfMute() + { var ret = new bool(); var res = Methods.IsSelfMute(MethodsPtr, ref ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } - public void SetSelfMute(bool mute) { + public void SetSelfMute(bool mute) + { var res = Methods.SetSelfMute(MethodsPtr, mute); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } - public bool IsSelfDeaf() { + public bool IsSelfDeaf() + { var ret = new bool(); var res = Methods.IsSelfDeaf(MethodsPtr, ref ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } - public void SetSelfDeaf(bool deaf) { + public void SetSelfDeaf(bool deaf) + { var res = Methods.SetSelfDeaf(MethodsPtr, deaf); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } - public bool IsLocalMute(Int64 userId) { + public bool IsLocalMute(Int64 userId) + { var ret = new bool(); var res = Methods.IsLocalMute(MethodsPtr, userId, ref ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } - public void SetLocalMute(Int64 userId, bool mute) { + public void SetLocalMute(Int64 userId, bool mute) + { var res = Methods.SetLocalMute(MethodsPtr, userId, mute); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } - public byte GetLocalVolume(Int64 userId) { + public byte GetLocalVolume(Int64 userId) + { var ret = new byte(); var res = Methods.GetLocalVolume(MethodsPtr, userId, ref ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } - public void SetLocalVolume(Int64 userId, byte volume) { + public void SetLocalVolume(Int64 userId, byte volume) + { var res = Methods.SetLocalVolume(MethodsPtr, userId, volume); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } } [MonoPInvokeCallback] - private static void OnSettingsUpdateImpl(IntPtr ptr) { + private static void OnSettingsUpdateImpl(IntPtr ptr) + { GCHandle h = GCHandle.FromIntPtr(ptr); Discord d = (Discord)h.Target; - if (d.VoiceManagerInstance.OnSettingsUpdate != null) { + if (d.VoiceManagerInstance.OnSettingsUpdate != null) + { d.VoiceManagerInstance.OnSettingsUpdate.Invoke(); } } } - public partial class AchievementManager { + public partial class AchievementManager + { [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIEvents { - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + internal partial struct FFIEvents + { + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void UserAchievementUpdateHandler(IntPtr ptr, ref UserAchievement userAchievement); internal UserAchievementUpdateHandler OnUserAchievementUpdate; } [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods { - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + internal partial struct FFIMethods + { + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void SetUserAchievementCallback(IntPtr ptr, Result result); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void SetUserAchievementMethod(IntPtr methodsPtr, Int64 achievementId, byte percentComplete, IntPtr callbackData, SetUserAchievementCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void FetchUserAchievementsCallback(IntPtr ptr, Result result); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void FetchUserAchievementsMethod(IntPtr methodsPtr, IntPtr callbackData, FetchUserAchievementsCallback callback); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate void CountUserAchievementsMethod(IntPtr methodsPtr, ref Int32 count); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result GetUserAchievementMethod(IntPtr methodsPtr, Int64 userAchievementId, ref UserAchievement userAchievement); - [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + [UnmanagedFunctionPointer(CallingConvention.Winapi)] internal delegate Result GetUserAchievementAtMethod(IntPtr methodsPtr, Int32 index, ref UserAchievement userAchievement); internal SetUserAchievementMethod SetUserAchievement; @@ -3624,9 +4315,12 @@ internal partial struct FFIMethods { private Object MethodsStructure; - private FFIMethods Methods { - get { - if (MethodsStructure == null) { + private FFIMethods Methods + { + get + { + if (MethodsStructure == null) + { MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); } return (FFIMethods)MethodsStructure; @@ -3636,7 +4330,8 @@ private FFIMethods Methods { public event UserAchievementUpdateHandler OnUserAchievementUpdate; - internal AchievementManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) { + internal AchievementManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) + { if (eventsPtr == IntPtr.Zero) { throw new ResultException(Result.InternalError); } @@ -3647,66 +4342,78 @@ internal AchievementManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) } } - private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) { + private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) + { events.OnUserAchievementUpdate = OnUserAchievementUpdateImpl; Marshal.StructureToPtr(events, eventsPtr, false); } [MonoPInvokeCallback] - private static void SetUserAchievementCallbackImpl(IntPtr ptr, Result result) { + private static void SetUserAchievementCallbackImpl(IntPtr ptr, Result result) + { GCHandle h = GCHandle.FromIntPtr(ptr); SetUserAchievementHandler callback = (SetUserAchievementHandler)h.Target; h.Free(); callback(result); } - public void SetUserAchievement(Int64 achievementId, byte percentComplete, SetUserAchievementHandler callback) { + public void SetUserAchievement(Int64 achievementId, byte percentComplete, SetUserAchievementHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.SetUserAchievement(MethodsPtr, achievementId, percentComplete, GCHandle.ToIntPtr(wrapped), SetUserAchievementCallbackImpl); } [MonoPInvokeCallback] - private static void FetchUserAchievementsCallbackImpl(IntPtr ptr, Result result) { + private static void FetchUserAchievementsCallbackImpl(IntPtr ptr, Result result) + { GCHandle h = GCHandle.FromIntPtr(ptr); FetchUserAchievementsHandler callback = (FetchUserAchievementsHandler)h.Target; h.Free(); callback(result); } - public void FetchUserAchievements(FetchUserAchievementsHandler callback) { + public void FetchUserAchievements(FetchUserAchievementsHandler callback) + { GCHandle wrapped = GCHandle.Alloc(callback); Methods.FetchUserAchievements(MethodsPtr, GCHandle.ToIntPtr(wrapped), FetchUserAchievementsCallbackImpl); } - public Int32 CountUserAchievements() { + public Int32 CountUserAchievements() + { var ret = new Int32(); Methods.CountUserAchievements(MethodsPtr, ref ret); return ret; } - public UserAchievement GetUserAchievement(Int64 userAchievementId) { + public UserAchievement GetUserAchievement(Int64 userAchievementId) + { var ret = new UserAchievement(); var res = Methods.GetUserAchievement(MethodsPtr, userAchievementId, ref ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } - public UserAchievement GetUserAchievementAt(Int32 index) { + public UserAchievement GetUserAchievementAt(Int32 index) + { var ret = new UserAchievement(); var res = Methods.GetUserAchievementAt(MethodsPtr, index, ref ret); - if (res != Result.Ok) { + if (res != Result.Ok) + { throw new ResultException(res); } return ret; } [MonoPInvokeCallback] - private static void OnUserAchievementUpdateImpl(IntPtr ptr, ref UserAchievement userAchievement) { + private static void OnUserAchievementUpdateImpl(IntPtr ptr, ref UserAchievement userAchievement) + { GCHandle h = GCHandle.FromIntPtr(ptr); Discord d = (Discord)h.Target; - if (d.AchievementManagerInstance.OnUserAchievementUpdate != null) { + if (d.AchievementManagerInstance.OnUserAchievementUpdate != null) + { d.AchievementManagerInstance.OnUserAchievementUpdate.Invoke(ref userAchievement); } } diff --git a/Assets/Scripts/Discord/Core.cs.meta b/Assets/Plugins/DiscordSDK/Core.cs.meta similarity index 83% rename from Assets/Scripts/Discord/Core.cs.meta rename to Assets/Plugins/DiscordSDK/Core.cs.meta index 54e89791a..5ff85bbd2 100644 --- a/Assets/Scripts/Discord/Core.cs.meta +++ b/Assets/Plugins/DiscordSDK/Core.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2dba976f0c0f41a4ab066c7125153ebe +guid: 6803100cc09c5bb48b81c763963c0828 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Discord/ImageManager.cs b/Assets/Plugins/DiscordSDK/ImageManager.cs similarity index 69% rename from Assets/Scripts/Discord/ImageManager.cs rename to Assets/Plugins/DiscordSDK/ImageManager.cs index fd36f4539..292e23004 100644 --- a/Assets/Scripts/Discord/ImageManager.cs +++ b/Assets/Plugins/DiscordSDK/ImageManager.cs @@ -4,14 +4,19 @@ using UnityEngine; #endif -namespace Discord { - public partial struct ImageHandle { - static public ImageHandle User(Int64 id) { +namespace Discord +{ + public partial struct ImageHandle + { + static public ImageHandle User(Int64 id) + { return User(id, 128); } - static public ImageHandle User(Int64 id, UInt32 size) { - return new ImageHandle { + static public ImageHandle User(Int64 id, UInt32 size) + { + return new ImageHandle + { Type = ImageType.User, Id = id, Size = size, @@ -19,12 +24,15 @@ static public ImageHandle User(Int64 id, UInt32 size) { } } - public partial class ImageManager { - public void Fetch(ImageHandle handle, FetchHandler callback) { + public partial class ImageManager + { + public void Fetch(ImageHandle handle, FetchHandler callback) + { Fetch(handle, false, callback); } - public byte[] GetData(ImageHandle handle) { + public byte[] GetData(ImageHandle handle) + { var dimensions = GetDimensions(handle); var data = new byte[dimensions.Width * dimensions.Height * 4]; GetData(handle, data); @@ -32,7 +40,8 @@ public byte[] GetData(ImageHandle handle) { } #if UNITY_EDITOR || UNITY_STANDALONE - public Texture2D GetTexture(ImageHandle handle) { + public Texture2D GetTexture(ImageHandle handle) + { var dimensions = GetDimensions(handle); var texture = new Texture2D((int)dimensions.Width, (int)dimensions.Height, TextureFormat.RGBA32, false, true); texture.LoadRawTextureData(GetData(handle)); diff --git a/Assets/Scripts/Discord/ImageManager.cs.meta b/Assets/Plugins/DiscordSDK/ImageManager.cs.meta similarity index 83% rename from Assets/Scripts/Discord/ImageManager.cs.meta rename to Assets/Plugins/DiscordSDK/ImageManager.cs.meta index 6941e6499..c34ca75ea 100644 --- a/Assets/Scripts/Discord/ImageManager.cs.meta +++ b/Assets/Plugins/DiscordSDK/ImageManager.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 458ced5faa36c1b44875bbe6aa18ac1c +guid: 8a9ae2ac76483094c8637f9bb3908d95 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Discord/LobbyManager.cs b/Assets/Plugins/DiscordSDK/LobbyManager.cs similarity index 71% rename from Assets/Scripts/Discord/LobbyManager.cs rename to Assets/Plugins/DiscordSDK/LobbyManager.cs index 80205ac6b..c914ba832 100644 --- a/Assets/Scripts/Discord/LobbyManager.cs +++ b/Assets/Plugins/DiscordSDK/LobbyManager.cs @@ -3,20 +3,23 @@ using System.Collections.Generic; using System.Text; -namespace Discord { - - public partial class LobbyManager { - - public IEnumerable GetMemberUsers(Int64 lobbyID) { +namespace Discord +{ + public partial class LobbyManager + { + public IEnumerable GetMemberUsers(Int64 lobbyID) + { var memberCount = MemberCount(lobbyID); var members = new List(); for (var i = 0; i < memberCount; i++) + { members.Add(GetMemberUser(lobbyID, GetMemberUserId(lobbyID, i))); - + } return members; } - public void SendLobbyMessage(Int64 lobbyID, string data, SendLobbyMessageHandler handler) { + public void SendLobbyMessage(Int64 lobbyID, string data, SendLobbyMessageHandler handler) + { SendLobbyMessage(lobbyID, Encoding.UTF8.GetBytes(data), handler); } } diff --git a/Assets/Scripts/Discord/LobbyManager.cs.meta b/Assets/Plugins/DiscordSDK/LobbyManager.cs.meta similarity index 83% rename from Assets/Scripts/Discord/LobbyManager.cs.meta rename to Assets/Plugins/DiscordSDK/LobbyManager.cs.meta index 42805de17..0b2b11b0e 100644 --- a/Assets/Scripts/Discord/LobbyManager.cs.meta +++ b/Assets/Plugins/DiscordSDK/LobbyManager.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 66c2b3d2e49b69f4c8439e8f9974a06c +guid: 969a5429f59847e4c9273c7327965abc MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Discord/StorageManager.cs b/Assets/Plugins/DiscordSDK/StorageManager.cs similarity index 65% rename from Assets/Scripts/Discord/StorageManager.cs rename to Assets/Plugins/DiscordSDK/StorageManager.cs index eff9f2035..65cfe72d6 100644 --- a/Assets/Scripts/Discord/StorageManager.cs +++ b/Assets/Plugins/DiscordSDK/StorageManager.cs @@ -2,16 +2,18 @@ using System.Collections.Generic; using System.Text; -namespace Discord { - - public partial class StorageManager { - - public IEnumerable Files() { +namespace Discord +{ + public partial class StorageManager + { + public IEnumerable Files() + { var fileCount = Count(); var files = new List(); for (var i = 0; i < fileCount; i++) + { files.Add(StatAt(i)); - + } return files; } } diff --git a/Assets/Scripts/Discord/StorageManager.cs.meta b/Assets/Plugins/DiscordSDK/StorageManager.cs.meta similarity index 83% rename from Assets/Scripts/Discord/StorageManager.cs.meta rename to Assets/Plugins/DiscordSDK/StorageManager.cs.meta index 0e7813d56..eb9366a65 100644 --- a/Assets/Scripts/Discord/StorageManager.cs.meta +++ b/Assets/Plugins/DiscordSDK/StorageManager.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8a5896d2a89279c4396d1cc9b690597d +guid: 1a63fb8bfc63d064d9e057c0b1d75d70 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Discord/StoreManager.cs b/Assets/Plugins/DiscordSDK/StoreManager.cs similarity index 69% rename from Assets/Scripts/Discord/StoreManager.cs rename to Assets/Plugins/DiscordSDK/StoreManager.cs index 1bdfa4c1b..48645767c 100644 --- a/Assets/Scripts/Discord/StoreManager.cs +++ b/Assets/Plugins/DiscordSDK/StoreManager.cs @@ -3,26 +3,29 @@ using System.Collections.Generic; using System.Text; -namespace Discord { - - public partial class StoreManager { - - public IEnumerable GetEntitlements() { - +namespace Discord +{ + public partial class StoreManager + { + public IEnumerable GetEntitlements() + { var count = CountEntitlements(); var entitlements = new List(); for (var i = 0; i < count; i++) + { entitlements.Add(GetEntitlementAt(i)); - + } return entitlements; } - public IEnumerable GetSkus() { + public IEnumerable GetSkus() + { var count = CountSkus(); var skus = new List(); for (var i = 0; i < count; i++) + { skus.Add(GetSkuAt(i)); - + } return skus; } } diff --git a/Assets/Scripts/Discord/StoreManager.cs.meta b/Assets/Plugins/DiscordSDK/StoreManager.cs.meta similarity index 83% rename from Assets/Scripts/Discord/StoreManager.cs.meta rename to Assets/Plugins/DiscordSDK/StoreManager.cs.meta index 0ba1f32f6..6fed8c9e8 100644 --- a/Assets/Scripts/Discord/StoreManager.cs.meta +++ b/Assets/Plugins/DiscordSDK/StoreManager.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b8fa0b3f4cb1577468b652d48318103e +guid: 103ff28411b3ab84e881e54b358d3f44 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Plugins/MoonSharp/Interpreter/CoreLib/LoadModule.cs b/Assets/Plugins/MoonSharp/Interpreter/CoreLib/LoadModule.cs index a756e6b54..621ff8b55 100644 --- a/Assets/Plugins/MoonSharp/Interpreter/CoreLib/LoadModule.cs +++ b/Assets/Plugins/MoonSharp/Interpreter/CoreLib/LoadModule.cs @@ -1,6 +1,6 @@ using System; +using System.Collections.Generic; using System.IO; -using Boo.Lang; // Disable warnings about XML documentation #pragma warning disable 1591 @@ -140,13 +140,17 @@ private static DynValue loadfile_impl(ScriptExecutionContext executionContext, C { try { Script S = executionContext.GetScript(); - DynValue filename = args.AsType(0, "loadfile", DataType.String, false); + DynValue v = args.AsType(0, "loadfile", DataType.String, false); DynValue env = args.AsType(2, "loadfile", DataType.Table, true); - string str = filename.String; - string suffix = "Lua/"; + string str; + if (v.String.StartsWith(DataRoot)) str = v.String; + else str = (v.String.Replace("\\", "/").StartsWith("/") ? "" : "/") + v.String; + string suffix = str.StartsWith(DataRoot) ? DataRoot : "raw"; ExplorePath(ref str, ref suffix); return S.LoadFile(str, env.IsNil() ? defaultEnv : env.Table); + } catch (FileNotFoundException ex) { + throw new CYFException(ex.Message); } catch (SyntaxErrorException ex) { return DynValue.NewTuple(DynValue.Nil, DynValue.NewString(ex.DecoratedMessage ?? ex.Message)); } catch (Exception) { @@ -173,22 +177,22 @@ private static Table GetSafeDefaultEnv(ScriptExecutionContext executionContext) //dofile executes the contents of the standard input (stdin). Returns all values returned by the chunk. //In case of errors, dofile propagates the error to its caller (that is, dofile does not run in protected mode). [MoonSharpModuleMethod] - public static DynValue dofile(ScriptExecutionContext executionContext, CallbackArguments args) - { - try - { + public static DynValue dofile(ScriptExecutionContext executionContext, CallbackArguments args) { + try { Script S = executionContext.GetScript(); DynValue v = args.AsType(0, "dofile", DataType.String, false); - string str = v.String.Replace('\\', '/'); - string suffix = str[0] == '/' ? "raw" : DataRoot; + string str; + if (v.String.StartsWith(DataRoot)) str = v.String; + else str = (v.String.Replace("\\", "/").StartsWith("/") ? "" : "/") + v.String; + string suffix = str.StartsWith(DataRoot) ? DataRoot : "raw"; ExplorePath(ref str, ref suffix); DynValue fn = S.LoadFile(str); return DynValue.NewTailCallReq(fn); // tail call to dofile - } - catch (SyntaxErrorException ex) - { + } catch (FileNotFoundException ex) { + throw new CYFException(ex.Message); + } catch (SyntaxErrorException ex) { throw new ScriptRuntimeException(ex); } } @@ -218,13 +222,21 @@ public static DynValue dofile(ScriptExecutionContext executionContext, CallbackA public static DynValue __require_clr_impl(ScriptExecutionContext executionContext, CallbackArguments args) { DynValue v = args.AsType(0, "__require_clr_impl", DataType.String, false); + string s = v.String.Replace("..", "¤").Replace(".", "/").Replace("¤", ".."); - CallbackArguments newArgs = new CallbackArguments(new List { DynValue.NewString(ModDataPath + "Lua/" + v.String + ".lua"), args[1], args[2] }, args.IsMethodCall); - DynValue fn = loadfile_impl(executionContext, newArgs, null, false); + CallbackArguments newArgs = new CallbackArguments(new List { DynValue.NewString(ModDataPath + "Lua/" + s + ".lua"), args[1], args[2] }, args.IsMethodCall); + Exception e = null; + DynValue fn = DynValue.Nil; + try { fn = loadfile_impl(executionContext, newArgs, null); } + catch (Exception ex) { e = ex; } if (fn.Type != DataType.Nil) return fn; // tail call to dofile - newArgs = new CallbackArguments(new List { DynValue.NewString(ModDataPath + "Lua/Libraries/" + v.String + ".lua"), args[1], args[2] }, args.IsMethodCall); - fn = loadfile_impl(executionContext, newArgs, null); + newArgs = new CallbackArguments(new List { DynValue.NewString(ModDataPath + "Lua/Libraries/" + s + ".lua"), args[1], args[2] }, args.IsMethodCall); + try { fn = loadfile_impl(executionContext, newArgs, null); } + catch (Exception ex) { + if (e != null) throw e; + throw ex; + } return fn; // tail call to dofile } @@ -328,8 +340,10 @@ public static bool RequireFile(ref string fileName, string pathSuffix, bool erro public static void ExplorePath(ref string fullPath, ref string pathSuffix) { fullPath = fullPath.Replace('\\', Path.DirectorySeparatorChar).Replace('/', Path.DirectorySeparatorChar); - if (pathSuffix == "raw") pathSuffix = "/"; - else if (pathSuffix.Contains(DataRoot)) { } + if (pathSuffix == "raw") + pathSuffix = "/"; + + if (pathSuffix.Contains(DataRoot)) { } else if (fullPath.Contains(ModDataPath)) pathSuffix = Path.Combine(ModDataPath, pathSuffix); else if (fullPath.Contains(DefaultDataPath)) pathSuffix = Path.Combine(DefaultDataPath, pathSuffix); else if (fullPath.Contains(DataRoot)) pathSuffix = Path.Combine(DataRoot, pathSuffix); diff --git a/Assets/Plugins/MoonSharp/Interpreter/Interop/StandardDescriptors/StandardGenericsUserDataDescriptor.cs b/Assets/Plugins/MoonSharp/Interpreter/Interop/StandardDescriptors/StandardGenericsUserDataDescriptor.cs index 112e406c3..ab387c863 100644 --- a/Assets/Plugins/MoonSharp/Interpreter/Interop/StandardDescriptors/StandardGenericsUserDataDescriptor.cs +++ b/Assets/Plugins/MoonSharp/Interpreter/Interop/StandardDescriptors/StandardGenericsUserDataDescriptor.cs @@ -49,7 +49,7 @@ public bool SetIndex(Script script, object obj, DynValue index, DynValue value, } /// - public string AsString(object obj) + public virtual string AsString(object obj) { return obj.ToString(); } diff --git a/Assets/Plugins/aarch64.meta b/Assets/Plugins/aarch64.meta new file mode 100644 index 000000000..a5379b9c3 --- /dev/null +++ b/Assets/Plugins/aarch64.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cbad02c1e1893bc4b95762c43cd3e7b0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/aarch64/discord_game_sdk.bundle b/Assets/Plugins/aarch64/discord_game_sdk.bundle new file mode 100644 index 000000000..8f086062a Binary files /dev/null and b/Assets/Plugins/aarch64/discord_game_sdk.bundle differ diff --git a/Assets/Plugins/aarch64/discord_game_sdk.bundle.meta b/Assets/Plugins/aarch64/discord_game_sdk.bundle.meta new file mode 100644 index 000000000..3659a7a1b --- /dev/null +++ b/Assets/Plugins/aarch64/discord_game_sdk.bundle.meta @@ -0,0 +1,32 @@ +fileFormatVersion: 2 +guid: b1a89a6e55a46a94f9ea0498d0e8fe14 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + - first: + Standalone: OSXUniversal + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/aarch64/discord_game_sdk.dylib b/Assets/Plugins/aarch64/discord_game_sdk.dylib new file mode 100644 index 000000000..8f086062a Binary files /dev/null and b/Assets/Plugins/aarch64/discord_game_sdk.dylib differ diff --git a/Assets/Plugins/aarch64/discord_game_sdk.dylib.meta b/Assets/Plugins/aarch64/discord_game_sdk.dylib.meta new file mode 100644 index 000000000..e05b4cd12 --- /dev/null +++ b/Assets/Plugins/aarch64/discord_game_sdk.dylib.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c35cde035132f404683ad501683a6a79 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/x86.meta b/Assets/Plugins/x86.meta index f0bc08dea..9033ebe64 100644 --- a/Assets/Plugins/x86.meta +++ b/Assets/Plugins/x86.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 100fef3f2e168774187051e12ae11956 +guid: 12e9082df71b3824fba9cb1b2a9c44d3 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Plugins/x86/discord_game_sdk.dll b/Assets/Plugins/x86/discord_game_sdk.dll index 8f1ee0a65..45b9bb172 100644 Binary files a/Assets/Plugins/x86/discord_game_sdk.dll and b/Assets/Plugins/x86/discord_game_sdk.dll differ diff --git a/Assets/Plugins/x86/discord_game_sdk.dll.lib b/Assets/Plugins/x86/discord_game_sdk.dll.lib index 58ec2820f..02c417e6e 100644 Binary files a/Assets/Plugins/x86/discord_game_sdk.dll.lib and b/Assets/Plugins/x86/discord_game_sdk.dll.lib differ diff --git a/Assets/Plugins/x86/discord_game_sdk.dll.lib.meta b/Assets/Plugins/x86/discord_game_sdk.dll.lib.meta index d9e35421c..ffbaf1496 100644 --- a/Assets/Plugins/x86/discord_game_sdk.dll.lib.meta +++ b/Assets/Plugins/x86/discord_game_sdk.dll.lib.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 01562762286ec10408ece22693d43d71 +guid: 8a1bc2dee583f474f9a661d95e437c0a DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Plugins/x86/discord_game_sdk.dll.meta b/Assets/Plugins/x86/discord_game_sdk.dll.meta index 320c210ab..1a9fedda3 100644 --- a/Assets/Plugins/x86/discord_game_sdk.dll.meta +++ b/Assets/Plugins/x86/discord_game_sdk.dll.meta @@ -1,25 +1,16 @@ fileFormatVersion: 2 -guid: 31ca969f093921f43bf7371d2303239b +guid: 5486a1a22e6655c48b48576143e19e95 PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - - first: - '': OSXIntel - second: - enabled: 1 - settings: - CPU: AnyCPU - - first: - '': OSXIntel64 - second: - enabled: 0 - settings: - CPU: None - first: Any: second: diff --git a/Assets/Plugins/x86_64/discord_game_sdk.bundle b/Assets/Plugins/x86_64/discord_game_sdk.bundle index 24045f792..3402426b8 100644 Binary files a/Assets/Plugins/x86_64/discord_game_sdk.bundle and b/Assets/Plugins/x86_64/discord_game_sdk.bundle differ diff --git a/Assets/Plugins/x86_64/discord_game_sdk.bundle.meta b/Assets/Plugins/x86_64/discord_game_sdk.bundle.meta index 1b7c12552..f15f52d39 100644 --- a/Assets/Plugins/x86_64/discord_game_sdk.bundle.meta +++ b/Assets/Plugins/x86_64/discord_game_sdk.bundle.meta @@ -1,25 +1,16 @@ fileFormatVersion: 2 -guid: 6a5a0ea0dd0681e4e8ad89dce287b4dc +guid: cbd617ca6c1ab4f4ab40f28081481e68 PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - - first: - '': OSXIntel - second: - enabled: 0 - settings: - CPU: None - - first: - '': OSXIntel64 - second: - enabled: 1 - settings: - CPU: AnyCPU - first: Any: second: diff --git a/Assets/Plugins/x86_64/discord_game_sdk.dll b/Assets/Plugins/x86_64/discord_game_sdk.dll index 10a8928f9..be946ea70 100644 Binary files a/Assets/Plugins/x86_64/discord_game_sdk.dll and b/Assets/Plugins/x86_64/discord_game_sdk.dll differ diff --git a/Assets/Plugins/x86_64/discord_game_sdk.dll.lib b/Assets/Plugins/x86_64/discord_game_sdk.dll.lib index 8ab3d4cb4..562b01cdc 100644 Binary files a/Assets/Plugins/x86_64/discord_game_sdk.dll.lib and b/Assets/Plugins/x86_64/discord_game_sdk.dll.lib differ diff --git a/Assets/Plugins/x86_64/discord_game_sdk.dll.lib.meta b/Assets/Plugins/x86_64/discord_game_sdk.dll.lib.meta index a9a8bac57..3e0653e74 100644 --- a/Assets/Plugins/x86_64/discord_game_sdk.dll.lib.meta +++ b/Assets/Plugins/x86_64/discord_game_sdk.dll.lib.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 571a9860038e284438acebec5166f4a2 +guid: e956840ab7bcae84f9acd8604ca1da39 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Plugins/x86_64/discord_game_sdk.dll.meta b/Assets/Plugins/x86_64/discord_game_sdk.dll.meta index 64c1cca6e..3da389c50 100644 --- a/Assets/Plugins/x86_64/discord_game_sdk.dll.meta +++ b/Assets/Plugins/x86_64/discord_game_sdk.dll.meta @@ -5,8 +5,11 @@ PluginImporter: serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - first: '': OSXIntel diff --git a/Assets/Plugins/x86_64/discord_game_sdk.dylib b/Assets/Plugins/x86_64/discord_game_sdk.dylib index 24045f792..3402426b8 100644 Binary files a/Assets/Plugins/x86_64/discord_game_sdk.dylib and b/Assets/Plugins/x86_64/discord_game_sdk.dylib differ diff --git a/Assets/Plugins/x86_64/discord_game_sdk.dylib.meta b/Assets/Plugins/x86_64/discord_game_sdk.dylib.meta index 1b3703b68..a56700284 100644 --- a/Assets/Plugins/x86_64/discord_game_sdk.dylib.meta +++ b/Assets/Plugins/x86_64/discord_game_sdk.dylib.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b8ae41ee9553bd448891791ac3d5494d +guid: 5a1889f8a47ee2149ade77d68d0ad58d DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Plugins/x86_64/discord_game_sdk.so b/Assets/Plugins/x86_64/discord_game_sdk.so index e46576062..9dacf9461 100644 Binary files a/Assets/Plugins/x86_64/discord_game_sdk.so and b/Assets/Plugins/x86_64/discord_game_sdk.so differ diff --git a/Assets/Plugins/x86_64/discord_game_sdk.so.meta b/Assets/Plugins/x86_64/discord_game_sdk.so.meta index db6f520ed..5446c0544 100644 --- a/Assets/Plugins/x86_64/discord_game_sdk.so.meta +++ b/Assets/Plugins/x86_64/discord_game_sdk.so.meta @@ -1,25 +1,16 @@ fileFormatVersion: 2 -guid: d603835f770d5e849a5c75e0fa3bcabd +guid: 04ead618fe2bfcc49b3fc9c4fa5b3a90 PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - - first: - '': OSXIntel - second: - enabled: 0 - settings: - CPU: None - - first: - '': OSXIntel64 - second: - enabled: 1 - settings: - CPU: AnyCPU - first: Any: second: diff --git a/Assets/Resources/Prefabs/DialogBubble.prefab b/Assets/Resources/Prefabs/DialogBubble.prefab index f4c35cf90..ca9efc005 100644 --- a/Assets/Resources/Prefabs/DialogBubble.prefab +++ b/Assets/Resources/Prefabs/DialogBubble.prefab @@ -3,14 +3,18 @@ --- !u!1 &186892 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - 224: {fileID: 22457756} - - 222: {fileID: 22251884} - - 114: {fileID: 11464268} - - 114: {fileID: 11442310} + - component: {fileID: 22457756} + - component: {fileID: 22251884} + - component: {fileID: 7243159785364819780} + - component: {fileID: 7243002510014050802} + - component: {fileID: 7243796318394485048} + - component: {fileID: 7243296499168504066} + - component: {fileID: 7243215545473884014} m_Layer: 5 m_Name: DialogBubble m_TagString: Untagged @@ -18,26 +22,44 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &11442310 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} +--- !u!224 &22457756 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 186892} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 96dc5aa61b3446942acd3e628a7d73d0, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &11464268 + 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_Children: + - {fileID: 7171881695221985094} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 480} + m_SizeDelta: {x: 640, y: 480} + m_Pivot: {x: 0, y: 1} +--- !u!222 &22251884 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 186892} + m_CullTransparentMesh: 0 +--- !u!114 &7243159785364819780 MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 186892} m_Enabled: 0 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: c152f559704a98f488c1e63266ed7418, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -46,9 +68,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -56,81 +76,229 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!222 &22251884 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_UseSpriteMesh: 0 + inverted: 0 +--- !u!114 &7243002510014050802 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 186892} ---- !u!224 &22457756 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7bbc081086ab24d458b6c45dcf29bf75, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &7243796318394485048 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 186892} - 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_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 99, y: 108} - m_Pivot: {x: 0, y: 1} ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &7243296499168504066 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 186892} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 +--- !u!114 &7243215545473884014 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 186892} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6c7b8a91bf13f244b93c1a72a65984e5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &7171881695233233282 +PrefabInstance: + m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 22457756} m_Modifications: - - target: {fileID: 0} - propertyPath: m_Enabled + - target: {fileID: 134386, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_Name + value: CstmTxtContainer + objectReference: {fileID: 0} + - target: {fileID: 11462692, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: autoSetLayer value: 0 objectReference: {fileID: 0} - - target: {fileID: 0} + - target: {fileID: 11462692, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: noAutoLineBreak + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11462692, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: needFontReset + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11462692, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: progress + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11462692, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: deleteWhenFinished + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22411304, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 22411304, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 22411304, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 0} + - target: {fileID: 22411304, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 22411304, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 22411304, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 22411304, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_AnchoredPosition.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_AnchorMax.x + - target: {fileID: 22411304, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 22411304, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_AnchorMax.y + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_AnchoredPosition.x + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_Pivot.x + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_AnchoredPosition.y + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_Pivot.y + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_AnchoredPosition.x + value: -320 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_AnchoredPosition.y + value: -240 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_SizeDelta.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_SizeDelta.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_Sprite - value: - objectReference: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} - - target: {fileID: 0} - propertyPath: m_Type + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 22496986, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_AnchoredPosition.x + value: -62 + objectReference: {fileID: 0} + - target: {fileID: 22496986, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_Pivot.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 22496986, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 58 + objectReference: {fileID: 0} + - target: {fileID: 22496986, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 186892} - m_IsPrefabParent: 1 + m_SourcePrefab: {fileID: 100100000, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} +--- !u!224 &7171881695221985094 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, + type: 3} + m_PrefabInstance: {fileID: 7171881695233233282} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Prefabs/Keybinding.prefab b/Assets/Resources/Prefabs/Keybinding.prefab new file mode 100644 index 000000000..d43515dfb --- /dev/null +++ b/Assets/Resources/Prefabs/Keybinding.prefab @@ -0,0 +1,1062 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6195791463972921765 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6195791463972921762} + - component: {fileID: 6195791463972921760} + - component: {fileID: 6195791463972921763} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6195791463972921762 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6195791463972921765} + 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_Children: [] + m_Father: {fileID: 6195791464691190923} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 110, y: 40} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &6195791463972921760 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6195791463972921765} + m_CullTransparentMesh: 0 +--- !u!114 &6195791463972921763 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6195791463972921765} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: a5a3b9aa4e92cfd4a9014c429c6a7e4e, type: 3} + m_FontSize: 32 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Confirm + +' +--- !u!1 &6195791464298063074 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6195791464298063075} + - component: {fileID: 6195791464298063073} + - component: {fileID: 6195791464298063072} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6195791464298063075 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6195791464298063074} + 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_Children: [] + m_Father: {fileID: 6195791464691190923} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &6195791464298063073 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6195791464298063074} + m_CullTransparentMesh: 0 +--- !u!114 &6195791464298063072 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6195791464298063074} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: c70cf2ea859a4094dbbdec828a55ef8b, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!1 &6195791464691190922 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6195791464691190923} + - component: {fileID: 6437133863614902638} + m_Layer: 5 + m_Name: Keybinding + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6195791464691190923 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6195791464691190922} + 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_Children: + - {fileID: 6435691881106882187} + - {fileID: 3248415385365244106} + - {fileID: 5535480206333731716} + - {fileID: 6195791463972921762} + - {fileID: 6195791464298063075} + - {fileID: 6195791465658335272} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 20, y: -20} + m_SizeDelta: {x: 300, y: 40} + m_Pivot: {x: 0, y: 1} +--- !u!114 &6437133863614902638 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6195791464691190922} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9580cf12eed84fd479de25a93c2e8b8d, type: 3} + m_Name: + m_EditorClassIdentifier: + Name: Keybinding + Edit: {fileID: 6435691881106882184} + Reset: {fileID: 3248415385365244105} + Clear: {fileID: 5535480206333731719} + Text: {fileID: 6195791463972921763} + KeyList: {fileID: 6195791465658335273} + Image: {fileID: 6195791464298063072} +--- !u!1 &6195791465658335275 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6195791465658335272} + - component: {fileID: 6195791465658335254} + - component: {fileID: 6195791465658335273} + m_Layer: 5 + m_Name: KeyList + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6195791465658335272 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6195791465658335275} + 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_Children: [] + m_Father: {fileID: 6195791464691190923} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 40, y: 0} + m_SizeDelta: {x: 260, y: 40} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &6195791465658335254 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6195791465658335275} + m_CullTransparentMesh: 0 +--- !u!114 &6195791465658335273 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6195791465658335275} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: a5a3b9aa4e92cfd4a9014c429c6a7e4e, type: 3} + m_FontSize: 32 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 4 + m_MaxSize: 32 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Z, Enter +--- !u!1001 &125509333232071130 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6195791464691190923} + m_Modifications: + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_Alignment + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Text + value: Edit + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_FontSize + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_MaxSize + value: 212 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_MinSize + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Name + value: Edit + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.r + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.g + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.b + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.a + value: 0.5019608 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 06a74376a3db7d744b36f7bb52973cf7, type: 3} +--- !u!224 &6435691881106882187 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 125509333232071130} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6435691881106882184 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6408004043003039570, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 125509333232071130} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &1458097908330851541 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6195791464691190923} + m_Modifications: + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_Alignment + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Text + value: Clear + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_FontSize + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_MaxSize + value: 212 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_MinSize + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Name + value: Clear + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 120 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.r + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.g + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.b + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.a + value: 0.5019608 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 06a74376a3db7d744b36f7bb52973cf7, type: 3} +--- !u!224 &5535480206333731716 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 1458097908330851541} + m_PrefabAsset: {fileID: 0} +--- !u!114 &5535480206333731719 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6408004043003039570, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 1458097908330851541} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &8500963403226769307 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6195791464691190923} + m_Modifications: + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_Alignment + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Text + value: Reset + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_FontSize + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_MaxSize + value: 212 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_MinSize + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Name + value: Reset + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.r + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.g + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.b + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.a + value: 0.5019608 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 06a74376a3db7d744b36f7bb52973cf7, type: 3} +--- !u!224 &3248415385365244106 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 8500963403226769307} + m_PrefabAsset: {fileID: 0} +--- !u!114 &3248415385365244105 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6408004043003039570, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 8500963403226769307} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Resources/Prefabs/Keybinding.prefab.meta b/Assets/Resources/Prefabs/Keybinding.prefab.meta new file mode 100644 index 000000000..91f383652 --- /dev/null +++ b/Assets/Resources/Prefabs/Keybinding.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5c826c0d5339343438211217ebd3152c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/ModButton.prefab b/Assets/Resources/Prefabs/ModButton.prefab index 80b6ba982..6aaf2e160 100644 --- a/Assets/Resources/Prefabs/ModButton.prefab +++ b/Assets/Resources/Prefabs/ModButton.prefab @@ -1,207 +1,282 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &141740 +--- !u!1 &6408004042313889261 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - 224: {fileID: 22436962} - - 222: {fileID: 22201924} - - 114: {fileID: 11408988} - - 114: {fileID: 11400648} + - component: {fileID: 6408004042313889262} + - component: {fileID: 6408004042313889256} + - component: {fileID: 6408004042313889263} m_Layer: 5 - m_Name: ModButton + m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &174634 +--- !u!224 &6408004042313889262 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6408004042313889261} + 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_Children: [] + m_Father: {fileID: 6408004043003039569} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 5, y: 0} + m_SizeDelta: {x: -10, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6408004042313889256 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6408004042313889261} + m_CullTransparentMesh: 0 +--- !u!114 &6408004042313889263 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6408004042313889261} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: a5a3b9aa4e92cfd4a9014c429c6a7e4e, type: 3} + m_FontSize: 16 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 0 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: " \u2190 Back" +--- !u!1 &6408004042703340350 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - 224: {fileID: 22448766} - - 222: {fileID: 22219704} - - 114: {fileID: 11471730} + - component: {fileID: 6408004042703340351} + - component: {fileID: 6408004042703340345} + - component: {fileID: 6408004042703340344} m_Layer: 5 - m_Name: Text + m_Name: Fill m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &11400648 +--- !u!224 &6408004042703340351 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6408004042703340350} + 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_Children: [] + m_Father: {fileID: 6408004043003039569} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 420, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6408004042703340345 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6408004042703340350} + m_CullTransparentMesh: 1 +--- !u!114 &6408004042703340344 MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 141740} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6408004042703340350} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} - m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} - m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} - m_ColorMultiplier: 1 - m_FadeDuration: .100000001 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 11408988} - m_OnClick: + m_Material: {fileID: 0} + m_Color: {r: 0.1254902, g: 0.1254902, b: 0.1254902, a: 0.5019608} + m_RaycastTarget: 1 + m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &11408988 + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!1 &6408004043003039568 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6408004043003039569} + - component: {fileID: 6408004043003039580} + - component: {fileID: 6408004043003039571} + - component: {fileID: 6408004043003039570} + - component: {fileID: 6408004043003039581} + m_Layer: 5 + m_Name: ModButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6408004043003039569 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6408004043003039568} + 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_Children: + - {fileID: 6408004042703340351} + - {fileID: 6408004042313889262} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 100} + m_SizeDelta: {x: 430, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6408004043003039580 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6408004043003039568} + m_CullTransparentMesh: 1 +--- !u!114 &6408004043003039571 MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 141740} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6408004043003039568} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.7529412, g: 0.7529412, b: 0.7529412, a: 0.5019608} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 - m_FillCenter: 1 + m_FillCenter: 0 m_FillMethod: 4 m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &11471730 + m_UseSpriteMesh: 0 +--- !u!114 &6408004043003039570 MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 174634} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6408004043003039568} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 0.2509804} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 5 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6408004043003039571} + m_OnClick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 3 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Button ---- !u!222 &22201924 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 141740} ---- !u!222 &22219704 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 174634} ---- !u!224 &22436962 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 141740} - 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_Children: - - {fileID: 22448766} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 20, y: -50} - m_SizeDelta: {x: 300, y: 30} - m_Pivot: {x: 0, y: 1} ---- !u!224 &22448766 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 174634} - 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_Children: [] - m_Father: {fileID: 22436962} - m_RootOrder: 0 - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 4, y: 0} - m_SizeDelta: {x: -8, y: 0} - m_Pivot: {x: .5, y: .5} ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 0} - propertyPath: m_SizeDelta.x - value: -8 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_FontData.m_Alignment - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 0} - propertyPath: m_AnchoredPosition.x - value: 4 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 141740} - m_IsPrefabParent: 1 +--- !u!114 &6408004043003039581 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6408004043003039568} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 525e6c79af09d3a4cbba3b47269cf03f, type: 3} + m_Name: + m_EditorClassIdentifier: + NormalColor: {r: 0.7529412, g: 0.7529412, b: 0.7529412, a: 0.5019608} + HoverColor: {r: 0.7529412, g: 0.7529412, b: 0.7529412, a: 1} + lockAnimation: 0 diff --git a/Assets/Resources/Prefabs/ModButton.prefab.meta b/Assets/Resources/Prefabs/ModButton.prefab.meta index eab6bccd5..a2a478606 100644 --- a/Assets/Resources/Prefabs/ModButton.prefab.meta +++ b/Assets/Resources/Prefabs/ModButton.prefab.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 39f0d6b05fe50e94d829efd22dea79ce -timeCreated: 1447530480 -licenseType: Free -NativeFormatImporter: +guid: 06a74376a3db7d744b36f7bb52973cf7 +PrefabImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/Prefabs/ModButtonNew.prefab b/Assets/Resources/Prefabs/ModButtonNew.prefab deleted file mode 100644 index 96ff4d066..000000000 --- a/Assets/Resources/Prefabs/ModButtonNew.prefab +++ /dev/null @@ -1,198 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &113044 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 - m_Component: - - 224: {fileID: 22473760} - - 222: {fileID: 22228730} - - 114: {fileID: 11464344} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &166588 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 - m_Component: - - 224: {fileID: 22408802} - - 222: {fileID: 22295474} - - 114: {fileID: 11447648} - - 114: {fileID: 11408110} - m_Layer: 5 - m_Name: ModButtonNew - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &11408110 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 166588} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 11447648} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &11447648 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 166588} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!114 &11464344 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 113044} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Button ---- !u!222 &22228730 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 113044} ---- !u!222 &22295474 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 166588} ---- !u!224 &22408802 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 166588} - 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_Children: - - {fileID: 22473760} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 300, y: 30} - m_Pivot: {x: 0, y: 1} ---- !u!224 &22473760 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 113044} - 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_Children: [] - m_Father: {fileID: 22408802} - m_RootOrder: 0 - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 5, y: 0} - m_SizeDelta: {x: -10, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 166588} - m_IsPrefabParent: 1 diff --git a/Assets/Resources/Prefabs/ModButtonNew.prefab.meta b/Assets/Resources/Prefabs/ModButtonNew.prefab.meta deleted file mode 100644 index 28da5a805..000000000 --- a/Assets/Resources/Prefabs/ModButtonNew.prefab.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 46ac502bde31fce439649ca03092ebbf -timeCreated: 1478969959 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sprites/mm.png b/Assets/Resources/Sprites/mm.png index cb4feddcd..c9ecc7012 100644 Binary files a/Assets/Resources/Sprites/mm.png and b/Assets/Resources/Sprites/mm.png differ diff --git a/Assets/Resources/Sprites/mm2.png b/Assets/Resources/Sprites/mm2.png index 64a19cbbc..e69f55dd1 100644 Binary files a/Assets/Resources/Sprites/mm2.png and b/Assets/Resources/Sprites/mm2.png differ diff --git a/Assets/Scenes/Battle.unity b/Assets/Scenes/Battle.unity index 5578f354a..7d78c799a 100644 --- a/Assets/Scenes/Battle.unity +++ b/Assets/Scenes/Battle.unity @@ -50,7 +50,6 @@ LightmapSettings: m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 @@ -117,7 +116,8 @@ NavMeshSettings: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 113347613} @@ -133,7 +133,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 113347612} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -151,7 +152,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 113347612} m_Enabled: 1 m_EditorHideFlags: 0 @@ -161,11 +163,12 @@ MonoBehaviour: letterSound: $ currentLine: 0 _textMaxWidth: 320 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + columnShift: 265 + columnNumber: 2 blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -173,7 +176,8 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 132697918} @@ -193,7 +197,8 @@ GameObject: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 132697915} m_Enabled: 1 m_EditorHideFlags: 0 @@ -206,8 +211,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -216,18 +219,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &132697917 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 132697915} m_CullTransparentMesh: 0 --- !u!224 &132697918 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 132697915} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -245,7 +251,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 132697915} m_Enabled: 1 m_EditorHideFlags: 0 @@ -258,7 +265,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 132697915} m_Enabled: 1 m_EditorHideFlags: 0 @@ -269,7 +277,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 132697915} m_Enabled: 1 m_EditorHideFlags: 0 @@ -280,7 +289,8 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 141548672} @@ -295,7 +305,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 141548671} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -313,8 +324,9 @@ RectTransform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 152242, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 185940574} @@ -331,8 +343,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22453886, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 185940573} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -350,8 +363,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11473188, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 185940573} m_Enabled: 1 m_EditorHideFlags: 0 @@ -364,8 +378,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 4b37e1b67779d8043af7039f25b19a78, type: 3} m_Type: 0 m_PreserveAspect: 1 @@ -374,20 +386,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &185940576 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22231318, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 185940573} m_CullTransparentMesh: 0 --- !u!1 &209795024 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 127862, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 209795025} @@ -404,8 +419,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22419362, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 209795024} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -423,8 +439,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11443696, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 209795024} m_Enabled: 1 m_EditorHideFlags: 0 @@ -437,8 +454,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 9bb9d61156064854da1ac61f68990ce9, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -447,20 +462,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &209795027 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22277692, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 209795024} m_CullTransparentMesh: 0 --- !u!1 &284158366 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 100010, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 284158367} @@ -477,8 +495,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22416422, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 284158366} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -496,8 +515,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11450012, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 284158366} m_Enabled: 1 m_EditorHideFlags: 0 @@ -510,8 +530,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -520,19 +538,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &284158369 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22288474, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 284158366} m_CullTransparentMesh: 0 --- !u!1 &310815950 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 310815951} @@ -547,7 +568,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 310815950} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -565,7 +587,8 @@ RectTransform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 358466701} @@ -580,7 +603,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 358466700} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -599,8 +623,9 @@ RectTransform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 199640, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 364169964} @@ -617,8 +642,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22405706, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 364169963} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -636,8 +662,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11400360, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 364169963} m_Enabled: 1 m_EditorHideFlags: 0 @@ -650,8 +677,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 361c275b93f22de45900062ada7925f1, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -660,19 +685,136 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &364169966 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22236428, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 364169963} m_CullTransparentMesh: 0 +--- !u!1 &459985788 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 459985789} + - component: {fileID: 459985792} + - component: {fileID: 459985790} + - component: {fileID: 459985794} + - component: {fileID: 459985793} + - component: {fileID: 459985791} + m_Layer: 5 + m_Name: MugshotMask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &459985789 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 459985788} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0009999, y: 1.0009999, z: 1} + m_Children: + - {fileID: 880643017} + m_Father: {fileID: 1502133296} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 130, y: 130} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &459985790 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 459985788} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6c7b8a91bf13f244b93c1a72a65984e5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &459985791 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 459985788} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!222 &459985792 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 459985788} + m_CullTransparentMesh: 0 +--- !u!114 &459985793 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 459985788} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 +--- !u!114 &459985794 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 459985788} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c152f559704a98f488c1e63266ed7418, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + inverted: 0 --- !u!1 &506907622 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 506907623} @@ -691,7 +833,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 506907622} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -709,7 +852,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 506907622} m_Enabled: 1 m_EditorHideFlags: 0 @@ -722,8 +866,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -732,18 +874,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &506907625 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 506907622} m_CullTransparentMesh: 0 --- !u!114 &506907626 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 506907622} m_Enabled: 1 m_EditorHideFlags: 0 @@ -756,7 +901,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 506907622} m_Enabled: 1 m_EditorHideFlags: 0 @@ -767,8 +913,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 159716, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 516848001} @@ -785,8 +932,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22456078, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 516848000} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -804,8 +952,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11438016, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 516848000} m_Enabled: 1 m_EditorHideFlags: 0 @@ -818,8 +967,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: d4b1335871fb6b549a5bd165cbc60327, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -828,20 +975,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &516848003 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22203948, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 516848000} m_CullTransparentMesh: 0 --- !u!1 &573913229 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 152242, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 573913230} @@ -858,8 +1008,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22453886, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 573913229} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -877,8 +1028,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11473188, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 573913229} m_Enabled: 1 m_EditorHideFlags: 0 @@ -891,8 +1043,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 4b37e1b67779d8043af7039f25b19a78, type: 3} m_Type: 0 m_PreserveAspect: 1 @@ -901,19 +1051,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &573913232 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22231318, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 573913229} m_CullTransparentMesh: 0 --- !u!1 &599533877 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 599533878} @@ -928,7 +1081,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 599533877} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -947,7 +1101,8 @@ RectTransform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 610348798} @@ -967,7 +1122,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 610348797} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -986,7 +1142,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 610348797} m_Enabled: 1 m_EditorHideFlags: 0 @@ -999,8 +1156,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} m_Type: 0 m_PreserveAspect: 0 @@ -1009,18 +1164,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &610348800 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 610348797} m_CullTransparentMesh: 0 --- !u!114 &610348801 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 610348797} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1047,7 +1205,8 @@ MonoBehaviour: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 610348797} m_Enabled: 1 serializedVersion: 4 @@ -1142,7 +1301,8 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 610348797} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1155,7 +1315,8 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 639286008} @@ -1176,7 +1337,8 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 639286007} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 320, y: 240, z: 0} @@ -1189,7 +1351,8 @@ Transform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 639286007} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1200,7 +1363,8 @@ MonoBehaviour: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 639286007} m_Enabled: 1 serializedVersion: 4 @@ -1295,28 +1459,32 @@ AudioSource: AudioListener: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 639286007} m_Enabled: 1 --- !u!124 &639286012 Behaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 639286007} m_Enabled: 1 --- !u!92 &639286013 Behaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 639286007} m_Enabled: 1 --- !u!20 &639286014 Camera: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 639286007} m_Enabled: 1 serializedVersion: 2 @@ -1325,6 +1493,7 @@ Camera: m_projectionMatrixMode: 1 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} + m_GateFitMode: 2 m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 @@ -1356,7 +1525,8 @@ Camera: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 651146614} @@ -1373,7 +1543,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 651146613} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1391,7 +1562,8 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 651146613} m_Enabled: 1 serializedVersion: 4 @@ -1486,14 +1658,15 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 651146613} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 3cd5272475a518749a954d77524c56f1, type: 3} m_Name: m_EditorClassIdentifier: - mainTextManager: {fileID: 1003495344} + mainTextManager: {fileID: 0} fightButton: {fileID: 1745075055} actButton: {fileID: 991344421} itemButton: {fileID: 506907624} @@ -1535,7 +1708,8 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 669874878} @@ -1550,7 +1724,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 669874877} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1568,8 +1743,9 @@ RectTransform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 191078, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 743543924} @@ -1585,8 +1761,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22496986, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 743543923} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1614,16 +1791,18 @@ RectTransform: CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22259784, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 743543923} m_CullTransparentMesh: 0 --- !u!1 &773549145 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 174686, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 773549146} @@ -1640,8 +1819,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22429080, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 773549145} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1659,8 +1839,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11429644, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 773549145} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1673,8 +1854,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -1683,12 +1862,14 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &773549148 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22243510, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 773549145} m_CullTransparentMesh: 0 --- !u!1 &778448265 @@ -1696,7 +1877,8 @@ GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 150814, guid: b52d5d8cf9ddaf740a8cf6024b1bca2f, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1952845558} @@ -1713,7 +1895,8 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11486350, guid: b52d5d8cf9ddaf740a8cf6024b1bca2f, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 778448265} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1732,8 +1915,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 157610, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 844207266} @@ -1750,8 +1934,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22498740, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 844207265} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1769,8 +1954,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11441354, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 844207265} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1783,8 +1969,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -1793,20 +1977,108 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &844207268 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22281488, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 844207265} m_CullTransparentMesh: 0 +--- !u!1 &880643016 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 880643017} + - component: {fileID: 880643020} + - component: {fileID: 880643019} + - component: {fileID: 880643018} + m_Layer: 5 + m_Name: Mugshot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &880643017 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 880643016} + 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_Children: [] + m_Father: {fileID: 459985789} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 130, y: 130} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &880643018 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 880643016} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6c7b8a91bf13f244b93c1a72a65984e5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &880643019 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 880643016} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &880643020 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 880643016} + m_CullTransparentMesh: 0 --- !u!1 &913680302 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 128286, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 913680303} @@ -1823,8 +2095,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22494804, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 913680302} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1842,8 +2115,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11495342, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 913680302} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1856,8 +2130,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 8a1c3af710aafa04bb78a9d6e1027114, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -1866,19 +2138,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &913680305 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22234048, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 913680302} m_CullTransparentMesh: 0 --- !u!1 &930260304 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 930260305} @@ -1895,7 +2170,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 930260304} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 90} @@ -1927,7 +2203,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 930260304} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1943,7 +2220,8 @@ MonoBehaviour: Canvas: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 930260304} m_Enabled: 1 serializedVersion: 3 @@ -1963,7 +2241,8 @@ Canvas: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 944112583} @@ -1978,7 +2257,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 944112582} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1996,7 +2276,8 @@ RectTransform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 991344420} @@ -2015,7 +2296,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 991344419} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2033,7 +2315,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 991344419} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2046,8 +2329,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -2056,18 +2337,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &991344422 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 991344419} m_CullTransparentMesh: 0 --- !u!114 &991344423 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 991344419} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2080,74 +2364,20 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 991344419} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6c7b8a91bf13f244b93c1a72a65984e5, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1003495342 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1003495343} - - component: {fileID: 1003495344} - m_Layer: 0 - m_Name: TextManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1003495343 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1003495342} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1502133296} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -267, y: -14} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0, y: 1} ---- !u!114 &1003495344 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1003495342} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 96dc5aa61b3446942acd3e628a7d73d0, type: 3} - m_Name: - m_EditorClassIdentifier: - letterSound: $ - currentLine: 0 - _textMaxWidth: 0 - currentReferenceCharacter: 0 - nextMonsterDialogueOnce: 0 - nmd2: 0 - wasStated: 0 - offset: {x: 0, y: 0} - blockSkip: 0 - skipNowIfBlocked: 0 - lateStartWaiting: 0 --- !u!1 &1007297935 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1007297936} @@ -2165,7 +2395,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1007297935} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.019515278} @@ -2185,7 +2416,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1007297935} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2198,8 +2430,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 9e5b8c252281549c3a05df1a46e5267a, type: 3} m_Type: 1 m_PreserveAspect: 0 @@ -2208,18 +2438,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1007297938 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1007297935} m_CullTransparentMesh: 0 --- !u!114 &1007297939 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1007297935} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2235,11 +2468,148 @@ MonoBehaviour: desiredHeight: 0 desiredX: 0 desiredY: 0 + showWhenWaveEnds: 0 +--- !u!1001 &1197438037 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1502133296} + m_Modifications: + - target: {fileID: 134386, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_Name + value: CstmTxtContainer + objectReference: {fileID: 0} + - target: {fileID: 191078, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11462692, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: needFontReset + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11462692, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: noAutoLineBreak + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11462692, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: progress + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11462692, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: deleteWhenFinished + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11462692, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: autoSetLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11462692, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: isMainTextObject + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11462692, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: _textMaxWidth + value: 534 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_LocalPosition.z + value: -9.999999 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_AnchoredPosition.x + value: -267 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_AnchoredPosition.y + value: -42 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_SizeDelta.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_SizeDelta.y + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e24fd648e823f074cb0fcadd09d5b42a, type: 3} +--- !u!224 &1197438038 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 22412996, guid: e24fd648e823f074cb0fcadd09d5b42a, + type: 3} + m_PrefabInstance: {fileID: 1197438037} + m_PrefabAsset: {fileID: 0} --- !u!1 &1280180705 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1280180706} @@ -2258,7 +2628,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1280180705} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2276,7 +2647,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1280180705} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2289,8 +2661,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -2299,18 +2669,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1280180708 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1280180705} m_CullTransparentMesh: 0 --- !u!114 &1280180709 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1280180705} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2323,7 +2696,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1280180705} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2334,7 +2708,8 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1304618330} @@ -2354,7 +2729,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1304618329} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2372,7 +2748,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1304618329} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2385,8 +2762,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -2395,18 +2770,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1304618332 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1304618329} m_CullTransparentMesh: 0 --- !u!114 &1304618333 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1304618329} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2417,7 +2795,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1304618329} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2428,7 +2807,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1304618329} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2439,7 +2819,8 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1306673876} @@ -2458,7 +2839,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1306673875} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2476,7 +2858,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1306673875} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2489,7 +2872,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1306673875} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2502,8 +2886,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -2512,18 +2894,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1306673879 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1306673875} m_CullTransparentMesh: 0 --- !u!114 &1306673880 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1306673875} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2534,8 +2919,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 171992, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1313924453} @@ -2552,8 +2938,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22425498, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1313924452} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2571,8 +2958,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11452418, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1313924452} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2585,8 +2973,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -2595,19 +2981,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1313924455 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22259690, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1313924452} m_CullTransparentMesh: 0 --- !u!1 &1320941747 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1320941748} @@ -2622,7 +3011,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1320941747} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2643,7 +3033,8 @@ RectTransform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1324215185} @@ -2660,7 +3051,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1324215184} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 100} @@ -2682,7 +3074,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1324215184} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2698,7 +3091,8 @@ MonoBehaviour: Canvas: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1324215184} m_Enabled: 1 serializedVersion: 3 @@ -2718,7 +3112,8 @@ Canvas: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1339418278} @@ -2734,7 +3129,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1339418277} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2753,7 +3149,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1339418277} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2763,16 +3160,22 @@ MonoBehaviour: letterSound: currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + columnShift: 265 + columnNumber: 2 blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 bubble: 0 + progress: 0 autoSetLayer: 0 + needFontReset: 0 + noAutoLineBreak: 0 + isMainTextObject: 0 + noSelfAdvance: 0 deleteWhenFinished: 1 _color: {r: 1, g: 1, b: 1, a: 1} hasColorBeenSet: 0 @@ -2781,8 +3184,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 128286, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1339420634} @@ -2799,8 +3203,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22494804, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1339420633} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2818,8 +3223,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11495342, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1339420633} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2832,8 +3238,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 8a1c3af710aafa04bb78a9d6e1027114, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -2842,19 +3246,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1339420636 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22234048, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1339420633} m_CullTransparentMesh: 0 --- !u!1 &1438538682 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1438538683} @@ -2869,7 +3276,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1438538682} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2887,7 +3295,8 @@ RectTransform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1443796532} @@ -2902,7 +3311,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1443796531} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 50} @@ -2921,8 +3331,9 @@ RectTransform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 199640, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1467740442} @@ -2939,8 +3350,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22405706, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1467740441} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2958,8 +3370,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11400360, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1467740441} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2972,8 +3385,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 361c275b93f22de45900062ada7925f1, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -2982,169 +3393,172 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1467740444 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22236428, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1467740441} m_CullTransparentMesh: 0 --- !u!1001 &1470743182 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 1320941748} m_Modifications: + - target: {fileID: 114540410594994212, guid: e304c26fb72bbec409a44c8b281d4f8c, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114540410594994212, guid: e304c26fb72bbec409a44c8b281d4f8c, + type: 3} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114540410594994212, guid: e304c26fb72bbec409a44c8b281d4f8c, + type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114984367897565676, guid: e304c26fb72bbec409a44c8b281d4f8c, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224013813592148948, guid: e304c26fb72bbec409a44c8b281d4f8c, + type: 3} + propertyPath: m_SizeDelta.x + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 224013813592148948, guid: e304c26fb72bbec409a44c8b281d4f8c, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224013813592148948, guid: e304c26fb72bbec409a44c8b281d4f8c, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 224457915871606856, guid: e304c26fb72bbec409a44c8b281d4f8c, - type: 2} + type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 224457915871606856, guid: e304c26fb72bbec409a44c8b281d4f8c, - type: 2} + type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - target: {fileID: 224457915871606856, guid: e304c26fb72bbec409a44c8b281d4f8c, - type: 2} + type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - target: {fileID: 224457915871606856, guid: e304c26fb72bbec409a44c8b281d4f8c, - type: 2} + type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - target: {fileID: 224457915871606856, guid: e304c26fb72bbec409a44c8b281d4f8c, - type: 2} + type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - target: {fileID: 224457915871606856, guid: e304c26fb72bbec409a44c8b281d4f8c, - type: 2} + type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - target: {fileID: 224457915871606856, guid: e304c26fb72bbec409a44c8b281d4f8c, - type: 2} + type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - target: {fileID: 224457915871606856, guid: e304c26fb72bbec409a44c8b281d4f8c, - type: 2} + type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - target: {fileID: 224457915871606856, guid: e304c26fb72bbec409a44c8b281d4f8c, - type: 2} + type: 3} propertyPath: m_AnchoredPosition.x value: 31 objectReference: {fileID: 0} - target: {fileID: 224457915871606856, guid: e304c26fb72bbec409a44c8b281d4f8c, - type: 2} + type: 3} propertyPath: m_AnchoredPosition.y value: -14 objectReference: {fileID: 0} - target: {fileID: 224457915871606856, guid: e304c26fb72bbec409a44c8b281d4f8c, - type: 2} + type: 3} propertyPath: m_SizeDelta.x value: 25 objectReference: {fileID: 0} - target: {fileID: 224457915871606856, guid: e304c26fb72bbec409a44c8b281d4f8c, - type: 2} + type: 3} propertyPath: m_SizeDelta.y value: 20 objectReference: {fileID: 0} - target: {fileID: 224457915871606856, guid: e304c26fb72bbec409a44c8b281d4f8c, - type: 2} + type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - target: {fileID: 224457915871606856, guid: e304c26fb72bbec409a44c8b281d4f8c, - type: 2} + type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - target: {fileID: 224457915871606856, guid: e304c26fb72bbec409a44c8b281d4f8c, - type: 2} + type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - target: {fileID: 224457915871606856, guid: e304c26fb72bbec409a44c8b281d4f8c, - type: 2} + type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - target: {fileID: 224457915871606856, guid: e304c26fb72bbec409a44c8b281d4f8c, - type: 2} + type: 3} propertyPath: m_Pivot.x value: 0 objectReference: {fileID: 0} - target: {fileID: 224457915871606856, guid: e304c26fb72bbec409a44c8b281d4f8c, - type: 2} + type: 3} propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - target: {fileID: 224457915871606856, guid: e304c26fb72bbec409a44c8b281d4f8c, - type: 2} + type: 3} propertyPath: m_LocalScale.x value: 1 objectReference: {fileID: 0} - target: {fileID: 224457915871606856, guid: e304c26fb72bbec409a44c8b281d4f8c, - type: 2} + type: 3} propertyPath: m_LocalScale.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 224013813592148948, guid: e304c26fb72bbec409a44c8b281d4f8c, - type: 2} - propertyPath: m_SizeDelta.x - value: 25 - objectReference: {fileID: 0} - - target: {fileID: 224013813592148948, guid: e304c26fb72bbec409a44c8b281d4f8c, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224013813592148948, guid: e304c26fb72bbec409a44c8b281d4f8c, - type: 2} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114540410594994212, guid: e304c26fb72bbec409a44c8b281d4f8c, - type: 2} - propertyPath: m_Color.r - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114540410594994212, guid: e304c26fb72bbec409a44c8b281d4f8c, - type: 2} - propertyPath: m_Color.g - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114540410594994212, guid: e304c26fb72bbec409a44c8b281d4f8c, - type: 2} - propertyPath: m_Color.b - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114984367897565676, guid: e304c26fb72bbec409a44c8b281d4f8c, - type: 2} - propertyPath: m_Color.g - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e304c26fb72bbec409a44c8b281d4f8c, type: 2} - m_IsPrefabAsset: 0 + m_SourcePrefab: {fileID: 100100000, guid: e304c26fb72bbec409a44c8b281d4f8c, type: 3} --- !u!224 &1470743183 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 224457915871606856, guid: e304c26fb72bbec409a44c8b281d4f8c, - type: 2} - m_PrefabInternal: {fileID: 1470743182} + type: 3} + m_PrefabInstance: {fileID: 1470743182} + m_PrefabAsset: {fileID: 0} --- !u!1 &1502133293 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1502133296} @@ -3161,7 +3575,8 @@ GameObject: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1502133293} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3174,8 +3589,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -3184,25 +3597,29 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1502133295 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1502133293} m_CullTransparentMesh: 0 --- !u!224 &1502133296 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1502133293} 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_Children: - - {fileID: 1003495343} + - {fileID: 459985789} - {fileID: 610348798} + - {fileID: 1197438038} m_Father: {fileID: 1007297936} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3215,7 +3632,8 @@ RectTransform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1509689744} @@ -3240,7 +3658,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1509689743} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 40} @@ -3258,7 +3677,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1509689743} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3285,7 +3705,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1509689743} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3298,8 +3719,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} m_Type: 0 m_PreserveAspect: 0 @@ -3308,19 +3727,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 inverted: 0 --- !u!222 &1509689747 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1509689743} m_CullTransparentMesh: 0 --- !u!82 &1509689748 AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1509689743} m_Enabled: 1 serializedVersion: 4 @@ -3415,7 +3837,8 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1509689743} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3428,7 +3851,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1509689743} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3439,7 +3863,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1509689743} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3458,7 +3883,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1509689743} m_Enabled: 0 m_EditorHideFlags: 0 @@ -3469,7 +3895,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1509689743} m_Enabled: 0 m_EditorHideFlags: 0 @@ -3481,7 +3908,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1509689743} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3492,7 +3920,8 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1546366360} @@ -3509,7 +3938,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1546366359} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3527,7 +3957,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1546366359} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3540,8 +3971,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 62f8426a429498442af34752c971234e, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -3550,158 +3979,161 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1546366362 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1546366359} m_CullTransparentMesh: 0 --- !u!1001 &1565117936 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 930260305} m_Modifications: - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} + propertyPath: m_Text + value: Debugger (F9 to toggle, DEBUG(string) to print) + objectReference: {fileID: 0} + - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} + propertyPath: m_FontData.m_Alignment + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} + propertyPath: m_FontData.m_BestFit + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} + propertyPath: m_FontData.m_HorizontalOverflow + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} + propertyPath: m_FontData.m_VerticalOverflow + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} + propertyPath: m_FontData.m_RichText + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: abd91933b51b6fc47931c535c62c6929, + type: 3} + - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} + propertyPath: m_FontData.m_AlignByGeometry + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11453098, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} + propertyPath: maxLines + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_RootOrder value: 13 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_AnchoredPosition.x value: 300 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_AnchoredPosition.y value: 240 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_SizeDelta.x value: 320 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_SizeDelta.y value: 140 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_AnchorMin.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_AnchorMax.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_Pivot.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_Pivot.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} - propertyPath: m_Text - value: Debugger (F9 to toggle, DEBUG(string) to print) - objectReference: {fileID: 0} - - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} - propertyPath: m_FontData.m_Alignment - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} - propertyPath: m_FontData.m_BestFit - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22474774, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22474774, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22474774, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22474774, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_SizeDelta.x value: -10 objectReference: {fileID: 0} - - target: {fileID: 22474774, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22474774, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22474774, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22474774, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_SizeDelta.y value: -10 objectReference: {fileID: 0} - - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} - propertyPath: m_FontData.m_HorizontalOverflow - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} - propertyPath: m_FontData.m_VerticalOverflow - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11453098, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} - propertyPath: maxLines - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} - propertyPath: m_FontData.m_RichText - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} - propertyPath: m_FontData.m_Font - value: - objectReference: {fileID: 12800000, guid: abd91933b51b6fc47931c535c62c6929, - type: 3} - - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} - propertyPath: m_FontData.m_AlignByGeometry - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} - m_IsPrefabAsset: 0 + m_SourcePrefab: {fileID: 100100000, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} --- !u!224 &1565117937 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, - type: 2} - m_PrefabInternal: {fileID: 1565117936} + type: 3} + m_PrefabInstance: {fileID: 1565117936} + m_PrefabAsset: {fileID: 0} --- !u!1 &1570704933 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1570704934} @@ -3717,7 +4149,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1570704933} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3735,7 +4168,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1570704933} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3745,11 +4179,12 @@ MonoBehaviour: letterSound: $ currentLine: 0 _textMaxWidth: 320 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + columnShift: 265 + columnNumber: 2 blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -3757,8 +4192,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 100010, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1642330545} @@ -3775,8 +4211,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22416422, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1642330544} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3794,8 +4231,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11450012, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1642330544} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3808,8 +4246,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -3818,20 +4254,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1642330547 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22288474, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1642330544} m_CullTransparentMesh: 0 --- !u!1 &1670131342 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 148596, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1670131343} @@ -3848,8 +4287,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22408080, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1670131342} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3867,8 +4307,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11410606, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1670131342} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3881,8 +4322,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 1c19ec938a1cccc4a9f09a1ce239c244, type: 3} m_Type: 0 m_PreserveAspect: 1 @@ -3891,20 +4330,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1670131345 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22238732, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1670131342} m_CullTransparentMesh: 0 --- !u!1 &1673161715 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 127862, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1673161716} @@ -3921,8 +4363,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22419362, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1673161715} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3940,8 +4383,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11443696, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1673161715} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3954,8 +4398,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 9bb9d61156064854da1ac61f68990ce9, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -3964,20 +4406,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1673161718 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22277692, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1673161715} m_CullTransparentMesh: 0 --- !u!1 &1700996734 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 157610, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1700996735} @@ -3994,8 +4439,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22498740, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1700996734} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4013,8 +4459,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11441354, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1700996734} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4027,8 +4474,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -4037,20 +4482,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1700996737 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22281488, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1700996734} m_CullTransparentMesh: 0 --- !u!1 &1723617986 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 191078, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1723617987} @@ -4066,8 +4514,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22496986, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1723617986} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4095,15 +4544,17 @@ RectTransform: CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22259784, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1723617986} m_CullTransparentMesh: 0 --- !u!1 &1727881044 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1727881049} @@ -4128,28 +4579,32 @@ GameObject: AudioListener: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1727881044} m_Enabled: 1 --- !u!124 &1727881046 Behaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1727881044} m_Enabled: 1 --- !u!92 &1727881047 Behaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1727881044} m_Enabled: 1 --- !u!20 &1727881048 Camera: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1727881044} m_Enabled: 1 serializedVersion: 2 @@ -4158,6 +4613,7 @@ Camera: m_projectionMatrixMode: 1 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} + m_GateFitMode: 2 m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 @@ -4189,7 +4645,8 @@ Camera: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1727881044} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 320, y: 240, z: -10} @@ -4202,7 +4659,8 @@ Transform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1727881044} m_Enabled: 1 serializedVersion: 4 @@ -4297,7 +4755,8 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1727881044} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4308,7 +4767,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1727881044} m_Enabled: 0 m_EditorHideFlags: 0 @@ -4320,7 +4780,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1727881044} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4331,7 +4792,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1727881044} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4342,7 +4804,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1727881044} m_Enabled: 0 m_EditorHideFlags: 0 @@ -4353,7 +4816,8 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1745075054} @@ -4372,7 +4836,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1745075053} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4390,7 +4855,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1745075053} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4403,8 +4869,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -4413,18 +4877,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1745075056 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1745075053} m_CullTransparentMesh: 0 --- !u!114 &1745075057 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1745075053} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4437,7 +4904,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1745075053} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4448,7 +4916,8 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1776304110} @@ -4463,7 +4932,8 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1776304109} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} @@ -4478,8 +4948,9 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 171992, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1803020737} @@ -4496,8 +4967,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22425498, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1803020736} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4515,8 +4987,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11452418, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1803020736} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4529,8 +5002,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -4539,19 +5010,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1803020739 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22259690, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1803020736} m_CullTransparentMesh: 0 --- !u!1 &1830754305 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1830754306} @@ -4568,7 +5042,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1830754305} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 50} @@ -4590,7 +5065,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1830754305} m_Enabled: 0 m_EditorHideFlags: 0 @@ -4603,8 +5079,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -4613,18 +5087,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1830754308 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1830754305} m_CullTransparentMesh: 0 --- !u!1 &1861186314 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1861186315} @@ -4641,7 +5118,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1861186314} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 100} @@ -4659,7 +5137,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1861186314} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4672,8 +5151,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 62f8426a429498442af34752c971234e, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -4682,19 +5159,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1861186317 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1861186314} m_CullTransparentMesh: 0 --- !u!1 &1881438397 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 174686, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1881438398} @@ -4711,8 +5191,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22429080, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1881438397} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4730,8 +5211,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11429644, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1881438397} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4744,8 +5226,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -4754,12 +5234,14 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1881438400 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22243510, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1881438397} m_CullTransparentMesh: 0 --- !u!224 &1952845558 @@ -4767,7 +5249,8 @@ RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22408240, guid: b52d5d8cf9ddaf740a8cf6024b1bca2f, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 778448265} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.019} @@ -4785,8 +5268,9 @@ RectTransform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 159716, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1964965498} @@ -4803,8 +5287,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22456078, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1964965497} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4822,8 +5307,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11438016, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1964965497} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4836,8 +5322,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: d4b1335871fb6b549a5bd165cbc60327, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -4846,19 +5330,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1964965500 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22203948, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1964965497} m_CullTransparentMesh: 0 --- !u!1 &2026747195 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2026747196} @@ -4874,7 +5361,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2026747195} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 50} @@ -4894,7 +5382,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2026747195} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4911,7 +5400,8 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2063039112} @@ -4926,7 +5416,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2063039111} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4944,8 +5435,9 @@ RectTransform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 148596, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2105576920} @@ -4962,8 +5454,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22408080, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2105576919} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4981,8 +5474,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11410606, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2105576919} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4995,8 +5489,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 1c19ec938a1cccc4a9f09a1ce239c244, type: 3} m_Type: 0 m_PreserveAspect: 1 @@ -5005,19 +5497,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &2105576922 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22238732, guid: e24fd648e823f074cb0fcadd09d5b42a, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2105576919} m_CullTransparentMesh: 0 --- !u!1 &2124894572 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2124894573} @@ -5033,7 +5528,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2124894572} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5051,7 +5547,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2124894572} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5062,7 +5559,8 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2137545031} @@ -5078,7 +5576,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2137545030} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5097,7 +5596,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2137545030} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5107,16 +5607,22 @@ MonoBehaviour: letterSound: currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + columnShift: 265 + columnNumber: 2 blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 bubble: 0 + progress: 0 autoSetLayer: 0 + needFontReset: 0 + noAutoLineBreak: 0 + isMainTextObject: 0 + noSelfAdvance: 0 deleteWhenFinished: 1 _color: {r: 1, g: 1, b: 1, a: 1} hasColorBeenSet: 0 diff --git a/Assets/Scenes/Disclaimer.unity b/Assets/Scenes/Disclaimer.unity index bdfe2876e..b940ded5b 100644 --- a/Assets/Scenes/Disclaimer.unity +++ b/Assets/Scenes/Disclaimer.unity @@ -211,16 +211,16 @@ RectTransform: m_GameObject: {fileID: 589038332} 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_LocalScale: {x: 0.2, y: 0.2, z: 1} m_Children: [] m_Father: {fileID: 1483471535} - m_RootOrder: 7 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -130} - m_SizeDelta: {x: 150, y: 40} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -112} + m_SizeDelta: {x: 500, y: 400} + m_Pivot: {x: 0.5, y: 1} --- !u!114 &589038334 MonoBehaviour: m_ObjectHideFlags: 0 @@ -241,20 +241,20 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: a5a3b9aa4e92cfd4a9014c429c6a7e4e, type: 3} - m_FontSize: 32 + m_FontSize: 160 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 m_MaxSize: 300 - m_Alignment: 4 + m_Alignment: 1 m_AlignByGeometry: 0 - m_RichText: 0 + m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: 'v0.6.6 -' + LTS 3' --- !u!222 &589038335 CanvasRenderer: m_ObjectHideFlags: 0 @@ -290,15 +290,15 @@ RectTransform: m_GameObject: {fileID: 643272688} 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_LocalScale: {x: 0.2, y: 0.2, z: 1} m_Children: [] m_Father: {fileID: 1483471535} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 195, y: 0} - m_SizeDelta: {x: -390, y: 160} + m_AnchoredPosition: {x: -140, y: 0} + m_SizeDelta: {x: 1000, y: 500} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &643272690 MonoBehaviour: @@ -319,21 +319,23 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: abd91933b51b6fc47931c535c62c6929, type: 3} - m_FontSize: 20 + m_Font: {fileID: 12800000, guid: a5a3b9aa4e92cfd4a9014c429c6a7e4e, type: 3} + m_FontSize: 160 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 - m_MaxSize: 40 + m_MaxSize: 160 m_Alignment: 4 m_AlignByGeometry: 1 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 'Press O for the + m_Text: 'Press Menu + + to access the - Overworld' + Overworld' --- !u!222 &643272691 CanvasRenderer: m_ObjectHideFlags: 0 @@ -354,7 +356,7 @@ GameObject: - component: {fileID: 890690847} - component: {fileID: 890690846} m_Layer: 5 - m_Name: RedditPlug + m_Name: DiscordPlug m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -369,15 +371,15 @@ RectTransform: m_GameObject: {fileID: 890690844} 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_LocalScale: {x: 0.2, y: 0.2, z: 1} m_Children: [] m_Father: {fileID: 1483471535} - m_RootOrder: 2 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -210} - m_SizeDelta: {x: 0, y: -420} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 30} + m_SizeDelta: {x: 2700, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &890690846 MonoBehaviour: @@ -398,19 +400,20 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: abd91933b51b6fc47931c535c62c6929, type: 3} - m_FontSize: 18 + m_Font: {fileID: 12800000, guid: a5a3b9aa4e92cfd4a9014c429c6a7e4e, type: 3} + m_FontSize: 80 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 - m_MaxSize: 40 + m_MaxSize: 80 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: For support and newest versions, go to /r/Unitale. + m_Text: For support and newest versions, go to the Unitale Discord + Server. --- !u!222 &890690847 CanvasRenderer: m_ObjectHideFlags: 0 @@ -446,15 +449,15 @@ RectTransform: m_GameObject: {fileID: 1020003805} 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_LocalScale: {x: 0.2, y: 0.2, z: 1} m_Children: [] m_Father: {fileID: 1483471535} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -120, y: 0} - m_SizeDelta: {x: 240, y: 160} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 190, y: 0} + m_SizeDelta: {x: 1500, y: 500} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1020003807 MonoBehaviour: @@ -475,21 +478,23 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: abd91933b51b6fc47931c535c62c6929, type: 3} - m_FontSize: 20 + m_Font: {fileID: 12800000, guid: a5a3b9aa4e92cfd4a9014c429c6a7e4e, type: 3} + m_FontSize: 160 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 - m_MaxSize: 40 + m_MaxSize: 300 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 'Press Space or Click for the + m_Text: 'Press Confirm or + + Click to access the - Mod Selection Screen' + Mod Selection Screen' --- !u!222 &1020003808 CanvasRenderer: m_ObjectHideFlags: 0 @@ -597,15 +602,15 @@ RectTransform: m_GameObject: {fileID: 1450756121} 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_LocalScale: {x: 0.2, y: 0.2, z: 1} m_Children: [] m_Father: {fileID: 1483471535} - m_RootOrder: 3 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -230} - m_SizeDelta: {x: 0, y: -460} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 10} + m_SizeDelta: {x: 2900, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1450756123 MonoBehaviour: @@ -620,18 +625,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: abd91933b51b6fc47931c535c62c6929, type: 3} - m_FontSize: 14 + m_Font: {fileID: 12800000, guid: a5a3b9aa4e92cfd4a9014c429c6a7e4e, type: 3} + m_FontSize: 80 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 - m_MaxSize: 40 + m_MaxSize: 80 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -639,7 +644,7 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Create Your Frisk is not owned by Toby Fox. Selling this engine or its mods - is illegal. + is illegal. --- !u!222 &1450756124 CanvasRenderer: m_ObjectHideFlags: 0 @@ -680,12 +685,12 @@ RectTransform: m_Children: - {fileID: 317379796} - {fileID: 1349124950} - - {fileID: 890690845} - - {fileID: 1450756122} + - {fileID: 589038333} - {fileID: 1020003806} - {fileID: 643272689} - {fileID: 2007236153} - - {fileID: 589038333} + - {fileID: 890690845} + - {fileID: 1450756122} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -724,7 +729,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 + m_ReferencePixelsPerUnit: 1000000 m_ScaleFactor: 1 m_ReferenceResolution: {x: 640, y: 480} m_ScreenMatchMode: 1 @@ -801,6 +806,14 @@ PrefabInstance: propertyPath: far clip plane value: 1000 objectReference: {fileID: 0} + - target: {fileID: 2064840, guid: 9c0c29340fc4a6347aa18ffb6f5a7eea, type: 3} + propertyPath: m_AllowMSAA + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2064840, guid: 9c0c29340fc4a6347aa18ffb6f5a7eea, type: 3} + propertyPath: m_AllowDynamicResolution + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8273166, guid: 9c0c29340fc4a6347aa18ffb6f5a7eea, type: 3} propertyPath: panLevelCustomCurve.m_RotationOrder value: 0 @@ -886,15 +899,15 @@ RectTransform: m_GameObject: {fileID: 2007236152} 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_LocalScale: {x: 0.2, y: 0.2, z: 1} m_Children: [] m_Father: {fileID: 1483471535} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -130} - m_SizeDelta: {x: 0, y: -260} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 120} + m_SizeDelta: {x: 2800, y: 500} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2007236154 MonoBehaviour: @@ -915,19 +928,21 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: abd91933b51b6fc47931c535c62c6929, type: 3} - m_FontSize: 22 + m_Font: {fileID: 12800000, guid: a5a3b9aa4e92cfd4a9014c429c6a7e4e, type: 3} + m_FontSize: 240 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 - m_MaxSize: 40 + m_MaxSize: 240 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Lua experience is REQUIRED to make your own mods!! + m_Text: 'Lua experience is REQUIRED + + to make your own mods!!' --- !u!222 &2007236155 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/KeybindSettings.unity b/Assets/Scenes/KeybindSettings.unity new file mode 100644 index 000000000..8331b91df --- /dev/null +++ b/Assets/Scenes/KeybindSettings.unity @@ -0,0 +1,2545 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 10 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringMode: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 1 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!224 &5970173 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + m_PrefabInstance: {fileID: 6195791464686670966} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &182826124 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1235065859} + m_Modifications: + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_Alignment + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Text + value: Back + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_FontSize + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_MaxSize + value: 212 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_MinSize + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Name + value: Back + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_RootOrder + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.r + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.g + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.b + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.a + value: 0.5019608 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 06a74376a3db7d744b36f7bb52973cf7, type: 3} +--- !u!224 &182826125 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 182826124} + m_PrefabAsset: {fileID: 0} +--- !u!114 &182826126 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6408004043003039570, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 182826124} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &244342558 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1235065859} + m_Modifications: + - target: {fileID: 6195791463972921763, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Text + value: Cancel + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190922, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Name + value: Cancel + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -70 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_SizeDelta.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6195791465658335273, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Text + value: X, LeftShift, RightShift + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5c826c0d5339343438211217ebd3152c, type: 3} +--- !u!224 &244342559 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + m_PrefabInstance: {fileID: 244342558} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &260251773 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1235065859} + m_Modifications: + - target: {fileID: 6195791463972921763, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Text + value: Right + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190922, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Name + value: Right + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -320 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_SizeDelta.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6195791465658335273, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Text + value: D, RightArrow + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5c826c0d5339343438211217ebd3152c, type: 3} +--- !u!224 &260251774 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + m_PrefabInstance: {fileID: 260251773} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &356226453 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1235065859} + m_Modifications: + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_Alignment + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Text + value: Save + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_FontSize + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_MaxSize + value: 212 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_MinSize + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Name + value: Save + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.r + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.g + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.b + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.a + value: 0.5019608 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 06a74376a3db7d744b36f7bb52973cf7, type: 3} +--- !u!224 &356226454 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 356226453} + m_PrefabAsset: {fileID: 0} +--- !u!114 &356226455 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6408004043003039570, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 356226453} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &427268937 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 427268940} + - component: {fileID: 427268939} + - component: {fileID: 427268938} + - component: {fileID: 427268941} + - component: {fileID: 427268942} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &427268938 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 427268937} + m_Enabled: 1 +--- !u!20 &427268939 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 427268937} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_GateFitMode: 2 + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 4 + height: 3 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 240 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_AllowMSAA: 0 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &427268940 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 427268937} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 320, y: 240, z: -20} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &427268941 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 427268937} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aab9c60fbfe800a4c8b71de27310ecf4, type: 3} + m_Name: + m_EditorClassIdentifier: + Confirm: {fileID: 1496962534} + Cancel: {fileID: 1194244628} + Menu: {fileID: 1705941982} + Up: {fileID: 679873567} + Left: {fileID: 1746013827} + Down: {fileID: 1331792659} + Right: {fileID: 1704067383} + Listening: {fileID: 807607704} + Save: {fileID: 356226455} + ResetAll: {fileID: 1934178443} + Restore: {fileID: 724436461} + Back: {fileID: 182826126} + listening: {fileID: 0} +--- !u!114 &427268942 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 427268937} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e994334232641bd4ca342c48fcdb1605, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &679873567 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6437133863614902638, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + m_PrefabInstance: {fileID: 2029917130} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9580cf12eed84fd479de25a93c2e8b8d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &724436459 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1235065859} + m_Modifications: + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_Alignment + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Text + value: Restore + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_FontSize + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_MaxSize + value: 212 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_MinSize + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Name + value: Restore + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.r + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.g + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.b + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.a + value: 0.5019608 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 06a74376a3db7d744b36f7bb52973cf7, type: 3} +--- !u!224 &724436460 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 724436459} + m_PrefabAsset: {fileID: 0} +--- !u!114 &724436461 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6408004043003039570, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 724436459} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &807607702 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 807607703} + - component: {fileID: 807607705} + - component: {fileID: 807607704} + m_Layer: 5 + m_Name: Listening + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &807607703 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 807607702} + 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_Children: [] + m_Father: {fileID: 1235065859} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 80} + m_SizeDelta: {x: 600, y: 30} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &807607704 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 807607702} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: a5a3b9aa4e92cfd4a9014c429c6a7e4e, type: 3} + m_FontSize: 32 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 4 + m_MaxSize: 32 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Not currently listening... +--- !u!222 &807607705 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 807607702} + m_CullTransparentMesh: 0 +--- !u!1001 &862187447 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1235065859} + m_Modifications: + - target: {fileID: 6195791463972921763, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Text + value: Left + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190922, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Name + value: Left + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -220 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_SizeDelta.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6195791465658335273, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Text + value: A, LeftArrow + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5c826c0d5339343438211217ebd3152c, type: 3} +--- !u!224 &862187448 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + m_PrefabInstance: {fileID: 862187447} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1167756897 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1235065859} + m_Modifications: + - target: {fileID: 6195791463972921763, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Text + value: Down + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190922, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Name + value: Down + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -270 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_SizeDelta.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6195791465658335273, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Text + value: S, DownArrow + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5c826c0d5339343438211217ebd3152c, type: 3} +--- !u!224 &1167756898 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + m_PrefabInstance: {fileID: 1167756897} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1194244628 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6437133863614902638, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + m_PrefabInstance: {fileID: 244342558} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9580cf12eed84fd479de25a93c2e8b8d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1235065855 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1235065859} + - component: {fileID: 1235065858} + - component: {fileID: 1235065857} + - component: {fileID: 1235065856} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1235065856 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1235065855} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1235065857 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1235065855} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 640, y: 480} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 1 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &1235065858 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1235065855} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 427268939} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1235065859 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1235065855} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 5970173} + - {fileID: 244342559} + - {fileID: 1546412106} + - {fileID: 2029917131} + - {fileID: 862187448} + - {fileID: 1167756898} + - {fileID: 260251774} + - {fileID: 356226454} + - {fileID: 807607703} + - {fileID: 1934178442} + - {fileID: 724436460} + - {fileID: 182826125} + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &1331792659 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6437133863614902638, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + m_PrefabInstance: {fileID: 1167756897} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9580cf12eed84fd479de25a93c2e8b8d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1496962534 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6437133863614902638, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + m_PrefabInstance: {fileID: 6195791464686670966} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9580cf12eed84fd479de25a93c2e8b8d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &1546412105 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1235065859} + m_Modifications: + - target: {fileID: 6195791463972921763, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Text + value: Menu + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190922, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Name + value: Menu + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -120 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_SizeDelta.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6195791465658335273, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Text + value: C, LeftControl, RightControl + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5c826c0d5339343438211217ebd3152c, type: 3} +--- !u!224 &1546412106 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + m_PrefabInstance: {fileID: 1546412105} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1561438720 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1561438723} + - component: {fileID: 1561438722} + - component: {fileID: 1561438721} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1561438721 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1561438720} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &1561438722 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1561438720} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 0 + m_DragThreshold: 10 +--- !u!4 &1561438723 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1561438720} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1704067383 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6437133863614902638, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + m_PrefabInstance: {fileID: 260251773} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9580cf12eed84fd479de25a93c2e8b8d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1705941982 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6437133863614902638, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + m_PrefabInstance: {fileID: 1546412105} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9580cf12eed84fd479de25a93c2e8b8d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1746013827 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6437133863614902638, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + m_PrefabInstance: {fileID: 862187447} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9580cf12eed84fd479de25a93c2e8b8d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &1934178441 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1235065859} + m_Modifications: + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_Alignment + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Text + value: Reset All + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_FontSize + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_MaxSize + value: 212 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_MinSize + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Name + value: ResetAll + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -60 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.r + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.g + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.b + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.a + value: 0.5019608 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 06a74376a3db7d744b36f7bb52973cf7, type: 3} +--- !u!224 &1934178442 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 1934178441} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1934178443 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6408004043003039570, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 1934178441} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &2029917130 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1235065859} + m_Modifications: + - target: {fileID: 6195791463972921763, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Text + value: Up + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190922, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Name + value: Up + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -170 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_SizeDelta.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6195791465658335273, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Text + value: W, UpArrow + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5c826c0d5339343438211217ebd3152c, type: 3} +--- !u!224 &2029917131 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + m_PrefabInstance: {fileID: 2029917130} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &6195791464686670966 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1235065859} + m_Modifications: + - target: {fileID: 6195791463972921763, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Text + value: Confirm + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190922, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Name + value: Confirm + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_SizeDelta.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6195791464691190923, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6195791465658335273, guid: 5c826c0d5339343438211217ebd3152c, + type: 3} + propertyPath: m_Text + value: Z, Return + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5c826c0d5339343438211217ebd3152c, type: 3} diff --git a/Assets/Scenes/KeybindSettings.unity.meta b/Assets/Scenes/KeybindSettings.unity.meta new file mode 100644 index 000000000..df69a9a0d --- /dev/null +++ b/Assets/Scenes/KeybindSettings.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c7340ada0080ba74ebc7e5bf2a43e8b5 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/ModSelect.unity b/Assets/Scenes/ModSelect.unity index e823e1cbb..bb6534c54 100644 --- a/Assets/Scenes/ModSelect.unity +++ b/Assets/Scenes/ModSelect.unity @@ -148,6 +148,7 @@ RectTransform: - {fileID: 827182969} - {fileID: 84447218} - {fileID: 1445560357} + - {fileID: 195716013} - {fileID: 577590892} - {fileID: 1633010448} - {fileID: 129405957} @@ -471,14 +472,14 @@ RectTransform: m_Children: - {fileID: 725714186} - {fileID: 763720701} - m_Father: {fileID: 1633010448} - m_RootOrder: 0 + m_Father: {fileID: 64571900} + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 268, y: 665} - m_SizeDelta: {x: 88, y: 30} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 140, y: 30} + m_Pivot: {x: 1, y: 1} --- !u!114 &195716014 MonoBehaviour: m_ObjectHideFlags: 0 @@ -972,8 +973,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 6, y: -1} - m_SizeDelta: {x: -12, y: -2} + m_AnchoredPosition: {x: 7, y: -1} + m_SizeDelta: {x: -10, y: -2} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &363465621 MonoBehaviour: @@ -997,16 +998,16 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: a5a3b9aa4e92cfd4a9014c429c6a7e4e, type: 3} m_FontSize: 16 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 1 - m_MaxSize: 40 + m_MaxSize: 16 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 0 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: " \u2190 Exit" + m_Text: " \u2190 Exit (Cancel)" --- !u!222 &363465622 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1060,7 +1061,7 @@ PrefabInstance: - target: {fileID: 224140591129239992, guid: 966f7de4bcc923b419ada0e7a348eab3, type: 3} propertyPath: m_RootOrder - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: 224140591129239992, guid: 966f7de4bcc923b419ada0e7a348eab3, type: 3} @@ -1379,7 +1380,7 @@ RectTransform: m_Children: - {fileID: 110115306} m_Father: {fileID: 64571900} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1697,8 +1698,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 6, y: -1} - m_SizeDelta: {x: -12, y: -2} + m_AnchoredPosition: {x: 2, y: -1} + m_SizeDelta: {x: -20, y: -2} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &725714187 MonoBehaviour: @@ -1722,16 +1723,16 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: a5a3b9aa4e92cfd4a9014c429c6a7e4e, type: 3} m_FontSize: 16 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 1 - m_MaxSize: 40 + m_MaxSize: 16 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 0 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "Options \u2192" + m_Text: "Options (Menu) \u2192" --- !u!222 &725714188 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1851,8 +1852,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 5, y: 0} - m_SizeDelta: {x: -10, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &763720702 MonoBehaviour: @@ -1876,16 +1877,16 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: a5a3b9aa4e92cfd4a9014c429c6a7e4e, type: 3} m_FontSize: 16 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 1 - m_MaxSize: 40 + m_MaxSize: 16 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 0 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "Options \u2192" + m_Text: "Options (Menu) \u2192" --- !u!222 &763720703 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1894,78 +1895,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 763720700} m_CullTransparentMesh: 0 ---- !u!1 &771050634 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 771050635} - - component: {fileID: 771050637} - - component: {fileID: 771050636} - m_Layer: 5 - m_Name: Fill - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &771050635 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 771050634} - 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_Children: [] - m_Father: {fileID: 1058685157} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 420, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &771050636 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 771050634} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 0} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &771050637 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 771050634} - m_CullTransparentMesh: 1 --- !u!1 &827182968 GameObject: m_ObjectHideFlags: 0 @@ -2235,136 +2164,12 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 911703477} m_CullTransparentMesh: 0 ---- !u!1 &1058685156 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1058685157} - - component: {fileID: 1058685160} - - component: {fileID: 1058685159} - - component: {fileID: 1058685158} - - component: {fileID: 1058685161} - m_Layer: 5 - m_Name: Back - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1058685157 +--- !u!224 &1058685157 stripped RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1058685156} - 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_Children: - - {fileID: 771050635} - - {fileID: 1410218586} - m_Father: {fileID: 501285793} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 100} - m_SizeDelta: {x: 430, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1058685158 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1058685156} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 0 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 0.2509804} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 5 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1058685159} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1058685159 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1058685156} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.7529412, g: 0.7529412, b: 0.7529412, a: 0.1254902} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 0 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &1058685160 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1058685156} - m_CullTransparentMesh: 1 ---- !u!114 &1058685161 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 6408004043052732340} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1058685156} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 525e6c79af09d3a4cbba3b47269cf03f, type: 3} - m_Name: - m_EditorClassIdentifier: - NormalColor: {r: 0.7529412, g: 0.7529412, b: 0.7529412, a: 0.1254902} - HoverColor: {r: 0.7529412, g: 0.7529412, b: 0.7529412, a: 0.8784314} --- !u!1 &1219723058 GameObject: m_ObjectHideFlags: 0 @@ -2554,83 +2359,6 @@ Transform: m_Father: {fileID: 64571900} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1410218585 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1410218586} - - component: {fileID: 1410218588} - - component: {fileID: 1410218587} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1410218586 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1410218585} - 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_Children: [] - m_Father: {fileID: 1058685157} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 5, y: 0} - m_SizeDelta: {x: -10, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1410218587 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1410218585} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: a5a3b9aa4e92cfd4a9014c429c6a7e4e, type: 3} - m_FontSize: 16 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 0 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: " \u2190 Back" ---- !u!222 &1410218588 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1410218585} - m_CullTransparentMesh: 0 --- !u!1 &1419761035 GameObject: m_ObjectHideFlags: 0 @@ -2743,11 +2471,11 @@ RectTransform: m_Father: {fileID: 64571900} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -282, y: 225} - m_SizeDelta: {x: 76, y: 30} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 0, y: 225} + m_SizeDelta: {x: 130, y: 30} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &1445560358 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2959,16 +2687,16 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: a5a3b9aa4e92cfd4a9014c429c6a7e4e, type: 3} m_FontSize: 16 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 1 - m_MaxSize: 40 + m_MaxSize: 16 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 0 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: " \u2190 Exit" + m_Text: " \u2190 Exit (Cancel)" --- !u!222 &1502871121 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3160,10 +2888,9 @@ RectTransform: 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_Children: - - {fileID: 195716013} + m_Children: [] m_Father: {fileID: 64571900} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3630,3 +3357,142 @@ Transform: m_Father: {fileID: 64571900} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &6408004043052732340 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 501285793} + m_Modifications: + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.a + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Name + value: Back + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: 430 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.a + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.a + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.a + value: 0.8784314 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 06a74376a3db7d744b36f7bb52973cf7, type: 3} diff --git a/Assets/Scenes/Options.unity b/Assets/Scenes/Options.unity index 6c3a284ec..18239a869 100644 --- a/Assets/Scenes/Options.unity +++ b/Assets/Scenes/Options.unity @@ -112,155 +112,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &4546567 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4546568} - - component: {fileID: 4546570} - - component: {fileID: 4546569} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4546568 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4546567} - 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_Children: [] - m_Father: {fileID: 1483033492} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &4546569 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4546567} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: a5a3b9aa4e92cfd4a9014c429c6a7e4e, type: 3} - m_FontSize: 16 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 0 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 2 - m_Text: Wipe Save ---- !u!222 &4546570 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4546567} - m_CullTransparentMesh: 0 ---- !u!1 &7037285 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7037286} - - component: {fileID: 7037288} - - component: {fileID: 7037287} - m_Layer: 5 - m_Name: Fill - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7037286 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7037285} - 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_Children: [] - m_Father: {fileID: 954509273} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 250, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &7037287 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7037285} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.1254902, g: 0.1254902, b: 0.1254902, a: 0.5019608} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &7037288 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7037285} - m_CullTransparentMesh: 0 --- !u!1 &64571899 GameObject: m_ObjectHideFlags: 0 @@ -294,15 +145,16 @@ RectTransform: - {fileID: 142379022} - {fileID: 1145778383} - {fileID: 666042082} - - {fileID: 1091755617} - - {fileID: 916737236} - - {fileID: 1483033492} - - {fileID: 1631460680} - - {fileID: 132251295} - - {fileID: 1342957225} - - {fileID: 1822809090} - - {fileID: 954509273} - - {fileID: 107375590} + - {fileID: 1826168419} + - {fileID: 1212751805} + - {fileID: 110168061} + - {fileID: 73542487} + - {fileID: 763680580} + - {fileID: 1716142121} + - {fileID: 1958569515} + - {fileID: 998100203} + - {fileID: 267279030} + - {fileID: 1583719772} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -371,2267 +223,592 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!1 &68851439 -GameObject: +--- !u!1001 &73542486 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 68851440} - - component: {fileID: 68851442} - - component: {fileID: 68851441} - m_Layer: 5 - m_Name: Fill - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &68851440 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 64571900} + m_Modifications: + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_Alignment + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Text + value: 'Safe mode: Off' + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.r + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.g + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.b + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Name + value: Safe + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -155 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: 250 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.a + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.r + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.g + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.b + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.a + value: 0.5019608 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 06a74376a3db7d744b36f7bb52973cf7, type: 3} +--- !u!224 &73542487 stripped RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 68851439} - 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_Children: [] - m_Father: {fileID: 1631460680} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 250, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &68851441 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 68851439} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.1254902, g: 0.1254902, b: 0.1254902, a: 0.5019608} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &68851442 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 73542486} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 68851439} - m_CullTransparentMesh: 0 ---- !u!1 &107375589 +--- !u!1 &73542488 stripped GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1356470217043364, guid: e264c08f2eb1b0a42a121539d52a0279, - type: 2} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 107375590} - - component: {fileID: 107375593} - - component: {fileID: 107375592} - - component: {fileID: 107375591} - m_Layer: 5 - m_Name: Exit - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &107375590 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 224965271745359238, guid: e264c08f2eb1b0a42a121539d52a0279, - type: 2} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 107375589} - 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_Children: - - {fileID: 2103507660} - - {fileID: 1679198200} - m_Father: {fileID: 64571900} - m_RootOrder: 11 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -155, y: -200} - m_SizeDelta: {x: 250, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &107375591 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 73542486} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 107375589} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 0 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 107375592} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &107375592 -MonoBehaviour: +--- !u!1001 &110168060 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 64571900} + m_Modifications: + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_Alignment + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Text + value: Wipe Save + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.r + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.g + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.b + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Name + value: ClearSave + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -155 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: 250 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.a + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.r + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.g + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.b + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.a + value: 0.5019608 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 06a74376a3db7d744b36f7bb52973cf7, type: 3} +--- !u!224 &110168061 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 110168060} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 107375589} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 0.5019608} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 0 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &107375593 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} +--- !u!1 &110168062 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 110168060} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 107375589} - m_CullTransparentMesh: 1 ---- !u!1 &132251294 +--- !u!1 &142379021 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1356470217043364, guid: e264c08f2eb1b0a42a121539d52a0279, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 132251295} - - component: {fileID: 132251297} - - component: {fileID: 132251296} - - component: {fileID: 132251298} + - component: {fileID: 142379022} + - component: {fileID: 142379024} + - component: {fileID: 142379023} m_Layer: 5 - m_Name: Retro + m_Name: OptionsLabel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &132251295 +--- !u!224 &142379022 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 224965271745359238, guid: e264c08f2eb1b0a42a121539d52a0279, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 132251294} + m_GameObject: {fileID: 142379021} 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_Children: - - {fileID: 566761845} - - {fileID: 381035972} + m_Children: [] m_Father: {fileID: 64571900} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -155, y: 0} - m_SizeDelta: {x: 250, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &132251296 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 132251294} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 0.5019608} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 0 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &132251297 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 132251294} - m_CullTransparentMesh: 1 ---- !u!114 &132251298 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 132251294} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 0 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 132251296} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &142379021 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 142379022} - - component: {fileID: 142379024} - - component: {fileID: 142379023} - m_Layer: 5 - m_Name: OptionsLabel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &142379022 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 142379021} - 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_Children: [] - m_Father: {fileID: 64571900} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -155, y: 200} - m_SizeDelta: {x: 250, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &142379023 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 142379021} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: a5625e3ef998003458714eb346f52fb6, type: 3} - m_FontSize: 16 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 0 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 2 - m_Text: 'Options:' ---- !u!222 &142379024 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 142379021} - m_CullTransparentMesh: 0 ---- !u!1 &353751478 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 353751479} - - component: {fileID: 353751481} - - component: {fileID: 353751480} - m_Layer: 5 - m_Name: Fill - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &353751479 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 353751478} - 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_Children: [] - m_Father: {fileID: 1483033492} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 250, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &353751480 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 353751478} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.1254902, g: 0.1254902, b: 0.1254902, a: 0.5019608} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &353751481 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 353751478} - m_CullTransparentMesh: 0 ---- !u!1 &381035971 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 381035972} - - component: {fileID: 381035974} - - component: {fileID: 381035973} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &381035972 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 381035971} - 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_Children: [] - m_Father: {fileID: 132251295} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &381035973 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 381035971} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: a5a3b9aa4e92cfd4a9014c429c6a7e4e, type: 3} - m_FontSize: 16 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 0 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 2 - m_Text: 'Retrocompatibility Mode: Off' ---- !u!222 &381035974 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 381035971} - m_CullTransparentMesh: 0 ---- !u!1 &545032593 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 545032594} - - component: {fileID: 545032596} - - component: {fileID: 545032595} - m_Layer: 5 - m_Name: Fill - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &545032594 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 545032593} - 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_Children: [] - m_Father: {fileID: 1342957225} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 250, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &545032595 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 545032593} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.1254902, g: 0.1254902, b: 0.1254902, a: 0.5019608} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &545032596 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 545032593} - m_CullTransparentMesh: 0 ---- !u!1 &566761844 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 566761845} - - component: {fileID: 566761847} - - component: {fileID: 566761846} - m_Layer: 5 - m_Name: Fill - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &566761845 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 566761844} - 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_Children: [] - m_Father: {fileID: 132251295} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 250, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &566761846 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 566761844} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.1254902, g: 0.1254902, b: 0.1254902, a: 0.5019608} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &566761847 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 566761844} - m_CullTransparentMesh: 0 ---- !u!1 &666042081 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 666042082} - - component: {fileID: 666042084} - - component: {fileID: 666042083} - m_Layer: 5 - m_Name: Description - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &666042082 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 666042081} - 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_Children: [] - m_Father: {fileID: 64571900} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 155, y: -70} - m_SizeDelta: {x: 300, y: 500} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &666042083 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 666042081} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: abd91933b51b6fc47931c535c62c6929, type: 3} - m_FontSize: 18 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 1 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Hover over an option and its description will appear here! ---- !u!222 &666042084 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 666042081} - m_CullTransparentMesh: 0 ---- !u!1 &916737235 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1356470217043364, guid: e264c08f2eb1b0a42a121539d52a0279, - type: 2} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 916737236} - - component: {fileID: 916737238} - - component: {fileID: 916737237} - - component: {fileID: 916737239} - m_Layer: 5 - m_Name: ResetAG - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &916737236 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 224965271745359238, guid: e264c08f2eb1b0a42a121539d52a0279, - type: 2} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 916737235} - 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_Children: - - {fileID: 1287356467} - - {fileID: 968196170} - m_Father: {fileID: 64571900} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -155, y: 120} - m_SizeDelta: {x: 250, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &916737237 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 916737235} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 0.5019608} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 0 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &916737238 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 916737235} - m_CullTransparentMesh: 1 ---- !u!114 &916737239 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 916737235} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 0 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 916737237} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &954509272 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1356470217043364, guid: e264c08f2eb1b0a42a121539d52a0279, - type: 2} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 954509273} - - component: {fileID: 954509276} - - component: {fileID: 954509275} - - component: {fileID: 954509274} - m_Layer: 5 - m_Name: Crate - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &954509273 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 224965271745359238, guid: e264c08f2eb1b0a42a121539d52a0279, - type: 2} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 954509272} - 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_Children: - - {fileID: 7037286} - - {fileID: 1623886877} - m_Father: {fileID: 64571900} - m_RootOrder: 10 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -155, y: -120} - m_SizeDelta: {x: 250, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &954509274 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 954509272} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 0 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 954509275} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &954509275 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 954509272} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 0.5019608} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 0 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &954509276 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 954509272} - m_CullTransparentMesh: 1 ---- !u!1 &963495577 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 963495578} - - component: {fileID: 963495580} - - component: {fileID: 963495579} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &963495578 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 963495577} - 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_Children: [] - m_Father: {fileID: 1342957225} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &963495579 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 963495577} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: a5a3b9aa4e92cfd4a9014c429c6a7e4e, type: 3} - m_FontSize: 16 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 0 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 2 - m_Text: 'Window Scale: 1x' ---- !u!222 &963495580 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 963495577} - m_CullTransparentMesh: 0 ---- !u!1 &968196169 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 968196170} - - component: {fileID: 968196172} - - component: {fileID: 968196171} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &968196170 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 968196169} - 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_Children: [] - m_Father: {fileID: 916737236} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &968196171 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 968196169} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: a5a3b9aa4e92cfd4a9014c429c6a7e4e, type: 3} - m_FontSize: 16 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 0 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 2 - m_Text: 'Reset AlMighty Globals - -' ---- !u!222 &968196172 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 968196169} - m_CullTransparentMesh: 0 ---- !u!1 &1033043455 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1033043459} - - component: {fileID: 1033043458} - - component: {fileID: 1033043457} - - component: {fileID: 1033043456} - m_Layer: 0 - m_Name: EventSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1033043456 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1033043455} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1997211142, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ForceModuleActive: 0 ---- !u!114 &1033043457 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1033043455} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 ---- !u!114 &1033043458 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1033043455} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 5 ---- !u!4 &1033043459 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1033043455} - 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_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1091755616 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1356470217043364, guid: e264c08f2eb1b0a42a121539d52a0279, - type: 2} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1091755617} - - component: {fileID: 1091755619} - - component: {fileID: 1091755618} - - component: {fileID: 1091755620} - m_Layer: 5 - m_Name: ResetRG - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1091755617 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 224965271745359238, guid: e264c08f2eb1b0a42a121539d52a0279, - type: 2} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1091755616} - 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_Children: - - {fileID: 1362656870} - - {fileID: 1142561128} - m_Father: {fileID: 64571900} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -155, y: 160} - m_SizeDelta: {x: 250, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1091755618 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1091755616} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 0.5019608} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 0 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &1091755619 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1091755616} - m_CullTransparentMesh: 1 ---- !u!114 &1091755620 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1091755616} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 0 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1091755618} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &1142561127 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1142561128} - - component: {fileID: 1142561130} - - component: {fileID: 1142561129} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1142561128 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1142561127} - 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_Children: [] - m_Father: {fileID: 1091755617} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1142561129 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1142561127} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: a5a3b9aa4e92cfd4a9014c429c6a7e4e, type: 3} - m_FontSize: 16 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 0 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 2 - m_Text: 'Reset Real Globals - -' ---- !u!222 &1142561130 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1142561127} - m_CullTransparentMesh: 0 ---- !u!1 &1145778382 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1145778383} - - component: {fileID: 1145778385} - - component: {fileID: 1145778384} - m_Layer: 5 - m_Name: DescriptionLabel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1145778383 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1145778382} - 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_Children: [] - m_Father: {fileID: 64571900} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 155, y: 200} - m_SizeDelta: {x: 250, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1145778384 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1145778382} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: a5625e3ef998003458714eb346f52fb6, type: 3} - m_FontSize: 16 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 0 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 2 - m_Text: 'Information:' ---- !u!222 &1145778385 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1145778382} - m_CullTransparentMesh: 0 ---- !u!1 &1287356466 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1287356467} - - component: {fileID: 1287356469} - - component: {fileID: 1287356468} - m_Layer: 5 - m_Name: Fill - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1287356467 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1287356466} - 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_Children: [] - m_Father: {fileID: 916737236} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 250, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1287356468 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1287356466} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.1254902, g: 0.1254902, b: 0.1254902, a: 0.5019608} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &1287356469 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1287356466} - m_CullTransparentMesh: 0 ---- !u!1 &1292252968 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1292252969} - - component: {fileID: 1292252971} - - component: {fileID: 1292252970} - m_Layer: 5 - m_Name: Fill - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1292252969 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1292252968} - 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_Children: [] - m_Father: {fileID: 1822809090} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 250, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1292252970 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1292252968} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.1254902, g: 0.1254902, b: 0.1254902, a: 0.5019608} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &1292252971 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1292252968} - m_CullTransparentMesh: 0 ---- !u!1 &1342957224 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1356470217043364, guid: e264c08f2eb1b0a42a121539d52a0279, - type: 2} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1342957225} - - component: {fileID: 1342957228} - - component: {fileID: 1342957227} - - component: {fileID: 1342957226} - m_Layer: 5 - m_Name: Scale - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1342957225 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 224965271745359238, guid: e264c08f2eb1b0a42a121539d52a0279, - type: 2} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1342957224} - 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_Children: - - {fileID: 545032594} - - {fileID: 963495578} - m_Father: {fileID: 64571900} - m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -155, y: -40} - m_SizeDelta: {x: 250, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1342957226 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1342957224} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 0 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1342957227} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1342957227 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1342957224} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 0.5019608} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 0 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &1342957228 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1342957224} - m_CullTransparentMesh: 1 ---- !u!1 &1362656869 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1362656870} - - component: {fileID: 1362656872} - - component: {fileID: 1362656871} - m_Layer: 5 - m_Name: Fill - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1362656870 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1362656869} - 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_Children: [] - m_Father: {fileID: 1091755617} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 250, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1362656871 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1362656869} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.1254902, g: 0.1254902, b: 0.1254902, a: 0.5019608} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &1362656872 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1362656869} - m_CullTransparentMesh: 0 ---- !u!1 &1483033491 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1356470217043364, guid: e264c08f2eb1b0a42a121539d52a0279, - type: 2} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1483033492} - - component: {fileID: 1483033495} - - component: {fileID: 1483033494} - - component: {fileID: 1483033493} - m_Layer: 5 - m_Name: ClearSave - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1483033492 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 224965271745359238, guid: e264c08f2eb1b0a42a121539d52a0279, - type: 2} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1483033491} - 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_Children: - - {fileID: 353751479} - - {fileID: 4546568} - m_Father: {fileID: 64571900} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -155, y: 80} - m_SizeDelta: {x: 250, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1483033493 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1483033491} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 0 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1483033494} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1483033494 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1483033491} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 0.5019608} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 0 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &1483033495 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1483033491} - m_CullTransparentMesh: 1 ---- !u!1 &1558413009 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1558413010} - - component: {fileID: 1558413012} - - component: {fileID: 1558413011} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1558413010 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1558413009} - 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_Children: [] - m_Father: {fileID: 1631460680} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1558413011 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1558413009} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: a5a3b9aa4e92cfd4a9014c429c6a7e4e, type: 3} - m_FontSize: 16 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 0 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 2 - m_Text: 'Safe mode: Off' ---- !u!222 &1558413012 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1558413009} - m_CullTransparentMesh: 0 ---- !u!1 &1623886876 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1623886877} - - component: {fileID: 1623886879} - - component: {fileID: 1623886878} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1623886877 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1623886876} - 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_Children: [] - m_Father: {fileID: 954509273} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1623886878 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1623886876} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: a5a3b9aa4e92cfd4a9014c429c6a7e4e, type: 3} - m_FontSize: 16 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 0 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 2 - m_Text: 'Crate Your Frisk: Off' ---- !u!222 &1623886879 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1623886876} - m_CullTransparentMesh: 0 ---- !u!1 &1631460679 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1356470217043364, guid: e264c08f2eb1b0a42a121539d52a0279, - type: 2} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1631460680} - - component: {fileID: 1631460682} - - component: {fileID: 1631460681} - - component: {fileID: 1631460683} - m_Layer: 5 - m_Name: Safe - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1631460680 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 224965271745359238, guid: e264c08f2eb1b0a42a121539d52a0279, - type: 2} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1631460679} - 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_Children: - - {fileID: 68851440} - - {fileID: 1558413010} - m_Father: {fileID: 64571900} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -155, y: 40} - m_SizeDelta: {x: 250, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1631460681 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1631460679} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 0.5019608} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 0 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &1631460682 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1631460679} - m_CullTransparentMesh: 1 ---- !u!114 &1631460683 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1631460679} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 0 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1631460681} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &1679198199 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1679198200} - - component: {fileID: 1679198202} - - component: {fileID: 1679198201} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1679198200 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1679198199} - 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_Children: [] - m_Father: {fileID: 107375590} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -155, y: 200} + m_SizeDelta: {x: 250, y: 40} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1679198201 +--- !u!114 &142379023 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1679198199} + m_GameObject: {fileID: 142379021} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -2644,7 +821,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: a5a3b9aa4e92cfd4a9014c429c6a7e4e, type: 3} + m_Font: {fileID: 12800000, guid: a5625e3ef998003458714eb346f52fb6, type: 3} m_FontSize: 16 m_FontStyle: 0 m_BestFit: 0 @@ -2656,16 +833,287 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 2 - m_Text: Exit to Mod Select ---- !u!222 &1679198202 + m_Text: 'Options:' +--- !u!222 &142379024 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1679198199} + m_GameObject: {fileID: 142379021} m_CullTransparentMesh: 0 ---- !u!1 &1706522957 +--- !u!1001 &267279029 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 64571900} + m_Modifications: + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_Alignment + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Text + value: 'Crate Your Frisk: Off' + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.r + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.g + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.b + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Name + value: Crate + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_RootOrder + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -155 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -160 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: 250 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.a + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.r + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.g + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.b + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.a + value: 0.5019608 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 06a74376a3db7d744b36f7bb52973cf7, type: 3} +--- !u!224 &267279030 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 267279029} + m_PrefabAsset: {fileID: 0} +--- !u!1 &267279031 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 267279029} + m_PrefabAsset: {fileID: 0} +--- !u!1 &666042081 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2673,42 +1121,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1706522958} - - component: {fileID: 1706522960} - - component: {fileID: 1706522959} + - component: {fileID: 666042082} + - component: {fileID: 666042084} + - component: {fileID: 666042083} m_Layer: 5 - m_Name: Text + m_Name: Description m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1706522958 +--- !u!224 &666042082 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1706522957} + m_GameObject: {fileID: 666042081} 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_Children: [] - m_Father: {fileID: 1822809090} - m_RootOrder: 1 + m_Father: {fileID: 64571900} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 155, y: -70} + m_SizeDelta: {x: 300, y: 500} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1706522959 +--- !u!114 &666042083 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1706522957} + m_GameObject: {fileID: 666042081} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -2721,144 +1169,1810 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: a5a3b9aa4e92cfd4a9014c429c6a7e4e, type: 3} - m_FontSize: 16 + m_Font: {fileID: 12800000, guid: abd91933b51b6fc47931c535c62c6929, type: 3} + m_FontSize: 18 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 1 m_AlignByGeometry: 0 - m_RichText: 0 + m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 2 - m_Text: 'Discord Display: Everything' ---- !u!222 &1706522960 + m_LineSpacing: 1 + m_Text: Hover over an option and its description will appear here! +--- !u!222 &666042084 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1706522957} + m_GameObject: {fileID: 666042081} m_CullTransparentMesh: 0 ---- !u!1 &1822809089 +--- !u!1001 &763680579 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 64571900} + m_Modifications: + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_Alignment + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Text + value: 'Retrocompatibility Mode: Off' + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.r + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.g + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.b + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Name + value: Retro + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -155 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: 250 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.a + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.r + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.g + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.b + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.a + value: 0.5019608 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 06a74376a3db7d744b36f7bb52973cf7, type: 3} +--- !u!224 &763680580 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 763680579} + m_PrefabAsset: {fileID: 0} +--- !u!1 &763680581 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 763680579} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &998100202 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 64571900} + m_Modifications: + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_Alignment + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Text + value: Keybinds... + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.r + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.g + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.b + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Name + value: Keys + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -155 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -120 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: 250 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.a + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.r + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.g + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.b + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.a + value: 0.5019608 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 06a74376a3db7d744b36f7bb52973cf7, type: 3} +--- !u!224 &998100203 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 998100202} + m_PrefabAsset: {fileID: 0} +--- !u!1 &998100204 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 998100202} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1033043455 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1033043459} + - component: {fileID: 1033043458} + - component: {fileID: 1033043457} + - component: {fileID: 1033043456} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1033043456 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1033043455} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1997211142, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ForceModuleActive: 0 +--- !u!114 &1033043457 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1033043455} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &1033043458 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1033043455} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 5 +--- !u!4 &1033043459 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1033043455} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1145778382 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1356470217043364, guid: e264c08f2eb1b0a42a121539d52a0279, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1822809090} - - component: {fileID: 1822809093} - - component: {fileID: 1822809092} - - component: {fileID: 1822809091} + - component: {fileID: 1145778383} + - component: {fileID: 1145778385} + - component: {fileID: 1145778384} m_Layer: 5 - m_Name: Discord + m_Name: DescriptionLabel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1822809090 +--- !u!224 &1145778383 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 224965271745359238, guid: e264c08f2eb1b0a42a121539d52a0279, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1822809089} + m_GameObject: {fileID: 1145778382} 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_Children: - - {fileID: 1292252969} - - {fileID: 1706522958} + m_Children: [] m_Father: {fileID: 64571900} - m_RootOrder: 9 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -155, y: -80} + m_AnchoredPosition: {x: 155, y: 200} m_SizeDelta: {x: 250, y: 40} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1822809091 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1822809089} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 0 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1822809092} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1822809092 +--- !u!114 &1145778384 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1822809089} + m_GameObject: {fileID: 1145778382} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 0.5019608} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 0 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &1822809093 + m_FontData: + m_Font: {fileID: 12800000, guid: a5625e3ef998003458714eb346f52fb6, type: 3} + m_FontSize: 16 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 0 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 2 + m_Text: 'Information:' +--- !u!222 &1145778385 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1822809089} - m_CullTransparentMesh: 1 + m_GameObject: {fileID: 1145778382} + m_CullTransparentMesh: 0 +--- !u!1001 &1212751804 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 64571900} + m_Modifications: + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_Alignment + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Text + value: Reset Almighty Globals + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.r + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.g + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.b + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Name + value: ResetAG + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -155 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 120 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: 250 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.a + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.r + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.g + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.b + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.a + value: 0.5019608 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 06a74376a3db7d744b36f7bb52973cf7, type: 3} +--- !u!224 &1212751805 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 1212751804} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1212751806 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 1212751804} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1583719771 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 64571900} + m_Modifications: + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_Alignment + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Text + value: Exit to Mod Select + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.r + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.g + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.b + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Name + value: Exit + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_RootOrder + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -155 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -200 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: 250 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.a + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.r + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.g + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.b + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.a + value: 0.5019608 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 06a74376a3db7d744b36f7bb52973cf7, type: 3} +--- !u!224 &1583719772 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 1583719771} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1583719773 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 1583719771} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1716142120 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 64571900} + m_Modifications: + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_Alignment + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Text + value: 'Window Scale: 1x' + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.r + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.g + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.b + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Name + value: Scale + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -155 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -40 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: 250 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.a + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.r + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.g + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.b + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.a + value: 0.5019608 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 06a74376a3db7d744b36f7bb52973cf7, type: 3} +--- !u!224 &1716142121 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 1716142120} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1716142122 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 1716142120} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1826168418 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 64571900} + m_Modifications: + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_Alignment + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Text + value: Reset Real Globals + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.r + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.g + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.b + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Name + value: ResetRG + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -155 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 160 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: 250 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.a + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.r + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.g + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.b + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.a + value: 0.5019608 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 06a74376a3db7d744b36f7bb52973cf7, type: 3} +--- !u!224 &1826168419 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 1826168418} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1826168420 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 1826168418} + m_PrefabAsset: {fileID: 0} --- !u!1 &1926334437 GameObject: m_ObjectHideFlags: 0 @@ -2985,86 +3099,285 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2ea8601668b5c64488fed0712837d69, type: 3} m_Name: m_EditorClassIdentifier: - ResetRG: {fileID: 1091755616} - ResetAG: {fileID: 916737235} - ClearSave: {fileID: 1483033491} - Safe: {fileID: 1631460679} - Retro: {fileID: 132251294} - Fullscreen: {fileID: 0} - Scale: {fileID: 1342957224} - Discord: {fileID: 1822809089} - Crate: {fileID: 954509272} - Exit: {fileID: 107375589} + ResetRG: {fileID: 1826168420} + ResetAG: {fileID: 1212751806} + ClearSave: {fileID: 110168062} + Safe: {fileID: 73542488} + Retro: {fileID: 763680581} + Scale: {fileID: 1716142122} + Discord: {fileID: 1958569516} + Keys: {fileID: 998100204} + Crate: {fileID: 267279031} + Exit: {fileID: 1583719773} Description: {fileID: 666042083} ---- !u!1 &2103507659 -GameObject: +--- !u!1001 &1958569514 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2103507660} - - component: {fileID: 2103507662} - - component: {fileID: 2103507661} - m_Layer: 5 - m_Name: Fill - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2103507660 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 64571900} + m_Modifications: + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889262, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_FontData.m_Alignment + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6408004042313889263, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Text + value: 'Discord Display: Everything' + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.r + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.g + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340344, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.b + value: 0.1254902 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004042703340351, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Name + value: Discord + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -155 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -80 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.x + value: 250 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.a + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039571, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: m_Color.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.r + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: NormalColor.b + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.r + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.g + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.b + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 6408004043003039581, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + propertyPath: HoverColor.a + value: 0.5019608 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 06a74376a3db7d744b36f7bb52973cf7, type: 3} +--- !u!224 &1958569515 stripped RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2103507659} - 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_Children: [] - m_Father: {fileID: 107375590} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 250, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2103507661 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 6408004043003039569, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 1958569514} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2103507659} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.1254902, g: 0.1254902, b: 0.1254902, a: 0.5019608} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!222 &2103507662 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} +--- !u!1 &1958569516 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6408004043003039568, guid: 06a74376a3db7d744b36f7bb52973cf7, + type: 3} + m_PrefabInstance: {fileID: 1958569514} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2103507659} - m_CullTransparentMesh: 0 diff --git a/Assets/Scenes/Shop.unity b/Assets/Scenes/Shop.unity index c59fe3447..4221b2033 100644 --- a/Assets/Scenes/Shop.unity +++ b/Assets/Scenes/Shop.unity @@ -50,7 +50,6 @@ LightmapSettings: m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 @@ -117,7 +116,8 @@ NavMeshSettings: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 24893794} @@ -132,7 +132,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 24893793} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -150,8 +151,9 @@ RectTransform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 126142, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 116576159} @@ -168,8 +170,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22438742, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 116576158} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -188,8 +191,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11488738, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 116576158} m_Enabled: 1 m_EditorHideFlags: 0 @@ -202,8 +206,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -212,20 +214,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &116576161 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22237998, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 116576158} m_CullTransparentMesh: 0 --- !u!1 &121037843 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 142508, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 121037844} @@ -242,8 +247,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22420856, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 121037843} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -261,8 +267,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11446620, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 121037843} m_Enabled: 1 m_EditorHideFlags: 0 @@ -275,8 +282,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 0f9ce02f0b7f9594494206ca2d908ad4, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -285,20 +290,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &121037846 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22211202, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 121037843} m_CullTransparentMesh: 0 --- !u!1 &534657685 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 188422, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 534657686} @@ -315,8 +323,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22443130, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 534657685} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -335,8 +344,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11427710, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 534657685} m_Enabled: 1 m_EditorHideFlags: 0 @@ -349,8 +359,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -359,20 +367,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &534657688 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22247638, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 534657685} m_CullTransparentMesh: 0 --- !u!1 &612950020 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 196304, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 612950023} @@ -389,8 +400,9 @@ GameObject: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8212490, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 612950020} m_Enabled: 1 serializedVersion: 4 @@ -485,8 +497,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11449538, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 612950020} m_Enabled: 1 m_EditorHideFlags: 0 @@ -496,11 +509,12 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + columnShift: 265 + columnNumber: 2 blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -508,8 +522,9 @@ MonoBehaviour: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22424056, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 612950020} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -527,8 +542,9 @@ RectTransform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 188422, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 661136828} @@ -545,8 +561,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22443130, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 661136827} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -565,8 +582,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11427710, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 661136827} m_Enabled: 1 m_EditorHideFlags: 0 @@ -579,8 +597,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -589,20 +605,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &661136830 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22247638, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 661136827} m_CullTransparentMesh: 0 --- !u!1 &735839752 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 126142, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 735839753} @@ -619,8 +638,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22438742, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 735839752} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -639,8 +659,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11488738, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 735839752} m_Enabled: 1 m_EditorHideFlags: 0 @@ -653,8 +674,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -663,20 +682,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &735839755 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22237998, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 735839752} m_CullTransparentMesh: 0 --- !u!1 &956183517 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 126142, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 956183518} @@ -693,8 +715,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22438742, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 956183517} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -713,8 +736,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11488738, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 956183517} m_Enabled: 1 m_EditorHideFlags: 0 @@ -727,8 +751,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -737,20 +759,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &956183520 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22237998, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 956183517} m_CullTransparentMesh: 0 --- !u!1 &1053457372 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 138530, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1053457376} @@ -769,8 +794,9 @@ GameObject: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11406992, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1053457372} m_Enabled: 1 m_EditorHideFlags: 0 @@ -786,8 +812,9 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11450476, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1053457372} m_Enabled: 1 m_EditorHideFlags: 0 @@ -808,8 +835,9 @@ MonoBehaviour: Canvas: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22343828, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1053457372} m_Enabled: 1 serializedVersion: 3 @@ -829,8 +857,9 @@ Canvas: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22435900, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1053457372} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -863,7 +892,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1053457372} m_Enabled: 1 m_EditorHideFlags: 0 @@ -882,8 +912,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 196304, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1064379238} @@ -900,8 +931,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22424056, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1064379237} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -919,8 +951,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8212490, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1064379237} m_Enabled: 1 serializedVersion: 4 @@ -1015,8 +1048,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11449538, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1064379237} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1026,11 +1060,12 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 574 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + columnShift: 265 + columnNumber: 2 blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -1038,8 +1073,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 126142, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1225570642} @@ -1056,8 +1092,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22438742, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1225570641} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1076,8 +1113,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11488738, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1225570641} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1090,8 +1128,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -1100,20 +1136,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1225570644 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22237998, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1225570641} m_CullTransparentMesh: 0 --- !u!1 &1288303641 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 102878, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1288303642} @@ -1130,8 +1169,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22499754, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1288303641} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1149,8 +1189,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11481102, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1288303641} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1163,8 +1204,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 84380142b5676e44daea94b5219bcf93, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -1173,20 +1212,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1288303644 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22201302, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1288303641} m_CullTransparentMesh: 0 --- !u!1 &1308600305 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 188422, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1308600306} @@ -1203,8 +1245,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22443130, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1308600305} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1223,8 +1266,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11427710, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1308600305} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1237,8 +1281,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -1247,20 +1289,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1308600308 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22247638, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1308600305} m_CullTransparentMesh: 0 --- !u!1 &1310941138 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 142508, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1310941139} @@ -1277,8 +1322,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22420856, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1310941138} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1296,8 +1342,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11446620, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1310941138} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1310,8 +1357,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: e6adce4d15086d64bb3b3fbddff1f69b, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -1320,20 +1365,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1310941141 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22211202, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1310941138} m_CullTransparentMesh: 0 --- !u!1 &1331393606 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 196304, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1331393607} @@ -1350,8 +1398,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22424056, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1331393606} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1369,8 +1418,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8212490, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1331393606} m_Enabled: 1 serializedVersion: 4 @@ -1465,8 +1515,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11449538, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1331393606} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1476,11 +1527,12 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 164 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + columnShift: 265 + columnNumber: 1 blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -1488,7 +1540,8 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1372833085} @@ -1503,7 +1556,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1372833084} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1521,8 +1575,9 @@ RectTransform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 196304, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1426570118} @@ -1539,8 +1594,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22424056, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1426570117} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1558,8 +1614,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8212490, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1426570117} m_Enabled: 1 serializedVersion: 4 @@ -1654,8 +1711,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11449538, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1426570117} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1665,11 +1723,12 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 164 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + columnShift: 265 + columnNumber: 1 blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -1677,8 +1736,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 196304, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1494352338} @@ -1695,8 +1755,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22424056, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1494352337} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1714,8 +1775,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8212490, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1494352337} m_Enabled: 1 serializedVersion: 4 @@ -1810,8 +1872,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11449538, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1494352337} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1821,11 +1884,12 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 364 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + columnShift: 265 + columnNumber: 1 blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -1833,8 +1897,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 188422, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1541950372} @@ -1851,8 +1916,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22443130, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1541950371} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1871,8 +1937,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11427710, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1541950371} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1885,8 +1952,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -1895,19 +1960,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1541950374 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22247638, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1541950371} m_CullTransparentMesh: 0 --- !u!1 &1701512144 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1701512145} @@ -1922,7 +1990,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1701512144} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1940,8 +2009,9 @@ RectTransform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 196304, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1727654155} @@ -1958,8 +2028,9 @@ GameObject: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8212490, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1727654152} m_Enabled: 1 serializedVersion: 4 @@ -2054,8 +2125,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11449538, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1727654152} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2065,11 +2137,12 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + columnShift: 265 + columnNumber: 2 blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -2077,8 +2150,9 @@ MonoBehaviour: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22424056, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1727654152} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2096,8 +2170,9 @@ RectTransform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 142508, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1823239362} @@ -2115,8 +2190,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22420856, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1823239361} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2134,8 +2210,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11446620, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1823239361} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2148,8 +2225,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -2158,19 +2233,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1823239364 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22211202, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1823239361} m_CullTransparentMesh: 0 --- !u!114 &1823239365 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1823239361} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2178,146 +2256,147 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: --- !u!1001 &1872943036 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 1053457376} m_Modifications: - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} + propertyPath: m_Text + value: Debugger (F9 to toggle, DEBUG(string) to print) + objectReference: {fileID: 0} + - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} + propertyPath: m_FontData.m_Alignment + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} + propertyPath: m_FontData.m_BestFit + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} + propertyPath: m_FontData.m_HorizontalOverflow + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} + propertyPath: m_FontData.m_VerticalOverflow + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} + propertyPath: m_FontData.m_RichText + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: abd91933b51b6fc47931c535c62c6929, + type: 3} + - target: {fileID: 11453098, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} + propertyPath: maxLines + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_LocalPosition.z value: 9080 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_RootOrder value: 14 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_AnchoredPosition.x value: -20 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_SizeDelta.x value: 320 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_SizeDelta.y value: 140 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_AnchorMin.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_AnchorMax.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_Pivot.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_Pivot.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} - propertyPath: m_Text - value: Debugger (F9 to toggle, DEBUG(string) to print) - objectReference: {fileID: 0} - - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} - propertyPath: m_FontData.m_Alignment - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} - propertyPath: m_FontData.m_BestFit - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22474774, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22474774, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22474774, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22474774, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_SizeDelta.x value: -10 objectReference: {fileID: 0} - - target: {fileID: 22474774, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22474774, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22474774, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22474774, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_SizeDelta.y value: -10 objectReference: {fileID: 0} - - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} - propertyPath: m_FontData.m_HorizontalOverflow - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} - propertyPath: m_FontData.m_VerticalOverflow - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11453098, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} - propertyPath: maxLines - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} - propertyPath: m_FontData.m_RichText - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} - propertyPath: m_FontData.m_Font - value: - objectReference: {fileID: 12800000, guid: abd91933b51b6fc47931c535c62c6929, - type: 3} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} - m_IsPrefabAsset: 0 + m_SourcePrefab: {fileID: 100100000, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} --- !u!224 &1872943037 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, - type: 2} - m_PrefabInternal: {fileID: 1872943036} + type: 3} + m_PrefabInstance: {fileID: 1872943036} + m_PrefabAsset: {fileID: 0} --- !u!1 &2033653813 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2033653814} @@ -2332,7 +2411,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2033653813} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/TransitionOverworld.unity b/Assets/Scenes/TransitionOverworld.unity index 5ef96ce2c..94a949058 100644 --- a/Assets/Scenes/TransitionOverworld.unity +++ b/Assets/Scenes/TransitionOverworld.unity @@ -50,7 +50,6 @@ LightmapSettings: m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 @@ -117,8 +116,9 @@ NavMeshSettings: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 111604, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 12034620} @@ -135,8 +135,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22430634, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 12034619} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -154,8 +155,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8227254, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 12034619} m_Enabled: 1 serializedVersion: 4 @@ -250,8 +252,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11424568, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 12034619} m_Enabled: 1 m_EditorHideFlags: 0 @@ -261,11 +264,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -273,8 +276,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 164878, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 37236982} @@ -291,8 +295,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22403394, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 37236981} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -310,8 +315,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8254826, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 37236981} m_Enabled: 1 serializedVersion: 4 @@ -406,8 +412,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11489994, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 37236981} m_Enabled: 1 m_EditorHideFlags: 0 @@ -417,151 +424,151 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 --- !u!1001 &43590226 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 1779322336} m_Modifications: - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} + propertyPath: m_Text + value: Debugger (F9 to toggle, DEBUG(string) to print) + objectReference: {fileID: 0} + - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} + propertyPath: m_FontData.m_Alignment + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} + propertyPath: m_FontData.m_BestFit + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} + propertyPath: m_FontData.m_HorizontalOverflow + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} + propertyPath: m_FontData.m_VerticalOverflow + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} + propertyPath: m_FontData.m_RichText + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: abd91933b51b6fc47931c535c62c6929, + type: 3} + - target: {fileID: 11453098, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} + propertyPath: maxLines + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_LocalPosition.z value: 90 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_RootOrder value: 7 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_AnchoredPosition.x value: -20 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_SizeDelta.x value: 320 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_SizeDelta.y value: 140 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_AnchorMin.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_AnchorMax.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_Pivot.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_Pivot.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} - propertyPath: m_Text - value: Debugger (F9 to toggle, DEBUG(string) to print) - objectReference: {fileID: 0} - - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} - propertyPath: m_FontData.m_Alignment - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} - propertyPath: m_FontData.m_BestFit - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22474774, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22474774, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22474774, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22474774, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_SizeDelta.x value: -10 objectReference: {fileID: 0} - - target: {fileID: 22474774, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22474774, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22474774, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} + - target: {fileID: 22474774, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} propertyPath: m_SizeDelta.y value: -10 objectReference: {fileID: 0} - - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} - propertyPath: m_FontData.m_HorizontalOverflow - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} - propertyPath: m_FontData.m_VerticalOverflow - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11453098, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} - propertyPath: maxLines - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} - propertyPath: m_FontData.m_RichText - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11413288, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} - propertyPath: m_FontData.m_Font - value: - objectReference: {fileID: 12800000, guid: abd91933b51b6fc47931c535c62c6929, - type: 3} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1ccc044534d366d4abebb5047dfda396, type: 2} - m_IsPrefabAsset: 0 + m_SourcePrefab: {fileID: 100100000, guid: 1ccc044534d366d4abebb5047dfda396, type: 3} --- !u!1 &124672994 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 169666, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 124672995} @@ -578,8 +585,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22444640, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 124672994} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -597,8 +605,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8284956, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 124672994} m_Enabled: 1 serializedVersion: 4 @@ -693,8 +702,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11404458, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 124672994} m_Enabled: 1 m_EditorHideFlags: 0 @@ -704,11 +714,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -716,8 +726,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 129530, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 147928541} @@ -734,8 +745,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22473642, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 147928540} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -5040} @@ -753,8 +765,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11485054, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 147928540} m_Enabled: 1 m_EditorHideFlags: 0 @@ -767,8 +780,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -777,19 +788,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &147928543 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22247274, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 147928540} m_CullTransparentMesh: 0 --- !u!1 &189985682 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 189985683} @@ -804,7 +818,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 189985682} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -822,8 +837,9 @@ RectTransform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 155676, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 212244440} @@ -840,8 +856,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22460088, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 212244439} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -859,8 +876,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8235390, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 212244439} m_Enabled: 1 serializedVersion: 4 @@ -955,8 +973,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11460566, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 212244439} m_Enabled: 1 m_EditorHideFlags: 0 @@ -966,11 +985,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -978,8 +997,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 198980, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 247211484} @@ -997,8 +1017,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22435714, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 247211483} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1016,8 +1037,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11438250, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 247211483} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1030,8 +1052,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -1040,19 +1060,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &247211486 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22248334, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 247211483} m_CullTransparentMesh: 0 --- !u!114 &247211487 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 247211483} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1063,8 +1086,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 196304, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 256024070} @@ -1081,8 +1105,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22424056, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 256024069} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1093,15 +1118,16 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -150, y: 65} + m_AnchoredPosition: {x: -267, y: 65} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0, y: 1} --- !u!82 &256024071 AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8212490, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 256024069} m_Enabled: 1 serializedVersion: 4 @@ -1196,8 +1222,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11449538, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 256024069} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1206,12 +1233,12 @@ MonoBehaviour: m_EditorClassIdentifier: letterSound: ( currentLine: 0 - _textMaxWidth: 0 + _textMaxWidth: 534 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -1219,8 +1246,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 116950, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 260230356} @@ -1237,8 +1265,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22495040, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 260230355} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1256,8 +1285,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8245112, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 260230355} m_Enabled: 1 serializedVersion: 4 @@ -1352,8 +1382,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11473182, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 260230355} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1363,11 +1394,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -1375,8 +1406,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 153806, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 268140600} @@ -1393,8 +1425,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22410726, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 268140599} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1412,8 +1445,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8293506, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 268140599} m_Enabled: 1 serializedVersion: 4 @@ -1508,8 +1542,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11425818, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 268140599} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1519,11 +1554,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -1531,8 +1566,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 172992, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 373771160} @@ -1549,8 +1585,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22431834, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 373771159} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1568,8 +1605,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8235822, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 373771159} m_Enabled: 1 serializedVersion: 4 @@ -1664,8 +1702,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11443542, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 373771159} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1675,11 +1714,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -1687,8 +1726,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 126142, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 424356987} @@ -1705,8 +1745,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22438742, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 424356986} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1725,8 +1766,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11488738, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 424356986} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1739,8 +1781,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -1749,20 +1789,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &424356989 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22237998, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 424356986} m_CullTransparentMesh: 0 --- !u!1 &483941558 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 127248, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 483941559} @@ -1779,8 +1822,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22478606, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 483941558} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1798,8 +1842,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8216894, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 483941558} m_Enabled: 1 serializedVersion: 4 @@ -1894,8 +1939,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11468106, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 483941558} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1905,11 +1951,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -1917,7 +1963,8 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 495211066} @@ -1935,7 +1982,8 @@ GameObject: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 495211062} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1951,7 +1999,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 495211062} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1972,7 +2021,8 @@ MonoBehaviour: Canvas: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 495211062} m_Enabled: 1 serializedVersion: 3 @@ -1992,7 +2042,8 @@ Canvas: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 495211062} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2011,8 +2062,9 @@ RectTransform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 135856, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 557343005} @@ -2029,8 +2081,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22422088, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 557343004} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2048,8 +2101,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8273024, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 557343004} m_Enabled: 1 serializedVersion: 4 @@ -2144,8 +2198,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11498876, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 557343004} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2155,11 +2210,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -2167,8 +2222,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 176660, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 566465744} @@ -2185,8 +2241,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22459112, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 566465743} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2204,8 +2261,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8286316, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 566465743} m_Enabled: 1 serializedVersion: 4 @@ -2300,8 +2358,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11479976, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 566465743} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2311,11 +2370,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -2323,8 +2382,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 127570, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 573195107} @@ -2341,8 +2401,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22414798, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 573195106} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2360,8 +2421,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8272772, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 573195106} m_Enabled: 1 serializedVersion: 4 @@ -2456,8 +2518,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11456694, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 573195106} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2467,542 +2530,542 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 --- !u!1001 &586924196 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 224554813039956440, guid: a606ee4e085f7114e8a4bb167d4e644b, - type: 2} + type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 224554813039956440, guid: a606ee4e085f7114e8a4bb167d4e644b, - type: 2} + type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - target: {fileID: 224554813039956440, guid: a606ee4e085f7114e8a4bb167d4e644b, - type: 2} + type: 3} propertyPath: m_LocalPosition.z value: -10000 objectReference: {fileID: 0} - target: {fileID: 224554813039956440, guid: a606ee4e085f7114e8a4bb167d4e644b, - type: 2} + type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - target: {fileID: 224554813039956440, guid: a606ee4e085f7114e8a4bb167d4e644b, - type: 2} + type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - target: {fileID: 224554813039956440, guid: a606ee4e085f7114e8a4bb167d4e644b, - type: 2} + type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - target: {fileID: 224554813039956440, guid: a606ee4e085f7114e8a4bb167d4e644b, - type: 2} + type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - target: {fileID: 224554813039956440, guid: a606ee4e085f7114e8a4bb167d4e644b, - type: 2} + type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - target: {fileID: 224554813039956440, guid: a606ee4e085f7114e8a4bb167d4e644b, - type: 2} + type: 3} propertyPath: m_AnchoredPosition.x value: 320 objectReference: {fileID: 0} - target: {fileID: 224554813039956440, guid: a606ee4e085f7114e8a4bb167d4e644b, - type: 2} + type: 3} propertyPath: m_AnchoredPosition.y value: 240 objectReference: {fileID: 0} - target: {fileID: 224554813039956440, guid: a606ee4e085f7114e8a4bb167d4e644b, - type: 2} + type: 3} propertyPath: m_SizeDelta.x value: 100 objectReference: {fileID: 0} - target: {fileID: 224554813039956440, guid: a606ee4e085f7114e8a4bb167d4e644b, - type: 2} + type: 3} propertyPath: m_SizeDelta.y value: 100 objectReference: {fileID: 0} - target: {fileID: 224554813039956440, guid: a606ee4e085f7114e8a4bb167d4e644b, - type: 2} + type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - target: {fileID: 224554813039956440, guid: a606ee4e085f7114e8a4bb167d4e644b, - type: 2} + type: 3} propertyPath: m_AnchorMin.y value: 0.5 objectReference: {fileID: 0} - target: {fileID: 224554813039956440, guid: a606ee4e085f7114e8a4bb167d4e644b, - type: 2} + type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - target: {fileID: 224554813039956440, guid: a606ee4e085f7114e8a4bb167d4e644b, - type: 2} + type: 3} propertyPath: m_AnchorMax.y value: 0.5 objectReference: {fileID: 0} - target: {fileID: 224554813039956440, guid: a606ee4e085f7114e8a4bb167d4e644b, - type: 2} + type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - target: {fileID: 224554813039956440, guid: a606ee4e085f7114e8a4bb167d4e644b, - type: 2} + type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a606ee4e085f7114e8a4bb167d4e644b, type: 2} - m_IsPrefabAsset: 0 + m_SourcePrefab: {fileID: 100100000, guid: a606ee4e085f7114e8a4bb167d4e644b, type: 3} --- !u!1001 &619600879 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 1654311716} m_Modifications: - - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} - propertyPath: anims.Array.size - value: 49 + - target: {fileID: 465484, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 465484, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5003194, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} + propertyPath: m_BodyType + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6156472, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} + propertyPath: m_SpriteTilingProperty.pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6156472, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} + propertyPath: m_SpriteTilingProperty.pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6156472, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.x + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 6156472, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.y + value: 0.66 + objectReference: {fileID: 0} + - target: {fileID: 6156472, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} + propertyPath: m_SpriteTilingProperty.newSize.x + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 6156472, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} + propertyPath: m_SpriteTilingProperty.newSize.y + value: 0.58 + objectReference: {fileID: 0} + - target: {fileID: 6156472, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} + propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6156472, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} + propertyPath: m_Size.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 6156472, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} + propertyPath: m_Size.y + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 6156472, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} + propertyPath: m_Offset.y + value: 0.1 objectReference: {fileID: 0} - - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} + - target: {fileID: 6156472, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} + propertyPath: m_EdgeRadius + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6156472, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6156472, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} + propertyPath: m_Offset.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11463766, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} + propertyPath: speed + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 21207398, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: ba3bc926f01aa7e4782aa6b0faf2a3d8, + type: 3} + - target: {fileID: 21207398, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} + propertyPath: m_Size.x + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 21207398, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} + propertyPath: m_Size.y + value: 0.58 + objectReference: {fileID: 0} + - target: {fileID: 21207398, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} + - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} + - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} + - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} + - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} + - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} + - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} + - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} + - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} + - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} + - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} propertyPath: m_SizeDelta.x value: 0.38 objectReference: {fileID: 0} - - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} + - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} propertyPath: m_SizeDelta.y value: 0.58 objectReference: {fileID: 0} - - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} + - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} + - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} + - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} + - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} + - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} + - target: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 21207398, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: ba3bc926f01aa7e4782aa6b0faf2a3d8, + - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} - - target: {fileID: 21207398, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} - propertyPath: m_Size.x - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 21207398, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} - propertyPath: m_Size.y - value: 0.58 - objectReference: {fileID: 0} - - target: {fileID: 6156472, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} - propertyPath: m_SpriteTilingProperty.pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6156472, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} - propertyPath: m_SpriteTilingProperty.pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6156472, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} - propertyPath: m_SpriteTilingProperty.oldSize.x - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 6156472, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} - propertyPath: m_SpriteTilingProperty.oldSize.y - value: 0.66 - objectReference: {fileID: 0} - - target: {fileID: 6156472, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} - propertyPath: m_SpriteTilingProperty.newSize.x - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 6156472, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} - propertyPath: m_SpriteTilingProperty.newSize.y - value: 0.58 - objectReference: {fileID: 0} - - target: {fileID: 6156472, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} - propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6156472, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} - propertyPath: m_Size.x - value: 0.3 - objectReference: {fileID: 0} - - target: {fileID: 6156472, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} - propertyPath: m_Size.y - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 6156472, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} - propertyPath: m_Offset.y - value: 0.1 - objectReference: {fileID: 0} - - target: {fileID: 6156472, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} - propertyPath: m_EdgeRadius - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6156472, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6156472, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} - propertyPath: m_Offset.x - value: 0 + propertyPath: anims.Array.size + value: 49 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[40].name value: BoosterMovingDown objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[40].anims value: BoosterOW/0, BoosterOW/1, BoosterOW/2, BoosterOW/3 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[40].transitionTime value: 0.1875 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[41].name value: BoosterMovingLeft objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[41].anims value: BoosterOW/4, BoosterOW/5, BoosterOW/6, BoosterOW/7 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[41].transitionTime value: 0.1875 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[42].name value: BoosterMovingRight objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[42].anims value: BoosterOW/8, BoosterOW/9, BoosterOW/10, BoosterOW/11 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[42].transitionTime value: 0.1875 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[43].name value: BoosterMovingUp objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[43].anims value: BoosterOW/12, BoosterOW/13, BoosterOW/14, BoosterOW/15 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[43].transitionTime value: 0.1875 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[44].name value: BoosterStopDown objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[44].anims value: BoosterOW/1, BoosterOW/3 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[44].transitionTime value: 1 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[45].name value: BoosterStopLeft objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[45].anims value: BoosterOW/5, BoosterOW/7 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[45].transitionTime value: 1 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[46].name value: BoosterStopRight objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[46].anims value: BoosterOW/9, BoosterOW/11 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[46].transitionTime value: 1 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[47].name value: BoosterStopUp objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[47].anims value: BoosterOW/13, BoosterOW/15 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[47].transitionTime value: 1 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[48].name value: NoAnim objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[48].anims value: empty2, empty2 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[48].transitionTime value: 60 objectReference: {fileID: 0} - - target: {fileID: 5003194, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} - propertyPath: m_BodyType - value: 1 - objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[4].anims value: FriskUT/1, FriskUT/3 objectReference: {fileID: 0} - - target: {fileID: 11463766, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} - propertyPath: speed - value: 3 - objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[0].transitionTime value: 0.1875 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[3].transitionTime value: 0.1875 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[2].transitionTime value: 0.1875 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[1].transitionTime value: 0.1875 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[8].transitionTime value: 0.1875 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[9].transitionTime value: 0.1875 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[10].transitionTime value: 0.1875 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[11].transitionTime value: 0.1875 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[16].transitionTime value: 0.1875 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[17].transitionTime value: 0.1875 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[18].transitionTime value: 0.1875 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[19].transitionTime value: 0.1875 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[24].transitionTime value: 0.1875 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[25].transitionTime value: 0.1875 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[26].transitionTime value: 0.1875 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[27].transitionTime value: 0.1875 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[32].transitionTime value: 0.1875 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[34].transitionTime value: 0.1875 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[33].transitionTime value: 0.1875 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[35].transitionTime value: 0.1875 objectReference: {fileID: 0} - target: {fileID: 114937843077718580, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} + type: 3} propertyPath: anims.Array.data[0].anims value: FriskUT/0, FriskUT/1, FriskUT/2, FriskUT/3 objectReference: {fileID: 0} - - target: {fileID: 465484, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 465484, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 21207398, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} - propertyPath: m_WasSpriteAssigned - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e40c2f31a47b71446a21f2839cf50317, type: 2} - m_IsPrefabAsset: 0 + m_SourcePrefab: {fileID: 100100000, guid: e40c2f31a47b71446a21f2839cf50317, type: 3} --- !u!224 &619600880 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 22441604, guid: e40c2f31a47b71446a21f2839cf50317, - type: 2} - m_PrefabInternal: {fileID: 619600879} + type: 3} + m_PrefabInstance: {fileID: 619600879} + m_PrefabAsset: {fileID: 0} --- !u!1 &629619426 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 190998, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 629619427} @@ -3019,8 +3082,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22458834, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 629619426} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3038,8 +3102,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8217906, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 629619426} m_Enabled: 1 serializedVersion: 4 @@ -3134,8 +3199,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11431062, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 629619426} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3145,11 +3211,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -3157,7 +3223,8 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 634136910} @@ -3172,7 +3239,8 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 634136909} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 320, y: 240, z: 100000} @@ -3187,8 +3255,9 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 149078, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 670959144} @@ -3205,8 +3274,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22459614, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 670959143} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3225,8 +3295,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11404624, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 670959143} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3239,8 +3310,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -3249,20 +3318,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &670959146 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22240298, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 670959143} m_CullTransparentMesh: 0 --- !u!1 &715141001 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 138530, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1779322336} @@ -3280,8 +3352,9 @@ GameObject: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11406992, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 715141001} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3297,8 +3370,9 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11450476, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 715141001} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3319,8 +3393,9 @@ MonoBehaviour: Canvas: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22343828, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 715141001} m_Enabled: 1 serializedVersion: 3 @@ -3340,8 +3415,9 @@ Canvas: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 154400, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 717195415} @@ -3358,8 +3434,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22402256, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 717195414} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3377,8 +3454,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8238284, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 717195414} m_Enabled: 1 serializedVersion: 4 @@ -3473,8 +3551,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11410186, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 717195414} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3484,11 +3563,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -3496,8 +3575,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 170660, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 738094586} @@ -3514,8 +3594,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22425382, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 738094585} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3533,8 +3614,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8227190, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 738094585} m_Enabled: 1 serializedVersion: 4 @@ -3629,8 +3711,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11424364, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 738094585} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3640,11 +3723,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -3652,8 +3735,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 193974, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 743800824} @@ -3670,8 +3754,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22475042, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 743800823} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3690,8 +3775,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11470070, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 743800823} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3704,8 +3790,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -3714,20 +3798,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &743800826 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22250412, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 743800823} m_CullTransparentMesh: 0 --- !u!1 &749788066 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 133030, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 749788067} @@ -3744,8 +3831,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22428066, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 749788066} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3763,8 +3851,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8259096, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 749788066} m_Enabled: 1 serializedVersion: 4 @@ -3859,8 +3948,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11485060, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 749788066} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3870,11 +3960,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -3882,8 +3972,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 187396, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 770504842} @@ -3900,8 +3991,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22453338, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 770504841} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -4990} @@ -3919,8 +4011,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11458820, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 770504841} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3933,8 +4026,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 62f8426a429498442af34752c971234e, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -3943,20 +4034,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &770504844 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22262554, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 770504841} m_CullTransparentMesh: 0 --- !u!1 &804708091 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 131400, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 804708092} @@ -3973,8 +4067,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22412628, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 804708091} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3992,8 +4087,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8277832, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 804708091} m_Enabled: 1 serializedVersion: 4 @@ -4088,8 +4184,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11489992, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 804708091} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4099,11 +4196,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -4111,8 +4208,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 109072, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 820532156} @@ -4129,8 +4227,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22473384, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 820532155} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4148,8 +4247,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8246416, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 820532155} m_Enabled: 1 serializedVersion: 4 @@ -4244,8 +4344,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11403628, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 820532155} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4255,11 +4356,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -4267,8 +4368,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 188448, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 835577668} @@ -4285,8 +4387,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22405568, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 835577667} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4310,8 +4413,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11458296, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 835577667} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4324,8 +4428,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -4334,20 +4436,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &835577670 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22237520, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 835577667} m_CullTransparentMesh: 0 --- !u!1 &841160939 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 126430, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 841160940} @@ -4364,8 +4469,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22445310, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 841160939} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4383,8 +4489,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8255908, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 841160939} m_Enabled: 1 serializedVersion: 4 @@ -4479,8 +4586,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11447966, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 841160939} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4490,11 +4598,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -4502,8 +4610,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 185926, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 891869947} @@ -4520,8 +4629,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22480922, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 891869946} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4539,8 +4649,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8222898, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 891869946} m_Enabled: 1 serializedVersion: 4 @@ -4635,8 +4746,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11408826, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 891869946} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4646,24 +4758,26 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 --- !u!1 &911517697 stripped GameObject: m_CorrespondingSourceObject: {fileID: 132834, guid: a606ee4e085f7114e8a4bb167d4e644b, - type: 2} - m_PrefabInternal: {fileID: 586924196} + type: 3} + m_PrefabInstance: {fileID: 586924196} + m_PrefabAsset: {fileID: 0} --- !u!114 &911517698 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 911517697} m_Enabled: 0 m_EditorHideFlags: 0 @@ -4675,8 +4789,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 104722, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 920785482} @@ -4693,8 +4808,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22464902, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 920785481} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4712,8 +4828,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8240498, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 920785481} m_Enabled: 1 serializedVersion: 4 @@ -4808,8 +4925,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11425914, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 920785481} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4819,11 +4937,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -4831,8 +4949,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 183300, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 952942992} @@ -4849,8 +4968,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22418524, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 952942991} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4869,8 +4989,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11481144, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 952942991} m_Enabled: 1 m_EditorHideFlags: 0 @@ -4883,8 +5004,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -4893,20 +5012,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &952942994 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22269356, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 952942991} m_CullTransparentMesh: 0 --- !u!1 &983044190 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 125440, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 983044191} @@ -4923,8 +5045,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22408348, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 983044190} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4942,8 +5065,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8292336, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 983044190} m_Enabled: 1 serializedVersion: 4 @@ -5038,8 +5162,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11406152, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 983044190} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5049,11 +5174,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -5061,7 +5186,8 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1024388665} @@ -5079,7 +5205,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1024388664} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5101,7 +5228,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1024388664} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5117,7 +5245,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1024388664} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5138,7 +5267,8 @@ MonoBehaviour: Canvas: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1024388664} m_Enabled: 1 serializedVersion: 3 @@ -5158,7 +5288,8 @@ Canvas: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1101583712} @@ -5174,7 +5305,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1101583711} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5192,7 +5324,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1101583711} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5202,11 +5335,11 @@ MonoBehaviour: letterSound: $ currentLine: 0 _textMaxWidth: 320 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -5214,8 +5347,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 175004, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1101770079} @@ -5232,8 +5366,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22487528, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1101770078} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5251,8 +5386,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8261376, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1101770078} m_Enabled: 1 serializedVersion: 4 @@ -5347,8 +5483,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11473512, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1101770078} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5358,11 +5495,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -5370,8 +5507,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 165910, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1117834469} @@ -5388,8 +5526,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22448448, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1117834468} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -5090} @@ -5407,8 +5546,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11489796, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1117834468} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5421,8 +5561,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 84380142b5676e44daea94b5219bcf93, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -5431,19 +5569,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1117834471 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22251132, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1117834468} m_CullTransparentMesh: 0 --- !u!1 &1147174114 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1147174115} @@ -5460,7 +5601,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1147174114} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5478,7 +5620,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1147174114} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5491,8 +5634,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 62f8426a429498442af34752c971234e, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -5501,19 +5642,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1147174117 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1147174114} m_CullTransparentMesh: 0 --- !u!1 &1152682277 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 139210, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1152682278} @@ -5530,8 +5674,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22457314, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1152682277} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5549,8 +5694,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8280518, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1152682277} m_Enabled: 1 serializedVersion: 4 @@ -5645,8 +5791,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11428126, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1152682277} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5656,11 +5803,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -5668,8 +5815,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 191150, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1168944912} @@ -5686,8 +5834,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22421098, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1168944911} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5716,8 +5865,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11491106, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1168944911} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5730,8 +5880,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -5740,20 +5888,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1168944914 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22260962, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1168944911} m_CullTransparentMesh: 0 --- !u!1 &1269631940 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 168814, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1269631941} @@ -5770,8 +5921,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22451430, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1269631940} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5790,8 +5942,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11493082, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1269631940} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5804,8 +5957,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -5814,20 +5965,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1269631943 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22264470, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1269631940} m_CullTransparentMesh: 0 --- !u!1 &1299325993 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 168326, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1299325994} @@ -5844,8 +5998,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22435978, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1299325993} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -5863,8 +6018,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8280770, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1299325993} m_Enabled: 1 serializedVersion: 4 @@ -5959,8 +6115,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11438302, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1299325993} m_Enabled: 1 m_EditorHideFlags: 0 @@ -5970,11 +6127,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -5982,8 +6139,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 192008, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1369875160} @@ -6000,8 +6158,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22465874, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1369875159} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6023,8 +6182,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11421820, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1369875159} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6037,8 +6197,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -6047,20 +6205,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1369875162 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22266498, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1369875159} m_CullTransparentMesh: 0 --- !u!1 &1395240486 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 188422, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1395240487} @@ -6077,8 +6238,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22443130, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1395240486} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6098,8 +6260,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11427710, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1395240486} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6112,8 +6275,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -6122,19 +6283,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1395240489 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22247638, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1395240486} m_CullTransparentMesh: 0 --- !u!1 &1442682132 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1442682133} @@ -6151,7 +6315,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1442682132} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 100} @@ -6169,7 +6334,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1442682132} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6182,8 +6348,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 62f8426a429498442af34752c971234e, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -6192,19 +6356,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1442682135 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1442682132} m_CullTransparentMesh: 0 --- !u!1 &1654311714 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1654311716} @@ -6220,8 +6387,9 @@ GameObject: SortingGroup: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 210702407409670196, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1654311714} m_Enabled: 1 m_SortingLayerID: 0 @@ -6231,8 +6399,9 @@ SortingGroup: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1654311714} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -320, y: 211, z: 0} @@ -6245,14 +6414,16 @@ Transform: --- !u!224 &1706295054 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 22465858, guid: 1ccc044534d366d4abebb5047dfda396, - type: 2} - m_PrefabInternal: {fileID: 43590226} + type: 3} + m_PrefabInstance: {fileID: 43590226} + m_PrefabAsset: {fileID: 0} --- !u!1 &1731033918 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 175106, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1731033919} @@ -6267,8 +6438,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22420338, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1731033918} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6292,8 +6464,9 @@ RectTransform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 111108, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1753446872} @@ -6310,8 +6483,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22418640, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1753446871} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6329,8 +6503,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8239556, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1753446871} m_Enabled: 1 serializedVersion: 4 @@ -6425,8 +6600,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11477156, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1753446871} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6436,11 +6612,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -6448,8 +6624,9 @@ MonoBehaviour: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22435900, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 715141001} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} @@ -6475,8 +6652,9 @@ RectTransform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 139748, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1801786522} @@ -6493,8 +6671,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22452400, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1801786521} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6512,8 +6691,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8254856, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1801786521} m_Enabled: 1 serializedVersion: 4 @@ -6608,8 +6788,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11491632, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1801786521} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6619,11 +6800,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -6631,8 +6812,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 102878, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1805120652} @@ -6649,8 +6831,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22499754, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1805120651} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -5090} @@ -6668,8 +6851,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11481102, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1805120651} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6682,8 +6866,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 84380142b5676e44daea94b5219bcf93, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -6692,20 +6874,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1805120654 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22201302, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1805120651} m_CullTransparentMesh: 0 --- !u!1 &1824575477 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 186728, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1824575478} @@ -6722,8 +6907,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22442236, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1824575477} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6751,8 +6937,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11484428, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1824575477} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6765,8 +6952,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -6775,20 +6960,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1824575480 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22267156, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1824575477} m_CullTransparentMesh: 0 --- !u!1 &1841481150 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 148386, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1841481151} @@ -6805,8 +6993,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22435654, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1841481150} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -6824,8 +7013,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8297074, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1841481150} m_Enabled: 1 serializedVersion: 4 @@ -6920,8 +7110,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11496254, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1841481150} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6931,11 +7122,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -6943,7 +7134,8 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1901620774} @@ -6960,7 +7152,8 @@ GameObject: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1901620771} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6978,7 +7171,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1901620771} m_Enabled: 1 m_EditorHideFlags: 0 @@ -6992,7 +7186,8 @@ MonoBehaviour: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1901620771} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -7005,8 +7200,9 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 162050, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1928767902} @@ -7023,8 +7219,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22420958, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1928767901} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -7042,8 +7239,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8218406, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1928767901} m_Enabled: 1 serializedVersion: 4 @@ -7138,8 +7336,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11433446, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1928767901} m_Enabled: 1 m_EditorHideFlags: 0 @@ -7149,11 +7348,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -7161,8 +7360,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 188432, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1942351438} @@ -7179,8 +7379,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22417472, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1942351437} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -11} @@ -7198,8 +7399,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11489894, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1942351437} m_Enabled: 1 m_EditorHideFlags: 0 @@ -7212,8 +7414,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 62f8426a429498442af34752c971234e, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -7222,20 +7422,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1942351441 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22241294, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1942351437} m_CullTransparentMesh: 0 --- !u!1 &1957097252 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 183300, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1957097253} @@ -7252,8 +7455,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22418524, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1957097252} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -7271,8 +7475,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11481144, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1957097252} m_Enabled: 1 m_EditorHideFlags: 0 @@ -7285,8 +7490,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 1940471d360cdfc4390f579caff5a009, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -7295,19 +7498,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1957097255 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22269356, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1957097252} m_CullTransparentMesh: 0 --- !u!1 &1977298764 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1977298765} @@ -7323,7 +7529,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1977298764} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -7341,7 +7548,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1977298764} m_Enabled: 1 m_EditorHideFlags: 0 @@ -7351,11 +7559,11 @@ MonoBehaviour: letterSound: $ currentLine: 0 _textMaxWidth: 320 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -7363,8 +7571,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 174536, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1977618865} @@ -7381,8 +7590,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22457004, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1977618864} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -7400,8 +7610,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8238304, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1977618864} m_Enabled: 1 serializedVersion: 4 @@ -7496,8 +7707,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11491416, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1977618864} m_Enabled: 1 m_EditorHideFlags: 0 @@ -7507,11 +7719,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -7519,8 +7731,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 127532, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2006300310} @@ -7537,8 +7750,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22462822, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2006300309} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -7556,8 +7770,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8239926, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2006300309} m_Enabled: 1 serializedVersion: 4 @@ -7652,8 +7867,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11427334, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2006300309} m_Enabled: 1 m_EditorHideFlags: 0 @@ -7663,11 +7879,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -7675,8 +7891,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 148338, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2020485661} @@ -7693,8 +7910,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22450696, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2020485660} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -7715,8 +7933,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11429386, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2020485660} m_Enabled: 1 m_EditorHideFlags: 0 @@ -7729,8 +7948,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -7739,19 +7956,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &2020485663 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22227018, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2020485660} m_CullTransparentMesh: 0 --- !u!1 &2043428501 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2043428502} @@ -7772,7 +7992,8 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2043428501} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -500} @@ -7785,7 +8006,8 @@ Transform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2043428501} m_Enabled: 1 m_EditorHideFlags: 0 @@ -7796,7 +8018,8 @@ MonoBehaviour: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2043428501} m_Enabled: 1 serializedVersion: 4 @@ -7891,28 +8114,32 @@ AudioSource: AudioListener: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2043428501} m_Enabled: 1 --- !u!124 &2043428506 Behaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2043428501} m_Enabled: 1 --- !u!92 &2043428507 Behaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2043428501} m_Enabled: 1 --- !u!20 &2043428508 Camera: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2043428501} m_Enabled: 1 serializedVersion: 2 @@ -7921,6 +8148,7 @@ Camera: m_projectionMatrixMode: 1 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} + m_GateFitMode: 2 m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 @@ -7952,8 +8180,9 @@ Camera: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 190766, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2055631346} @@ -7970,8 +8199,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22435204, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2055631345} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -7989,8 +8219,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8200024, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2055631345} m_Enabled: 1 serializedVersion: 4 @@ -8085,8 +8316,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11422436, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2055631345} m_Enabled: 1 m_EditorHideFlags: 0 @@ -8096,11 +8328,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -8108,8 +8340,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 186548, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2064810221} @@ -8126,8 +8359,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22431496, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2064810220} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -8145,8 +8379,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8252388, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2064810220} m_Enabled: 1 serializedVersion: 4 @@ -8241,8 +8476,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11457128, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2064810220} m_Enabled: 1 m_EditorHideFlags: 0 @@ -8252,11 +8488,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -8264,8 +8500,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 144218, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2078350987} @@ -8282,8 +8519,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22461734, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2078350986} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -8302,8 +8540,9 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11493134, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2078350986} m_Enabled: 1 m_EditorHideFlags: 0 @@ -8316,8 +8555,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -8326,20 +8563,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &2078350989 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22235086, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2078350986} m_CullTransparentMesh: 0 --- !u!1 &2084897705 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 142056, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2084897706} @@ -8356,8 +8596,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22459620, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2084897705} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -8375,8 +8616,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8251932, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2084897705} m_Enabled: 1 serializedVersion: 4 @@ -8471,8 +8713,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11420884, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2084897705} m_Enabled: 1 m_EditorHideFlags: 0 @@ -8482,11 +8725,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 @@ -8494,8 +8737,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 102584, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2105879892} @@ -8512,8 +8756,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22405520, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2105879891} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -8531,8 +8776,9 @@ RectTransform: AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8235252, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2105879891} m_Enabled: 1 serializedVersion: 4 @@ -8627,8 +8873,9 @@ AudioSource: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11425900, guid: 65ee94c713ee95942a47240fb8f2ae5c, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2105879891} m_Enabled: 1 m_EditorHideFlags: 0 @@ -8638,11 +8885,11 @@ MonoBehaviour: letterSound: ( currentLine: 0 _textMaxWidth: 0 + currentCharacter: 0 currentReferenceCharacter: 0 nextMonsterDialogueOnce: 0 - nmd2: 0 wasStated: 0 - offset: {x: 0, y: 0} + localPosition: {x: 0, y: 0} blockSkip: 0 skipNowIfBlocked: 0 lateStartWaiting: 0 diff --git a/Assets/Scenes/newhome3.unity b/Assets/Scenes/newhome3.unity index 727b0d100..750e1e31c 100644 --- a/Assets/Scenes/newhome3.unity +++ b/Assets/Scenes/newhome3.unity @@ -50,7 +50,6 @@ LightmapSettings: m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 @@ -117,8 +116,9 @@ NavMeshSettings: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 109456, guid: 2a197ba458fd7604f8764d355d1a4934, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 308986566} @@ -134,8 +134,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 405938, guid: 2a197ba458fd7604f8764d355d1a4934, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 308986565} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -18, y: -1.5999999, z: 0} @@ -148,8 +149,9 @@ Transform: BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 6158276, guid: 2a197ba458fd7604f8764d355d1a4934, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 308986565} m_Enabled: 1 m_Density: 1 @@ -168,13 +170,14 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 3600, y: 80} + m_Size: {x: 3640, y: 80} m_EdgeRadius: 0 --- !u!1 &417886228 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 417886233} @@ -195,7 +198,8 @@ GameObject: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 417886228} m_Enabled: 1 m_EditorHideFlags: 0 @@ -214,7 +218,8 @@ MonoBehaviour: BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 417886228} m_Enabled: 1 m_Density: 1 @@ -240,7 +245,8 @@ Rigidbody2D: serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 417886228} m_BodyType: 0 m_Simulated: 1 @@ -259,7 +265,8 @@ Rigidbody2D: SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 417886228} m_Enabled: 1 m_CastShadows: 0 @@ -269,6 +276,7 @@ SpriteRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -305,7 +313,8 @@ SpriteRenderer: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 417886228} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 1} @@ -323,22 +332,22 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 417886228} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5b6761159c8f6224a8a895abea10dd25, type: 3} m_Name: m_EditorClassIdentifier: - SetNativeSize: 0 SpritePath: empty Loop: 0 - done: 0 --- !u!114 &417886235 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 417886228} m_Enabled: 1 m_EditorHideFlags: 0 @@ -349,8 +358,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 134422, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 716850861} @@ -367,8 +377,9 @@ GameObject: SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 21251718, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 716850858} m_Enabled: 1 m_CastShadows: 0 @@ -378,6 +389,7 @@ SpriteRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -414,8 +426,9 @@ SpriteRenderer: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11414468, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 716850858} m_Enabled: 1 m_EditorHideFlags: 0 @@ -430,8 +443,9 @@ MonoBehaviour: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 716850858} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 140} @@ -449,15 +463,16 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 1800, y: 240} - m_SizeDelta: {x: 36, y: 4.8} + m_AnchoredPosition: {x: 1820, y: 240} + m_SizeDelta: {x: 36.4, y: 4.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &754946256 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 127852, guid: 2a197ba458fd7604f8764d355d1a4934, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 754946257} @@ -473,11 +488,12 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 475476, guid: 2a197ba458fd7604f8764d355d1a4934, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 754946256} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 18, y: -0.79999995, z: 0} + m_LocalPosition: {x: 18.2, y: -0.79999995, z: 0} m_LocalScale: {x: 0.01, y: 0.01, z: 1} m_Children: [] m_Father: {fileID: 716850861} @@ -487,8 +503,9 @@ Transform: BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 6104952, guid: 2a197ba458fd7604f8764d355d1a4934, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 754946256} m_Enabled: 1 m_Density: 1 @@ -513,8 +530,9 @@ BoxCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 141804, guid: 2a197ba458fd7604f8764d355d1a4934, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 828439519} @@ -530,8 +548,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 489280, guid: 2a197ba458fd7604f8764d355d1a4934, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 828439518} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -18, y: 2.3999999, z: 0} @@ -544,8 +563,9 @@ Transform: BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 6111054, guid: 2a197ba458fd7604f8764d355d1a4934, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 828439518} m_Enabled: 1 m_Density: 1 @@ -564,14 +584,15 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 3600, y: 320} + m_Size: {x: 3640, y: 320} m_EdgeRadius: 0 --- !u!1 &1138192096 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 134422, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1138192097} @@ -587,8 +608,9 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1138192096} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -599,15 +621,16 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -1.65, y: 0} + m_AnchoredPosition: {x: -1.85, y: 0} m_SizeDelta: {x: 36, y: 4.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!212 &1138192098 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 21251718, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1138192096} m_Enabled: 1 m_CastShadows: 0 @@ -617,6 +640,7 @@ SpriteRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -649,12 +673,196 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1302973905 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1302973912} + - component: {fileID: 1302973911} + - component: {fileID: 1302973910} + - component: {fileID: 1302973909} + - component: {fileID: 1302973908} + - component: {fileID: 1302973907} + - component: {fileID: 1302973906} + m_Layer: 0 + m_Name: MusicWarper + m_TagString: Event + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1302973906 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1302973905} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6c7b8a91bf13f244b93c1a72a65984e5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1302973907 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1302973905} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b6761159c8f6224a8a895abea10dd25, type: 3} + m_Name: + m_EditorClassIdentifier: + SpritePath: empty + Loop: 0 +--- !u!114 &1302973908 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1302973905} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 846d0d1a9b9e1c14884c79473a1f1d14, type: 3} + m_Name: + m_EditorClassIdentifier: + scriptToLoad: MusicWarper + actualPage: 3 + eventTriggers: + - {x: 1, y: 1} + - {x: 2, y: 3} + - {x: 3, y: 2} + moveSpeed: 1 + isMovingWaitEnd: 0 + isRotatingWaitEnd: 0 +--- !u!61 &1302973909 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1302973905} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.01, y: 0.01} + newSize: {x: 0.01, y: 0.01} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 0.2675} + m_EdgeRadius: 0 +--- !u!50 &1302973910 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1302973905} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!212 &1302973911 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1302973905} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 876f2cc47fea2394b98c7950cde30cd9, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.01, y: 0.01} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!224 &1302973912 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1302973905} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 1} + m_LocalScale: {x: 1, y: 300, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 2040, y: 120} + m_SizeDelta: {x: 1, y: 1} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1385992952 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 157358, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1385992953} @@ -672,11 +880,12 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 406064, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1385992952} m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071067} - m_LocalPosition: {x: -17.8, y: -1.2, z: 0} + m_LocalPosition: {x: -18, y: -1.2, z: 0} m_LocalScale: {x: 0.79999995, y: 1, z: 1} m_Children: [] m_Father: {fileID: 716850861} @@ -686,8 +895,9 @@ Transform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11494438, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1385992952} m_Enabled: 1 m_EditorHideFlags: 0 @@ -705,8 +915,9 @@ Rigidbody2D: serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 5032938, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1385992952} m_BodyType: 1 m_Simulated: 1 @@ -725,8 +936,9 @@ Rigidbody2D: EdgeCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 6882432, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1385992952} m_Enabled: 1 m_Density: 1 @@ -743,8 +955,9 @@ EdgeCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 168770, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1753661296} @@ -762,11 +975,12 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 425052, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1753661295} m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071067} - m_LocalPosition: {x: 17.8, y: -1.2, z: 0} + m_LocalPosition: {x: 18, y: -1.2, z: 0} m_LocalScale: {x: 0.79999995, y: 1, z: 1} m_Children: [] m_Father: {fileID: 716850861} @@ -776,8 +990,9 @@ Transform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11498914, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1753661295} m_Enabled: 1 m_EditorHideFlags: 0 @@ -795,8 +1010,9 @@ Rigidbody2D: serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 5034292, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1753661295} m_BodyType: 1 m_Simulated: 1 @@ -815,8 +1031,9 @@ Rigidbody2D: EdgeCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 6853106, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1753661295} m_Enabled: 1 m_Density: 1 @@ -833,7 +1050,8 @@ EdgeCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1871179668} @@ -854,7 +1072,8 @@ GameObject: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1871179663} m_Enabled: 1 m_EditorHideFlags: 0 @@ -873,7 +1092,8 @@ MonoBehaviour: BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1871179663} m_Enabled: 1 m_Density: 1 @@ -899,7 +1119,8 @@ Rigidbody2D: serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1871179663} m_BodyType: 0 m_Simulated: 1 @@ -918,7 +1139,8 @@ Rigidbody2D: SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1871179663} m_Enabled: 1 m_CastShadows: 0 @@ -928,6 +1150,7 @@ SpriteRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -964,7 +1187,8 @@ SpriteRenderer: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1871179663} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 1} @@ -982,22 +1206,22 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1871179663} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5b6761159c8f6224a8a895abea10dd25, type: 3} m_Name: m_EditorClassIdentifier: - SetNativeSize: 0 SpritePath: empty Loop: 0 - done: 0 --- !u!114 &1871179670 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1871179663} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1008,8 +1232,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 168310, guid: 2a197ba458fd7604f8764d355d1a4934, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1967538839} @@ -1025,11 +1250,12 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 460918, guid: 2a197ba458fd7604f8764d355d1a4934, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1967538838} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -18.2, y: -0.79999995, z: 0} + m_LocalPosition: {x: -18.4, y: -0.79999995, z: 0} m_LocalScale: {x: 0.01, y: 0.01, z: 1} m_Children: [] m_Father: {fileID: 716850861} @@ -1039,8 +1265,9 @@ Transform: BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 6198640, guid: 2a197ba458fd7604f8764d355d1a4934, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1967538838} m_Enabled: 1 m_Density: 1 diff --git a/Assets/Scenes/test.unity b/Assets/Scenes/test.unity index 211871884..1e59c97c5 100644 --- a/Assets/Scenes/test.unity +++ b/Assets/Scenes/test.unity @@ -50,7 +50,6 @@ LightmapSettings: m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 @@ -114,363 +113,373 @@ NavMeshSettings: m_Flags: 0 m_NavMeshData: {fileID: 0} --- !u!1001 &89432780 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.size + - target: {fileID: 124458, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: 4eab1af3ab6a932c23b3cdb8ef618b1af9c02088 + objectReference: {fileID: 0} + - target: {fileID: 124458, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Layer + value: 21 + objectReference: {fileID: 0} + - target: {fileID: 5055424, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_BodyType value: 2 objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + - target: {fileID: 5055424, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Simulated + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.x + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.y + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Offset.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.x + value: 0.19 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.y + value: 0.48 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.newSize.x + value: 0.28 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.newSize.y + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: eventTriggers.Array.size value: 2 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[1].x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[2].x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[3].x + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[4].x + value: 666 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: moveSpeed + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: scriptToLoad + value: Secret/nothing + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[0].x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: actualPage + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 4fc2fb526f4a28c4d8c3ecb33259d8eb, + type: 3} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.x + value: 0.28 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.y + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Color.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchoredPosition.x value: 1040 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchoredPosition.y value: 740 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_SizeDelta.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_SizeDelta.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SpritePath - value: Overworld/Punder/1 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[1].x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[2].x - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[3].x - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[4].x - value: 666 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: moveSpeed - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 4fc2fb526f4a28c4d8c3ecb33259d8eb, - type: 3} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalScale.x value: 200 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalScale.y value: 200 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.x - value: 0.01 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.y - value: 0.01 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: scriptToLoad - value: Secret/nothing - objectReference: {fileID: 0} - - target: {fileID: 124458, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Name value: 4eab1af3ab6a932c23b3cdb8ef618b1af9c02088 objectReference: {fileID: 0} - - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SetNativeSize - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Offset.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.x - value: 0.28 + - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: SpritePivot objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.y - value: 0.38 + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_RootOrder + value: 6 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.pivot.x - value: 0.5 + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalPosition.x + value: 300 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.pivot.y - value: 0.5 + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalPosition.y + value: 400 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_SpriteTilingProperty.oldSize.x value: 0.19 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_SpriteTilingProperty.oldSize.y value: 0.48 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.newSize.x - value: 0.28 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.newSize.y + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Size.x value: 0.38 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 300 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchoredPosition.y - value: 390 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalScale.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalScale.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Color.a - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5055424, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_BodyType - value: 2 + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Size.y + value: 0.4 objectReference: {fileID: 0} - - target: {fileID: 5055424, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Simulated - value: 1 + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Offset.y + value: 0.2 objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[0].x + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_SpriteTilingProperty.pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 124458, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Layer - value: 21 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: actualPage - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalPosition.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_RootOrder - value: 6 + - target: {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: SpritePath + value: objectReference: {fileID: 0} - - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: 4eab1af3ab6a932c23b3cdb8ef618b1af9c02088 + - target: {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: SpritePivot + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: eventTriggers.Array.size + value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: scriptToLoad value: Secret/nothing objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[0].x value: 0 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[1].x value: 1 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[2].x value: 3 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[3].x value: 4 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[4].x value: 666 objectReference: {fileID: 0} + - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: SpritePath + value: Overworld/Punder/1 + objectReference: {fileID: 0} + - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: SetNativeSize + value: 0 + objectReference: {fileID: 0} - target: {fileID: 212134501322781040, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Sprite value: objectReference: {fileID: 21300000, guid: 4fc2fb526f4a28c4d8c3ecb33259d8eb, type: 3} - - target: {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SpritePath - value: + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 300 objectReference: {fileID: 0} - - target: {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Enabled - value: 0 + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 390 objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_LocalScale.x value: 100 objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_LocalScale.y value: 100 objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_SpriteTilingProperty.oldSize.x - value: 0.19 - objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_SpriteTilingProperty.oldSize.y - value: 0.48 - objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Size.x - value: 0.01 - objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Size.y - value: 0.01 + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_RootOrder + value: 8 objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Offset.y - value: 0.005 + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalPosition.z + value: 1 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_LocalPosition.x - value: 300 + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalScale.x + value: 100 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_LocalPosition.y - value: 400 + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalScale.y + value: 100 objectReference: {fileID: 0} - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_SizeDelta.x + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: - - {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, type: 2} - - {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_IsPrefabAsset: 0 + - {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, type: 3} + - {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 3} --- !u!1 &387083019 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 1161035551607804, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 387083020} @@ -486,8 +495,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 4205393937864470, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 387083019} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -500,7 +510,8 @@ Transform: PolygonCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 387083019} m_Enabled: 1 m_Density: 1 @@ -530,8 +541,9 @@ PolygonCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 1161035551607804, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 480496902} @@ -547,8 +559,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 4205393937864470, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 480496901} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -561,7 +574,8 @@ Transform: PolygonCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 480496901} m_Enabled: 1 m_Density: 1 @@ -591,8 +605,9 @@ PolygonCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 674305610} @@ -609,7 +624,8 @@ GameObject: SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 674305607} m_Enabled: 1 m_CastShadows: 0 @@ -619,6 +635,7 @@ SpriteRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -655,8 +672,9 @@ SpriteRenderer: SortingGroup: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 210702407409670196, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 674305607} m_Enabled: 1 m_SortingLayerID: 0 @@ -666,7 +684,8 @@ SortingGroup: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 674305607} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -682,318 +701,319 @@ RectTransform: m_SizeDelta: {x: 1, y: 1} m_Pivot: {x: 0.5, y: 0} --- !u!1001 &957516868 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 124458, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: bee6bcfc (1) + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.x + value: 0.18 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.y + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Offset.y + value: 0.098 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.x + value: 0.28 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.y + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.newSize.x + value: 0.28 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.newSize.y + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: eventTriggers.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.size + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[1].x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[2].x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[3].x + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[4].x + value: 666 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: moveSpeed + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: scriptToLoad + value: Secret/bee6bcfc + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[0].x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 876f2cc47fea2394b98c7950cde30cd9, + type: 3} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.x + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.y + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchoredPosition.x value: 1040 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchoredPosition.y value: 740 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_SizeDelta.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_SizeDelta.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SpritePath - value: empty - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[1].x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[2].x - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[3].x - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[4].x - value: 666 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: moveSpeed - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 876f2cc47fea2394b98c7950cde30cd9, - type: 3} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalScale.x value: 200 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalScale.y value: 200 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.x - value: 0.18 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.y - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: scriptToLoad - value: Secret/bee6bcfc + - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: dac97760 (1) objectReference: {fileID: 0} - - target: {fileID: 124458, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Name - value: bee6bcfc (1) + value: SpritePivot objectReference: {fileID: 0} - - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SetNativeSize + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Offset.y - value: 0.098 + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_Size.x - value: 0.01 + value: 0.0001 objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_Size.y - value: 0.01 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.oldSize.x - value: 0.28 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.oldSize.y - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.newSize.x - value: 0.28 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.newSize.y - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 0 + value: 0.0001 objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchoredPosition.y + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Offset.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalScale.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalScale.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[0].x + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_UsedByComposite value: 0 objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_WasSpriteAssigned - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: SpritePivot - objectReference: {fileID: 0} - - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: dac97760 (1) - objectReference: {fileID: 0} - target: {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: SpritePath value: empty objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} + propertyPath: eventTriggers.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: scriptToLoad value: none objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: actualPage value: 1 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[0].x value: 1 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[1].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[2].x value: 3 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[3].x value: 4 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[4].x value: 666 objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Size.x - value: 0.0001 - objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Size.y - value: 0.0001 + - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: SpritePath + value: empty objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Offset.y + - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: SetNativeSize value: 0 objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_UsedByComposite + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_LocalPosition.x + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_LocalPosition.y - value: 0 + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalScale.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalScale.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_RootOrder + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_IsPrefabAsset: 0 + m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 3} --- !u!1 &957516869 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - m_PrefabInternal: {fileID: 957516868} + type: 3} + m_PrefabInstance: {fileID: 957516868} + m_PrefabAsset: {fileID: 0} --- !u!114 &957516870 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 957516869} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1014,317 +1034,318 @@ MonoBehaviour: anims: empty, empty transitionTime: 60 --- !u!1001 &1053321142 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.size + - target: {fileID: 124458, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: 68302eae (1) + objectReference: {fileID: 0} + - target: {fileID: 5055424, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_BodyType + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5055424, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Simulated value: 0 objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.x + value: 0.34 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.y + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Offset.y + value: 0.148 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.x + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.y + value: 0.58 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.newSize.x + value: 0.28 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.newSize.y + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: eventTriggers.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[1].x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[2].x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[3].x + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[4].x + value: 666 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: moveSpeed + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: scriptToLoad + value: Secret/68302eae + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[0].x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 5a15fea0f60c14a449b67566953ba18a, + type: 3} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.x + value: 0.28 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.y + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Color.a + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchoredPosition.x value: 1040 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchoredPosition.y value: 740 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_SizeDelta.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_SizeDelta.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SpritePath - value: Overworld/Punder/1 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[1].x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[2].x - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[3].x - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[4].x - value: 666 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: moveSpeed - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 5a15fea0f60c14a449b67566953ba18a, - type: 3} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalScale.x value: 200 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalScale.y value: 200 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.x - value: 0.34 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.y - value: 0.3 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: scriptToLoad - value: Secret/68302eae - objectReference: {fileID: 0} - - target: {fileID: 124458, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Name - value: 68302eae (1) - objectReference: {fileID: 0} - - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SetNativeSize - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Offset.y - value: 0.148 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.x - value: 0.28 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.y - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.oldSize.x - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.oldSize.y - value: 0.58 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.newSize.x - value: 0.28 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.newSize.y - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 400 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchoredPosition.y - value: 200.5 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalScale.x - value: 100 + value: bee6bcfc (1) objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalScale.y - value: 100 + - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: SpritePivot objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_RootOrder - value: 5 + value: 3 objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Color.a + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5055424, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_BodyType - value: 2 + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 5055424, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Simulated + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Offset.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[0].x - value: 1 + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Size.y + value: 0.0001 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_RootOrder - value: 3 + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Size.x + value: 0.0001 objectReference: {fileID: 0} - - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: SpritePivot + - target: {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: SpritePath + value: empty objectReference: {fileID: 0} - - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: bee6bcfc (1) + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: eventTriggers.Array.size + value: 0 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: scriptToLoad value: none objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[0].x value: 1 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[1].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[2].x value: 3 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[3].x value: 4 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[4].x value: 666 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_LocalPosition.x - value: 0 + - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: SpritePath + value: Overworld/Punder/1 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_LocalPosition.y + - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: SetNativeSize value: 0 objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Offset.y - value: 0 + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 400 objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Size.y - value: 0.0001 + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 200.5 objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Size.x - value: 0.0001 + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalScale.x + value: 100 objectReference: {fileID: 0} - - target: {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SpritePath - value: empty + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalScale.y + value: 100 objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_IsPrefabAsset: 0 ---- !u!1 &1053321143 stripped + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 3} +--- !u!1 &1053321143 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - m_PrefabInternal: {fileID: 1053321142} + type: 3} + m_PrefabInstance: {fileID: 1053321142} + m_PrefabAsset: {fileID: 0} --- !u!114 &1053321144 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1053321143} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1345,8 +1366,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 1161035551607804, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1408707710} @@ -1362,8 +1384,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 4205393937864470, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1408707709} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1376,7 +1399,8 @@ Transform: PolygonCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1408707709} m_Enabled: 1 m_Density: 1 @@ -1406,8 +1430,9 @@ PolygonCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1446132282} @@ -1424,7 +1449,8 @@ GameObject: SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1446132279} m_Enabled: 1 m_CastShadows: 0 @@ -1434,6 +1460,7 @@ SpriteRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -1470,8 +1497,9 @@ SpriteRenderer: SortingGroup: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 210702407409670196, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1446132279} m_Enabled: 1 m_SortingLayerID: 0 @@ -1481,7 +1509,8 @@ SortingGroup: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1446132279} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1497,341 +1526,342 @@ RectTransform: m_SizeDelta: {x: 1, y: 1} m_Pivot: {x: 0.5, y: 0} --- !u!1001 &1459585894 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 124458, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: 68302eae + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.x + value: 0.34 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.y + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Offset.y + value: 0.148 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.x + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.y + value: 0.58 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.newSize.x + value: 0.28 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.newSize.y + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: eventTriggers.Array.size value: 2 objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.size + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[1].x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[2].x value: 3 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[3].x + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[4].x + value: 666 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: moveSpeed + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: scriptToLoad + value: Secret/68302eae + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 29b8b27a4045bde4c8ba97c1a30b2095, + type: 3} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.x + value: 0.28 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.y + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Color.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchoredPosition.x value: 1040 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchoredPosition.y value: 740 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_SizeDelta.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_SizeDelta.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SpritePath - value: - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[1].x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[2].x - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[3].x - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[4].x - value: 666 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: moveSpeed - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 29b8b27a4045bde4c8ba97c1a30b2095, - type: 3} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalScale.x value: 200 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalScale.y value: 200 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.x - value: 0.34 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.y - value: 0.3 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: scriptToLoad - value: Secret/68302eae - objectReference: {fileID: 0} - - target: {fileID: 124458, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Name - value: 68302eae - objectReference: {fileID: 0} - - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SetNativeSize - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Offset.y - value: 0.148 + value: bee6bcfc objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.x - value: 0.28 + - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: SpritePivot objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.y - value: 0.38 + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_RootOrder + value: 2 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.pivot.x - value: 0.5 + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalPosition.x + value: 1060 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.pivot.y - value: 0.5 + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalPosition.y + value: 680 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_SpriteTilingProperty.oldSize.x - value: 0.38 + value: 0.56 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_SpriteTilingProperty.oldSize.y - value: 0.58 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.newSize.x - value: 0.28 + value: 0.76 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.newSize.y + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Size.x value: 0.38 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 400 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchoredPosition.y - value: 200 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalScale.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalScale.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Color.a - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: SpritePivot + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Size.y + value: 0.3 objectReference: {fileID: 0} - - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: bee6bcfc + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Offset.y + value: 0.15 objectReference: {fileID: 0} - target: {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: SpritePath value: Overworld/Punder/1 objectReference: {fileID: 0} + - target: {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: SetNativeSize + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: eventTriggers.Array.size + value: 3 + objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[3].x value: 4 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[4].x value: 666 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[0].x value: 0 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[1].x value: 1 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[2].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: moveSpeed value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: scriptToLoad value: Secret/bee6bcfc objectReference: {fileID: 0} + - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: SpritePath + value: + objectReference: {fileID: 0} + - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: SetNativeSize + value: 0 + objectReference: {fileID: 0} - target: {fileID: 212134501322781040, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Sprite value: objectReference: {fileID: 21300000, guid: aa445937c50f03946b0a19d4716f59de, type: 3} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 400 + objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_LocalScale.x value: 100 objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_LocalScale.y value: 100 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_LocalPosition.x - value: 1060 - objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_LocalPosition.y - value: 680 - objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_SpriteTilingProperty.oldSize.x - value: 0.56 + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_RootOrder + value: 4 objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_SpriteTilingProperty.oldSize.y - value: 0.76 + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalScale.x + value: 100 objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Size.x - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Size.y - value: 0.3 - objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Offset.y - value: 0.15 - objectReference: {fileID: 0} - - target: {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SetNativeSize - value: 0 + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalScale.y + value: 100 objectReference: {fileID: 0} m_RemovedComponents: - - {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_IsPrefabAsset: 0 + - {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 3} --- !u!1 &1459585895 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - m_PrefabInternal: {fileID: 1459585894} + type: 3} + m_PrefabInstance: {fileID: 1459585894} + m_PrefabAsset: {fileID: 0} --- !u!114 &1459585896 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1459585895} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1873,915 +1903,913 @@ MonoBehaviour: anims: Overworld/Punder/Secret/Knockout, Overworld/Punder/Secret/Knockout transitionTime: 60 --- !u!1001 &1465603899 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 124458, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: dac97760 (1) + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.x + value: 0.18 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.y + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Offset.y + value: 0.098 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.x + value: 0.28 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.y + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.newSize.x + value: 0.28 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.newSize.y + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: eventTriggers.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.size + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[1].x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[2].x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[3].x + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[4].x + value: 666 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: moveSpeed + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: scriptToLoad + value: Secret/dac97760 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[0].x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 876f2cc47fea2394b98c7950cde30cd9, + type: 3} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.x + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.y + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchoredPosition.x value: 1040 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchoredPosition.y value: 740 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_SizeDelta.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_SizeDelta.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SpritePath - value: empty - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[1].x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[2].x - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[3].x - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[4].x - value: 666 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: moveSpeed - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 876f2cc47fea2394b98c7950cde30cd9, - type: 3} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalScale.x value: 200 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalScale.y value: 200 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.x - value: 0.18 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.y - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: scriptToLoad - value: Secret/dac97760 - objectReference: {fileID: 0} - - target: {fileID: 124458, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Name - value: dac97760 (1) - objectReference: {fileID: 0} - - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SetNativeSize - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Offset.y - value: 0.098 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.x - value: 0.1 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.y - value: 0.1 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.oldSize.x - value: 0.28 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.oldSize.y - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.newSize.x - value: 0.28 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.newSize.y - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalScale.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalScale.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[0].x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_RootOrder - value: 7 + value: 68302eae (1) objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_WasSpriteAssigned - value: 1 + - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: SpritePivot objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: SpritePivot + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 objectReference: {fileID: 0} - - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: 68302eae (1) + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Offset.y value: 0 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Size.x value: 0.0001 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Size.y value: 0.0001 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_LocalPosition.y + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: eventTriggers.Array.size value: 0 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[2].x value: 3 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[3].x value: 4 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[4].x value: 666 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[0].x value: 0 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[1].x value: 1 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: scriptToLoad value: none objectReference: {fileID: 0} - - target: {fileID: 212134501322781040, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Color.a - value: 0 + - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: SpritePath + value: empty objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchoredPosition.y + - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: SetNativeSize value: 0 objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Pivot.y + - target: {fileID: 212134501322781040, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Color.a value: 0 objectReference: {fileID: 0} - target: {fileID: 212134501322781040, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Sprite value: objectReference: {fileID: 21300000, guid: c9f3271be80940e43ba5e5eaa5513eff, type: 3} - target: {fileID: 212134501322781040, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_WasSpriteAssigned value: 1 objectReference: {fileID: 0} - target: {fileID: 212134501322781040, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Size.x value: 0.08 objectReference: {fileID: 0} - target: {fileID: 212134501322781040, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Size.y value: 0.08 objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalScale.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalScale.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: - - {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_IsPrefabAsset: 0 + - {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 3} --- !u!1 &1465603900 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - m_PrefabInternal: {fileID: 1465603899} + type: 3} + m_PrefabInstance: {fileID: 1465603899} + m_PrefabAsset: {fileID: 0} --- !u!114 &1465603901 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1465603900} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5b6761159c8f6224a8a895abea10dd25, type: 3} m_Name: m_EditorClassIdentifier: - SetNativeSize: 0 SpritePath: black Loop: 0 - done: 0 --- !u!1001 &1524005578 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.size - value: 1 + - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: Ladder + objectReference: {fileID: 0} + - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: SpritePivot objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.x value: 350 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.y value: 720 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: SpritePivot - objectReference: {fileID: 0} - - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: Ladder - objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_SizeDelta.x - value: 0.4 - objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_SizeDelta.y - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: scriptToLoad - value: Ladder - objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.data[1].x - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.data[2].x - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.data[3].x - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.data[4].x - value: 666 - objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Offset.y - value: 0.19 - objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Size.x - value: 0.4 - objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Size.y - value: 0.38 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_IsPrefabAsset: 0 ---- !u!1001 &1551304559 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: m_Points.m_Paths.Array.data[0].Array.size - value: 25 - objectReference: {fileID: 0} - - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: m_LocalPosition.z - value: 140 - objectReference: {fileID: 0} - - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: m_AnchoredPosition.x - value: 762.5 - objectReference: {fileID: 0} - - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: m_AnchoredPosition.y - value: 581 - objectReference: {fileID: 0} - - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: m_SizeDelta.x - value: 15.25 - objectReference: {fileID: 0} - - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: m_SizeDelta.y - value: 11.62 - objectReference: {fileID: 0} - - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: m_Pivot.x - value: 0.5 + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 objectReference: {fileID: 0} - - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: m_Pivot.y - value: 0.5 + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_RootOrder + value: 9 objectReference: {fileID: 0} - - target: {fileID: 134422, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: m_Name - value: Background + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Offset.y + value: 0.19 objectReference: {fileID: 0} - - target: {fileID: 21251718, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 1349755d19b4ea14db229a36b82e13f0, + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, type: 3} - - target: {fileID: 21251718, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} propertyPath: m_Size.x - value: 15.25 + value: 0.4 objectReference: {fileID: 0} - - target: {fileID: 21251718, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_Size.y - value: 11.62 + value: 0.38 objectReference: {fileID: 0} - - target: {fileID: 21251718, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: m_WasSpriteAssigned + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: eventTriggers.Array.size value: 1 objectReference: {fileID: 0} - - target: {fileID: 11456550, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: position.x - value: 40 + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: scriptToLoad + value: Ladder objectReference: {fileID: 0} - - target: {fileID: 11456550, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: position.y - value: 160 + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: eventTriggers.Array.data[1].x + value: 2 objectReference: {fileID: 0} - - target: {fileID: 11456550, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: direction - value: 6 + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: eventTriggers.Array.data[2].x + value: 3 objectReference: {fileID: 0} - - target: {fileID: 11456550, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: sceneName - value: test5 + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: eventTriggers.Array.data[3].x + value: 4 objectReference: {fileID: 0} - - target: {fileID: 11494438, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: sceneName - value: test4 + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: eventTriggers.Array.data[4].x + value: 666 objectReference: {fileID: 0} - - target: {fileID: 11494438, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: position.x - value: 1200 + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_SizeDelta.x + value: 0.4 objectReference: {fileID: 0} - - target: {fileID: 11494438, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: position.y - value: 240 + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_SizeDelta.y + value: 0.38 objectReference: {fileID: 0} - - target: {fileID: 11494438, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: direction - value: 4 + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 3} +--- !u!1001 &1551304559 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 134422, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: m_Name + value: Background objectReference: {fileID: 0} - - target: {fileID: 474894, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 406064, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_RootOrder - value: 7 + value: 8 objectReference: {fileID: 0} - - target: {fileID: 479136, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 407264, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - - target: {fileID: 480924, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 425052, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_RootOrder - value: 3 + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 474894, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: m_RootOrder + value: 7 objectReference: {fileID: 0} - - target: {fileID: 477142, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 477142, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 480500, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 479136, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_RootOrder - value: 6 + value: 4 objectReference: {fileID: 0} - - target: {fileID: 406064, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 479584, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_RootOrder - value: 8 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 407264, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 480500, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_RootOrder - value: 5 + value: 6 objectReference: {fileID: 0} - - target: {fileID: 479584, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 480924, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_RootOrder - value: 0 + value: 3 objectReference: {fileID: 0} - - target: {fileID: 499438, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 499438, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 425052, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - propertyPath: m_RootOrder - value: 9 + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.size + value: 25 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[4].y value: 2.6 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[4].x value: -3.125 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[5].x value: -3.125 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[5].y value: 3.775 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[6].x value: -2.825 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[6].y value: 3.775 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[7].x value: -2.825 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[7].y value: 2.2 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[8].x value: -1.225 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[8].y value: 0.6 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[9].x value: -1.225 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[9].y value: 0.2 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[10].x value: -2.425 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[10].y value: 0.2 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[11].x value: -2.825 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[11].y value: -0.2 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[12].x value: -3.525 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[12].y value: -0.2 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[13].x value: -3.95 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[13].y value: -0.625 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[14].x value: -4.825 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[14].y value: -0.625 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[15].x value: -6.015 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[15].y value: -1.815 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[16].x value: -6.015 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[16].y value: -3 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[17].x value: -4.405 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[17].y value: -4.61 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[18].x value: 3.175 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[18].y value: -4.61 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[19].x value: 3.585 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[19].y value: -4.2 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[20].x value: 5.575 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[20].y value: -4.2 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[21].x value: 5.975 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[21].y value: -3.8 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[22].x value: 7.625 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[22].y value: -3.8 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[23].x value: 7.625 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[23].y value: -5.81 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[24].x value: -7.625 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[24].y value: -5.81 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[25].x value: -7.6244817 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[25].y value: -5.8117347 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[26].x value: -7.6244817 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[26].y value: -5.8117347 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[27].x value: -7.6244817 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[27].y value: -5.8117347 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[28].x value: -7.6244817 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[28].y value: -5.8117347 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[29].x value: -7.6244817 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[29].y value: -5.8117347 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[30].x value: -7.6244817 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[30].y value: -5.8117347 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[31].x value: -7.6244817 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[31].y value: -5.8117347 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[32].x value: -7.6244817 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[32].y value: -5.8117347 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[0].x value: -7.625 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[0].y value: 2.2 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[1].y value: 2.2 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[1].x value: -6.825 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[2].y value: 1.8 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[3].y value: 1.8 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[2].x value: -6.425 objectReference: {fileID: 0} - - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} + - target: {fileID: 6053462, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[3].x value: -3.925 objectReference: {fileID: 0} + - target: {fileID: 11456550, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: position.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 11456550, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: position.y + value: 160 + objectReference: {fileID: 0} + - target: {fileID: 11456550, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: direction + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 11456550, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: sceneName + value: test5 + objectReference: {fileID: 0} + - target: {fileID: 11494438, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: sceneName + value: test4 + objectReference: {fileID: 0} + - target: {fileID: 11494438, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: position.x + value: 1200 + objectReference: {fileID: 0} + - target: {fileID: 11494438, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: position.y + value: 240 + objectReference: {fileID: 0} + - target: {fileID: 11494438, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: direction + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 21251718, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 1349755d19b4ea14db229a36b82e13f0, + type: 3} + - target: {fileID: 21251718, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: m_Size.x + value: 15.25 + objectReference: {fileID: 0} + - target: {fileID: 21251718, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: m_Size.y + value: 11.62 + objectReference: {fileID: 0} + - target: {fileID: 21251718, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: m_LocalPosition.z + value: 140 + objectReference: {fileID: 0} + - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: m_AnchoredPosition.x + value: 762.5 + objectReference: {fileID: 0} + - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: m_AnchoredPosition.y + value: 581 + objectReference: {fileID: 0} + - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: m_SizeDelta.x + value: 15.25 + objectReference: {fileID: 0} + - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: m_SizeDelta.y + value: 11.62 + objectReference: {fileID: 0} + - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d781acdb7c86dff4081250e8c5edd546, type: 2} - m_IsPrefabAsset: 0 + m_SourcePrefab: {fileID: 100100000, guid: d781acdb7c86dff4081250e8c5edd546, type: 3} --- !u!1 &1675059907 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1675059910} @@ -2798,7 +2826,8 @@ GameObject: SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1675059907} m_Enabled: 1 m_CastShadows: 0 @@ -2808,6 +2837,7 @@ SpriteRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -2844,8 +2874,9 @@ SpriteRenderer: SortingGroup: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 210702407409670196, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1675059907} m_Enabled: 1 m_SortingLayerID: 0 @@ -2855,7 +2886,8 @@ SortingGroup: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1675059907} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2874,8 +2906,9 @@ RectTransform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1731488818} @@ -2892,7 +2925,8 @@ GameObject: SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1731488815} m_Enabled: 1 m_CastShadows: 0 @@ -2902,6 +2936,7 @@ SpriteRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -2938,8 +2973,9 @@ SpriteRenderer: SortingGroup: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 210702407409670196, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1731488815} m_Enabled: 1 m_SortingLayerID: 0 @@ -2949,7 +2985,8 @@ SortingGroup: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1731488815} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2965,321 +3002,322 @@ RectTransform: m_SizeDelta: {x: 1, y: 1} m_Pivot: {x: 0.5, y: 0} --- !u!1001 &1829774938 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 124458, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: bee6bcfc + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.x + value: 0.18 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.y + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Offset.y + value: 0.098 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.x + value: 0.28 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.y + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.newSize.x + value: 0.28 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.newSize.y + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: eventTriggers.Array.size value: 3 objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.size - value: 2 + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[1].x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[2].x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[3].x + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[4].x + value: 666 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: moveSpeed + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: scriptToLoad + value: Secret/bee6bcfc + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[0].x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 7801b99d48f55d844bbe1a64c451983b, + type: 3} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.x + value: 0.28 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.y + value: 0.38 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchoredPosition.x value: 1040 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchoredPosition.y value: 740 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_SizeDelta.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_SizeDelta.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SpritePath - value: Overworld/Punder/1 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[1].x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[2].x - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[3].x - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[4].x - value: 666 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: moveSpeed - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 7801b99d48f55d844bbe1a64c451983b, - type: 3} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalScale.x value: 200 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalScale.y value: 200 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.x - value: 0.18 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.y - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: scriptToLoad - value: Secret/bee6bcfc - objectReference: {fileID: 0} - - target: {fileID: 124458, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Name - value: bee6bcfc - objectReference: {fileID: 0} - - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SetNativeSize - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Offset.y - value: 0.098 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.x - value: 0.28 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.y - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.oldSize.x - value: 0.28 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.oldSize.y - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.newSize.x - value: 0.28 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.newSize.y - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 1080 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchoredPosition.y - value: 680 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalScale.x - value: 200 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalScale.y - value: 200 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[0].x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_SizeDelta.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_SizeDelta.y - value: 1 + value: 68302eae objectReference: {fileID: 0} - - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Name value: SpritePivot objectReference: {fileID: 0} - - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: 68302eae - objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.x value: 400 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.y value: 200 objectReference: {fileID: 0} - - target: {fileID: 212134501322781040, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: bf4f3c556ff738e43a6f8efd808d3fd2, + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.x + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.y + value: 0.58 + objectReference: {fileID: 0} + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Size.x + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Size.y + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Offset.y + value: 0.15 + objectReference: {fileID: 0} - target: {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: SpritePath value: FriskUT/5 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} + propertyPath: eventTriggers.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: scriptToLoad value: Secret/68302eae objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[2].x value: 3 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[3].x value: 4 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[4].x value: 666 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[0].x value: 0 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[1].x value: 1 objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_SpriteTilingProperty.oldSize.x - value: 0.38 + - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: SpritePath + value: Overworld/Punder/1 objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_SpriteTilingProperty.oldSize.y - value: 0.58 + - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: SetNativeSize + value: 0 objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Size.x - value: 0.4 + - target: {fileID: 212134501322781040, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: bf4f3c556ff738e43a6f8efd808d3fd2, + type: 3} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 1080 objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Size.y - value: 0.4 + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 680 objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Offset.y - value: 0.15 + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalScale.x + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalScale.y + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_SizeDelta.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_SizeDelta.y + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_IsPrefabAsset: 0 + m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 3} --- !u!1 &1829774939 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - m_PrefabInternal: {fileID: 1829774938} + type: 3} + m_PrefabInstance: {fileID: 1829774938} + m_PrefabAsset: {fileID: 0} --- !u!114 &1829774940 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1829774939} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3313,323 +3351,323 @@ MonoBehaviour: anims: empty, empty transitionTime: 60 --- !u!1001 &1908988710 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 124458, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: bee6bcfc (1) + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.x + value: 0.18 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.y + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Offset.y + value: 0.098 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.x + value: 0.28 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.y + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.newSize.x + value: 0.28 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.newSize.y + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: eventTriggers.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.size - value: 2 + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[1].x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[2].x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[3].x + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[4].x + value: 666 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: moveSpeed + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: scriptToLoad + value: Secret/bee6bcfc + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[0].x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 876f2cc47fea2394b98c7950cde30cd9, + type: 3} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.x + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.y + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchoredPosition.x value: 1040 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchoredPosition.y value: 740 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_SizeDelta.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_SizeDelta.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SpritePath - value: empty - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[1].x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[2].x - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[3].x - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[4].x - value: 666 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: moveSpeed - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 876f2cc47fea2394b98c7950cde30cd9, - type: 3} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalScale.x value: 200 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalScale.y value: 200 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.x - value: 0.18 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.y - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: scriptToLoad - value: Secret/bee6bcfc - objectReference: {fileID: 0} - - target: {fileID: 124458, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Name - value: bee6bcfc (1) - objectReference: {fileID: 0} - - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SetNativeSize - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Offset.y - value: 0.098 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.x - value: 0.01 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.y - value: 0.01 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.oldSize.x - value: 0.28 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.oldSize.y - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.newSize.x - value: 0.28 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.newSize.y - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalScale.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalScale.y - value: 100 + value: dac97760 objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[0].x + - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_WasSpriteAssigned - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Name value: SpritePivot objectReference: {fileID: 0} - - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: dac97760 + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_RootOrder + value: 4 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.x value: 1160 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.y value: 280 objectReference: {fileID: 0} - target: {fileID: 50155291888853208, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_BodyType value: 0 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Offset.y value: 0 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Size.x value: 0.01 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Size.y value: 2.4 objectReference: {fileID: 0} + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: SpritePath + value: empty + objectReference: {fileID: 0} + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: eventTriggers.Array.size + value: 2 + objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: scriptToLoad value: Secret/dac97760 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[0].x value: 0 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[1].x value: 1 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[1].y value: 1 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[2].x value: 3 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[3].x value: 4 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[4].x value: 666 objectReference: {fileID: 0} - - target: {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: SpritePath value: empty objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_IsTrigger - value: 1 + - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: SetNativeSize + value: 0 objectReference: {fileID: 0} - - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Layer + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalScale.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalScale.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_IsPrefabAsset: 0 + m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 3} --- !u!1 &2024213113 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 1161035551607804, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2024213114} @@ -3645,8 +3683,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 4205393937864470, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2024213113} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3659,7 +3698,8 @@ Transform: PolygonCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2024213113} m_Enabled: 1 m_Density: 1 @@ -3686,144 +3726,143 @@ PolygonCollider2D: - {x: 85, y: 0} - {x: 70, y: 15} --- !u!1001 &2085461523 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.size - value: 2 + - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: Save + objectReference: {fileID: 0} + - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: SpritePivot objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.x value: 200 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.y value: 1000 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_RootOrder value: 8 objectReference: {fileID: 0} - - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: SpritePivot - objectReference: {fileID: 0} - - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: Save - objectReference: {fileID: 0} - - target: {fileID: 212134501322781040, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: fe0fb303d866c974ab18bdf7ecff6ba4, - type: 3} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_SizeDelta.x - value: 0.4 - objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_SizeDelta.y - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Offset.y value: 0.19 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_SpriteTilingProperty.pivot.y value: 0 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_SpriteTilingProperty.oldSize.x value: 0.4 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_SpriteTilingProperty.oldSize.y value: 0.38 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Size.x value: 0.4 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Size.y value: 0.38 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} + propertyPath: eventTriggers.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: scriptToLoad value: SaveTest objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[2].x value: 3 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[3].x value: 4 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[4].x value: 666 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[0].x value: 0 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[1].x value: 1 objectReference: {fileID: 0} + - target: {fileID: 212134501322781040, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: fe0fb303d866c974ab18bdf7ecff6ba4, + type: 3} + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_SizeDelta.x + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_SizeDelta.y + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} m_RemovedComponents: - - {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_IsPrefabAsset: 0 + - {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 3} diff --git a/Assets/Scenes/test2.unity b/Assets/Scenes/test2.unity index 8c4cfc435..8178a8032 100644 --- a/Assets/Scenes/test2.unity +++ b/Assets/Scenes/test2.unity @@ -50,7 +50,6 @@ LightmapSettings: m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 @@ -117,7 +116,8 @@ NavMeshSettings: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 43529138} @@ -135,7 +135,8 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 43529137} m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071067} m_LocalPosition: {x: 3, y: -0.4, z: 0.125} @@ -148,7 +149,8 @@ Transform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 43529137} m_Enabled: 1 m_EditorHideFlags: 0 @@ -166,7 +168,8 @@ Rigidbody2D: serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 43529137} m_BodyType: 1 m_Simulated: 1 @@ -185,7 +188,8 @@ Rigidbody2D: EdgeCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 43529137} m_Enabled: 1 m_Density: 1 @@ -202,8 +206,9 @@ EdgeCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 129262, guid: 81be41ce3a4b1df4ab875cc673214de3, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 178145622} @@ -219,8 +224,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 418202, guid: 81be41ce3a4b1df4ab875cc673214de3, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 178145621} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -13.099998} @@ -233,8 +239,9 @@ Transform: PolygonCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 6031574, guid: 81be41ce3a4b1df4ab875cc673214de3, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 178145621} m_Enabled: 1 m_Density: 1 @@ -265,288 +272,287 @@ PolygonCollider2D: - {x: 3.2003381, y: -1.0392646} - {x: 3.1991937, y: -2.3980544} --- !u!1001 &252612462 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.size - value: 2 + - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: Save + objectReference: {fileID: 0} + - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: SpritePivot objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.x value: 160 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.y value: 280 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: SpritePivot - objectReference: {fileID: 0} - - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: Save - objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_SizeDelta.x - value: 0.4 - objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_SizeDelta.y - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 212134501322781040, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: fe0fb303d866c974ab18bdf7ecff6ba4, - type: 3} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Offset.y value: 0.19 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_SpriteTilingProperty.pivot.y value: 0 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_SpriteTilingProperty.oldSize.x value: 0.4 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_SpriteTilingProperty.oldSize.y value: 0.38 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Size.x value: 0.4 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Size.y value: 0.38 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} + propertyPath: eventTriggers.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: scriptToLoad value: SaveTest objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[2].x value: 3 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[3].x value: 4 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[4].x value: 666 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[0].x value: 0 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[1].x value: 1 objectReference: {fileID: 0} + - target: {fileID: 212134501322781040, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: fe0fb303d866c974ab18bdf7ecff6ba4, + type: 3} + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_SizeDelta.x + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_SizeDelta.y + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} m_RemovedComponents: - - {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_IsPrefabAsset: 0 + - {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 3} --- !u!1001 &317963910 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.size - value: 2 + - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: CharacterSelector + objectReference: {fileID: 0} + - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: SpritePivot objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.x value: 167 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.y value: 286 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_RootOrder value: 3 objectReference: {fileID: 0} - - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: SpritePivot + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Offset.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: CharacterSelector + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Size.x + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Size.y + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: eventTriggers.Array.size + value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[0].x value: 0 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[2].x value: 3 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[3].x value: 4 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[4].x value: 666 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[1].x value: 1 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[1].y value: 3 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: scriptToLoad value: CharacterSelector objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Offset.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Size.x - value: 0.4 - objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Size.y - value: 0.4 - objectReference: {fileID: 0} - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_AnchorMin.y value: 0.5 objectReference: {fileID: 0} - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_AnchorMax.y value: 0.5 objectReference: {fileID: 0} - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} m_RemovedComponents: - - {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_IsPrefabAsset: 0 + - {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 3} --- !u!1 &413061391 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 413061392} @@ -564,7 +570,8 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 413061391} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 2, z: 0.125} @@ -577,7 +584,8 @@ Transform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 413061391} m_Enabled: 1 m_EditorHideFlags: 0 @@ -595,7 +603,8 @@ Rigidbody2D: serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 413061391} m_BodyType: 1 m_Simulated: 1 @@ -614,7 +623,8 @@ Rigidbody2D: EdgeCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 413061391} m_Enabled: 1 m_Density: 1 @@ -631,8 +641,9 @@ EdgeCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 121140, guid: 81be41ce3a4b1df4ab875cc673214de3, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 689712512} @@ -649,7 +660,8 @@ GameObject: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 689712511} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 140} @@ -679,7 +691,8 @@ RectTransform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 689712511} m_Enabled: 1 m_EditorHideFlags: 0 @@ -694,8 +707,9 @@ MonoBehaviour: SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 21203668, guid: 81be41ce3a4b1df4ab875cc673214de3, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 689712511} m_Enabled: 1 m_CastShadows: 0 @@ -705,6 +719,7 @@ SpriteRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -741,8 +756,9 @@ SpriteRenderer: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 127166, guid: 81be41ce3a4b1df4ab875cc673214de3, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 756508359} @@ -758,8 +774,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 497532, guid: 81be41ce3a4b1df4ab875cc673214de3, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 756508358} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -13.099998} @@ -772,8 +789,9 @@ Transform: PolygonCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 6021280, guid: 81be41ce3a4b1df4ab875cc673214de3, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 756508358} m_Enabled: 1 m_Density: 1 @@ -807,8 +825,9 @@ PolygonCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 195286, guid: 81be41ce3a4b1df4ab875cc673214de3, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 930831121} @@ -824,8 +843,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 489144, guid: 81be41ce3a4b1df4ab875cc673214de3, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 930831120} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -13.099998} @@ -838,8 +858,9 @@ Transform: PolygonCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 6077432, guid: 81be41ce3a4b1df4ab875cc673214de3, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 930831120} m_Enabled: 1 m_Density: 1 @@ -871,8 +892,9 @@ PolygonCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 103182, guid: 81be41ce3a4b1df4ab875cc673214de3, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1137831013} @@ -888,8 +910,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 477860, guid: 81be41ce3a4b1df4ab875cc673214de3, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1137831012} m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071067} m_LocalPosition: {x: -3.2, y: 0, z: 0} @@ -902,8 +925,9 @@ Transform: EdgeCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 6816892, guid: 81be41ce3a4b1df4ab875cc673214de3, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1137831012} m_Enabled: 1 m_Density: 1 @@ -920,8 +944,9 @@ EdgeCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 103182, guid: 81be41ce3a4b1df4ab875cc673214de3, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1153289609} @@ -937,8 +962,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 477860, guid: 81be41ce3a4b1df4ab875cc673214de3, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1153289608} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -2.4, z: 0} @@ -951,8 +977,9 @@ Transform: EdgeCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 6816892, guid: 81be41ce3a4b1df4ab875cc673214de3, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1153289608} m_Enabled: 1 m_Density: 1 @@ -969,7 +996,8 @@ EdgeCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1174268684} @@ -987,7 +1015,8 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1174268683} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -2.1999998, z: 0.125} @@ -1000,7 +1029,8 @@ Transform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1174268683} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1018,7 +1048,8 @@ Rigidbody2D: serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1174268683} m_BodyType: 1 m_Simulated: 1 @@ -1037,7 +1068,8 @@ Rigidbody2D: EdgeCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1174268683} m_Enabled: 1 m_Density: 1 @@ -1051,130 +1083,130 @@ EdgeCollider2D: - {x: -0.5, y: 0} - {x: 0.5, y: 0} --- !u!1001 &1323007553 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.size - value: 1 + - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: Bpie + objectReference: {fileID: 0} + - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: SpritePivot objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.x value: 90 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.y value: 170 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: SpritePivot - objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_SizeDelta.x - value: 0.4 - objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_SizeDelta.y - value: 0.28 - objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Offset.y value: 0.14 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Size.y value: 0.28 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Size.x value: 0.4 objectReference: {fileID: 0} + - target: {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: SpritePath + value: Overworld/Bpie + objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} + propertyPath: eventTriggers.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: scriptToLoad value: Bpie objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[1].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[2].x value: 3 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[3].x value: 4 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[4].x value: 666 objectReference: {fileID: 0} - - target: {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SpritePath - value: Overworld/Bpie + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_SizeDelta.x + value: 0.4 objectReference: {fileID: 0} - - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: Bpie + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_SizeDelta.y + value: 0.28 + objectReference: {fileID: 0} + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_IsPrefabAsset: 0 + m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 3} --- !u!1 &1366681679 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1366681680} @@ -1192,7 +1224,8 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1366681679} m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071067} m_LocalPosition: {x: -3, y: 0, z: 0.125} @@ -1205,7 +1238,8 @@ Transform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1366681679} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1223,7 +1257,8 @@ Rigidbody2D: serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1366681679} m_BodyType: 1 m_Simulated: 1 @@ -1242,7 +1277,8 @@ Rigidbody2D: EdgeCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1366681679} m_Enabled: 1 m_Density: 1 @@ -1256,698 +1292,698 @@ EdgeCollider2D: - {x: -0.5, y: 0} - {x: 0.5, y: 0} --- !u!1001 &1392546541 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: eventTriggers.Array.size value: 7 objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.size - value: 8 + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[5].x + value: 6 objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalPosition.x - value: 0 + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[6].x + value: 666 objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalPosition.y - value: 0 + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[4].x + value: 5 objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalPosition.z - value: 0 + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 876f2cc47fea2394b98c7950cde30cd9, + type: 3} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.x + value: 0.01 objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalRotation.x - value: 0 + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.y + value: 0.01 objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalRotation.y - value: 0 + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalRotation.z - value: 0 + - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: SpritePivot objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 490 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchoredPosition.y + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalPosition.y value: 170 objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_SizeDelta.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_SizeDelta.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[5].x - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[6].x - value: 666 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[4].x + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 876f2cc47fea2394b98c7950cde30cd9, - type: 3} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.x - value: 0.01 + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalRotation.x + value: -0 objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.y - value: 0.01 + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalRotation.y + value: -0 objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_WasSpriteAssigned - value: 1 + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalRotation.z + value: -0 objectReference: {fileID: 0} - - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: SpritePivot + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalPosition.x + value: 490 objectReference: {fileID: 0} - - target: {fileID: 212134501322781040, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 78086316886eefc40ad1bf4b05215ba0, + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, type: 3} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_LocalPosition.y - value: 170 + propertyPath: eventTriggers.Array.size + value: 8 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: scriptToLoad value: EventTest objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[1].x value: 10 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[2].x value: 14 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[3].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[4].x value: 368395 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[5].x value: 69 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[6].x value: 4 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[6].y value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[0].y value: 0 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[1].y value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[2].y value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[3].y value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[4].y value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[5].y value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[7].x value: 5 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[7].y value: 2 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_LocalPosition.x - value: 490 - objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[8].x value: 3 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[8].y value: 2 objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_IsPrefabAsset: 0 ---- !u!1001 &1505561506 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.size - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.size - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 212134501322781040, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 78086316886eefc40ad1bf4b05215ba0, + type: 3} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_RootOrder - value: 2 + value: 5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_AnchoredPosition.x - value: 1040 + value: 490 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_AnchoredPosition.y - value: 740 + value: 170 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_SizeDelta.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_SizeDelta.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SpritePath - value: - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[1].x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[2].x - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[3].x - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[4].x - value: 666 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: moveSpeed - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 29b8b27a4045bde4c8ba97c1a30b2095, - type: 3} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_LocalScale.x - value: 200 - objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_LocalScale.y - value: 200 + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 3} +--- !u!1001 &1505561506 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 124458, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: 68302eae objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Size.x value: 0.34 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Size.y value: 0.3 objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: scriptToLoad - value: Secret/68302eae - objectReference: {fileID: 0} - - target: {fileID: 124458, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: 68302eae - objectReference: {fileID: 0} - - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SetNativeSize - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Offset.y value: 0.148 objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.x - value: 0.28 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.y - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_SpriteTilingProperty.pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_SpriteTilingProperty.pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_SpriteTilingProperty.oldSize.x value: 0.38 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_SpriteTilingProperty.oldSize.y value: 0.58 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_SpriteTilingProperty.newSize.x value: 0.28 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_SpriteTilingProperty.newSize.y value: 0.38 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 400 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchoredPosition.y - value: 200 + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.size + value: 2 objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalScale.x - value: 100 + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[1].x + value: 0 objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalScale.y - value: 100 + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[2].x + value: 3 objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_RootOrder + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[3].x value: 4 objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[4].x + value: 666 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: moveSpeed + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: scriptToLoad + value: Secret/68302eae + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 29b8b27a4045bde4c8ba97c1a30b2095, + type: 3} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.x + value: 0.28 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.y + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Color.a value: 1 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: SpritePivot + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 objectReference: {fileID: 0} - - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: Punder + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SpritePath - value: Overworld/Punder/1 + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalPosition.z + value: 0 objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.data[3].x - value: 2 + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalRotation.x + value: 0 objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.data[4].x - value: 2 + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalRotation.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.data[0].x + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.data[1].x + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.data[2].x + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: moveSpeed + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_AnchoredPosition.x + value: 1040 + objectReference: {fileID: 0} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_AnchoredPosition.y + value: 740 + objectReference: {fileID: 0} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SizeDelta.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: scriptToLoad - value: PunderTest + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SizeDelta.y + value: 1 objectReference: {fileID: 0} - - target: {fileID: 212134501322781040, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: aa445937c50f03946b0a19d4716f59de, - type: 3} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalScale.x - value: 100 + value: 200 objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalScale.y - value: 100 + value: 200 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: Punder + objectReference: {fileID: 0} + - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: SpritePivot + objectReference: {fileID: 0} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.x value: 400 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.y value: 260 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_SpriteTilingProperty.oldSize.x value: 0.56 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_SpriteTilingProperty.oldSize.y value: 0.76 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Size.x value: 0.38 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Size.y value: 0.3 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Offset.y value: 0.15 objectReference: {fileID: 0} - target: {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} + propertyPath: SpritePath + value: Overworld/Punder/1 + objectReference: {fileID: 0} + - target: {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: SetNativeSize value: 0 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} + propertyPath: eventTriggers.Array.size + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: eventTriggers.Array.data[3].x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: eventTriggers.Array.data[4].x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: eventTriggers.Array.data[0].x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: eventTriggers.Array.data[1].x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: eventTriggers.Array.data[2].x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: moveSpeed + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: scriptToLoad + value: PunderTest + objectReference: {fileID: 0} + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: eventTriggers.Array.data[5].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[6].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[7].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[8].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[9].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[10].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[11].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[12].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[13].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[14].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[15].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[16].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[17].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[18].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[19].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[20].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[21].x value: 2 objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.data[22].x - value: 2 + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: eventTriggers.Array.data[22].x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: eventTriggers.Array.data[2].y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: SpritePath + value: + objectReference: {fileID: 0} + - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: SetNativeSize + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 212134501322781040, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: aa445937c50f03946b0a19d4716f59de, + type: 3} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 400 + objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalScale.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalScale.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalScale.x + value: 100 objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.data[2].y - value: 3 + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalScale.y + value: 100 objectReference: {fileID: 0} m_RemovedComponents: - - {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_IsPrefabAsset: 0 + - {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 3} --- !u!1 &1505561507 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - m_PrefabInternal: {fileID: 1505561506} + type: 3} + m_PrefabInstance: {fileID: 1505561506} + m_PrefabAsset: {fileID: 0} --- !u!114 &1505561508 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1505561507} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2019,8 +2055,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 103182, guid: 81be41ce3a4b1df4ab875cc673214de3, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1534585419} @@ -2036,8 +2073,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 477860, guid: 81be41ce3a4b1df4ab875cc673214de3, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1534585418} m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071067} m_LocalPosition: {x: 3.2, y: -0.4, z: 0} @@ -2050,8 +2088,9 @@ Transform: EdgeCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 6816892, guid: 81be41ce3a4b1df4ab875cc673214de3, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1534585418} m_Enabled: 1 m_Density: 1 @@ -2065,216 +2104,216 @@ EdgeCollider2D: - {x: -0.5, y: 0} - {x: 0.5, y: 0} --- !u!1001 &1692212090 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: eventTriggers.Array.size value: 7 objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[5].x + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[6].x + value: 666 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[4].x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 876f2cc47fea2394b98c7950cde30cd9, + type: 3} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.x + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.y + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: Stare + objectReference: {fileID: 0} + - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: SpritePivot + objectReference: {fileID: 0} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_SpriteTilingProperty.pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.x + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.y + value: 0.57 + objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.size value: 4 objectReference: {fileID: 0} + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: eventTriggers.Array.data[4].x + value: 666 + objectReference: {fileID: 0} + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: eventTriggers.Array.data[1].y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: eventTriggers.Array.data[2].y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: eventTriggers.Array.data[3].y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: scriptToLoad + value: StareTest + objectReference: {fileID: 0} + - target: {fileID: 212134501322781040, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 876f2cc47fea2394b98c7950cde30cd9, + type: 3} - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_AnchoredPosition.x value: 490 objectReference: {fileID: 0} - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_AnchoredPosition.y value: 170 objectReference: {fileID: 0} - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_SizeDelta.x value: 1 objectReference: {fileID: 0} - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_SizeDelta.y value: 1 objectReference: {fileID: 0} - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_AnchorMin.y value: 0.5 objectReference: {fileID: 0} - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_AnchorMax.y value: 0.5 objectReference: {fileID: 0} - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[5].x - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[6].x - value: 666 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[4].x - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 876f2cc47fea2394b98c7950cde30cd9, - type: 3} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.x - value: 0.01 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.y - value: 0.01 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_WasSpriteAssigned - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: SpritePivot - objectReference: {fileID: 0} - - target: {fileID: 212134501322781040, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 876f2cc47fea2394b98c7950cde30cd9, type: 3} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_SpriteTilingProperty.pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_SpriteTilingProperty.oldSize.x - value: 0.6 - objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_SpriteTilingProperty.oldSize.y - value: 0.57 - objectReference: {fileID: 0} - - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: Stare - objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_LocalPosition.x + propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.data[4].x - value: 666 - objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.data[1].y - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.data[2].y - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.data[3].y - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: scriptToLoad - value: StareTest - objectReference: {fileID: 0} m_RemovedComponents: - - {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_IsPrefabAsset: 0 + - {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 3} --- !u!1 &1889494566 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 114590, guid: 81be41ce3a4b1df4ab875cc673214de3, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1889494567} @@ -2290,8 +2329,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 434968, guid: 81be41ce3a4b1df4ab875cc673214de3, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1889494566} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -13.099998} @@ -2304,8 +2344,9 @@ Transform: PolygonCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 6083686, guid: 81be41ce3a4b1df4ab875cc673214de3, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1889494566} m_Enabled: 1 m_Density: 1 @@ -2332,442 +2373,442 @@ PolygonCollider2D: - {x: -1.8101139, y: 0.40003508} - {x: -3.2000644, y: 0.39905334} --- !u!1001 &1973657632 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 124458, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: 68302eae + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.x + value: 0.34 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.y + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Offset.y + value: 0.148 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.x + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.y + value: 0.58 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.newSize.x + value: 0.28 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.newSize.y + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: eventTriggers.Array.size value: 2 objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.size + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[1].x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[2].x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[3].x + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[4].x + value: 666 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: moveSpeed + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: scriptToLoad + value: Secret/68302eae + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 29b8b27a4045bde4c8ba97c1a30b2095, + type: 3} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.x + value: 0.28 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.y + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Color.a value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchoredPosition.x value: 1040 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchoredPosition.y value: 740 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_SizeDelta.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_SizeDelta.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SpritePath - value: - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[1].x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[2].x - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[3].x - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[4].x - value: 666 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: moveSpeed - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 29b8b27a4045bde4c8ba97c1a30b2095, - type: 3} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalScale.x value: 200 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalScale.y value: 200 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.x - value: 0.34 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.y - value: 0.3 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: scriptToLoad - value: Secret/68302eae - objectReference: {fileID: 0} - - target: {fileID: 124458, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Name - value: 68302eae - objectReference: {fileID: 0} - - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SetNativeSize - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Offset.y - value: 0.148 + value: Boxybox objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.x - value: 0.28 + - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: SpritePivot objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.y - value: 0.38 + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_RootOrder + value: 6 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.pivot.x - value: 0.5 + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalPosition.x + value: 214 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.pivot.y - value: 0.5 + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalPosition.y + value: 96 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_SpriteTilingProperty.oldSize.x - value: 0.38 + value: 0.4 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_SpriteTilingProperty.oldSize.y - value: 0.58 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.newSize.x - value: 0.28 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.newSize.y - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 400 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchoredPosition.y - value: 200 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalScale.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalScale.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_RootOrder - value: 4 + value: 0.4 objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Color.a - value: 1 + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Size.x + value: 0.4 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_RootOrder - value: 6 + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Size.y + value: 0.4 objectReference: {fileID: 0} - - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: SpritePivot + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Offset.y + value: 0.2 objectReference: {fileID: 0} - - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: Boxybox + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_SpriteTilingProperty.pivot.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: SpritePath value: spr_chestbox_0 objectReference: {fileID: 0} + - target: {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: SetNativeSize + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: eventTriggers.Array.size + value: 1 + objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[3].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[4].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[0].x value: 1 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[1].x value: 1 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[2].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: moveSpeed value: 0 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: scriptToLoad value: BoxTest objectReference: {fileID: 0} - - target: {fileID: 212134501322781040, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 0acd4547315eb914f93ba1859fa4f79b, - type: 3} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalScale.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalScale.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_LocalPosition.x - value: 214 - objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_LocalPosition.y - value: 96 - objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_SpriteTilingProperty.oldSize.x - value: 0.4 - objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_SpriteTilingProperty.oldSize.y - value: 0.4 - objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Size.x - value: 0.4 - objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Size.y - value: 0.4 - objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Offset.y - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SetNativeSize - value: 0 - objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[5].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[6].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[7].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[8].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[9].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[10].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[11].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[12].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[13].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[14].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[15].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[16].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[17].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[18].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[19].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[20].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[21].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[22].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[2].y value: 3 objectReference: {fileID: 0} + - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: SpritePath + value: + objectReference: {fileID: 0} + - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: SetNativeSize + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 212134501322781040, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 0acd4547315eb914f93ba1859fa4f79b, + type: 3} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 400 + objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalScale.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalScale.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalScale.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalScale.y + value: 100 + objectReference: {fileID: 0} - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_SizeDelta.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_SpriteTilingProperty.pivot.y - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: - - {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_IsPrefabAsset: 0 + - {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 3} --- !u!1 &2088941609 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 140050, guid: 81be41ce3a4b1df4ab875cc673214de3, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2088941611} @@ -2783,8 +2824,9 @@ GameObject: EdgeCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 6820472, guid: 81be41ce3a4b1df4ab875cc673214de3, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2088941609} m_Enabled: 1 m_Density: 1 @@ -2801,8 +2843,9 @@ EdgeCollider2D: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 465334, guid: 81be41ce3a4b1df4ab875cc673214de3, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2088941609} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 2.4, z: 0} diff --git a/Assets/Scenes/test4.unity b/Assets/Scenes/test4.unity index 741f97ee3..9ce7e6d10 100644 --- a/Assets/Scenes/test4.unity +++ b/Assets/Scenes/test4.unity @@ -50,7 +50,6 @@ LightmapSettings: m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 @@ -114,278 +113,277 @@ NavMeshSettings: m_Flags: 0 m_NavMeshData: {fileID: 0} --- !u!1001 &5702134 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.size - value: 2 + - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: Save + objectReference: {fileID: 0} + - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: SpritePivot objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.x value: 1140 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.y value: 280 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_RootOrder value: 6 objectReference: {fileID: 0} - - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: SpritePivot - objectReference: {fileID: 0} - - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: Save - objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_SizeDelta.x - value: 0.4 - objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_SizeDelta.y - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 212134501322781040, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: fe0fb303d866c974ab18bdf7ecff6ba4, - type: 3} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Offset.y value: 0.19 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_SpriteTilingProperty.pivot.y value: 0 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_SpriteTilingProperty.oldSize.x value: 0.4 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_SpriteTilingProperty.oldSize.y value: 0.38 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Size.y value: 0.38 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Size.x value: 0.4 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} + propertyPath: eventTriggers.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: scriptToLoad value: SaveTest objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[2].x value: 3 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[3].x value: 4 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[4].x value: 666 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[0].x value: 0 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[1].x value: 1 objectReference: {fileID: 0} + - target: {fileID: 212134501322781040, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: fe0fb303d866c974ab18bdf7ecff6ba4, + type: 3} + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_SizeDelta.x + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_SizeDelta.y + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} m_RemovedComponents: - - {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_IsPrefabAsset: 0 + - {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 3} --- !u!1001 &429742953 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.size - value: 2 + - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: 8ba3f2c2 + objectReference: {fileID: 0} + - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: SpritePivot objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.x value: 380 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.y value: 240 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_RootOrder value: 7 objectReference: {fileID: 0} - - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: SpritePivot - objectReference: {fileID: 0} - - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: 8ba3f2c2 - objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Offset.y value: 0 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Size.x value: 0.01 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Size.y value: 0.8 objectReference: {fileID: 0} + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: eventTriggers.Array.size + value: 2 + objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: scriptToLoad value: Secret/8ba3f2c2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[2].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[3].x value: 4 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[4].x value: 666 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[0].x value: 0 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[1].y value: 1 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[2].y value: 1 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[1].x value: 1 objectReference: {fileID: 0} - - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Layer - value: 0 - objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: actualPage value: 1 objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_IsTrigger - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: - - {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_IsPrefabAsset: 0 + - {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 3} --- !u!1 &1268756797 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 177562, guid: f25522319d7cd2e4a94cbb960fb4e6c7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1268756798} @@ -404,8 +402,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 431592, guid: f25522319d7cd2e4a94cbb960fb4e6c7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1268756797} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -418,8 +417,9 @@ Transform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11452048, guid: f25522319d7cd2e4a94cbb960fb4e6c7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1268756797} m_Enabled: 1 m_EditorHideFlags: 0 @@ -431,8 +431,9 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11422268, guid: f25522319d7cd2e4a94cbb960fb4e6c7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1268756797} m_Enabled: 1 m_EditorHideFlags: 0 @@ -443,8 +444,9 @@ MonoBehaviour: MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 2389372, guid: f25522319d7cd2e4a94cbb960fb4e6c7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1268756797} m_Enabled: 1 m_CastShadows: 0 @@ -454,6 +456,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: b90bff42e575b504a9929ba56d216286, type: 2} m_StaticBatchInfo: @@ -479,16 +482,18 @@ MeshRenderer: MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 3361588, guid: f25522319d7cd2e4a94cbb960fb4e6c7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1268756797} m_Mesh: {fileID: 4300000, guid: 6b8f1b32149de0c418bdc62a7f9eba86, type: 3} --- !u!1 &1323470861 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 100150, guid: f25522319d7cd2e4a94cbb960fb4e6c7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1323470862} @@ -507,8 +512,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 405108, guid: f25522319d7cd2e4a94cbb960fb4e6c7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1323470861} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -6.2, y: 2.4, z: 0} @@ -521,8 +527,9 @@ Transform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11410426, guid: f25522319d7cd2e4a94cbb960fb4e6c7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1323470861} m_Enabled: 1 m_EditorHideFlags: 0 @@ -534,8 +541,9 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11409522, guid: f25522319d7cd2e4a94cbb960fb4e6c7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1323470861} m_Enabled: 1 m_EditorHideFlags: 0 @@ -546,8 +554,9 @@ MonoBehaviour: MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 2356494, guid: f25522319d7cd2e4a94cbb960fb4e6c7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1323470861} m_Enabled: 1 m_CastShadows: 0 @@ -557,6 +566,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: b90bff42e575b504a9929ba56d216286, type: 2} m_StaticBatchInfo: @@ -582,16 +592,18 @@ MeshRenderer: MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 3350656, guid: f25522319d7cd2e4a94cbb960fb4e6c7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1323470861} m_Mesh: {fileID: 4300002, guid: 6b8f1b32149de0c418bdc62a7f9eba86, type: 3} --- !u!1 &1372627567 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 157358, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1372627568} @@ -609,8 +621,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 406064, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1372627567} m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071067} m_LocalPosition: {x: 6, y: 0, z: 0} @@ -623,8 +636,9 @@ Transform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11494438, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1372627567} m_Enabled: 1 m_EditorHideFlags: 0 @@ -642,8 +656,9 @@ Rigidbody2D: serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 5032938, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1372627567} m_BodyType: 1 m_Simulated: 1 @@ -662,8 +677,9 @@ Rigidbody2D: EdgeCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 6882432, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1372627567} m_Enabled: 1 m_Density: 1 @@ -680,8 +696,9 @@ EdgeCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 168770, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1523043057} @@ -699,8 +716,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 425052, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1523043056} m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071067} m_LocalPosition: {x: -6, y: 0, z: 0} @@ -713,8 +731,9 @@ Transform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11498914, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1523043056} m_Enabled: 1 m_EditorHideFlags: 0 @@ -732,8 +751,9 @@ Rigidbody2D: serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 5034292, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1523043056} m_BodyType: 1 m_Simulated: 1 @@ -752,8 +772,9 @@ Rigidbody2D: EdgeCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 6853106, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1523043056} m_Enabled: 1 m_Density: 1 @@ -770,8 +791,9 @@ EdgeCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 189286, guid: f25522319d7cd2e4a94cbb960fb4e6c7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1552866259} @@ -787,8 +809,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 457758, guid: f25522319d7cd2e4a94cbb960fb4e6c7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1552866258} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -6.2, y: 2.4, z: -140} @@ -801,8 +824,9 @@ Transform: BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 6142724, guid: f25522319d7cd2e4a94cbb960fb4e6c7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1552866258} m_Enabled: 1 m_Density: 1 @@ -827,8 +851,9 @@ BoxCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 178842, guid: f25522319d7cd2e4a94cbb960fb4e6c7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1602858721} @@ -843,8 +868,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 437592, guid: f25522319d7cd2e4a94cbb960fb4e6c7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1602858720} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 480, z: -1} @@ -855,431 +881,432 @@ Transform: m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1683666805 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 124458, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: 68302eae + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.x + value: 0.34 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.y + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Offset.y + value: 0.148 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.x + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.y + value: 0.58 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.newSize.x + value: 0.28 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.newSize.y + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: eventTriggers.Array.size value: 2 objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.size + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[1].x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[2].x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[3].x + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[4].x + value: 666 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: moveSpeed value: 2 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: scriptToLoad + value: Secret/68302eae + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 29b8b27a4045bde4c8ba97c1a30b2095, + type: 3} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.x + value: 0.28 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.y + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Color.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchoredPosition.x value: 1040 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchoredPosition.y value: 740 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_SizeDelta.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_SizeDelta.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SpritePath - value: + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalScale.x + value: 200 objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[1].x - value: 0 + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalScale.y + value: 200 objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[2].x - value: 3 + - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: Punder1 objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[3].x - value: 4 + - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: SpritePivot objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[4].x - value: 666 + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_RootOrder + value: 5 objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: moveSpeed - value: 2 + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalPosition.x + value: 1060 objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 29b8b27a4045bde4c8ba97c1a30b2095, + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalPosition.y + value: 240 + objectReference: {fileID: 0} + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, type: 3} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_LocalScale.x - value: 200 + propertyPath: m_SpriteTilingProperty.oldSize.x + value: 0.56 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_LocalScale.y - value: 200 + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.y + value: 0.76 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_Size.x - value: 0.34 + value: 0.38 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_Size.y value: 0.3 objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: scriptToLoad - value: Secret/68302eae + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Offset.y + value: 0.15 objectReference: {fileID: 0} - - target: {fileID: 124458, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: 68302eae + - target: {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: SpritePath + value: Overworld/Punder/1 objectReference: {fileID: 0} - - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + - target: {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: SetNativeSize value: 0 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Offset.y - value: 0.148 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.x - value: 0.28 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.y - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.oldSize.x - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.oldSize.y - value: 0.58 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.newSize.x - value: 0.28 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.newSize.y - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 400 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchoredPosition.y - value: 200 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalScale.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalScale.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Color.a - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: SpritePivot - objectReference: {fileID: 0} - - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: Punder1 - objectReference: {fileID: 0} - - target: {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SpritePath - value: Overworld/Punder/1 + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: eventTriggers.Array.size + value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[3].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[4].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[0].x value: 0 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[1].x value: 1 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[2].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: moveSpeed value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: scriptToLoad value: punderTest1 objectReference: {fileID: 0} - - target: {fileID: 212134501322781040, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: aa445937c50f03946b0a19d4716f59de, - type: 3} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalScale.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalScale.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_LocalPosition.x - value: 1060 - objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_LocalPosition.y - value: 240 - objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_SpriteTilingProperty.oldSize.x - value: 0.56 - objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_SpriteTilingProperty.oldSize.y - value: 0.76 - objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Size.x - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Size.y - value: 0.3 - objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Offset.y - value: 0.15 - objectReference: {fileID: 0} - - target: {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SetNativeSize - value: 0 - objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[5].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[6].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[7].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[8].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[9].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[10].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[11].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[12].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[13].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[14].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[15].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[16].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[17].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[18].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[19].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[20].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[21].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[22].x value: 2 objectReference: {fileID: 0} + - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: SpritePath + value: + objectReference: {fileID: 0} + - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: SetNativeSize + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 212134501322781040, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: aa445937c50f03946b0a19d4716f59de, + type: 3} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 400 + objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalScale.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalScale.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalScale.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalScale.y + value: 100 + objectReference: {fileID: 0} m_RemovedComponents: - - {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_IsPrefabAsset: 0 + - {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 3} --- !u!1 &1683666806 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - m_PrefabInternal: {fileID: 1683666805} + type: 3} + m_PrefabInstance: {fileID: 1683666805} + m_PrefabAsset: {fileID: 0} --- !u!114 &1683666807 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1683666806} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1324,8 +1351,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 194538, guid: f25522319d7cd2e4a94cbb960fb4e6c7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1753844028} @@ -1344,8 +1372,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 439314, guid: f25522319d7cd2e4a94cbb960fb4e6c7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1753844027} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1358,8 +1387,9 @@ Transform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11451652, guid: f25522319d7cd2e4a94cbb960fb4e6c7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1753844027} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1371,8 +1401,9 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11443456, guid: f25522319d7cd2e4a94cbb960fb4e6c7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1753844027} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1383,8 +1414,9 @@ MonoBehaviour: MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 2359872, guid: f25522319d7cd2e4a94cbb960fb4e6c7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1753844027} m_Enabled: 1 m_CastShadows: 0 @@ -1394,6 +1426,7 @@ MeshRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: b90bff42e575b504a9929ba56d216286, type: 2} m_StaticBatchInfo: @@ -1419,16 +1452,18 @@ MeshRenderer: MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 3360044, guid: f25522319d7cd2e4a94cbb960fb4e6c7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1753844027} m_Mesh: {fileID: 4300004, guid: 6b8f1b32149de0c418bdc62a7f9eba86, type: 3} --- !u!1 &1778780347 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 160736, guid: f25522319d7cd2e4a94cbb960fb4e6c7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1778780348} @@ -1443,8 +1478,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 419426, guid: f25522319d7cd2e4a94cbb960fb4e6c7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1778780347} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 480, z: 141} @@ -1455,323 +1491,324 @@ Transform: m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1864644675 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.size + - target: {fileID: 124458, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: 8ba3f2c2 (1) + objectReference: {fileID: 0} + - target: {fileID: 124458, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.x + value: 0.18 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.y + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Offset.y + value: -0.09 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.x + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.y + value: 0.66 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.newSize.x + value: 0.28 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.newSize.y + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: eventTriggers.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[1].x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[2].x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[3].x + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[4].x + value: 666 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: moveSpeed + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: scriptToLoad + value: Secret/8ba3f2c2 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[0].x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 876f2cc47fea2394b98c7950cde30cd9, + type: 3} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.x + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.y + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchoredPosition.x value: 1040 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchoredPosition.y value: 740 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_SizeDelta.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_SizeDelta.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SpritePath - value: empty - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[1].x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[2].x - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[3].x - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[4].x - value: 666 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: moveSpeed - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 876f2cc47fea2394b98c7950cde30cd9, - type: 3} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalScale.x value: 200 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalScale.y value: 200 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.x - value: 0.18 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.y - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: scriptToLoad - value: Secret/8ba3f2c2 - objectReference: {fileID: 0} - - target: {fileID: 124458, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Name value: 8ba3f2c2 (1) objectReference: {fileID: 0} - - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SetNativeSize - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Offset.y - value: -0.09 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.x - value: 0.01 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.y - value: 0.01 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.oldSize.x - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.oldSize.y - value: 0.66 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.newSize.x - value: 0.28 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.newSize.y - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchoredPosition.y - value: 240 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalScale.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalScale.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[0].x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_IsTrigger - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_WasSpriteAssigned - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 124458, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Layer - value: 0 + - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: SpritePivot objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: 8ba3f2c2 (1) - objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.x value: -20 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.y value: 240 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Size.x value: 0.2 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Size.y value: 0.2 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Offset.y value: 0.1 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} + propertyPath: eventTriggers.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: scriptToLoad value: none objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[0].x value: 1 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[1].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[2].x value: 3 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[3].x value: 4 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[4].x value: 666 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: moveSpeed value: 2 objectReference: {fileID: 0} + - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: SpritePath + value: empty + objectReference: {fileID: 0} + - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: SetNativeSize + value: 0 + objectReference: {fileID: 0} - target: {fileID: 212134501322781040, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Sprite value: objectReference: {fileID: 21300000, guid: ba3bc926f01aa7e4782aa6b0faf2a3d8, type: 3} - - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: SpritePivot + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 240 + objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalScale.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalScale.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_RootOrder + value: 6 objectReference: {fileID: 0} m_RemovedComponents: - - {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_IsPrefabAsset: 0 + - {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 3} --- !u!1 &1864644676 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - m_PrefabInternal: {fileID: 1864644675} + type: 3} + m_PrefabInstance: {fileID: 1864644675} + m_PrefabAsset: {fileID: 0} --- !u!114 &1864644677 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1864644676} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1797,305 +1834,309 @@ MonoBehaviour: - name: NoAnim anims: empty, empty transitionTime: 60 + - name: MovingDown + anims: FriskUT/1, FriskUT/1 + transitionTime: 60 --- !u!1001 &1976352766 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 124458, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: Punder1 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.x + value: 0.18 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.y + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Offset.y + value: 0.085 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.x + value: 0.28 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.y + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.newSize.x + value: 0.28 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.newSize.y + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: eventTriggers.Array.size value: 2 objectReference: {fileID: 0} - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.size + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[1].x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[2].x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[3].x + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[4].x + value: 666 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: moveSpeed + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: scriptToLoad + value: punderTest1 + objectReference: {fileID: 0} + - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: eventTriggers.Array.data[0].x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 7801b99d48f55d844bbe1a64c451983b, + type: 3} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.x + value: 0.28 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Size.y + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_RootOrder value: 3 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchoredPosition.x value: 490 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchoredPosition.y value: 240 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_SizeDelta.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_SizeDelta.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SpritePath - value: Overworld/Punder/1 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[1].x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[2].x - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[3].x - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[4].x - value: 666 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: moveSpeed - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 7801b99d48f55d844bbe1a64c451983b, - type: 3} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalScale.x value: 200 objectReference: {fileID: 0} - - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 22437642, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalScale.y value: 200 objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.x - value: 0.18 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Size.y - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: scriptToLoad - value: punderTest1 - objectReference: {fileID: 0} - - target: {fileID: 124458, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_Name - value: Punder1 - objectReference: {fileID: 0} - - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: SetNativeSize - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Offset.y - value: 0.085 + value: 8ba3f2c2 (2) objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 800 + - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: SpritePivot objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchoredPosition.y - value: 240 + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_RootOrder + value: 1 objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalScale.x - value: 200 + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 objectReference: {fileID: 0} - - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_LocalScale.y - value: 200 + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_Size.x - value: 0.28 + value: 0.2 objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: m_Size.y - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.oldSize.x - value: 0.28 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.oldSize.y - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.newSize.x - value: 0.28 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.newSize.y - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 6188160, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold - value: 0.5 + value: 0.2 objectReference: {fileID: 0} - - target: {fileID: 21250564, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_WasSpriteAssigned - value: 1 + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Offset.y + value: 0.1 objectReference: {fileID: 0} - - target: {fileID: 11460532, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: eventTriggers.Array.data[0].x + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: eventTriggers.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: 8ba3f2c2 (2) - objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: scriptToLoad value: none objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[0].x value: 1 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[1].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[2].x value: 3 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[3].x value: 4 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[4].x value: 666 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: moveSpeed value: 2 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_LocalPosition.x - value: 0 + - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: SpritePath + value: Overworld/Punder/1 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_LocalPosition.y + - target: {fileID: 114980733475525374, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: SetNativeSize value: 0 objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Size.x - value: 0.2 + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 800 objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Size.y - value: 0.2 + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 240 objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Offset.y - value: 0.1 + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalScale.x + value: 200 objectReference: {fileID: 0} - - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: SpritePivot + - target: {fileID: 224194490068971162, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_LocalScale.y + value: 200 objectReference: {fileID: 0} m_RemovedComponents: - - {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_IsPrefabAsset: 0 + - {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 3} --- !u!1 &1976352767 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - m_PrefabInternal: {fileID: 1976352766} + type: 3} + m_PrefabInstance: {fileID: 1976352766} + m_PrefabAsset: {fileID: 0} --- !u!114 &1976352768 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1976352767} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2122,8 +2163,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 199562, guid: f25522319d7cd2e4a94cbb960fb4e6c7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2010831947} @@ -2139,8 +2181,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 474438, guid: f25522319d7cd2e4a94cbb960fb4e6c7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2010831946} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -6.2, y: -0.4, z: -140} @@ -2153,8 +2196,9 @@ Transform: BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 6163526, guid: f25522319d7cd2e4a94cbb960fb4e6c7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2010831946} m_Enabled: 1 m_Density: 1 @@ -2179,8 +2223,9 @@ BoxCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 134422, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2052254822} @@ -2197,8 +2242,9 @@ GameObject: SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 21251718, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2052254819} m_Enabled: 1 m_CastShadows: 0 @@ -2208,6 +2254,7 @@ SpriteRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -2244,8 +2291,9 @@ SpriteRenderer: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11414468, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2052254819} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2260,8 +2308,9 @@ MonoBehaviour: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2052254819} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 140} diff --git a/Assets/Scenes/test5.unity b/Assets/Scenes/test5.unity index 862d991f4..39f44af4c 100644 --- a/Assets/Scenes/test5.unity +++ b/Assets/Scenes/test5.unity @@ -50,7 +50,6 @@ LightmapSettings: m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 @@ -117,8 +116,9 @@ NavMeshSettings: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 1757683408647010, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 10025049} @@ -134,8 +134,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 4598805064824768, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 10025048} m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068} m_LocalPosition: {x: -7.205, y: -0.79999995, z: -140} @@ -148,8 +149,9 @@ Transform: EdgeCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 68369455898468872, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 10025048} m_Enabled: 1 m_Density: 1 @@ -166,8 +168,9 @@ EdgeCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 1070681132078748, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 194666132} @@ -183,8 +186,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 4346538951897100, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 194666131} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -7.2, y: 0.39999998, z: -140} @@ -197,8 +201,9 @@ Transform: BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 61153385514969244, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 194666131} m_Enabled: 1 m_Density: 1 @@ -223,8 +228,9 @@ BoxCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 1161035551607804, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 506967178} @@ -240,8 +246,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 4205393937864470, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 506967177} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -8.4, y: 0.79999995, z: -140} @@ -254,8 +261,9 @@ Transform: EdgeCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 68072420332171870, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 506967177} m_Enabled: 1 m_Density: 1 @@ -272,8 +280,9 @@ EdgeCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 1151812770722732, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 521334823} @@ -289,8 +298,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 4529729036647938, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 521334822} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -10.4, y: -1.1999999, z: -140} @@ -303,8 +313,9 @@ Transform: BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 61385251179982890, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 521334822} m_Enabled: 1 m_Density: 1 @@ -329,8 +340,9 @@ BoxCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 1195497376485132, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 567811969} @@ -346,8 +358,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 4605571963405776, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 567811968} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -7.2, y: -0.39999998, z: -140} @@ -360,8 +373,9 @@ Transform: BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 61904730147415522, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 567811968} m_Enabled: 1 m_Density: 1 @@ -386,8 +400,9 @@ BoxCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 1760979035267770, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 577914316} @@ -403,8 +418,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 4838777674642716, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 577914315} m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068} m_LocalPosition: {x: 6.3949986, y: 0.79999995, z: -140} @@ -417,8 +433,9 @@ Transform: EdgeCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 68811772085747062, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 577914315} m_Enabled: 1 m_Density: 1 @@ -435,8 +452,9 @@ EdgeCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 1787832774283786, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 640508263} @@ -452,8 +470,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 4983500857017358, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 640508262} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 6.3999996, y: -1.1999999, z: -140} @@ -466,8 +485,9 @@ Transform: BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 61171404436155026, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 640508262} m_Enabled: 1 m_Density: 1 @@ -492,8 +512,9 @@ BoxCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 157358, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 646992163} @@ -511,8 +532,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 406064, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 646992162} m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071067} m_LocalPosition: {x: 10.2, y: -0.4, z: 0} @@ -525,8 +547,9 @@ Transform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11494438, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 646992162} m_Enabled: 1 m_EditorHideFlags: 0 @@ -544,8 +567,9 @@ Rigidbody2D: serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 5032938, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 646992162} m_BodyType: 1 m_Simulated: 1 @@ -564,8 +588,9 @@ Rigidbody2D: EdgeCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 6882432, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 646992162} m_Enabled: 1 m_Density: 1 @@ -582,8 +607,9 @@ EdgeCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 134422, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 750405499} @@ -600,8 +626,9 @@ GameObject: SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 21251718, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 750405496} m_Enabled: 1 m_CastShadows: 0 @@ -611,6 +638,7 @@ SpriteRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -647,8 +675,9 @@ SpriteRenderer: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11414468, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 750405496} m_Enabled: 1 m_EditorHideFlags: 0 @@ -663,8 +692,9 @@ MonoBehaviour: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 22411040, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 750405496} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 140} @@ -697,136 +727,136 @@ RectTransform: m_SizeDelta: {x: 20.8, y: 4.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &797913842 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.size - value: 2 + - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: caf144b2 + objectReference: {fileID: 0} + - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: SpritePivot objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.x value: 1000 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.y value: 220 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: SpritePivot - objectReference: {fileID: 0} - - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: caf144b2 - objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Offset.y value: 0 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Size.x value: 0.01 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Size.y value: 0.4 objectReference: {fileID: 0} + - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} + propertyPath: eventTriggers.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: scriptToLoad value: Secret/caf144b2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[2].x value: 3 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[3].x value: 4 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[4].x value: 666 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[0].x value: 0 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[1].x value: 1 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[1].y value: 1 objectReference: {fileID: 0} - - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_IsTrigger - value: 1 + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Layer - value: 0 + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 objectReference: {fileID: 0} m_RemovedComponents: - - {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_IsPrefabAsset: 0 + - {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 3} --- !u!1 &821340573 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 1694266021406360, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 821340574} @@ -842,8 +872,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 4527790992299656, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 821340573} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -7.6, y: 0.79499996, z: -140} @@ -856,8 +887,9 @@ Transform: EdgeCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 68415795411351456, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 821340573} m_Enabled: 1 m_Density: 1 @@ -874,8 +906,9 @@ EdgeCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 1910794801251156, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 873920483} @@ -891,8 +924,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 4852167593473878, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 873920482} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 6, y: -0.79999995, z: -140} @@ -905,8 +939,9 @@ Transform: EdgeCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 68353605231433050, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 873920482} m_Enabled: 1 m_Density: 1 @@ -920,153 +955,153 @@ EdgeCollider2D: - {x: 0, y: -0.0738636} - {x: 40, y: -40.0455} --- !u!1001 &888482714 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.size - value: 2 + - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: Save objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: SpritePivot + objectReference: {fileID: 0} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.x value: 1840 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.y value: 280 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_RootOrder value: 6 objectReference: {fileID: 0} - - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: SpritePivot - objectReference: {fileID: 0} - - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: Save - objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_SizeDelta.x - value: 0.4 - objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_SizeDelta.y - value: 0.38 - objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 212134501322781040, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: fe0fb303d866c974ab18bdf7ecff6ba4, - type: 3} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Offset.y value: 0.19 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_SpriteTilingProperty.pivot.y value: 0 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_SpriteTilingProperty.oldSize.x value: 0.4 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_SpriteTilingProperty.oldSize.y value: 0.38 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Size.x value: 0.4 objectReference: {fileID: 0} - target: {fileID: 61614148327684554, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: m_Size.y value: 0.38 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} + propertyPath: eventTriggers.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} propertyPath: scriptToLoad value: SaveTest objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[2].x value: 3 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[3].x value: 4 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[4].x value: 666 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[0].x value: 0 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[1].x value: 1 objectReference: {fileID: 0} + - target: {fileID: 212134501322781040, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: fe0fb303d866c974ab18bdf7ecff6ba4, + type: 3} + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_SizeDelta.x + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_SizeDelta.y + value: 0.38 + objectReference: {fileID: 0} + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224528923083268334, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} m_RemovedComponents: - - {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_IsPrefabAsset: 0 + - {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 3} --- !u!1 &929373714 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 1345539823582904, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 929373715} @@ -1082,8 +1117,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 4535569777836866, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 929373714} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 6.3999996, y: 1.1999999, z: -140} @@ -1096,8 +1132,9 @@ Transform: BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 61202526088194468, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 929373714} m_Enabled: 1 m_Density: 1 @@ -1122,7 +1159,8 @@ BoxCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1142746682} @@ -1138,7 +1176,8 @@ GameObject: SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1142746680} m_Enabled: 1 m_CastShadows: 0 @@ -1148,6 +1187,7 @@ SpriteRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -1184,7 +1224,8 @@ SpriteRenderer: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1142746680} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 141} @@ -1202,8 +1243,9 @@ RectTransform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 1102268064559802, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1370588189} @@ -1219,8 +1261,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 4629995627236018, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1370588188} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -8.4, y: 1.1999999, z: -140} @@ -1233,8 +1276,9 @@ Transform: BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 61132017150951326, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1370588188} m_Enabled: 1 m_Density: 1 @@ -1259,8 +1303,9 @@ BoxCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 1242799010098532, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1402197616} @@ -1276,8 +1321,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 4266183532546440, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1402197615} m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068} m_LocalPosition: {x: 9.995, y: -0.79999995, z: -140} @@ -1290,8 +1336,9 @@ Transform: EdgeCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 68830159985401728, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1402197615} m_Enabled: 1 m_Density: 1 @@ -1308,8 +1355,9 @@ EdgeCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 1535449735655230, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1495977421} @@ -1325,8 +1373,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 4586177013734896, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1495977420} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -10.4, y: 0, z: -140} @@ -1339,8 +1388,9 @@ Transform: BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 61427001335369136, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1495977420} m_Enabled: 1 m_Density: 1 @@ -1365,8 +1415,9 @@ BoxCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 1830991993780378, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1554140765} @@ -1382,8 +1433,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 4139305849416020, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1554140764} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 10, y: -0.8, z: -140} @@ -1396,8 +1448,9 @@ Transform: BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 61181203576953738, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1554140764} m_Enabled: 1 m_Density: 1 @@ -1422,8 +1475,9 @@ BoxCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1577340202} @@ -1440,7 +1494,8 @@ GameObject: SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1577340199} m_Enabled: 1 m_CastShadows: 0 @@ -1450,6 +1505,7 @@ SpriteRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -1486,8 +1542,9 @@ SpriteRenderer: SortingGroup: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 210702407409670196, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1577340199} m_Enabled: 1 m_SortingLayerID: 0 @@ -1497,7 +1554,8 @@ SortingGroup: RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1577340199} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -1} @@ -1512,106 +1570,111 @@ RectTransform: m_SizeDelta: {x: 1, y: 1} m_Pivot: {x: 0.5, y: 0} --- !u!1001 &1581974915 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.size + - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: caf144b2 (1) + objectReference: {fileID: 0} + - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: SpritePivot + objectReference: {fileID: 0} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.x value: 540 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.y value: 220 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: SpritePivot - objectReference: {fileID: 0} - - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: caf144b2 (1) + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: eventTriggers.Array.size + value: 0 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: scriptToLoad value: none objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[0].x value: 1 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[1].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[2].x value: 3 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[3].x value: 4 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[4].x value: 666 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: moveSpeed value: 2 objectReference: {fileID: 0} m_RemovedComponents: - - {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_IsPrefabAsset: 0 + - {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 3} --- !u!1 &1581974916 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - m_PrefabInternal: {fileID: 1581974915} + type: 3} + m_PrefabInstance: {fileID: 1581974915} + m_PrefabAsset: {fileID: 0} --- !u!114 &1581974917 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1581974916} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1641,8 +1704,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 168770, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1677029747} @@ -1660,8 +1724,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 425052, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1677029746} m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071067} m_LocalPosition: {x: -10.2, y: -0.8, z: 0} @@ -1674,8 +1739,9 @@ Transform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11498914, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1677029746} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1693,8 +1759,9 @@ Rigidbody2D: serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 5034292, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1677029746} m_BodyType: 1 m_Simulated: 1 @@ -1713,8 +1780,9 @@ Rigidbody2D: EdgeCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 6853106, guid: d781acdb7c86dff4081250e8c5edd546, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1677029746} m_Enabled: 1 m_Density: 1 @@ -1728,106 +1796,111 @@ EdgeCollider2D: - {x: -0.5, y: 0} - {x: 0.5, y: 0} --- !u!1001 &1843310489 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - propertyPath: eventTriggers.Array.size + - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: caf144b2 (2) + objectReference: {fileID: 0} + - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Layer value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 3} + propertyPath: m_Name + value: SpritePivot + objectReference: {fileID: 0} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 2} + - target: {fileID: 4671881132980978, guid: a0add8308da8d24468328221253c3ec7, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 1849668906715600, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: SpritePivot - objectReference: {fileID: 0} - - target: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, type: 2} - propertyPath: m_Name - value: caf144b2 (2) + - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, + type: 3} + propertyPath: eventTriggers.Array.size + value: 0 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: scriptToLoad value: none objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[0].x value: 1 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[1].x value: 2 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[2].x value: 3 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[3].x value: 4 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: eventTriggers.Array.data[4].x value: 666 objectReference: {fileID: 0} - target: {fileID: 114879940000294058, guid: a0add8308da8d24468328221253c3ec7, - type: 2} + type: 3} propertyPath: moveSpeed value: 2 objectReference: {fileID: 0} m_RemovedComponents: - - {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 2} - m_IsPrefabAsset: 0 + - {fileID: 114226206946908324, guid: a0add8308da8d24468328221253c3ec7, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: a0add8308da8d24468328221253c3ec7, type: 3} --- !u!1 &1843310490 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1649222073514108, guid: a0add8308da8d24468328221253c3ec7, - type: 2} - m_PrefabInternal: {fileID: 1843310489} + type: 3} + m_PrefabInstance: {fileID: 1843310489} + m_PrefabAsset: {fileID: 0} --- !u!114 &1843310491 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1843310490} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1851,8 +1924,9 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 1341082084791428, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2046660587} @@ -1868,8 +1942,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 4204999113919738, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2046660586} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 9.599998, y: 0.79999995, z: -140} @@ -1882,8 +1957,9 @@ Transform: EdgeCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 68611834399267132, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2046660586} m_Enabled: 1 m_Density: 1 @@ -1900,8 +1976,9 @@ EdgeCollider2D: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 1181203595476496, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2047385491} @@ -1917,8 +1994,9 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 4890667143594728, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2047385490} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 10, y: 0.39999998, z: -140} @@ -1931,8 +2009,9 @@ Transform: BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 61279817987866440, guid: a09f87100ed37ef47bc40405617328e4, - type: 2} - m_PrefabInternal: {fileID: 0} + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2047385490} m_Enabled: 1 m_Density: 1 diff --git a/Assets/Scripts/Battle/ArenaManager.cs b/Assets/Scripts/Battle/ArenaManager.cs index 02ae38600..7a085444a 100644 --- a/Assets/Scripts/Battle/ArenaManager.cs +++ b/Assets/Scripts/Battle/ArenaManager.cs @@ -30,6 +30,7 @@ public class ArenaManager : MonoBehaviour { public float desiredHeight; // Desired height of the arena; internal so the Lua Arena object may refer to it (lazy) public float desiredX; // Desired x of the arena; internal so the Lua Arena object may refer to it (lazy) public float desiredY; // Desired y of the arena; internal so the Lua Arena object may refer to it (lazy) + public bool showWhenWaveEnds = false; // Used to know if we need to run Arena.Show() at the end of a wave private bool movePlayer; /// diff --git a/Assets/Scripts/Battle/EnemyController.cs b/Assets/Scripts/Battle/EnemyController.cs index 5180a6bef..7ec37e218 100644 --- a/Assets/Scripts/Battle/EnemyController.cs +++ b/Assets/Scripts/Battle/EnemyController.cs @@ -7,22 +7,22 @@ public class EnemyController : MonoBehaviour { public GameObject bubbleObject; - internal Sprite textBubbleSprite; - - internal Vector2 textBubblePos; protected UIController ui; - public Vector2 DialogBubblePosition { - get { - Sprite diagBubbleSpr = SpriteRegistry.Get(DialogBubble); - RectTransform t = GetComponent(); - if (diagBubbleSpr.name.StartsWith("right")) textBubblePos = new Vector2(t.rect.width / 2 + 5, diagBubbleSpr.rect.height / 2); - else if (diagBubbleSpr.name.StartsWith("left")) textBubblePos = new Vector2(-t.rect.width / 2 - diagBubbleSpr.rect.width - 5, diagBubbleSpr.rect.height / 2); - else if (diagBubbleSpr.name.StartsWith("top")) textBubblePos = new Vector2(-diagBubbleSpr.rect.width / 2, t.rect.height / 2 + diagBubbleSpr.rect.height + 5); - else if (diagBubbleSpr.name.StartsWith("bottom")) textBubblePos = new Vector2(-diagBubbleSpr.rect.width / 2, -t.rect.height / 2 - 5); - else textBubblePos = new Vector2(t.rect.width / 2 + 5, diagBubbleSpr.rect.height / 2); // rightside default - return textBubblePos; + public enum BubbleSideEnum { LEFT, RIGHT, UP, DOWN, NONE } + public BubbleSideEnum GetReverseBubbleSide(BubbleSideEnum val) { + switch (val) { + case BubbleSideEnum.LEFT: + return BubbleSideEnum.RIGHT; + case BubbleSideEnum.RIGHT: + return BubbleSideEnum.LEFT; + case BubbleSideEnum.UP: + return BubbleSideEnum.DOWN; + case BubbleSideEnum.DOWN: + return BubbleSideEnum.UP; + default: + return val; } } @@ -240,6 +240,38 @@ public string NoAttackMissText { set { script.SetVar("noattackmisstext", DynValue.NewString(value)); } } + public Color SpareColor { + get { + DynValue spareColor = script.GetVar("sparecolor"); + DynValue spareColor32 = script.GetVar("sparecolor32"); + DynValue val = spareColor.IsNotNil() ? spareColor : spareColor32; + if (val.IsNil()) + return new Color(1, 1, 0, 1); + + if (val.Type != DataType.Table) + throw new CYFException("An enemy's spare color must be a table with 3 or 4 numbers: type is " + val.Type.ToString() + "."); + + Table tab = val.Table; + if (tab.Length < 3 || tab.Length > 4) + throw new CYFException("An enemy's spare color must be a table with 3 or 4 numbers: the table has " + tab.Length + " elements."); + + foreach (TablePair p in tab.Pairs) { + if (p.Key.Type != DataType.Number) + throw new CYFException("An enemy's spare color must be a table with 3 or 4 numbers: the table's " + p.Key.ToString() + " value doesn't have a numbered key."); + if (p.Value.Type != DataType.Number) + throw new CYFException("An enemy's spare color must be a table with 3 or 4 numbers: the table's " + p.Key.ToString() + " value is of type " + p.Value.Type.ToString() + "."); + } + + bool is32 = spareColor.IsNil(); + return new Color( + Mathf.Clamp01((float)tab.Get(1).Number / (is32 ? 255 : 1)), + Mathf.Clamp01((float)tab.Get(2).Number / (is32 ? 255 : 1)), + Mathf.Clamp01((float)tab.Get(3).Number / (is32 ? 255 : 1)), + tab.Get(4).Type == DataType.Nil ? 1 : Mathf.Clamp01((float)tab.Get(4).Number / (is32 ? 255 : 1)) + ); + } + } + public float PosX { get { return GetComponent().position.x; } } @@ -248,6 +280,61 @@ public float PosY { get { return GetComponent().position.y; } } + public Vector2 DialogBubblePosition { + get { + RectTransform t = GetComponent(); + Vector2 spr = new Vector2(Mathf.Abs(t.rect.width), t.rect.height); + Vector2 bubSize; + if (DialogBubble == "UI/SpeechBubbles/") { + LuaTextManager text = GetComponentInChildren(); + bubSize = text.GetBubbleSize(); + Vector2 bubbleShift = text.GetBubbleShift(); + Vector2 res; + switch (BubbleSide) { + case BubbleSideEnum.LEFT: res = new Vector2(-spr.x / 2 - bubSize.x - 25, bubSize.y / 2); break; + case BubbleSideEnum.UP: res = new Vector2(-bubSize.x / 2, spr.y / 2 + bubSize.y + 25); break; + case BubbleSideEnum.DOWN: res = new Vector2(-bubSize.x / 2, -spr.y / 2 - 25); break; + default: res = new Vector2(spr.x / 2 + 25, bubSize.y / 2); break; // rightside default + } + return res - bubbleShift; + } + Sprite diagBubbleSpr = SpriteRegistry.Get(DialogBubble); + bubSize = new Vector2(diagBubbleSpr.rect.width, diagBubbleSpr.rect.height); + if (diagBubbleSpr.name.StartsWith("left")) return new Vector2(-spr.x / 2 - bubSize.x - 5, bubSize.y / 2); + if (diagBubbleSpr.name.StartsWith("top")) return new Vector2(-bubSize.x / 2, spr.y / 2 + bubSize.y + 5); + if (diagBubbleSpr.name.StartsWith("bottom")) return new Vector2(-bubSize.x / 2, -spr.y / 2 - 5); + return new Vector2(spr.x / 2 + 5, bubSize.y / 2); // rightside default + } + } + + public BubbleSideEnum BubbleSide { + get { + if (script.GetVar("bubbleside").Type == DataType.Nil) + throw new CYFException("You need to set the value of the variable bubbleside if you want the engine to create a text bubble automatically.\nIts possible values are \"LEFT\", \"RIGHT\", \"UP\", \"DOWN\" or \"NONE\"."); + if (script.GetVar("bubbleside").Type != DataType.String) + throw new CYFException("The bubbleside value can only be \"LEFT\", \"RIGHT\", \"UP\", \"DOWN\" or \"NONE\", but its value isn't a string."); + string s = script.GetVar("bubbleside").String.ToUpper(); + try { + return (BubbleSideEnum)Enum.Parse(typeof(BubbleSideEnum), s); + } catch { throw new CYFException("The bubbleside value can only be \"LEFT\", \"RIGHT\", \"UP\", \"DOWN\" or \"NONE\", but its value is \"" + s.ToUpper() + "\"."); } + } + set { + script.SetVar("bubbleside", DynValue.NewString(value.ToString())); + } + } + + public double BubbleWidth { + get { + if (script.GetVar("bubblewidth").Type != DataType.Number) + throw new CYFException("The bubblewidth value of the monster " + Name + " isn't a number.\nIt must be a number above or equal to 16."); + double val = script.GetVar("bubblewidth").Number; + if (val < 16) + throw new CYFException("The bubblewidth value of the monster " + Name + " is too low (" + val + ").\nIt must be a number above or equal to 16."); + return val; + } + set { script.SetVar("bubblewidth", DynValue.NewNumber(value)); } + } + public void InitializeEnemy() { try { string scriptText = FileLoader.GetScript("Monsters/" + scriptName, StaticInits.ENCOUNTER, "monster"); @@ -269,6 +356,8 @@ public void InitializeEnemy() { script.SetVar("canmove", DynValue.NewBoolean(true)); sprite = LuaSpriteController.GetOrCreate(gameObject); script.SetVar("monstersprite", UserData.Create(sprite, LuaSpriteController.data)); + script.SetVar("bubblesprite", UserData.Create(LuaSpriteController.GetOrCreate(bubbleObject))); + script.SetVar("textobject", UserData.Create(bubbleObject.GetComponentInChildren())); script.DoString(scriptText); string spriteFile = script.GetVar("sprite").String; @@ -281,8 +370,6 @@ public void InitializeEnemy() { if (MaxHP == 0) MaxHP = HP; - textBubbleSprite = Resources.Load("Sprites/UI/SpeechBubbles/right"); - /*if (script.GetVar("canspare") == null) CanSpare = false; if (script.GetVar("cancheck") == null) CanCheck = true;*/ } @@ -294,8 +381,6 @@ public void InitializeEnemy() { public string[] GetDefenseDialog() { DynValue dialogues = script.GetVar("currentdialogue"); - if (dialogues == null) - return null; if (dialogues.Table == null) if (dialogues.String != null) return new[] { dialogues.String }; else if (Dialogue == null) return null; @@ -312,6 +397,73 @@ protected void HandleCustomCommand(string command) { UnitaleUtil.TryCall(script, "HandleCustomCommand", new[] { DynValue.NewString(command) }); } + public void CreateBubble() { + GameObject speechBub = Instantiate(SpriteFontRegistry.BUBBLE_OBJECT); + speechBub.transform.SetParent(transform); + + LuaTextManager sbTextMan = speechBub.GetComponentInChildren(); + sbTextMan.SetCaller(script); + sbTextMan.HideBubble(); + sbTextMan.SetText(DynValue.NewString("")); + sbTextMan.GetComponent().pivot = new Vector2(0, 1); + sbTextMan.adjustTextDisplay = true; + + bubbleObject = speechBub; + } + + public void UpdateBubble(int enemyID) { + LuaTextManager sbTextMan = bubbleObject.GetComponentInChildren(); + + bool usingAutoBubble = DialogBubble == "UI/SpeechBubbles/"; + Image speechBubImg = bubbleObject.GetComponent(); + speechBubImg.enabled = !usingAutoBubble; + + // Bubble management: can be a normal bubble OR an auto bubble from text objects + if (!usingAutoBubble) { + try { SpriteUtil.SwapSpriteFromFile(speechBubImg, DialogBubble, enemyID); } + catch (Exception e) { + UnitaleUtil.DisplayLuaError(scriptName + ": Creating a dialogue bubble", "An error was encountered. It's highly possible the dialogue bubble " + script.GetVar("dialogbubble") + " doesn't exist.\n\nError: " + e.Message); + return; + } + Sprite speechBubSpr = speechBubImg.sprite; + + float xMov = speechBubSpr.border.x; + float yMov = -speechBubSpr.border.w - sbTextMan.font.LineSpacing; + float angle = sbTextMan.rotation * Mathf.Deg2Rad; + sbTextMan.MoveTo((int)(Mathf.Cos(angle) * xMov - Mathf.Sin(angle) * yMov), (int)(Mathf.Sin(angle) * xMov + Mathf.Cos(angle) * yMov)); + speechBubImg.color = new Color(speechBubImg.color.r, speechBubImg.color.g, speechBubImg.color.b, sbTextMan.letters.Count == 0 ? 0 : 1); + + if (bubbleWidth == 0) + bubbleWidth = speechBubSpr.textureRect.width - speechBubSpr.border.x - speechBubSpr.border.z; + + sbTextMan.HideBubble(); + } else { + try { bubbleWidth = (float)BubbleWidth; } + catch (Exception e) { + UnitaleUtil.DisplayLuaError(scriptName + ": Creating a dialogue bubble", e.Message); + return; + } + + if (sbTextMan.letters.Count > 0) sbTextMan.ShowBubble(GetReverseBubbleSide(BubbleSide).ToString(), DynValue.NewString("50%")); + else sbTextMan.HideBubble(); + sbTextMan.MoveTo(0, 0); + } + + sbTextMan._textMaxWidth = (int)bubbleWidth; + speechBubImg.transform.SetAsLastSibling(); + + bubbleObject.GetComponent().anchoredPosition = DialogBubblePosition + offsets[1]; + sbTextMan.Move(0, 0); // Used to even out the text object's position so it's only using integers + + if (Voice != "") + sbTextMan.fontVoice = Voice; + } + + public void HideBubble() { + bubbleObject.GetComponent().enabled = false; + bubbleObject.GetComponentInChildren().HideBubble(); + } + public void Remove() { try { UIController.instance.encounter.enemies.Remove(this); diff --git a/Assets/Scripts/Battle/EnemyEncounter.cs b/Assets/Scripts/Battle/EnemyEncounter.cs index 8af023c06..be1be6cc7 100644 --- a/Assets/Scripts/Battle/EnemyEncounter.cs +++ b/Assets/Scripts/Battle/EnemyEncounter.cs @@ -64,7 +64,9 @@ public DynValue CreateEnemy(string enemyScript, float x, float y) { enemyController.GetComponent().anchoredPosition = new Vector2(x, y); enemyController.script = new ScriptWrapper(); enemies.Add(enemyController); + enemyController.CreateBubble(); enemyController.InitializeEnemy(); + return UserData.Create(enemyController.script); } @@ -99,6 +101,38 @@ public Vector2 ArenaSize { } } + public Color SpareColor { + get { + DynValue spareColor = script.GetVar("sparecolor"); + DynValue spareColor32 = script.GetVar("sparecolor32"); + DynValue val = spareColor.IsNotNil() ? spareColor : spareColor32; + if (val.IsNil()) + return new Color(1, 1, 0, 1); + + if (val.Type != DataType.Table) + throw new CYFException("An enemy's spare color must be a table with 3 or 4 numbers: type is " + val.Type.ToString() + "."); + + Table tab = val.Table; + if (tab.Length < 3 || tab.Length > 4) + throw new CYFException("An enemy's spare color must be a table with 3 or 4 numbers: the table has " + tab.Length + " elements."); + + foreach (TablePair p in tab.Pairs) { + if (p.Key.Type != DataType.Number) + throw new CYFException("An enemy's spare color must be a table with 3 or 4 numbers: the table's " + p.Key.ToString() + " value doesn't have a numbered key."); + if (p.Value.Type != DataType.Number) + throw new CYFException("An enemy's spare color must be a table with 3 or 4 numbers: the table's " + p.Key.ToString() + " value is of type " + p.Value.Type.ToString() + "."); + } + + bool is32 = spareColor.IsNil(); + return new Color( + Mathf.Clamp01((float)tab.Get(1).Number / (is32 ? 255 : 1)), + Mathf.Clamp01((float)tab.Get(2).Number / (is32 ? 255 : 1)), + Mathf.Clamp01((float)tab.Get(3).Number / (is32 ? 255 : 1)), + tab.Get(4).Type == DataType.Nil ? 1 : Mathf.Clamp01((float)tab.Get(4).Number / (is32 ? 255 : 1)) + ); + } + } + protected void LoadEnemiesAndPositions() { AudioSource musicSource = GameObject.Find("Main Camera").GetComponent(); EncounterText = script.GetVar("encountertext").String; @@ -142,6 +176,7 @@ protected void LoadEnemiesAndPositions() { if (enemyCount > enemyPositions.Length) { UnitaleUtil.DisplayLuaError(StaticInits.ENCOUNTER, "All enemies in an encounter must have a screen position defined. Either your enemypositions table is missing, " + "or there are more enemies than available positions. Refer to the documentation's Basic Setup section on how to do this."); + return; } Table luaEnemyTable = script.GetVar("enemies").Table; @@ -176,6 +211,9 @@ public static void BattleDialog(Script scr, DynValue arg) { UnitaleUtil.Warn("BattleDialog can only be used as early as EncounterStarting."); else { UIController.instance.battleDialogueStarted = true; + EnemyController enemy = UIController.instance.encounter.enemies.Find(e => e.script.script == scr); + if (enemy) + UIController.instance.mainTextManager.SetCaller(enemy.script); TextMessage[] msgs = null; if (arg.Type == DataType.String) msgs = new TextMessage[]{new RegularMessage(arg.String)}; @@ -195,13 +233,6 @@ public static void BattleDialog(Script scr, DynValue arg) { if (!GlobalControls.retroMode) UIController.instance.mainTextManager.SetEffect(new TwitchEffect(UIController.instance.mainTextManager)); - // Fetch the script this function has been called from as its caller - foreach (ScriptWrapper scrWrap in ScriptWrapper.instances) { - if (scrWrap.script != scr) continue; - UIController.instance.mainTextManager.SetCaller(scrWrap); - break; - } - UIController.instance.ActionDialogResult(msgs); } } @@ -308,7 +339,7 @@ public void UpdateWave() { try { for (int i = 0; i < waves.Length; i++) { currentScript = waveNames[i]; - try { waves[i].script.Call(waves[i].script.Globals["Update"]); } + try { waves[i].Call("Update"); } catch (InterpreterException ex) { UnitaleUtil.DisplayLuaError(currentScript, UnitaleUtil.FormatErrorSource(ex.DecoratedMessage, ex.Message) + ex.Message); return; @@ -382,7 +413,7 @@ public void EndWave(bool death = false) { if (!death) foreach (DynValue obj in t.Keys) { try { - ((ScriptWrapper)t[obj]).Call("EndingWave"); + (t[obj] as ScriptWrapper).Call("EndingWave"); ScriptWrapper.instances.Remove((ScriptWrapper)t[obj]); } catch { UnitaleUtil.DisplayLuaError(StaticInits.ENCOUNTER, "You shouldn't override Wave, now you get an error :P"); } } @@ -390,6 +421,8 @@ public void EndWave(bool death = false) { foreach (LuaProjectile p in FindObjectsOfType()) if (!p.ctrl.isPersistent) p.ctrl.Remove(); + if (ArenaManager.instance.showWhenWaveEnds) + ArenaManager.instance.Show(); if (!death) CallOnSelfOrChildren("DefenseEnding"); if (GlobalControls.retroMode) diff --git a/Assets/Scripts/Battle/FightUI.cs b/Assets/Scripts/Battle/FightUI.cs index 35326c5b5..fc96dd1ca 100644 --- a/Assets/Scripts/Battle/FightUI.cs +++ b/Assets/Scripts/Battle/FightUI.cs @@ -6,7 +6,6 @@ public class FightUI : MonoBehaviour { public LuaSpriteController slice; public LifeBarController lifeBar; public TextManager damageText; - private RectTransform damageTextRt; public bool shakeInProgress; private int[] shakeX = { 12, -12, 7, -7, 3, -3, 1, -1, 0 }; @@ -18,7 +17,7 @@ public class FightUI : MonoBehaviour { private float totalShakeTime = 1.5f; public float sliceAnimFrequency = 1 / 6f; public EnemyController enemy; - public Vector2 enePos, eneSize; + public Vector2 eneSize; private string[] sliceAnim = { "UI/Battle/spr_slice_o_0", "UI/Battle/spr_slice_o_1", @@ -45,7 +44,6 @@ public void Setup() { lifeBar.SetVisible(false); damageText = transform.GetComponentInChildren(); - damageTextRt = damageText.GetComponent(); damageText.SetFont(SpriteFontRegistry.Get(SpriteFontRegistry.UI_DAMAGETEXT_NAME)); damageText.SetMute(true); @@ -57,6 +55,8 @@ public void Setup() { if (enemy == null) enemy = UIController.instance.encounter.EnabledEnemies[enemyIndex]; transform.SetParent(enemy.transform); + transform.localEulerAngles = Vector3.zero; + GetComponent().anchoredPosition = Vector3.zero; isInit = true; } @@ -107,8 +107,6 @@ private void Update() { return; eneSize = enemy.GetComponent().sizeDelta; - enePos = new Vector2(enemy.GetComponent().position.x - eneSize.x * (Mathf.Abs(enemy.sprite.xpivot) - 0.5f) * Mathf.Sign(enemy.sprite.xscale), - enemy.GetComponent().position.y - eneSize.y * (Mathf.Abs(enemy.sprite.ypivot) - 0.5f) * Mathf.Sign(enemy.sprite.yscale)); if (shakeInProgress) { int shakeidx = (int)Mathf.Floor(shakeTimer * shakeX.Length / totalShakeTime); @@ -118,14 +116,10 @@ private void Update() { shakeIndex = shakeidx; Vector2 localEnePos = enemy.GetComponent().anchoredPosition; // get local position to do the shake enemy.GetComponent().anchoredPosition = new Vector2(localEnePos.x + shakeX[shakeIndex], localEnePos.y); - - /*#if UNITY_STANDALONE_WIN || UNITY_EDITOR_WIN - if (StaticInits.ENCOUNTER == "01 - Two monsters" && StaticInits.MODFOLDER == "Examples") - Misc.MoveWindow(shakeX[shakeIndex] * 2, 0); - #endif*/ } if (shakeTimer < 1.5f) - damageTextRt.position = new Vector3(damageTextRt.position.x, enePos.y - eneSize.y / 2 + enemy.offsets[2].y + 40 * (2 + Mathf.Sin(shakeTimer * Mathf.PI * 0.75f)), 0); + damageText.transform.localPosition = new Vector2(-UnitaleUtil.PredictTextWidth(damageText) / 2 + enemy.offsets[2].x, + -eneSize.y / 2 + enemy.offsets[2].y + 40 * (2 + Mathf.Sin(shakeTimer * Mathf.PI * 0.75f))); shakeTimer += Time.deltaTime; if (shakeTimer >= totalShakeTime) shakeInProgress = false; @@ -148,16 +142,15 @@ private void Update() { else damageTextStr = "[color:c0c0c0]" + enemy.DefenseMissText; } else if (Damage > 0) damageTextStr = "[color:ff0000]" + Damage; else damageTextStr = "[color:00ff00]" + Damage; - damageTextRt.localPosition = new Vector3(0, 0, 0); damageText.SetText(new TextMessage(damageTextStr, false, true)); - damageTextRt.position = new Vector3(enePos.x - UnitaleUtil.CalcTextWidth(damageText) / 2 + enemy.offsets[2].x, enePos.y - eneSize.y / 2 + 40 + enemy.offsets[2].y, 0); + damageText.transform.localPosition = new Vector2(-UnitaleUtil.PredictTextWidth(damageText) / 2 + enemy.offsets[2].x, -eneSize.y / 2 + enemy.offsets[2].y + 40); // initiate lifebar and set lerp to its new health value if (Damage != 0) { int newHP = enemy.HP - Damage; - lifeBar.outline.MoveToAbs(enePos.x + enemy.offsets[2].x - 1, enePos.y - eneSize.y / 2 + 20 + enemy.offsets[2].y - 1); + lifeBar.outline.img.transform.localPosition = new Vector2(enemy.offsets[2].x - 1, -eneSize.y / 2 + 20 + enemy.offsets[2].y - 1); lifeBar.Resize(enemy.GetComponent().rect.width, 13); - lifeBar.SetLerp(enemy.HP / (float)enemy.MaxHP, newHP / (float)enemy.MaxHP); + lifeBar.SetLerpFull(enemy.HP / (float)enemy.MaxHP, newHP / (float)enemy.MaxHP); lifeBar.SetVisible(true); enemy.doDamage(Damage); } @@ -172,7 +165,7 @@ private void Update() { } } else if (slice.isactive && !slice.animcomplete) { slice.img.gameObject.GetComponent().sizeDelta = new Vector2(slice.img.GetComponent().sprite.rect.width, slice.img.GetComponent().sprite.rect.height); - slice.img.GetComponent().position = new Vector2(enePos.x + enemy.offsets[0].x, enePos.y + enemy.offsets[0].y); + slice.img.transform.localPosition = new Vector2(enemy.offsets[0].x, enemy.offsets[0].y); } } } diff --git a/Assets/Scripts/Battle/FightUIController.cs b/Assets/Scripts/Battle/FightUIController.cs index 858763eef..660257f8a 100644 --- a/Assets/Scripts/Battle/FightUIController.cs +++ b/Assets/Scripts/Battle/FightUIController.cs @@ -133,7 +133,7 @@ public float GetAtkMult() { public bool Finished() { if (!stopped) return targetRt.anchoredPosition.x < borderX; - return boundFightUiInstances.All(fight => fight.Finished()); + return boundFightUiInstances.Count == 0 || boundFightUiInstances.All(fight => fight.Finished()); } public void InitFade() { @@ -217,9 +217,7 @@ private void Update() { if (fightUi.enemy.NoAttackMissText != null) smc2.SetText(fightUi.enemy.NoAttackMissText); smc2.transform.SetParent(GameObject.Find("Canvas").transform); - if (fightUi.enemy.NoAttackMissText != null) - smc2.setXPosition(fightUi.enePos.x - 10 * fightUi.enemy.NoAttackMissText.Length + 20); - else smc2.setXPosition(fightUi.enePos.x); + smc2.setPosition(fightUi.transform.position.x, fightUi.transform.position.y + fightUi.eneSize.y / 2 + 40); } InitFade(); } diff --git a/Assets/Scripts/Battle/GameOverBehavior.cs b/Assets/Scripts/Battle/GameOverBehavior.cs index 6ff43252d..b2002a4a2 100644 --- a/Assets/Scripts/Battle/GameOverBehavior.cs +++ b/Assets/Scripts/Battle/GameOverBehavior.cs @@ -89,7 +89,7 @@ public void ResetGameOver() { internalTimer = 0.0f; internalTimerRevive = 0.0f; gameOverFadeTimer = 0.0f; - gameOverTxt.textQueue = null; + gameOverTxt.HideTextObject(); started = false; done = false; exiting = false; @@ -391,7 +391,7 @@ private void Update () { heartShardRelocs[i].y -= 100f * Time.deltaTime; } - if (gameOverTxt.textQueue == null) return; + if (!gameOverTxt.isactive) return; if (!exiting && gameOverTxt.AllLinesComplete() && gameOverTxt.LineCount() != 0) { exiting = true; gameOverFadeTimer = 1.0f; diff --git a/Assets/Scripts/Battle/LifeBarController.cs b/Assets/Scripts/Battle/LifeBarController.cs index 3b7096662..338f00276 100644 --- a/Assets/Scripts/Battle/LifeBarController.cs +++ b/Assets/Scripts/Battle/LifeBarController.cs @@ -37,6 +37,10 @@ public int outlineThickness { } } + public bool isactive { + get { return background.isactive; } + } + /// /// Creates a bar object using its position and size. /// @@ -65,6 +69,11 @@ public static LifeBarController Create(float x, float y, string backgroundSprite lifebar.Start(); lifebar.background.MoveToAbs(x, y); lifebar.SetSprites(backgroundSprite, fillSprite); + + lifebar.background.color = lifebar.fill.color = new float[] { 1, 1, 1 }; + if (lifebar.outlineRt) + lifebar.outline.color = lifebar.background.color; + return lifebar; } @@ -109,16 +118,6 @@ public void SetInstant(float fillValue, bool allowNonClamped = false) { needInstant = true; } - /// - /// Start a linear-time transition from current fill to this value. - /// - /// Value the healthbar should be at when finished, in range of [0.0, 1.0]. - /// Time for the healthbar to reach its destination in frames. - /// True if values outside of the range [0.0, 1.0] should be kept. - public void SetLerp(float fillValue, int time = 60, bool allowNonClamped = false) { - SetLerp(currentFill, fillValue, time, allowNonClamped); - } - /// /// Start a linear-time transition from first value to second value. /// @@ -126,7 +125,7 @@ public void SetLerp(float fillValue, int time = 60, bool allowNonClamped = false /// Value the healthbar should be at when finished, in range of [0.0, 1.0]. /// Time for the healthbar to reach its destination in frames. /// True if values outside of the range [0.0, 1.0] should be kept. - public void SetLerp(float originalValue, float fillValue, int time = 60, bool allowNonClamped = false) { + public void SetLerpFull(float originalValue, float fillValue, int time = 60, bool allowNonClamped = false) { fillLinearTime = time / 60f; if (!allowNonClamped) { @@ -142,6 +141,16 @@ public void SetLerp(float originalValue, float fillValue, int time = 60, bool al inLerp = true; } + /// + /// Start a linear-time transition from the current value to a given value. + /// + /// Value the healthbar should be at when finished, in range of [0.0, 1.0]. + /// Time for the healthbar to reach its destination in frames. + /// True if values outside of the range [0.0, 1.0] should be kept. + public void SetLerp(float fillValue, int time = 60, bool allowNonClamped = false) { + SetLerpFull(currentFill, fillValue, time, allowNonClamped); + } + /// /// Adds an outline with a given color to the bar object. /// Don't forget to move the outline from now on, not the background! @@ -151,6 +160,7 @@ public void SetLerp(float originalValue, float fillValue, int time = 60, bool al /// Green color of the outline. /// Blue color of the outline. public void AddOutline(int thickness, float r = 0, float g = 0, float b = 0) { + if (!isactive) return; if (outlineRt) RemoveOutline(); outline = (LuaSpriteController)SpriteUtil.MakeIngameSprite("bar-px", -1).UserData.Object; @@ -174,6 +184,7 @@ public void AddOutline(int thickness, float r = 0, float g = 0, float b = 0) { /// Removes the bar object's outline if it has one. /// public void RemoveOutline() { + if (!isactive) return; if (!outlineRt) return; backgroundRt.SetParent(outlineRt.parent); backgroundRt.SetSiblingIndex(outlineRt.GetSiblingIndex()); @@ -190,6 +201,7 @@ public void RemoveOutline() { /// New y scale of the bar object. /// True of the outline should be resized as well. public void Resize(float width, float height, bool updateOutline = true) { + if (!isactive) return; // Update the position and size of the outline if (outlineRt && updateOutline) { outline.Scale((width + outlineThickness * 2) * background.width / outline.width, (height + outlineThickness * 2) * background.height / outline.height); @@ -212,6 +224,7 @@ public void Resize(float width, float height, bool updateOutline = true) { /// New sprite for the bar object's mask. Will do nothing if null or empty. /// New sprite for the bar object's background. Will do nothing if there's no outline, or if null or empty. public void SetSprites(string bgSprite, string fSprite = null, string mSprite = null, string oSprite = null) { + if (!isactive) return; background.Set(bgSprite); fill.Set(string.IsNullOrEmpty(fSprite) ? bgSprite : fSprite); if (!string.IsNullOrEmpty(mSprite)) mask.Set(mSprite); @@ -224,6 +237,7 @@ public void SetSprites(string bgSprite, string fSprite = null, string mSprite = /// /// Color for present health. [MoonSharpHidden] public void SetFillColor(Color c) { + if (!isactive) return; fill.color = new[] { c.r, c.g, c.b, c.a }; } @@ -232,6 +246,7 @@ [MoonSharpHidden] public void SetFillColor(Color c) { /// /// Color for missing health. [MoonSharpHidden] public void SetBackgroundColor(Color c) { + if (!isactive) return; background.color = new[] { c.r, c.g, c.b, c.a }; } @@ -240,6 +255,7 @@ [MoonSharpHidden] public void SetBackgroundColor(Color c) { /// /// True for visible, false for hidden. public void SetVisible(bool visible) { + if (!isactive) return; foreach (Image img in (outlineRt ?? backgroundRt).GetComponentsInChildren()) img.enabled = visible; } @@ -248,6 +264,7 @@ public void SetVisible(bool visible) { /// Destroys this bar object's instance. /// public void Remove() { + if (!isactive) return; if (this == UIStats.instance.lifebar) throw new CYFException("You can't remove the player's lifebar!"); if (hasOutline) outline.Remove(); background.Remove(); @@ -257,6 +274,7 @@ public void Remove() { /// Takes care of moving the healthbar to its intended position. /// private void Update() { + if (!isactive) return; if (!needInstant) { if (!inLerp) return; diff --git a/Assets/Scripts/Battle/StationaryMissScript.cs b/Assets/Scripts/Battle/StationaryMissScript.cs index 07c2a5850..d98e67324 100644 --- a/Assets/Scripts/Battle/StationaryMissScript.cs +++ b/Assets/Scripts/Battle/StationaryMissScript.cs @@ -4,18 +4,19 @@ /// Fairly hacky way for the static MISS to appear over enemies if you don't press the attack button. /// public class StationaryMissScript : MonoBehaviour { + private TextManager mgr; private const float secondsToDespawn = 1.5f; private float despawnTimer; public string text = "MISS"; - public void setXPosition(float xpos) { - GetComponent().position = new Vector2(xpos - 55, 430); // 55 is the the fairly static 1/2 width of the miss text + public void setPosition(float xPos, float yPos) { + mgr.transform.position = new Vector2(xPos - UnitaleUtil.PredictTextWidth(mgr) / 2, Mathf.Min(yPos, 430)); } public void SetText(string _text) { text = _text; } - private void Start () { - TextManager mgr = GetComponent(); + private void Awake() { + mgr = GetComponent(); mgr.SetFont(SpriteFontRegistry.Get(SpriteFontRegistry.UI_DAMAGETEXT_NAME)); mgr.SetText(new TextMessage("[color:c0c0c0]" + text, false, true)); } diff --git a/Assets/Scripts/Battle/UIController.cs b/Assets/Scripts/Battle/UIController.cs index b4bf8a5ec..84d57ac58 100644 --- a/Assets/Scripts/Battle/UIController.cs +++ b/Assets/Scripts/Battle/UIController.cs @@ -1,7 +1,6 @@ using System; using System.Collections; using System.Collections.Generic; -using System.IO; using System.Linq; using MoonSharp.Interpreter; using UnityEngine; @@ -21,25 +20,25 @@ /// public class UIController : MonoBehaviour { public static UIController instance; // The instance of this class, only one UIController should exist at all times - public TextManager mainTextManager; // Main text manager in the arena + public LuaTextManager mainTextManager; // Main text manager in the arena - public static Sprite fightButtonSprite, actButtonSprite, itemButtonSprite, mercyButtonSprite; // UI button sprites when the soul is selecting them + public static Sprite fightButtonSprite, actButtonSprite, itemButtonSprite, mercyButtonSprite; // UI button sprites when the soul is selecting them public Image fightButton, actButton, itemButton, mercyButton; // UI button objects in the scene - public Actions action = Actions.FIGHT; // Current action chosen when entering the state ENEMYSELECT + public Actions action = Actions.FIGHT; // Current action chosen when entering the state ENEMYSELECT public Actions forcedAction = Actions.NONE; // Action forced by the user previously for the next time we enter the state ENEMYSELECT - private GameObject arenaParent; // Arena's parent, which will be used to manipulate it + public GameObject arenaParent; // Arena's parent, which will be used to manipulate it public GameObject psContainer; // Container for any particle effect used when using sprite.Dust() and when sparing or killing an enemy private AudioSource uiAudio; // AudioSource only used to play the sound menumove when the Player moves in menus - internal EnemyEncounter encounter; // Main encounter script + internal EnemyEncounter encounter; // Main encounter script [HideInInspector] public FightUIController fightUI; // Main Player attack handler - private readonly Vector2 initialHealthPos = new Vector2(250, -10); // Initial health bar position for target selection + private readonly Vector2 initialHealthPos = new Vector2(250, -2); // Initial health bar position for target selection - public TextManager[] monsterDialogues; // Enemies' dialogue bubbles' text objects appearing in the state ENEMYDIALOGUE - public int[] monsterDialogueEnemyID; // Stores the ID of the associated enemy + public LuaTextManager[] monsterDialogues = new LuaTextManager[0]; // Enemies' dialogue bubbles' text objects appearing in the state ENEMYDIALOGUE + public EnemyController[] monsterDialogueEnemy; // Stores the enemies associated with the dialogue bubbles private bool musicPausedFromRunning; // Used to pause the BGM when trying to flee in retromode for a comedic effect private int runAwayAttempts; // Amount of times the Player tried to flee unsuccessfully in this encounter @@ -61,14 +60,12 @@ public class UIController : MonoBehaviour { private string stateAfterDialogs = "DEFENDING"; // State to enter after the current arena dialogue is done. Only used after a proper call to BattleDialog() private string lastNewState = "UNUSED"; // Allows the detection of state changes during an OnDeath() call so the engine can switch to it properly - private readonly Vector2 upperLeft = new Vector2(-255, 100); // Coordinates of the first choice in a choice text - private bool encounterHasUpdate; // True if the encounter has an Update function, false otherwise private bool parentStateCall = true; // Used to stop the execution of a previous State() call if a new call has been done and to prevent infinite EnteringState() loops private bool childStateCalled; // Used to stop the execution of a previous State() call if a new call has been done and to prevent infinite EnteringState() loops private bool fleeSwitch; // True if the Player fled, and the encounter can be ended - public Dictionary messages; // Stores the messages enemies will say in the state ENEMYDIALOGUE + public List messages = new List(); // Stores the messages enemies will say in the state ENEMYDIALOGUE public bool[] readyToNextLine; // Used to know which enemy bubbles are done displaying their text - public bool needOnDeath; // Used to force the check on whether the enemies are dead or not + public bool checkDeathCall; // Used to force the check on whether the enemies are dead or not private bool onDeathSwitch; // Allows to switch to a given state if State() was used in OnDeath() public bool stateSwitched; // True if the state has been changed this frame, false otherwise public bool battleDialogueStarted; // True if the battle dialog is being displayed, false otherwise. Only used for the state ITEMMENU, and not updated outside of it @@ -127,6 +124,7 @@ public static void EndBattle(bool fromGameOver = false) { if (GlobalControls.modDev) //Empty the inventory if not in the overworld Inventory.inventory.Clear(); Inventory.RemoveAddedItems(); + KeyboardInput.ResetEncounterInputs(); if (GlobalControls.modDev) PlayerCharacter.instance.MaxHPShift = 0; PlayerCharacter.instance.ATK = 8 + 2 * PlayerCharacter.instance.LV; @@ -157,6 +155,7 @@ public static void EndBattle(bool fromGameOver = false) { LuaScriptBinder.ClearBattleVar(); GlobalControls.stopScreenShake = true; + Cursor.visible = true; MusicManager.hiddenDictionary.Clear(); if (GlobalControls.modDev) { List toDelete = NewMusicManager.audioname.Keys.Where(str => str != "src").ToList(); @@ -291,13 +290,9 @@ public void SwitchState(string newState, bool first = false) { if (newState == "DEFENDING" || newState == "ENEMYDIALOGUE") { PlayerController.instance.setControlOverride(newState != "DEFENDING"); - mainTextManager.DestroyChars(); + mainTextManager.SetText(DynValue.NewString("")); PlayerController.instance.SetPosition(ArenaManager.instance.currentX, ArenaManager.instance.currentY + 70, true); PlayerController.instance.GetComponent().enabled = true; - fightButton.overrideSprite = null; - actButton.overrideSprite = null; - itemButton.overrideSprite = null; - mercyButton.overrideSprite = null; mainTextManager.SetPause(true); } else if ((state == "DEFENDING" || state == "ENEMYDIALOGUE") && newState != "DEFENDING" && newState != "ENEMYDIALOGUE") { ArenaManager.instance.ResetArena(); @@ -309,14 +304,19 @@ public void SwitchState(string newState, bool first = false) { foreach (LifeBarController lbc in arenaParent.GetComponentsInChildren()) Destroy(lbc.gameObject); else if (state == "ENEMYDIALOGUE") { - TextManager[] textManagers = FindObjectsOfType(); - foreach (TextManager textManager in textManagers) - if (textManager.gameObject.name.StartsWith("DialogBubble")) // game object name is hardcoded as it won't change - Destroy(textManager.gameObject); - } else if (state == "DIALOGRESULT") - mainTextManager.SetCaller(EnemyEncounter.script); - else if (state == "ATTACKING") + foreach (EnemyController enemy in encounter.enemies) { + enemy.HideBubble(); + if (!enemy.bubbleObject) + continue; + LuaTextManager sbTextMan = enemy.bubbleObject.GetComponentInChildren(); + if (!sbTextMan) + continue; + sbTextMan.HideTextObject(); + } + } else if (state == "ATTACKING") FightUIController.instance.HideAttackingUI(); + else if (state == "DIALOGRESULT") + mainTextManager.SetCaller(EnemyEncounter.script); string oldState = state; state = newState; @@ -329,6 +329,9 @@ public void SwitchState(string newState, bool first = false) { return; } + mainTextManager.SetMugshot(DynValue.NewNil()); + SetPlayerOnAction(action); + switch (state) { case "ATTACKING": // Error for no active enemies @@ -340,7 +343,7 @@ public void SwitchState(string newState, bool first = false) { foreach (EnemyController enemy in encounter.EnabledEnemies) FightUIController.instance.DestroyAllAttackInstances(enemy); - mainTextManager.DestroyChars(); + mainTextManager.SetText(DynValue.NewString("")); PlayerController.instance.GetComponent().enabled = false; if (!fightUI.multiHit) { fightUI.targetIDs = new[] { selectedEnemy }; @@ -354,7 +357,6 @@ public void SwitchState(string newState, bool first = false) { forcedAction = Actions.NONE; PlayerController.instance.setControlOverride(true); PlayerController.instance.GetComponent().enabled = true; - SetPlayerOnAction(action); mainTextManager.SetPause(ArenaManager.instance.isResizeInProgress()); if (!GlobalControls.retroMode) { mainTextManager.SetEffect(new TwitchEffect(mainTextManager)); @@ -378,7 +380,7 @@ public void SwitchState(string newState, bool first = false) { SetPlayerOnSelection(selectedAction); if (!GlobalControls.retroMode) mainTextManager.SetEffect(new TwitchEffect(mainTextManager)); - mainTextManager.SetText(new SelectMessage(actions, false)); + mainTextManager.SetText(new SelectMessage(GetActPage(actions, 0, mainTextManager.columnNumber), false, mainTextManager.columnNumber)); break; case "ITEMMENU": @@ -387,11 +389,11 @@ public void SwitchState(string newState, bool first = false) { if (Inventory.inventory.Count == 0) throw new CYFException("Cannot enter state ITEMMENU with empty inventory."); else { - string[] items = GetInventoryPage(0); + string[] items = GetInventoryPage(0, mainTextManager.columnNumber); selectedItem = 0; if (!GlobalControls.retroMode) mainTextManager.SetEffect(new TwitchEffect(mainTextManager)); - mainTextManager.SetText(new SelectMessage(items, false)); + mainTextManager.SetText(new SelectMessage(items, false, mainTextManager.columnNumber)); SetPlayerOnSelection(0); /*ActionDialogResult(new TextMessage[] { new TextMessage("Can't open inventory.\nClogged with pasta residue.", true, false), @@ -412,14 +414,16 @@ public void SwitchState(string newState, bool first = false) { selectedMercy = 0; string[] mercyOptions = new string[1 + (encounter.CanRun ? 1 : 0)]; mercyOptions[0] = "Spare"; - if (encounter.EnabledEnemies.Any(enemy => enemy.CanSpare)) - mercyOptions[0] = "[starcolor:ffff00][color:ffff00]" + mercyOptions[0] + "[color:ffffff]"; + if (encounter.EnabledEnemies.Any(enemy => enemy.CanSpare)) { + string hexColor = ParseUtil.GetBytesFromColor(encounter.SpareColor, true); + mercyOptions[0] = "[alpha:" + hexColor.Substring(6) + "][starcolor:" + hexColor.Substring(0, 6) + "][color:" + hexColor.Substring(0, 6) + "]" + mercyOptions[0] + "[color:ffffff]"; + } if (encounter.CanRun) mercyOptions[1] = "Flee"; - SetPlayerOnSelection(0); if (!GlobalControls.retroMode) mainTextManager.SetEffect(new TwitchEffect(mainTextManager)); - mainTextManager.SetText(new SelectMessage(mercyOptions, true)); + mainTextManager.SetText(new SelectMessage(mercyOptions, true, mainTextManager.columnNumber)); + SetPlayerOnSelection(0); break; case "ENEMYSELECT": @@ -427,27 +431,13 @@ public void SwitchState(string newState, bool first = false) { if (encounter.EnabledEnemies.Length == 0) throw new CYFException("Cannot enter state ENEMYSELECT with no active enemies."); - string[] names = new string[encounter.EnabledEnemies.Length]; - string[] colorPrefixes = new string[names.Length]; - for (int i = 0; i < encounter.EnabledEnemies.Length; i++) { - names[i] = encounter.EnabledEnemies[i].Name; - if (encounter.EnabledEnemies[i].CanSpare) - colorPrefixes[i] = "[color:ffff00]"; - } - if (encounter.EnabledEnemies.Length > 3) { - selectedEnemy = 0; - string[] newNames = new string[3]; - newNames[0] = names[0]; - newNames[1] = names[1]; - colorPrefixes[2] = ""; - newNames[2] = "\tPAGE 1"; - names = newNames; - } - for (int i = 0; i < names.Length; i++) - names[i] += "[color:ffffff]"; if (!GlobalControls.retroMode) mainTextManager.SetEffect(new TwitchEffect(mainTextManager)); - mainTextManager.SetText(new SelectMessage(names, true, colorPrefixes)); + + int enemyPage = encounter.EnabledEnemies.Length <= 3 ? 0 : selectedEnemy / 2; + string[] colors; + string[] textTemp = GetEnemyPage(enemyPage, mainTextManager.columnNumber, out colors); + mainTextManager.SetText(new SelectMessage(textTemp, false, mainTextManager.columnNumber, colors)); if (forcedAction != Actions.FIGHT && forcedAction != Actions.ACT) forcedAction = action; if (forcedAction == Actions.FIGHT) { @@ -464,7 +454,7 @@ public void SwitchState(string newState, bool first = false) { count++; //int mNameWidth = (int)UnitaleUtil.calcTotalLength(mainTextManager, lastCount, count); for (int j = 0; j <= 1 && j < encounter.EnabledEnemies.Length; j++) { - int mNameWidth = (int)UnitaleUtil.CalcTextWidth(mainTextManager) + 50; + int mNameWidth = (int)UnitaleUtil.PredictTextWidth(mainTextManager) + 50; if (mNameWidth > maxWidth) maxWidth = mNameWidth; } @@ -473,19 +463,13 @@ public void SwitchState(string newState, bool first = false) { if (encounter.EnabledEnemies.Length > 3) if (i > 1) break; - LifeBarController lifeBar = LifeBarController.Create(0, 0, 90); - lifeBar.transform.SetParent(mainTextManager.transform); - lifeBar.transform.SetAsFirstSibling(); - lifeBar.background.MoveTo(maxWidth, initialHealthPos.y - i * mainTextManager.Charset.LineSpacing); - lifeBar.SetFillColor(Color.green); - float hpDivide = encounter.EnabledEnemies[i].HP / (float)encounter.EnabledEnemies[i].MaxHP; - lifeBar.SetInstant(hpDivide, encounter.EnabledEnemies[i].HP < 0); + RenewLifeBars(encounter.EnabledEnemies.Length > 3 ? selectedEnemy / 2 : 0); } } if (selectedEnemy >= encounter.EnabledEnemies.Length) selectedEnemy = 0; - SetPlayerOnSelection(selectedEnemy * 2); // single list so skip right row by multiplying x2 + SetPlayerOnSelection((encounter.EnabledEnemies.Length > 3 ? selectedEnemy % 2 : selectedEnemy) * mainTextManager.columnNumber); // single list so skip right row by multiplying x2 break; case "DEFENDING": @@ -508,50 +492,22 @@ public void SwitchState(string newState, bool first = false) { encounter.CallOnSelfOrChildren("EnemyDialogueStarting"); if (state != "ENEMYDIALOGUE") return; - monsterDialogues = new TextManager[encounter.EnabledEnemies.Length]; - monsterDialogueEnemyID = new int[encounter.EnabledEnemies.Length]; - readyToNextLine = new bool[encounter.enemies.Count]; - // TODO: Try to merge this and the other bubble-related code block + monsterDialogues = new LuaTextManager[encounter.EnabledEnemies.Length]; + monsterDialogueEnemy = new EnemyController[encounter.EnabledEnemies.Length]; + messages.Clear(); for (int i = 0; i < encounter.EnabledEnemies.Length; i++) { - messages.Remove(i); - messages.Add(i, encounter.EnabledEnemies[i].GetDefenseDialog()); + messages.Add(encounter.EnabledEnemies[i].GetDefenseDialog()); string[] message = messages[i]; if (message == null) { UnitaleUtil.Warn("Entered ENEMYDIALOGUE, but no current/random dialogue was set for " + encounter.EnabledEnemies[i].Name); SwitchState("DEFENDING"); break; } - GameObject speechBub = Instantiate(SpriteFontRegistry.BUBBLE_OBJECT); - //RectTransform enemyRt = encounter.enabledEnemies[i].GetComponent(); - TextManager sbTextMan = speechBub.GetComponent(); - monsterDialogues[i] = sbTextMan; - monsterDialogueEnemyID[i] = encounter.enemies.IndexOf(encounter.EnabledEnemies[i]); - sbTextMan.SetCaller(encounter.EnabledEnemies[i].script); - Image speechBubImg = speechBub.GetComponent(); - - // error catcher - try { SpriteUtil.SwapSpriteFromFile(speechBubImg, encounter.EnabledEnemies[i].DialogBubble, i); } - catch { - if (encounter.EnabledEnemies[i].DialogBubble != "UI/SpeechBubbles/") - UnitaleUtil.DisplayLuaError(encounter.EnabledEnemies[i].scriptName + ": Creating a dialogue bubble", - "The dialogue bubble \"" + encounter.EnabledEnemies[i].script.GetVar("dialogbubble") + "\" doesn't exist."); - else - UnitaleUtil.DisplayLuaError(encounter.EnabledEnemies[i].scriptName + ": Creating a dialogue bubble", - "This monster has no set dialogue bubble."); - return; - } - sbTextMan._textMaxWidth = (int)encounter.EnabledEnemies[i].bubbleWidth; - Sprite speechBubSpr = speechBubImg.sprite; - // TODO improve position setting/remove hardcoding of position setting - bool reversedX = encounter.EnabledEnemies[i].sprite.xscale < 0, - reversedY = encounter.EnabledEnemies[i].sprite.yscale < 0; - - speechBub.transform.SetParent(encounter.EnabledEnemies[i].transform); - speechBub.GetComponent().anchorMin = speechBub.GetComponent().anchorMax = new Vector2(0.5f, 0.5f); - speechBub.GetComponent().anchoredPosition = new Vector3((encounter.EnabledEnemies[i].DialogBubblePosition.x + encounter.EnabledEnemies[i].offsets[1].x) * (reversedX ? -1 : 1), - (encounter.EnabledEnemies[i].DialogBubblePosition.y + encounter.EnabledEnemies[i].offsets[1].y) * (reversedY ? -1 : 1)); - sbTextMan.SetOffset(speechBubSpr.border.x, -speechBubSpr.border.w); + GameObject speechBub = encounter.EnabledEnemies[i].bubbleObject; + LuaTextManager sbTextMan = speechBub.GetComponentInChildren(); + monsterDialogues[i] = sbTextMan; + monsterDialogueEnemy[i] = encounter.EnabledEnemies[i]; UnderFont enemyFont = SpriteFontRegistry.Get(encounter.EnabledEnemies[i].Font ?? string.Empty) ?? SpriteFontRegistry.Get(SpriteFontRegistry.UI_MONSTERTEXT_NAME); sbTextMan.SetFont(enemyFont); @@ -560,14 +516,13 @@ public void SwitchState(string newState, bool first = false) { for (int j = 0; j < monsterMessages.Length; j++) monsterMessages[j] = new MonsterMessage(encounter.EnabledEnemies[i].DialoguePrefix + message[j]); + // UpdateBubble run twice: once to feed the bubble's width to spawn the text properly, + // once to update the bubble's visibility after the text has been spawned + encounter.EnabledEnemies[i].UpdateBubble(i); sbTextMan.SetTextQueue(monsterMessages); - speechBubImg.color = new Color(speechBubImg.color.r, speechBubImg.color.g, speechBubImg.color.b, sbTextMan.letterReferences.Count(ltr => ltr != null) == 0 ? 0 : 1); - - speechBub.GetComponent().enabled = true; - if (encounter.EnabledEnemies[i].Voice != "") - sbTextMan.letterSound = encounter.EnabledEnemies[i].Voice; - encounter.EnabledEnemies[i].bubbleObject = speechBub; + encounter.EnabledEnemies[i].UpdateBubble(i); } + readyToNextLine = encounter.enemies.Select(e => !monsterDialogueEnemy.Contains(e)).ToArray(); break; case "DONE": @@ -614,7 +569,6 @@ private void Awake() { mercyButtonSprite = SpriteRegistry.Get("UI/Buttons/mercybt_1"); } - arenaParent = GameObject.Find("arena_border_outer"); //canvasParent = GameObject.Find("Canvas"); uiAudio = GetComponent(); uiAudio.clip = AudioClipRegistry.GetSound("menumove"); @@ -622,209 +576,133 @@ private void Awake() { instance = this; } - public void UpdateBubble() { - for (int i = 0; i < encounter.enemies.Count; i++) { - try { - EnemyController enemy = encounter.enemies[i]; - if (!enemy.bubbleObject) - continue; - int monsterDialogueID = Array.IndexOf(monsterDialogueEnemyID, i); - if (monsterDialogues[monsterDialogueID] == null) { - readyToNextLine[i] = true; - continue; - } - - if (monsterDialogues[monsterDialogueID].currentLine >= monsterDialogues[monsterDialogueID].LineCount()) { - readyToNextLine[i] = true; - continue; - } - - GameObject speechBub = enemy.bubbleObject; - TextManager sbTextMan = speechBub.GetComponent(); - sbTextMan._textMaxWidth = (int)enemy.bubbleWidth; - readyToNextLine[i] = false; - Image speechBubImg = speechBub.GetComponent(); - speechBubImg.color = new Color(speechBubImg.color.r, speechBubImg.color.g, speechBubImg.color.b, sbTextMan.letterReferences.Count(ltr => ltr != null) == 0 ? 0 : 1); - - SpriteUtil.SwapSpriteFromFile(speechBubImg, enemy.DialogBubble, monsterDialogueID); - Sprite speechBubSpr = speechBubImg.sprite; - sbTextMan.SetOffset(speechBubSpr.border.x, -speechBubSpr.border.w); - - bool reversedX = enemy.sprite.xscale < 0, - reversedY = enemy.sprite.yscale < 0; - speechBub.GetComponent().anchorMin = speechBub.GetComponent().anchorMax = new Vector2(0.5f, 0.5f); - speechBub.GetComponent().anchoredPosition = new Vector3((enemy.DialogBubblePosition.x + enemy.offsets[1].x) * (reversedX ? -1 : 1), - (enemy.DialogBubblePosition.y + enemy.offsets[1].y) * (reversedY ? -1 : 1)); - if (enemy.Voice != "") - sbTextMan.letterSound = enemy.Voice; - } catch (Exception e) { - throw new CYFException("Error while updating monster #" + i + ": \n" + e.Message + "\n\n" + e.StackTrace); - } - } - } - private void UpdateMonsterDialogue() { - bool allGood = true; for (int i = 0; i < monsterDialogues.Length; i++) { - if (readyToNextLine[monsterDialogueEnemyID[i]]) continue; - if (monsterDialogues[i] == null) { - readyToNextLine[monsterDialogueEnemyID[i]] = true; + int enemyIndex = encounter.enemies.IndexOf(monsterDialogueEnemy[i]); + if (monsterDialogues[i] == null || !monsterDialogues[i].isactive) { + readyToNextLine[enemyIndex] = true; continue; } - if (monsterDialogues[i].CanAutoSkip()) { - readyToNextLine[monsterDialogueEnemyID[i]] = true; - DoNextMonsterDialogue(false, i); - } + if (monsterDialogues[i].CanAutoSkipAll()) { - for (int j = 0; j < monsterDialogues.Length; j++) - readyToNextLine[monsterDialogueEnemyID[j]] = true; DoNextMonsterDialogue(); return; } - - if ((!monsterDialogues[i].AllLinesComplete() || monsterDialogues[i].LineCount() == 0) && !monsterDialogues[i].CanAutoSkipThis() && (monsterDialogues[i].AllLinesComplete() || !monsterDialogues[i].LineComplete())) { - allGood = false; + if (monsterDialogues[i].CanAutoSkip()) { + DoNextMonsterDialogue(i); continue; } + if (readyToNextLine[enemyIndex]) + continue; - readyToNextLine[monsterDialogueEnemyID[i]] = true; + if (monsterDialogues[i] == null || monsterDialogues[i].CanSkipToNextLine() || monsterDialogues[i].LineComplete()) + readyToNextLine[enemyIndex] = true; } - - if (!allGood) return; - for (int i = 0; i < readyToNextLine.Length; i++) - readyToNextLine[i] = true; } - public void DoNextMonsterDialogue(bool singleLineAll = false, int index = -1) { - bool complete = true, foiled = false; + public void DoNextMonsterDialogue(int index = -1) { + bool someTextsHaveLinesLeft = false; if (index != -1) { - if (monsterDialogues[index] == null) + // Forcefully skips only one monster text object + if (!monsterDialogues[index]) return; if (monsterDialogues[index].HasNext()) { - FileInfo fi = new FileInfo(FileLoader.PathToDefaultFile("Sprites/" + encounter.EnabledEnemies[index].DialogBubble + ".png")); - if (!fi.Exists) - fi = new FileInfo(FileLoader.PathToModFile("Sprites/" + encounter.EnabledEnemies[index].DialogBubble + ".png")); - if (!fi.Exists) - UnitaleUtil.Warn("The bubble " + encounter.EnabledEnemies[index].DialogBubble + ".png doesn't exist."); - else { - Sprite speechBubSpr = SpriteUtil.FromFile(encounter.EnabledEnemies[index].DialogBubble + ".png"); - monsterDialogues[index].SetOffset(speechBubSpr.border.x, -speechBubSpr.border.w); - } monsterDialogues[index].NextLineText(); - complete = false; + monsterDialogueEnemy[index].UpdateBubble(index); } else { - monsterDialogues[index].DestroyChars(); - Destroy(monsterDialogues[index].gameObject); - foreach (TextManager textManager in monsterDialogues) - if (textManager != null) - complete = false; + monsterDialogues[index].HideTextObject(); + monsterDialogueEnemy[index].HideBubble(); + readyToNextLine[index] = true; } - } else if (!singleLineAll) + + foreach (LuaTextManager mgr in monsterDialogues) + if (mgr != null && mgr.isactive && mgr.HasNext()) + someTextsHaveLinesLeft = true; + } else { for (int i = 0; i < monsterDialogues.Length; i++) { - if (monsterDialogues[i] == null) + EnemyController enemy = monsterDialogueEnemy[i]; + if (!enemy.bubbleObject) continue; - - if (monsterDialogues[i].AllLinesComplete() && monsterDialogues[i].LineCount() != 0 || (!monsterDialogues[i].HasNext() && readyToNextLine[i])) { - monsterDialogues[i].DestroyChars(); - Destroy(monsterDialogues[i].gameObject); // this text manager's game object is a dialog bubble and should be destroyed at this point + LuaTextManager sbTextMan = enemy.bubbleObject.GetComponentInChildren(); + if (!sbTextMan) continue; + + if (sbTextMan.HasNext()) { + sbTextMan.NextLineText(); + enemy.UpdateBubble(i); + someTextsHaveLinesLeft = true; + } else { + sbTextMan.HideTextObject(); + enemy.HideBubble(); } - complete = false; - - // part that autoskips text if [nextthisnow] or [finished] is introduced - if (monsterDialogues[i].CanAutoSkipThis() || monsterDialogues[i].CanAutoSkip()) { - if (monsterDialogues[i].HasNext()) { - FileInfo fi = new FileInfo(FileLoader.PathToDefaultFile("Sprites/" + encounter.EnabledEnemies[i].DialogBubble + ".png")); - if (!fi.Exists) - fi = new FileInfo(FileLoader.PathToModFile("Sprites/" + encounter.EnabledEnemies[i].DialogBubble + ".png")); - if (!fi.Exists) { - Debug.LogError("The bubble " + encounter.EnabledEnemies[i].DialogBubble + ".png doesn't exist."); - } else { - Sprite speechBubSpr = SpriteUtil.FromFile(encounter.EnabledEnemies[i].DialogBubble + ".png"); - monsterDialogues[i].SetOffset(speechBubSpr.border.x, -speechBubSpr.border.w); - } - monsterDialogues[i].NextLineText(); - } else { - monsterDialogues[i].DestroyChars(); - Destroy(monsterDialogues[i].gameObject); // code duplication? in my source? it's more likely than you think - if (!foiled) - complete = true; - continue; - } - } else if (readyToNextLine[monsterDialogueEnemyID[i]]) { - FileInfo fi = new FileInfo(FileLoader.PathToDefaultFile("Sprites/" + encounter.EnabledEnemies[i].DialogBubble + ".png")); - if (!fi.Exists) - fi = new FileInfo(FileLoader.PathToModFile("Sprites/" + encounter.EnabledEnemies[i].DialogBubble + ".png")); - if (!fi.Exists) { - Debug.LogError("The bubble " + encounter.EnabledEnemies[i].DialogBubble + ".png doesn't exist."); - } else { - Sprite speechBubSpr = SpriteUtil.FromFile(encounter.EnabledEnemies[i].DialogBubble + ".png"); - monsterDialogues[i].SetOffset(speechBubSpr.border.x, -speechBubSpr.border.w); - } - monsterDialogues[i].NextLineText(); - } - foiled = true; } - if (!complete) - UpdateBubble(); - // looping through the same list three times? there's a reason this class is the most in need of redoing - // either way, after doing everything required, check which text manager has the longest text now and mute all others - int longestTextLen = 0; - int longestTextMgrIndex = -1; - for (int i = 0; i < monsterDialogues.Length; i++) { - if (monsterDialogues[i] == null) continue; - monsterDialogues[i].SetMute(true); - if (monsterDialogues[i].AllLinesComplete() || monsterDialogues[i].letterReferences.Length <= longestTextLen) continue; - longestTextLen = monsterDialogues[i].letterReferences.Length - monsterDialogues[i].currentReferenceCharacter; - longestTextMgrIndex = i; } - if (longestTextMgrIndex > -1) - monsterDialogues[longestTextMgrIndex].SetMute(false); + if (someTextsHaveLinesLeft) { + for (int i = 0; i < monsterDialogues.Length; i++) + readyToNextLine[encounter.enemies.IndexOf(monsterDialogueEnemy[i])] = monsterDialogues[i] == null || monsterDialogues[i].LineComplete(); + return; + } - if (!complete) return; // break if we're not done with all text if (encounter.EnabledEnemies.Length <= 0) return; encounter.CallOnSelfOrChildren("EnemyDialogueEnding"); if (state == "ENEMYDIALOGUE") SwitchState("DEFENDING"); } - private static string[] GetInventoryPage(int page) { - int invCount = 0; - for (int i = page * 4; i < page * 4 + 4; i++) { - if (Inventory.inventory.Count <= i) break; - invCount++; + private string[] GetActPage(string[] acts, int page, int columns) { + string[] items = new string[3 * columns]; + + int actsPerPage = 3 * columns; + int maxPages = Mathf.CeilToInt(acts.Length / (float)actsPerPage); + // Add the page number text if too many acts + if (maxPages > 1) { + actsPerPage -= columns; + maxPages = Mathf.CeilToInt(acts.Length / (float)actsPerPage); } + int pageActNumber = Mathf.Min(acts.Length - (actsPerPage * page), actsPerPage); - if (invCount == 0) return null; + for (int i = 0; i < pageActNumber; i++) + items[i] = acts[i + page * actsPerPage]; + if (maxPages > 1) + items[3 * columns - 1] = "PAGE " + (page + 1); + return items; + } - string[] items = new string[6]; - for (int i = 0; i < invCount; i++) - items[i] = Inventory.inventory[i + page * 4].ShortName; - items[5] = "PAGE " + (page + 1); + private string[] GetInventoryPage(int page, int columns) { + int itemsPerPage = 2 * columns; + int pageItemNumber = Mathf.Min(Inventory.inventory.Count - (itemsPerPage * page), 2 * columns); + int maxPages = Mathf.CeilToInt(Inventory.inventory.Count / (float)itemsPerPage); + if (pageItemNumber == 0) return null; + + string[] items = new string[3 * columns]; + for (int i = 0; i < pageItemNumber; i++) + items[i] = Inventory.inventory[i + page * itemsPerPage].ShortName; + if (maxPages > 1) + items[3 * columns - 1] = "PAGE " + (page + 1); return items; } - private string[] GetEnemyPage(int page, out string[] colors) { - int enemyCount = 0; - for (int i = page * 2; i < page * 2 + 2; i++) { - if (encounter.EnabledEnemies.Length <= i) - break; - enemyCount++; + private string[] GetEnemyPage(int page, int columns, out string[] colors) { + colors = new string[columns * 3]; + + int enemyCount = encounter.EnabledEnemies.Length <= 3 ? encounter.EnabledEnemies.Length : Mathf.RoundToInt(Mathf.Clamp(encounter.EnabledEnemies.Length - page * 2, 0, 2)); + int maxPages = encounter.EnabledEnemies.Length <= 3 ? 1 : Mathf.CeilToInt(encounter.EnabledEnemies.Length / 2f); + string[] enemies = new string[columns * 3]; + for (int i = 0; i < enemyCount; i++) { + enemies[columns * i] = encounter.EnabledEnemies[page * 2 + i].Name; } - colors = new string[6]; - string[] enemies = new string[6]; - enemies[0] = encounter.EnabledEnemies[page * 2].Name; - if (enemyCount == 2) - enemies[2] = "* " + encounter.EnabledEnemies[page * 2 + 1].Name; for (int i = page * 2; i < encounter.EnabledEnemies.Length && enemyCount > 0; i++) { - if (encounter.EnabledEnemies[i].CanSpare) - colors[(i - page * 2) * 2] = "[color:ffff00]"; + if (encounter.EnabledEnemies[i].CanSpare) { + string hexColor = ParseUtil.GetBytesFromColor(encounter.EnabledEnemies[i].SpareColor, true); + colors[(i - page * 2) * columns] = "[color:" + hexColor.Substring(0, 6) + "][alpha:" + hexColor.Substring(6) + "]"; + } enemyCount--; } - enemies[5] = "PAGE " + (page + 1); + if (maxPages > 1) + enemies[columns * 3 - 1] = "PAGE " + (page + 1); return enemies; } @@ -832,16 +710,17 @@ private void RenewLifeBars(int page) { int maxWidth = (int)initialHealthPos.x; foreach (LifeBarController lbc in arenaParent.GetComponentsInChildren()) Destroy(lbc.gameObject); - for (int i = page * 2; i <= page * 2 + 1 && i < encounter.EnabledEnemies.Length; i++) { - int mNameWidth = (int)UnitaleUtil.CalcTextWidth(mainTextManager) + 50; - if (mNameWidth > maxWidth) - maxWidth = mNameWidth; - } - for (int i = page * 2; i <= page * 2 + 1 && i < encounter.EnabledEnemies.Length; i++) { + int mNameWidth = (int)UnitaleUtil.PredictTextWidth(mainTextManager) + 50; + if (mNameWidth > maxWidth) + maxWidth = mNameWidth; + int enemiesToShow = encounter.EnabledEnemies.Length <= 3 ? 3 : 2; + for (int i = page * 2; i <= page * 2 + enemiesToShow - 1 && i < encounter.EnabledEnemies.Length; i++) { LifeBarController lifeBar = LifeBarController.Create(0, 0, 90); lifeBar.transform.SetParent(mainTextManager.transform); lifeBar.transform.SetAsFirstSibling(); - lifeBar.background.MoveTo(maxWidth, initialHealthPos.y - (i - page * 2) * mainTextManager.Charset.LineSpacing); + lifeBar.background.SetAnchor(0.5f, 0.5f); + lifeBar.background.MoveTo(maxWidth, initialHealthPos.y - (i - page * 2) * mainTextManager.font.LineSpacing); + lifeBar.fill.rotation = lifeBar.mask.rotation = lifeBar.background.rotation = mainTextManager.rotation; lifeBar.SetFillColor(Color.green); float hpDivide = encounter.EnabledEnemies[i].HP / (float)encounter.EnabledEnemies[i].MaxHP; lifeBar.SetInstant(hpDivide, encounter.EnabledEnemies[i].HP < 0); @@ -863,10 +742,8 @@ private void HandleAction() { if (!mainTextManager.AllLinesComplete() && mainTextManager.LineComplete()) mainTextManager.NextLineText(); - else if (mainTextManager.AllLinesComplete() && mainTextManager.LineCount() != 0) { - mainTextManager.DestroyChars(); + else if (mainTextManager.AllLinesComplete() && mainTextManager.LineCount() != 0) SwitchState(stateAfterDialogs); - } break; case "ACTIONSELECT": @@ -874,18 +751,14 @@ private void HandleAction() { case Actions.FIGHT: if (encounter.EnabledEnemies.Length > 0) SwitchState("ENEMYSELECT"); - else - mainTextManager.DoSkipFromPlayer(); break; case Actions.ACT: if (GlobalControls.crate) if (ControlPanel.instance.Safe) UnitaleUtil.PlaySound("MEOW", "sounds/meow" + Math.RandomRange(1, 8)); - else UnitaleUtil.PlaySound("MEOW", "sounds/meow" + Math.RandomRange(1, 9)); + else UnitaleUtil.PlaySound("MEOW", "sounds/meow" + Math.RandomRange(1, 9)); else if (encounter.EnabledEnemies.Length > 0) SwitchState("ENEMYSELECT"); - else - mainTextManager.DoSkipFromPlayer(); break; case Actions.ITEM: @@ -898,9 +771,7 @@ private void HandleAction() { } else { if (Inventory.inventory.Count == 0) { - //ActionDialogResult(new TextMessage("Your Inventory is empty.", true, false), UIState.ACTIONSELECT); PlaySound(AudioClipRegistry.GetSound("menuconfirm")); - mainTextManager.DoSkipFromPlayer(); return; } SwitchState("ITEMMENU"); @@ -1037,15 +908,12 @@ private void HandleAction() { break; case "ENEMYDIALOGUE": - bool singleLineAll = monsterDialogues.Where(mgr => mgr != null).All(mgr => mgr.LineCount() <= 1 && mgr.CanSkip()); - if (singleLineAll) { - foreach (TextManager mgr in monsterDialogues) - mgr.DoSkipFromPlayer(); - mainTextManager.nextMonsterDialogueOnce = true; - } else if (!ArenaManager.instance.isResizeInProgress()) { - bool readyToSkip = readyToNextLine.All(b => b); - if (readyToSkip) - DoNextMonsterDialogue(); + bool skippableSingleLine = monsterDialogues.Where(mgr => mgr != null && mgr.isactive).All(mgr => mgr.LineCount() <= 1 && mgr.CanSkip()); + if (skippableSingleLine || readyToNextLine.All(b => b)) { + foreach (LuaTextManager mgr in monsterDialogues) + if (mgr != null && mgr.isactive) + mgr.DoSkipFromPlayer(); + DoNextMonsterDialogue(); } break; } @@ -1098,147 +966,65 @@ private void HandleArrows() { bool up = InputUtil.Pressed(GlobalControls.input.Up); bool down = InputUtil.Pressed(GlobalControls.input.Down); + int xMov = left ? -1 : right ? 1 : 0; + int yMov = up ? -1 : down ? 1 : 0; + int columns = mainTextManager.columnNumber; + switch (state) { case "ACTIONSELECT": - if (!left &&!right) + if (xMov == 0) break; - int oldActionIndex = (int)action; action = FindAvailableAction(left ? -1 : 1); - int actionIndex = (int)action; - - if (oldActionIndex != actionIndex) { - fightButton.overrideSprite = null; - actButton.overrideSprite = null; - itemButton.overrideSprite = null; - mercyButton.overrideSprite = null; - - SetPlayerOnAction(action); - } + SetPlayerOnAction(action); PlaySound(AudioClipRegistry.GetSound("menumove")); break; case "ENEMYSELECT": - bool odd = false; - if (encounter.EnabledEnemies.Length > 3) { - if (!up &&!down &&!right &&!left) break; - if (right) { - if (selectedEnemy % 2 == 1) - odd = true; - selectedEnemy = (selectedEnemy + 2) % encounter.EnabledEnemies.Length; - if (encounter.EnabledEnemies.Length % 2 == 1 && selectedEnemy < 2) selectedEnemy = odd ? 1 : 0; - } else if (left) { - if (selectedEnemy % 2 == 1) - odd = true; - selectedEnemy = (selectedEnemy - 2 + encounter.EnabledEnemies.Length) % encounter.EnabledEnemies.Length; - if (encounter.EnabledEnemies.Length % 2 == 1 && selectedEnemy > encounter.EnabledEnemies.Length - 3) - if (odd && encounter.EnabledEnemies.Length % 2 == 0) selectedEnemy = encounter.EnabledEnemies.Length - 1; - else if (odd && encounter.EnabledEnemies.Length % 2 == 1) selectedEnemy = encounter.EnabledEnemies.Length - 2; - else if (!odd && encounter.EnabledEnemies.Length % 2 == 0) selectedEnemy = encounter.EnabledEnemies.Length - 2; - else if (!odd && encounter.EnabledEnemies.Length % 2 == 1) selectedEnemy = encounter.EnabledEnemies.Length - 1; - } else if (selectedEnemy / 2 * 2 + (selectedEnemy % 2 + 1) % 2 < encounter.EnabledEnemies.Length) - selectedEnemy = selectedEnemy / 2 * 2 + (selectedEnemy % 2 + 1) % 2; - if (right || left) { - string[] colors; - string[] textTemp = GetEnemyPage(selectedEnemy / 2, out colors); - mainTextManager.SetText(new SelectMessage(textTemp, false, colors)); - if (forcedAction == Actions.FIGHT) - RenewLifeBars(selectedEnemy / 2); - } - SetPlayerOnSelection(selectedEnemy % 2 * 2); - } else { - if (!up && !down) break; - if (up) selectedEnemy--; - else selectedEnemy++; - selectedEnemy = (selectedEnemy + encounter.EnabledEnemies.Length) % encounter.EnabledEnemies.Length; - SetPlayerOnSelection(selectedEnemy * 2); + if (xMov == 0 && yMov == 0) + return; + + selectedEnemy = UnitaleUtil.SelectionChoice(encounter.EnabledEnemies.Length, selectedEnemy, xMov, yMov, encounter.EnabledEnemies.Length <= 3 ? 3 : 2, 1); + int enemyPage = encounter.EnabledEnemies.Length <= 3 ? 0 : selectedEnemy / 2; + + if (xMov != 0) { + string[] colors; + mainTextManager.SetText(new SelectMessage(GetEnemyPage(enemyPage, columns, out colors), false, columns, colors)); + if (forcedAction == Actions.FIGHT) + RenewLifeBars(enemyPage); } + SetPlayerOnSelection(Math.Mod(selectedEnemy, encounter.EnabledEnemies.Length <= 3 ? 3 : 2) * 2); break; case "ACTMENU": - if (!up && !down && !left && !right) + if (xMov == 0 && yMov == 0) return; - int xCol = selectedAction % 2; // can just use remainder here, xCol will never be negative at this part - int yCol = selectedAction / 2; - - if (left) xCol--; - else if (right) xCol++; - else if (up) yCol--; - else yCol++; - - int actionCount = encounter.EnabledEnemies[selectedEnemy].ActCommands.Length; - int leftColSize = (actionCount + 1) / 2; - int rightColSize = actionCount / 2; - - if (left || right) xCol = Math.Mod(xCol, 2); - if (up || down) yCol = xCol == 0 ? Math.Mod(yCol, leftColSize) : Math.Mod(yCol, rightColSize); - int desiredAction = yCol * 2 + xCol; - if (desiredAction >= 0 && desiredAction < actionCount) { - selectedAction = desiredAction; - SetPlayerOnSelection(selectedAction); - } + string[] acts = encounter.EnabledEnemies[selectedEnemy].ActCommands; + bool onePage = acts.Length <= 3 * columns; + selectedAction = UnitaleUtil.SelectionChoice(acts.Length, selectedAction, xMov, yMov, onePage ? 3 : 2, columns); + SetPlayerOnSelection(selectedAction % ((onePage ? 3 : 2) * columns)); + int actPage = onePage ? 0 : Mathf.FloorToInt((float)selectedAction / (2 * columns)); + mainTextManager.SetText(new SelectMessage(GetActPage(acts, actPage, columns), false, columns)); break; case "ITEMMENU": - if (!up &&!down &&!left &&!right) + if (xMov == 0 && yMov == 0) return; - int xColI = Math.Mod(selectedItem, 2); - int yColI = Math.Mod(selectedItem, 4) / 2; - - if (left) xColI--; - else if (right) xColI++; - else if (up) yColI--; - else yColI++; - - // UnitaleUtil.writeInLog("xCol after controls " + xColI); - // UnitaleUtil.writeInLog("yCol after controls " + yColI); - - const int itemCount = 4; // HACK: should do item count based on page number... - const int leftColSizeI = (itemCount + 1) / 2; - const int rightColSizeI = itemCount / 2; - int desiredItem = (selectedItem / 4) * 4; - switch (xColI) { - case -1: - xColI = 1; - desiredItem -= 4; - break; - case 2: - xColI = 0; - desiredItem += 4; - break; - } - - if (up || down) - yColI = xColI == 0 ? Math.Mod(yColI, leftColSizeI) : Math.Mod(yColI, rightColSizeI); - desiredItem += (yColI * 2 + xColI); - - // UnitaleUtil.writeInLog("xCol after evaluation " + xColI); - // UnitaleUtil.writeInLog("yCol after evaluation " + yColI); - - // UnitaleUtil.writeInLog("Unchecked desired item " + desiredItem); + selectedItem = UnitaleUtil.SelectionChoice(Inventory.inventory.Count, selectedItem, xMov, yMov, 2, columns); + SetPlayerOnSelection(Math.Mod(selectedItem, 2 * columns)); + int itemPage = Mathf.FloorToInt(selectedItem / (2f * columns)); + mainTextManager.SetText(new SelectMessage(GetInventoryPage(itemPage, columns), false, columns)); - if (desiredItem < 0) desiredItem = Math.Mod(desiredItem, 4) + (Inventory.inventory.Count / 4) * 4; - else if (desiredItem > Inventory.inventory.Count) desiredItem = Math.Mod(desiredItem, 4); - - if (desiredItem != selectedItem && desiredItem < Inventory.inventory.Count) { // 0 check not needed, done before - selectedItem = desiredItem; - SetPlayerOnSelection(Math.Mod(selectedItem, 4)); - int page = selectedItem / 4; - mainTextManager.SetText(new SelectMessage(GetInventoryPage(page), false)); - } - - // UnitaleUtil.writeInLog("Desired item index after evaluation " + desiredItem); break; case "MERCYMENU": - if (!up && !down) break; - if (up) selectedMercy--; - else selectedMercy++; - selectedMercy = encounter.CanRun ? Math.Mod(selectedMercy, 2) : 0; + if (yMov == 0) + break; + selectedMercy = UnitaleUtil.SelectionChoice(encounter.CanRun ? 2 : 1, selectedMercy, 0, yMov, 2, 1); SetPlayerOnSelection(selectedMercy * 2); break; } @@ -1248,7 +1034,7 @@ private void HandleCancel() { switch (state) { case "ACTIONSELECT": case "DIALOGRESULT": - if (mainTextManager.CanSkip() &&!mainTextManager.LineComplete()) + if (mainTextManager.CanSkip() && !mainTextManager.LineComplete()) mainTextManager.DoSkipFromPlayer(); break; @@ -1256,7 +1042,9 @@ private void HandleCancel() { bool singleLineAll = true; bool cannotSkip = false; // why two booleans for the same result? 'cause they're different conditions - foreach (TextManager mgr in monsterDialogues) { + foreach (LuaTextManager mgr in monsterDialogues) { + if (mgr != null && !mgr.isactive) + continue; if (!mgr.CanSkip()) cannotSkip = true; @@ -1267,8 +1055,9 @@ private void HandleCancel() { if (cannotSkip || singleLineAll) break; - foreach (TextManager mgr in monsterDialogues) - mgr.DoSkipFromPlayer(); + foreach (LuaTextManager mgr in monsterDialogues) + if (mgr != null && mgr.isactive) + mgr.DoSkipFromPlayer(); break; case "ACTMENU": @@ -1299,24 +1088,25 @@ public Vector2 FindPlayerOffsetForAction(Actions action) { } private void SetPlayerOnAction(Actions newAction) { - switch (newAction) { - case Actions.FIGHT: fightButton.overrideSprite = fightButtonSprite; break; - case Actions.ACT: actButton.overrideSprite = actButtonSprite; break; - case Actions.ITEM: itemButton.overrideSprite = itemButtonSprite; break; - case Actions.MERCY: mercyButton.overrideSprite = mercyButtonSprite; break; - default: return; - } - - if (state == "ACTIONSELECT") - PlayerController.instance.SetPosition(FindPlayerOffsetForAction(newAction).x, FindPlayerOffsetForAction(newAction).y, true); - } - - public void MovePlayerToAction(Actions act) { fightButton.overrideSprite = null; actButton.overrideSprite = null; itemButton.overrideSprite = null; mercyButton.overrideSprite = null; + if (state == "ACTIONSELECT") { + switch (newAction) { + case Actions.FIGHT: fightButton.overrideSprite = fightButtonSprite; break; + case Actions.ACT: actButton.overrideSprite = actButtonSprite; break; + case Actions.ITEM: itemButton.overrideSprite = itemButtonSprite; break; + case Actions.MERCY: mercyButton.overrideSprite = mercyButtonSprite; break; + default: return; + } + + PlayerController.instance.SetPosition(FindPlayerOffsetForAction(newAction).x, FindPlayerOffsetForAction(newAction).y, true); + } + } + + public void MovePlayerToAction(Actions act) { action = act; action = FindAvailableAction(0); SetPlayerOnAction(action); @@ -1327,21 +1117,25 @@ public void MovePlayerToAction(Actions act) { // 2 3 // 4 5 private void SetPlayerOnSelection(int selection) { - int xMv = selection % 2; // remainder safe again, selection is never negative - int yMv = selection / 2; - PlayerController.instance.SetPosition(upperLeft.x + ArenaManager.instance.currentX + xMv * 256, - upperLeft.y + ArenaManager.instance.currentY - yMv * mainTextManager.Charset.LineSpacing, true); + int xMv = selection % mainTextManager.columnNumber; + int yMv = selection / mainTextManager.columnNumber; + + if (mainTextManager.letters.Count > 0) + PlayerController.instance.SetPosition(mainTextManager.absx + mainTextManager.letters[0].image.rectTransform.sizeDelta.x / 2 + xMv * mainTextManager.columnShift + 4, + mainTextManager.absy + mainTextManager.letters[0].image.rectTransform.sizeDelta.y / 2 - yMv * mainTextManager.font.LineSpacing, true); } private void Start() { - messages = new Dictionary(); // reset GlobalControls' frame timer GlobalControls.frame = 0; + arenaParent = GameObject.Find("arena_border_outer"); - mainTextManager = GameObject.Find("TextManager").GetComponent(); + mainTextManager = GameObject.Find("arena").GetComponentInChildren(); + mainTextManager.HideBubble(); mainTextManager.SetEffect(new TwitchEffect(mainTextManager)); mainTextManager.ResetFont(); mainTextManager.SetCaller(EnemyEncounter.script); + mainTextManager.SetText(DynValue.NewString("")); encounter = FindObjectOfType(); fightButton = GameObject.Find("FightBt").GetComponent(); @@ -1367,10 +1161,10 @@ private void Start() { buttonSpriteDictionary.Add("ACT", actButtonSprite); buttonSpriteDictionary.Add("ITEM", itemButtonSprite); buttonSpriteDictionary.Add("MERCY", mercyButtonSprite); - buttonBasePositions.Add("FIGHT", new Vector2(32, 6)); - buttonBasePositions.Add("ACT", new Vector2(185, 6)); - buttonBasePositions.Add("ITEM", new Vector2(355, 6)); - buttonBasePositions.Add("MERCY", new Vector2(500, 6)); + buttonBasePositions.Add("FIGHT", new Vector2(0, 0)); + buttonBasePositions.Add("ACT", new Vector2(154, 0)); + buttonBasePositions.Add("ITEM", new Vector2(313, 0)); + buttonBasePositions.Add("MERCY", new Vector2(467, 0)); buttonBasePlayerPositions.Add("FIGHT", new Vector2(16, 19)); buttonBasePlayerPositions.Add("ACT", new Vector2(16, 19)); buttonBasePlayerPositions.Add("ITEM", new Vector2(16, 19)); @@ -1403,8 +1197,6 @@ private void Start() { ControlPanel.instance.FrameBasedMovement = false; LuaScriptBinder.CopyToBattleVar(); - if (EnemyEncounter.script.GetVar("Update") != null) - encounterHasUpdate = true; GameObject.Find("Main Camera").GetComponent().enabled = !GameObject.Find("Main Camera").GetComponent().enabled; //There are scene init bugs, let's fix them! /*if (GameObject.Find("TopLayer").transform.parent != GameObject.Find("Canvas").transform) { @@ -1432,6 +1224,8 @@ private void Start() { rts[indexText].SetParent(rts[indexDeb]);*/ //} + KeyboardInput.ResetEncounterInputs(); + // If retromode is enabled, set the inventory to the one with TESTDOGs (can be overridden) if (GlobalControls.retroMode && GlobalControls.modDev) { // Set the in-game names of these items to TestDogN instead of DOGTESTN @@ -1555,8 +1349,7 @@ private void Update() { stateSwitched = false; if (encounter.gameOverStance) return; - if (encounterHasUpdate) - UnitaleUtil.TryCall(EnemyEncounter.script, "Update"); + UnitaleUtil.TryCall(EnemyEncounter.script, "Update"); if (frozenState != "PAUSE") return; @@ -1565,18 +1358,14 @@ private void Update() { mainTextManager.SetPause(false); if (state == "DIALOGRESULT") - if (mainTextManager.CanAutoSkipAll() || (mainTextManager.CanAutoSkipThis() && mainTextManager.LineComplete())) + if (mainTextManager.CanAutoSkipAny(true)) if (mainTextManager.HasNext()) mainTextManager.NextLineText(); - else { - mainTextManager.DestroyChars(); + else SwitchState(stateAfterDialogs); - } - if (state == "ENEMYDIALOGUE") { - if (monsterDialogues.All(mgr => mgr.CanAutoSkipThis())) DoNextMonsterDialogue(); - else UpdateMonsterDialogue(); - } + if (state == "ENEMYDIALOGUE") + UpdateMonsterDialogue(); if (state == "DEFENDING") { if (!encounter.WaveInProgress()) { @@ -1598,25 +1387,25 @@ private void Update() { else if (InputUtil.Pressed(GlobalControls.input.Confirm)) SwitchState("DONE"); - if ((state == "ATTACKING" || needOnDeath) && fightUI.Finished()) { + if (state == "ATTACKING" && fightUI.Finished() || checkDeathCall) { bool noOnDeath = true; - onDeathSwitch = true; bool playSound = true; foreach (EnemyController enemyController in encounter.EnabledEnemies) { if (enemyController.HP > 0 || enemyController.Unkillable) continue; - // fightUI.disableImmediate(); - if (UnitaleUtil.TryCall(enemyController.script, "OnDeath")) continue; - noOnDeath = false; + onDeathSwitch = true; + bool hasOnDeath = UnitaleUtil.TryCall(enemyController.script, "OnDeath"); + onDeathSwitch = false; + if (hasOnDeath) { + noOnDeath = false; + continue; + } enemyController.DoKill(playSound); playSound = false; - if (encounter.EnabledEnemies.Length > 0) + if (encounter.EnabledEnemies.Length > 0 && !checkDeathCall) SwitchState("ENEMYDIALOGUE"); - //else - // checkAndTriggerVictory(); } - onDeathSwitch = false; if (state == "ATTACKING" && fightUI.Finished()) { if (lastNewState != "UNUSED") { SwitchState(lastNewState); @@ -1624,10 +1413,7 @@ private void Update() { } else if (noOnDeath) SwitchState("ENEMYDIALOGUE"); } - needOnDeath = false; + checkDeathCall = false; } - //if (state == UIState.ENEMYDIALOGUE) - // if ((Vector2)arenaParent.transform.position == new Vector2(320, 90)) - // PlayerController.instance.setControlOverride(false); } } diff --git a/Assets/Scripts/Battle/UIStats.cs b/Assets/Scripts/Battle/UIStats.cs index ade0ae8de..b7aae4c85 100644 --- a/Assets/Scripts/Battle/UIStats.cs +++ b/Assets/Scripts/Battle/UIStats.cs @@ -28,7 +28,7 @@ private void Start() { hpLabel = LuaSpriteController.GetOrCreate(GameObject.Find("HPLabel")); hpTextMan = GameObject.Find("HPText").GetComponent(); - hpTextMan.SetFont(SpriteFontRegistry.Get(SpriteFontRegistry.UI_SMALLTEXT_NAME), false); + hpTextMan.SetFont(SpriteFontRegistry.Get(SpriteFontRegistry.UI_SMALLTEXT_NAME)); hpTextMan.progressmode = "NONE"; hpTextMan.HideBubble(); hpTextMan.SetCaller(EnemyEncounter.script); @@ -51,7 +51,8 @@ public void setNamePosition() { nameLevelTextMan.MoveTo(0, -11); hpLabel.MoveTo(0, -9); lifebar.background.MoveTo(31, -14); - hpTextMan.MoveTo(70, -11); + hpTextMan.MoveTo(0, -11); + setMaxHP(); hpRect.transform.localPosition = new Vector3(PlayerCharacter.instance.Name.Length > 6 ? 286 : 215, 0, 0); } @@ -70,7 +71,7 @@ public void setMaxHP() { if (!initialized || stopUIUpdate) return; if (lifebar.background.spritename == "bar-px") lifebar.Resize(Mathf.Min(120, PlayerCharacter.instance.MaxHP * 1.2f), 20); - hpTextMan.transform.position = new Vector3(lifebar.background.absx + lifebar.backgroundRt.sizeDelta.x + 14, hpTextMan.transform.position.y, hpTextMan.transform.position.z); + hpTextMan.MoveToAbs(lifebar.background.absx + lifebar.backgroundRt.sizeDelta.x + 14, hpTextMan.transform.position.y); setHP(PlayerCharacter.instance.HP); } diff --git a/Assets/Scripts/Debug/UserDebugger.cs b/Assets/Scripts/Debug/UserDebugger.cs index c08c8fbdd..fdbeee80e 100644 --- a/Assets/Scripts/Debug/UserDebugger.cs +++ b/Assets/Scripts/Debug/UserDebugger.cs @@ -5,7 +5,7 @@ /// /// Behaviour you can use to print lines into a UnityEngine.UI.Text component for debugging, keeping only a set amount of lines in memory. /// -public class UserDebugger : MonoBehaviour{ +public class UserDebugger : MonoBehaviour { public static UserDebugger instance; public Text text; public int maxLines = 7; @@ -33,6 +33,10 @@ public void Start() { UnitaleUtil.printDebuggerBeforeInit = ""; } + public void Update() { + transform.SetAsLastSibling(); + } + public void UserWriteLine(string line) { line = line ?? "nil"; foreach (string str in line.Split('\n')) @@ -46,7 +50,6 @@ public void UserWriteLine(string line) { firstActive = true; } - transform.SetAsLastSibling(); } private void WriteLine(string line) { diff --git a/Assets/Scripts/Device/DisclaimerScript.cs b/Assets/Scripts/Device/DisclaimerScript.cs index 8f1eba42e..1e26ebbe0 100644 --- a/Assets/Scripts/Device/DisclaimerScript.cs +++ b/Assets/Scripts/Device/DisclaimerScript.cs @@ -15,8 +15,8 @@ private void Start() { LogoCrate.GetComponent().enabled = true; RedditPlug.GetComponent().text = "GO TO /R/UNITLAE. FOR UPDTAES!!!!!"; LegalStuff.GetComponent().text = "NO RELESLING HERE!!! IT'S RFEE!!! OR TUBY FEX WILL BE ANGER!!! U'LL HVAE A BED TMIE!!!"; - ModSelection.GetComponent().text = "SPACE OR KLIK TO\nPALY MODS!!!!!"; - Overworld.GetComponent().text = "PRSES O TO\nOOVERWURL!!!!!"; + ModSelection.GetComponent().text = "YASS GO OR KLIK TO\nPALY MODS!!!!!"; + Overworld.GetComponent().text = "PRSES YUMMY 2\nOOVERWURL!!!!!"; LuaKnowledgeDisclaimer.GetComponent().text = "KNOW YUOR CODE R U'LL HVAE A BED TMIE!!!"; Version.GetComponent().text = "v" + Random.Range(0,9) + "." + Random.Range(0,9) + "." + Random.Range(0,9); } else if (Random.Range(0, 1000) == 021) { @@ -24,29 +24,31 @@ private void Start() { Version.GetComponent().localPosition = new Vector3(0f, 160f, 0f); Version.GetComponent().color = new Color(1f, 1f, 1f, 1f); Version.GetComponent().text = "Not Unitale v0.2.1a"; - } else - Version.GetComponent().text = "v" + GlobalControls.CYFversion; + } else if (GlobalControls.BetaVersion > 0) + Version.GetComponent().text = "v" + GlobalControls.CYFversion + "\nLTS " + (GlobalControls.LTSversion + 1) + "\nb" + GlobalControls.BetaVersion + ""; + else + Version.GetComponent().text = "v" + GlobalControls.CYFversion + "\nLTS " + GlobalControls.LTSversion; } /// /// Checks if you pressed one of the things the disclaimer tells you to. It's pretty straightforward. /// private void Update() { - // Try to hook on to the game window when the user interacts - #if UNITY_STANDALONE_WIN || UNITY_EDITOR_WIN - if (Input.GetMouseButtonDown(0) || Input.GetKeyDown(KeyCode.Space) || Input.GetKeyDown(KeyCode.O) || Input.GetKeyDown(KeyCode.F4) - || Input.GetKeyDown(KeyCode.Return) && (Input.GetKey(KeyCode.LeftAlt) || Input.GetKey(KeyCode.RightAlt))) // LAlt/RAlt + Enter - Misc.RetargetWindow(); - #endif - if (!ScreenResolution.hasInitialized) return; - if (Input.GetKeyDown(KeyCode.O)) { + if (GlobalControls.input.Menu == ButtonState.PRESSED) { + #if UNITY_STANDALONE_WIN || UNITY_EDITOR_WIN + Misc.RetargetWindow(); + #endif StaticInits.InitAll(StaticInits.EDITOR_MODFOLDER); GlobalControls.modDev = false; SceneManager.LoadScene("Intro"); Destroy(this); - } else if (Input.GetKeyDown(KeyCode.Space) || Input.GetMouseButtonDown(0) || Input.GetKeyDown(KeyCode.Return)) + } else if (GlobalControls.input.Confirm == ButtonState.PRESSED || Input.GetMouseButtonDown(0)) { + #if UNITY_STANDALONE_WIN || UNITY_EDITOR_WIN + Misc.RetargetWindow(); + #endif StartCoroutine(ModSelect()); + } } // The mod select screen can take some extra time to load, diff --git a/Assets/Scripts/Device/DiscordControls.cs b/Assets/Scripts/Device/DiscordControls.cs index 0ff335e69..2748b6e3f 100644 --- a/Assets/Scripts/Device/DiscordControls.cs +++ b/Assets/Scripts/Device/DiscordControls.cs @@ -1,6 +1,7 @@ using Discord; using System; using MoonSharp.Interpreter; +using UnityEngine; public static class DiscordControls { public static Discord.Discord discord; @@ -28,8 +29,10 @@ public static void Start() { discord = new Discord.Discord(711497963771527219, (ulong)CreateFlags.NoRequireDiscord); activityManager = discord.GetActivityManager(); isActive = true; - } catch (Exception) { + Debug.Log("Discord Status: Success"); + } catch (Exception e) { isActive = false; + Debug.Log("Discord Status: Failed - " + e.Message); } // Gets Discord Visibility Setting @@ -71,21 +74,22 @@ public static string ChangeVisibilitySetting(int spd) { if (spd > 0) LuaScriptBinder.SetAlMighty(null, "CYFDiscord", DynValue.NewNumber(curr_setting), true); - switch (curr_setting) { - case 0: - StartModSelect(false); - break; - case 1: - activity.Details = ""; - activity.State = ""; - activity.Timestamps.Start = 0; - activity.Timestamps.End = 0; - UpdatePresence(true); - break; - default: - Clear(); - break; - } + if (isActive) + switch (curr_setting) { + case 0: + StartModSelect(false); + break; + case 1: + activity.Details = ""; + activity.State = ""; + activity.Timestamps.Start = 0; + activity.Timestamps.End = 0; + UpdatePresence(true); + break; + default: + Clear(); + break; + } return GlobalControls.crate ? Temmify.Convert(settingNames[curr_setting]) : settingNames[curr_setting]; } @@ -94,8 +98,6 @@ public static string ChangeVisibilitySetting(int spd) { /// Sets the status when you're on the title screen, erasing details and timer /// public static void StartTitle() { - if (!isActive) return; - activity.Details = "Title Screen"; activity.State = ""; @@ -106,8 +108,6 @@ public static void StartTitle() { /// Sets the status when you're entering the Overworld, erasing details and timer /// public static void StartOW() { - if (!isActive) return; - activity.Details = "In the Overworld"; activity.State = ""; ClearTime(false); @@ -119,8 +119,6 @@ public static void StartOW() { /// This function runs whenever showing a scene /// public static void ShowOWScene(string mapName) { - if (!isActive) return; - activity.Details = "In the Overworld"; activity.State = mapName; UnitaleUtil.MapCorrespondanceList.TryGetValue(mapName, out activity.State); @@ -138,8 +136,6 @@ public static void ShowOWScene(string mapName) { /// /// Whether to reset the timer when loading the mod select scene. public static void StartModSelect(bool reset = true) { - if (!isActive) return; - activity.Details = "Selecting a Mod"; activity.State = ""; if (reset) @@ -155,8 +151,6 @@ public static void StartModSelect(bool reset = true) { /// The name of the mod. /// The name of the encounter. public static void StartBattle(string modName, string encounterName) { - if (!isActive) return; - activity.Details = "Playing Mod: " + modName; activity.State = encounterName; oldTime = GetCurrentTime(); @@ -183,7 +177,8 @@ public static void UpdatePresence(bool force = false) { /// This function will be called one time, on the frame after applying settings, to prevent abuse of the activity manager. /// private static void UpdateActivity() { - activityManager.UpdateActivity(activity, (res) => {}); + if (isActive) + activityManager.UpdateActivity(activity, (res) => {}); updateQueued = false; } @@ -192,8 +187,6 @@ private static void UpdateActivity() { /// /// New text to display. public static void SetName(string name) { - if (!isActive) return; - // Work around a very strange bug in the Discord SDK if (name.Length == 1) name += " "; @@ -206,8 +199,6 @@ public static void SetName(string name) { /// /// If true, text will be reset to its initial value. Otherwise, it will be cleared from the status. public static void ClearName(bool reset) { - if (!isActive) return; - activity.Details = reset ? oldDetails : ""; } @@ -216,8 +207,6 @@ public static void ClearName(bool reset) { /// /// New text to display. public static void SetDetails(string details) { - if (!isActive) return; - // Work around a very strange bug in the Discord SDK if (details.Length == 1) details += " "; @@ -230,8 +219,6 @@ public static void SetDetails(string details) { /// /// If true, text will be reset to its initial value. Otherwise, it will be cleared from the status. public static void ClearDetails(bool reset) { - if (!isActive) return; - activity.State = reset ? oldState : ""; } @@ -241,8 +228,6 @@ public static void ClearDetails(bool reset) { /// Number of seconds to display in the timer. /// If true, the timer will count down from this value instead of counting up. public static void SetTime(int seconds, bool countdown) { - if (!isActive) return; - if (!countdown) { activity.Timestamps.Start = GetCurrentTime() - seconds; activity.Timestamps.End = 0; @@ -257,8 +242,6 @@ public static void SetTime(int seconds, bool countdown) { /// /// If true, text will be reset to its initial value. Otherwise, it will be cleared from the status. public static void ClearTime(bool reset) { - if (!isActive) return; - if (reset) { activity.Timestamps.Start = oldTime; activity.Timestamps.End = 0; @@ -276,7 +259,10 @@ public static void ClearTime(bool reset) { /// /// Internal use function that clears the discord rich presence status. /// - public static void Clear() { activityManager.ClearActivity((result) => {}); } + public static void Clear() { + if (isActive) + activityManager.ClearActivity((result) => {}); + } // Update is called once per frame public static void Update() { diff --git a/Assets/Scripts/Device/GlobalControls.cs b/Assets/Scripts/Device/GlobalControls.cs index 0b32936d3..1bc2b9cb1 100644 --- a/Assets/Scripts/Device/GlobalControls.cs +++ b/Assets/Scripts/Device/GlobalControls.cs @@ -11,12 +11,13 @@ public class GlobalControls : MonoBehaviour { public static string CYFversion = "0.6.6"; // Current version of CYF displayed in the main menu and usable in scripts public static string OverworldVersion = "0.6.6"; // Last version in which the overworld was changed, notifying any user with an old save to delete it - public static int LTSversion = 2; // LTS version, mainly used for CYF 0.6.6 + public static int LTSversion = 3; // LTS version, mainly used for CYF 0.6.6 + public static int BetaVersion = 0; // Only used for beta versions public static int frame; // Frame counter used for logging purposes public static float overworldTimestamp = 0f; // Timestamp of the creation of the save file, mostly used to know the time spent in this save in the save and load screen - public static UndertaleInput input = new KeyboardInput(); // KeyboardInput singleton, registering any key press the Player does and handling them + public static IUndertaleInput input = new KeyboardInput(); // KeyboardInput singleton, registering any key press the Player does and handling them public static LuaInputBinding luaInput = new LuaInputBinding(input); // Input Lua object, usable on the Lua side public static string realName; // Player's name in the overworld, given through the scene EnterName @@ -29,7 +30,7 @@ public class GlobalControls : MonoBehaviour { public static bool allowWipeSave; // Allows you to wipe your save in the Error scene if it couldn't load properly private bool screenShaking; // True if a screenshake is occuring, false otherwise - public static string[] nonOWScenes = { "Battle", "Error", "ModSelect", "Options", "TitleScreen", "Disclaimer", "EnterName", "TransitionOverworld", "Intro" }; // Scenes in which you're not considered to be in the overworld + public static string[] nonOWScenes = { "Battle", "Error", "ModSelect", "Options", "TitleScreen", "Disclaimer", "EnterName", "TransitionOverworld", "Intro", "KeybindSettings" }; // Scenes in which you're not considered to be in the overworld public static string[] canTransOW = { "Battle", "Error" }; // Scenes from which you can enter the overworld public static Dictionary GameMapData = new Dictionary(); // Main save data on each map the Player has visited before @@ -49,6 +50,8 @@ public void Awake() { SaveLoad.LoadAlMighty(); LuaScriptBinder.Set(null, "ModFolder", DynValue.NewString("@Title")); + KeyboardInput.LoadPlayerKeys(); + // Load map names for the overworld UnitaleUtil.AddKeysToMapCorrespondanceList(); @@ -68,7 +71,7 @@ public void Awake() { // Check if window scale has a stored preference that is a number if (LuaScriptBinder.GetAlMighty(null, "CYFWindowScale") != null && LuaScriptBinder.GetAlMighty(null, "CYFWindowScale").Type == DataType.Number) { - ScreenResolution.windowScale = (int) System.Math.Min(LuaScriptBinder.GetAlMighty(null, "CYFWindowScale").Number, 1); + ScreenResolution.windowScale = (int) System.Math.Max(LuaScriptBinder.GetAlMighty(null, "CYFWindowScale").Number, 1); if (!ScreenResolution.hasInitialized) { Screen.SetResolution(640, 480, Screen.fullScreen, 0); ScreenResolution scrRes = FindObjectOfType(); @@ -91,7 +94,7 @@ public static void ReloadCrate() { #endif } - #if UNITY_STANDALONE_WIN + #if UNITY_STANDALONE_WIN && !UNITY_EDITOR /// /// Used to reposition the window in the middle of the screen after exiting fullscreen. /// @@ -125,7 +128,7 @@ private void Update () { // Update Discord RPC DiscordControls.Update(); - #if UNITY_STANDALONE_WIN + #if UNITY_STANDALONE_WIN && !UNITY_EDITOR // Reposition the window to the middle of the screen after exiting fullscreen if (fullscreenSwitch == 1) StartCoroutine(RepositionWindow()); @@ -137,6 +140,8 @@ private void Update () { if (isInFight || UnitaleUtil.IsOverworld) frame ++; + luaInput.Update(); + string sceneName = SceneManager.GetActiveScene().name; // Activate Debugger @@ -166,7 +171,7 @@ private void Update () { else UIController.EndBattle(); } // Open the Menu in the Overworld - else if (input.Menu == UndertaleInput.ButtonState.PRESSED && !nonOWScenes.Contains(sceneName) && !isInFight && !isInShop && (!GameOverBehavior.gameOverContainerOw || !GameOverBehavior.gameOverContainerOw.activeInHierarchy)) { + else if (input.Menu == ButtonState.PRESSED && !nonOWScenes.Contains(sceneName) && !isInFight && !isInShop && (!GameOverBehavior.gameOverContainerOw || !GameOverBehavior.gameOverContainerOw.activeInHierarchy)) { if (!PlayerOverworld.instance.PlayerNoMove && EventManager.instance.script == null && !PlayerOverworld.instance.menuRunning[2] && !PlayerOverworld.instance.menuRunning[4] && (GameObject.Find("FadingBlack") == null || GameObject.Find("FadingBlack").GetComponent().alpha <= 0)) StartCoroutine(PlayerOverworld.LaunchMenu()); } @@ -185,6 +190,13 @@ private void Update () { } } + /// + /// Runs pnce per frame, after all other update functions are run. + /// + public void LateUpdate() { + input.LateUpdate(); + } + /// /// Shakes the screen for a given amount of frames. /// diff --git a/Assets/Scripts/Device/Input/IUndertaleInput.cs b/Assets/Scripts/Device/Input/IUndertaleInput.cs new file mode 100644 index 000000000..b2d4c9b05 --- /dev/null +++ b/Assets/Scripts/Device/Input/IUndertaleInput.cs @@ -0,0 +1,19 @@ +public enum ButtonState { + RELEASED = -1, + NONE = 0, + PRESSED = 1, + HELD = 2 +} + +public interface IUndertaleInput { + ButtonState Confirm { get; } + ButtonState Cancel { get; } + ButtonState Menu { get; } + ButtonState Up { get; } + ButtonState Down { get; } + ButtonState Left { get; } + ButtonState Right { get; } + ButtonState Key(string key); + + void LateUpdate(); +} diff --git a/Assets/Scripts/Device/Input/UndertaleInput.cs.meta b/Assets/Scripts/Device/Input/IUndertaleInput.cs.meta similarity index 100% rename from Assets/Scripts/Device/Input/UndertaleInput.cs.meta rename to Assets/Scripts/Device/Input/IUndertaleInput.cs.meta diff --git a/Assets/Scripts/Device/Input/KeyboardInput.cs b/Assets/Scripts/Device/Input/KeyboardInput.cs index c3b3144a5..070658827 100644 --- a/Assets/Scripts/Device/Input/KeyboardInput.cs +++ b/Assets/Scripts/Device/Input/KeyboardInput.cs @@ -1,33 +1,419 @@ -using System.Linq; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; using UnityEngine; -public class KeyboardInput : UndertaleInput { - private const KeyCode KC_CONFIRM = KeyCode.Z, KC_CONFIRM_ALT = KeyCode.Return, - KC_CANCEL = KeyCode.X, KC_CANCEL_ALT = KeyCode.LeftShift, KC_CANCEL_ALT2 = KeyCode.RightShift, - KC_MENU = KeyCode.C, KC_MENU_ALT = KeyCode.LeftControl, - KC_UP = KeyCode.W, KC_UP_ALT = KeyCode.UpArrow, - KC_DOWN = KeyCode.S, KC_DOWN_ALT = KeyCode.DownArrow, - KC_LEFT = KeyCode.A, KC_LEFT_ALT = KeyCode.LeftArrow, - KC_RIGHT = KeyCode.D, KC_RIGHT_ALT = KeyCode.RightArrow; - - public override ButtonState Confirm { get { return StateFor(KC_CONFIRM, KC_CONFIRM_ALT); } } - public override ButtonState Cancel { get { return StateFor(KC_CANCEL, KC_CANCEL_ALT, KC_CANCEL_ALT2); } } - public override ButtonState Menu { get { return StateFor(KC_MENU, KC_MENU_ALT); } } - public override ButtonState Up { get { return StateFor(KC_UP, KC_UP_ALT); } } - public override ButtonState Down { get { return StateFor(KC_DOWN, KC_DOWN_ALT); } } - public override ButtonState Left { get { return StateFor(KC_LEFT, KC_LEFT_ALT); } } - public override ButtonState Right { get { return StateFor(KC_RIGHT, KC_RIGHT_ALT); } } - - public override ButtonState Key(string Key) { return StateFor((KeyCode)System.Enum.Parse(typeof(KeyCode), Key)); } +public class KeyboardInput : IUndertaleInput { + /// + /// List of axes handled by CYF. + /// + public static readonly Dictionary axes = new Dictionary(); + /// + /// List of known axes keys, for quick computation. + /// + private static List knownAxes = new List(); + /// + /// Number of controllers handled by CYF. + /// Add more inputs in CYF's Input settings if you wanna handle more controllers! + /// + private const int controllers = 2; + /// + /// Number of axes handled by CYF. + /// Add more inputs in CYF's Input settings if you wanna handle more axes! + /// + private const int axesNumber = 10; + /// + /// Dictionary storing the various default keybindings of Create Your Frisk. + /// + public readonly static Dictionary> defaultKeys = new Dictionary>() { + { "Confirm", new List { "Z", "Return" } }, + { "Cancel", new List { "X", "LeftShift", "RightShift" } }, + { "Menu", new List { "C", "LeftControl", "RightControl" } }, + { "Up", new List { "W", "UpArrow", "Vertical1 +" } }, + { "Down", new List { "S", "DownArrow", "Vertical1 -" } }, + { "Left", new List { "A", "LeftArrow", "Horizontal1 -" } }, + { "Right", new List { "D", "RightArrow", "Horizontal1 +" } }, + }; + /// + /// Dictionary storing the various keybindings set by the user. + /// Can be modified through Create Your Frisk's Options menu. + /// + public static Dictionary> playerKeys = new Dictionary>(); + /// + /// Dictionary storing the various keybindings in effect during the current encounter. + /// Can be modified through various Input functions. + /// + public static Dictionary> encounterKeys = new Dictionary>(); + + /// + /// This function is executed whenever this object is created. + /// + public KeyboardInput() { + foreach (KeyValuePair> keybind in defaultKeys) { + playerKeys[keybind.Key] = new List(keybind.Value); + encounterKeys[keybind.Key] = new List(keybind.Value); + } + + for (int controller = 1; controller <= controllers; controller++) { + for (int axis = 1; axis <= axesNumber; axis++) { + string axisName; + if (axis == 1) axisName = "Horizontal"; + else if (axis == 2) axisName = "Vertical"; + else axisName = "Axis" + axis + "-"; + axisName += controller; + + knownAxes.Add(axisName + " +"); + knownAxes.Add(axisName + " -"); + axes[axisName] = 0; + } + } + } + + /// + /// This function resets the user's keybindings after a battle, in case they were tampered with during it. + /// + public static void ResetEncounterInputs() { + encounterKeys.Clear(); + foreach (KeyValuePair> keybind in playerKeys) + encounterKeys[keybind.Key] = new List(keybind.Value); + } + /// + /// This function resets the user's keybindings, it should only be used when the user asks to reset all keybindings to their default. + /// + public static void ResetInputs() { + playerKeys.Clear(); + foreach (KeyValuePair> keybind in defaultKeys) + playerKeys[keybind.Key] = new List(keybind.Value); + ResetEncounterInputs(); + } + /// + /// This function reset the user's keybindings on a given key, leaving any other key untouched. + /// + /// The key to reset the bindings of. + public static void ResetSpecificInput(string keybind) { + if (defaultKeys[keybind] == null) + throw new CYFException("CYF doesn't know the default keybind \"" + keybind + "\". Please refer to the list of known default keybinds in the Input object page of the documentation."); + playerKeys[keybind] = new List(defaultKeys[keybind]); + } + + /// + /// This function creates a new keybind for the encounter and assigns it some keys if they're given. + /// + /// Name of the new keybind to create. + /// Keys assigned to the keybind. + public static void CreateKeybind(string keybind, string[] keysToBind = null) { + if (encounterKeys.ContainsKey(keybind)) + throw new CYFException("The keybind \"" + keybind + "\" already exists yet you tried creating it again."); + + List keyCodesToBind = new List(); + if (keysToBind != null) + foreach (string key in keysToBind) + keyCodesToBind.Add(key); + + encounterKeys.Add(keybind, keyCodesToBind); + } + + /// + /// This function completely deletes a keybind from the doctionary of keybinds. + /// Note that base CYF keybinds cannot be deleted, as it would cause errors when the engine tries to fetch them. + /// + /// The keybind to delete. + public static void DeleteKeybind(string keybind) { + if (defaultKeys.ContainsKey(keybind)) + throw new CYFException("CYF's base keybinds cannot be deleted!"); + encounterKeys.Remove(keybind); + } + + /// + /// This function returns an array of all the keys bound to a given keybind. + /// + /// The keybind to get the keys of. + /// The various eys bound to the given keybind. + public static string[] GetKeybindKeys(string keybind) { + if (!encounterKeys.ContainsKey(keybind)) + throw new CYFException("The keybind \"" + keybind + "\" doesn't exist."); + return encounterKeys[keybind].Select(k => k.ToString()).ToArray(); + } + + /// + /// This function returns the keys bound to several keybinds. + /// + /// Keybind collection to check for conflicts. + /// Dictionary of conflicts found within the collection. + public static Dictionary GetConflicts(Dictionary> keybinds) { + Dictionary conflicts = new Dictionary(); + + foreach (KeyValuePair> keybind in keybinds) + foreach (string key in keybind.Value) { + List linkedKeybinds = conflicts.ContainsKey(key) ? conflicts[key].ToList() : new List(); + linkedKeybinds.Add(keybind.Key); + conflicts[key] = linkedKeybinds.ToArray(); + } + + return conflicts.Where(p => p.Value.Length > 1).ToDictionary(p => p.Key, p => p.Value); + } + + /// + /// This function replaces all of a keybind's bound keys with another set of keys. + /// + /// Name of the keybind to replace the keys of. + /// List of new keys to assign to the keybind. + public static void SetKeybindKeys(string keybind, string[] keysToBind) { + if (!encounterKeys.ContainsKey(keybind)) + throw new CYFException("The keybind \"" + keybind + "\" doesn't exist."); + + List keyCodesToBind = new List(); + if (keysToBind != null) + foreach (string key in keysToBind) { + if (!CheckKeyValidity(key)) + throw new CYFException("The key \"" + key + "\" isn't recognized by CYF."); + keyCodesToBind.Add(key); + } + + encounterKeys[keybind] = keyCodesToBind; + } + + /// + /// This function adds a key to an existing keybind. + /// + /// Name of the keybind to add a key to. + /// Key to add to the keybind. + public static bool AddKeyToKeybind(string keybind, string key) { + List keys; + encounterKeys.TryGetValue(keybind, out keys); + if (keys == null) + throw new CYFException("The keybind \"" + keybind + "\" doesn't exist."); + + if (!CheckKeyValidity(key)) + throw new CYFException("The key \"" + key + "\" isn't recognized by CYF."); + + if (!keys.Contains(key)) { + keys.Add(key); + encounterKeys[keybind] = keys; + return true; + } + return false; + } + /// + /// This function removes a key from an existing keybind. + /// + /// Name of the keybind to remove a key from. + /// Key to remove from the keybind. + public static bool RemoveKeyFromKeybind(string keybind, string key) { + List keys; + encounterKeys.TryGetValue(keybind, out keys); + if (keys == null) + throw new CYFException("The keybind \"" + keybind + "\" doesn't exist."); + + if (!CheckKeyValidity(key)) + throw new CYFException("The key \"" + key + "\" isn't recognized by CYF."); + + if (keys.Contains(key)) { + keys.Remove(key); + encounterKeys[keybind] = keys; + return true; + } + return false; + } + + /// + /// This function returns true if the keybind exists, false otherwise. + /// + /// The keybind to check the existence of. + /// True if the keybind exists, false otherwise. + public static bool KeybindExists(string keybind) { + return encounterKeys.ContainsKey(keybind); + } + + /// + /// This function loads the player's keybinding configuration stored in their AlMightyGlobals. + /// + public static void LoadPlayerKeys() { + if (!File.Exists(Application.persistentDataPath + "/keybinds.gd")) + return; + + UTF8Encoding utf8 = new UTF8Encoding(); + string fileContents = ""; + using (FileStream file = File.OpenRead(Application.persistentDataPath + "/keybinds.gd")) { + byte[] buffer = new byte[1024]; + int offset = 0; + while (offset < file.Length - 1) { + offset += file.Read(buffer, offset, 1024); + fileContents += utf8.GetString(buffer); + } + file.Dispose(); + } + + try { + foreach (string keybind in fileContents.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)) { + string[] keyValue = keybind.Split(':'); + if (keyValue.Length != 2) + throw new Exception("The keybind format of the line " + keybind + " doesn't follow CYF's standard keybind format."); + + List keys = keyValue[1].Split('|').Select(k => k.TrimEnd('\0')).ToList(); + foreach (string key in keys) + if (!CheckKeyValidity(key)) + throw new CYFException("The key \"" + key + "\" isn't recognized by CYF for the keybind \"" + keyValue[0] + "\"."); + + playerKeys[keyValue[0]] = keys; + } + } catch (Exception e) { + UnitaleUtil.DisplayLuaError("keybind loading", "Error while loading the user's keybind configuration.\nPlease delete the file named \"keybinds.gd\" in CYF's save folder, in this path:\n\n" + Application.persistentDataPath + "/keybinds.gd\n\nActual error:\n" + e.Message, true); + } + ResetEncounterInputs(); + } + /// + /// This function saves the player's keybinding configuration into their AlMightyGlobals. + /// + public static void SaveKeybinds(Dictionary> newKeys) { + if (File.Exists(Application.persistentDataPath + "/keybinds.gd")) + File.Delete(Application.persistentDataPath + "/keybinds.gd"); + + UTF8Encoding utf8 = new UTF8Encoding(); + string debugFile = ""; + using (FileStream file = File.OpenWrite(Application.persistentDataPath + "/keybinds.gd")) { + int fileLength = 0; + foreach (KeyValuePair> keybind in newKeys) { + string keybindString = (fileLength > 0 ? Environment.NewLine : "") + keybind.Key + ":" + string.Join("|", keybind.Value.OrderBy(k => k.Length).ToArray()); + debugFile += keybindString; + file.Write(utf8.GetBytes(keybindString), 0, keybindString.Length); + file.Flush(); + fileLength += keybindString.Length; + } + file.Dispose(); + } + playerKeys.Clear(); + foreach (KeyValuePair> keybind in newKeys) + playerKeys[keybind.Key] = new List(keybind.Value); + ResetEncounterInputs(); + } + + /// + /// This function returns whether a given key is recognized by CYF or not. + /// + /// KEy to check for. + /// True if the key is valid, false otherwise. + public static bool CheckKeyValidity(string key) { + KeyCode keycode; + if (ParseUtil.TryParseEnum(typeof(KeyCode), key, out keycode)) + return true; + + if (knownAxes.Contains(key)) + return true; + + return false; + } + + // Shortcuts for existing keys + public ButtonState Confirm { get { return StateFor("Confirm"); } } + public ButtonState Cancel { get { return StateFor("Cancel"); } } + public ButtonState Menu { get { return StateFor("Menu"); } } + public ButtonState Up { get { return StateFor("Up"); } } + public ButtonState Down { get { return StateFor("Down"); } } + public ButtonState Left { get { return StateFor("Left"); } } + public ButtonState Right { get { return StateFor("Right"); } } + + /// + /// This function queries the current state of an existing keyboard key or axis. + /// + /// A keyboard key known by Unity, or axis. + /// ButtonState depending on the state of the key (pressed, held, released, none). + public ButtonState Key(string key) { + if (knownAxes.Contains(key)) + return StateForAxis(key); + return StateFor((KeyCode)Enum.Parse(typeof(KeyCode), key)); + } + + /// + /// This function returns the state of the selected key. + /// + /// Key to check the state of. + /// state of the key (pressed, held, released, none). private static ButtonState StateFor(KeyCode c) { if (Input.GetKeyDown(c)) return ButtonState.PRESSED; if (Input.GetKeyUp(c)) return ButtonState.RELEASED; - return Input.GetKey(c) ? ButtonState.HELD - : ButtonState.NONE; + return Input.GetKey(c) ? ButtonState.HELD + : ButtonState.NONE; + } + + /// + /// Priority of each key state, in descending order: + /// 2 = HELD + /// 1 = PRESSED + /// -1 = RELEASED + /// 0 = NONE + /// + private static readonly int[] priority = new int[] { 2, 1, -1, 0 }; + /// + /// This function returns the state with the highest priority among the keys linked to a named key. + /// + /// Named key to check for (ex: Confirm). + /// State of the key with the highest priority among the set. + public static ButtonState StateFor(string keybind) { + List keys; + encounterKeys.TryGetValue(keybind, out keys); + if (keys == null) + throw new CYFException("The keybind or key \"" + keybind + "\" doesn't exist."); + + List keycodes = new List(); + List axes = new List(); + + foreach (string key in keys) { + if (knownAxes.Contains(key)) axes.Add(key); + else keycodes.Add((KeyCode)Enum.Parse(typeof(KeyCode), key)); + } + + List states = keycodes.Select(k => StateFor(k)).ToList(); + foreach (string axis in axes) + states.Add(StateForAxis(axis)); + + ButtonState result = ButtonState.NONE; + int resultPriority = Array.IndexOf(priority, (int)result); + foreach (ButtonState state in states) { + int statePriority = Array.IndexOf(priority, (int)state); + if (statePriority < resultPriority) { + result = state; + resultPriority = statePriority; + if (resultPriority == 0) + break; + } + } + + return result; + } + + /// + /// This function returns the state of the selected axis key. + /// + /// Axis key to check for. + /// The state of the selected axis key + public static ButtonState StateForAxis(string axisKey) { + int state = 0; + string axisName = axisKey.Substring(0, axisKey.Length - 2); + float axisState = Input.GetAxis(axisName); + if (axisKey.Substring(axisKey.Length - 1).Equals("+")) { + if (axes[axisName] >= 0.7f) + state -= 1; + if (axisState > 0.7f) + state = -state + 1; + } else { + if (axes[axisName] <= -0.7f) + state -= 1; + if (axisState < -0.7f) + state = -state + 1; + } + return (ButtonState)state; } - private static ButtonState StateFor(params KeyCode[] keys) { - return keys.Select(StateFor).FirstOrDefault(state => state != ButtonState.NONE); + /// + /// This function is run after all other Update() calls within the engine are run. + /// + public void LateUpdate() { + string[] axesNames = axes.Keys.ToArray(); + foreach (string axis in axesNames) + axes[axis] = Input.GetAxis(axis); } } diff --git a/Assets/Scripts/Device/Input/UndertaleInput.cs b/Assets/Scripts/Device/Input/UndertaleInput.cs deleted file mode 100644 index 14dcc8219..000000000 --- a/Assets/Scripts/Device/Input/UndertaleInput.cs +++ /dev/null @@ -1,17 +0,0 @@ -public abstract class UndertaleInput { - public enum ButtonState { - RELEASED = -1, - NONE = 0, - PRESSED = 1, - HELD = 2 - } - - public abstract ButtonState Confirm { get; } - public abstract ButtonState Cancel { get; } - public abstract ButtonState Menu { get; } - public abstract ButtonState Up { get; } - public abstract ButtonState Down { get; } - public abstract ButtonState Left { get; } - public abstract ButtonState Right { get; } - public abstract ButtonState Key(string Key); -} diff --git a/Assets/Scripts/Device/ScreenResolution.cs b/Assets/Scripts/Device/ScreenResolution.cs index 6099f3544..9a23a00d7 100644 --- a/Assets/Scripts/Device/ScreenResolution.cs +++ b/Assets/Scripts/Device/ScreenResolution.cs @@ -39,9 +39,7 @@ public void Start() { FSBorderRect = new Rect(inset/2, 0f, 1f-inset, 1f); } - #if !UNITY_EDITOR - SceneManager.sceneLoaded += BoxCameras2; - #endif + SceneManager.sceneLoaded += BoxCameras2; // Load BGCamera Prefab and have it be in every scene, from the moment CYF starts. // This is necessary so BGCamera will clear out old frames outside of the Main Camera's display rect. @@ -127,7 +125,7 @@ public static void SetFullScreen(bool fullscreen, int fswitch = 1, int width = - } } - #if UNITY_STANDALONE_WIN + #if UNITY_STANDALONE_WIN && !UNITY_EDITOR GlobalControls.fullscreenSwitch = fswitch; #elif UNITY_EDITOR mousePosShift = new Vector2(); @@ -163,6 +161,8 @@ public static void BoxCameras(float newOrthographicSize, Rect rect) { Camera cam, cam2 = null; if (GlobalControls.isInFight && UIController.instance != null && (UIController.instance.encounter == null || !UIController.instance.encounter.gameOverStance)) { cam = GameObject.Find("Main Camera").GetComponent(); + if (GameOverBehavior.gameOverContainer == null) + GameOverBehavior.gameOverContainer = GameObject.Find("GameOverContainer"); cam2 = GameOverBehavior.gameOverContainer.transform.GetComponentInChildren(true); } else cam = Camera.main; diff --git a/Assets/Scripts/Discord/ActivityManager.cs b/Assets/Scripts/Discord/ActivityManager.cs deleted file mode 100644 index db0d73c33..000000000 --- a/Assets/Scripts/Discord/ActivityManager.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; - -namespace Discord { - - public partial class ActivityManager { - - public void RegisterCommand() { - RegisterCommand(null); - } - - } - -} diff --git a/Assets/Scripts/Inventory/Inventory.cs b/Assets/Scripts/Inventory/Inventory.cs index 3960ed470..235c9d8f8 100644 --- a/Assets/Scripts/Inventory/Inventory.cs +++ b/Assets/Scripts/Inventory/Inventory.cs @@ -12,7 +12,7 @@ public static class Inventory { public static List addedItemsTypes = new List(); public static LuaInventory luaInventory; public static int inventorySize = 8; - public static int tempAmount; + public static int itemStatAmount; public static Dictionary NametoDesc = new Dictionary(), NametoShortName = new Dictionary(); public static Dictionary NametoType = new Dictionary(), NametoPrice = new Dictionary(); public static bool usedItemNoDelete; @@ -73,34 +73,35 @@ public static bool TryCall(string func, DynValue[] param = null) { public static void UseItem(int ID) { usedItemNoDelete = false; - tempAmount = 0; - string Name = inventory[ID].Name, replacement; + itemStatAmount = 0; + string Name = inventory[ID].Name, replacement = ""; int type = inventory[ID].Type; - float amount; + float amount = -991; TryCall("HandleItem", new[] { DynValue.NewString(Name.ToUpper()), DynValue.NewNumber(ID + 1) }); - TextMessage[] mess = { }; - if (addedItems.Count != 0) { - if (addedItems.Any(t => string.Equals(t, Name, StringComparison.CurrentCultureIgnoreCase))) { - if (type == 1 || type == 2) - mess = ChangeEquipment(ID, mess); - if (!usedItemNoDelete && type == 0) - inventory.RemoveAt(ID); - if ((type == 1 || type == 2) && mess.Length != 0 && !UIController.instance.battleDialogueStarted) - UIController.instance.ActionDialogResult(mess); - return; - } - } - ItemLibrary(Name, type, out mess, out amount, out replacement); + // Check if the current item has been added to the list of custom items + bool foundCustomItem = false; + if (addedItems.Count != 0 && !UnitaleUtil.IsOverworld) + if (addedItems.Any(t => string.Equals(t, Name, StringComparison.CurrentCultureIgnoreCase))) + foundCustomItem = true; + + TextMessage[] mess = null; + // Check the standard CYF item dictionary + if (!foundCustomItem) ItemLibrary(Name, type, out mess, out amount, out replacement); + if (type == 1 || type == 2) { - tempAmount = (int)amount; - mess = ChangeEquipment(ID, mess); - } - if (replacement != null) { + // Equip the item if it's a weapon or armor + if ((int)amount != -991) + itemStatAmount = (int)amount; + mess = ChangeEquipment(ID); + } else if (replacement != "") { + // Replace the current item with another if it has a replacement item inventory.RemoveAt(ID); inventory.Insert(ID, new UnderItem(replacement)); - } else if (type == 0) + } else if (!usedItemNoDelete && type == 0) + // Delete the item if it's a standard consumable inventory.RemoveAt(ID); + if (!UnitaleUtil.IsOverworld) { if (!UIController.instance.battleDialogueStarted && mess != null) UIController.instance.ActionDialogResult(mess); @@ -277,7 +278,7 @@ private static string HPRecoverString(float HP) { } public static void ItemLibrary(string name, int type, out TextMessage[] mess, out float amount, out string replacement) { - mess = null; amount = 0; replacement = null; + mess = null; amount = 0; replacement = ""; switch (type) { case 0: switch (name) { @@ -445,7 +446,7 @@ public static void ItemLibrary(string name, int type, out TextMessage[] mess, ou mess = new[] { new TextMessage("Through DETERMINATION, the dream\rbecame true." + HPRecoverString(amount), true, false) }; break; default: - UnitaleUtil.Warn("The item " + name + " doesn't exist in CYF's usable item pool."); + UnitaleUtil.Warn("The item " + name + " doesn't exist in CYF's consumable item pool."); break; } if (amount != 0) @@ -521,13 +522,13 @@ private static void SetEquip(int ID) { switch (mode) { case 1: - PlayerCharacter.instance.WeaponATK = tempAmount; + PlayerCharacter.instance.WeaponATK = itemStatAmount; RemoveItem(ID); AddItem(PlayerCharacter.instance.Weapon); PlayerCharacter.instance.Weapon = Name; break; case 2: - PlayerCharacter.instance.ArmorDEF = tempAmount; + PlayerCharacter.instance.ArmorDEF = itemStatAmount; RemoveItem(ID); AddItem(PlayerCharacter.instance.Armor); PlayerCharacter.instance.Armor = Name; @@ -537,13 +538,10 @@ private static void SetEquip(int ID) { } } - public static void ChangeEquipment(int itemIndex) { SetEquip(itemIndex); } - - public static TextMessage[] ChangeEquipment(int ID, TextMessage[] mess) { + public static TextMessage[] ChangeEquipment(int ID, bool silent = false) { string name = inventory[ID].Name; SetEquip(ID); - mess = mess.Length == 0 ? new[] { new TextMessage("You equipped the " + name + ".", true, false) } : new TextMessage[] { }; - return mess; + return silent ? null : new[] { new TextMessage("You equipped the " + name + ".", true, false) }; } public static void RemoveAddedItems() { diff --git a/Assets/Scripts/Lua/CLRBindings/LuaArenaStatus.cs b/Assets/Scripts/Lua/CLRBindings/LuaArenaStatus.cs index e4645d72d..d7c9beeb2 100644 --- a/Assets/Scripts/Lua/CLRBindings/LuaArenaStatus.cs +++ b/Assets/Scripts/Lua/CLRBindings/LuaArenaStatus.cs @@ -53,8 +53,9 @@ public void ResizeImmediate(int w, int h) { ArenaManager.instance.ResizeImmediate(w, h); } - public void Hide() { + public void Hide(bool showWhenWaveEnds = true) { ArenaManager.instance.Hide(); + ArenaManager.instance.showWhenWaveEnds = showWhenWaveEnds; } public void Show() { diff --git a/Assets/Scripts/Lua/CLRBindings/LuaCYFObject.cs b/Assets/Scripts/Lua/CLRBindings/LuaCYFObject.cs new file mode 100644 index 000000000..6471cb7eb --- /dev/null +++ b/Assets/Scripts/Lua/CLRBindings/LuaCYFObject.cs @@ -0,0 +1,43 @@ +using MoonSharp.Interpreter; +using UnityEngine; + +public class LuaCYFObject { + public Transform transform; + + public string name { + get { return transform.gameObject.name; } + } + + public int childIndex { + get { return transform.GetSiblingIndex() + 1; } + set { transform.SetSiblingIndex(value - 1); } + } + public int childCount { + get { return transform.childCount; } + } + + public LuaCYFObject(Transform t) { + transform = t; + } + + public DynValue GetParent() { + return UnitaleUtil.GetObjectParent(transform); + } + + public void SetParent(object p) { + UnitaleUtil.SetObjectParent(this, p); + } + + public DynValue GetChild(int index) { + if (index > childCount) + throw new CYFException("This object only has " + childCount + " children yet you try to get its child #" + index); + return UnitaleUtil.GetObject(transform.GetChild(--index)); + } + + public DynValue[] GetChildren() { + DynValue[] tab = new DynValue[transform.childCount]; + for (int i = 0; i < transform.childCount; i++) + tab[i] = GetChild(i + 1); + return tab; + } +} diff --git a/Assets/Scripts/Lua/CLRBindings/LuaCYFObject.cs.meta b/Assets/Scripts/Lua/CLRBindings/LuaCYFObject.cs.meta new file mode 100644 index 000000000..21e7577ea --- /dev/null +++ b/Assets/Scripts/Lua/CLRBindings/LuaCYFObject.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3acc14db707d43641acaf6c1f9301ebf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Lua/CLRBindings/LuaFile.cs b/Assets/Scripts/Lua/CLRBindings/LuaFile.cs index aa7dac514..e8c51ff17 100644 --- a/Assets/Scripts/Lua/CLRBindings/LuaFile.cs +++ b/Assets/Scripts/Lua/CLRBindings/LuaFile.cs @@ -123,8 +123,9 @@ public void Copy(string newPath, bool overwrite = false) { string origNewPath = newPath; FileLoader.SanitizePath(ref newPath, "", false, true, false); - if (!File.Exists(filePath)) throw new CYFException("The file at the path \"" + filePath + "\" doesn't exist, so you can't move it."); + if (!File.Exists(filePath)) throw new CYFException("The file at the path \"" + filePath + "\" doesn't exist, so you can't copy it."); if (File.Exists(newPath) && !overwrite) throw new CYFException("The file at the path \"" + origNewPath + "\" already exists."); + if (newPath == filePath) throw new CYFException("Cannot copy a file to its own location!"); try { File.Copy(filePath, newPath, overwrite); } catch (DirectoryNotFoundException) { throw new CYFException("File.Copy: Could not find part or all of the path:\n\"" + origNewPath + "\"\n\nMake sure the path specified is valid, and its total length (" + origNewPath.Length + " characters, " + newPath.Length + " after sanitization) is not too long."); } diff --git a/Assets/Scripts/Lua/CLRBindings/LuaInputBinding.cs b/Assets/Scripts/Lua/CLRBindings/LuaInputBinding.cs index c4127ee2c..ddf6d79cd 100644 --- a/Assets/Scripts/Lua/CLRBindings/LuaInputBinding.cs +++ b/Assets/Scripts/Lua/CLRBindings/LuaInputBinding.cs @@ -1,10 +1,18 @@ using UnityEngine; using System; +using MoonSharp.Interpreter; +using System.Linq; +using System.Collections.Generic; public class LuaInputBinding { - private readonly UndertaleInput input; - public LuaInputBinding(UndertaleInput baseInput) { input = baseInput; } + private readonly IUndertaleInput input; + public LuaInputBinding(IUndertaleInput baseInput) { input = baseInput; } + ////////////////// + // Basic inputs // + ////////////////// + + // Create Your Frisk's basic keys public int Confirm { get { return (int)input.Confirm; } } public int Cancel { get { return (int)input.Cancel; } } public int Menu { get { return (int)input.Menu; } } @@ -13,11 +21,24 @@ public class LuaInputBinding { public int Left { get { return (int)input.Left; } } public int Right { get { return (int)input.Right; } } - public int GetKey(string Key) { - try { return (int)input.Key(Key); } - catch (Exception) { throw new CYFException("Input.GetKey(): The key \"" + Key + "\" doesn't exist."); } + public int GetKey(string key) { + try { + if (!keyStateNeedsReload) + return keyStates[key]; + return (int)input.Key(key); + } catch { throw new CYFException("Input.GetKey(): The key \"" + key + "\" doesn't exist."); } + } + + public float GetAxisRaw(string axis) { + if (!KeyboardInput.axes.ContainsKey(axis)) + throw new CYFException("Input.GetAxisRaw(): The axis \"" + axis + "\" doesn't exist."); + return Input.GetAxisRaw(axis); } + ////////////////////////// + // Mouse-related inputs // + ////////////////////////// + // X and Y position of the mouse // The X position of the mouse is taken from ScreenResolution so that the value is correct even if WideScreen is enabled public int MousePosX { get { return (int) (ScreenResolution.mousePosition.x / ScreenResolution.displayedSize.x * 640); } } @@ -26,15 +47,83 @@ public int GetKey(string Key) { public int MousePosAbsX { get { return (int) (Input.mousePosition.x / ScreenResolution.displayedSize.x * 640); } } public int MousePosAbsY { get { return (int) (Input.mousePosition.y / ScreenResolution.displayedSize.y * 480); } } - public bool isMouseInWindow { + public bool IsMouseInWindow { get { if (ScreenResolution.wideFullscreen && Screen.fullScreen) return true; Rect screenRect = new Rect(0, 0, ScreenResolution.displayedSize.x, Screen.height); return screenRect.Contains(ScreenResolution.mousePosition); } } - public bool IsMouseInWindow { get { return isMouseInWindow; } } - public float mouseScroll { get { return Input.mouseScrollDelta.y; } } - public float MouseScroll { get { return mouseScroll; } } + public bool IsMouseVisible { + get { return Cursor.visible; } + set { Cursor.visible = value; } + } + + public float MouseScroll { get { return Input.mouseScrollDelta.y; } } + + //////////////////////// + // Keystate recording // + //////////////////////// + [MoonSharpHidden] private readonly Dictionary keyStates = new Dictionary(); + [MoonSharpHidden] private bool keyStateNeedsReload = true; + + [MoonSharpHidden] public void Update() { keyStateNeedsReload = true; } + + [MoonSharpHidden] public void ReloadKeyStates() { + keyStates.Clear(); + foreach (string k in Enum.GetNames(typeof(KeyCode))) + keyStates.Add(k, GetKey(k)); + keyStateNeedsReload = false; + } + + public string[] GetPressedKeys() { + if (keyStateNeedsReload) + ReloadKeyStates(); + return keyStates.Where(kv => kv.Value == 1).Select(kv => kv.Key).ToArray(); + } + public string[] GetHeldKeys() { + if (keyStateNeedsReload) + ReloadKeyStates(); + return keyStates.Where(kv => kv.Value == 2).Select(kv => kv.Key).ToArray(); + } + public string[] GetReleasedKeys() { + if (keyStateNeedsReload) + ReloadKeyStates(); + return keyStates.Where(kv => kv.Value == -1).Select(kv => kv.Key).ToArray(); + } + + ////////////// + // Keybinds // + ////////////// + public void CreateKeybind(string keybind, string[] keysToBind = null) { KeyboardInput.CreateKeybind(keybind, keysToBind); } + public void RemoveKeybind(string keybind) { KeyboardInput.DeleteKeybind(keybind); } + public void SetKeybindKeys(string keybind, string[] keysToBind = null) { KeyboardInput.SetKeybindKeys(keybind, keysToBind); } + + public bool BindKeyToKeybind(string keybind, string keyToAdd) { return KeyboardInput.AddKeyToKeybind(keybind, keyToAdd); } + public bool UnbindKeyFromKeybind(string keybind, string keyToRemove) { return KeyboardInput.RemoveKeyFromKeybind(keybind, keyToRemove); } + + public int GetKeybind(string keybind) { return (int)KeyboardInput.StateFor(keybind); } + + public string[] GetKeybindKeys(string keybind) { return KeyboardInput.GetKeybindKeys(keybind); } + public string[][] GetKeybindConflicts() { + Dictionary conflicts = KeyboardInput.GetConflicts(KeyboardInput.encounterKeys); + return conflicts.Select( + (p) => { + List temp = p.Value.ToList(); + temp.Insert(0, p.Key); + return temp.ToArray(); + }).ToArray(); + } + + public void ResetKeybinds() { KeyboardInput.LoadPlayerKeys(); } + + public DynValue this[string keybind] { + get { return DynValue.NewNumber(GetKeybind(keybind)); } + set { + if (value.Type != DataType.Table || !value.Table.Values.All(d => d.Type == DataType.String)) + throw new CYFException("You need to provide a table of keys as strings to set the keybind to."); + SetKeybindKeys(keybind, value.Table.Values.Select(d => d.String).ToArray()); + } + } } diff --git a/Assets/Scripts/Lua/CLRBindings/LuaInventory.cs b/Assets/Scripts/Lua/CLRBindings/LuaInventory.cs index f89f4a421..f5b3ca5b4 100644 --- a/Assets/Scripts/Lua/CLRBindings/LuaInventory.cs +++ b/Assets/Scripts/Lua/CLRBindings/LuaInventory.cs @@ -86,6 +86,6 @@ public bool NoDelete { } public void SetAmount(int amount) { - Inventory.tempAmount = amount; + Inventory.itemStatAmount = amount; } } \ No newline at end of file diff --git a/Assets/Scripts/Lua/CLRBindings/LuaPlayerStatus.cs b/Assets/Scripts/Lua/CLRBindings/LuaPlayerStatus.cs index 20ab477d8..8a4cdbe27 100644 --- a/Assets/Scripts/Lua/CLRBindings/LuaPlayerStatus.cs +++ b/Assets/Scripts/Lua/CLRBindings/LuaPlayerStatus.cs @@ -372,5 +372,5 @@ public void ForceMultiAttack(int[] targets = null, int[] damage = null) { UIController.instance.fightUI.QuickInit(damage); } - public void CheckDeath() { UIController.instance.needOnDeath = true; } + public void CheckDeath() { UIController.instance.checkDeathCall = true; } } \ No newline at end of file diff --git a/Assets/Scripts/Lua/CLRBindings/LuaPlayerUI.cs b/Assets/Scripts/Lua/CLRBindings/LuaPlayerUI.cs index d04c9681e..3e856a037 100644 --- a/Assets/Scripts/Lua/CLRBindings/LuaPlayerUI.cs +++ b/Assets/Scripts/Lua/CLRBindings/LuaPlayerUI.cs @@ -1,4 +1,6 @@ -using System; +using MoonSharp.Interpreter; +using System; +using System.Linq; using UnityEngine; using UnityEngine.UI; using Object = UnityEngine.Object; @@ -34,6 +36,22 @@ public LuaTextManager hptext { get { return UIStats.instance.hpTextMan; } } + public LuaTextManager maintext { + get { return UIController.instance.mainTextManager; } + } + + public LuaSpriteController mugshot { + get { return UIController.instance.mainTextManager.mugshot; } + } + + public LuaSpriteController mugshotmask { + get { return UIController.instance.mainTextManager.mugshotMask; } + } + + public DynValue enemylifebarlist { + get { return DynValue.NewTable(null, UIController.instance.arenaParent.GetComponentsInChildren().Select(p => UserData.Create(p)).ToArray()); } + } + public static LuaSpriteController fightbtn { get { return LuaSpriteController.GetOrCreate(UIController.instance.fightButton.gameObject); } @@ -52,6 +70,11 @@ public static LuaSpriteController mercybtn { } + public static LuaCYFObject root { + get { return new LuaCYFObject(Object.FindObjectOfType().transform); } + } + + public void StopUpdate(bool toggle) { ui.stopUIUpdate = toggle; } @@ -62,7 +85,7 @@ public void Hide(bool hide) { public void RepositionHPElements() { hpbar.transform.position = new Vector3(ui.hpLabel.absx + ui.hpLabel.spr.GetComponent().sizeDelta.x + 8, hpbar.transform.position.y, hpbar.transform.position.z); - ui.hpTextMan.transform.position = new Vector3(hpbar.background.absx + hpbar.backgroundRt.sizeDelta.x + 14, ui.hpTextMan.transform.position.y, ui.hpTextMan.transform.position.z); + ui.hpTextMan.MoveToAbs(hpbar.background.absx + hpbar.backgroundRt.sizeDelta.x + 14, ui.hpTextMan.transform.position.y); } public void Reset() { @@ -143,7 +166,7 @@ public void ResetButtonPosition(string btn, bool resetX = true, bool resetY = tr if (!UIController.instance.buttonDictionary.TryGetValue(btn, out image)) throw new CYFException("ResetButtonPosition() can only take \"FIGHT\", \"ACT\", \"ITEM\" or \"MERCY\", but you entered \"" + btn + "\"."); UIController.instance.buttonBasePositions.TryGetValue(btn, out basePos); - image.transform.position = new Vector3(resetX ? basePos.x : image.transform.position.x, resetY ? basePos.y : image.transform.position.y); + image.rectTransform.anchoredPosition = new Vector3(resetX ? basePos.x : image.transform.position.x, resetY ? basePos.y : image.transform.position.y); UpdateButtons(); } diff --git a/Assets/Scripts/Lua/CLRBindings/LuaSpriteController.cs b/Assets/Scripts/Lua/CLRBindings/LuaSpriteController.cs index 02735a3f2..502910096 100644 --- a/Assets/Scripts/Lua/CLRBindings/LuaSpriteController.cs +++ b/Assets/Scripts/Lua/CLRBindings/LuaSpriteController.cs @@ -36,6 +36,7 @@ public void Reset() { img.GetComponent().color = new Color(1, 1, 1, 1); Mask("OFF"); + img.GetComponent().inverted = false; shader.Revert(); StopAnimation(); @@ -57,89 +58,76 @@ public string spritename { // The x position of the sprite, relative to the arena position and its anchor. public float x { get { - float val = img.GetComponent().anchoredPosition.x; - if (img.transform.parent == null) return val; - if (img.transform.parent.name == "SpritePivot") - val += img.transform.parent.localPosition.x; - return val; - } - set { - if (img.transform.parent != null && img.transform.parent.name == "SpritePivot") - img.transform.parent.localPosition = new Vector3(value, img.transform.parent.localPosition.y, img.transform.parent.localPosition.z) - (Vector3)img.GetComponent().anchoredPosition; - else - img.GetComponent().anchoredPosition = new Vector2(value, img.GetComponent().anchoredPosition.y); + float letterAdjustShift = 0; + if (tag == "letter") { + TextManager tm = img.transform.parent.GetComponent(); + letterAdjustShift = tm.letterAdjustShifts[tm.letters.FindIndex(l => l.image.gameObject == img)].x; + } + return letterAdjustShift + img.GetComponent().anchoredPosition.x + (GetTarget().gameObject != img ? GetTarget().transform.localPosition.x : 0); } + set { MoveTo(value, y); } } // The y position of the sprite, relative to the arena position and its anchor. public float y { get { - float val = img.GetComponent().anchoredPosition.y; - if (img.transform.parent == null) return val; - if (img.transform.parent.name == "SpritePivot") - val += img.transform.parent.localPosition.y; - return val; - } - set { - if (img.transform.parent != null && img.transform.parent.name == "SpritePivot") - img.transform.parent.localPosition = new Vector3(img.transform.parent.localPosition.x, value, img.transform.parent.localPosition.z) - (Vector3)img.GetComponent().anchoredPosition; - else - img.GetComponent().anchoredPosition = new Vector2(img.GetComponent().anchoredPosition.x, value); - } + float letterAdjustShift = 0; + if (tag == "letter") { + TextManager tm = img.transform.parent.GetComponent(); + letterAdjustShift = tm.letterAdjustShifts[tm.letters.FindIndex(l => l.image.gameObject == img)].y; + } + return letterAdjustShift + img.GetComponent().anchoredPosition.y + (GetTarget().gameObject != img ? GetTarget().transform.localPosition.y : 0); } + set { MoveTo(x, value); } } // The z position of the sprite, relative to the arena position and its anchor. (Only useful in the overworld) public float z { - get { return GetTarget().localPosition.z; } - set { - Transform target = GetTarget(); - target.localPosition = new Vector3(target.localPosition.x, target.localPosition.y, value); - } + get { return img.GetComponent().localPosition.z + (GetTarget().gameObject != img ? GetTarget().transform.localPosition.z : 0); } + set { MoveTo(x, y, value); } } // The x position of the sprite, relative to the bottom left corner of the screen. public float absx { - get { return GetTarget().position.x; } - set { - Transform target = GetTarget(); - target.position = new Vector3(value, target.position.y, target.position.z); + get { + float letterAdjustShift = 0; + if (tag == "letter") { + TextManager tm = img.transform.parent.GetComponent(); + letterAdjustShift = tm.letterAdjustShifts[tm.letters.FindIndex(l => l.image.gameObject == img)].x; + } + return letterAdjustShift + GetTarget().position.x; } + set { MoveToAbs(value, absy); } } // The y position of the sprite, relative to the bottom left corner of the screen. public float absy { - get { return GetTarget().position.y; } - set { - Transform target = GetTarget(); - target.position = new Vector3(target.position.x, value, target.position.z); + get { + float letterAdjustShift = 0; + if (tag == "letter") { + TextManager tm = img.transform.parent.GetComponent(); + letterAdjustShift = tm.letterAdjustShifts[tm.letters.FindIndex(l => l.image.gameObject == img)].y; + } + return letterAdjustShift + GetTarget().position.y; } + set { MoveToAbs(absx, value); } } // The z position of the sprite, relative to the bottom left corner of the screen. (Only useful in the overworld) public float absz { get { return GetTarget().position.z; } - set { - Transform target = GetTarget(); - target.position = new Vector3(target.position.x, target.position.y, value); - } + set { MoveToAbs(absx, absy, value); } } // The x scale of the sprite. This variable is used for the same purpose as img, to be able to do other things when setting the variable public float xscale { get { return xScale; } - set { - xScale = value; - Scale(xScale, yScale); - } + set { Scale(value, yScale); } } // The y scale of the sprite. public float yscale { get { return yScale; } - set { - yScale = value; - Scale(xScale, yScale); - } + set { Scale(xScale, value); } } // Is the sprite active? True if the image of the sprite isn't null, false otherwise @@ -180,10 +168,9 @@ public float ypivot { // Is the current animation finished? True if there is a finished animation, false otherwise public bool animcomplete { get { - if (keyframes == null) - if (img.GetComponent()) - keyframes = img.GetComponent(); - if (keyframes == null) return false; + if (keyframes == null && img.GetComponent()) + keyframes = img.GetComponent(); + if (keyframes == null) return false; if (keyframes.enabled == false) return true; if (loop == KeyframeCollection.LoopMode.LOOP) return false; return keyframes.enabled && keyframes.animationComplete(); @@ -250,9 +237,6 @@ public float[] color32 { set { if (value == null) throw new CYFException("sprite.color can't be nil."); - for (int i = 0; i < value.Length; i++) - if (value[i] < 0) value[i] = 0; - else if (value[i] > 255) value[i] = 255; if (img.GetComponent()) { Image imgtemp = img.GetComponent(); // If we don't have three/four floats, we throw an error @@ -315,18 +299,53 @@ public float alpha32 { } } + // The local rotation of the sprite + public float localRotation { + get { + if (GlobalControls.isInFight && EnemyEncounter.script.GetVar("noscalerotationbug").Boolean) { + return Math.Mod(img.transform.localEulerAngles.z + (yScale < 0 ? 180 : 0), 360); + } + return Math.Mod(internalRotation.z - img.transform.parent.eulerAngles.z, 360); + } + set { + // We mod the value from 0 to 360 because angles are between 0 and 360 normally + internalRotation.z = Math.Mod(img.transform.parent.eulerAngles.z + value, 360); + img.transform.eulerAngles = internalRotation; + + if (img.GetComponent() && img.GetComponent().isPP()) + img.GetComponent().needSizeRefresh = true; + } + } + // The rotation of the sprite public float rotation { - get { return internalRotation.z; } + get { + if (GlobalControls.isInFight && EnemyEncounter.script.GetVar("noscalerotationbug").Boolean) { + return Math.Mod(img.transform.eulerAngles.z + (yScale < 0 ? 180 : 0), 360); + } + return internalRotation.z; + } set { // We mod the value from 0 to 360 because angles are between 0 and 360 normally internalRotation.z = Math.Mod(value, 360); - img.GetComponent().eulerAngles = internalRotation; + img.transform.eulerAngles = internalRotation; + if (img.GetComponent() && img.GetComponent().isPP()) img.GetComponent().needSizeRefresh = true; } } + private float GetParentRot() { + Transform t = spr.transform.parent; + while (t != null) { + CYFSprite sprite = t.GetComponent(); + if (sprite != null) + return sprite.ctrl.rotation; + t = t.parent; + } + return 0; + } + // The layer of the sprite public string layer { // You can't get or set the layer on an enemy sprite @@ -351,6 +370,14 @@ public string layer { } } + public int characterNumber { + get { + if (tag != "letter") + throw new CYFException("You can only use characterNumber on letters!"); + return img.GetComponent().characterNumber; + } + } + /* public bool filter { get { return img.sprite.texture.filterMode != FilterMode.Point; } @@ -392,6 +419,11 @@ public static LuaSpriteController GetOrCreate(GameObject go, bool forceReset = f return ctrl; } + public static bool HasSpriteController(GameObject go) { + CYFSprite newSpr = go.GetComponent(); + return newSpr != null && newSpr.ctrl != null; + } + // Changes the sprite of this instance public void Set(string name) { // Change the sprite @@ -416,23 +448,11 @@ public void Set(string name) { img.GetComponent().needUpdateTex = true; } - // Sets the parent of a sprite. - public void SetParent(LuaSpriteController parent) { - if (parent == null) throw new CYFException("sprite.SetParent() can't set null as the sprite's parent."); - if (tag == "event" || parent != null && parent.tag == "event") throw new CYFException("sprite.SetParent() can not be used with an Overworld Event's sprite."); - if (tag == "letter" ^ (parent != null && parent.tag == "letter")) throw new CYFException("sprite.SetParent() can not be used between letter sprites and other sprites."); - try { - GetTarget().SetParent(parent.img.transform); - if (img.GetComponent()) - img.GetComponent().inverted = parent._masked == MaskMode.INVERTEDSPRITE || parent._masked == MaskMode.INVERTEDSTENCIL; - } catch { throw new CYFException("sprite.SetParent(): You tried to set a removed sprite/nil sprite as this sprite's parent."); } - } - // Sets the pivot of a sprite (its rotation point) public void SetPivot(float x, float y) { img.GetComponent().pivot = new Vector2(x, y); if (img.transform.parent != null && img.transform.parent.name == "SpritePivot") - img.GetComponent().localPosition = new Vector3(0, 0, 0); + img.transform.localPosition = new Vector3(0, 0, 0); } // Sets the anchor of a sprite @@ -441,22 +461,18 @@ public void SetAnchor(float x, float y) { img.GetComponent().anchorMax = new Vector2(x, y); } - public void Move(float x, float y) { + public void Move(float x, float y) { Move(x, y, 0); } + public void Move(float x, float y, float z) { MoveTo(this.x + x, this.y + y, this.z + z); } + public void MoveTo(float x, float y) { MoveTo(x, y, GetTarget().localPosition.z); } + public void MoveTo(float x, float y, float z) { if (img.transform.parent != null && img.transform.parent.name == "SpritePivot") - img.transform.parent.localPosition = new Vector3(x + this.x, y + this.y, img.transform.parent.localPosition.z) - (Vector3)img.GetComponent().anchoredPosition; - else - img.GetComponent().anchoredPosition = new Vector2(x + this.x, y + this.y); - } - - public void MoveTo(float x, float y) { - if (img.transform.parent != null && img.transform.parent.name == "SpritePivot") - img.transform.parent.localPosition = new Vector3(x, y, img.transform.parent.localPosition.z) - (Vector3)img.GetComponent().anchoredPosition; + GetTarget().localPosition = new Vector3(x, y, z) - (Vector3)img.GetComponent().anchoredPosition; else img.GetComponent().anchoredPosition = new Vector2(x, y); } - - public void MoveToAbs(float x, float y) { - GetTarget().position = new Vector3(x, y, GetTarget().position.z); + public void MoveToAbs(float x, float y) { MoveToAbs(x, y, GetTarget().position.z); } + public void MoveToAbs(float x, float y, float z) { + GetTarget().position = new Vector3(x, y, z); } // Sets both xScale and yScale of a sprite @@ -471,16 +487,16 @@ public void Scale(float xs, float ys) { } else if (img.GetComponent()) { // In battle nativeSizeDelta = new Vector2(img.GetComponent().sprite.texture.width, img.GetComponent().sprite.texture.height); img.GetComponent().sizeDelta = new Vector2(nativeSizeDelta.x * Mathf.Abs(xScale), nativeSizeDelta.y * Mathf.Abs(yScale)); - // img.GetComponent().localScale = new Vector3(xs < 0 ? -1 : 1, ys < 0 ? -1 : 1, 1); + // img.transform.localScale = new Vector3(xs < 0 ? -1 : 1, ys < 0 ? -1 : 1, 1); } else { // In overworld nativeSizeDelta = new Vector2(img.GetComponent().sprite.texture.width, img.GetComponent().sprite.texture.height); - img.GetComponent().localScale = new Vector3(100 * Mathf.Abs(xScale), 100 * Mathf.Abs(yScale), 1); + img.transform.localScale = new Vector3(100 * Mathf.Abs(xScale), 100 * Mathf.Abs(yScale), 1); } // Flip the sprite horizontally and/or vertically if its scale is negative - float zValue = GlobalControls.isInFight && EnemyEncounter.script.GetVar("noscalerotationbug").Boolean ? img.GetComponent().eulerAngles.z : internalRotation.z; + float zValue = internalRotation.z; internalRotation = new Vector3(ys < 0 ? 180 : 0, xs < 0 ? 180 : 0, zValue); - img.GetComponent().eulerAngles = internalRotation; + img.transform.eulerAngles = internalRotation; } // Sets an animation for this instance @@ -779,8 +795,53 @@ public DynValue this[string key] { private Transform GetTarget() { Transform target = img.transform; - if (img.transform.parent != null && img.transform.parent.name == "SpritePivot") - target = target.parent; + if (target.parent && target.parent.name == "SpritePivot") + return target.parent.transform; return target; } + + //////////////////// + // Children stuff // + //////////////////// + + public string name { + get { return img.name; } + } + + public int childIndex { + get { return img.transform.GetSiblingIndex() + 1; } + set { img.transform.SetSiblingIndex(value - 1); } + } + public int childCount { + get { return img.transform.childCount; } + } + + public DynValue GetParent() { + return UnitaleUtil.GetObjectParent(img.transform); + } + + public void SetParent(object parent) { + UnitaleUtil.SetObjectParent(this, parent); + LuaSpriteController sParent = parent as LuaSpriteController; + ProjectileController pParent = parent as ProjectileController; + if (pParent != null) + sParent = pParent.sprite; + if (sParent == null) + return; + if (img.GetComponent()) + img.GetComponent().inverted = sParent._masked == MaskMode.INVERTEDSPRITE || sParent._masked == MaskMode.INVERTEDSTENCIL; + } + + public DynValue GetChild(int index) { + if (index > childCount) + throw new CYFException("This object only has " + childCount + " children yet you try to get its child #" + index); + return UnitaleUtil.GetObject(img.transform.GetChild(--index)); + } + + public DynValue[] GetChildren() { + DynValue[] tab = new DynValue[img.transform.childCount]; + for (int i = 0; i < img.transform.childCount; i++) + tab[i] = GetChild(i + 1); + return tab; + } } diff --git a/Assets/Scripts/Lua/CLRBindings/LuaTextManager.cs b/Assets/Scripts/Lua/CLRBindings/LuaTextManager.cs index 026410547..5ce2e2607 100644 --- a/Assets/Scripts/Lua/CLRBindings/LuaTextManager.cs +++ b/Assets/Scripts/Lua/CLRBindings/LuaTextManager.cs @@ -1,14 +1,13 @@ using UnityEngine; -using UnityEngine.UI; using System; using System.Collections; using System.Collections.Generic; +using System.Linq; using MoonSharp.Interpreter; public class LuaTextManager : TextManager { private GameObject container; private bool removed; - private bool hidden; private GameObject containerBubble; private RectTransform speechThing; private RectTransform speechThingShadow; @@ -18,15 +17,63 @@ public class LuaTextManager : TextManager { private int countFrames; private int _bubbleHeight = -1; private BubbleSide bubbleSide = BubbleSide.NONE; - private ProgressMode progress = ProgressMode.AUTO; - private Color textColor; + [SerializeField] private ProgressMode progress = ProgressMode.AUTO; private float xScale = 1; private float yScale = 1; + private string _linePrefix = ""; [MoonSharpHidden] public bool autoSetLayer = true; private readonly Dictionary vars = new Dictionary(); + [MoonSharpHidden] public bool needFontReset = false; + [MoonSharpHidden] public bool isMainTextObject = false; - public bool isactive { - get { return !removed && !hidden; } + // Variables used to store text display adjustment variables + public Dictionary xScaleSizes = new Dictionary(); + public Dictionary yScaleSizes = new Dictionary(); + private float lastXScale = 1, lastYScale = 1; + + // Whether we correct the text's display (position, scale) to not look jagged + private static bool globalAdjustTextPos { + get { + if (!GlobalControls.isInFight) + return false; + if (EnemyEncounter.script.GetVar("noadjusttextdisplay").Type == DataType.Boolean) + return !EnemyEncounter.script.GetVar("noadjusttextdisplay").Boolean; + return true; + } + } + private bool adjustTextDisplaySet = false; + private bool _adjustTextDisplay = true; + public bool adjustTextDisplay { + get { + if (adjustTextDisplaySet) + return _adjustTextDisplay; + if (rotation % 90 != 0) + return false; + return globalAdjustTextPos; + } + set { + adjustTextDisplaySet = true; + _adjustTextDisplay = value; + if (!adjustTextDisplay) + foreach (LetterData l in letters) + l.image.GetComponent().localScale = Vector2.one; + Move(0, 0); + Scale(xscale, yscale); + } + } + + public override bool isactive { + get { return base.isactive && !removed; } + } + + // The rotation of the text object + public new float rotation { + get { return container.transform.eulerAngles.z; } + set { + // We mod the value from 0 to 360 because angles are between 0 and 360 normally + internalRotation.z = Math.Mod(value, 360); + container.transform.eulerAngles = internalRotation; + } } private enum BubbleSide { LEFT = 0, DOWN = 90, RIGHT = 180, UP = 270, NONE = -1 } @@ -34,14 +81,17 @@ private enum ProgressMode { AUTO, MANUAL, NONE } public bool deleteWhenFinished = true; + public GameObject GetContainer() { + return container; + } + protected override void Awake() { + container = transform.parent.gameObject; base.Awake(); if (!UnitaleUtil.IsOverworld && autoSetLayer) transform.parent.SetParent(GameObject.Find("TopLayer").transform); - container = transform.parent.gameObject; - - Transform bubbleTransform = UnitaleUtil.GetChildPerName(container.transform, "BubbleContainer"); + Transform bubbleTransform = UnitaleUtil.GetChildPerName(container.transform, "BubbleContainer", true); if (bubbleTransform != null) { containerBubble = bubbleTransform.gameObject; speechThing = UnitaleUtil.GetChildPerName(containerBubble.transform, "SpeechThing", false, true).GetComponent(); @@ -53,27 +103,30 @@ protected override void Update() { if (hidden) return; base.Update(); - //Next line/EOF check if (!isactive) return; + + AlignLetters(); + + //Next line/EOF check switch (progress) { case ProgressMode.MANUAL: { - if (GlobalControls.input.Confirm == UndertaleInput.ButtonState.PRESSED && LineComplete()) - Advance(); + if (GlobalControls.input.Confirm == ButtonState.PRESSED && LineComplete()) + NextLine(); break; } case ProgressMode.AUTO: { if (LineComplete()) if (countFrames == framesWait) { - Advance(); + NextLine(); countFrames = 0; } else countFrames++; break; } } - if (CanAutoSkipAll() || CanAutoSkipThis()) - Advance(); - if (CanSkip() && !LineComplete() && GlobalControls.input.Cancel == UndertaleInput.ButtonState.PRESSED) + if (CanAutoSkipAny(true) && (!UIController.instance || !UIController.instance.monsterDialogues.Contains(this))) + NextLine(); + if (GlobalControls.input.Cancel == ButtonState.PRESSED && CanSkip() && !LineComplete() && (!UIController.instance || this != UIController.instance.mainTextManager || !UIController.instance.stateSwitched)) DoSkipFromPlayer(); } @@ -89,19 +142,34 @@ public void DestroyText() { removed = true; } - [MoonSharpHidden] public void HideTextObject() { - DestroyChars(); - hidden = true; - } - private void ResizeBubble() { float effectiveBubbleHeight = bubbleHeight != -1 ? bubbleHeight < 16 ? 40 : bubbleHeight + 24 : UnitaleUtil.CalcTextHeight(this) < 16 ? 40 : UnitaleUtil.CalcTextHeight(this) + 24; containerBubble.transform.GetComponent().sizeDelta = new Vector2(textMaxWidth + 20, effectiveBubbleHeight); //To set the borders - UnitaleUtil.GetChildPerName(containerBubble.transform, "BackHorz").GetComponent().sizeDelta = new Vector2(textMaxWidth + 20, effectiveBubbleHeight - 20 * 2); //BackHorz - UnitaleUtil.GetChildPerName(containerBubble.transform, "BackVert").GetComponent().sizeDelta = new Vector2(textMaxWidth - 20, effectiveBubbleHeight); //BackVert - UnitaleUtil.GetChildPerName(containerBubble.transform, "CenterHorz").GetComponent().sizeDelta = new Vector2(textMaxWidth + 16, effectiveBubbleHeight - 16 * 2); //CenterHorz - UnitaleUtil.GetChildPerName(containerBubble.transform, "CenterVert").GetComponent().sizeDelta = new Vector2(textMaxWidth - 16, effectiveBubbleHeight - 4); //CenterVert - SetSpeechThingPositionAndSide(bubbleSide.ToString(), bubbleLastVar); + if (UnitaleUtil.GetChildPerName(containerBubble.transform, "BackHorz")) { + UnitaleUtil.GetChildPerName(containerBubble.transform, "BackHorz").GetComponent().sizeDelta = new Vector2(textMaxWidth + 20, effectiveBubbleHeight - 20 * 2); //BackHorz + UnitaleUtil.GetChildPerName(containerBubble.transform, "BackVert").GetComponent().sizeDelta = new Vector2(textMaxWidth - 20, effectiveBubbleHeight); //BackVert + UnitaleUtil.GetChildPerName(containerBubble.transform, "CenterHorz").GetComponent().sizeDelta = new Vector2(textMaxWidth + 16, effectiveBubbleHeight - 16 * 2); //CenterHorz + UnitaleUtil.GetChildPerName(containerBubble.transform, "CenterVert").GetComponent().sizeDelta = new Vector2(textMaxWidth - 16, effectiveBubbleHeight - 4); //CenterVert + } + SetTail(bubbleSide.ToString(), bubbleLastVar); + } + + public Vector2 GetBubbleSize() { + return containerBubble.transform.GetComponent().sizeDelta; + } + + public Vector2 GetBubbleShift() { + return containerBubble.GetComponent().localPosition; + } + + public DynValue text { + get { + CheckExists(); + DynValue[] texts = new DynValue[textQueue.Length]; + for (int i = 0; i < textQueue.Length; i++) + texts[i] = DynValue.NewString(textQueue[i].Text); + return DynValue.NewTable(caller.script, texts); + } } public string progressmode { @@ -120,38 +188,48 @@ public string progressmode { } } - public int x { + public float x { get { CheckExists(); - return Mathf.RoundToInt(container.transform.localPosition.x); + return container.transform.localPosition.x; } set { MoveTo(value, y); } } - public int y { + public float y { get { CheckExists(); - return Mathf.RoundToInt(container.transform.localPosition.y); + return container.transform.localPosition.y; } set { MoveTo(x, value); } } - public int absx { + public float absx { get { CheckExists(); - return Mathf.RoundToInt(container.transform.position.x); + return container.transform.position.x; } set { MoveToAbs(value, absy); } } - public int absy { + public float absy { get { CheckExists(); - return Mathf.RoundToInt(container.transform.position.y); + return container.transform.position.y; } set { MoveToAbs(absx, value); } } + public int width { + get { + CheckExists(); + return _textMaxWidth; + } + set { + CheckExists(); + _textMaxWidth = value < 16 ? 16 : value; + } + } public int textMaxWidth { get { CheckExists(); @@ -203,7 +281,11 @@ public void Scale(float xs, float ys) { xScale = xs; yScale = ys; - container.gameObject.GetComponent().localScale = new Vector3(xs, ys, 1.0f); + container.transform.localScale = new Vector2(xs, ys); + if (adjustTextDisplay) { + PostScaleHandling(); + MoveLetters(); + } } public string layer { @@ -216,7 +298,7 @@ public string layer { set { CheckExists(); try { - container.transform.SetParent(GameObject.Find(value + "Layer").transform); + SetParent(GameObject.Find(value + "Layer").transform); foreach (Transform child in container.transform) { MaskImage childmask = child.gameObject.GetComponent(); if (childmask != null) @@ -229,12 +311,12 @@ public string layer { public void SendToTop() { CheckExists(); - transform.SetAsLastSibling(); + container.transform.SetAsLastSibling(); } public void SendToBottom() { CheckExists(); - transform.SetAsFirstSibling(); + container.transform.SetAsFirstSibling(); } public void MoveBelow(LuaTextManager otherText) { @@ -259,43 +341,20 @@ public void MoveAbove(LuaTextManager otherText) { public void ResetColor(bool resetAlpha = false) { CheckExists(); - Color c = fontDefaultColor; - if (!resetAlpha) c.a = alpha; - - if (currentColor.r == defaultColor.r && currentColor.g == defaultColor.g && currentColor.b == defaultColor.b) - currentColor = c; - - foreach (Image i in letterReferences) - if (i != null) - if (i.color == defaultColor) i.color = c; - - _color = c; - defaultColor = c; - - hasColorBeenSet = false; - hasAlphaBeenSet = !resetAlpha && hasAlphaBeenSet; + if (resetAlpha) + ResetAlpha(); + color = new[] { fontDefaultColor.r, fontDefaultColor.g, fontDefaultColor.b }; + textColorSet = false; } public void ResetAlpha() { CheckExists(); - Color c = currentColor; - c.a = fontDefaultColor.a; - - if (currentColor.a == defaultColor.a) - currentColor = c; - - foreach (Image i in letterReferences) - if (i != null) - if (i.color == defaultColor) i.color = c; - - _color.a = c.a; - defaultColor = c; - hasAlphaBeenSet = false; + alpha = fontDefaultColor.a; + textAlphaSet = false; } [MoonSharpHidden] public Color _color = Color.white; - [MoonSharpHidden] public bool hasColorBeenSet; - [MoonSharpHidden] public bool hasAlphaBeenSet; + [MoonSharpHidden] public bool textColorSet, textAlphaSet; // The color of the text. It uses an array of three floats between 0 and 1 public float[] color { get { @@ -306,23 +365,22 @@ public float[] color { CheckExists(); if (value == null) throw new CYFException("text.color can not be set to a nil value."); - switch (value.Length) { - // If we don't have three or four floats, we throw an error - case 3: _color = new Color(value[0], value[1], value[2], alpha); break; - case 4: _color = new Color(value[0], value[1], value[2], value[3]); break; - default: - throw new CYFException("You need 3 or 4 numeric values when setting a text's color."); - } + if (value.Length < 3 || value.Length > 4) + throw new CYFException("You need 3 or 4 numeric values when setting a text's color."); + + _color.r = value[0]; + _color.g = value[1]; + _color.b = value[2]; + if (value.Length == 4) + alpha = value[3]; - hasColorBeenSet = true; - hasAlphaBeenSet = hasAlphaBeenSet || value.Length == 4; + textColorSet = true; - foreach (Image i in letterReferences) - if (i != null) - if (i.color == defaultColor) i.color = _color; + foreach (LetterData l in letters.Where(i => !i.commandColorSet)) + l.image.color = new Color(_color.r, _color.g, _color.b, l.image.color.a); - if (currentColor.r == defaultColor.r && currentColor.g == defaultColor.g && currentColor.b == defaultColor.b) - currentColor = _color; + if (!commandColorSet) + commandColor = _color; defaultColor = _color; } } @@ -338,13 +396,9 @@ public float[] color32 { CheckExists(); if (value == null) throw new CYFException("text.color32 can not be set to a nil value."); - switch (value.Length) { - // If we don't have three or four floats, we throw an error - case 3: color = new[] { value[0] / 255, value[1] / 255, value[2] / 255, alpha }; break; - case 4: color = new[] { value[0] / 255, value[1] / 255, value[2] / 255, value[3] / 255 }; break; - default: - throw new CYFException("You need 3 or 4 numeric values when setting a text's color."); - } + if (value.Length < 3 || value.Length > 4) + throw new CYFException("You need 3 or 4 numeric values when setting a text's color."); + color = value.Select(v => v / 255).ToArray(); } } @@ -356,8 +410,17 @@ public float alpha { } set { CheckExists(); - color = new[] { _color.r, _color.g, _color.b, Mathf.Clamp01(value) }; - hasAlphaBeenSet = true; + _color.a = Mathf.Clamp01(value); + textAlphaSet = true; + textColorSet = true; // TODO: Remove in 0.7 + + foreach (LetterData l in letters.Where(i => !i.commandAlphaSet)) + //l.image.color = new Color(l.image.color.r, l.image.color.g, l.image.color.b, _color.a); // TODO: Remove in 0.7 + l.image.color = _color; + + if (!commandAlphaSet) + commandColor.a = _color.a; + defaultColor.a = _color.a; } } @@ -373,17 +436,45 @@ public float alpha32 { } } + + public string linePrefix { + get { + CheckExists(); + return _linePrefix; + } + set { + CheckExists(); + _linePrefix = value; + } + } + + private DynValue _OnTextDisplay = DynValue.Nil; + public DynValue OnTextDisplay { + get { return _OnTextDisplay; } + set { + if ((value.Type & (DataType.Nil | DataType.Function | DataType.ClrFunction)) == 0) + throw new CYFException("Text.OnTextDisplay: This variable has to be a function!"); + if (value.Type == DataType.Function && value.Function.OwnerScript != caller.script) + throw new CYFException("Text.OnTextDisplay: You can only use a function created in the same script as the text object!"); + _OnTextDisplay = value; + } + } + public DynValue GetLetters() { CheckExists(); + if (lateStartWaiting) + throw new CYFException("You cannot fetch a text object's letters on the first frame it was created, unless you use the [instant] command at the beginning of its line."); Table table = new Table(null); int key = 0; - foreach (Image i in letterReferences) - if (i != null) { - key++; - LuaSpriteController letter = LuaSpriteController.GetOrCreate(i.gameObject); - letter.tag = "letter"; - table.Set(key, UserData.Create(letter, LuaSpriteController.data)); - } + foreach (LetterData d in letters) { + key++; + LuaSpriteController letter = LuaSpriteController.GetOrCreate(d.image.gameObject); + letter.tag = "letter"; + letter.spritename = textQueue[currentLine].Text[d.index].ToString(); + letter.img.GetComponent().characterNumber = d.index; + table.Set(key, UserData.Create(letter, LuaSpriteController.data)); + } + return DynValue.NewTable(table); } @@ -399,38 +490,22 @@ public bool allLinesComplete { } } - public void SetParent(LuaSpriteController parent) { + public void SetText(DynValue text, bool resetLateStart = true) { CheckExists(); - if (parent != null && parent.img.transform != null && parent.img.transform.parent.name == "SpritePivot") - throw new CYFException("text.SetParent(): Can not use SetParent with an Overworld Event's sprite."); - try { - if (parent == null) throw new CYFException("text.SetParent(): Can't set a sprite's parent as nil."); - container.transform.SetParent(parent.img.transform); - foreach (Transform child in container.transform) { - MaskImage childmask = child.gameObject.GetComponent(); - if (childmask != null) - childmask.inverted = parent._masked == LuaSpriteController.MaskMode.INVERTEDSPRITE || parent._masked == LuaSpriteController.MaskMode.INVERTEDSTENCIL; - } - } - catch { throw new CYFException("You tried to set a removed sprite/nil sprite as this text object's parent."); } - } - public void SetText(DynValue text) { - CheckExists(); - hidden = false; - - // disable late start if SetText is used on the same frame the text is created - lateStartWaiting = false; + // Disable late start if SetText is used on the same frame the text is created + if (resetLateStart) + lateStartWaiting = false; if (text == null || text.Type != DataType.Table && text.Type != DataType.String) throw new CYFException("Text.SetText: the text argument must be a non-empty array of strings or a simple string."); - // Converts the text argument into a table if it's a simple string + // Convert the text argument into a table if it's a simple string text = text.Type == DataType.String ? DynValue.NewTable(null, text) : text; TextMessage[] msgs = new TextMessage[text.Table.Length]; for (int i = 0; i < text.Table.Length; i++) - msgs[i] = new TextMessage(text.Table.Get(i + 1).String, false, false); + msgs[i] = new TextMessage(linePrefix + text.Table.Get(i + 1).String, false, false); if (bubble) containerBubble.SetActive(true); try { SetTextQueue(msgs); } @@ -440,23 +515,33 @@ public void SetText(DynValue text) { ResizeBubble(); } + protected override void SpawnText() { + base.SpawnText(); + if ((OnTextDisplay.Type & (DataType.Function | DataType.ClrFunction)) != 0) + caller.Call(OnTextDisplay, "OnTextDisplay", UserData.Create(this)); + else if (GlobalControls.isInFight && (EnemyEncounter.script.script.Globals.Get("OnTextDisplay").Type & (DataType.Function | DataType.ClrFunction)) != 0) + EnemyEncounter.script.Call("OnTextDisplay", UserData.Create(this)); + } + [MoonSharpHidden] public void LateStart() { StartCoroutine(LateStartSetText()); } - private IEnumerator LateStartSetText() { - yield return new WaitForEndOfFrame(); + private IEnumerator LateStartSetText(bool waitUntilEndOfFrame = true) { + if (waitUntilEndOfFrame) + yield return new WaitForEndOfFrame(); - if (!isactive) + if (!isactive || !lateStartWaiting) yield break; - letterSound = defaultVoice ?? default_charset.SoundName; + if (linePrefix != "") + foreach (TextMessage tm in textQueue) + tm.Text = linePrefix + tm.Text; - // only allow inline text commands and letter sounds on the second frame + // Only allow inline text commands and letter sounds on the second frame lateStartWaiting = false; - currentLine = -1; - Advance(); + ShowLine(0); if (bubble) - ResizeBubble(); + UpdateBubble(); } public void AddText(DynValue text) { @@ -475,7 +560,7 @@ public void AddText(DynValue text) { } TextMessage[] msgs = new TextMessage[text.Table.Length]; for (int i = 0; i < text.Table.Length; i++) - msgs[i] = new MonsterMessage(text.Table.Get(i + 1).String); + msgs[i] = new MonsterMessage(linePrefix + text.Table.Get(i + 1).String); AddToTextQueue(msgs); } @@ -486,42 +571,23 @@ public void SetVoice(string voiceName) { defaultVoice = voiceName == "none" ? null : voiceName; } - public void SetFont(string fontName, bool firstTime = false) { + public void SetFont(string fontName) { if (fontName == null) throw new CYFException("Text.SetFont: The first argument (the font name) is nil.\n\nSee the documentation for proper usage."); CheckExists(); UnderFont uf = SpriteFontRegistry.Get(fontName); if (uf == null) throw new CYFException("The font \"" + fontName + "\" doesn't exist.\nYou should check if you made a typo, or if the font really is in your mod."); - SetFont(uf, firstTime); - if (!firstTime) - default_charset = uf; + SetFont(uf); if (bubble) UpdateBubble(); } [MoonSharpHidden] public void UpdateBubble() { containerBubble.GetComponent().localPosition = new Vector2(-12, 24); - // GetComponent().localPosition = new Vector2(0, 16); - GetComponent().localPosition = new Vector2(0, 0); ResizeBubble(); } - public void SetEffect(string effect, float intensity = -1) { - if (effect == null) - throw new CYFException("Text.SetEffect: The first argument (the effect name) is nil.\n\nSee the documentation for proper usage."); - CheckExists(); - switch (effect.ToLower()) { - case "none": textEffect = null; break; - case "twitch": textEffect = intensity != -1 ? new TwitchEffect(this, intensity) : new TwitchEffect(this); break; - case "shake": textEffect = intensity != -1 ? new ShakeEffect(this, intensity) : new ShakeEffect(this); break; - case "rotate": textEffect = intensity != -1 ? new RotatingEffect(this, intensity) : new RotatingEffect(this); break; - - default: - throw new CYFException("The effect \"" + effect + "\" doesn't exist.\nYou can only choose between \"none\", \"twitch\", \"shake\" and \"rotate\"."); - } - } - public void ShowBubble(string side = null, DynValue position = null) { CheckExists(); bubble = true; @@ -545,7 +611,8 @@ public void SetSpeechThingPositionAndSide(string side, DynValue position) { speechThing.anchorMin = speechThing.anchorMax = speechThingShadow.anchorMin = speechThingShadow.anchorMax = new Vector2(bubbleSide == BubbleSide.LEFT ? 0 : bubbleSide == BubbleSide.RIGHT ? 1 : 0.5f, bubbleSide == BubbleSide.DOWN ? 0 : bubbleSide == BubbleSide.UP ? 1 : 0.5f); - speechThing.rotation = speechThingShadow.rotation = Quaternion.Euler(0, 0, (int)bubbleSide); + speechThing.localRotation = speechThingShadow.localRotation = Quaternion.Euler(0, 0, (int)bubbleSide); + speechThing.localScale = speechThingShadow.localScale = new Vector2(speechThing.lossyScale.x < 0 ? -1 : 1, speechThing.lossyScale.y < 0 ? -1 : 1); bool isSide = bubbleSide == BubbleSide.LEFT || bubbleSide == BubbleSide.RIGHT; int size = isSide ? (int)containerBubble.GetComponent().sizeDelta.y - 20 : (int)containerBubble.GetComponent().sizeDelta.x - 20; if (position == null) @@ -587,8 +654,9 @@ public void HideBubble() { } public override void SkipLine() { - if (noSkip1stFrame) return; CheckExists(); + if (lateStartWaiting) + LateStartSetText(); if (GlobalControls.isInFight && EnemyEncounter.script.GetVar("playerskipdocommand").Boolean || UnitaleUtil.IsOverworld && (EventManager.instance.script != null && EventManager.instance.script.GetVar("playerskipdocommand").Boolean || GlobalControls.isInShop && GameObject.Find("Canvas").GetComponent().script.GetVar("playerskipdocommand").Boolean)) @@ -597,14 +665,6 @@ public override void SkipLine() { base.SkipLine(); } - private void Advance() { - NextLine(); - if (caller == null) return; - if (caller.script.Globals["OnTextAdvance"] == null || caller.script.Globals.Get("OnTextAdvance") == null) return; - try {caller.script.Call(caller.script.Globals["OnTextAdvance"], this, removed); } - catch (ScriptRuntimeException ex) { UnitaleUtil.DisplayLuaError(caller.scriptname, UnitaleUtil.FormatErrorSource(ex.DecoratedMessage, ex.Message) + ex.Message, ex.DoNotDecorateMessage); } - } - public void NextLine() { CheckExists(); if (AllLinesComplete() || currentLine + 1 == LineCount()) { @@ -620,6 +680,38 @@ public void NextLine() { ResizeBubble(); } } + private void PostScaleHandling() { + if (xscale == 0 || yscale == 0) + return; + + if (xscale != lastXScale) xScaleSizes.Clear(); + if (yscale != lastYScale) yScaleSizes.Clear(); + + foreach (LetterData l in letters) { + RectTransform r = l.image.GetComponent(); + + float xLocalScale; + if (xScaleSizes.ContainsKey(Mathf.RoundToInt(r.rect.width))) + xLocalScale = xScaleSizes[Mathf.RoundToInt(r.rect.width)]; + else { + float newXSize = r.rect.width * xscale, + chosenX = Mathf.Round(newXSize - 0.001f); + xLocalScale = chosenX / newXSize; + xScaleSizes[Mathf.RoundToInt(r.rect.width)] = xLocalScale; + } + + float yLocalScale; + if (yScaleSizes.ContainsKey(Mathf.RoundToInt(r.rect.height))) + yLocalScale = yScaleSizes[Mathf.RoundToInt(r.rect.height)]; + else { + float newYSize = r.rect.height * yscale, + chosenY = Mathf.Round(newYSize - 0.001f); + yLocalScale = chosenY / newYSize; + yScaleSizes[Mathf.RoundToInt(r.rect.height)] = yLocalScale; + } + r.localScale = new Vector2(xLocalScale, yLocalScale); + } + } // Shortcut to `SetAutoWaitTimeBetweenTexts` public void SetWaitTime(int time) { SetAutoWaitTimeBetweenTexts(time); } @@ -629,14 +721,20 @@ public void SetAutoWaitTimeBetweenTexts(int time) { framesWait = time; } - public void MoveTo(int newX, int newY) { - CheckExists(); - container.transform.localPosition = new Vector3(newX, newY, container.transform.localPosition.z); + public override void Move(float newX, float newY) { + MoveToAbs(container.transform.position.x + newX, container.transform.position.y + newY, false); + } + + public override void MoveTo(float newX, float newY) { + MoveToAbs(container.transform.parent.position.x + newX, container.transform.parent.position.y + newY); } - public void MoveToAbs(int newX, int newY) { + public override void MoveToAbs(float newX, float newY, bool resetAdjustShift = true) { CheckExists(); - container.transform.position = new Vector3(newX, newY, container.transform.position.z); + if (resetAdjustShift) + for (int i = 0; i < letterAdjustShifts.Count; i++) + letterAdjustShifts[i] = new Vector2(); + container.transform.position = new Vector3(newX, newY, transform.position.z); } public void SetAnchor(float newX, float newY) { @@ -645,14 +743,35 @@ public void SetAnchor(float newX, float newY) { container.GetComponent().anchorMax = new Vector2(newX, newY); } - public int GetTextWidth() { + public int GetTextWidth(int firstLetter = 0, int lastLetter = 999999) { CheckExists(); - return (int)UnitaleUtil.CalcTextWidth(this); + if (textQueue == null || textQueue[currentLine] == null) + return 0; + + if (firstLetter < 0) firstLetter += textQueue[currentLine].Text.Length - 1; + if (lastLetter < 0) lastLetter += textQueue[currentLine].Text.Length - 1; + + if (firstLetter >= textQueue[currentLine].Text.Length) firstLetter = textQueue[currentLine].Text.Length - 1; + if (lastLetter >= textQueue[currentLine].Text.Length) lastLetter = textQueue[currentLine].Text.Length - 1; + + if (letters.Count == 0) + return (int)UnitaleUtil.PredictTextWidth(this, firstLetter, lastLetter); + return (int)UnitaleUtil.CalcTextWidth(this, firstLetter, lastLetter); } - public int GetTextHeight() { + public int GetTextHeight(int firstLetter = 0, int lastLetter = 999999) { CheckExists(); - return (int)UnitaleUtil.CalcTextHeight(this); + if (textQueue == null || textQueue[currentLine] == null) + return 0; + + if (firstLetter < 0) firstLetter += textQueue[currentLine].Text.Length; + if (lastLetter < 0) lastLetter += textQueue[currentLine].Text.Length; + + if (firstLetter >= textQueue[currentLine].Text.Length) firstLetter = textQueue[currentLine].Text.Length - 1; + if (lastLetter >= textQueue[currentLine].Text.Length) lastLetter = textQueue[currentLine].Text.Length - 1; + + // TODO: Add text height prediction if not yet set + return (int)UnitaleUtil.CalcTextHeight(this, firstLetter, lastLetter); } public void SetVar(string key, DynValue value) { @@ -661,6 +780,31 @@ public void SetVar(string key, DynValue value) { vars[key] = value; } + public void AlignLetters() { + if (!adjustTextDisplay || xscale == 0 || yscale == 0) + return; + + for (int i = 0; i < letters.Count; i++) { + LetterData letter = letters[i]; + Vector2 adjustShift = letterAdjustShifts[i]; + Vector2 realPosition = (Vector2)letter.image.transform.position + adjustShift; + + float xShift = realPosition.x % xscale; + if (xShift > xscale / 2) + xShift -= xscale; + + float yShift = realPosition.y % yscale; + if (yShift > yscale / 2) + yShift -= yscale; + + Vector2 newShift = new Vector2(xShift, yShift); + if ((newShift - adjustShift).magnitude > 0.001f) { + letter.image.rectTransform.position = realPosition - newShift; + letterAdjustShifts[i] = newShift; + } + } + } + public DynValue GetVar(string key) { if (key == null) throw new CYFException("text.GetVar: The first argument (the index) is nil.\n\nSee the documentation for proper usage."); @@ -672,4 +816,47 @@ public DynValue this[string key] { get { return GetVar(key); } set { SetVar(key, value); } } + + //////////////////// + // Children stuff // + //////////////////// + + #pragma warning disable 108,114 + public string name { + get { return container.name; } + } + #pragma warning restore 108,114 + + public int childIndex { + get { return container.transform.GetSiblingIndex() + 1; } + set { container.transform.SetSiblingIndex(value - 1); } + } + public int childCount { + get { return container.transform.childCount; } + } + + public DynValue GetParent() { + return UnitaleUtil.GetObjectParent(container.transform); + } + + public void SetParent(object parent) { + CheckExists(); + + Transform t = UnitaleUtil.GetTransform(parent); + if (t == null) + return; + UnitaleUtil.SetObjectParent(this, parent); + + LuaSpriteController sParent = parent as LuaSpriteController; + ProjectileController pParent = parent as ProjectileController; + if (pParent != null) + sParent = pParent.sprite; + if (sParent == null) + return; + foreach (Transform child in container.transform) { + MaskImage childmask = child.gameObject.GetComponent(); + if (childmask != null) + childmask.inverted = sParent._masked == LuaSpriteController.MaskMode.INVERTEDSPRITE || sParent._masked == LuaSpriteController.MaskMode.INVERTEDSTENCIL; + } + } } \ No newline at end of file diff --git a/Assets/Scripts/Lua/CLRBindings/LuaTextManager.cs.meta b/Assets/Scripts/Lua/CLRBindings/LuaTextManager.cs.meta index 210f0ed6f..7555239dc 100644 --- a/Assets/Scripts/Lua/CLRBindings/LuaTextManager.cs.meta +++ b/Assets/Scripts/Lua/CLRBindings/LuaTextManager.cs.meta @@ -1,11 +1,10 @@ fileFormatVersion: 2 guid: 9ac8dc980caea604a81186f096e200ea -timeCreated: 1498875627 -licenseType: Free MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: 700 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Scripts/Lua/CLRBindings/NewMusicManager.cs b/Assets/Scripts/Lua/CLRBindings/NewMusicManager.cs index 6c158c782..941be63a1 100644 --- a/Assets/Scripts/Lua/CLRBindings/NewMusicManager.cs +++ b/Assets/Scripts/Lua/CLRBindings/NewMusicManager.cs @@ -116,9 +116,6 @@ public static void PlayVoice(string name, string voice, bool loop = false, float public static void SetPitch(string name, float value) { if (!audiolist.ContainsKey(name)) throw new CYFException("The audio channel " + name + " doesn't exist."); - if (value < -3) value = -3; - if (value > 3) value = 3; - if (Mathf.Abs(value) < 0.01f) value = 0.01f * Mathf.Sign(value); ((AudioSource)audiolist[name]).pitch = value; } diff --git a/Assets/Scripts/Lua/CLRBindings/Overworld/LuaGeneralOW.cs b/Assets/Scripts/Lua/CLRBindings/Overworld/LuaGeneralOW.cs index ba42996ef..390145f99 100644 --- a/Assets/Scripts/Lua/CLRBindings/Overworld/LuaGeneralOW.cs +++ b/Assets/Scripts/Lua/CLRBindings/Overworld/LuaGeneralOW.cs @@ -124,8 +124,8 @@ [CYFEventFunction] public void EndDialog() { if (textmgr != null && textmgr.GetComponent().color.a != 0) { // Clean up text manager textmgr.SetTextFrameAlpha(0); - textmgr.textQueue = new TextMessage[] { }; - textmgr.DestroyChars(); + textmgr.SetTextQueue(new TextMessage[] { }); + textmgr.HideTextObject(); // Clean up SetChoice if applicable if (EventManager.instance.script != null && EventManager.instance.script == textmgr.caller) { diff --git a/Assets/Scripts/Lua/CLRBindings/Overworld/LuaInventoryOW.cs b/Assets/Scripts/Lua/CLRBindings/Overworld/LuaInventoryOW.cs index 529956bd4..7f9d6bec7 100644 --- a/Assets/Scripts/Lua/CLRBindings/Overworld/LuaInventoryOW.cs +++ b/Assets/Scripts/Lua/CLRBindings/Overworld/LuaInventoryOW.cs @@ -11,7 +11,7 @@ [MoonSharpHidden] public LuaInventoryOW() { } [MoonSharpHidden] public void SetEquip(string itemName) { if (!Inventory.ItemExists(itemName)) throw new CYFException("The item \"" + itemName + "\" doesn't exist in the item list."); if (Inventory.InventoryNumber(itemName) == -1) throw new CYFException("You can't equip an item that isn't in the inventory."); - Inventory.ChangeEquipment(Inventory.InventoryNumber(itemName)); + Inventory.ChangeEquipment(Inventory.InventoryNumber(itemName), true); appliedScript.Call("CYFEventNextCommand"); } diff --git a/Assets/Scripts/Lua/CLRBindings/ProjectileController.cs b/Assets/Scripts/Lua/CLRBindings/ProjectileController.cs index 598154f5f..55326ecc8 100644 --- a/Assets/Scripts/Lua/CLRBindings/ProjectileController.cs +++ b/Assets/Scripts/Lua/CLRBindings/ProjectileController.cs @@ -24,38 +24,26 @@ public ProjectileController(Projectile p) { // The x position of the sprite, relative to the arena position and its anchor. public float x { - get { return p == null ? lastX : p.self.anchoredPosition.x - ArenaManager.arenaCenter.x; } - set { - if (p != null) - p.self.anchoredPosition = new Vector2(value + ArenaManager.arenaCenter.x, p.self.anchoredPosition.y); - } + get { return p == null ? lastX : p.self.position.x - ArenaManager.arenaCenter.x; } + set { MoveTo(value, y); } } // The y position of the sprite, relative to the arena position and its anchor. public float y { - get { return p == null ? lastY : p.self.anchoredPosition.y - ArenaManager.arenaCenter.y; } - set { - if (p != null) - p.self.anchoredPosition = new Vector2(p.self.anchoredPosition.x, value + ArenaManager.arenaCenter.y); - } + get { return p == null ? lastY : p.self.position.y - ArenaManager.arenaCenter.y; } + set { MoveTo(x, value); } } // The x position of the sprite, relative to the bottom left corner of the screen. public float absx { get { return p == null ? lastAbsX : p.self.position.x; } - set { - if (p != null) - p.self.position = new Vector2(value, p.self.position.y); - } + set { MoveToAbs(value, absy); } } // The y position of the sprite, relative to the bottom left corner of the screen. public float absy { get { return p == null ? lastAbsY : p.self.position.y; } - set { - if (p != null) - p.self.position = new Vector2(p.self.position.x, value); - } + set { MoveToAbs(absx, value); } } //Bullet.Duplicate() has been suspended because of some bugs. Maybe that I'll get on it later. @@ -199,7 +187,7 @@ public void MoveToAbs(float newX, float newY) { public DynValue OnHit { get { return _OnHit; } set { - if (value.Type != DataType.Nil && value.Type != DataType.Function) + if ((value.Type & (DataType.Nil | DataType.Function | DataType.ClrFunction)) == 0) throw new CYFException("bullet.OnHit: This variable has to be a function!"); if (value.Type == DataType.Function && value.Function.OwnerScript != p.owner) throw new CYFException("bullet.OnHit: You can only use a function created in the same script as the projectile!"); @@ -231,4 +219,47 @@ public bool isColliding() { return false; return p.isPP() ? p.HitTestPP() : p.HitTest(); } + + //////////////////// + // Children stuff // + //////////////////// + + public string name { + get { return p.gameObject.name; } + } + + public int childIndex { + get { return p.self.GetSiblingIndex() + 1; } + set { p.self.SetSiblingIndex(value - 1); } + } + public int childCount { + get { return p.self.childCount; } + } + + public DynValue GetParent() { return UnitaleUtil.GetObjectParent(p.self); } + + public void SetParent(object parent) { + UnitaleUtil.SetObjectParent(this, parent); + LuaSpriteController sParent = parent as LuaSpriteController; + ProjectileController pParent = parent as ProjectileController; + if (pParent != null) + sParent = pParent.sprite; + if (sParent == null) + return; + if (sprite.img.GetComponent()) + sprite.img.GetComponent().inverted = sParent._masked == LuaSpriteController.MaskMode.INVERTEDSPRITE || sParent._masked == LuaSpriteController.MaskMode.INVERTEDSTENCIL; + } + + public DynValue GetChild(int index) { + if (index > childCount) + throw new CYFException("This object only has " + childCount + " children yet you try to get its child #" + index); + return UnitaleUtil.GetObject(sprite.img.transform.GetChild(--index)); + } + + public DynValue[] GetChildren() { + DynValue[] tab = new DynValue[sprite.img.transform.childCount]; + for (int i = 0; i < sprite.img.transform.childCount; i++) + tab[i] = GetChild(i + 1); + return tab; + } } \ No newline at end of file diff --git a/Assets/Scripts/Lua/LuaScriptBinder.cs b/Assets/Scripts/Lua/LuaScriptBinder.cs index 6e798cece..12b958b22 100644 --- a/Assets/Scripts/Lua/LuaScriptBinder.cs +++ b/Assets/Scripts/Lua/LuaScriptBinder.cs @@ -5,6 +5,11 @@ using UnityEngine; using Object = UnityEngine.Object; +internal class LuaTextManagerDescriptor : MoonSharp.Interpreter.Interop.StandardUserDataDescriptor { + public LuaTextManagerDescriptor(Type type, InteropAccessMode accessMode) : base(type, accessMode) { } + public override string AsString(object obj) { return "LuaTextManager"; } +} + /// /// Takes care of creating objects with globally bound functions. /// Doubles as a dictionary for the SetGlobal/GetGlobal functions attached to these scripts. @@ -31,13 +36,14 @@ static LuaScriptBinder() { UserData.RegisterType(); UserData.RegisterType(); UserData.RegisterType(); - UserData.RegisterType(); + UserData.RegisterType(new LuaTextManagerDescriptor(typeof(LuaTextManager), InteropAccessMode.Default)); UserData.RegisterType(); UserData.RegisterType(); UserData.RegisterType(); UserData.RegisterType(); UserData.RegisterType(); UserData.RegisterType(); + UserData.RegisterType(); // Overworld bindings UserData.RegisterType(); @@ -99,9 +105,11 @@ public static Script BoundScript(/*bool overworld = false*/) { script.Globals["Encounter"] = EnemyEncounter.script; DynValue PlayerStatus = UserData.Create(PlayerController.luaStatus); - DynValue ArenaStatus = UserData.Create(ArenaManager.luaStatus); script.Globals.Set("Player", PlayerStatus); + DynValue ArenaStatus = UserData.Create(ArenaManager.luaStatus); script.Globals.Set("Arena", ArenaStatus); + DynValue LuaUI = UserData.Create(new LuaPlayerUI()); + script.Globals.Set("UI", LuaUI); } else if (!GlobalControls.isInShop) { try { DynValue PlayerOW = UserData.Create(EventManager.instance.luaPlayerOw); @@ -143,8 +151,6 @@ public static Script BoundScript(/*bool overworld = false*/) { script.Globals.Set("Time", TimeInfo); DynValue DiscordMgr = UserData.Create(new LuaDiscord()); script.Globals.Set("Discord", DiscordMgr); - DynValue LuaUI = UserData.Create(new LuaPlayerUI()); - script.Globals.Set("UI", LuaUI); return script; } @@ -219,7 +225,7 @@ public static void SetAlMighty(Script script, string key, DynValue value, bool r alMightyDict.Remove(key); alMightyDict.Add(key, value); if (reload) - SaveLoad.SaveAlMighty(); + SaveLoad.SaveAlMighty(key); } /// @@ -252,11 +258,14 @@ public static void ClearVariables() { UserData.RegisterType(); UserData.RegisterType(); UserData.RegisterType(); - UserData.RegisterType(); + UserData.RegisterType(new LuaTextManagerDescriptor(typeof(LuaTextManager), InteropAccessMode.Default)); UserData.RegisterType(); UserData.RegisterType(); UserData.RegisterType(); UserData.RegisterType(); + UserData.RegisterType(); + UserData.RegisterType(); + UserData.RegisterType(); // Overworld bindings UserData.RegisterType(); @@ -353,7 +362,7 @@ public static LuaTextManager CreateText(Script scr, DynValue text, DynValue posi GameObject go = Object.Instantiate(Resources.Load("Prefabs/CstmTxtContainer")); LuaTextManager luatm = go.GetComponentInChildren(); - go.GetComponent().position = new Vector2((float)position.Table.Get(1).Number, (float)position.Table.Get(2).Number); + luatm.MoveToAbs((float)position.Table.Get(1).Number, (float)position.Table.Get(2).Number); UnitaleUtil.GetChildPerName(go.transform, "BubbleContainer").GetComponent().pivot = new Vector2(0, 1); UnitaleUtil.GetChildPerName(go.transform, "BubbleContainer").GetComponent().localPosition = new Vector2(-12, 8); @@ -362,6 +371,7 @@ public static LuaTextManager CreateText(Script scr, DynValue text, DynValue posi UnitaleUtil.GetChildPerName(go.transform, "BackVert").GetComponent().sizeDelta = new Vector2(textWidth - 20, 100); //BackVert UnitaleUtil.GetChildPerName(go.transform, "CenterHorz").GetComponent().sizeDelta = new Vector2(textWidth + 16, 96 - 16 * 2); //CenterHorz UnitaleUtil.GetChildPerName(go.transform, "CenterVert").GetComponent().sizeDelta = new Vector2(textWidth - 16, 96); //CenterVert + luatm.Move(0, 0); foreach (ScriptWrapper scrWrap in ScriptWrapper.instances) { if (scrWrap.script != scr) continue; luatm.SetCaller(scrWrap); @@ -437,24 +447,22 @@ public static LuaTextManager CreateText(Script scr, DynValue text, DynValue posi UnderFont font = SpriteFontRegistry.Get(fontPartTwo); if (font == null) throw new CYFException("The font \"" + fontPartTwo + "\" doesn't exist.\nYou should check if you made a typo, or if the font really is in your mod."); - luatm.SetFont(font, true); + luatm.SetFont(font); } else luatm.ResetFont(); } else luatm.ResetFont(); } else luatm.ResetFont(); // Bubble variables luatm.bubble = true; - luatm.textMaxWidth = textWidth; + luatm._textMaxWidth = textWidth; luatm.bubbleHeight = bubbleHeight; if (enableLateStart) luatm.lateStartWaiting = true; - luatm.SetText(text); - + luatm.SetText(text, false); luatm.ShowBubble(); if (!enableLateStart) return luatm; - luatm.DestroyChars(); luatm.LateStart(); return luatm; } diff --git a/Assets/Scripts/Lua/ScriptWrapper.cs b/Assets/Scripts/Lua/ScriptWrapper.cs index 4481f0d91..0f35f6a42 100644 --- a/Assets/Scripts/Lua/ScriptWrapper.cs +++ b/Assets/Scripts/Lua/ScriptWrapper.cs @@ -66,63 +66,30 @@ public DynValue GetVar(Script caller, string key) { return script.Globals[key] != null ? MoonSharpUtil.CloneIfRequired(caller, value) : null; } - public DynValue Call(string function, DynValue[] args = null, bool checkExist = false) { return Call(null, function, args, checkExist); } + public DynValue Call(string function, DynValue arg) { return Call(function, new[] { arg }); } - public DynValue Call(string function, DynValue arg) { return Call(null, function, new[] { arg }); } + public DynValue Call(string function, DynValue[] args = null, bool checkExist = false) { return Call(script.Globals.Get(function), function, args, checkExist); } - public DynValue Call(Script caller, string function, DynValue[] args = null, bool checkExist = false) { - if (script.Globals[function] == null || script.Globals.Get(function) == null) { - if (checkExist &&!GlobalControls.retroMode) - UnitaleUtil.DisplayLuaError(scriptname, "Attempted to call the function \"" + function + "\", but it didn't exist."); - //Debug.LogWarning("Attempted to call the function " + function + " but it didn't exist."); - return DynValue.Nil; - } - if (args != null) { - DynValue d = DynValue.Nil; - try { d = script.Call(script.Globals[function], args); } - catch (Exception e) { - if (args[0].Type == DataType.Table && args.Length == 1) { + public DynValue Call(DynValue function, string functionName, DynValue arg, bool checkExist = false) { return Call(function, functionName, new[] { arg }, checkExist); } + + public DynValue Call(DynValue function, string functionName, DynValue[] args = null, bool checkExist = false) { + if ((function.Type & (DataType.ClrFunction | DataType.Function)) == 0) { + if (checkExist && !GlobalControls.retroMode) + UnitaleUtil.DisplayLuaError(scriptname, "Attempted to call the function \"" + functionName + "\", but it didn't exist."); + } else + try { return script.Call(function, args ?? new DynValue[0]); } catch (Exception e) { + if (args != null && args[0].Type == DataType.Table && args.Length == 1) { DynValue[] argsNew = UnitaleUtil.TableToDynValueArray(args[0].Table); - try { d = script.Call(script.Globals[function], argsNew); } - catch (InterpreterException ex) { UnitaleUtil.DisplayLuaError(scriptname, ex.DecoratedMessage == null ? - ex.Message : - UnitaleUtil.FormatErrorSource(ex.DecoratedMessage, ex.Message) + ex.Message, - ex.DoNotDecorateMessage); } - catch (Exception ex) { - if (!GlobalControls.retroMode) - UnitaleUtil.DisplayLuaError(scriptname + ", calling the function " + function, "This is a " + ex.GetType() + " error. Contact a developer and show them this screen, this must be an engine-side error.\n\n" + ex.Message + "\n\n" + ex.StackTrace + "\n"); + try { return script.Call(function, argsNew); } catch (Exception e2) { + if (e2 as InterpreterException != null) + e = e2; } - } else if (e.GetType() == typeof(InterpreterException) || e.GetType().BaseType == typeof(InterpreterException) || e.GetType().BaseType.BaseType == typeof(InterpreterException)) { - UnitaleUtil.DisplayLuaError(scriptname, ((InterpreterException)e).DecoratedMessage == null ? - ((InterpreterException)e).Message : - UnitaleUtil.FormatErrorSource(((InterpreterException)e).DecoratedMessage, ((InterpreterException)e).Message) + ((InterpreterException)e).Message, - ((InterpreterException)e).DoNotDecorateMessage); - } else if (!GlobalControls.retroMode) - UnitaleUtil.DisplayLuaError(scriptname + ", calling the function " + function, "This is a " + e.GetType() + " error. Contact a dev and show them this screen, this must be an engine-side error.\n\n" + e.Message + "\n\n" + e.StackTrace + "\n"); - } - return d; - } else { - DynValue d = DynValue.Nil; - try { d = script.Call(script.Globals[function]); } - catch (InterpreterException ex) { - UnitaleUtil.DisplayLuaError(scriptname, ex.DecoratedMessage == null ? - ex.Message : - UnitaleUtil.FormatErrorSource(ex.DecoratedMessage, ex.Message) + ex.Message, - ex.DoNotDecorateMessage); - } catch (Exception ex) { - if (GlobalControls.retroMode) return d; - if (ex.GetType().ToString() == "System.IndexOutOfRangeException" && ex.StackTrace.StartsWith(" at (wrapper stelemref) object:stelemref (object,intptr,object)" - + "\r\n at MoonSharp.Interpreter.DataStructs.FastStack`1[MoonSharp.Interpreter.DynValue].Push")) - UnitaleUtil.DisplayLuaError(scriptname + ", calling the function " + function, "Possible infinite loop\n\nThis is a " + ex.GetType() + " error.\n\n" - + "You almost definitely have an infinite loop in your code. A function tried to call itself infinitely. It could be a normal function or a metatable function." - + "\n\n\nFull stracktrace (see CYF output log at " + Application.persistentDataPath + "/output_log.txt):\n\n" + ex.StackTrace); - else - UnitaleUtil.DisplayLuaError(scriptname + ", calling the function " + function, "This is a " + ex.GetType() + " error. Contact a dev and show them this screen, this must be an engine-side error.\n\n" + ex.Message + "\n\n" + ex.StackTrace + "\n"); + } + + UnitaleUtil.HandleError(scriptname, functionName, e); } - return d; - } + return DynValue.Nil; } internal void Bind(string key, object func) { script.Globals[key] = func; } - internal void BindDyn(string key, DynValue func) { script.Globals[key] = func; } } \ No newline at end of file diff --git a/Assets/Scripts/Lua/StaticRegistries/AudioClipRegistry.cs b/Assets/Scripts/Lua/StaticRegistries/AudioClipRegistry.cs index 1bc10677e..af6293da6 100644 --- a/Assets/Scripts/Lua/StaticRegistries/AudioClipRegistry.cs +++ b/Assets/Scripts/Lua/StaticRegistries/AudioClipRegistry.cs @@ -23,8 +23,8 @@ private static AudioClip Get(string key, string prefix) { string k = key; key = key.TrimStart('/', '\\'); - string oggKey = key + (key.EndsWith(".ogg") ? "" : ".ogg"); - string wavKey = key + (key.EndsWith(".wav") ? "" : ".wav"); + string oggKey = key + (key.ToLower().EndsWith(".ogg") ? "" : ".ogg"); + string wavKey = key + (key.ToLower().EndsWith(".wav") ? "" : ".wav"); if (!FileLoader.SanitizePath(ref oggKey, "", false)) { FileLoader.SanitizePath(ref wavKey, "", !GlobalControls.retroMode); key = wavKey; @@ -124,9 +124,9 @@ private static void LoadAllFrom(string directoryPath, bool mod = false) { /// AudioClip object on successful load, otherwise null. public static AudioClip GetAudioClip(string musicFilePath) { AudioType type; - if (musicFilePath.EndsWith(".ogg")) type = AudioType.OGGVORBIS; - else if (musicFilePath.EndsWith(".wav")) type = AudioType.WAV; - else return null; + if (musicFilePath.ToLower().EndsWith(".ogg")) type = AudioType.OGGVORBIS; + else if (musicFilePath.ToLower().EndsWith(".wav")) type = AudioType.WAV; + else return null; UnityWebRequest www = UnityWebRequestMultimedia.GetAudioClip(new Uri(musicFilePath).AbsoluteUri.Replace("+", "%2B"), type); www.SendWebRequest(); diff --git a/Assets/Scripts/Lua/StaticRegistries/SpriteFontRegistry.cs b/Assets/Scripts/Lua/StaticRegistries/SpriteFontRegistry.cs index 498f13bd4..49a9baac9 100644 --- a/Assets/Scripts/Lua/StaticRegistries/SpriteFontRegistry.cs +++ b/Assets/Scripts/Lua/StaticRegistries/SpriteFontRegistry.cs @@ -20,7 +20,7 @@ public static class SpriteFontRegistry { public static UnderFont Get(string key) { string k = key; - key = key.TrimStart('/', '\\') + (key.EndsWith(".png") ? "" : ".png"); + key = key.TrimStart('/', '\\') + (key.ToLower().EndsWith(".png") ? "" : ".png"); FileLoader.SanitizePath(ref key, "Sprites/UI/Fonts/", false); key = key.ToLower(); return dict.ContainsKey(key) ? dict[key] : TryLoad(k, key); @@ -34,7 +34,7 @@ public static UnderFont TryLoad(string origKey, string key) { } private static UnderFont TryFetchFromDefault(string origKey, string key) { - FileInfo tryF = new FileInfo(Path.Combine(FileLoader.PathToDefaultFile("Sprites/UI/Fonts/"), origKey) + (origKey.EndsWith(".png") ? "" : ".png")); + FileInfo tryF = new FileInfo(Path.Combine(FileLoader.PathToDefaultFile("Sprites/UI/Fonts/"), origKey) + (origKey.ToLower().EndsWith(".png") ? "" : ".png")); if (!tryF.Exists) return null; @@ -44,7 +44,7 @@ private static UnderFont TryFetchFromDefault(string origKey, string key) { } private static UnderFont TryFetchFromMod(string origKey, string key) { - FileInfo tryF = new FileInfo(Path.Combine(FileLoader.PathToModFile("Sprites/UI/Fonts/"), origKey.TrimStart('/')) + (origKey.EndsWith(".png") ? "" : ".png")); + FileInfo tryF = new FileInfo(Path.Combine(FileLoader.PathToModFile("Sprites/UI/Fonts/"), origKey.TrimStart('/')) + (origKey.ToLower().EndsWith(".png") ? "" : ".png")); if (!tryF.Exists) return null; diff --git a/Assets/Scripts/Lua/StaticRegistries/SpriteRegistry.cs b/Assets/Scripts/Lua/StaticRegistries/SpriteRegistry.cs index ac0a2c975..9fa796456 100644 --- a/Assets/Scripts/Lua/StaticRegistries/SpriteRegistry.cs +++ b/Assets/Scripts/Lua/StaticRegistries/SpriteRegistry.cs @@ -24,7 +24,7 @@ public static void Unload(string key) { } public static Sprite Get(string origKey) { - origKey += origKey.EndsWith(".png") ? "" : ".png"; + origKey += origKey.ToLower().EndsWith(".png") ? "" : ".png"; string key = ProcessKey(origKey); return dict.ContainsKey(key) ? dict[key] : TryLoad(origKey, key); } @@ -39,7 +39,7 @@ private static Sprite TryLoad(string origKey, string key) { } private static Sprite TryFetchFromDefault(string origKey, string key) { - FileInfo tryF = new FileInfo(Path.Combine(FileLoader.PathToDefaultFile("Sprites"), origKey) + (origKey.EndsWith(".png") ? "" : ".png")); + FileInfo tryF = new FileInfo(Path.Combine(FileLoader.PathToDefaultFile("Sprites"), origKey) + (origKey.ToLower().EndsWith(".png") ? "" : ".png")); if (!tryF.Exists) return null; dictDefault[key] = tryF; @@ -48,7 +48,7 @@ private static Sprite TryFetchFromDefault(string origKey, string key) { } private static Sprite TryFetchFromMod(string origKey, string key) { - FileInfo tryF = new FileInfo(Path.Combine(FileLoader.PathToModFile("Sprites"), origKey.TrimStart('/')) + (origKey.EndsWith(".png") ? "" : ".png")); + FileInfo tryF = new FileInfo(Path.Combine(FileLoader.PathToModFile("Sprites"), origKey.TrimStart('/')) + (origKey.ToLower().EndsWith(".png") ? "" : ".png")); if (!tryF.Exists) return null; dictMod[key] = tryF; @@ -86,7 +86,7 @@ private static void LoadAllFrom(string directoryPath, bool mod = false) { } private static string ProcessKey(string key) { - key = key.TrimStart('/', '\\') + (key.EndsWith(".png") ? "" : ".png"); + key = key.TrimStart('/', '\\') + (key.ToLower().EndsWith(".png") ? "" : ".png"); FileLoader.SanitizePath(ref key, "Sprites/"); return key.ToLower(); } diff --git a/Assets/Scripts/Overworld/EnterNameScript.cs b/Assets/Scripts/Overworld/EnterNameScript.cs index cf088bfdc..5f1aff24c 100644 --- a/Assets/Scripts/Overworld/EnterNameScript.cs +++ b/Assets/Scripts/Overworld/EnterNameScript.cs @@ -25,7 +25,7 @@ private void Start() { isNewGame = SaveLoad.savedGame == null; try { GameObject.Find("textframe_border_outer").SetActive(false); } catch { /* ignored */ } - tmInstr.SetTextQueue(new[] { new TextMessage("[noskipatall]" + (GlobalControls.crate ? "GIV HMI A NAME!!!" : "Name the fallen human."), false, true) }); + tmInstr.SetTextQueue(new[] { new TextMessage((GlobalControls.crate ? "GIV HMI A NAME!!!" : "Name the fallen human."), false, true) }); tmInstr.SetHorizontalSpacing(2); tmName.SetHorizontalSpacing(2); GameObject firstCamera = GameObject.Find("Main Camera"); @@ -40,9 +40,9 @@ private void Start() { Camera.main.GetComponent().Play(); } tmName.SetTextQueue(new[] { new TextMessage(playerName, false, true) }); - tmLettersMaj.SetTextQueue(new[] { new TextMessage("[noskipatall][charspacing:52.2][linespacing:-1]ABCDEFG\nHIJKLMN\nOPQRSTU\nVWXYZ", false, true) }); + tmLettersMaj.SetTextQueue(new[] { new TextMessage("[charspacing:52.2][linespacing:-1]ABCDEFG\nHIJKLMN\nOPQRSTU\nVWXYZ", false, true) }); tmLettersMaj.SetEffect(new ShakeEffect(tmLettersMaj)); - tmLettersMin.SetTextQueue(new[] { new TextMessage("[noskipatall][charspacing:52.2][linespacing:-1]abcdefg\nhijklmn\nopqrstu\nvwxyz", false, true) }); + tmLettersMin.SetTextQueue(new[] { new TextMessage("[charspacing:52.2][linespacing:-1]abcdefg\nhijklmn\nopqrstu\nvwxyz", false, true) }); tmLettersMin.SetEffect(new ShakeEffect(tmLettersMin)); for (int i = 0; i < tmLettersMaj.GetComponentsInChildren().Length; i ++) tmLettersMaj.GetComponentsInChildren()[i].name = tmLettersMaj.GetComponentsInChildren()[i].sprite.name; @@ -57,9 +57,9 @@ private void Update() { if (!hackFirstString && tmName.transform.childCount != 0 && !isNewGame) { hackFirstString = true; tmName.SetTextQueue(new[] { new TextMessage(playerName, false, true) }); - tmName.transform.localPosition = new Vector3(-calcTotalLength(tmName) / 2, tmName.transform.localPosition.y, tmName.transform.localPosition.z); + tmName.MoveTo(-calcTotalLength(tmName) / 2, tmName.transform.localPosition.y); } - if (GlobalControls.input.Down == UndertaleInput.ButtonState.PRESSED) { + if (GlobalControls.input.Down == ButtonState.PRESSED) { switch (choiceLetter) { case "Quit": setColor("A"); break; case "Backspace": setColor("D"); break; @@ -80,7 +80,7 @@ private void Update() { case "z": setColor("Backspace"); break; default: setColor(choiceLetter[0] + 7); break; } - } else if (GlobalControls.input.Up == UndertaleInput.ButtonState.PRESSED) { + } else if (GlobalControls.input.Up == ButtonState.PRESSED) { switch (choiceLetter) { case "Quit": setColor("v"); break; case "Backspace": setColor("y"); break; @@ -101,7 +101,7 @@ private void Update() { case "G": setColor("Done"); break; default: setColor(choiceLetter[0] - 7); break; } - } else if (GlobalControls.input.Right == UndertaleInput.ButtonState.PRESSED) { + } else if (GlobalControls.input.Right == ButtonState.PRESSED) { switch (choiceLetter) { case "Quit": setColor("Backspace"); break; case "Backspace": setColor("Done"); break; @@ -116,7 +116,7 @@ private void Update() { case "z": setColor(choiceLetter[0] - 4); break; default: setColor(choiceLetter[0] + 1); break; } - } else if (GlobalControls.input.Left == UndertaleInput.ButtonState.PRESSED) { + } else if (GlobalControls.input.Left == ButtonState.PRESSED) { switch (choiceLetter) { case "Quit": setColor("Done"); break; case "Backspace": setColor("Quit"); break; @@ -131,15 +131,15 @@ private void Update() { case "v": setColor(choiceLetter[0] + 4); break; default: setColor(choiceLetter[0] - 1); break; } - } else if (GlobalControls.input.Cancel == UndertaleInput.ButtonState.PRESSED) { + } else if (GlobalControls.input.Cancel == ButtonState.PRESSED) { weirdBackspaceShift = true; if (playerName.Length > 0) playerName = playerName.Substring(0, playerName.Length - 1); else weirdBackspaceShift = false; tmName.SetTextQueue(new[] { new TextMessage(playerName, false, true) }); - tmName.transform.localPosition = new Vector3(-calcTotalLength(tmName) / 2, tmName.transform.localPosition.y, tmName.transform.localPosition.z); - } else if (GlobalControls.input.Confirm == UndertaleInput.ButtonState.PRESSED) { + tmName.MoveTo(-calcTotalLength(tmName) / 2, tmName.transform.localPosition.y); + } else if (GlobalControls.input.Confirm == ButtonState.PRESSED) { switch (choiceLetter) { case "Quit": GameObject.Find("Main Camera").GetComponent().Stop(); @@ -172,7 +172,7 @@ private void Update() { } } tmName.SetTextQueue(new[] { new TextMessage(playerName, false, true) }); - tmName.transform.localPosition = new Vector3(-calcTotalLength(tmName) / 2, tmName.transform.localPosition.y, tmName.transform.localPosition.z); + tmName.MoveTo(-calcTotalLength(tmName) / 2, tmName.transform.localPosition.y); uiAudio.PlayOneShot(AudioClipRegistry.GetSound("menuconfirm")); return; } else @@ -191,22 +191,22 @@ private void setColor(string str) { private IEnumerator waitConfirm(bool isForbidden = false) { yield return 0; - tmInstr.SetTextQueue(new[] { new TextMessage("[noskipatall]" + (confirmText ?? (GlobalControls.crate ? "LAL GUD???" : "[noskipatall]Is this name correct?")), false, true) }); + tmInstr.SetTextQueue(new[] { new TextMessage((confirmText ?? (GlobalControls.crate ? "LAL GUD???" : "Is this name correct?")), false, true) }); tmName.SetEffect(new ShakeEffect(tmName)); GameObject.Find("Backspace").GetComponent().enabled = false; - tmLettersMaj.transform.position = new Vector3(tmLettersMaj.transform.position.x, tmLettersMaj.transform.position.y, 10000); - tmLettersMin.transform.position = new Vector3(tmLettersMin.transform.position.x, tmLettersMin.transform.position.y, 10000); + tmLettersMaj.gameObject.SetActive(false); + tmLettersMin.gameObject.SetActive(false); setColor("Quit"); GameObject.Find("Done").GetComponent().color = new Color(1, 1, 1, isForbidden ? 0 : 1); float diff = calcTotalLength(tmName)*2; float actualX = tmName.transform.localPosition.x, actualY = tmName.transform.localPosition.y; - while (GlobalControls.input.Confirm != UndertaleInput.ButtonState.PRESSED) { + while (GlobalControls.input.Confirm != ButtonState.PRESSED) { if (tmName.transform.localScale.x < 3) { - tmName.transform.localScale = new Vector3(tmName.transform.localScale.x + 0.01f, tmName.transform.localScale.y + 0.01f, 1); - tmName.transform.localPosition = new Vector3(actualX - (tmName.transform.localScale.x - 1) * diff / 2, - actualY - (tmName.transform.localScale.x - 1) * diff / 6, tmName.transform.localPosition.z); + float scale = Mathf.Min(3, tmName.transform.localScale.x + 0.01f); + tmName.transform.localScale = new Vector3(scale, scale, 1); + tmName.MoveTo(actualX - (tmName.transform.localScale.x - 1) * diff / 2, actualY - (tmName.transform.localScale.x - 1) * diff / 6); } - if ((GlobalControls.input.Left == UndertaleInput.ButtonState.PRESSED || GlobalControls.input.Right == UndertaleInput.ButtonState.PRESSED) + if ((GlobalControls.input.Left == ButtonState.PRESSED || GlobalControls.input.Right == ButtonState.PRESSED) && GameObject.Find("Done").GetComponent().enabled &&!isForbidden) { setColor(choiceLetter == "Quit" ? "Done": "Quit"); uiAudio.PlayOneShot(AudioClipRegistry.GetSound("menumove")); @@ -221,10 +221,10 @@ private IEnumerator waitConfirm(bool isForbidden = false) { tmName.transform.localScale = new Vector3(1, 1, 1); tmName.SetEffect(null); tmName.SetTextQueue(new[] { new TextMessage(playerName, false, true) }); - tmName.transform.localPosition = new Vector3(-calcTotalLength(tmName)/2, 145, tmName.transform.localPosition.z); - tmInstr.SetTextQueue(new[] { new TextMessage("[noskipatall]" + (GlobalControls.crate ? "QWIK QWIK QWIK!!!" : "Name the fallen human."), false, true) }); - tmLettersMaj.transform.position = new Vector3(tmLettersMaj.transform.position.x, tmLettersMaj.transform.position.y, 0); - tmLettersMin.transform.position = new Vector3(tmLettersMin.transform.position.x, tmLettersMin.transform.position.y, 0); + tmName.MoveTo(-calcTotalLength(tmName)/2, 145); + tmInstr.SetTextQueue(new[] { new TextMessage((GlobalControls.crate ? "QWIK QWIK QWIK!!!" : "Name the fallen human."), false, true) }); + tmLettersMaj.gameObject.SetActive(true); + tmLettersMin.gameObject.SetActive(true); GameObject.Find("Backspace").GetComponent().enabled = true; setColor("Done"); } else { @@ -235,8 +235,9 @@ private IEnumerator waitConfirm(bool isForbidden = false) { SpriteRenderer blank = GameObject.Find("Blank").GetComponent(); while (blank.color.a <= 1) { if (tmName.transform.localScale.x < 3) { - tmName.transform.localScale = new Vector3(tmName.transform.localScale.x + 0.01f, tmName.transform.localScale.y + 0.01f, 1); - tmName.transform.localPosition = new Vector3(actualX - (tmName.transform.localScale.x - 1f) * diff / 2f, actualY - (tmName.transform.localScale.x - 1f) * diff / 6, tmName.transform.localPosition.z); + float scale = Mathf.Min(3, tmName.transform.localScale.x + 0.01f); + tmName.transform.localScale = new Vector3(scale, scale, 1); + tmName.MoveTo(actualX - (tmName.transform.localScale.x - 1f) * diff / 2f, actualY - (tmName.transform.localScale.x - 1f) * diff / 6); } blank.color = new Color(blank.color.r, blank.color.g, blank.color.b, blank.color.a + 0.003f); yield return 0; diff --git a/Assets/Scripts/Overworld/EventManager.cs b/Assets/Scripts/Overworld/EventManager.cs index ec1067ae3..abe9ad0ad 100644 --- a/Assets/Scripts/Overworld/EventManager.cs +++ b/Assets/Scripts/Overworld/EventManager.cs @@ -211,7 +211,7 @@ private void Update() { // Run an available auto event if (TestEventAuto()) return; // If the Player pressed the Confirm key, check if it's in range of a button press event - if (GlobalControls.input.Confirm == UndertaleInput.ButtonState.PRESSED && !passPressOnce && (GameObject.Find("FadingBlack") == null || GameObject.Find("FadingBlack").GetComponent().alpha <= 0)) { + if (GlobalControls.input.Confirm == ButtonState.PRESSED && !passPressOnce && (GameObject.Find("FadingBlack") == null || GameObject.Find("FadingBlack").GetComponent().alpha <= 0)) { RaycastHit2D hit; TestEventPress(PlayerOverworld.instance.lastMove.x, PlayerOverworld.instance.lastMove.y, out hit); } else @@ -694,14 +694,15 @@ public void SetPlayerOnSelection(int selection, bool question = false, bool thre if (threeLines) selection += 2; else selection += 4; } - // Position of the soul if selection was 0 - Vector2 upperLeft = new Vector2(61 + Camera.main.transform.position.x - 320, - GameObject.Find("letter(Clone)").GetComponent().position.y + (GameObject.Find("letter(Clone)").GetComponent().sizeDelta.y / 2) - 1); - // Compute the horizontal and vertical shift of the soul - int xMv = selection % 2; - int yMv = selection / 2; - // Move the soul where it should be, hardcoded - GameObject.Find("tempHeart").GetComponent().position = new Vector2(upperLeft.x + xMv * 303, upperLeft.y - yMv * _textManager.Charset.LineSpacing); + + int xMv = selection % _textManager.columnNumber; + int yMv = selection / _textManager.columnNumber; + + if (_textManager.letters.Count > 0) + GameObject.Find("tempHeart").GetComponent().position = + new Vector3(_textManager.letters[0].image.transform.position.x + xMv * _textManager.columnShift, + _textManager.letters[0].image.transform.position.y - yMv * _textManager.font.LineSpacing + 9, + GameObject.Find("tempHeart").GetComponent().position.z); } /// @@ -1049,8 +1050,7 @@ public static void GetMapState(MapInfos mi, string id) { /// public void EndEvent() { PlayerOverworld.instance.textmgr.SetTextFrameAlpha(0); - PlayerOverworld.instance.textmgr.textQueue = new TextMessage[] { }; - PlayerOverworld.instance.textmgr.DestroyChars(); + PlayerOverworld.instance.textmgr.SetTextQueue(new TextMessage[] { }); PlayerOverworld.instance.PlayerNoMove = false; PlayerOverworld.instance.UIPos = 0; ScriptRunning = false; @@ -1202,13 +1202,14 @@ private IEnumerator ISetChoice(object[] args) { // Main loop of the choice dialogue while (true) { + int xMov = GlobalControls.input.Right == ButtonState.PRESSED ? 1 : GlobalControls.input.Left == ButtonState.PRESSED ? -1 : 0; // Move the soul in front of the current selected option if one of the Left or Right keys are pressed - if (GlobalControls.input.Right == UndertaleInput.ButtonState.PRESSED || GlobalControls.input.Left == UndertaleInput.ButtonState.PRESSED) { - actualChoice = (actualChoice + 1) % 2; + if (xMov != 0) { + actualChoice = UnitaleUtil.SelectionChoice(2, actualChoice, xMov, 0, 1, 2, false); SetPlayerOnSelection(actualChoice, question, !oneLiners[actualChoice]); // Confirm the selected option if a Confirm key is pressed - } else if (GlobalControls.input.Confirm == UndertaleInput.ButtonState.PRESSED) - if (!_textManager.blockSkip && !_textManager.LineComplete() && _textManager.CanSkip()) + } else if (GlobalControls.input.Confirm == ButtonState.PRESSED) + if (!_textManager.LineComplete() && _textManager.CanSkip()) _textManager.SkipLine(); else break; @@ -1379,7 +1380,7 @@ private IEnumerator IWaitForInput() { } // Wait until the Player presses a Confirm key - while (GlobalControls.input.Confirm != UndertaleInput.ButtonState.PRESSED) + while (GlobalControls.input.Confirm != ButtonState.PRESSED) yield return 0; scr.Call("CYFEventNextCommand"); @@ -1743,20 +1744,20 @@ private IEnumerator ISave(object[] args) { var playerName = SaveLoad.savedGame.player.Name; double playerLevel = SaveLoad.savedGame.player.LV; - txtName.SetTextQueue(new[] { new TextMessage("[noskipatall][charspacing:2]" + playerName, false, true) }); - txtLevel.SetTextQueue(new[] { new TextMessage("[noskipatall][charspacing:2]LV" + playerLevel, false, true) }); - txtTime.SetTextQueue(new[] { new TextMessage("[noskipatall][charspacing:2]" + UnitaleUtil.TimeFormatter(SaveLoad.savedGame.playerTime), false, true) }); - GameObject.Find("TextManagerTime").transform.localPosition = new Vector3(180f - UnitaleUtil.CalcTextWidth(txtTime), 68, 0f); - txtMap.SetTextQueue(new[] { new TextMessage("[noskipatall][charspacing:2]" + SaveLoad.savedGame.lastScene, false, true) }); + txtName.SetTextQueue(new[] { new TextMessage("[charspacing:2]" + playerName, false, true) }); + txtLevel.SetTextQueue(new[] { new TextMessage("[charspacing:2]LV" + playerLevel, false, true) }); + txtTime.SetTextQueue(new[] { new TextMessage("[charspacing:2]" + UnitaleUtil.TimeFormatter(SaveLoad.savedGame.playerTime), false, true) }); + GameObject.Find("TextManagerTime").GetComponent().MoveTo(180f - UnitaleUtil.PredictTextWidth(txtTime), 68); + txtMap.SetTextQueue(new[] { new TextMessage("[charspacing:2]" + SaveLoad.savedGame.lastScene, false, true) }); } else { - txtName.SetTextQueue(new[] { new TextMessage("[noskipatall][charspacing:2]EMPTY", false, true) }); - txtLevel.SetTextQueue(new[] { new TextMessage("[noskipatall][charspacing:2]LV0", false, true) }); - txtTime.SetTextQueue(new[] { new TextMessage("[noskipatall][charspacing:2]0:00", false, true) }); - GameObject.Find("TextManagerTime").transform.localPosition = new Vector3(130f, 68, 0f); - txtMap.SetTextQueue(new[] { new TextMessage("[noskipatall][charspacing:2]--", false, true) }); + txtName.SetTextQueue(new[] { new TextMessage("[charspacing:2]EMPTY", false, true) }); + txtLevel.SetTextQueue(new[] { new TextMessage("[charspacing:2]LV0", false, true) }); + txtTime.SetTextQueue(new[] { new TextMessage("[charspacing:2]0:00", false, true) }); + GameObject.Find("TextManagerTime").GetComponent().MoveTo(130f, 68); + txtMap.SetTextQueue(new[] { new TextMessage("[charspacing:2]--", false, true) }); } - txtSave.SetTextQueue(new[] { new TextMessage("[noskipatall][charspacing:2]Save", false, true) }); - txtReturn.SetTextQueue(new[] { new TextMessage("[noskipatall][charspacing:2]Return", false, true) }); + txtSave.SetTextQueue(new[] { new TextMessage("[charspacing:2]Save", false, true) }); + txtReturn.SetTextQueue(new[] { new TextMessage("[charspacing:2]Return", false, true) }); // Hide the text dialogue box GameObject.Find("Mugshot").GetComponent().color = new Color(1, 1, 1, 0); @@ -1768,28 +1769,28 @@ private IEnumerator ISave(object[] args) { bool end = false; while (true) { // Move the soul in front of the current selected option if one of the Left or Right keys are pressed - if (GlobalControls.input.Left == UndertaleInput.ButtonState.PRESSED || GlobalControls.input.Right == UndertaleInput.ButtonState.PRESSED) { + if (GlobalControls.input.Left == ButtonState.PRESSED || GlobalControls.input.Right == ButtonState.PRESSED) { PlayerOverworld.instance.utHeart.transform.position = new Vector3((save ? 331 : 151) + Camera.main.transform.position.x - 320, PlayerOverworld.instance.utHeart.transform.position.y, PlayerOverworld.instance.utHeart.transform.position.z); save = !save; // Select automatically "Return" if a Cancel key has been pressed - } else if (GlobalControls.input.Cancel == UndertaleInput.ButtonState.PRESSED) { + } else if (GlobalControls.input.Cancel == ButtonState.PRESSED) { end = true; // Choose the currently selected option if a Confirm key has been pressed - } else if (GlobalControls.input.Confirm == UndertaleInput.ButtonState.PRESSED) { + } else if (GlobalControls.input.Confirm == ButtonState.PRESSED) { if (save) { // Save the game SaveLoad.Save(true); // Update the save dialogue box's data PlayerOverworld.instance.utHeart.color = new Color(c.r, c.g, c.b, 0); - txtName.SetTextQueue(new[] { new TextMessage("[noskipatall][charspacing:2]" + PlayerCharacter.instance.Name, false, true) }); - txtLevel.SetTextQueue(new[] { new TextMessage("[noskipatall][charspacing:2]LV" + PlayerCharacter.instance.LV, false, true) }); - txtTime.SetTextQueue(new[] { new TextMessage("[noskipatall][charspacing:2]" + UnitaleUtil.TimeFormatter(SaveLoad.savedGame.playerTime), false, true) }); - GameObject.Find("TextManagerTime").transform.localPosition = new Vector3(180f - UnitaleUtil.CalcTextWidth(txtTime), 68, 0f); - txtMap.SetTextQueue(new[] { new TextMessage("[noskipatall][charspacing:2]" + SaveLoad.savedGame.lastScene, false, true) }); - txtSave.SetTextQueue(new[] { new TextMessage("[noskipatall][charspacing:2]File saved.", false, true) }); - txtReturn.SetTextQueue(new[] { new TextMessage("[noskipatall][charspacing:2]", false, true) }); + txtName.SetTextQueue(new[] { new TextMessage("[charspacing:2]" + PlayerCharacter.instance.Name, false, true) }); + txtLevel.SetTextQueue(new[] { new TextMessage("[charspacing:2]LV" + PlayerCharacter.instance.LV, false, true) }); + txtTime.SetTextQueue(new[] { new TextMessage("[charspacing:2]" + UnitaleUtil.TimeFormatter(SaveLoad.savedGame.playerTime), false, true) }); + GameObject.Find("TextManagerTime").GetComponent().MoveTo(180f - UnitaleUtil.PredictTextWidth(txtTime), 68); + txtMap.SetTextQueue(new[] { new TextMessage("[charspacing:2]" + SaveLoad.savedGame.lastScene, false, true) }); + txtSave.SetTextQueue(new[] { new TextMessage("[charspacing:2]File saved.", false, true) }); + txtReturn.SetTextQueue(new[] { new TextMessage("[charspacing:2]", false, true) }); foreach (Image img in GameObject.Find("save_interior").transform.GetComponentsInChildren()) img.color = new Color(1, 1, 0, 1); GameObject.Find("save_interior").GetComponent().color = new Color(0, 0, 0, 1); @@ -1801,7 +1802,7 @@ private IEnumerator ISave(object[] args) { do { passPressOnce = true; yield return 0; - } while (GlobalControls.input.Confirm != UndertaleInput.ButtonState.PRESSED); + } while (GlobalControls.input.Confirm != ButtonState.PRESSED); } end = true; } @@ -1809,7 +1810,7 @@ private IEnumerator ISave(object[] args) { // Hides the save dialogue box if (end) { PlayerOverworld.instance.utHeart.color = new Color(c.r, c.g, c.b, 0); - txtName.DestroyChars(); txtLevel.DestroyChars(); txtTime.DestroyChars(); txtMap.DestroyChars(); txtSave.DestroyChars(); txtReturn.DestroyChars(); + txtName.HideTextObject(); txtLevel.HideTextObject(); txtTime.HideTextObject(); txtMap.HideTextObject(); txtSave.HideTextObject(); txtReturn.HideTextObject(); GameObject.Find("save_border_outer").GetComponent().color = new Color(1, 1, 1, 0); GameObject.Find("save_interior").GetComponent().color = new Color(0, 0, 0, 0); script.Call("CYFEventNextCommand"); diff --git a/Assets/Scripts/Overworld/IntroManager.cs b/Assets/Scripts/Overworld/IntroManager.cs index 4a4f1e9f4..4b6d0d47c 100644 --- a/Assets/Scripts/Overworld/IntroManager.cs +++ b/Assets/Scripts/Overworld/IntroManager.cs @@ -82,7 +82,7 @@ private void Update () { //Check end of intro if (text.AllLinesComplete()) { fadeMusic = true; - text.DestroyChars(); + text.HideTextObject(); } else { img.sprite = SpriteRegistry.Get("Intro/" + imagePaths[++currentIndex]); img.SetNativeSize(); diff --git a/Assets/Scripts/Overworld/ItemBoxUI.cs b/Assets/Scripts/Overworld/ItemBoxUI.cs index 721b7c9f3..234429448 100644 --- a/Assets/Scripts/Overworld/ItemBoxUI.cs +++ b/Assets/Scripts/Overworld/ItemBoxUI.cs @@ -43,7 +43,7 @@ private void Start() { go.AddComponent(); TextManager tm = go.GetComponent(); tm.transform.SetParent(transform); - tm.transform.localPosition = new Vector3(80, 410 - (i * 32)); + tm.MoveTo(80, 410 - (i * 32)); inventory.Add(tm); LuaSpriteController sprite = (LuaSpriteController) (SpriteUtil.MakeIngameSprite("px", -1).UserData.Object); @@ -61,7 +61,7 @@ private void Start() { go.AddComponent(); TextManager tm = go.GetComponent(); tm.transform.SetParent(transform); - tm.transform.localPosition = new Vector3(372, 410 - (i * 32)); + tm.MoveTo(372, 410 - (i * 32)); boxContents.Add(tm); LuaSpriteController sprite = (LuaSpriteController) (SpriteUtil.MakeIngameSprite("px", -1).UserData.Object); @@ -77,7 +77,7 @@ private void Start() { // Update is called once per frame private void Update() { - if (GlobalControls.input.Confirm == UndertaleInput.ButtonState.PRESSED) { + if (GlobalControls.input.Confirm == ButtonState.PRESSED) { List selectedInv = inventoryColumn ? Inventory.inventory : ItemBox.items; List otherInv = inventoryColumn ? ItemBox.items : Inventory.inventory; int otherInvCapacity = inventoryColumn ? ItemBox.capacity : Inventory.inventorySize; @@ -99,27 +99,27 @@ private void Update() { UnitaleUtil.PlaySound("SeparateSound", "menumove"); RefreshDisplay(); - } else if (GlobalControls.input.Up == UndertaleInput.ButtonState.PRESSED) { + } else if (GlobalControls.input.Up == ButtonState.PRESSED) { lineIndex--; if (lineIndex < 0) lineIndex = (inventoryColumn ? Inventory.inventorySize : ItemBox.capacity) - 1; UnitaleUtil.PlaySound("SeparateSound", "menumove"); RefreshDisplay(); - } else if (GlobalControls.input.Down == UndertaleInput.ButtonState.PRESSED) { + } else if (GlobalControls.input.Down == ButtonState.PRESSED) { lineIndex++; if (lineIndex >= (inventoryColumn ? Inventory.inventorySize : ItemBox.capacity)) lineIndex = 0; UnitaleUtil.PlaySound("SeparateSound", "menumove"); RefreshDisplay(); - } else if (GlobalControls.input.Left == UndertaleInput.ButtonState.PRESSED || GlobalControls.input.Right == UndertaleInput.ButtonState.PRESSED) { + } else if (GlobalControls.input.Left == ButtonState.PRESSED || GlobalControls.input.Right == ButtonState.PRESSED) { if (lineIndex >= Inventory.inventorySize || lineIndex >= ItemBox.capacity) return; inventoryColumn = !inventoryColumn; UnitaleUtil.PlaySound("SeparateSound", "menumove"); RefreshDisplay(); - } else if (GlobalControls.input.Cancel == UndertaleInput.ButtonState.PRESSED) { + } else if (GlobalControls.input.Cancel == ButtonState.PRESSED) { UnitaleUtil.PlaySound("SeparateSound", "menumove"); DestroySelf(); } @@ -149,14 +149,14 @@ private void RefreshDisplay() { private void DestroySelf() { while (inventory.Count > 0) { - inventory[0].DestroyChars(); + inventory[0].HideTextObject(); Destroy(inventory[0].gameObject); inventory.RemoveAt(0); inventorySprites[0].Remove(); inventorySprites.RemoveAt(0); } while (boxContents.Count > 0) { - boxContents[0].DestroyChars(); + boxContents[0].HideTextObject(); Destroy(boxContents[0].gameObject); boxContents.RemoveAt(0); boxContentsSprites[0].Remove(); diff --git a/Assets/Scripts/Overworld/PlayerOverworld.cs b/Assets/Scripts/Overworld/PlayerOverworld.cs index b7f0d62a2..877d8f9a2 100644 --- a/Assets/Scripts/Overworld/PlayerOverworld.cs +++ b/Assets/Scripts/Overworld/PlayerOverworld.cs @@ -197,20 +197,22 @@ private void OnDisable() { private void FinishFade() { PlayerNoMove = false; } // Scene loaded private void NextText() { - if (!textmgr.AllLinesComplete() && (textmgr.CanAutoSkipAll() || textmgr.LineComplete())) - textmgr.NextLineText(); - else if ((textmgr.AllLinesComplete() || textmgr.CanAutoSkipAll()) && textmgr.LineCount() != 0) { - EventManager.instance.passPressOnce = true; - textmgr.transform.parent.parent.SetAsFirstSibling(); - textmgr.SetTextQueue(null); - textmgr.DestroyChars(); - textmgr.SetHorizontalSpacing(textmgr.Charset.CharSpacing); - textmgr.SetVerticalSpacing(); - textmgr.SetTextFrameAlpha(0); - if (EventManager.instance.script != null) - EventManager.instance.script.Call("CYFEventNextCommand"); - else - PlayerNoMove = false; //End text no event + if (textmgr.CanAutoSkipAny(true) || textmgr.LineComplete()) { + if (!textmgr.AllLinesComplete()) + textmgr.NextLineText(); + else if (textmgr.LineCount() != 0) { + EventManager.instance.passPressOnce = true; + textmgr.transform.parent.parent.SetAsFirstSibling(); + textmgr.SetTextQueue(null); + textmgr.HideTextObject(); + textmgr.SetHorizontalSpacing(textmgr.font.CharSpacing); + textmgr.SetVerticalSpacing(); + textmgr.SetTextFrameAlpha(0); + if (EventManager.instance.script != null) + EventManager.instance.script.Call("CYFEventNextCommand"); + else + PlayerNoMove = false; //End text no event + } } } @@ -220,14 +222,14 @@ private IEnumerator TextCoroutine() { if (!GameObject.Find("textframe_border_outer")) continue; if (GameObject.Find("textframe_border_outer").GetComponent().color.a == 0) continue; try { - if (textmgr.CanAutoSkipAll()) + if (textmgr.CanAutoSkipAny(true)) NextText(); - if (GlobalControls.input.Cancel == UndertaleInput.ButtonState.PRESSED && !textmgr.blockSkip && !textmgr.LineComplete() && textmgr.CanSkip()) { + if (GlobalControls.input.Cancel == ButtonState.PRESSED && !textmgr.LineComplete() && textmgr.CanSkip()) { if (EventManager.instance.script != null && EventManager.instance.script.GetVar("playerskipdocommand").Boolean) textmgr.DoSkipFromPlayer(); else textmgr.SkipLine(); - } else if (GlobalControls.input.Confirm == UndertaleInput.ButtonState.PRESSED && !textmgr.blockSkip && !EventManager.instance.passPressOnce) + } else if (GlobalControls.input.Confirm == ButtonState.PRESSED && !EventManager.instance.passPressOnce) NextText(); } catch { /* ignored */ } } @@ -259,8 +261,8 @@ private void Update() { int currentDirection = 0; //If you locked the player, do nothing if (!PlayerNoMove) { - horizontal = (int)(Input.GetAxisRaw("Horizontal")); - vertical = (int)(Input.GetAxisRaw("Vertical")); + horizontal = (int)Input.GetAxisRaw("Horizontal"); + vertical = (int)Input.GetAxisRaw("Vertical"); //Just some animations switches if (animator.movementDirection == 0) { if (GlobalControls.input.Up > 0) currentDirection = 8; @@ -268,10 +270,10 @@ private void Update() { else if (GlobalControls.input.Right > 0) currentDirection = 6; else if (GlobalControls.input.Left > 0) currentDirection = 4; } - if (GlobalControls.input.Up == UndertaleInput.ButtonState.PRESSED) currentDirection = 8; - else if (GlobalControls.input.Right == UndertaleInput.ButtonState.PRESSED) currentDirection = 6; - else if (GlobalControls.input.Left == UndertaleInput.ButtonState.PRESSED) currentDirection = 4; - else if (GlobalControls.input.Down == UndertaleInput.ButtonState.PRESSED) currentDirection = 2; + if (GlobalControls.input.Up == ButtonState.PRESSED) currentDirection = 8; + else if (GlobalControls.input.Right == ButtonState.PRESSED) currentDirection = 6; + else if (GlobalControls.input.Left == ButtonState.PRESSED) currentDirection = 4; + else if (GlobalControls.input.Down == ButtonState.PRESSED) currentDirection = 2; if ((animator.beginAnim.Contains("Up") && GlobalControls.input.Up <= 0) || (animator.beginAnim.Contains("Right") && GlobalControls.input.Right <= 0) || (animator.beginAnim.Contains("Left") && GlobalControls.input.Left <= 0) || (animator.beginAnim.Contains("Down") && GlobalControls.input.Down <= 0)) { if (horizontal < 0) currentDirection = 4; @@ -286,7 +288,7 @@ private void Update() { if (!isBeingMoved) isMoving = AttemptMove(horizontal, vertical); - if (GlobalControls.input.Menu == UndertaleInput.ButtonState.PRESSED) + if (GlobalControls.input.Menu == ButtonState.PRESSED) if (menuRunning[2] && !menuRunning[3] && !menuRunning[4]) CloseMenu(true); menuRunning[4] = false; @@ -588,17 +590,12 @@ public void SetDialog(string[] textTable, bool rearranged, DynValue mugshots = n TextMessage[] textmsg = new TextMessage[textTable.Length]; - if (mugshots != null) - for (int i = 0; i < textTable.Length; i++) - textmsg[i] = new TextMessage(textTable[i], rearranged, false, mugshots); - else - for (int i = 0; i < textTable.Length; i++) - textmsg[i] = new TextMessage(textTable[i], rearranged, false); + for (int i = 0; i < textTable.Length; i++) + textmsg[i] = new TextMessage(textTable[i], rearranged, false, mugshots); PlayerNoMove = true; //Old SetDialog EventManager.instance.passPressOnce = true; textmgr.SetTextFrameAlpha(1); - textmgr.blockSkip = false; //textmgr.setTextQueue(textmsg, mugshots); textmgr.SetTextQueue(textmsg); @@ -675,27 +672,27 @@ public static IEnumerator LaunchMenu() { instance.UIPos = 0; AutoSetUIPos(); - GameObject.Find("TextManager OW").GetComponent().SetText(new TextMessage("[noskipatall]", false, false)); + GameObject.Find("TextManager OW").GetComponent().SetText(new TextMessage("", false, false)); GameObject.Find("menustat_border_outer").GetComponent().color = new Color(1, 1, 1, 1); GameObject.Find("menuchoice_border_outer").GetComponent().color = new Color(1, 1, 1, 1); GameObject.Find("menustat_interior").GetComponent().color = new Color(0, 0, 0, 1); GameObject.Find("menuchoice_interior").GetComponent().color = new Color(0, 0, 0, 1); - txtmgrs[0].SetText(new TextMessage("[noskipatall]" + PlayerCharacter.instance.Name, false, true)); + txtmgrs[0].SetText(new TextMessage("" + PlayerCharacter.instance.Name, false, true)); if (GlobalControls.crate) { - txtmgrs[1].SetText(new TextMessage("[noskipatall][font:menu]LV " + PlayerCharacter.instance.LV, false, true)); - txtmgrs[2].SetText(new TextMessage("[noskipatall][font:menu]PH " + (int)PlayerCharacter.instance.HP + "/" + PlayerCharacter.instance.MaxHP, false, true)); - txtmgrs[3].SetText(new TextMessage("[noskipatall][font:menu]G " + PlayerCharacter.instance.Gold, false, true)); - txtmgrs[4].SetText(new TextMessage("[noskipatall]" + (Inventory.inventory.Count > 0 ? "" : "[color:808080]") + "TEM", false, true)); - txtmgrs[5].SetText(new TextMessage("[noskipatall]TAST", false, true)); - txtmgrs[6].SetText(new TextMessage("[noskipatall]LECL", false, true)); + txtmgrs[1].SetText(new TextMessage("[font:menu]LV " + PlayerCharacter.instance.LV, false, true)); + txtmgrs[2].SetText(new TextMessage("[font:menu]PH " + (int)PlayerCharacter.instance.HP + "/" + PlayerCharacter.instance.MaxHP, false, true)); + txtmgrs[3].SetText(new TextMessage("[font:menu]G " + PlayerCharacter.instance.Gold, false, true)); + txtmgrs[4].SetText(new TextMessage((Inventory.inventory.Count > 0 ? "" : "[color:808080]") + "TEM", false, true)); + txtmgrs[5].SetText(new TextMessage("TAST", false, true)); + txtmgrs[6].SetText(new TextMessage("LECL", false, true)); } else { - txtmgrs[1].SetText(new TextMessage("[noskipatall][font:menu]LV " + PlayerCharacter.instance.LV, false, true)); - txtmgrs[2].SetText(new TextMessage("[noskipatall][font:menu]HP " + (int)PlayerCharacter.instance.HP + "/" + PlayerCharacter.instance.MaxHP, false, true)); - txtmgrs[3].SetText(new TextMessage("[noskipatall][font:menu]G " + PlayerCharacter.instance.Gold, false, true)); - txtmgrs[4].SetText(new TextMessage("[noskipatall]" + (Inventory.inventory.Count > 0 ? "" : "[color:808080]") + "ITEM", false, true)); - txtmgrs[5].SetText(new TextMessage("[noskipatall]STAT", false, true)); - txtmgrs[6].SetText(new TextMessage("[noskipatall]CELL", false, true)); + txtmgrs[1].SetText(new TextMessage("[font:menu]LV " + PlayerCharacter.instance.LV, false, true)); + txtmgrs[2].SetText(new TextMessage("[font:menu]HP " + (int)PlayerCharacter.instance.HP + "/" + PlayerCharacter.instance.MaxHP, false, true)); + txtmgrs[3].SetText(new TextMessage("[font:menu]G " + PlayerCharacter.instance.Gold, false, true)); + txtmgrs[4].SetText(new TextMessage((Inventory.inventory.Count > 0 ? "" : "[color:808080]") + "ITEM", false, true)); + txtmgrs[5].SetText(new TextMessage("STAT", false, true)); + txtmgrs[6].SetText(new TextMessage("CELL", false, true)); } GameObject.Find("Mugshot").GetComponent().color = new Color(1, 1, 1, 0); GameObject.Find("textframe_border_outer").GetComponent().color = new Color(1, 1, 1, 0); @@ -707,13 +704,13 @@ public static IEnumerator LaunchMenu() { yield return 0; while (!instance.menuRunning[3]) { if (!instance.menuRunning[0]) { - if (GlobalControls.input.Up == UndertaleInput.ButtonState.PRESSED) { + if (GlobalControls.input.Up == ButtonState.PRESSED) { choice = (choice + 1) % 3; GameObject.Find("utHeartMenu").transform.localPosition = new Vector3(-255, 35 - ((2 - choice % 3) * 36), GameObject.Find("utHeartMenu").transform.position.z); - } else if (GlobalControls.input.Down == UndertaleInput.ButtonState.PRESSED) { + } else if (GlobalControls.input.Down == ButtonState.PRESSED) { choice = (choice + 2) % 3; GameObject.Find("utHeartMenu").transform.localPosition = new Vector3(-255, 35 - ((2 - choice % 3) * 36), GameObject.Find("utHeartMenu").transform.position.z); - } else if (GlobalControls.input.Confirm == UndertaleInput.ButtonState.PRESSED) { + } else if (GlobalControls.input.Confirm == ButtonState.PRESSED) { instance.uiAudio.PlayOneShot(AudioClipRegistry.GetSound("menuconfirm")); instance.menuRunning[0] = true; switch (choice) { @@ -724,15 +721,15 @@ public static IEnumerator LaunchMenu() { instance.menuRunning[0] = false; } else { for (int i = 0; i != invCount; i++) - txtmgrs[i + 7].SetText(new TextMessage("[noskipatall]" + Inventory.inventory[i].Name, false, true)); + txtmgrs[i + 7].SetText(new TextMessage(Inventory.inventory[i].Name, false, true)); if (GlobalControls.crate) { - txtmgrs[15].SetText(new TextMessage("[noskipatall]SUE", false, true)); - txtmgrs[16].SetText(new TextMessage("[noskipatall]FINO", false, true)); - txtmgrs[17].SetText(new TextMessage("[noskipatall]DORP", false, true)); + txtmgrs[15].SetText(new TextMessage("SUE", false, true)); + txtmgrs[16].SetText(new TextMessage("FINO", false, true)); + txtmgrs[17].SetText(new TextMessage("DORP", false, true)); } else { - txtmgrs[15].SetText(new TextMessage("[noskipatall]USE", false, true)); - txtmgrs[16].SetText(new TextMessage("[noskipatall]INFO", false, true)); - txtmgrs[17].SetText(new TextMessage("[noskipatall]DROP", false, true)); + txtmgrs[15].SetText(new TextMessage("USE", false, true)); + txtmgrs[16].SetText(new TextMessage("INFO", false, true)); + txtmgrs[17].SetText(new TextMessage("DROP", false, true)); } GameObject.Find("Mugshot").GetComponent().color = new Color(1, 1, 1, 0); GameObject.Find("textframe_border_outer").GetComponent().color = new Color(1, 1, 1, 0); @@ -743,31 +740,31 @@ public static IEnumerator LaunchMenu() { int index = 0; yield return 0; while (instance.menuRunning[0] && !instance.menuRunning[1] && !instance.menuRunning[3]) { - if (GlobalControls.input.Down == UndertaleInput.ButtonState.PRESSED) { + if (GlobalControls.input.Down == ButtonState.PRESSED) { index = (index + 1) % invCount; instance.uiAudio.PlayOneShot(AudioClipRegistry.GetSound("menumove")); GameObject.Find("utHeartMenu").transform.localPosition = new Vector3(-48, 143 - 32 * index, GameObject.Find("utHeartMenu").transform.position.z); - } else if (GlobalControls.input.Up == UndertaleInput.ButtonState.PRESSED) { + } else if (GlobalControls.input.Up == ButtonState.PRESSED) { index = (index + invCount - 1) % invCount; instance.uiAudio.PlayOneShot(AudioClipRegistry.GetSound("menumove")); GameObject.Find("utHeartMenu").transform.localPosition = new Vector3(-48, 143 - 32 * index, GameObject.Find("utHeartMenu").transform.position.z); - } else if (GlobalControls.input.Cancel == UndertaleInput.ButtonState.PRESSED) { + } else if (GlobalControls.input.Cancel == ButtonState.PRESSED) { instance.menuRunning[0] = false; - for (int i = 7; i <= 17; i++) txtmgrs[i].DestroyChars(); + for (int i = 7; i <= 17; i++) txtmgrs[i].HideTextObject(); GameObject.Find("Mugshot").GetComponent().color = new Color(1, 1, 1, 0); GameObject.Find("textframe_border_outer").GetComponent().color = new Color(1, 1, 1, 0); GameObject.Find("textframe_interior").GetComponent().color = new Color(0, 0, 0, 0); GameObject.Find("item_border_outer").GetComponent().color = new Color(1, 1, 1, 0); GameObject.Find("item_interior").GetComponent().color = new Color(0, 0, 0, 0); GameObject.Find("utHeartMenu").transform.localPosition = new Vector3(-255, 35 - ((2 - choice % 3) * 36), GameObject.Find("utHeartMenu").transform.position.z); - } else if (GlobalControls.input.Confirm == UndertaleInput.ButtonState.PRESSED) { + } else if (GlobalControls.input.Confirm == ButtonState.PRESSED) { instance.menuRunning[1] = true; instance.uiAudio.PlayOneShot(AudioClipRegistry.GetSound("menuconfirm")); int index2 = 0; GameObject.Find("utHeartMenu").transform.localPosition = new Vector3(-48, -137, GameObject.Find("utHeartMenu").transform.position.z); // -53,42,156 yield return 0; while (instance.menuRunning[1] && !instance.menuRunning[3]) { - if (GlobalControls.input.Left == UndertaleInput.ButtonState.PRESSED) { + if (GlobalControls.input.Left == ButtonState.PRESSED) { instance.uiAudio.PlayOneShot(AudioClipRegistry.GetSound("menumove")); index2 = (index2 + 2) % 3; switch (index2) { @@ -775,7 +772,7 @@ public static IEnumerator LaunchMenu() { case 1: GameObject.Find("utHeartMenu").transform.localPosition = new Vector3(47, -137, GameObject.Find("utHeartMenu").transform.position.z); break; case 2: GameObject.Find("utHeartMenu").transform.localPosition = new Vector3(161, -137, GameObject.Find("utHeartMenu").transform.position.z); break; } - } else if (GlobalControls.input.Right == UndertaleInput.ButtonState.PRESSED) { + } else if (GlobalControls.input.Right == ButtonState.PRESSED) { instance.uiAudio.PlayOneShot(AudioClipRegistry.GetSound("menumove")); index2 = (index2 + 1) % 3; switch (index2) { @@ -783,12 +780,12 @@ public static IEnumerator LaunchMenu() { case 1: GameObject.Find("utHeartMenu").transform.localPosition = new Vector3(47, -137, GameObject.Find("utHeartMenu").transform.position.z); break; case 2: GameObject.Find("utHeartMenu").transform.localPosition = new Vector3(161, -137, GameObject.Find("utHeartMenu").transform.position.z); break; } - } else if (GlobalControls.input.Cancel == UndertaleInput.ButtonState.PRESSED) { + } else if (GlobalControls.input.Cancel == ButtonState.PRESSED) { GameObject.Find("utHeartMenu").transform.localPosition = new Vector3(-48, 143 - 32 * index, GameObject.Find("utHeartMenu").transform.position.z); instance.menuRunning[1] = false; - } else if (GlobalControls.input.Confirm == UndertaleInput.ButtonState.PRESSED) { + } else if (GlobalControls.input.Confirm == ButtonState.PRESSED) { instance.uiAudio.PlayOneShot(AudioClipRegistry.GetSound("menuconfirm")); - for (int i = 7; i <= 17; i++) txtmgrs[i].DestroyChars(); + for (int i = 7; i <= 17; i++) txtmgrs[i].HideTextObject(); GameObject.Find("item_border_outer").GetComponent().color = new Color(1, 1, 1, 0); GameObject.Find("item_interior").GetComponent().color = new Color(0, 0, 0, 0); GameObject.Find("utHeartMenu").GetComponent().color = new Color(c.r, c.g, c.b, 0); @@ -798,21 +795,21 @@ public static IEnumerator LaunchMenu() { instance.textmgr.SetEffect(null); Inventory.UseItem(index); //Update the stat text managers again, which means you can see the item's effects immediately - txtmgrs[0].SetText(new TextMessage("[noskipatall]" + PlayerCharacter.instance.Name, false, true)); + txtmgrs[0].SetText(new TextMessage("" + PlayerCharacter.instance.Name, false, true)); if (GlobalControls.crate) { - txtmgrs[1].SetText(new TextMessage("[noskipatall][font:menu]LV " + PlayerCharacter.instance.LV, false, true)); - txtmgrs[2].SetText(new TextMessage("[noskipatall][font:menu]PH " + (int)PlayerCharacter.instance.HP + "/" + PlayerCharacter.instance.MaxHP, false, true)); - txtmgrs[3].SetText(new TextMessage("[noskipatall][font:menu]G " + PlayerCharacter.instance.Gold, false, true)); - txtmgrs[4].SetText(new TextMessage("[noskipatall]" + (Inventory.inventory.Count > 0 ? "" : "[color:808080]") + "TEM", false, true)); - txtmgrs[5].SetText(new TextMessage("[noskipatall]TAST", false, true)); - txtmgrs[6].SetText(new TextMessage("[noskipatall]LECL", false, true)); + txtmgrs[1].SetText(new TextMessage("[font:menu]LV " + PlayerCharacter.instance.LV, false, true)); + txtmgrs[2].SetText(new TextMessage("[font:menu]PH " + (int)PlayerCharacter.instance.HP + "/" + PlayerCharacter.instance.MaxHP, false, true)); + txtmgrs[3].SetText(new TextMessage("[font:menu]G " + PlayerCharacter.instance.Gold, false, true)); + txtmgrs[4].SetText(new TextMessage((Inventory.inventory.Count > 0 ? "" : "[color:808080]") + "TEM", false, true)); + txtmgrs[5].SetText(new TextMessage("TAST", false, true)); + txtmgrs[6].SetText(new TextMessage("LECL", false, true)); } else { - txtmgrs[1].SetText(new TextMessage("[noskipatall][font:menu]LV " + PlayerCharacter.instance.LV, false, true)); - txtmgrs[2].SetText(new TextMessage("[noskipatall][font:menu]HP " + (int)PlayerCharacter.instance.HP + "/" + PlayerCharacter.instance.MaxHP, false, true)); - txtmgrs[3].SetText(new TextMessage("[noskipatall][font:menu]G " + PlayerCharacter.instance.Gold, false, true)); - txtmgrs[4].SetText(new TextMessage("[noskipatall]" + (Inventory.inventory.Count > 0 ? "" : "[color:808080]") + "ITEM", false, true)); - txtmgrs[5].SetText(new TextMessage("[noskipatall]STAT", false, true)); - txtmgrs[6].SetText(new TextMessage("[noskipatall]CELL", false, true)); + txtmgrs[1].SetText(new TextMessage("[font:menu]LV " + PlayerCharacter.instance.LV, false, true)); + txtmgrs[2].SetText(new TextMessage("[font:menu]HP " + (int)PlayerCharacter.instance.HP + "/" + PlayerCharacter.instance.MaxHP, false, true)); + txtmgrs[3].SetText(new TextMessage("[font:menu]G " + PlayerCharacter.instance.Gold, false, true)); + txtmgrs[4].SetText(new TextMessage((Inventory.inventory.Count > 0 ? "" : "[color:808080]") + "ITEM", false, true)); + txtmgrs[5].SetText(new TextMessage("STAT", false, true)); + txtmgrs[6].SetText(new TextMessage("CELL", false, true)); } break; case 1: @@ -824,8 +821,8 @@ public static IEnumerator LaunchMenu() { break; case 2: instance.textmgr.SetEffect(null); - instance.textmgr.SetText(new TextMessage(GlobalControls.crate ? "U DORPED TEH " + Inventory.inventory[index].Name + "!!!!!" : - "You dropped the " + Inventory.inventory[index].Name + ".", true, false)); + instance.textmgr.SetText(new TextMessage(GlobalControls.crate ? ("U DORPED TEH " + Inventory.inventory[index].Name + "!!!!!") + : "You dropped the " + Inventory.inventory[index].Name + ".", true, false)); instance.textmgr.transform.parent.parent.SetAsLastSibling(); Inventory.RemoveItem(index); break; @@ -845,25 +842,25 @@ public static IEnumerator LaunchMenu() { case 1: { // STAT GameObject.Find("utHeartMenu").GetComponent().color = new Color(c.r, c.g, c.b, 0); - txtmgrs[18].SetText(new TextMessage("[noskipatall]\"" + PlayerCharacter.instance.Name + "\"", false, true)); - txtmgrs[19].SetText(new TextMessage("[noskipatall]LV " + PlayerCharacter.instance.LV, false, true)); - txtmgrs[20].SetText(new TextMessage("[noskipatall]HP " + PlayerCharacter.instance.HP + "/" + PlayerCharacter.instance.MaxHP, false, true)); + txtmgrs[18].SetText(new TextMessage("\"" + PlayerCharacter.instance.Name + "\"", false, true)); + txtmgrs[19].SetText(new TextMessage("LV " + PlayerCharacter.instance.LV, false, true)); + txtmgrs[20].SetText(new TextMessage("HP " + PlayerCharacter.instance.HP + "/" + PlayerCharacter.instance.MaxHP, false, true)); if (GlobalControls.crate) { - txtmgrs[21].SetText(new TextMessage("[noskipatall]TA " + (PlayerCharacter.instance.ATK + PlayerCharacter.instance.WeaponATK) + " (" + PlayerCharacter.instance.WeaponATK + ")", false, true)); - txtmgrs[22].SetText(new TextMessage("[noskipatall]DF " + (PlayerCharacter.instance.DEF + PlayerCharacter.instance.ArmorDEF) + " (" + PlayerCharacter.instance.ArmorDEF + ")", false, true)); - txtmgrs[23].SetText(new TextMessage("[noskipatall]EPX: " + PlayerCharacter.instance.EXP, false, true)); - txtmgrs[24].SetText(new TextMessage("[noskipatall]NETX: " + PlayerCharacter.instance.GetNext(), false, true)); - txtmgrs[25].SetText(new TextMessage("[noskipatall]WAEPON: " + PlayerCharacter.instance.Weapon, false, true)); - txtmgrs[26].SetText(new TextMessage("[noskipatall]AROMR: " + PlayerCharacter.instance.Armor, false, true)); - txtmgrs[27].SetText(new TextMessage("[noskipatall]GLOD: " + PlayerCharacter.instance.Gold, false, true)); + txtmgrs[21].SetText(new TextMessage("TA " + (PlayerCharacter.instance.ATK + PlayerCharacter.instance.WeaponATK) + " (" + PlayerCharacter.instance.WeaponATK + ")", false, true)); + txtmgrs[22].SetText(new TextMessage("DF " + (PlayerCharacter.instance.DEF + PlayerCharacter.instance.ArmorDEF) + " (" + PlayerCharacter.instance.ArmorDEF + ")", false, true)); + txtmgrs[23].SetText(new TextMessage("EPX: " + PlayerCharacter.instance.EXP, false, true)); + txtmgrs[24].SetText(new TextMessage("NETX: " + PlayerCharacter.instance.GetNext(), false, true)); + txtmgrs[25].SetText(new TextMessage("WAEPON: " + PlayerCharacter.instance.Weapon, false, true)); + txtmgrs[26].SetText(new TextMessage("AROMR: " + PlayerCharacter.instance.Armor, false, true)); + txtmgrs[27].SetText(new TextMessage("GLOD: " + PlayerCharacter.instance.Gold, false, true)); } else { - txtmgrs[21].SetText(new TextMessage("[noskipatall]AT " + (PlayerCharacter.instance.ATK + PlayerCharacter.instance.WeaponATK) + " (" + PlayerCharacter.instance.WeaponATK + ")", false, true)); - txtmgrs[22].SetText(new TextMessage("[noskipatall]DF " + (PlayerCharacter.instance.DEF + PlayerCharacter.instance.ArmorDEF) + " (" + PlayerCharacter.instance.ArmorDEF + ")", false, true)); - txtmgrs[23].SetText(new TextMessage("[noskipatall]EXP: " + PlayerCharacter.instance.EXP, false, true)); - txtmgrs[24].SetText(new TextMessage("[noskipatall]NEXT: " + PlayerCharacter.instance.GetNext(), false, true)); - txtmgrs[25].SetText(new TextMessage("[noskipatall]WEAPON: " + PlayerCharacter.instance.Weapon, false, true)); - txtmgrs[26].SetText(new TextMessage("[noskipatall]ARMOR: " + PlayerCharacter.instance.Armor, false, true)); - txtmgrs[27].SetText(new TextMessage("[noskipatall]GOLD: " + PlayerCharacter.instance.Gold, false, true)); + txtmgrs[21].SetText(new TextMessage("AT " + (PlayerCharacter.instance.ATK + PlayerCharacter.instance.WeaponATK) + " (" + PlayerCharacter.instance.WeaponATK + ")", false, true)); + txtmgrs[22].SetText(new TextMessage("DF " + (PlayerCharacter.instance.DEF + PlayerCharacter.instance.ArmorDEF) + " (" + PlayerCharacter.instance.ArmorDEF + ")", false, true)); + txtmgrs[23].SetText(new TextMessage("EXP: " + PlayerCharacter.instance.EXP, false, true)); + txtmgrs[24].SetText(new TextMessage("NEXT: " + PlayerCharacter.instance.GetNext(), false, true)); + txtmgrs[25].SetText(new TextMessage("WEAPON: " + PlayerCharacter.instance.Weapon, false, true)); + txtmgrs[26].SetText(new TextMessage("ARMOR: " + PlayerCharacter.instance.Armor, false, true)); + txtmgrs[27].SetText(new TextMessage("GOLD: " + PlayerCharacter.instance.Gold, false, true)); } GameObject.Find("Mugshot").GetComponent().color = new Color(1, 1, 1, 0); GameObject.Find("textframe_border_outer").GetComponent().color = new Color(1, 1, 1, 0); @@ -872,11 +869,11 @@ public static IEnumerator LaunchMenu() { GameObject.Find("stat_interior").GetComponent().color = new Color(0, 0, 0, 1); yield return 0; while (instance.menuRunning[0] && !instance.menuRunning[3]) { - if (GlobalControls.input.Cancel == UndertaleInput.ButtonState.PRESSED || GlobalControls.input.Confirm == UndertaleInput.ButtonState.PRESSED) { + if (GlobalControls.input.Cancel == ButtonState.PRESSED || GlobalControls.input.Confirm == ButtonState.PRESSED) { GameObject.Find("utHeartMenu").GetComponent().color = new Color(c.r, c.g, c.b, 1); instance.uiAudio.PlayOneShot(AudioClipRegistry.GetSound("menuconfirm")); instance.menuRunning[0] = false; - for (int i = 18; i <= 27; i++) txtmgrs[i].DestroyChars(); + for (int i = 18; i <= 27; i++) txtmgrs[i].HideTextObject(); GameObject.Find("Mugshot").GetComponent().color = new Color(1, 1, 1, 0); GameObject.Find("textframe_border_outer").GetComponent().color = new Color(1, 1, 1, 0); GameObject.Find("textframe_interior").GetComponent().color = new Color(0, 0, 0, 0); @@ -894,7 +891,7 @@ public static IEnumerator LaunchMenu() { instance.textmgr.transform.parent.parent.SetAsLastSibling(); break; } - } else if (GlobalControls.input.Cancel == UndertaleInput.ButtonState.PRESSED) + } else if (GlobalControls.input.Cancel == ButtonState.PRESSED) yield return CloseMenu(true); } yield return 0; @@ -910,7 +907,7 @@ private static bool CloseMenu(bool endOfInText = false) { if (tf.GetComponent()) tf.gameObject.GetComponent().color = new Color(tf.gameObject.GetComponent().color.r, tf.gameObject.GetComponent().color.b, tf.gameObject.GetComponent().color.g, 0); - if (tf.GetComponent()) tf.gameObject.GetComponent().DestroyChars(); + if (tf.GetComponent()) tf.gameObject.GetComponent().HideTextObject(); } instance.menuRunning = new[] { false, false, !endOfInText, true, true }; GameObject.Find("Mugshot").GetComponent().color = new Color(1, 1, 1, 0); diff --git a/Assets/Scripts/Overworld/SaveLoad.cs b/Assets/Scripts/Overworld/SaveLoad.cs index 75df65ade..25f23e0a0 100644 --- a/Assets/Scripts/Overworld/SaveLoad.cs +++ b/Assets/Scripts/Overworld/SaveLoad.cs @@ -72,7 +72,7 @@ public static bool Load(bool loadGlobals = true) { return false; } - public static void SaveAlMighty() { + public static void SaveAlMighty(string key = null) { almightycurrentGame = new AlMightyGameState(); almightycurrentGame.UpdateVariables(); File.Delete(Application.persistentDataPath + "/AlMightySave.gd"); @@ -80,7 +80,7 @@ public static void SaveAlMighty() { //Application.persistentDataPath is a string, so if you wanted you can put that into unitaleutil.writeinlog if you want to know where save games are located FileStream file = File.Create(Application.persistentDataPath + "/AlMightySave.gd"); bf.Serialize(file, almightycurrentGame); - Debug.Log("AlMighty Save created at this location : " + Application.persistentDataPath + "/AlMightySave.gd"); + Debug.Log(key == null ? "AlMighties have been saved!" : "The AlMighty \"" + key + "\" has been saved!"); file.Close(); } diff --git a/Assets/Scripts/Overworld/ShopScript.cs b/Assets/Scripts/Overworld/ShopScript.cs index d0ec6944c..fc8e096dc 100644 --- a/Assets/Scripts/Overworld/ShopScript.cs +++ b/Assets/Scripts/Overworld/ShopScript.cs @@ -32,7 +32,7 @@ private enum State { MENU, BUY, BUYCONFIRM, SELL, SELLCONFIRM, TALK, TALKINPROGR private void Start() { FindObjectOfType().BeginFade(-1); - tmBigTalk.SetTextQueue(new[] { new TextMessage("[noskipatall][novoice]", false, true) }); + tmBigTalk.SetTextQueue(new[] { new TextMessage("[novoice]", false, true) }); EnableBigText(false); if (scriptName == null) @@ -57,11 +57,11 @@ private void Start() { tmInfo.SetCaller(script); tmBigTalk.SetCaller(script); - tmMain.SetTextQueue(new[] { new TextMessage("[noskipatall][linespacing:11]" + script.GetVar("maintalk").String, true, false) }); - tmChoice.SetTextQueue(new[] { new TextMessage("[noskipatall][novoice][font:uidialoglilspace][linespacing:9] Buy\n Sell\n Talk\n Exit", false, true) }); - tmGold.SetTextQueue(new[] { new TextMessage("[noskipatall][novoice]" + PlayerCharacter.instance.Gold + "G", false, true) }); - tmItem.SetTextQueue(new[] { new TextMessage("[noskipatall][novoice]" + Inventory.inventory.Count + "/8", false, true) }); - tmInfo.SetTextQueue(new[] { new TextMessage("[noskipatall][novoice]", false, true) }); + tmMain.SetTextQueue(new[] { new TextMessage("[linespacing:11]" + script.GetVar("maintalk").String, true, false) }); + tmChoice.SetTextQueue(new[] { new TextMessage("[novoice][font:uidialoglilspace][linespacing:9] Buy\n Sell\n Talk\n Exit", false, true) }); + tmGold.SetTextQueue(new[] { new TextMessage("[novoice]" + PlayerCharacter.instance.Gold + "G", false, true) }); + tmItem.SetTextQueue(new[] { new TextMessage("[novoice]" + Inventory.inventory.Count + "/8", false, true) }); + tmInfo.SetTextQueue(new[] { new TextMessage("[novoice]", false, true) }); Camera.main.GetComponent().clip = AudioClipRegistry.GetMusic(script.GetVar("music").String); Camera.main.GetComponent().time = 0; @@ -118,10 +118,10 @@ private void ChangeState(State state, int select = -1, object arg = null) { if (select != -1) selection = select; numberOfChoices = 4; - tmChoice.SetTextQueue(new[] { new TextMessage("[noskipatall][novoice][font:uidialoglilspace][linespacing:9] Buy\n Sell\n Talk\n Exit", false, true) }); - tmMain.SetTextQueue(new[] { new TextMessage("[noskipatall][linespacing:11]" + script.GetVar("maintalk").String, true, false) }); - tmGold.SetTextQueue(new[] { new TextMessage("[noskipatall][novoice]" + PlayerCharacter.instance.Gold + "G", false, true) }); - tmItem.SetTextQueue(new[] { new TextMessage("[noskipatall][novoice]" + Inventory.inventory.Count + "/8", false, true) }); + tmChoice.SetTextQueue(new[] { new TextMessage("[novoice][font:uidialoglilspace][linespacing:9] Buy\n Sell\n Talk\n Exit", false, true) }); + tmMain.SetTextQueue(new[] { new TextMessage("[linespacing:11]" + script.GetVar("maintalk").String, true, false) }); + tmGold.SetTextQueue(new[] { new TextMessage("[novoice]" + PlayerCharacter.instance.Gold + "G", false, true) }); + tmItem.SetTextQueue(new[] { new TextMessage("[novoice]" + Inventory.inventory.Count + "/8", false, true) }); infoActive = false; tmInfoParent.transform.position = new Vector3(tmInfoParent.transform.position.x, 70, tmInfoParent.transform.position.z); } @@ -130,13 +130,13 @@ private void ChangeState(State state, int select = -1, object arg = null) { currentItemIndex = selection; selection = 1; numberOfChoices = 2; - tmChoice.SetTextQueue(new[] { new TextMessage("[noskipatall][font:uidialoglilspace][linespacing:0][novoice]Buy for\n" + mainPrice[currentItemIndex] + "G?\n\n Yes\n No", false, true) }); + tmChoice.SetTextQueue(new[] { new TextMessage("[font:uidialoglilspace][linespacing:0][novoice]Buy for\n" + mainPrice[currentItemIndex] + "G?\n\n Yes\n No", false, true) }); break; case State.SELLCONFIRM: currentItemIndex = selection; selection = 1; numberOfChoices = 2; - tmBigTalk.SetTextQueue(new[] { new TextMessage("\n[linespacing:11][noskipatall][font:uidialoglilspace][novoice] Sell the " + Inventory.inventory[currentItemIndex].Name + " for " + + tmBigTalk.SetTextQueue(new[] { new TextMessage("\n[linespacing:11][font:uidialoglilspace][novoice] Sell the " + Inventory.inventory[currentItemIndex].Name + " for " + Inventory.NametoPrice[Inventory.inventory[currentItemIndex].Name] / 5 + "G?\n\n Yes\tNo" + "\n\n\t [color:ffff00](" + PlayerCharacter.instance.Gold + "G)", false, true) }); break; @@ -147,10 +147,10 @@ private void ChangeState(State state, int select = -1, object arg = null) { selection = select; text = BuildBuyString().Replace("\n", " \n").Replace("\r", " \r").Replace("\t", " \t"); numberOfChoices = text.Split('\n', '\r', '\t').Length; - tmChoice.SetTextQueue(new[] { new TextMessage("[noskipatall][linespacing:9][font:uidialoglilspace]" + script.GetVar("buytalk").String, false, false) }); - tmMain.SetTextQueue(new[] { new TextMessage("[noskipatall][novoice][linespacing:11][font:uidialoglilspace]" + text, false, true) }); - tmGold.SetTextQueue(new[] { new TextMessage("[noskipatall][novoice]" + PlayerCharacter.instance.Gold + "G", false, true) }); - tmItem.SetTextQueue(new[] { new TextMessage("[noskipatall][novoice]" + Inventory.inventory.Count + "/8", false, true) }); + tmChoice.SetTextQueue(new[] { new TextMessage("[linespacing:9][font:uidialoglilspace]" + script.GetVar("buytalk").String, false, false) }); + tmMain.SetTextQueue(new[] { new TextMessage("[novoice][linespacing:11][font:uidialoglilspace]" + text, false, true) }); + tmGold.SetTextQueue(new[] { new TextMessage("[novoice]" + PlayerCharacter.instance.Gold + "G", false, true) }); + tmItem.SetTextQueue(new[] { new TextMessage("[novoice]" + Inventory.inventory.Count + "/8", false, true) }); } break; case State.SELL: @@ -162,7 +162,7 @@ private void ChangeState(State state, int select = -1, object arg = null) { sellItem = Inventory.inventory.Count; text = BuildSellString(); numberOfChoices = Inventory.inventory.Count + 1; - tmBigTalk.SetTextQueue(new[] { new TextMessage("[noskipatall][novoice][font:uidialoglilspace][linespacing:11]" + text, false, true) }); + tmBigTalk.SetTextQueue(new[] { new TextMessage("[novoice][font:uidialoglilspace][linespacing:11]" + text, false, true) }); if (Inventory.inventory.Count == 0) { UnitaleUtil.TryCall(script, "FailSell", DynValue.NewString("empty")); if (!interrupted) @@ -177,8 +177,8 @@ private void ChangeState(State state, int select = -1, object arg = null) { selection = select; text = BuildTalkString(); numberOfChoices = mainName.Length + 1; - tmMain.SetTextQueue(new[] { new TextMessage("[noskipatall][linespacing:11]" + text, false, true) }); - tmChoice.SetTextQueue(new[] { new TextMessage("[noskipatall][font:uidialoglilspace][linespacing:9]" + script.GetVar("talktalk").String, false, false) }); + tmMain.SetTextQueue(new[] { new TextMessage("[linespacing:11]" + text, false, true) }); + tmChoice.SetTextQueue(new[] { new TextMessage("[font:uidialoglilspace][linespacing:9]" + script.GetVar("talktalk").String, false, false) }); } break; case State.TALKINPROGRESS: @@ -227,51 +227,56 @@ private void SetPlayerOnSelection() { } if (tm == null) return; - string[] text = tm.textQueue[0].Text.Split(new[] { '\n', '\r', '\t' }, StringSplitOptions.RemoveEmptyEntries); - int selectionTemp = selection; - if (currentState == State.SELL && selection == numberOfChoices - 1) selection = 8; - else switch (currentState) { - case State.BUYCONFIRM: selection += 2; break; - case State.SELLCONFIRM: selection += 1; break; - } - int beginLine = GetIndexFirstCharOfLineFromChild(tm); - Vector3 v = tm.transform.GetChild(GetIndexFirstCharOfLineFromText(text[selection]) + beginLine).position; + + int usedSelection = selection; + if (currentState == State.BUYCONFIRM) usedSelection += 3; + if (currentState == State.SELLCONFIRM) usedSelection += 6; + + Vector3 v = tm.letters[GetIndexFirstCharOfGivenLine(tm, usedSelection)].image.transform.position; utHeart.transform.position = new Vector3(v.x - 16, v.y + 8, v.z); - selection = selectionTemp; if (currentState != State.BUY) return; infoActive = selection != numberOfChoices - 1; if (!infoActive) return; string info = mainPrice[selection] == 0 ? "SOLD OUT" : mainInfo[selection].String; - tmInfo.SetTextQueue(new[] { new TextMessage("[noskipatall][novoice][font:uidialoglilspace]" + info, false, true) }); + tmInfo.SetTextQueue(new[] { new TextMessage("[novoice][font:uidialoglilspace]" + info, false, true) }); } - private int GetIndexFirstCharOfLineFromChild(TextManager tm) { - int beginLine = 0; - if (selection == 0) return beginLine; - float y = tm.transform.GetChild(0).position.y; - int count = 0; - for (int i = 0; i < tm.transform.childCount && count < selection; i++) - if (tm.transform.GetChild(i).position.y <= y - 8 || tm.transform.GetChild(i).position.y >= y + 8 || Mathf.Round(tm.transform.GetChild(i).position.x) == 356) { + private static int GetIndexFirstCharOfGivenLine(TextManager tm, int choiceIndex = 0) { + string text = tm.textQueue[0].Text; + int count = -1, columnsUsed = 0, bracketCount = 0, bracketBegin = 0; + for (int i = 0; i < text.Length; i++) { + if (tm.letters.Any(data => data.index == i)) count++; - y = tm.transform.GetChild(i).position.y; - if (count != selection) continue; - beginLine = i; - break; - } - return beginLine; - } - private static int GetIndexFirstCharOfLineFromText(string text) { - int count = 0, commandLess = 0; - for (int i = 0; i < text.Length; i++) { switch (text[i]) { case ' ': case '*': continue; - case '[': count++; break; + case '[': + if (bracketCount == 0) + bracketBegin = i; + bracketCount++; + break; + case '\n': + case '\r': + choiceIndex -= tm.columnNumber - columnsUsed; + columnsUsed = 0; + continue; + case '\t': + choiceIndex--; + columnsUsed++; + continue; + } + + if (bracketCount == 0 && choiceIndex <= 0) return count; + + if (text[i] == ']' && bracketCount > 0) + bracketCount--; + + // Unmatched open bracket at end of text + if (bracketCount > 0 && i == text.Length - 1) { + bracketCount = 0; + i = bracketBegin; } - if (count == 0) return i - commandLess; - commandLess++; - if (text[i] == ']') count--; } return 0; } @@ -365,7 +370,7 @@ private void HandleAction() { } break; case State.SELL: - if (selection == numberOfChoices - 1) HandleCancel(); + if (selection == 8) HandleCancel(); else { ChangeState(State.SELLCONFIRM, 0); if (Inventory.NametoPrice[Inventory.inventory[currentItemIndex].Name] == 0) { @@ -390,8 +395,8 @@ private void HandleAction() { UnitaleUtil.PlaySound("SeparateSound", "ShopSuccess"); PlayerCharacter.instance.SetGold(PlayerCharacter.instance.Gold - mainPrice[currentItemIndex]); Inventory.AddItem(mainName[currentItemIndex]); - tmGold.SetTextQueue(new[] { new TextMessage("[noskipatall][novoice]" + PlayerCharacter.instance.Gold + "G", false, true) }); - tmItem.SetTextQueue(new[] { new TextMessage("[noskipatall][novoice]" + Inventory.inventory.Count + "/8", false, true) }); + tmGold.SetTextQueue(new[] { new TextMessage("[novoice]" + PlayerCharacter.instance.Gold + "G", false, true) }); + tmItem.SetTextQueue(new[] { new TextMessage("[novoice]" + Inventory.inventory.Count + "/8", false, true) }); } } if (!interrupted) { @@ -410,6 +415,7 @@ private void HandleAction() { currentItemIndex--; } if (!interrupted) { + currentItemIndex = 0; selection = currentItemIndex; HandleCancel(); } @@ -430,50 +436,41 @@ private void HandleCancel(bool fromKey = false) { private void SelectionInputManager() { utHeart.GetComponent().enabled = true; - if (GlobalControls.input.Down == UndertaleInput.ButtonState.PRESSED) { - if (currentState == State.SELL) { - if (selection == numberOfChoices - 2) selection = numberOfChoices - 1; - else if (selection == numberOfChoices - 1) selection = 0; - else if (selection == numberOfChoices - 3 && numberOfChoices % 2 == 0) selection = (selection + 1) % numberOfChoices; - else selection = (selection + 2) % numberOfChoices; - } else selection = (selection + 1) % numberOfChoices; - SetPlayerOnSelection(); - } else if (GlobalControls.input.Right == UndertaleInput.ButtonState.PRESSED) { - if (currentState == State.SELL) { - if (selection == numberOfChoices - 1) { } - else if (selection % 2 == 1 || (selection == numberOfChoices - 2 && numberOfChoices % 2 == 0)) selection = (selection + numberOfChoices - 1) % numberOfChoices; - else selection = (selection + 1) % numberOfChoices; - } else selection = (selection + 1) % numberOfChoices; - SetPlayerOnSelection(); - } else if (GlobalControls.input.Up == UndertaleInput.ButtonState.PRESSED) { - if (currentState == State.SELL) { - if (selection == 0) selection = numberOfChoices - 1; - else if (selection == numberOfChoices - 1 && numberOfChoices % 2 == 0) selection = (selection + numberOfChoices - 1) % numberOfChoices; - else selection = (selection + numberOfChoices - 2) % numberOfChoices; - } else selection = (selection + numberOfChoices - 1) % numberOfChoices; - SetPlayerOnSelection(); - } else if (GlobalControls.input.Left == UndertaleInput.ButtonState.PRESSED) { - if (currentState == State.SELL) { - if (selection == numberOfChoices - 1) { } - else if (selection % 2 == 1 || (selection == numberOfChoices - 2 && numberOfChoices % 2 == 0)) selection = (selection + numberOfChoices - 1) % numberOfChoices; - else selection = (selection + 1) % numberOfChoices; - } else selection = (selection + numberOfChoices - 1) % numberOfChoices; + int xMov = GlobalControls.input.Left == ButtonState.PRESSED ? -1 : GlobalControls.input.Right == ButtonState.PRESSED ? 1 : 0; + int yMov = GlobalControls.input.Up == ButtonState.PRESSED ? -1 : GlobalControls.input.Down == ButtonState.PRESSED ? 1 : 0; + if (xMov != 0 || yMov != 0) { + switch (currentState) { + case State.MENU: selection = UnitaleUtil.SelectionChoice(4, selection, xMov, yMov, 4, 1); break; + case State.TALK: + case State.BUY: selection = UnitaleUtil.SelectionChoice(numberOfChoices, selection, xMov, yMov, numberOfChoices, 1); break; + case State.BUYCONFIRM: selection = UnitaleUtil.SelectionChoice(2, selection, xMov, yMov, 2, 1); break; + case State.SELLCONFIRM: selection = UnitaleUtil.SelectionChoice(2, selection, xMov, yMov, 1, 2, false); break; + case State.SELL: + if (selection == 8 && yMov == -1) + selection = numberOfChoices - 2 - (numberOfChoices - 2) % 2; + else + selection = UnitaleUtil.SelectionChoice(selection < 8 && (xMov != 0 || selection % 2 == 1) ? numberOfChoices - 1 : 9, selection, xMov, yMov, 5, 2); + + if (currentState == State.SELL && selection >= numberOfChoices - 1) + selection = 8; + break; + } SetPlayerOnSelection(); - } else if (GlobalControls.input.Confirm == UndertaleInput.ButtonState.PRESSED) + } else if (GlobalControls.input.Confirm == ButtonState.PRESSED) HandleAction(); - else if (GlobalControls.input.Cancel == UndertaleInput.ButtonState.PRESSED) + else if (GlobalControls.input.Cancel == ButtonState.PRESSED) HandleCancel(true); } private void TextInputManager() { - if (GlobalControls.input.Cancel == UndertaleInput.ButtonState.PRESSED && !tmBigTalk.blockSkip && !tmBigTalk.LineComplete() && tmBigTalk.CanSkip()) { + if (GlobalControls.input.Cancel == ButtonState.PRESSED && !tmBigTalk.LineComplete() && tmBigTalk.CanSkip()) { if (script.GetVar("playerskipdocommand").Boolean) tmBigTalk.DoSkipFromPlayer(); else tmBigTalk.SkipLine(); - } else if ((GlobalControls.input.Confirm == UndertaleInput.ButtonState.PRESSED || tmBigTalk.CanAutoSkipAll()) && tmBigTalk.LineComplete() && !tmBigTalk.AllLinesComplete()) + } else if ((GlobalControls.input.Confirm == ButtonState.PRESSED || tmBigTalk.CanAutoSkipAny(true)) && tmBigTalk.LineComplete() && !tmBigTalk.AllLinesComplete()) tmBigTalk.NextLineText(); - else if ((GlobalControls.input.Confirm == UndertaleInput.ButtonState.PRESSED || tmBigTalk.CanAutoSkipAll()) && tmBigTalk.AllLinesComplete()) { + else if ((GlobalControls.input.Confirm == ButtonState.PRESSED || tmBigTalk.CanAutoSkipAny(true)) && tmBigTalk.AllLinesComplete()) { switch (currentState) { case State.TALKINPROGRESS: ChangeState(State.TALK); @@ -497,7 +494,7 @@ private void TextInputManager() { else if (script.GetVar("returndir").Number > 8 || script.GetVar("returndir").Number < 2 || script.GetVar("returndir").Number % 2 == 1) throw new CYFException("The variable \"returndir\" must be either 2 (Down), 4 (Left), 6 (Right) or 8 (Up)."); - tmBigTalk.DestroyChars(); + tmBigTalk.HideTextObject(); tp = Instantiate(Resources.Load("Prefabs/TP On-the-fly")); tp.sceneName = script.GetVar("returnscene").String; diff --git a/Assets/Scripts/Overworld/Title.cs b/Assets/Scripts/Overworld/Title.cs index 2ae583ccb..163179b55 100644 --- a/Assets/Scripts/Overworld/Title.cs +++ b/Assets/Scripts/Overworld/Title.cs @@ -58,7 +58,7 @@ private IEnumerator TitlePhase1() { // Update is called once per frame private void Update() { - if (GlobalControls.input.Confirm == UndertaleInput.ButtonState.PRESSED && phase == 0) { + if (GlobalControls.input.Confirm == ButtonState.PRESSED && phase == 0) { phase++; Camera.main.GetComponent().Stop(); Destroy(RetromodeCanvas); @@ -82,10 +82,10 @@ private void Update() { TextManagerLevel.SetHorizontalSpacing(2); TextManagerTime.SetHorizontalSpacing(2); TextManagerMap.SetHorizontalSpacing(2); - TextManagerName.SetTextQueue(new[] { new TextMessage("[noskipatall]" + PlayerCharacter.instance.Name, false, true) }); - TextManagerLevel.SetTextQueue(new[] { new TextMessage("[noskipatall]" + (GlobalControls.crate ? "VL" : "LV") + PlayerCharacter.instance.LV, false, true) }); - TextManagerTime.SetTextQueue(new[] {new TextMessage("[noskipatall]" + UnitaleUtil.TimeFormatter(SaveLoad.savedGame.playerTime), false, true) }); - TextManagerMap.SetTextQueue(new[] { new TextMessage("[noskipatall]" + SaveLoad.savedGame.lastScene, false, true) }); + TextManagerName.SetTextQueue(new[] { new TextMessage(PlayerCharacter.instance.Name, false, true) }); + TextManagerLevel.SetTextQueue(new[] { new TextMessage((GlobalControls.crate ? "VL" : "LV") + PlayerCharacter.instance.LV, false, true) }); + TextManagerTime.SetTextQueue(new[] {new TextMessage(UnitaleUtil.TimeFormatter(SaveLoad.savedGame.playerTime), false, true) }); + TextManagerMap.SetTextQueue(new[] { new TextMessage(SaveLoad.savedGame.lastScene, false, true) }); tmName.SetTextQueue(new[] { new TextMessage(PlayerCharacter.instance.Name, false, true) }); diff = calcTotalLength(tmName); tmName.SetEffect(new ShakeEffect(tmName)); @@ -106,11 +106,11 @@ private void Update() { + "Tell me if you have any more problems, and thanks for following my fork! ^^\n\n"); } } else { - if (GlobalControls.input.Right == UndertaleInput.ButtonState.PRESSED || GlobalControls.input.Left == UndertaleInput.ButtonState.PRESSED) + if (GlobalControls.input.Right == ButtonState.PRESSED || GlobalControls.input.Left == ButtonState.PRESSED) setColor(choiceLetter == 2 ? 2 : (choiceLetter + 1) % 2); - if (GlobalControls.input.Up == UndertaleInput.ButtonState.PRESSED || GlobalControls.input.Down == UndertaleInput.ButtonState.PRESSED) + if (GlobalControls.input.Up == ButtonState.PRESSED || GlobalControls.input.Down == ButtonState.PRESSED) setColor(choiceLetter == 2 ? 0 : 2); - else if (GlobalControls.input.Confirm == UndertaleInput.ButtonState.PRESSED) + else if (GlobalControls.input.Confirm == ButtonState.PRESSED) switch (choiceLetter) { case 0: phase = -1; @@ -132,13 +132,14 @@ private void Update() { } case 2: { if (tmName.transform.localScale.x < 3) { - tmName.transform.localScale = new Vector3(tmName.transform.localScale.x + 0.01f, tmName.transform.localScale.y + 0.01f, 1); - tmName.transform.localPosition = new Vector3(actualX - (((tmName.transform.localScale.x - 1) * diff) / 2), - actualY - (((tmName.transform.localScale.x - 1) * diff) / 6), tmName.transform.localPosition.z); + float scale = Mathf.Min(3, tmName.transform.localScale.x + 0.01f); + tmName.transform.localScale = new Vector3(scale, scale, 1); + tmName.MoveTo(actualX - ((tmName.transform.localScale.x - 1) * diff / 2), + actualY - ((tmName.transform.localScale.x - 1) * diff / 6)); } - if (GlobalControls.input.Right == UndertaleInput.ButtonState.PRESSED || GlobalControls.input.Left == UndertaleInput.ButtonState.PRESSED) + if (GlobalControls.input.Right == ButtonState.PRESSED || GlobalControls.input.Left == ButtonState.PRESSED) setColor((choiceLetter + 1) % 2, 2); - else if (GlobalControls.input.Confirm == UndertaleInput.ButtonState.PRESSED) { + else if (GlobalControls.input.Confirm == ButtonState.PRESSED) { if (choiceLetter == 1) { Camera.main.GetComponent().Stop(); Camera.main.GetComponent().PlayOneShot(AudioClipRegistry.GetSound("intro_holdup")); @@ -185,9 +186,10 @@ private IEnumerator NewGame() { SpriteRenderer blank = GameObject.Find("Blank").GetComponent(); while (blank.color.a <= 1) { if (tmName.transform.localScale.x < 3) { - tmName.transform.localScale = new Vector3(tmName.transform.localScale.x + 0.01f, tmName.transform.localScale.y + 0.01f, 1); - tmName.transform.localPosition = new Vector3(actualX - (((tmName.transform.localScale.x - 1) * diff) / 2), - actualY - (((tmName.transform.localScale.x - 1) * diff) / 6), tmName.transform.localPosition.z); + float scale = Mathf.Min(3, tmName.transform.localScale.x + 0.01f); + tmName.transform.localScale = new Vector3(scale, scale, 1); + tmName.MoveTo(actualX - ((tmName.transform.localScale.x - 1) * diff / 2), + actualY - ((tmName.transform.localScale.x - 1) * diff / 6)); } blank.color = new Color(blank.color.r, blank.color.g, blank.color.b, blank.color.a + 0.003f); yield return 0; diff --git a/Assets/Scripts/PregamePlaceholder/KeybindEntry.cs b/Assets/Scripts/PregamePlaceholder/KeybindEntry.cs new file mode 100644 index 000000000..2a411137c --- /dev/null +++ b/Assets/Scripts/PregamePlaceholder/KeybindEntry.cs @@ -0,0 +1,53 @@ +using UnityEngine; +using UnityEngine.UI; + +public class KeybindEntry : MonoBehaviour { + public static KeybindSettings controller; + public string Name; + public Button Edit, Reset, Clear; + public Text Text, KeyList; + public Image Image; + + void Start() { + Name = gameObject.name; + if (controller == null) + controller = FindObjectOfType(); + + Edit.onClick.AddListener(() => { + if (controller.listening == this) controller.StopListening(); + else controller.StartListening(this); + }); + Reset.onClick.AddListener(() => { + controller.ResetKeybind(this); + }); + Clear.onClick.AddListener(() => { + controller.ClearKeybind(this); + }); + + if (GlobalControls.crate) { + Edit.GetComponentInChildren().text = "GO"; + Reset.GetComponentInChildren().text = "OLD"; + Clear.GetComponentInChildren().text = "BYEE"; + switch (Text.text) { + case "Confirm": Text.text = "YASS GO"; break; + case "Cancel": Text.text = "RATIO'D"; break; + case "Menu": Text.text = "YUMMY"; break; + case "Up": Text.text = "EYUP"; break; + case "Down": Text.text = "DONN"; break; + case "Left": Text.text = "LETFE"; break; + case "Right": Text.text = "RITE"; break; + default: break; + } + KeyList.text = Temmify.Convert(KeyList.text); + } + } + + public void SetKeyList(string keyList) { KeyList.text = keyList; } + public void SetEditText(string text) { Edit.GetComponentInChildren().text = text; } + + public void SetColor(Color c) { + Image.color = c; + Text.color = c; + KeyList.color = c; + } +} diff --git a/Assets/Scripts/PregamePlaceholder/KeybindEntry.cs.meta b/Assets/Scripts/PregamePlaceholder/KeybindEntry.cs.meta new file mode 100644 index 000000000..e73fb270c --- /dev/null +++ b/Assets/Scripts/PregamePlaceholder/KeybindEntry.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9580cf12eed84fd479de25a93c2e8b8d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: -1 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PregamePlaceholder/KeybindSettings.cs b/Assets/Scripts/PregamePlaceholder/KeybindSettings.cs new file mode 100644 index 000000000..991d7ead5 --- /dev/null +++ b/Assets/Scripts/PregamePlaceholder/KeybindSettings.cs @@ -0,0 +1,302 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using UnityEngine; +using UnityEngine.SceneManagement; +using UnityEngine.UI; + +public class KeybindSettings : MonoBehaviour { + public KeybindEntry Confirm, Cancel, Menu, Up, Left, Down, Right; + public Text Listening; + public Button Save, ResetAll, Restore, Back; + + private Dictionary> tempKeybinds = new Dictionary>(); + + private CYFTimer textHijackTimer; + private CYFTimer resetAllTimer; + private CYFTimer restoreTimer; + private CYFTimer notSavedExitTimer; + + [HideInInspector] public KeybindEntry listening = null; + + void Start() { + foreach (KeyValuePair> keybind in KeyboardInput.playerKeys) + tempKeybinds[keybind.Key] = new List(keybind.Value); + + textHijackTimer = new CYFTimer(3, UpdateListeningText); + resetAllTimer = new CYFTimer(3, CancelResetAll); + restoreTimer = new CYFTimer(3, CancelRestore); + notSavedExitTimer = new CYFTimer(3, CancelNoSaveExit); + + Save.GetComponentInChildren().text = GlobalControls.crate ? "SAV" : "Save"; + CancelResetAll(); + CancelRestore(); + CancelNoSaveExit(); + UpdateListeningText(); + + Save.onClick.AddListener(() => { + if (listening != null) + StopListening(); + SaveKeybinds(); + }); + ResetAll.onClick.AddListener(() => { + if (listening != null) + StopListening(); + if (resetAllTimer.IsElapsing()) { + resetAllTimer.Stop(); + ResetAll.GetComponentInChildren().text = GlobalControls.crate ? "BYEEEE" : "Reset All"; + Reload(true); + } else { + resetAllTimer.Start(); + ResetAll.GetComponentInChildren().text = GlobalControls.crate ? "DONUT!1" : "You sure?"; + } + }); + Restore.onClick.AddListener(() => { + if (listening != null) + StopListening(); + if (restoreTimer.IsElapsing()) { + restoreTimer.Stop(); + Restore.GetComponentInChildren().text = GlobalControls.crate ? "GO OLD" : "Restore"; + FactoryResetKeybinds(); + } else { + restoreTimer.Start(); + Restore.GetComponentInChildren().text = GlobalControls.crate ? "DONUT!1" : "You sure?"; + } + }); + Back.onClick.AddListener(() => { + if (listening != null) + StopListening(); + + bool foundUnsaved = false; + foreach (KeyValuePair> keybind in tempKeybinds) + if (!keybind.Value.SequenceEqual(KeyboardInput.playerKeys[keybind.Key])) { + foundUnsaved = true; + break; + } + + if (!foundUnsaved || notSavedExitTimer.IsElapsing()) { + notSavedExitTimer.Stop(); + SceneManager.LoadScene("Options"); + } else { + notSavedExitTimer.Start(); + Back.GetComponentInChildren().text = GlobalControls.crate ? "DONUT!1" : "You sure?"; + UnitaleUtil.PlaySound("Reset", "hurtsound"); + HijackListeningText(GlobalControls.crate ? "ONO BAD DID NO SAV NO GO AAAA" + : "Some keys have not been saved! Are you sure you wanna exit?", "ff0000"); + } + }); + + Reload(); + } + + public void CancelResetAll() { + ResetAll.GetComponentInChildren().text = GlobalControls.crate ? "LAL BAD" : "Reset All"; + } + public void CancelRestore() { + Restore.GetComponentInChildren().text = GlobalControls.crate ? "GO OLD" : "Restore"; + } + public void CancelNoSaveExit() { + Back.GetComponentInChildren().text = GlobalControls.crate ? "BYEEEE" : "Back"; + } + + public void LoadKeybinds() { + KeyboardInput.LoadPlayerKeys(); + tempKeybinds.Clear(); + foreach (KeyValuePair> keybind in KeyboardInput.playerKeys) + tempKeybinds[keybind.Key] = new List(keybind.Value); + foreach (KeybindEntry keybind in new KeybindEntry[] { Confirm, Cancel, Menu, Up, Left, Down, Right }) + UpdateKeyList(keybind); + UpdateColor(); + } + + public void SaveKeybinds() { + string invalidReason = null; + + Dictionary conflicts = KeyboardInput.GetConflicts(tempKeybinds); + if (conflicts.Count > 0) { + string[] conflict = conflicts[conflicts.Keys.First()]; + invalidReason = "Please get rid of key conflicts before saving this configuration."; + } + + if (invalidReason == null) + foreach (KeyValuePair> p in tempKeybinds) + if (p.Value.Count == 0) { + invalidReason = "The keybind \"" + p.Key + "\" is unbound! Please add at least one key to it."; + break; + } + + if (invalidReason != null) { + UnitaleUtil.PlaySound("Reset", "hurtsound"); + HijackListeningText(GlobalControls.crate ? "BAD KEEBLEDS NOOOO GO AWAY" : invalidReason, "ff0000"); + return; + } + + KeyboardInput.SaveKeybinds(tempKeybinds); + Reload(); + + UnitaleUtil.PlaySound("Save", "saved"); + HijackListeningText(GlobalControls.crate ? "KEEBLEDS OKOK!1!!1!" : "Keybinds saved!"); + } + + public void HijackListeningText(string text, string color = "ffff00") { + Listening.text = "" + text + ""; + if (textHijackTimer.IsElapsing()) + textHijackTimer.Stop(); + textHijackTimer.Start(); + } + + public void Reload(bool isReset = false) { + LoadKeybinds(); + + if (isReset) { + UnitaleUtil.PlaySound("Reset", "hurtsound"); + HijackListeningText(GlobalControls.crate ? "KEEBLEDS BYEEEE!1!1!!" : "Keybinds reset!"); + } + } + + public void FactoryResetKeybinds() { + tempKeybinds.Clear(); + foreach (KeyValuePair> keybind in KeyboardInput.defaultKeys) + tempKeybinds[keybind.Key] = new List(keybind.Value); + foreach (KeybindEntry keybind in new KeybindEntry[] { Confirm, Cancel, Menu, Up, Left, Down, Right }) + UpdateKeyList(keybind); + UpdateColor(); + + UnitaleUtil.PlaySound("Reset", "hurtsound"); + HijackListeningText(GlobalControls.crate ? "KEEBLEDS OLD NOWWW!!1!!!" : "Keybinds restored to their default state!"); + } + + public void UpdateColor() { + List conflictingKeybinds = new List(); + Dictionary conflicts = KeyboardInput.GetConflicts(tempKeybinds); + foreach (string[] conflictArray in conflicts.Values) + foreach (string conflict in conflictArray) + if (!conflictingKeybinds.Contains(conflict)) + conflictingKeybinds.Add(conflict); + + foreach (KeybindEntry keybind in new KeybindEntry[] { Confirm, Cancel, Menu, Up, Left, Down, Right }) { + Color c; + if (listening != null && listening.Name == keybind.Name) c = new Color(1, 1, 0); + else if (tempKeybinds[keybind.Name].Count == 0) c = new Color(1, 0, 0); + else if (conflictingKeybinds.Contains(keybind.Name)) c = new Color(1, 0, 0); + else if (!tempKeybinds[keybind.Name].SequenceEqual(KeyboardInput.playerKeys[keybind.Name])) c = new Color(1, 1, 1); + else c = new Color(0.7f, 0.7f, 0.7f); + keybind.SetColor(c); + } + } + + public void UpdateKeyList(KeybindEntry keybind) { + string keyList = string.Join(", ", tempKeybinds[keybind.Name].OrderBy(k => k.Length).ToArray()); + keybind.SetKeyList(GlobalControls.crate ? Temmify.Convert(keyList) : keyList); + } + + public void AddKeyToKeybind(KeybindEntry keybind, string key) { + tempKeybinds[keybind.Name].Add(key); + UpdateKeyList(keybind); + UpdateColor(); + } + + public void RemoveKeyFromKeybind(KeybindEntry keybind, string key) { + tempKeybinds[keybind.Name].Remove(key); + UpdateKeyList(keybind); + UpdateColor(); + } + + public void ResetKeybind(KeybindEntry keybind) { + if (listening != null) + StopListening(); + tempKeybinds[keybind.Name] = new List(KeyboardInput.playerKeys[keybind.Name]); + + UpdateKeyList(keybind); + UpdateListeningText(); + UpdateColor(); + } + + public void ClearKeybind(KeybindEntry keybind) { + if (listening != null) + StopListening(); + + tempKeybinds[keybind.Name].Clear(); + + UpdateKeyList(keybind); + UpdateListeningText(); + UpdateColor(); + } + + public void StartListening(KeybindEntry keybind) { + if (listening != null) + StopListening(); + listening = keybind; + listening.SetEditText(GlobalControls.crate ? "NO GO" : "Stop"); + + UpdateListeningText(); + UpdateColor(); + } + + public void StopListening() { + if (listening != null) + listening.SetEditText(GlobalControls.crate ? "GO" : "Edit"); + listening = null; + + UpdateListeningText(); + UpdateColor(); + } + + public void UpdateListeningText() { + textHijackTimer.Stop(); + Dictionary conflicts = KeyboardInput.GetConflicts(tempKeybinds); + if (listening) { + string crateText = "WAAAT"; + switch (listening.Name) { + case "Confirm": crateText = "YASS GO"; break; + case "Cancel": crateText = "RATIO'D"; break; + case "Menu": crateText = "YUMMY"; break; + case "Up": crateText = "EYUP"; break; + case "Down": crateText = "DONN"; break; + case "Left": crateText = "LETFE"; break; + case "Right": crateText = "RITE"; break; + default: break; + } + Listening.text = GlobalControls.crate ? "NO DEF! ME HER GUD! HER " + crateText + "1!!1!1" + : "Listening for " + listening.Name + ". Press a key to add/remove it! ESC to stop."; + } else if (conflicts.Count == 0) + Listening.text = GlobalControls.crate ? "ME DEF! NO HER GUD! HLEP1!!1!1" + : "Not currently listening..."; + else { + string[] conflict = conflicts[conflicts.Keys.First()]; + Listening.text = GlobalControls.crate ? "BAD KEEBLEDS NOOOO GO AWAY" + : "Conflict detected: " + conflicts.Keys.First().ToString() + " used for both " + conflict[0] + " and " + conflict[1] + "."; + } + } + + void Update() { + textHijackTimer.Update(); + resetAllTimer.Update(); + restoreTimer.Update(); + notSavedExitTimer.Update(); + + if (listening != null) { + foreach (KeyCode keycode in Enum.GetValues(typeof(KeyCode))) { + string key = keycode.ToString(); + if (Input.GetKeyDown(keycode)) { + if (keycode == KeyCode.Escape) StopListening(); + else if (tempKeybinds[listening.Name].Contains(key)) RemoveKeyFromKeybind(listening, key); + else if (keycode != KeyCode.Mouse0 && !key.StartsWith("JoystickButton")) AddKeyToKeybind(listening, key); + } + } + + foreach (KeyValuePair axis in KeyboardInput.axes) { + string axisName = null; + float state = Input.GetAxis(axis.Key); + if (state >= 0.7f && axis.Value < 0.7f) axisName = axis.Key + " +"; + else if (state <= -0.7f && axis.Value > -0.7f) axisName = axis.Key + " -"; + + if (axisName == null) + continue; + + if (tempKeybinds[listening.Name].Contains(axisName)) RemoveKeyFromKeybind(listening, axisName); + else AddKeyToKeybind(listening, axisName); + } + } + } +} diff --git a/Assets/Scripts/PregamePlaceholder/KeybindSettings.cs.meta b/Assets/Scripts/PregamePlaceholder/KeybindSettings.cs.meta new file mode 100644 index 000000000..d41612bba --- /dev/null +++ b/Assets/Scripts/PregamePlaceholder/KeybindSettings.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: aab9c60fbfe800a4c8b71de27310ecf4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PregamePlaceholder/MenuButton.cs b/Assets/Scripts/PregamePlaceholder/MenuButton.cs index 867882841..7cefe3a49 100644 --- a/Assets/Scripts/PregamePlaceholder/MenuButton.cs +++ b/Assets/Scripts/PregamePlaceholder/MenuButton.cs @@ -9,6 +9,7 @@ public class MenuButton : MonoBehaviour, IPointerEnterHandler, IPointerExitHandl private const float animateTimerMaxValue = 2; // number of frames it takes to animate private float animateTimer; private int animateDirection = -1; // -1 for Fade Out, 1 for Fade In + public bool lockAnimation = false; public void Update() { if (animateDirection == 1 && animateTimer < animateTimerMaxValue) { @@ -46,10 +47,12 @@ public void Reset() { } public void OnPointerEnter(PointerEventData ped) { - StartAnimation( 1); + if (!lockAnimation) + StartAnimation(1); } - public void OnPointerExit (PointerEventData ped) { - StartAnimation(-1); + public void OnPointerExit(PointerEventData ped) { + if (!lockAnimation) + StartAnimation(-1); } } diff --git a/Assets/Scripts/PregamePlaceholder/OptionsScript.cs b/Assets/Scripts/PregamePlaceholder/OptionsScript.cs index f9386a397..8c11b147b 100644 --- a/Assets/Scripts/PregamePlaceholder/OptionsScript.cs +++ b/Assets/Scripts/PregamePlaceholder/OptionsScript.cs @@ -3,6 +3,7 @@ using UnityEngine.SceneManagement; using System.IO; using MoonSharp.Interpreter; +using System.Collections.Generic; public class OptionsScript : MonoBehaviour { // used to prevent the player from erasing real/almighty globals or their save by accident @@ -18,14 +19,32 @@ public class OptionsScript : MonoBehaviour { private bool CrateUnlocked; // game objects - public GameObject ResetRG, ResetAG, ClearSave, Safe, Retro, Scale, Discord, Crate, Exit; + public GameObject ResetRG, ResetAG, ClearSave, Safe, Retro, Scale, Discord, Keys, Crate, Exit; public Text Description; + // Used for controller selection + private int selectedButton = -99; + private List buttons = new List(); + // Use this for initialization private void Start() { LocalCrate = GlobalControls.crate; CrateUnlocked = LuaScriptBinder.GetAlMighty(null, "CrateYourFrisk") != null; + buttons.AddRange(new MenuButton[] { + ResetRG.GetComponent(), + ResetAG.GetComponent(), + ClearSave.GetComponent(), + Safe.GetComponent(), + Retro.GetComponent(), + Scale.GetComponent(), + Discord.GetComponent(), + Keys.GetComponent(), + Exit.GetComponent() + }); + if (CrateUnlocked) + buttons.Insert(buttons.Count - 1, Crate.GetComponent()); + // add button functions // reset RealGlobals @@ -123,13 +142,9 @@ private void Start() { ? "Window Scale: " + ScreenResolution.windowScale + "x" : "WEENDO STRECH: " + ScreenResolution.windowScale + "X"; }); - #if UNITY_EDITOR - Scale.GetComponent public class SelectMessage : TextMessage { - public SelectMessage(IList options, bool singleList, IList colorPrefixes = null) : base("", false, true) { + public SelectMessage(IList options, bool singleList, int columns, IList colorPrefixes = null) : base("", false, true) { string finalMessage = ""; // String that will contain all our text when finished - const string rowOneSpacing = " "; // String that contains the needed shift for each normal line + const string itemSpacing = " "; // String that contains the needed shift for each item const string rowTwoSpacing = "\t"; // String that contains a tabulation character that puts the text to the right string prefix = "* "; // Prefix used for new lines @@ -22,7 +22,7 @@ public SelectMessage(IList options, bool singleList, IList color // If the option isn't null, has an existing color and this color isn't null or empty, we'll add the color as a prefix and put a white color tag as a suffix if (colorPrefixes != null && i < colorPrefixes.Count && !string.IsNullOrEmpty(colorPrefixes[i])) { intermedPrefix = colorPrefixes[i]; - intermedSuffix = "[color:ffffff]"; + intermedSuffix = "[color:ffffff][alpha:ff]"; } int index = 0; string commands = ""; @@ -60,14 +60,16 @@ public SelectMessage(IList options, bool singleList, IList color if (options[i] != null) options[i] = options[i].TrimStart('*', ' '); // If this is a single list, we don't need text on the right side of the textbox - if (singleList) finalMessage += commands + rowOneSpacing + intermedPrefix + prefix + options[i] + intermedSuffix + "\n"; - // If the number of the option is an even number, it'll be at the left side of the textbox - else if (i % 2 == 0) finalMessage += commands + rowOneSpacing + intermedPrefix + prefix + options[i] + intermedSuffix; - // Else, we'll put the text at the right and we'll add a chariot return - else finalMessage += commands + rowTwoSpacing + intermedPrefix + prefix + options[i]+ intermedSuffix + "\n"; + if (singleList) finalMessage += commands + itemSpacing + intermedPrefix + prefix + options[i] + intermedSuffix + "\n"; + // If the option is on the first column, it'll be at the left side of the textbox + else if (i % columns == 0) finalMessage += commands + itemSpacing + intermedPrefix + prefix + options[i] + intermedSuffix; + // If the option is on the last column, add a chariot return + else if (i % columns == columns - 1) finalMessage += commands + rowTwoSpacing + itemSpacing + intermedPrefix + prefix + options[i] + intermedSuffix + "\n"; + // Else, we'll put the textwith a tab + else finalMessage += commands + rowTwoSpacing + itemSpacing + intermedPrefix + prefix + options[i] + intermedSuffix; } // This function sends finalMessage to the real text handler function - Setup(finalMessage, false, true); + Setup(finalMessage, false, true, true, true); } } \ No newline at end of file diff --git a/Assets/Scripts/Text/TextEffect/RotatingEffect.cs b/Assets/Scripts/Text/TextEffect/RotatingEffect.cs index 7e7367997..e5d57f9d7 100644 --- a/Assets/Scripts/Text/TextEffect/RotatingEffect.cs +++ b/Assets/Scripts/Text/TextEffect/RotatingEffect.cs @@ -4,16 +4,21 @@ public class RotatingEffect : TextEffect { private float sinTimer; private readonly float intensity; private const float rotSpeed = 7.0f; + private readonly float effectStep; - public RotatingEffect(TextManager textMan, float intensity = 1.5f) : base(textMan) { this.intensity = intensity; } + public RotatingEffect(TextManager textMan, float intensity = 1.5f, float step = 0f) : base(textMan) { + this.intensity = intensity != 0 ? intensity : 1.5f; + effectStep = step; + } protected override void UpdateInternal() { - for (int i = 0; i < textMan.letterReferences.Length; i++) { - if (textMan.letterReferences[i] == null) - continue; - RectTransform rt = textMan.letterReferences[i].GetComponent(); - float iDiv = sinTimer * rotSpeed + (i / 3.0f); - rt.anchoredPosition = new Vector2(textMan.letterPositions[i].x + intensity * -Mathf.Sin(iDiv), textMan.letterPositions[i].y + intensity * Mathf.Cos(iDiv)); + for (int i = 0; i < textMan.letters.Count; i++) { + float iDiv = sinTimer * rotSpeed + i / 3.0f + effectStep * i; + + LuaSpriteController ctrl = LuaSpriteController.GetOrCreate(textMan.letters[i].image.gameObject); + Vector2 oldPosition = positions[i]; + positions[i] = new Vector2(intensity * -Mathf.Sin(iDiv), intensity * Mathf.Cos(iDiv)); + ctrl.Move(positions[i].x - oldPosition.x, positions[i].y - oldPosition.y); } sinTimer += Time.deltaTime; diff --git a/Assets/Scripts/Text/TextEffect/ShakeEffect.cs b/Assets/Scripts/Text/TextEffect/ShakeEffect.cs index ead5e2858..6393eb51a 100644 --- a/Assets/Scripts/Text/TextEffect/ShakeEffect.cs +++ b/Assets/Scripts/Text/TextEffect/ShakeEffect.cs @@ -4,22 +4,23 @@ internal class ShakeEffect : TextEffect { private readonly float intensity; private bool skipNextFrame; - public ShakeEffect(TextManager textMan, float intensity = 1.0f) : base(textMan) { this.intensity = intensity; } + public ShakeEffect(TextManager textMan, float intensity = 1.0f) : base(textMan) { + this.intensity = intensity > 0 ? intensity : 1.0f; + } protected override void UpdateInternal() { if (skipNextFrame) { skipNextFrame = false; return; } - for (int i = 0; i < textMan.letterReferences.Length; i++) { - if (textMan.letterReferences[i] == null) - continue; + skipNextFrame = true; + + for (int i = 0; i < textMan.letters.Count; i++) { + LuaSpriteController ctrl = LuaSpriteController.GetOrCreate(textMan.letters[i].image.gameObject); float random = Random.value * 2.0f * Mathf.PI; - float xWig = Mathf.Sin(random) * intensity; - float yWig = Mathf.Cos(random) * intensity; - RectTransform rt = textMan.letterReferences[i].GetComponent(); - rt.anchoredPosition = new Vector2(textMan.letterPositions[i].x + xWig, textMan.letterPositions[i].y + yWig); + Vector2 oldPosition = positions[i]; + positions[i] = new Vector2(Mathf.Sin(random) * intensity, Mathf.Cos(random) * intensity); + ctrl.Move(positions[i].x - oldPosition.x, positions[i].y - oldPosition.y); } - skipNextFrame = true; } } \ No newline at end of file diff --git a/Assets/Scripts/Text/TextEffect/TextEffect.cs b/Assets/Scripts/Text/TextEffect/TextEffect.cs index 3dce4999e..dd60e08ae 100644 --- a/Assets/Scripts/Text/TextEffect/TextEffect.cs +++ b/Assets/Scripts/Text/TextEffect/TextEffect.cs @@ -1,7 +1,28 @@ -public abstract class TextEffect { - //private bool doUpdate = true; +using System.Collections.Generic; +using UnityEngine; + +public abstract class TextEffect { protected TextManager textMan; - protected TextEffect(TextManager textMan) { this.textMan = textMan; } - public void UpdateEffects() { UpdateInternal(); } + protected List positions; + + protected TextEffect(TextManager textMan) { + this.textMan = textMan; + positions = new List(); + foreach (TextManager.LetterData l in textMan.letters) + positions.Add(new Vector2()); + } + + public void UpdateEffects() { + while (textMan.letters.Count > positions.Count) positions.Add(new Vector2()); + while (textMan.letters.Count < positions.Count) positions.RemoveAt(positions.Count - 1); + UpdateInternal(); + } protected abstract void UpdateInternal(); + + public void ResetPositions() { + for (int i = 0; i < positions.Count; i++) { + if (textMan != null && i < textMan.letters.Count && textMan.letters[i].image != null) + textMan.letters[i].image.transform.position -= (Vector3)positions[i]; + } + } } \ No newline at end of file diff --git a/Assets/Scripts/Text/TextEffect/TwitchEffect.cs b/Assets/Scripts/Text/TextEffect/TwitchEffect.cs index 5dcda3042..bdde90d0e 100644 --- a/Assets/Scripts/Text/TextEffect/TwitchEffect.cs +++ b/Assets/Scripts/Text/TextEffect/TwitchEffect.cs @@ -1,40 +1,47 @@ using UnityEngine; -using UnityEngine.UI; public class TwitchEffect : TextEffect { - private int prevChar; + private int selectedChar = -1; private int updateCount; private readonly float intensity; - private const int minWigFrames = 34; - private const int wigFrameVariety = 30; - private int nextWigInFrames = 24; + private readonly int avgWigFrames = 48; + private readonly int wigFrameVariety = 16; + private int nextWigInFrames; + private LuaSpriteController ctrl; - public TwitchEffect(TextManager textMan, float intensity = 2.0f) : base(textMan) { this.intensity = intensity; } + public TwitchEffect(TextManager textMan, float intensity = 2.0f, int step = 0) : base(textMan) { + this.intensity = intensity > 0 ? intensity : 2.0f; + + if (step > 0) { + avgWigFrames = step; + wigFrameVariety = step / 3; + } + nextWigInFrames = GetNextWigTime(); + } protected override void UpdateInternal() { - Image[] letters = textMan.letterReferences; - if (letters.Length == 0) + if (textMan.letters.Count == 0) return; - // move back last character - if (prevChar >= 0 && textMan.letterReferences.Length > prevChar && textMan.letterReferences[prevChar] != null) - textMan.letterReferences[prevChar].GetComponent().anchoredPosition = textMan.letterPositions[prevChar]; - prevChar = -1; + // Move back last character + if (updateCount == 0 && selectedChar >= 0 && selectedChar < textMan.letters.Count && ctrl != null) { + ctrl.Move(-positions[selectedChar].x, -positions[selectedChar].y); + positions[selectedChar] = new Vector2(); + } updateCount++; if (updateCount < nextWigInFrames) return; updateCount = 0; + nextWigInFrames = GetNextWigTime(); - int selectedChar = Random.Range(0, letters.Length); - if (letters[selectedChar] == null) - return; float random = Random.value * 2.0f * Mathf.PI; - float xWig = Mathf.Sin(random) * intensity; - float yWig = Mathf.Cos(random) * intensity; - nextWigInFrames = minWigFrames + (int)(wigFrameVariety * Random.value); - RectTransform rt = letters[selectedChar].GetComponent(); - rt.position = new Vector2(letters[selectedChar].transform.position.x + xWig, letters[selectedChar].transform.position.y + yWig); - prevChar = selectedChar; + selectedChar = Random.Range(0, textMan.letters.Count); + positions[selectedChar] = new Vector2(Mathf.Sin(random) * intensity, Mathf.Cos(random) * intensity); + + ctrl = LuaSpriteController.GetOrCreate(textMan.letters[selectedChar].image.gameObject); + ctrl.Move(positions[selectedChar].x, positions[selectedChar].y); } + + private int GetNextWigTime() { return avgWigFrames + Mathf.RoundToInt(wigFrameVariety * (Random.value * 2 - 1)); } } \ No newline at end of file diff --git a/Assets/Scripts/Text/TextEffectLetter/RotatingEffectLetter.cs b/Assets/Scripts/Text/TextEffectLetter/RotatingEffectLetter.cs index 1db63fe04..ea0c7d3d0 100644 --- a/Assets/Scripts/Text/TextEffectLetter/RotatingEffectLetter.cs +++ b/Assets/Scripts/Text/TextEffectLetter/RotatingEffectLetter.cs @@ -4,13 +4,21 @@ public class RotatingEffectLetter : TextEffectLetter { private float sinTimer; private readonly float intensity; private const float rotSpeed = 7.0f; + private readonly float effectStep; - public RotatingEffectLetter(Letter letter, float intensity = 1.5f) : base(letter) { this.intensity = intensity != 0 ? intensity : 1.5f; } + public RotatingEffectLetter(Letter letter, float intensity = 1.5f, float step = 0f) : base(letter) { + this.intensity = intensity != 0 ? intensity : 1.5f; + effectStep = step; + } protected override void UpdateInternal() { - RectTransform rt = letter.GetComponent(); - float iDiv = sinTimer * rotSpeed; - rt.position = new Vector2(rt.position.x + intensity * -Mathf.Sin(iDiv), rt.position.y + intensity * Mathf.Cos(iDiv)); + float iDiv = sinTimer * rotSpeed + effectStep; sinTimer += Time.deltaTime; + + float oldXPos = xPos; + float oldYPos = yPos; + xPos = intensity * -Mathf.Sin(iDiv); + yPos = intensity * Mathf.Cos(iDiv); + ctrl.Move(xPos - oldXPos, yPos - oldYPos); } } \ No newline at end of file diff --git a/Assets/Scripts/Text/TextEffectLetter/ShakeEffectLetter.cs b/Assets/Scripts/Text/TextEffectLetter/ShakeEffectLetter.cs index dad858f46..a2df7e383 100644 --- a/Assets/Scripts/Text/TextEffectLetter/ShakeEffectLetter.cs +++ b/Assets/Scripts/Text/TextEffectLetter/ShakeEffectLetter.cs @@ -4,19 +4,22 @@ public class ShakeEffectLetter : TextEffectLetter { private readonly float intensity; private bool skipNextFrame; - public ShakeEffectLetter(Letter letter, float intensity = 1.0f) : base(letter) { this.intensity = intensity != 0 ? intensity : 1.0f; } + public ShakeEffectLetter(Letter letter, float intensity = 1.0f) : base(letter) { + this.intensity = intensity > 0 ? intensity : 1.0f; + } protected override void UpdateInternal() { if (skipNextFrame) { skipNextFrame = false; return; } + skipNextFrame = true; float random = Random.value * 2.0f * Mathf.PI; - float xWig = Mathf.Sin(random) * intensity; - float yWig = Mathf.Cos(random) * intensity; - RectTransform rt = letter.GetComponent(); - rt.position = new Vector2(letter.basisPos.x + xWig, letter.basisPos.y + yWig); - skipNextFrame = true; + float oldXPos = xPos; + float oldYPos = yPos; + xPos = Mathf.Sin(random) * intensity; + yPos = Mathf.Cos(random) * intensity; + ctrl.Move(xPos - oldXPos, yPos - oldYPos); } } \ No newline at end of file diff --git a/Assets/Scripts/Text/TextEffectLetter/TextEffectLetter.cs b/Assets/Scripts/Text/TextEffectLetter/TextEffectLetter.cs index 18345949f..06d500e94 100644 --- a/Assets/Scripts/Text/TextEffectLetter/TextEffectLetter.cs +++ b/Assets/Scripts/Text/TextEffectLetter/TextEffectLetter.cs @@ -1,6 +1,18 @@ public abstract class TextEffectLetter { protected Letter letter; - protected TextEffectLetter(Letter letter) { this.letter = letter; } + protected LuaSpriteController ctrl; + protected float xPos = 0, yPos = 0; + + protected TextEffectLetter(Letter letter) { + this.letter = letter; + ctrl = LuaSpriteController.GetOrCreate(letter.gameObject); + } + public void UpdateEffects() { UpdateInternal(); } protected abstract void UpdateInternal(); + + public void ResetPositions() { + if (letter && ctrl != null) + ctrl.Move(-xPos, -yPos); + } } \ No newline at end of file diff --git a/Assets/Scripts/Text/TextEffectLetter/TwitchEffectLetter.cs b/Assets/Scripts/Text/TextEffectLetter/TwitchEffectLetter.cs index 0fed7e846..83fc12329 100644 --- a/Assets/Scripts/Text/TextEffectLetter/TwitchEffectLetter.cs +++ b/Assets/Scripts/Text/TextEffectLetter/TwitchEffectLetter.cs @@ -3,29 +3,35 @@ public class TwitchEffectLetter : TextEffectLetter { private int updateCount; private readonly float intensity; - private const int minWigFrames = 300; - private const int wigFrameVariety = 750; + private readonly int avgWigFrames = 500; + private readonly int wigFrameVariety = 400; private int nextWigInFrames; - public TwitchEffectLetter(Letter letter, float intensity = 2.0f) : base(letter) { - this.intensity = intensity != 0 ? intensity : 2.0f; - nextWigInFrames = (int)(wigFrameVariety * Random.value); + public TwitchEffectLetter(Letter letter, float intensity = 2.0f, int step = 0) : base(letter) { + this.intensity = intensity > 0 ? intensity : 2.0f; + + if (step > 0) { + avgWigFrames = step; + wigFrameVariety = step * 4 / 5; + } + nextWigInFrames = GetNextWigTime(); } protected override void UpdateInternal() { if (updateCount == 0) - letter.GetComponent().position = letter.basisPos; - // don't make it happen too often + ctrl.Move(-xPos, -yPos); + updateCount++; if (updateCount < nextWigInFrames) return; updateCount = 0; + nextWigInFrames = GetNextWigTime(); float random = Random.value * 2.0f * Mathf.PI; - float xWig = Mathf.Sin(random) * intensity; - float yWig = Mathf.Cos(random) * intensity; - nextWigInFrames = minWigFrames + (int)(wigFrameVariety * Random.value); - RectTransform rt = letter.GetComponent(); - rt.position = new Vector2(rt.position.x + xWig, rt.position.y + yWig); + xPos = Mathf.Sin(random) * intensity; + yPos = Mathf.Cos(random) * intensity; + ctrl.Move(xPos, yPos); } + + private int GetNextWigTime() { return avgWigFrames + Mathf.RoundToInt(wigFrameVariety * (Random.value * 2 - 1)); } } \ No newline at end of file diff --git a/Assets/Scripts/Text/TextManager.cs b/Assets/Scripts/Text/TextManager.cs index 713ba3eb4..b0e794d5a 100644 --- a/Assets/Scripts/Text/TextManager.cs +++ b/Assets/Scripts/Text/TextManager.cs @@ -7,38 +7,53 @@ // TODO less code duplicate-y way of pulling commands out of the text. public class TextManager : MonoBehaviour { - internal Image[] letterReferences; - internal Vector2[] letterPositions; - protected UnderFont default_charset; + public struct LetterData { + public int index; + public Image image; + public Sprite sprite; + public Vector2 position; + public bool commandColorSet, commandAlphaSet; + public LetterData(int index, Image image, Sprite sprite, Vector2 position, bool commandColorSet, bool commandAlphaSet) { + this.index = index; + this.image = image; + this.sprite = sprite; + this.position = position; + this.commandColorSet = commandColorSet; + this.commandAlphaSet = commandAlphaSet; + } + } + internal List letters = new List(); + public List letterAdjustShifts = new List(); + + protected UnderFont defaultFont; protected string defaultVoice; - [MoonSharpHidden] public string letterSound; + [MoonSharpHidden] public UnderFont font { get; protected set; } + [MoonSharpHidden] public string fontVoice; + private string commandVoice; + protected TextEffect textEffect; private string letterEffect = "none"; + private float letterEffectStep; + private float letterEffectStepCount; + private float letterIntensity; + public static string[] commandList = { "color", "alpha", "charspacing", "linespacing", "starcolor", "instant", "font", "effect", "noskip", "w", "waitall", "novoice", - "next", "finished", "nextthisnow", "noskipatall", "waitfor", "speed", "letters", "voice", "func", "mugshot", + "next", "finished", "nextthisnow", "noskipatall", "waitfor", "speed", "letters", "lettersperframe", "voice", "func", "mugshot", "music", "sound", "health", "lettereffect"}; - private float letterIntensity; + public static string[] movementCommands = { "charspacing", "linespacing", "font" }; public int currentLine; [MoonSharpHidden] public int _textMaxWidth; - private int currentCharacter; + public int currentCharacter; public int currentReferenceCharacter; - private bool currentSkippable = true; + public bool currentSkippable = true; private bool decoratedTextOffset; - [MoonSharpHidden] public bool nextMonsterDialogueOnce, nmd2, wasStated; private RectTransform self; - [MoonSharpHidden] public Vector2 offset; - private bool offsetSet; + private float currentX; - //private float _currentY; - private float currentY; /* { - get { return _currentY; } - set { - if (GetType() == typeof(LuaTextManager)) - print("Change currentY value: " + _currentY + " => " + value); - _currentY = value; - } - }*/ + private float currentY; + private float startingLineX; + private float startingLineY; // Variables that have to do with "[instant]" private bool instantActive; // Will be true if "[instant]" or "[instant:allowcommand]" have been activated @@ -46,39 +61,58 @@ public class TextManager : MonoBehaviour { private bool paused; private bool muted; - private bool autoSkipThis; + private bool skippableToNextLine; private bool autoSkipAll; private bool autoSkip; private bool skipFromPlayer; private bool firstChar; + internal float hSpacing = 3; internal float vSpacing; - private LuaSpriteController mugshot; + + public LuaSpriteController mugshotMask; + public LuaSpriteController mugshot; private string[] mugshotList; - private string finalMugshot; + private bool lineHasMugshot; private float mugshotTimer; + // private int letterSpeed = 1; - private int letterOnceValue; + private int lettersToDisplay; + private int lettersToDisplayOnce; private KeyCode waitingChar = KeyCode.None; + private string waitingKeybind = null; - protected Color currentColor = Color.white; - private bool colorSet; + protected Color commandColor = Color.white; protected Color defaultColor = Color.white; protected Color fontDefaultColor = Color.white; + protected bool commandColorSet, commandAlphaSet; private float letterTimer; private float timePerLetter; private const float singleFrameTiming = 1.0f / 20; + protected Vector3 internalRotation = Vector3.zero; + + public int columnShift = 265; + public int columnNumber = 2; + + protected bool hidden = true; + + // The rotation of the text + public float rotation { + get { return transform.eulerAngles.z; } + set { + // We mod the value from 0 to 360 because angles are between 0 and 360 normally + internalRotation.z = Math.Mod(value, 360); + transform.eulerAngles = internalRotation; + } + } [MoonSharpHidden] public ScriptWrapper caller; - [MoonSharpHidden] public UnderFont Charset { get; protected set; } - [MoonSharpHidden] public TextMessage[] textQueue; + [MoonSharpHidden] public TextMessage[] textQueue { get; protected set; } //public string[] mugshotsPath; //public bool overworld; - [MoonSharpHidden] public bool blockSkip; [MoonSharpHidden] public bool skipNowIfBlocked = false; - internal bool noSkip1stFrame = true; [MoonSharpHidden] public bool lateStartWaiting = false; // Lua text objects will use a late start public TextManager() { @@ -90,7 +124,6 @@ public TextManager() { currentCharacter = 0; currentReferenceCharacter = 0; decoratedTextOffset = false; - wasStated = false; instantActive = false; instantCommand = false; autoSkipAll = false; @@ -99,50 +132,67 @@ public TextManager() { firstChar = false; vSpacing = 0; mugshotList = null; - letterOnceValue = 0; - colorSet = false; + lettersToDisplay = 1; + lettersToDisplayOnce = 0; + commandColorSet = false; + commandAlphaSet = false; letterTimer = 0.0f; textQueue = null; - blockSkip = false; } [MoonSharpHidden] public void SetCaller(ScriptWrapper s) { caller = s; } - public void SetFont(UnderFont font, bool firstTime = false) { - Charset = font; - if (default_charset == null) - default_charset = font; - if (firstTime) { - if (letterSound == defaultVoice && font.Sound != null) - letterSound = font.SoundName; - } else if (font.Sound != null) - letterSound = font.SoundName; + public void SetFont(UnderFont font, bool inline = false) { + this.font = font; + + if (!inline || defaultFont == null) { + defaultFont = font; + defaultVoice = font.SoundName; + fontDefaultColor = font.DefaultColor; + } vSpacing = 0; hSpacing = font.CharSpacing; - fontDefaultColor = defaultColor = font.DefaultColor; - if (GetType() == typeof(LuaTextManager)) { - if (((LuaTextManager) this).hasColorBeenSet) defaultColor = ((LuaTextManager) this)._color; - if (((LuaTextManager) this).hasAlphaBeenSet) defaultColor.a = ((LuaTextManager) this).alpha; + + defaultColor = font.DefaultColor; + if (this as LuaTextManager) { + if ((this as LuaTextManager).textColorSet) defaultColor = ((LuaTextManager) this)._color; + if ((this as LuaTextManager).textAlphaSet) defaultColor.a = ((LuaTextManager) this).alpha; } - currentColor = defaultColor; + commandColor = defaultColor; + } + + public string GetVoice() { + string voice = commandVoice ?? fontVoice; + return voice != "none" ? voice : null; } [MoonSharpHidden] public void SetHorizontalSpacing(float spacing = 3) { hSpacing = spacing; } [MoonSharpHidden] public void SetVerticalSpacing(float spacing = 0) { vSpacing = spacing; } [MoonSharpHidden] public void ResetFont() { - if (Charset == null || default_charset == null) - if (GetType() == typeof(LuaTextManager)) - ((LuaTextManager)this).SetFont(SpriteFontRegistry.UI_MONSTERTEXT_NAME); + if (font == null || defaultFont == null) + if (GetType() == typeof(LuaTextManager) && !((LuaTextManager)this).isMainTextObject) + ((LuaTextManager) this).SetFont(SpriteFontRegistry.UI_MONSTERTEXT_NAME); else - SetFont(SpriteFontRegistry.Get(SpriteFontRegistry.UI_DEFAULT_NAME), true); - Charset = default_charset; - Debug.Assert(default_charset != null, "default_charset != null"); - letterSound = defaultVoice ?? default_charset.SoundName; - fontDefaultColor = default_charset.DefaultColor; - if (GetType() == typeof(LuaTextManager) && !((LuaTextManager) this).hasColorBeenSet) + SetFont(SpriteFontRegistry.Get(SpriteFontRegistry.UI_DEFAULT_NAME)); + font = defaultFont; + System.Diagnostics.Debug.Assert(defaultFont != null, "defaultFont != null"); + fontVoice = defaultVoice ?? font.SoundName; + fontDefaultColor = font.DefaultColor; + hSpacing = font.CharSpacing; + + if (!(this as LuaTextManager)) defaultColor = fontDefaultColor; + else { + if (!(this as LuaTextManager).textColorSet) { + defaultColor.r = fontDefaultColor.r; + defaultColor.g = fontDefaultColor.g; + defaultColor.b = fontDefaultColor.b; + } + if (!(this as LuaTextManager).textAlphaSet) + defaultColor.a = fontDefaultColor.a; + } // Default voice in the overworld if (gameObject.name == "TextManager OW") @@ -151,19 +201,14 @@ [MoonSharpHidden] public void ResetFont() { protected virtual void Awake() { self = gameObject.GetComponent(); - // SetFont(SpriteFontRegistry.F_UI_DIALOGFONT); timePerLetter = singleFrameTiming; - GameObject textFrameOuter = GameObject.Find("textframe_border_outer"); - if (!UnitaleUtil.IsOverworld || !textFrameOuter || textFrameOuter.GetComponentInChildren() != this) return; - mugshot = LuaSpriteController.GetOrCreate(GameObject.Find("Mugshot")); - } - - private void Start() { - // ResetFont(); - // SetText("the quick brown fox jumps over\rthe lazy dog.\nTHE QUICK BROWN FOX JUMPS OVER\rTHE LAZY DOG.\nJerry.", true, true); - // SetText(new TextMessage("Here comes Napstablook.", true, false)); - // SetText(new TextMessage(new string[] { "Check", "Compliment", "Ignore", "Steal", "trow temy", "Jerry" }, false)); + Transform parent = this as LuaTextManager ? (this as LuaTextManager).GetContainer().transform.parent : transform.parent; + if (parent == null || (!parent.Find("Mugshot") && !parent.Find("MugshotMask"))) + return; + mugshot = LuaSpriteController.GetOrCreate((parent.Find("Mugshot") ?? parent.Find("MugshotMask").GetChild(0)).gameObject); + if (parent.Find("MugshotMask")) + mugshotMask = LuaSpriteController.GetOrCreate(parent.Find("MugshotMask").gameObject); } public void SetPause(bool pause) { paused = pause; } @@ -171,20 +216,33 @@ private void Start() { public bool IsPaused() { return paused; } [MoonSharpHidden] public bool IsFinished() { - if (letterReferences == null) - return false; - return currentCharacter >= letterReferences.Length; + return currentCharacter >= textQueue[currentLine].Text.Length; } [MoonSharpHidden] public void SetMute(bool newMuted) { muted = newMuted; } public void SetText(TextMessage text) { SetTextQueue(new[] { text }); } + public bool GetAutoLineBreak() { + if (textQueue[currentLine].ForceNoAutoLineBreak) return false; + if (!GlobalControls.isInFight || EnemyEncounter.script.GetVar("autolinebreak").Boolean) return true; + return (this as LuaTextManager) != null && this != UIController.instance.mainTextManager; + } + [MoonSharpHidden] public void SetTextQueue(TextMessage[] newTextQueue) { + if (newTextQueue == null) + newTextQueue = new TextMessage[] { }; + if (UnitaleUtil.IsOverworld && (gameObject.name == "TextManager OW")) PlayerOverworld.AutoSetUIPos(); ResetFont(); + if (mugshotList != null) { + bool oldLineHasMugshot = lineHasMugshot; + SetMugshot(DynValue.NewNil()); + SetMugshotShift(oldLineHasMugshot); + } + hidden = newTextQueue.Length == 0; textQueue = newTextQueue; currentLine = 0; ShowLine(0); @@ -216,156 +274,136 @@ [MoonSharpHidden] public void AddToTextQueue(TextMessage[] textQueueToAdd) { } [MoonSharpHidden] public bool CanSkip() { return currentSkippable; } - [MoonSharpHidden] public bool CanAutoSkip() { return autoSkip; } - [MoonSharpHidden] public bool CanAutoSkipThis() { return autoSkipThis; } + [MoonSharpHidden] public bool CanSkipToNextLine() { return skippableToNextLine; } [MoonSharpHidden] public bool CanAutoSkipAll() { return autoSkipAll; } + [MoonSharpHidden] public bool CanAutoSkipAny(bool onlySkippableIfConfirm = false) { return CanAutoSkip() || (CanSkipToNextLine() && (!onlySkippableIfConfirm || GlobalControls.input.Confirm == ButtonState.PRESSED)) || CanAutoSkipAll(); } public int LineCount() { - if (textQueue == null) - return 0; - return textQueue.Length; - } - - [MoonSharpHidden] public void SetOffset(float xOff, float yOff) { - offset = new Vector2(xOff, yOff); - offsetSet = true; + return textQueue == null ? 0 : textQueue.Length; } public bool LineComplete() { - if (letterReferences == null) - return false; - return (instantActive || currentCharacter == letterReferences.Length); + return textQueue == null || instantActive || currentCharacter == textQueue[currentLine].Text.Length; } [MoonSharpHidden] public bool AllLinesComplete() { return textQueue == null || currentLine == textQueue.Length - 1 && LineComplete(); } - private void SetMugshot(DynValue text) { + public void SetMugshotShift(bool oldLineHasMugshot) { + if (lineHasMugshot && !oldLineHasMugshot) { + Move(117, 0); + _textMaxWidth -= 117; + } else if (!lineHasMugshot && oldLineHasMugshot) { + Move(-117, 0); + _textMaxWidth += 117; + } + } + + public void SetMugshot(DynValue text) { + if (mugshot == null || text == null) + return; + if (text.Type != DataType.String && text.Type != DataType.Table && text.Type != DataType.Nil && text.Type != DataType.Void) + throw new CYFException("Mugshots can either be nil, strings or tables of strings ending with a number, yet it's currently a " + text.Type + "."); + if (text.Type == DataType.Table) { + Table t = text.Table; + for (int i = 1; i <= t.Length; i++) { + DynValue d = t.Get(i); + if (d.Type != DataType.String && !(d.Type == DataType.Number && i == t.Length)) + throw new CYFException("Mugshots can either be nil, strings or tables of strings ending with a number, yet the current table has a " + d.Type + "."); + } + } + + mugshotTimer = 0.2f; List mugshots = new List(); - float time = -1; - finalMugshot = null; - if (text != null) { - if (text.String != "null") - if (text.Type == DataType.Table) { - int count = 0; - foreach (DynValue dv in text.Table.Values) { - count++; - if (dv.Type == DataType.Number && count >= text.Table.Length - 1 && time == -1) - time = (float)dv.Number; - else if (time != -1) - finalMugshot = "Mugshots/" + dv.String; - else - mugshots.Add("Mugshots/" + dv.String); - } - } else - mugshots.Add("Mugshots/" + text.String); - else - mugshots.Add("Mugshots/"); + if (text != null && text.String != "null") { + if (text.Type == DataType.Table) { + foreach (DynValue dv in text.Table.Values) { + if (dv.Type == DataType.String) + mugshots.Add("Mugshots/" + dv.String); + else if (dv.Type == DataType.Number) + mugshotTimer = (float)(dv.Number > 0 ? dv.Number : 0.2f); + } + } else + mugshots.Add("Mugshots/" + text.String); } else mugshots.Add("Mugshots/"); - bool mugshotSet = false; - if (mugshot != null && mugshot.isactive) { - mugshot.StopAnimation(); - if ((mugshots.Count > 1 || (mugshots[0] != "Mugshots/" && mugshots[0] != "Mugshots/null")) && text != null) { - try { - if (mugshots.Count > 1) { - time = time > 0f ? time : 0.2f; - mugshot.SetAnimation((string[])UnitaleUtil.ListToArray(mugshots), time); - if (finalMugshot == null) - finalMugshot = mugshots[mugshots.Count - 1]; - } else { - mugshot.StopAnimation(); - mugshot.Set(mugshots[0]); - } - } catch (CYFException e) { - UnitaleUtil.DisplayLuaError("mugshot system", e.Message); - } - mugshotSet = true; - mugshotTimer = time; - mugshotList = (string[])UnitaleUtil.ListToArray(mugshots); - mugshot.color = new float[] { 1, 1, 1, 1 }; - self.localPosition = new Vector3(-150, self.localPosition.y, self.localPosition.z); - } else { - mugshot.Set("empty"); - mugshotList = null; - mugshot.color = new float[] { 1, 1, 1, 0 }; - if (gameObject.name == "TextManager OW") - self.localPosition = new Vector3(-267, self.localPosition.y, self.localPosition.z); + mugshot.StopAnimation(); + bool mugshotSet = mugshots.Count > 0 && mugshots[0] != "Mugshots/" && mugshots[0] != "Mugshots/null"; + if (mugshotSet) { + mugshotList = mugshots.ToArray(); + mugshot.alpha = 1; + try { + if (mugshotList.Length > 1) + mugshot.SetAnimation(mugshotList, mugshotTimer); + else + mugshot.Set(mugshotList[0]); + } catch (CYFException e) { + UnitaleUtil.DisplayLuaError("Setting a mugshot", e.Message); } + } else { + mugshotList = null; + mugshot.alpha = 0; + mugshot.Set("empty"); } - _textMaxWidth = mugshotSet ? 417 : 534; } - protected void ShowLine(int line, bool forceNoAutoLineBreak = false) { - /*if (overworld) { - if (mugshotsPath != null) - if (mugshotsPath[line] != null || mugshotsPath[line] != "") - mugshot.sprite = SpriteRegistry.GetMugshot(mugshotsPath[line]); - else - mugshot.sprite = null; - - if (mugshot.sprite == null) { - mugshot.color = new Color(mugshot.color.r, mugshot.color.g, mugshot.color.b, 0); - self.localPosition = new Vector3(-267, self.localPosition.y, self.localPosition.z); - } else { - mugshot.color = new Color(mugshot.color.r, mugshot.color.g, mugshot.color.b, 1); - self.localPosition = new Vector3(-150, self.localPosition.y, self.localPosition.z); - } - }*/ + protected void ShowLine(int line) { if (textQueue == null) return; if (line >= textQueue.Length) return; if (textQueue[line] == null) return; - if ((UnitaleUtil.IsOverworld || GlobalControls.isInFight) && ((UIController.instance && this == UIController.instance.mainTextManager) || gameObject.name == "TextManager OW")) - SetMugshot(textQueue[line].Mugshot); + if (lateStartWaiting) return; + bool oldLineHasMugshot = lineHasMugshot; + SetMugshot(textQueue[line].Mugshot); - if (!offsetSet) - SetOffset(0, 0); - if (GetType() != typeof(LuaTextManager)) + if (!(this as LuaTextManager) || (this as LuaTextManager).needFontReset) ResetFont(); - currentColor = defaultColor; - colorSet = false; + commandColor = defaultColor; + commandColorSet = false; + commandAlphaSet = false; currentSkippable = true; - autoSkipThis = false; + skippableToNextLine = false; autoSkip = false; autoSkipAll = false; instantCommand = false; skipFromPlayer = false; firstChar = false; + lineHasMugshot = mugshotList != null; + commandVoice = null; + + SetMugshotShift(oldLineHasMugshot); timePerLetter = singleFrameTiming; letterTimer = 0.0f; DestroyChars(); currentLine = line; - currentX = self.position.x + offset.x; - currentY = self.position.y + offset.y; - // allow Game Over fonts to enjoy the fixed text positioning, too! - if (GetType() != typeof(LuaTextManager) && gameObject.name != "TextParent" && gameObject.name != "ReviveText") - currentY -= Charset.LineSpacing; - /*if (GetType() == typeof(LuaTextManager)) - print("currentY from ShowLine (" + textQueue[currentLine].Text + ") = " + self.position.y + " + " + offset.y + " - " + Charset.LineSpacing + " = " + currentY);*/ currentCharacter = 0; currentReferenceCharacter = 0; letterEffect = "none"; - /*textEffect = null; - letterIntensity = 0;*/ - // letterSpeed = 1; instantActive = textQueue[line].ShowImmediate; - SpawnText(forceNoAutoLineBreak); - //if (!overworld) - // UIController.instance.encounter.CallOnSelfOrChildren("AfterText"); + + float rot = rotation; + rotation = 0; + float xScale = 1, yScale = 1; + LuaTextManager ltm = this as LuaTextManager; + if (ltm) { + xScale = ltm.xscale; + yScale = ltm.yscale; + } + if (ltm) ltm.SpawnText(); + else SpawnText(); + rotation = rot; + if (UnitaleUtil.IsOverworld && this == PlayerOverworld.instance.textmgr) { if (textQueue[line].ActualText) { if (transform.parent.GetComponent().color.a == 0) SetTextFrameAlpha(1); - blockSkip = false; } else { if (transform.parent.GetComponent().color.a == 1) SetTextFrameAlpha(0); - blockSkip = true; - DestroyChars(); + HideTextObject(); } } @@ -387,7 +425,7 @@ protected void ShowLine(int line, bool forceNoAutoLineBreak = false) { int lines = textQueue[line].Text.Split('\n').Length; lines = lines >= 4 ? 4 : 3; Vector3 pos = gameObject.GetComponent().localPosition; - gameObject.GetComponent().localPosition = new Vector3(pos.x, 22 + ((lines - 1) * Charset.LineSpacing / 2), pos.z); + MoveTo(pos.x, 22 + ((lines - 1) * font.LineSpacing / 2)); } } @@ -406,18 +444,6 @@ [MoonSharpHidden] public void SetTextFrameAlpha(float a) { [MoonSharpHidden] public void NextLineText() { ShowLine(++currentLine); } - [MoonSharpHidden] public void SkipText() { - if (noSkip1stFrame) return; - while (currentCharacter < letterReferences.Length) { - if (letterReferences[currentCharacter] != null && Charset.Letters.ContainsKey(textQueue[currentLine].Text[currentCharacter])) { - letterReferences[currentCharacter].enabled = true; - currentReferenceCharacter++; - } - - currentCharacter++; - } - } - [MoonSharpHidden] public void DoSkipFromPlayer() { skipFromPlayer = true; @@ -427,51 +453,64 @@ [MoonSharpHidden] public void DoSkipFromPlayer() { if (!GlobalControls.retroMode) InUpdateControlCommand(DynValue.NewString("instant"), currentCharacter); else - SkipText(); + SkipLine(); } public virtual void SkipLine() { - if (noSkip1stFrame) return; - while (currentCharacter < letterReferences.Length) { - if (letterReferences[currentCharacter] != null && Charset.Letters.ContainsKey(textQueue[currentLine].Text[currentCharacter])) { - letterReferences[currentCharacter].enabled = true; - switch (letterEffect.ToLower()) { - case "twitch": letterReferences[currentCharacter].GetComponent().effect = new TwitchEffectLetter(letterReferences[currentCharacter].GetComponent(), letterIntensity); break; - case "rotate": letterReferences[currentCharacter].GetComponent().effect = new RotatingEffectLetter(letterReferences[currentCharacter].GetComponent(), letterIntensity); break; - case "shake": letterReferences[currentCharacter].GetComponent().effect = new ShakeEffectLetter(letterReferences[currentCharacter].GetComponent(), letterIntensity); break; - default: letterReferences[currentCharacter].GetComponent().effect = null; break; - } - currentReferenceCharacter++; - switch (textQueue[currentLine].Text[currentCharacter]) { - case '\t': { - float indice = currentX / 320f; - if (currentX - (indice * 320f) < 36) - indice--; - currentX = indice * 320 + 356; - break; - } - case '\n': - currentX = self.position.x + offset.x; - currentY = currentY - vSpacing - Charset.LineSpacing; - currentCharacter++; - return; - } - } - currentCharacter++; + if (lateStartWaiting) return; + foreach (LetterData d in letters) + d.image.enabled = true; + currentCharacter = textQueue[currentLine].Text.Length; + currentReferenceCharacter = letters.Count; + } + + public void SetEffect(TextEffect effect) { + if (textEffect != null) + textEffect.ResetPositions(); + textEffect = effect; + } + public void SetEffect(string effect, float intensity = -1, float step = 0) { + if (effect == null) + throw new CYFException("Text.SetEffect: The first argument (the effect name) is nil.\n\nSee the documentation for proper usage."); + if (textEffect != null) + textEffect.ResetPositions(); + switch (effect.ToLower()) { + case "none": + textEffect = null; + break; + case "twitch": + textEffect = new TwitchEffect(this, intensity != -1 ? intensity : 2, (int)step); + break; + case "shake": + textEffect = new ShakeEffect(this, intensity != -1 ? intensity : 1); + break; + case "rotate": + textEffect = new RotatingEffect(this, intensity != -1 ? intensity : 1.5f, step); + break; + + default: + throw new CYFException("The effect \"" + effect + "\" doesn't exist.\nYou can only choose between \"none\", \"twitch\", \"shake\" and \"rotate\"."); } } - public void SetEffect(TextEffect effect) { textEffect = effect; } + [MoonSharpHidden] protected void DestroyChars() { + foreach (Transform child in gameObject.transform) { + if (child.GetComponent() == null && child.GetComponent() == null) continue; + LuaSpriteController.GetOrCreate(child.gameObject).Remove(); + } + letters.Clear(); + letterAdjustShifts.Clear(); + } - [MoonSharpHidden] public void DestroyChars() { - foreach (Transform child in gameObject.transform) - Destroy(child.gameObject); + [MoonSharpHidden] public void HideTextObject() { + DestroyChars(); + hidden = true; } private void SpawnTextSpaceTest(int i, string currentText, out string currentText2) { currentText2 = currentText; bool decorated = textQueue[currentLine].Decorated; - float decorationLength = decorated ? UnitaleUtil.CalcTextWidth(this, 0, 1, true, true) : 0; + float decorationLength = decorated ? UnitaleUtil.PredictTextWidth(this, 0, 1, true) : 0; // Gets the first character of the line and the last character after the current space int finalIndex = i + 1, beginIndex = i; @@ -486,13 +525,13 @@ private void SpawnTextSpaceTest(int i, string currentText, out string currentTex if (currentText[beginIndex] == '\n' || currentText[beginIndex] == '\r') beginIndex++; if (currentText[finalIndex] == '\n' || currentText[finalIndex] == ' ' || currentText[finalIndex] == '\r') finalIndex--; - if (UnitaleUtil.CalcTextWidth(this, beginIndex, finalIndex, true) > _textMaxWidth && _textMaxWidth > 0) { + if (_textMaxWidth > 0 && UnitaleUtil.PredictTextWidth(this, beginIndex, finalIndex, true) > _textMaxWidth) { // If the line's too long, do something! int wordBeginIndex = currentText2[i] == ' ' ? i + 1 : i; - if (UnitaleUtil.CalcTextWidth(this, wordBeginIndex, finalIndex) > _textMaxWidth - decorationLength) { + if (UnitaleUtil.PredictTextWidth(this, wordBeginIndex, finalIndex) > _textMaxWidth - decorationLength) { // Word is taking the entire line for (int currentIndex = wordBeginIndex; currentIndex <= finalIndex; currentIndex++) { - if (!(UnitaleUtil.CalcTextWidth(this, beginIndex, currentIndex) > _textMaxWidth)) continue; + if (!(UnitaleUtil.PredictTextWidth(this, beginIndex, currentIndex) > _textMaxWidth)) continue; currentText2 = currentText2.Substring(0, currentIndex) + "\n" + (decorated ? " " : "") + currentText2.Substring(currentIndex, currentText2.Length - currentIndex); textQueue[currentLine].Text = currentText2; finalIndex += decorated ? 3 : 1; @@ -501,81 +540,78 @@ private void SpawnTextSpaceTest(int i, string currentText, out string currentTex } else // Line is too long currentText2 = currentText2.Substring(0, wordBeginIndex - 1) + "\n" + (decorated ? " " : "") + currentText2.Substring(wordBeginIndex, currentText.Length - wordBeginIndex); - - Array.Resize(ref letterReferences, currentText2.Length); - Array.Resize(ref letterPositions, currentText2.Length); } textQueue[currentLine].Text = currentText2; } - private void CreateLetter(string currentText, int index, bool insert = false) { - if (insert) - for (int i = letterReferences.Length - 2; i >= index; i--) { - letterPositions[i + 1] = letterPositions[i]; - letterReferences[i + 1] = letterReferences[i]; - } - + private int CreateLetter(string currentText, int index) { GameObject singleLtr = Instantiate(SpriteFontRegistry.LETTER_OBJECT); RectTransform ltrRect = singleLtr.GetComponent(); - bool isLua = GetType() == typeof(LuaTextManager); - LuaTextManager luaThis = isLua ? ((LuaTextManager) this) : null; + LuaTextManager luaThis = this as LuaTextManager; + bool isLua = luaThis != null; - ltrRect.localScale = new Vector3((isLua ? luaThis.xscale : 1f) + 0.001f, (isLua ? luaThis.yscale : 1f) + 0.001f, ltrRect.localScale.z); + ltrRect.localScale = new Vector3(isLua ? luaThis.xscale : 1f, isLua ? luaThis.yscale : 1f, ltrRect.localScale.z); Image ltrImg = singleLtr.GetComponent(); ltrRect.SetParent(gameObject.transform); - ltrImg.sprite = Charset.Letters[currentText[index]]; - - letterReferences[index] = ltrImg; + ltrImg.sprite = font.Letters[currentText[index]]; - MoveLetter(currentText, index, ltrRect); + letters.Add(new LetterData(index, ltrImg, font.Letters[currentText[index]], new Vector2(), commandColorSet, commandAlphaSet)); + letterAdjustShifts.Add(new Vector2()); ltrImg.SetNativeSize(); + + Color resultColor = commandColor; if (isLua) { - Color luaColor = luaThis._color; - if (!colorSet) { - if (!luaThis.hasAlphaBeenSet && !luaThis.hasColorBeenSet) ltrImg.color = currentColor; - else if (!luaThis.hasColorBeenSet) ltrImg.color = new Color(currentColor.r, currentColor.g, currentColor.b, luaColor.a ); - else if (!luaThis.hasAlphaBeenSet) ltrImg.color = new Color(luaColor.r, luaColor.g, luaColor.b, currentColor.a); - else ltrImg.color = luaColor; - } else ltrImg.color = currentColor; - } else ltrImg.color = currentColor; - ltrImg.GetComponent().colorFromText = currentColor; + if (!commandColorSet && luaThis.textColorSet) { + resultColor.r = luaThis._color.r; + resultColor.g = luaThis._color.g; + resultColor.b = luaThis._color.b; + } + if (!commandAlphaSet && luaThis.textAlphaSet) + resultColor.a = commandColor.a; + } + ltrImg.color = resultColor; ltrImg.enabled = textQueue[currentLine].ShowImmediate || (GlobalControls.retroMode && instantActive); + + return letters.Count - 1; } - private void MoveLetter(string currentText, int index, RectTransform ltrRect) { - if (GetType() == typeof(LuaTextManager) || gameObject.name == "TextParent" || gameObject.name == "ReviveText") { + private void MoveLetter(string currentText, int letterIndex) { + LetterData letter = letters[letterIndex]; + RectTransform rt = letter.image.GetComponent(); + + float letterShift = letter.sprite.border.w - letter.sprite.border.y; + + if (GetType() == typeof(LuaTextManager) || gameObject.name == "TextParent" || gameObject.name == "ReviveText") // Allow Game Over fonts to enjoy the fixed text positioning, too! - float diff = (Charset.Letters[currentText[index]].border.w - Charset.Letters[currentText[index]].border.y); - ltrRect.localPosition = new Vector3(currentX - self.position.x - .9f, (currentY - self.position.y) + diff + .1f, 0); - } else + rt.localPosition = new Vector3(currentX, currentY + letterShift, 0); + else // Keep what we already have for all text boxes that are not Text Objects in an encounter - ltrRect.position = new Vector3(currentX + .1f, (currentY + Charset.Letters[currentText[index]].border.w - Charset.Letters[currentText[index]].border.y + 2) + .1f, 0); + rt.localPosition = new Vector3(currentX, currentY + (letterShift + 2), 0); - letterPositions[index] = ltrRect.anchoredPosition; + rt.eulerAngles = new Vector3(0, 0, rotation); + letters[letterIndex] = new LetterData(letter.index, letter.image, letter.sprite, rt.anchoredPosition, letters[letterIndex].commandColorSet, letters[letterIndex].commandAlphaSet); } - private void SpawnText(bool forceNoAutoLineBreak = false) { - noSkip1stFrame = true; + protected virtual void SpawnText() { string currentText = textQueue[currentLine].Text; - letterReferences = new Image[currentText.Length]; - letterPositions = new Vector2[currentText.Length]; - if (currentText.Length > 1 && !forceNoAutoLineBreak) - if (!GlobalControls.isInFight || EnemyEncounter.script.GetVar("autolinebreak").Boolean || GetType() == typeof(LuaTextManager)) - SpawnTextSpaceTest(0, currentText, out currentText); + letters.Clear(); + letterAdjustShifts.Clear(); + if (currentText.Length > 1 && GetAutoLineBreak()) + SpawnTextSpaceTest(0, currentText, out currentText); // Work-around for [instant] and [instant:allowcommand] at the beginning of a line of text bool skipImmediate = false; - string skipCommand = ""; + string skipCommand = ""; for (int i = 0; i < currentText.Length; i++) { switch (currentText[i]) { case '[': int currentChar = i; string command = UnitaleUtil.ParseCommandInline(currentText, ref i); - if (command == null || lateStartWaiting) + if (command == null) i = currentChar; else { // Work-around for [noskip], [instant] and [instant:allowcommand] @@ -619,17 +655,10 @@ private void SpawnText(bool forceNoAutoLineBreak = false) { continue; } break; - case '\n': - currentX = self.position.x + offset.x; - currentY = currentY - vSpacing - Charset.LineSpacing; - break; - case '\t': - currentX = !GlobalControls.isInFight ? (356 + Misc.cameraX) : 356; // HACK: bad tab usage - break; case ' ': - if (i + 1 == currentText.Length || currentText[i + 1] == ' ' || forceNoAutoLineBreak) + if (i + 1 == currentText.Length || currentText[i + 1] == ' ') break; - if (!GlobalControls.isInFight || EnemyEncounter.script.GetVar("autolinebreak").Boolean || GetType() == typeof(LuaTextManager)) { + if (GetAutoLineBreak()) { SpawnTextSpaceTest(i, currentText, out currentText); if (currentText[i] != ' ') { i--; @@ -639,21 +668,106 @@ private void SpawnText(bool forceNoAutoLineBreak = false) { break; } - if (!Charset.Letters.ContainsKey(currentText[i])) + if (!font.Letters.ContainsKey(currentText[i])) continue; CreateLetter(currentText, i); - currentX += letterReferences[i].gameObject.GetComponent().rect.width + hSpacing; // TODO remove hardcoded letter offset } + LuaTextManager ltm = this as LuaTextManager; + if (ltm && ltm.adjustTextDisplay) + ltm.Scale(ltm.xscale, ltm.yscale); + MoveLetters(); // Work-around for [instant] and [instant:allowcommand] at the beginning of a line of text if (skipImmediate) InUpdateControlCommand(DynValue.NewString(skipCommand)); + } + + private float[] ComputeTextSpacings() { + LuaTextManager ltm = this as LuaTextManager; + float normalizedHSpacing = hSpacing; + float normalizedVSpacing = vSpacing + font.LineSpacing; + if (ltm && ltm.adjustTextDisplay) { + float spaceHeight = font.Letters[' '].rect.height; + + // Normalize shifts so they're integers + bool isNormalizedHSpacingPositive = normalizedHSpacing >= 0.001f; + normalizedHSpacing = Mathf.Round((normalizedHSpacing - 0.001f) * ltm.xscale); + if (isNormalizedHSpacingPositive) + normalizedHSpacing = Mathf.Max(1, normalizedHSpacing); + normalizedHSpacing /= ltm.xscale; + + float relativeVSpacing = normalizedVSpacing - spaceHeight; + bool isRelativeVSpacingPositive = relativeVSpacing >= 0.001f; + relativeVSpacing = Mathf.Round((relativeVSpacing - 0.001f) * ltm.yscale); + if (isRelativeVSpacingPositive) + relativeVSpacing = Mathf.Max(1, relativeVSpacing); + relativeVSpacing /= ltm.yscale; + normalizedVSpacing = relativeVSpacing + spaceHeight; + } + + return new float[] { normalizedHSpacing, normalizedVSpacing }; + } + + public void MoveLetters() { + ResetFont(); + + float baseHSpacing = hSpacing; + float baseVSpacing = vSpacing; + + currentX = 0.01f; + currentY = 0.01f; + + // allow Game Over fonts to enjoy the fixed text positioning, too! + LuaTextManager ltm = this as LuaTextManager; + if (!ltm && gameObject.name != "TextParent" && gameObject.name != "ReviveText") + currentY -= font.LineSpacing; + + startingLineX = currentX; + startingLineY = currentY; + + float[] spacings = ComputeTextSpacings(); + float normalizedHSpacing = spacings[0]; + float normalizedVSpacing = spacings[1]; + + string currentText = textQueue[currentLine].Text; + int tabCount = 0; + for (int i = 0; i < currentText.Length; i++) { + int currentChar = i; + switch (currentText[i]) { + case '[': + string command = UnitaleUtil.ParseCommandInline(currentText, ref i); + if (command == null || !movementCommands.Contains(command.Split(':')[0])) + i = currentChar; + else { + PreCreateControlCommand(command, true); + spacings = ComputeTextSpacings(); + normalizedHSpacing = spacings[0]; + normalizedVSpacing = spacings[1]; + } + break; + case '\n': + currentX = startingLineX + normalizedVSpacing * Mathf.Sin(rotation * Mathf.Deg2Rad); + currentY = startingLineY - normalizedVSpacing * Mathf.Cos(rotation * Mathf.Deg2Rad); + startingLineX = currentX; + startingLineY = currentY; + tabCount = 0; + break; + case '\t': + currentX = ++tabCount * columnShift; + break; + } + if (currentChar == i && letters.Exists(l => l.index == i)) { + LetterData letter = letters.Find(l => l.index == i); + MoveLetter(currentText, letters.IndexOf(letter)); + RectTransform rt = letter.image.GetComponent(); + currentX += (rt.rect.width * rt.localScale.x + normalizedHSpacing) * Mathf.Cos(rotation * Mathf.Deg2Rad); + currentY += (rt.rect.width * rt.localScale.x + normalizedHSpacing) * Mathf.Sin(rotation * Mathf.Deg2Rad); + } + } - if (mugshot != null && mugshot.alpha == 0) - mugshot.color = new float[] { 1, 1, 1 }; - if (!instantActive) - Update(); + hSpacing = baseHSpacing; + vSpacing = baseVSpacing; } private bool CheckCommand() { @@ -666,18 +780,9 @@ private bool CheckCommand() { if (command != null) { currentCharacter++; // we're not in a continuable loop so move to the character after the ] manually - //float lastLetterTimer = letterTimer; // kind of a dirty hack so we can at least release 0.2.0 sigh - //float lastTimePerLetter = timePerLetter; // i am so sorry - - wasStated = false; - DynValue commandDV = DynValue.NewString(command); InUpdateControlCommand(commandDV, currentCharacter); - //if (lastLetterTimer != letterTimer || lastTimePerLetter != timePerLetter) - //if (currentCharacter >= textQueue[currentLine].Text.Length) - // return true; - return true; } currentCharacter = currentChar; @@ -685,77 +790,50 @@ private bool CheckCommand() { } protected virtual void Update() { - if (!UnitaleUtil.IsOverworld && nextMonsterDialogueOnce) { - bool test = true; - foreach (TextManager mgr in UIController.instance.monsterDialogues) { - if (!mgr.IsFinished()) - test = false; - } - if (test) { - nextMonsterDialogueOnce = false; - if (!wasStated) - UIController.instance.DoNextMonsterDialogue(true); - wasStated = false; - } - } else if (mugshot != null && mugshotList != null) - if (UnitaleUtil.IsOverworld&& mugshot.alpha != 0 && mugshotList.Length > 1) { + if (mugshotList != null) + if (UnitaleUtil.IsOverworld && mugshot.alpha != 0 && mugshotList.Length > 1) { if (!mugshot.animcomplete && (letterTimer < 0 || LineComplete())) { mugshot.StopAnimation(); - mugshot.Set(finalMugshot); + mugshot.Set(mugshotList.Last()); } else if (mugshot.animcomplete && !(letterTimer < 0 || LineComplete())) mugshot.SetAnimation(mugshotList, mugshotTimer); } - if (textQueue == null || textQueue.Length == 0 || paused || lateStartWaiting) - return; - /*if (currentLine >= lineCount() && overworld) { - endTextEvent(); + if (!isactive || textQueue[currentLine] == null || paused || lateStartWaiting) return; - }*/ if (textEffect != null) textEffect.UpdateEffects(); - if (GlobalControls.retroMode && instantActive || currentCharacter >= letterReferences.Length) + if (GlobalControls.retroMode && instantActive || currentCharacter >= textQueue[currentLine].Text.Length) return; if (waitingChar != KeyCode.None) { - if (Input.GetKeyDown(waitingChar)) - waitingChar = KeyCode.None; - else - return; + if (Input.GetKeyDown(waitingChar)) waitingChar = KeyCode.None; + else return; } - - /* - letterTimer += Time.deltaTime; - if ((letterTimer > timePerLetter || firstChar) && !LineComplete()) { - firstChar = false; - letterTimer = 0.0f; - bool soundPlayed = false; - int lastLetter = -1; - if (HandleShowLettersOnce(ref soundPlayed, ref lastLetter)) - return; - else - for (int i = 0; (instantCommand || i < letterSpeed) && currentCharacter < letterReferences.Length; i++) - if (!HandleShowLetter(ref soundPlayed, ref lastLetter)) { - HandleShowLettersOnce(ref soundPlayed, ref lastLetter); - return; - } + if (waitingKeybind != null) { + if (KeyboardInput.StateFor(waitingKeybind) == ButtonState.PRESSED) waitingKeybind = null; + else return; } - */ letterTimer += Time.deltaTime; if ((letterTimer >= timePerLetter || firstChar) && !LineComplete()) { int repeats = timePerLetter == 0f ? 1 : (int)Mathf.Floor(letterTimer / timePerLetter); - bool soundPlayed = false; + bool soundPlayed = firstChar && lettersToDisplay > 1; int lastLetter = -1; for (int i = 0; i < repeats; i++) { - if (!HandleShowLetter(ref soundPlayed, ref lastLetter)) { + if (lettersToDisplayOnce > 0) HandleShowLettersOnce(ref soundPlayed, ref lastLetter); - return; - } + else + for (int j = 0; j < lettersToDisplay; j++) + if (!HandleShowLetter(ref soundPlayed, ref lastLetter)) + break; + + if (letterTimer < timePerLetter) + break; if (!firstChar) letterTimer -= timePerLetter; @@ -765,49 +843,63 @@ protected virtual void Update() { } } } - - noSkip1stFrame = false; } private void HandleShowLettersOnce(ref bool soundPlayed, ref int lastLetter) { - while (letterOnceValue != 0 && !instantCommand) { - if (!HandleShowLetter(ref soundPlayed, ref lastLetter)) return; - letterOnceValue--; + while (lettersToDisplayOnce != 0 && !instantCommand) { + if (!HandleShowLetter(ref soundPlayed, ref lastLetter, true)) return; + lettersToDisplayOnce--; } } - private bool HandleShowLetter(ref bool soundPlayed, ref int lastLetter) { - if (lastLetter != currentCharacter && ((!GlobalControls.retroMode && (!instantActive || instantCommand)) || GlobalControls.retroMode)) { + private bool HandleShowLetter(ref bool soundPlayed, ref int lastLetter, bool fromOnce = false) { + if (lastLetter != currentCharacter) { float oldLetterTimer = letterTimer; - int oldLetterOnceValue = letterOnceValue; + int oldLettersToDisplay = lettersToDisplay; + int oldLettersToDisplayOnce = lettersToDisplayOnce; lastLetter = currentCharacter; - while (CheckCommand()) - if ((GlobalControls.retroMode && instantActive) || letterTimer != oldLetterTimer || waitingChar != KeyCode.None || letterOnceValue != oldLetterOnceValue || paused) + while (CheckCommand()) { + if ((fromOnce && lettersToDisplayOnce != oldLettersToDisplayOnce) || (!fromOnce && lettersToDisplay != oldLettersToDisplay)) return false; - if (currentCharacter >= letterReferences.Length) + if ((GlobalControls.retroMode && instantActive) || letterTimer != oldLetterTimer || waitingChar != KeyCode.None || paused) + return false; + } + if (currentCharacter >= textQueue[currentLine].Text.Length) return false; } - if (letterReferences[currentCharacter] != null) { - letterReferences[currentCharacter].enabled = true; + + if (letters.Exists(l => l.index == currentCharacter)) { + Image im = letters.Find(l => l.index == currentCharacter).image; + if (im == null) return false; + im.enabled = true; + letterEffectStepCount += letterEffectStep; + if (im.GetComponent().effect != null) + im.GetComponent().effect.ResetPositions(); switch (letterEffect.ToLower()) { - case "twitch": letterReferences[currentCharacter].GetComponent().effect = new TwitchEffectLetter(letterReferences[currentCharacter].GetComponent(), letterIntensity); break; - case "rotate": letterReferences[currentCharacter].GetComponent().effect = new RotatingEffectLetter(letterReferences[currentCharacter].GetComponent(), letterIntensity); break; - case "shake": letterReferences[currentCharacter].GetComponent().effect = new ShakeEffectLetter(letterReferences[currentCharacter].GetComponent(), letterIntensity); break; - default: letterReferences[currentCharacter].GetComponent().effect = null; break; + case "twitch": im.GetComponent().effect = new TwitchEffectLetter(im.GetComponent(), letterIntensity, (int)letterEffectStep); break; + case "rotate": im.GetComponent().effect = new RotatingEffectLetter(im.GetComponent(), letterIntensity, letterEffectStepCount); break; + case "shake": im.GetComponent().effect = new ShakeEffectLetter(im.GetComponent(), letterIntensity); break; + default: im.GetComponent().effect = null; break; } - if (!string.IsNullOrEmpty(letterSound) && !muted && !soundPlayed && (GlobalControls.retroMode || textQueue[currentLine].Text[currentCharacter] != ' ')) { - soundPlayed = true; - UnitaleUtil.PlayVoice("BubbleSound", letterSound); - } + currentReferenceCharacter++; + } + + if (!string.IsNullOrEmpty(GetVoice()) && !muted && !soundPlayed && (GlobalControls.retroMode || (currentCharacter < textQueue[currentLine].Text.Length && textQueue[currentLine].Text[currentCharacter] != ' '))) { + soundPlayed = true; + try { UnitaleUtil.PlayVoice("BubbleSound", GetVoice()); } + catch (CYFException e) { UnitaleUtil.DisplayLuaError("Playing a voice", e.Message); } } - currentReferenceCharacter++; + currentCharacter++; return true; } - private void PreCreateControlCommand(string command) { + private void PreCreateControlCommand(string command, bool movementCommand = false) { string[] cmds = UnitaleUtil.SpecialSplit(':', command); + // Only allow letter movement commands on the letter movement pass + if (movementCommand && !movementCommands.Contains(cmds[0])) + return; string[] args = new string[0]; if (cmds.Length == 2) { args = UnitaleUtil.SpecialSplit(',', cmds[1], true); @@ -816,20 +908,21 @@ private void PreCreateControlCommand(string command) { // TODO: Restore errors for 0.7 switch (cmds[0].ToLower()) { case "color": - float oldAlpha = currentColor.a; - colorSet = args.Length == 1; - try { currentColor = colorSet ? ParseUtil.GetColor(cmds[1]) : defaultColor; } + float oldAlpha = commandColor.a; + commandColorSet = args.Length >= 1; + try { commandColor = commandColorSet ? ParseUtil.GetColor(cmds[1]) : defaultColor; } catch { Debug.LogError("[color:x] usage - You used the value \"" + cmds[1] + "\" to set the text's color but it's not a valid hexadecimal color value."); } - currentColor.a = oldAlpha; + commandColor.a = oldAlpha; break; case "alpha": - try { currentColor.a = args.Length == 1 ? ParseUtil.GetByte(cmds[1]) / 255 : defaultColor.a; } + commandAlphaSet = args.Length >= 1; + try { commandColor.a = commandAlphaSet ? ParseUtil.GetByte(cmds[1]) / 255 : defaultColor.a; } catch { Debug.LogError("[alpha:x] usage - You used the value \"" + cmds[1] + "\" to set the text's alpha but it's not a valid hexadecimal value."); } break; case "charspacing": try { - if (cmds.Length > 1 && cmds[1].ToLower() == "default") SetHorizontalSpacing(Charset.CharSpacing); + if (cmds.Length > 1 && cmds[1].ToLower() == "default") SetHorizontalSpacing(font.CharSpacing); else SetHorizontalSpacing(ParseUtil.GetFloat(cmds[1])); } catch (CYFException) { Debug.LogError("[charspacing:x] usage - You used the value \"" + cmds[1] + "\" to set the text's horizontal spacing but it's not a valid number value."); @@ -849,7 +942,8 @@ private void PreCreateControlCommand(string command) { Color starColor = ParseUtil.GetColor(cmds[1]); int indexOfStar = textQueue[currentLine].Text.IndexOf('*'); // HACK oh my god lol if (indexOfStar > -1) - letterReferences[indexOfStar].color = starColor; + if (letters.Exists(l => l.index == indexOfStar)) + letters.Find(l => l.index == indexOfStar).image.color = starColor; } catch (CYFException) { Debug.LogError("[starcolor:x] usage - You used the value \"" + cmds[1] + "\" to set the color of the text's star, but it's not a valid hexadecimal color value."); } @@ -868,20 +962,29 @@ private void PreCreateControlCommand(string command) { case "font": UnderFont uf = SpriteFontRegistry.Get(cmds[1]); - if (uf == null) - Debug.LogError("[font:x] usage - The font \"" + cmds[1] + "\" doesn't exist.\nYou should check if you made a typo, or if the font really is in your mod."); - SetFont(uf); + if (uf == null) { + UnitaleUtil.DisplayLuaError("", "[font:x] usage - The font \"" + cmds[1] + "\" doesn't exist.\nYou should check if you made a typo, or if the font really is in your mod.", true); + break; + } + SetFont(uf, true); if (GetType() == typeof(LuaTextManager) && ((LuaTextManager)this).bubble) ((LuaTextManager) this).UpdateBubble(); break; case "effect": - switch (cmds[1].ToUpper()) { - case "NONE": textEffect = null; break; - case "TWITCH": textEffect = new TwitchEffect(this, args.Length > 1 ? ParseUtil.GetFloat(args[1]) : 2); break; - case "SHAKE": textEffect = new ShakeEffect(this, args.Length > 1 ? ParseUtil.GetFloat(args[1]) : 1); break; - case "ROTATE": textEffect = new RotatingEffect(this, args.Length > 1 ? ParseUtil.GetFloat(args[1]) : 1.5f); break; - } + float step = args.Length > 2 ? ParseUtil.GetFloat(args[2]) : 0; + SetEffect(cmds[1].ToLower(), args.Length > 1 ? ParseUtil.GetFloat(args[1]) : -1, step); + break; + + case "mugshot": + DynValue temp = DynValue.NewNil(); + if (args.Length > 0) + temp = args[0][0] == '{' ? UnitaleUtil.RebuildTableFromString(args[0]) : DynValue.NewString(args[0]); + + bool oldLineHasMugshot = lineHasMugshot; + if (temp.Type != DataType.Nil && temp.Type != DataType.Void && !(temp.Type == DataType.String && (temp.String == "null" || temp.String == ""))) + lineHasMugshot = true; + SetMugshotShift(oldLineHasMugshot); break; } } @@ -889,16 +992,15 @@ private void PreCreateControlCommand(string command) { private void InUpdateControlCommand(DynValue command, int index = 0) { string[] cmds = UnitaleUtil.SpecialSplit(':', command.String); string[] args = new string[0]; - if (cmds.Length >= 2) { - if (cmds.Length == 3) { - if (cmds[2] == "skipover" && instantCommand) return; - if (cmds[2] == "skiponly" && !instantCommand) return; - } else if (cmds[1] == "skipover" && instantCommand) return; - else if (cmds[1] == "skiponly" && !instantCommand) return; + if (cmds.Length > 1) { args = UnitaleUtil.SpecialSplit(',', cmds[1], true); cmds[1] = args[0]; } - //print("Frame " + GlobalControls.frame + ": Command " + cmds[0].ToLower() + " found for " + gameObject.name); + + string tag = cmds[cmds.Length - 1]; + if (tag == "skipover" && instantActive) return; + if (tag == "skiponly" && !instantActive) return; + // TODO: Restore errors for 0.7 switch (cmds[0].ToLower()) { case "noskip": @@ -907,8 +1009,14 @@ private void InUpdateControlCommand(DynValue command, int index = 0) { break; case "waitfor": - try { waitingChar = (KeyCode)Enum.Parse(typeof(KeyCode), cmds[1]); } - catch { Debug.LogError("[waitfor:x] usage - The key \"" + cmds[1] + "\" isn't a valid key."); } + try { + if (KeyboardInput.KeybindExists(cmds[1])) { + waitingKeybind = cmds[1]; + return; + } + waitingChar = (KeyCode)Enum.Parse(typeof(KeyCode), cmds[1]); + } + catch { Debug.LogError("[waitfor:x] usage - The key \"" + cmds[1] + "\" is neither a valid key or a known keybind."); } break; case "w": @@ -921,11 +1029,10 @@ private void InUpdateControlCommand(DynValue command, int index = 0) { catch { Debug.LogError("[waitall:x] usage - You used the value \"" + cmds[1] + "\" to set the text's waiting time between letters, but it's not a valid integer value."); } break; - case "novoice": letterSound = null; break; - case "next": autoSkipAll = true; break; - case "finished": autoSkipThis = true; break; - case "nextthisnow": autoSkip = true; break; - case "noskipatall": blockSkip = true; break; + case "novoice": commandVoice = "none"; break; + case "next": autoSkipAll = true; break; + case "finished": skippableToNextLine = true; break; + case "nextthisnow": autoSkip = true; break; case "speed": try { //you can only set text speed to a number >= 0 @@ -941,18 +1048,26 @@ private void InUpdateControlCommand(DynValue command, int index = 0) { break; case "letters": - try { letterOnceValue = ParseUtil.GetInt(args[0]); } - catch { Debug.LogError("[letters:x] usage - You used the value \"" + args[0] + "\" to display a given amount of letters instantly, but it's not a valid integer value."); } + try { + lettersToDisplayOnce = ParseUtil.GetInt(args[0]); + firstChar = true; + Update(); + } catch { Debug.LogError("[letters:x] usage - You used the value \"" + args[0] + "\" to display a given amount of letters instantly, but it's not a valid integer value."); } + break; + + case "lettersperframe": + try { lettersToDisplay = ParseUtil.GetInt(args[0]); } + catch { Debug.LogError("[lettersperframe:x] usage - You used the value \"" + args[0] + "\" to display a given amount of letters every frame, but it's not a valid integer value."); } break; case "voice": if (cmds[1].ToLower() != "default") { try { AudioClipRegistry.GetVoice(cmds[1].ToLower()); - letterSound = cmds[1].ToLower(); + commandVoice = cmds[1].ToLower(); } catch (InterpreterException) { UnitaleUtil.Warn("The voice file " + cmds[1].ToLower() + " doesn't exist. Note that all sound files use lowercase letters only.", false); } } else - letterSound = SpriteFontRegistry.UI_DEFAULT_NAME; + commandVoice = null; break; case "instant": @@ -986,17 +1101,15 @@ private void InUpdateControlCommand(DynValue command, int index = 0) { // Third: Show all letters (and execute all commands, if applicable) between `index` and `pos` bool soundPlayed = true; int lastLetter = -1; - int destination = System.Math.Min(pos, letterReferences.Length); + int destination = System.Math.Min(pos, textQueue[currentLine].Text.Length); while (currentCharacter < destination) HandleShowLetter(ref soundPlayed, ref lastLetter); // This is a catch-all. // If a line of text starts with [instant], the above code will not display the letters it passes over, // due to how HandleShowLetter is coded. - for (int i = index; i < pos; i++) { - if (letterReferences[i] != null) - letterReferences[i].enabled = true; - } + foreach (LetterData letter in letters.Where(l => l.index >= index && l.index < pos)) + letter.image.enabled = true; // Fourth: Update variables if (pos < currentText.Length) { @@ -1006,9 +1119,6 @@ private void InUpdateControlCommand(DynValue command, int index = 0) { } skipFromPlayer = false; - - currentCharacter = pos; - currentReferenceCharacter = pos; break; case "func": @@ -1030,18 +1140,17 @@ private void InUpdateControlCommand(DynValue command, int index = 0) { DynValue[] argsbis = new DynValue[args.Length - 1]; for (int i = 1; i < args.Length; i++) argsbis[i - 1] = ComputeArgument(args[i]); - if (caller != null) caller.Call(args[0], argsbis, true); //ADD TRY - //caller.Call(args[0], DynValue.NewString(args[1])); - } else if (caller != null) caller.Call(cmds[1], null, true); - - if (cmds[1] == "State") - wasStated = true; + if (caller != null) + caller.Call(args[0], argsbis, true); + } else if (caller != null) + caller.Call(cmds[1], null, true); } catch (InterpreterException ex) { UnitaleUtil.DisplayLuaError(caller.scriptname, UnitaleUtil.FormatErrorSource(ex.DecoratedMessage, ex.Message) + ex.Message); } break; case "mugshot": - DynValue temp; - temp = args[0][0] == '{' ? UnitaleUtil.RebuildTableFromString(args[0]) : DynValue.NewString(args[0]); + DynValue temp = DynValue.NewNil(); + if (args.Length > 0) + temp = args[0][0] == '{' ? UnitaleUtil.RebuildTableFromString(args[0]) : DynValue.NewString(args[0]); SetMugshot(temp); break; @@ -1109,9 +1218,22 @@ private void InUpdateControlCommand(DynValue command, int index = 0) { case "lettereffect": letterEffect = args[0]; - if (args.Length == 2) + + if (args.Length > 1) { try { letterIntensity = ParseUtil.GetFloat(args[1]); } catch { Debug.LogError("[lettereffect:x] usage - You used the value \"" + args[1] + "\" to set the letter effect's intensity, but it's not a valid number value."); } + } else + letterIntensity = 0; + + if (args.Length > 2) { + try { + letterEffectStep = ParseUtil.GetFloat(args[2]); + letterEffectStepCount = 0; + } catch { Debug.LogError("[lettereffect:x] usage - You used the value \"" + args[2] + "\" to set the letter effect's step, but it's not a valid number value."); } + } else { + letterEffectStep = 0; + letterEffectStepCount = 0; + } break; } } @@ -1156,7 +1278,7 @@ private void SetHP(float newhp) { // gameObject.transform.SetParent(null); // GameObject.DontDestroyOnLoad(this.gameObject); RectTransform rt = gameObject.GetComponent(); - rt.position = new Vector3(rt.position.x, rt.position.y, -1000); + MoveToAbs(rt.position.x, rt.position.y); gob.StartDeath(); return; } @@ -1173,6 +1295,18 @@ private void SetHP(float newhp) { UIStats.instance.setHP(HP); } + public virtual void Move(float newX, float newY) { + MoveToAbs(transform.position.x + newX, transform.position.y + newY); + } + + public virtual void MoveTo(float newX, float newY) { + MoveToAbs(transform.parent.position.x + newX, transform.parent.position.y + newY); + } + + public virtual void MoveToAbs(float newX, float newY, bool resetAdjustShift = false) { + transform.position = new Vector3(Mathf.Round(newX), Mathf.Round(newY), transform.position.z); + } + private float CreateNumber(string str) { float number = 0, dot = -1; int index = 0; @@ -1199,4 +1333,8 @@ private float CreateNumber(string str) { return -number; return number; } + + public virtual bool isactive { + get { return !hidden; } + } } \ No newline at end of file diff --git a/Assets/Scripts/Text/TextMessage.cs b/Assets/Scripts/Text/TextMessage.cs index e89e08ec3..d5fbf8846 100644 --- a/Assets/Scripts/Text/TextMessage.cs +++ b/Assets/Scripts/Text/TextMessage.cs @@ -2,33 +2,33 @@ public class TextMessage { public TextMessage(string text, bool decorated, bool showImmediate, bool actualText = true, DynValue mugshot = null) { - Setup(text, decorated, showImmediate, actualText, mugshot); + Setup(text, decorated, showImmediate, actualText, false, mugshot); } public TextMessage(string text, bool decorated, bool showImmediate, DynValue mugshot, bool actualText = true) { - Setup(text, decorated, showImmediate, actualText, mugshot); + Setup(text, decorated, showImmediate, actualText, false, mugshot); } public string Text { get; set; } public bool Decorated { get; private set; } public bool ShowImmediate { get; private set; } public bool ActualText { get; private set; } + public bool ForceNoAutoLineBreak { get; private set; } public DynValue Mugshot { get; private set; } public void AddToText(string textToAdd) { Text += textToAdd; } - protected void Setup(string text, bool decorated, bool showImmediate, bool actualText, DynValue mugshot) { + protected void Setup(string text, bool decorated, bool showImmediate, bool actualText = true, bool forceNoAutoLineBreak = false, DynValue mugshot = null) { text = Unescape(text); // compensate for unity inspector autoescaping control characters text = text.Replace("[name]", PlayerCharacter.instance.Name); Text = decorated ? DecorateText(text) : text; Decorated = decorated; ShowImmediate = showImmediate; ActualText = actualText; + ForceNoAutoLineBreak = forceNoAutoLineBreak; Mugshot = mugshot; } - protected void Setup(string text, bool formatted, bool showImmediate) { Setup(text, formatted, showImmediate, true, null); } - public void SetText(string text) { Text = text; } private static string DecorateText(string text) { diff --git a/Assets/Scripts/Util/CYFTimer.cs b/Assets/Scripts/Util/CYFTimer.cs new file mode 100644 index 000000000..e4d15c6bc --- /dev/null +++ b/Assets/Scripts/Util/CYFTimer.cs @@ -0,0 +1,35 @@ +using System; +using UnityEngine; + +public class CYFTimer { + private readonly float triggerTime = 0; + private float startTime = 0; + private bool elapsing = false; + private readonly Action func; + + public CYFTimer(float triggerTime, Action func) { + this.triggerTime = triggerTime; + this.func = func; + } + + public void Start() { + startTime = Time.time; + elapsing = true; + } + + public void Stop() { + elapsing = false; + } + + public bool IsElapsing() { + return elapsing; + } + + public void Update() { + if (elapsing) + if (Time.time - startTime > triggerTime) { + func(); + Stop(); + } + } +} diff --git a/Assets/Scripts/Util/CYFTimer.cs.meta b/Assets/Scripts/Util/CYFTimer.cs.meta new file mode 100644 index 000000000..ab889b7c4 --- /dev/null +++ b/Assets/Scripts/Util/CYFTimer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3593f4eeb5bc00549b8026116a051023 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Util/ControlPanel.cs b/Assets/Scripts/Util/ControlPanel.cs index f4799f39d..8f4ad0c59 100644 --- a/Assets/Scripts/Util/ControlPanel.cs +++ b/Assets/Scripts/Util/ControlPanel.cs @@ -11,8 +11,8 @@ [System.Serializable]public class ControlPanel { public float PlayerMovementPerSec = 120.0f; public float MinimumAlpha = 0.5f; public string BasisName = "Rhenao"; - public string WindowBasisName = "Create Your Frisk"; - public string WinodwBsaisNmae = "Crate Your Frisk"; + public string WindowBasisName = "Create Your Frisk v" + GlobalControls.CYFversion + " LTS " + (GlobalControls.BetaVersion > 0 ? (GlobalControls.LTSversion + 1) + " b" + GlobalControls.BetaVersion : "" + GlobalControls.LTSversion); + public string WinodwBsaisNmae = "Crate Your Frisk v" + GlobalControls.CYFversion + " LTS " + (GlobalControls.BetaVersion > 0 ? (GlobalControls.LTSversion + 1) + " b" + GlobalControls.BetaVersion : "" + GlobalControls.LTSversion); public bool FrameBasedMovement = false; public bool Safe = false; #if UNITY_STANDALONE_WIN || UNITY_EDITOR_WIN diff --git a/Assets/Scripts/Util/InputUtil.cs b/Assets/Scripts/Util/InputUtil.cs index e7d54debc..2da46433e 100644 --- a/Assets/Scripts/Util/InputUtil.cs +++ b/Assets/Scripts/Util/InputUtil.cs @@ -1,5 +1,5 @@ public static class InputUtil { - public static bool Released(UndertaleInput.ButtonState s) { return s == UndertaleInput.ButtonState.RELEASED; } - public static bool Pressed(UndertaleInput.ButtonState s) { return s == UndertaleInput.ButtonState.PRESSED; } - public static bool Held(UndertaleInput.ButtonState s) { return s > 0; } + public static bool Released(ButtonState s) { return s == ButtonState.RELEASED; } + public static bool Pressed(ButtonState s) { return s == ButtonState.PRESSED; } + public static bool Held(ButtonState s) { return s > 0; } } \ No newline at end of file diff --git a/Assets/Scripts/Util/MoonSharpUtil.cs b/Assets/Scripts/Util/MoonSharpUtil.cs index cca5a795e..48bf610dc 100644 --- a/Assets/Scripts/Util/MoonSharpUtil.cs +++ b/Assets/Scripts/Util/MoonSharpUtil.cs @@ -15,8 +15,9 @@ private static DynValue RecursiveTableOwnership(Script newOwner, DynValue tableS t.Table.Set(pair.Key, newOwnedSubtable); break; } - case DataType.Function: t.Table.Set(pair.Key, DynValue.NewClosure(pair.Value.Function)); break; - default: t.Table.Set(pair.Key, pair.Value); break; + case DataType.ClrFunction: t.Table.Set(pair.Key, DynValue.NewCallback(pair.Value.Callback)); break; + case DataType.Function: t.Table.Set(pair.Key, DynValue.NewClosure(pair.Value.Function)); break; + default: t.Table.Set(pair.Key, pair.Value); break; } } return t; diff --git a/Assets/Scripts/Util/ParseUtil.cs b/Assets/Scripts/Util/ParseUtil.cs index 69cbc1cdf..70fcfbac3 100644 --- a/Assets/Scripts/Util/ParseUtil.cs +++ b/Assets/Scripts/Util/ParseUtil.cs @@ -1,4 +1,5 @@ -using System.Globalization; +using System; +using System.Globalization; using UnityEngine; public static class ParseUtil { @@ -33,4 +34,21 @@ public static Color GetColor(string s) { float b = (intColor & 255) / 255.0f; return new Color(r, g, b); } + + public static string GetBytesFromColor(Color c, bool allowAlpha = false) { + ulong intColor = ((ulong)Mathf.RoundToInt(c.r * 255) << 16) + ((ulong)Mathf.RoundToInt(c.g * 255) << 8) + (ulong)Mathf.RoundToInt(c.b * 255); + if (allowAlpha) + intColor = (intColor << 8) + (ulong)Mathf.RoundToInt(c.a * 255); + return intColor.ToString("X" + (allowAlpha ? 8 : 6)); + } + + public static bool TryParseEnum(Type type, string value, out T result) { + try { + result = (T)Enum.Parse(type, value); + } catch { + result = default(T); + return false; + } + return true; + } } \ No newline at end of file diff --git a/Assets/Scripts/Util/SpriteUtil.cs b/Assets/Scripts/Util/SpriteUtil.cs index 926287e5c..9a804cf84 100644 --- a/Assets/Scripts/Util/SpriteUtil.cs +++ b/Assets/Scripts/Util/SpriteUtil.cs @@ -128,7 +128,7 @@ public static DynValue MakeIngameSprite(string filename, string tag = "BelowAren if ((!UnitaleUtil.IsOverworld && tag == "BelowArena") || (UnitaleUtil.IsOverworld && tag == "Default")) i.transform.SetParent(GameObject.Find(canvas).transform); else - UnitaleUtil.DisplayLuaError("Creating a sprite", "The sprite layer " + tag + " doesn't exist."); + throw new CYFException("The sprite layer " + tag + " doesn't exist."); else { i.transform.SetParent(GameObject.Find(tag == "none" ? canvas : tag + "Layer").transform, true); if (childNumber != -1) diff --git a/Assets/Scripts/Util/UnitaleUtil.cs b/Assets/Scripts/Util/UnitaleUtil.cs index 6b149e04a..39e5dc074 100644 --- a/Assets/Scripts/Util/UnitaleUtil.cs +++ b/Assets/Scripts/Util/UnitaleUtil.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; +using UnityEngine.UI; using Object = UnityEngine.Object; /// @@ -93,6 +94,30 @@ public static void DisplayLuaError(string source, string decoratedMessage, bool ScreenResolution.wideFullscreen = true; } + /// + /// Handles most CYF errors related to script execution + /// + /// Name of the script, used for the error message + /// Name of the function, used for the error message + /// Exception to handle + public static void HandleError(string scriptname, string function, Exception e) { + if (e as InterpreterException != null) { + InterpreterException ie = e as InterpreterException; + DisplayLuaError(scriptname, ie.DecoratedMessage == null ? ie.Message : FormatErrorSource(ie.DecoratedMessage, ie.Message) + ie.Message, ie.DoNotDecorateMessage); + } else if (GlobalControls.retroMode) + return; + else if (e.GetType().ToString() == "System.IndexOutOfRangeException" && e.StackTrace.Contains("at MoonSharp.Interpreter.DataStructs.FastStack`1[MoonSharp.Interpreter.DynValue].Push")) + DisplayLuaError(scriptname + ", calling the function " + function, "Possible infinite loop\n\nThis is a " + e.GetType() + " error." + + "\n\nYou almost definitely have an infinite loop in your code. A function tried to call itself infinitely. It could be a normal function or a metatable function." + + "\n\nFull stracktrace (see CYF output log at " + Application.persistentDataPath + "/output_log.txt):" + + "\n" + e.StackTrace); + else + DisplayLuaError(scriptname + ", calling the function " + function, "This is a " + e.GetType() + " error. Contact a dev and show them this screen, this must be an engine-side error." + + "\n\n" + e.Message + + "\n\nFull stracktrace (see CYF output log at " + Application.persistentDataPath + "/output_log.txt):" + + "\n" + e.StackTrace + "\n"); + } + public static string FormatErrorSource(string DecoratedMessage, string message) { string source = DecoratedMessage.Substring(0, DecoratedMessage.Length - message.Length); Regex validator = new Regex(@"\(\d+,\d+(-[\d,]+)?\)"); //Finds `(13,9-16)` or `(13,9-14,10)` or `(20,0)` @@ -165,8 +190,18 @@ public static string ParseCommandInline(string input, ref int currentChar, bool return null; } - public static float CalcTextWidth(TextManager txtmgr, int fromLetter = -1, int toLetter = -1, bool countEOLSpace = false, bool getLastSpace = false) { - float totalWidth = 0, totalWidthSpaceTest = 0, totalMaxWidth = 0, hSpacing = txtmgr.Charset.CharSpacing; + /// + /// Predicts the length of the text using the letters' size and various tags. + /// + /// Text object + /// Letter of the current line of text to count from + /// Letter of the current line of text to count to + /// True if we count spaces (spaces are usually skipped) + /// True if we count the letter spacing after the last letter of the text + /// The length of the text in pixels + public static float PredictTextWidth(TextManager txtmgr, int fromLetter = -1, int toLetter = -1, bool countEOLSpace = false) { + float totalWidth = 0, totalWidthSpaceTest = 0, totalMaxWidth = 0, hSpacing = txtmgr.font.CharSpacing, columns = 0; + List columnsMaxWidth = new List(); if (fromLetter == -1) fromLetter = 0; if (txtmgr.textQueue == null) return 0; if (txtmgr.textQueue[txtmgr.currentLine] == null) return 0; @@ -176,50 +211,106 @@ public static float CalcTextWidth(TextManager txtmgr, int fromLetter = -1, int t for (int i = fromLetter; i <= toLetter; i++) { switch (txtmgr.textQueue[txtmgr.currentLine].Text[i]) { case '[': - string str = ParseCommandInline(txtmgr.textQueue[txtmgr.currentLine].Text, ref i); if (str == null) { - if (txtmgr.Charset.Letters.ContainsKey(txtmgr.textQueue[txtmgr.currentLine].Text[i])) - totalWidth += txtmgr.Charset.Letters[txtmgr.textQueue[txtmgr.currentLine].Text[i]].textureRect.size.x + hSpacing; + if (txtmgr.font.Letters.ContainsKey(txtmgr.textQueue[txtmgr.currentLine].Text[i])) + totalWidth += txtmgr.font.Letters[txtmgr.textQueue[txtmgr.currentLine].Text[i]].textureRect.size.x + hSpacing; } else if (str.Split(':')[0] == "charspacing") - hSpacing = str.Split(':')[1].ToLower() == "default" ? txtmgr.Charset.CharSpacing : ParseUtil.GetFloat(str.Split(':')[1]); + hSpacing = str.Split(':')[1].ToLower().Trim() == "default" ? txtmgr.font.CharSpacing : ParseUtil.GetFloat(str.Split(':')[1]); + break; + case '\t': + // Add columns if they're not empty or filled with spaces + if (totalWidthSpaceTest == totalWidth) + columnsMaxWidth.Add(totalWidth); + totalWidth = txtmgr.columnShift * ++columns; + if (countEOLSpace) + totalWidthSpaceTest = totalWidth; break; case '\r': case '\n': - if (totalMaxWidth < totalWidthSpaceTest - hSpacing) - totalMaxWidth = totalWidthSpaceTest - hSpacing; + columns = 0; + columnsMaxWidth.Add(totalWidthSpaceTest); + totalWidthSpaceTest = columnsMaxWidth.Max(w => w); + totalMaxWidth = Mathf.Max(totalMaxWidth, totalWidthSpaceTest - hSpacing); totalWidth = 0; totalWidthSpaceTest = 0; + columnsMaxWidth.Clear(); break; default: - if (txtmgr.Charset.Letters.ContainsKey(txtmgr.textQueue[txtmgr.currentLine].Text[i])) { - totalWidth += txtmgr.Charset.Letters[txtmgr.textQueue[txtmgr.currentLine].Text[i]].textureRect.size.x + hSpacing; - // Do not count end of line spaces + if (txtmgr.font.Letters.ContainsKey(txtmgr.textQueue[txtmgr.currentLine].Text[i])) { + totalWidth += txtmgr.font.Letters[txtmgr.textQueue[txtmgr.currentLine].Text[i]].textureRect.size.x + hSpacing; + // Do not count spaces if (txtmgr.textQueue[txtmgr.currentLine].Text[i] != ' ' || countEOLSpace) totalWidthSpaceTest = totalWidth; } break; } } - if (totalMaxWidth < totalWidthSpaceTest - hSpacing) - totalMaxWidth = totalWidthSpaceTest - hSpacing; - return totalMaxWidth + (getLastSpace ? hSpacing : 0); + totalMaxWidth = Mathf.Max(totalMaxWidth, totalWidthSpaceTest - hSpacing); + return Mathf.Max(totalMaxWidth, 0); } - public static float CalcTextHeight(TextManager txtmgr, int fromLetter = -1, int toLetter = -1) { - float maxY = -999, minY = 999; - if (fromLetter == -1) fromLetter = 0; - if (toLetter == -1) toLetter = txtmgr.textQueue[txtmgr.currentLine].Text.Length; - if (fromLetter > toLetter || fromLetter < 0 || toLetter > txtmgr.textQueue[txtmgr.currentLine].Text.Length) return -1; - if (fromLetter == toLetter) return 0; - for (int i = fromLetter; i < toLetter; i++) { - if (!txtmgr.Charset.Letters.ContainsKey(txtmgr.textQueue[txtmgr.currentLine].Text[i])) continue; - if (txtmgr.letterPositions[i].y < minY) - minY = txtmgr.letterPositions[i].y; - if (txtmgr.letterPositions[i].y + txtmgr.Charset.Letters[txtmgr.textQueue[txtmgr.currentLine].Text[i]].textureRect.size.y > maxY) - maxY = txtmgr.letterPositions[i].y + txtmgr.Charset.Letters[txtmgr.textQueue[txtmgr.currentLine].Text[i]].textureRect.size.y; + /// + /// Computes the text's width using the x position of all of the text's letters. + /// This function assumes the text's letters have been created. + /// + /// Text object + /// Letter of the current line of text to count from + /// Letter of the current line of text to count to + /// True if we count spaces (spaces are usually skipped) + /// The length of the text in pixels + public static float CalcTextWidth(TextManager txtmgr, int fromLetter = -1, int toLetter = -1, bool countEOLSpace = false) { + if (txtmgr.textQueue == null || txtmgr.textQueue[txtmgr.currentLine] == null) return 0; + if (fromLetter > toLetter || fromLetter < -1 || toLetter > txtmgr.textQueue[txtmgr.currentLine].Text.Length) return 0; + if (fromLetter == -1) fromLetter = 0; + if (toLetter == -1) toLetter = txtmgr.textQueue[txtmgr.currentLine].Text.Length - 1; + + float maxX = Mathf.NegativeInfinity, minX = Mathf.Infinity; + LuaTextManager ltm = txtmgr as LuaTextManager; + + // Add text pos in case of tab + if (fromLetter == 0) { + minX = Mathf.Min(minX, ltm.absx); + maxX = Mathf.Max(maxX, ltm.absx); } - return maxY - minY; + + for (int i = fromLetter; i <= toLetter; i++) { + if (!txtmgr.letters.Any(l => l.index == i)) + continue; + if (txtmgr.textQueue[txtmgr.currentLine].Text[i] == ' ' && !countEOLSpace) + continue; + + TextManager.LetterData letter = txtmgr.letters.Find(l => l.index == i); + float letterPosMin = letter.image.rectTransform.position.x, + letterPosMax = letter.image.rectTransform.position.x + letter.image.rectTransform.rect.width * letter.image.rectTransform.localScale.x; + minX = Mathf.Min(minX, letterPosMin, letterPosMax); + maxX = Mathf.Max(maxX, letterPosMin, letterPosMax); + } + return Mathf.Max(maxX - minX, 0) / (ltm ? ltm.xscale : 1); + } + + public static float CalcTextHeight(TextManager txtmgr, int fromLetter = -1, int toLetter = -1, bool countEOLSpace = false) { + if (txtmgr.textQueue == null || txtmgr.textQueue[txtmgr.currentLine] == null) return 0; + if (fromLetter == -1) fromLetter = 0; + if (toLetter == -1) toLetter = txtmgr.textQueue[txtmgr.currentLine].Text.Length - 1; + if (fromLetter > toLetter || fromLetter < 0 || toLetter > txtmgr.textQueue[txtmgr.currentLine].Text.Length) return 0; + + float maxY = Mathf.NegativeInfinity, minY = Mathf.Infinity; + LuaTextManager ltm = txtmgr as LuaTextManager; + + for (int i = fromLetter; i <= toLetter; i++) { + if (!txtmgr.letters.Any(l => l.index == i)) + continue; + if (txtmgr.textQueue[txtmgr.currentLine].Text[i] == ' ' && !countEOLSpace) + continue; + + TextManager.LetterData letter = txtmgr.letters.Find(l => l.index == i); + float letterPosMin = letter.image.rectTransform.position.y, + letterPosMax = letter.image.rectTransform.position.y + letter.image.rectTransform.rect.height * letter.image.rectTransform.localScale.y; + minY = Mathf.Min(minY, letterPosMin, letterPosMax); + maxY = Mathf.Max(maxY, letterPosMin, letterPosMax); + } + return Mathf.Max(maxY - minY, 0) / (ltm ? ltm.yscale : 1); } public static DynValue RebuildTableFromString(string text) { @@ -590,6 +681,7 @@ public static void RemoveChildren(GameObject go, bool immediate = false, bool fi public static Dictionary MapCorrespondanceList = new Dictionary(); public static void AddKeysToMapCorrespondanceList() { + MapCorrespondanceList.Clear(); MapCorrespondanceList.Add("test", "Snowdin - Big boy map"); MapCorrespondanceList.Add("test2", "Hotland - Crossroads"); // MapCorrespondanceList.Add("test3", "The Core - The test map"); @@ -649,11 +741,123 @@ public static bool IsSpecialAnnouncement(string str) { public static bool TryCall(ScriptWrapper script, string func, DynValue param) { return TryCall(script, func, new[] { param }); } public static bool TryCall(ScriptWrapper script, string func, DynValue[] param = null) { - try { - DynValue sval = script.GetVar(func); - if (sval == null || sval.Type == DataType.Nil) return false; - script.Call(func, param); - } catch (InterpreterException ex) { DisplayLuaError(script.scriptname, FormatErrorSource(ex.DecoratedMessage, ex.Message) + ex.Message); } - return true; + DynValue sval = script.GetVar(func); + script.Call(func, param); + return (sval.Type & (DataType.Function | DataType.ClrFunction)) != 0; + } + + public static int SelectionChoice(int items, int current, int xMov, int yMov, int rows, int columns, bool verticalRollaround = true) { + int pageItems = rows * columns; + int pageNumber = Mathf.CeilToInt(items / (float)pageItems); + int currentPage = current / pageItems; + int currentItem = current % pageItems; + int lastPageItemNumber = Math.Mod(items - 1, pageItems) + 1; + int xPos = currentItem % columns; + int yPos = currentItem / columns; + + xPos += xMov; + yPos += yMov; + + // Horizontal movement + if (xMov != 0) { + // Right bound + if (xPos >= columns || (currentPage == pageNumber - 1 && xPos >= lastPageItemNumber - yPos * columns)) { + xPos = 0; + if (verticalRollaround) + currentPage++; + } + // Left bound + if (xPos < 0) { + if (currentPage == 0) xPos = Math.Mod(lastPageItemNumber - yPos * columns - 1, columns); + else xPos = columns - 1; + if (verticalRollaround) + currentPage--; + } + } + + // Vertical movement + // Down bound + if (yPos >= rows || (currentPage == pageNumber - 1 && yPos >= Mathf.CeilToInt((lastPageItemNumber - xPos) / (float)columns))) { + yPos = 0; + if (!verticalRollaround) + currentPage++; + } + // Up bound + if (yPos < 0) { + if (currentPage == pageNumber - 1) yPos = Mathf.CeilToInt((lastPageItemNumber - xPos) / (float)columns) - 1; + else yPos = rows - 1; + if (!verticalRollaround) + currentPage--; + } + + // Page underflow + while (currentPage < 0) + currentPage += pageNumber; + // Page overflow + while (currentPage >= pageNumber) + currentPage -= pageNumber; + + int result = xPos + yPos * columns + currentPage * pageItems; + if (result >= items) + result = items - 1; + + return result; + } + + public static Transform GetTransform(object o) { + LuaSpriteController sSelf = o as LuaSpriteController; + if (sSelf != null) return sSelf.img.transform; + LuaTextManager tSelf = o as LuaTextManager; + if (tSelf != null) return tSelf.GetContainer().transform; + ProjectileController pSelf = o as ProjectileController; + if (pSelf != null) return pSelf.sprite.img.transform; + LuaCYFObject oSelf = o as LuaCYFObject; + if (oSelf != null) return oSelf.transform; + Transform tsSelf = o as Transform; + if (tsSelf != null) return tsSelf; + return null; + } + + public static DynValue GetObject(Transform t) { + if (t == null) + return DynValue.NewNil(); + + GameObject go = t.gameObject; + if (LuaSpriteController.HasSpriteController(go)) + return UserData.Create(LuaSpriteController.GetOrCreate(go)); + if (t.GetComponent() != null) + return UserData.Create(t.GetComponent().ctrl); + if (t.GetComponent() != null) + return UserData.Create(t.GetComponent()); + for (int i = 0; i < t.childCount; i++) { + Transform child = t.GetChild(i); + if (child.GetComponent() != null) + return UserData.Create(child.GetComponent()); + } + return UserData.Create(new LuaCYFObject(t)); + } + + public static DynValue GetObjectParent(Transform t) { + return GetObject(t.parent); + } + + public static void SetObjectParent(object self, object p) { + if (p == null) + throw new CYFException("SetParent(): Can't set nil as parent."); + + LuaSpriteController sSelf = self as LuaSpriteController; + LuaSpriteController sParent = p as LuaSpriteController; + + if (sSelf != null && sSelf.tag == "event") + throw new CYFException("sprite.SetParent(): Cannot set the prent of an overworld event's sprite."); + if ((sSelf != null && sSelf.tag == "letter") ^ (sParent != null && sParent.tag == "letter")) + throw new CYFException("sprite.SetParent(): Cannot be used between letter sprites and other objects."); + + Transform t = GetTransform(p); + if (t == null) { + DynValue d = p as DynValue; + throw new CYFException("SetParent(): Can't set an object of type " + d.GetType().ToString() + " as a parent!"); + } + GetTransform(self).SetParent(GetTransform(p)); } } diff --git a/Assets/Sprites/Arrow.png b/Assets/Sprites/Arrow.png new file mode 100644 index 000000000..c837b2e1e Binary files /dev/null and b/Assets/Sprites/Arrow.png differ diff --git a/Assets/Sprites/Arrow.png.meta b/Assets/Sprites/Arrow.png.meta new file mode 100644 index 000000000..ad957b394 --- /dev/null +++ b/Assets/Sprites/Arrow.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: c70cf2ea859a4094dbbdec828a55ef8b +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 1ce9a4a22bcea0549a9c3b07253f6f67 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Tiled2Unity/Materials/PC Computer - Undertale - Core Tileset(1).mat b/Assets/Tiled2Unity/Materials/PC Computer - Undertale - Core Tileset(1).mat index 5a4857dad..b3fda4301 100644 --- a/Assets/Tiled2Unity/Materials/PC Computer - Undertale - Core Tileset(1).mat +++ b/Assets/Tiled2Unity/Materials/PC Computer - Undertale - Core Tileset(1).mat @@ -5,7 +5,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: PC Computer - Undertale - Core Tileset(1) m_Shader: {fileID: 4800000, guid: 5245ae2adfce6f04f91ba1b0be78d711, type: 3} m_ShaderKeywords: diff --git a/Assets/Tiled2Unity/Materials/Snow 2.mat b/Assets/Tiled2Unity/Materials/Snow 2.mat index 53a3a61b3..89fc3c7d8 100644 --- a/Assets/Tiled2Unity/Materials/Snow 2.mat +++ b/Assets/Tiled2Unity/Materials/Snow 2.mat @@ -5,7 +5,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Snow 2 m_Shader: {fileID: 4800000, guid: 5245ae2adfce6f04f91ba1b0be78d711, type: 3} m_ShaderKeywords: diff --git a/Assets/Tiled2Unity/Materials/UT NewHome 1.mat b/Assets/Tiled2Unity/Materials/UT NewHome 1.mat index 60b32b801..c4c18d5fd 100644 --- a/Assets/Tiled2Unity/Materials/UT NewHome 1.mat +++ b/Assets/Tiled2Unity/Materials/UT NewHome 1.mat @@ -5,7 +5,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: UT NewHome 1 m_Shader: {fileID: 4800000, guid: 5245ae2adfce6f04f91ba1b0be78d711, type: 3} m_ShaderKeywords: diff --git a/Assets/Tiled2Unity/Materials/UT NewHome 2.mat b/Assets/Tiled2Unity/Materials/UT NewHome 2.mat index 781ab6213..f9ea8dd03 100644 --- a/Assets/Tiled2Unity/Materials/UT NewHome 2.mat +++ b/Assets/Tiled2Unity/Materials/UT NewHome 2.mat @@ -5,7 +5,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: UT NewHome 2 m_Shader: {fileID: 4800000, guid: 5245ae2adfce6f04f91ba1b0be78d711, type: 3} m_ShaderKeywords: diff --git a/Assets/Tiled2Unity/Materials/UT NewHome 3.mat b/Assets/Tiled2Unity/Materials/UT NewHome 3.mat index a7aa8eb3c..a090581e9 100644 --- a/Assets/Tiled2Unity/Materials/UT NewHome 3.mat +++ b/Assets/Tiled2Unity/Materials/UT NewHome 3.mat @@ -5,7 +5,8 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: UT NewHome 3 m_Shader: {fileID: 4800000, guid: 5245ae2adfce6f04f91ba1b0be78d711, type: 3} m_ShaderKeywords: diff --git a/Assets/Tiled2Unity/Prefabs/Core - Pont.prefab b/Assets/Tiled2Unity/Prefabs/Core - Pont.prefab index 98b3b2dc6..f72f5a092 100644 --- a/Assets/Tiled2Unity/Prefabs/Core - Pont.prefab +++ b/Assets/Tiled2Unity/Prefabs/Core - Pont.prefab @@ -4,7 +4,8 @@ GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 402534} @@ -16,11 +17,55 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!4 &402534 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 108440} + 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_Children: + - {fileID: 419426} + - {fileID: 413906} + - {fileID: 437592} + - {fileID: 438254} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &11426462 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 108440} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c0619e460a775cc458d37cb4a214a189, type: 3} + m_Name: + m_EditorClassIdentifier: + Orientation: 0 + StaggerAxis: 1 + StaggerIndex: 0 + HexSideLength: 0 + NumLayers: 3 + NumTilesWide: 31 + NumTilesHigh: 12 + TileWidth: 20 + TileHeight: 20 + ExportScale: 1 + MapWidthInPixels: 620 + MapHeightInPixels: 240 + BackgroundColor: {r: 0, g: 0, b: 0, a: 1} --- !u!1 &160736 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 419426} @@ -31,11 +76,27 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!4 &419426 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 160736} + 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_Children: + - {fileID: 4308558649129638} + m_Father: {fileID: 402534} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &169200 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 438254} @@ -46,11 +107,28 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!4 &438254 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 169200} + 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_Children: + - {fileID: 4386384304748246} + - {fileID: 8111908885985878775} + m_Father: {fileID: 402534} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &178842 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 437592} @@ -61,11 +139,27 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!4 &437592 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 178842} + 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_Children: + - {fileID: 7596906105155575219} + m_Father: {fileID: 402534} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &192206 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 413906} @@ -76,120 +170,27 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &402534 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 108440} - 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_Children: - - {fileID: 419426} - - {fileID: 413906} - - {fileID: 437592} - - {fileID: 438254} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &413906 Transform: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 192206} 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_Children: - - {fileID: 4766272462590212} + - {fileID: 8074756568423026410} m_Father: {fileID: 402534} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &419426 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 160736} - 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_Children: - - {fileID: 4308558649129638} - m_Father: {fileID: 402534} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &437592 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 178842} - 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_Children: - - {fileID: 4810717534342658} - m_Father: {fileID: 402534} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &438254 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 169200} - 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_Children: - - {fileID: 4467177287012260} - - {fileID: 4386384304748246} - m_Father: {fileID: 402534} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &11426462 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 108440} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c0619e460a775cc458d37cb4a214a189, type: 3} - m_Name: - m_EditorClassIdentifier: - Orientation: 0 - StaggerAxis: 1 - StaggerIndex: 0 - HexSideLength: 0 - NumLayers: 3 - NumTilesWide: 31 - NumTilesHigh: 12 - TileWidth: 20 - TileHeight: 20 - ExportScale: 1 - MapWidthInPixels: 620 - MapHeightInPixels: 240 - BackgroundColor: {r: 0, g: 0, b: 0, a: 1} ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 0} - m_RootGameObject: {fileID: 108440} - m_IsPrefabAsset: 1 --- !u!1 &1012493506038218 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 4308558649129638} @@ -202,28 +203,71 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1091058302252216 -GameObject: - m_ObjectHideFlags: 1 +--- !u!4 &4308558649129638 +Transform: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 4810717534342658} - - component: {fileID: 33334605075894098} - - component: {fileID: 23295363341395114} - m_Layer: 0 - m_Name: PC Computer - Undertale - Core Tileset(1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1012493506038218} + 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_Children: [] + m_Father: {fileID: 419426} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &33707057386136336 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1012493506038218} + m_Mesh: {fileID: 4300000, guid: 00f5a8d3bbea0b446b9b74cb861e0993, type: 3} +--- !u!23 &23325816555492212 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1012493506038218} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: b90bff42e575b504a9929ba56d216286, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 --- !u!1 &1190818210142280 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 4386384304748246} @@ -235,32 +279,56 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1373818873229750 -GameObject: - m_ObjectHideFlags: 1 +--- !u!4 &4386384304748246 +Transform: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 4766272462590212} - - component: {fileID: 33695945972466258} - - component: {fileID: 23708115883294688} - m_Layer: 0 - m_Name: PC Computer - Undertale - Core Tileset(1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1453839302926570 + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1190818210142280} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -140, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 438254} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &61146647554749178 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1190818210142280} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 330, y: -50} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 660, y: 100} + m_EdgeRadius: 0 +--- !u!1 &5531872188588348032 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4467177287012260} - - component: {fileID: 61461664906995446} + - component: {fileID: 8111908885985878775} + - component: {fileID: 5361211882319396307} m_Layer: 0 m_Name: RectangleObject m_TagString: Untagged @@ -268,25 +336,13 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4308558649129638 +--- !u!4 &8111908885985878775 Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1012493506038218} - 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_Children: [] - m_Father: {fileID: 419426} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4386384304748246 -Transform: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1190818210142280} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5531872188588348032} 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} @@ -294,38 +350,57 @@ Transform: m_Father: {fileID: 438254} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4467177287012260 -Transform: - m_ObjectHideFlags: 1 +--- !u!61 &5361211882319396307 +BoxCollider2D: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1453839302926570} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -140, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 438254} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4766272462590212 -Transform: - m_ObjectHideFlags: 1 + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5531872188588348032} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 330, y: -50} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 660, y: 100} + m_EdgeRadius: 0 +--- !u!1 &6825209556489267170 +GameObject: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1373818873229750} - 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_Children: [] - m_Father: {fileID: 413906} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4810717534342658 + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7596906105155575219} + - component: {fileID: 2590289517446592252} + - component: {fileID: 2032661981495072701} + m_Layer: 0 + m_Name: PC Computer - Undertale - Core Tileset(1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7596906105155575219 Transform: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1091058302252216} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6825209556489267170} 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} @@ -333,12 +408,21 @@ Transform: m_Father: {fileID: 437592} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &23295363341395114 +--- !u!33 &2590289517446592252 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6825209556489267170} + m_Mesh: {fileID: 4300004, guid: 00f5a8d3bbea0b446b9b74cb861e0993, type: 3} +--- !u!23 &2032661981495072701 MeshRenderer: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1091058302252216} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6825209556489267170} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -346,7 +430,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 - m_RenderingLayerMask: 4294967295 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: b90bff42e575b504a9929ba56d216286, type: 2} m_StaticBatchInfo: @@ -368,47 +453,53 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 2 ---- !u!23 &23325816555492212 -MeshRenderer: - m_ObjectHideFlags: 1 +--- !u!1 &7166690070803798906 +GameObject: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1012493506038218} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RenderingLayerMask: 4294967295 - m_Materials: - - {fileID: 2100000, guid: b90bff42e575b504a9929ba56d216286, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!23 &23708115883294688 + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8074756568423026410} + - component: {fileID: 7363853635766280682} + - component: {fileID: 4843288546606066647} + m_Layer: 0 + m_Name: PC Computer - Undertale - Core Tileset(1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8074756568423026410 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7166690070803798906} + 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_Children: [] + m_Father: {fileID: 413906} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &7363853635766280682 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7166690070803798906} + m_Mesh: {fileID: 4300002, guid: 00f5a8d3bbea0b446b9b74cb861e0993, type: 3} +--- !u!23 &4843288546606066647 MeshRenderer: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1373818873229750} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7166690070803798906} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -416,7 +507,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 - m_RenderingLayerMask: 4294967295 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: b90bff42e575b504a9929ba56d216286, type: 2} m_StaticBatchInfo: @@ -438,74 +530,3 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 1 ---- !u!33 &33334605075894098 -MeshFilter: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1091058302252216} - m_Mesh: {fileID: 4300004, guid: 00f5a8d3bbea0b446b9b74cb861e0993, type: 3} ---- !u!33 &33695945972466258 -MeshFilter: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1373818873229750} - m_Mesh: {fileID: 4300002, guid: 00f5a8d3bbea0b446b9b74cb861e0993, type: 3} ---- !u!33 &33707057386136336 -MeshFilter: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1012493506038218} - m_Mesh: {fileID: 4300000, guid: 00f5a8d3bbea0b446b9b74cb861e0993, type: 3} ---- !u!61 &61146647554749178 -BoxCollider2D: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1190818210142280} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 330, y: -50} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 660, y: 100} - m_EdgeRadius: 0 ---- !u!61 &61461664906995446 -BoxCollider2D: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1453839302926570} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 330, y: -50} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 660, y: 100} - m_EdgeRadius: 0 diff --git a/Assets/Tiled2Unity/Prefabs/newhome1.prefab b/Assets/Tiled2Unity/Prefabs/newhome1.prefab index ec55d2e6a..6380b00a3 100644 --- a/Assets/Tiled2Unity/Prefabs/newhome1.prefab +++ b/Assets/Tiled2Unity/Prefabs/newhome1.prefab @@ -4,7 +4,8 @@ GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 412730} @@ -15,11 +16,30 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!4 &412730 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 132186} + 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_Children: + - {fileID: 4018143445105366} + - {fileID: 5838746142872141972} + - {fileID: 5444463805845917696} + - {fileID: 552372400121540218} + m_Father: {fileID: 484346} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &137128 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 461400} @@ -32,59 +52,12 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &172050 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 484346} - - component: {fileID: 11423186} - m_Layer: 0 - m_Name: newhome1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &185918 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 493402} - m_Layer: 0 - m_Name: Tile Layer 1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &412730 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 132186} - 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_Children: - - {fileID: 4018143445105366} - - {fileID: 4171179504430190} - - {fileID: 4031888121060782} - - {fileID: 4758993719055064} - m_Father: {fileID: 484346} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &461400 Transform: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 137128} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -93,40 +66,20 @@ Transform: m_Father: {fileID: 493402} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &484346 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 172050} - 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_Children: - - {fileID: 493402} - - {fileID: 412730} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &493402 -Transform: - m_ObjectHideFlags: 1 +--- !u!33 &3311786 +MeshFilter: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 185918} - 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_Children: - - {fileID: 461400} - m_Father: {fileID: 484346} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137128} + m_Mesh: {fileID: 4300000, guid: 01c84d4d6cbc1134f8c2d15a7f2a66c0, type: 3} --- !u!23 &2349500 MeshRenderer: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 137128} m_Enabled: 1 m_CastShadows: 0 @@ -135,7 +88,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 - m_RenderingLayerMask: 4294967295 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: d7b1f2149f5fc5e48aea6aec865fa420, type: 2} m_StaticBatchInfo: @@ -157,18 +111,45 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 1 ---- !u!33 &3311786 -MeshFilter: - m_ObjectHideFlags: 1 +--- !u!1 &172050 +GameObject: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 137128} - m_Mesh: {fileID: 4300000, guid: 01c84d4d6cbc1134f8c2d15a7f2a66c0, type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 484346} + - component: {fileID: 11423186} + m_Layer: 0 + m_Name: newhome1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &484346 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 172050} + 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_Children: + - {fileID: 493402} + - {fileID: 412730} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &11423186 MonoBehaviour: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 172050} m_Enabled: 1 m_EditorHideFlags: 0 @@ -188,38 +169,43 @@ MonoBehaviour: MapWidthInPixels: 2000 MapHeightInPixels: 480 BackgroundColor: {r: 0, g: 0, b: 0, a: 1} ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 0} - m_RootGameObject: {fileID: 172050} - m_IsPrefabAsset: 1 ---- !u!1 &1027919183631034 +--- !u!1 &185918 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4758993719055064} - - component: {fileID: 61699536141137890} + - component: {fileID: 493402} m_Layer: 0 - m_Name: RectangleObject + m_Name: Tile Layer 1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!4 &493402 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 185918} + 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_Children: + - {fileID: 461400} + m_Father: {fileID: 484346} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1553122346830566 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 4018143445105366} @@ -231,43 +217,12 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1583678297505300 -GameObject: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 4171179504430190} - - component: {fileID: 61354557833905066} - m_Layer: 0 - m_Name: RectangleObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1898097208673694 -GameObject: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 4031888121060782} - - component: {fileID: 61470362178511422} - m_Layer: 0 - m_Name: RectangleObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!4 &4018143445105366 Transform: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1553122346830566} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -276,58 +231,20 @@ Transform: m_Father: {fileID: 412730} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4031888121060782 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1898097208673694} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -240, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 412730} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4171179504430190 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1583678297505300} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -320, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 412730} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4758993719055064 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1027919183631034} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2000, y: -240, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 412730} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &61354557833905066 +--- !u!61 &61566473455395286 BoxCollider2D: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1583678297505300} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1553122346830566} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 1000, y: -80} + m_Offset: {x: 1000, y: -120} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -338,21 +255,53 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 2000, y: 160} + m_Size: {x: 2000, y: 240} m_EdgeRadius: 0 ---- !u!61 &61470362178511422 +--- !u!1 &3893743701049403221 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 552372400121540218} + - component: {fileID: 600888441555569354} + m_Layer: 0 + m_Name: RectangleObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &552372400121540218 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3893743701049403221} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 2000, y: -240, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 412730} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &600888441555569354 BoxCollider2D: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1898097208673694} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3893743701049403221} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 80, y: -40} + m_Offset: {x: 10, y: -40} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -363,21 +312,53 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 160, y: 80} + m_Size: {x: 20, y: 80} m_EdgeRadius: 0 ---- !u!61 &61566473455395286 +--- !u!1 &5367509667803404129 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5444463805845917696} + - component: {fileID: 6951446824776322559} + m_Layer: 0 + m_Name: RectangleObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5444463805845917696 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5367509667803404129} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -240, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 412730} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &6951446824776322559 BoxCollider2D: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1553122346830566} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5367509667803404129} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 1000, y: -120} + m_Offset: {x: 80, y: -40} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -388,21 +369,53 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 2000, y: 240} + m_Size: {x: 160, y: 80} m_EdgeRadius: 0 ---- !u!61 &61699536141137890 +--- !u!1 &5691891643246900096 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5838746142872141972} + - component: {fileID: 3497005893855546166} + m_Layer: 0 + m_Name: RectangleObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5838746142872141972 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5691891643246900096} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -320, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 412730} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &3497005893855546166 BoxCollider2D: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1027919183631034} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5691891643246900096} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 10, y: -40} + m_Offset: {x: 1000, y: -80} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -413,5 +426,5 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 20, y: 80} + m_Size: {x: 2000, y: 160} m_EdgeRadius: 0 diff --git a/Assets/Tiled2Unity/Prefabs/newhome2.prefab b/Assets/Tiled2Unity/Prefabs/newhome2.prefab index e385149cf..e8d153d97 100644 --- a/Assets/Tiled2Unity/Prefabs/newhome2.prefab +++ b/Assets/Tiled2Unity/Prefabs/newhome2.prefab @@ -4,7 +4,8 @@ GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 470546} @@ -15,11 +16,27 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!4 &470546 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 116090} + 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_Children: + - {fileID: 451980} + m_Father: {fileID: 441110} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &152760 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 451980} @@ -32,76 +49,12 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &161848 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 411254} - m_Layer: 0 - m_Name: Collision Layer - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &199918 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 441110} - - component: {fileID: 11410530} - m_Layer: 0 - m_Name: newhome2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &411254 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 161848} - 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_Children: - - {fileID: 4005495505347418} - - {fileID: 4478833979814336} - - {fileID: 4453337244147448} - - {fileID: 4368679770483186} - - {fileID: 4406714784306328} - - {fileID: 4641313063197844} - m_Father: {fileID: 441110} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &441110 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 199918} - 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_Children: - - {fileID: 470546} - - {fileID: 411254} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &451980 Transform: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 152760} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -110,25 +63,20 @@ Transform: m_Father: {fileID: 470546} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &470546 -Transform: - m_ObjectHideFlags: 1 +--- !u!33 &3312910 +MeshFilter: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 116090} - 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_Children: - - {fileID: 451980} - m_Father: {fileID: 441110} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 152760} + m_Mesh: {fileID: 4300000, guid: 9a67fc81593ea064897c94224242ac21, type: 3} --- !u!23 &2352800 MeshRenderer: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 152760} m_Enabled: 1 m_CastShadows: 0 @@ -137,7 +85,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 - m_RenderingLayerMask: 4294967295 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 9fa45d50e3268fe48af9f3318f903b16, type: 2} m_StaticBatchInfo: @@ -159,133 +108,106 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!33 &3312910 -MeshFilter: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 152760} - m_Mesh: {fileID: 4300000, guid: 9a67fc81593ea064897c94224242ac21, type: 3} ---- !u!114 &11410530 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 199918} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c0619e460a775cc458d37cb4a214a189, type: 3} - m_Name: - m_EditorClassIdentifier: - Orientation: 0 - StaggerAxis: 1 - StaggerIndex: 0 - HexSideLength: 0 - NumLayers: 1 - NumTilesWide: 16 - NumTilesHigh: 24 - TileWidth: 40 - TileHeight: 40 - ExportScale: 1 - MapWidthInPixels: 640 - MapHeightInPixels: 960 - BackgroundColor: {r: 0, g: 0, b: 0, a: 1} ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 0} - m_RootGameObject: {fileID: 199918} - m_IsPrefabAsset: 1 ---- !u!1 &1025056818014386 +--- !u!1 &161848 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4641313063197844} - - component: {fileID: 61849620888538198} + - component: {fileID: 411254} m_Layer: 0 - m_Name: RectangleObject + m_Name: Collision Layer m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1100501039417678 -GameObject: - m_ObjectHideFlags: 1 +--- !u!4 &411254 +Transform: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 4478833979814336} - - component: {fileID: 61754352990975582} - m_Layer: 0 - m_Name: RectangleObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1134707249026392 + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 161848} + 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_Children: + - {fileID: 4005495505347418} + - {fileID: 231905513245790519} + - {fileID: 110147840637466481} + - {fileID: 2508422384424575483} + - {fileID: 4783449076012860439} + - {fileID: 3629650843925297592} + m_Father: {fileID: 441110} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &199918 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4453337244147448} - - component: {fileID: 61216365365016442} + - component: {fileID: 441110} + - component: {fileID: 11410530} m_Layer: 0 - m_Name: RectangleObject + m_Name: newhome2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1538364663242990 -GameObject: - m_ObjectHideFlags: 1 +--- !u!4 &441110 +Transform: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 4368679770483186} - - component: {fileID: 61062374182799774} - m_Layer: 0 - m_Name: RectangleObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1859677702817620 -GameObject: - m_ObjectHideFlags: 1 + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 199918} + 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_Children: + - {fileID: 470546} + - {fileID: 411254} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &11410530 +MonoBehaviour: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 4406714784306328} - - component: {fileID: 61863914397295314} - m_Layer: 0 - m_Name: RectangleObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 199918} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c0619e460a775cc458d37cb4a214a189, type: 3} + m_Name: + m_EditorClassIdentifier: + Orientation: 0 + StaggerAxis: 1 + StaggerIndex: 0 + HexSideLength: 0 + NumLayers: 1 + NumTilesWide: 16 + NumTilesHigh: 24 + TileWidth: 40 + TileHeight: 40 + ExportScale: 1 + MapWidthInPixels: 640 + MapHeightInPixels: 960 + BackgroundColor: {r: 0, g: 0, b: 0, a: 1} --- !u!1 &1930510601017404 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 4005495505347418} @@ -299,9 +221,10 @@ GameObject: m_IsActive: 1 --- !u!4 &4005495505347418 Transform: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1930510601017404} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -310,84 +233,20 @@ Transform: m_Father: {fileID: 411254} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4368679770483186 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1538364663242990} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -840, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 411254} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4406714784306328 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1859677702817620} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -20, y: -720, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 411254} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4453337244147448 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1134707249026392} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 400, y: -400, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 411254} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4478833979814336 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1100501039417678} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -320, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 411254} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4641313063197844 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1025056818014386} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 640, y: -320, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 411254} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &61062374182799774 +--- !u!61 &61489429164814898 BoxCollider2D: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1538364663242990} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1930510601017404} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 200, y: -60} + m_Offset: {x: 320, y: -160} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -398,21 +257,53 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 400, y: 120} + m_Size: {x: 640, y: 320} m_EdgeRadius: 0 ---- !u!61 &61216365365016442 +--- !u!1 &4757447242233984141 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4783449076012860439} + - component: {fileID: 3227850184289536364} + m_Layer: 0 + m_Name: RectangleObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4783449076012860439 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4757447242233984141} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -20, y: -720, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 411254} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &3227850184289536364 BoxCollider2D: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1134707249026392} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4757447242233984141} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 120, y: -280} + m_Offset: {x: 10, y: -60} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -423,21 +314,53 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 240, y: 560} + m_Size: {x: 20, y: 120} m_EdgeRadius: 0 ---- !u!61 &61489429164814898 +--- !u!1 &5901090983608442905 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 110147840637466481} + - component: {fileID: 6340270645180773697} + m_Layer: 0 + m_Name: RectangleObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &110147840637466481 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5901090983608442905} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 400, y: -400, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 411254} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &6340270645180773697 BoxCollider2D: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1930510601017404} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5901090983608442905} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 320, y: -160} + m_Offset: {x: 120, y: -280} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -448,21 +371,53 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 640, y: 320} + m_Size: {x: 240, y: 560} m_EdgeRadius: 0 ---- !u!61 &61754352990975582 +--- !u!1 &6178066375582435966 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3629650843925297592} + - component: {fileID: 605243457544702335} + m_Layer: 0 + m_Name: RectangleObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3629650843925297592 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6178066375582435966} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 640, y: -320, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 411254} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &605243457544702335 BoxCollider2D: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1100501039417678} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6178066375582435966} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 120, y: -200} + m_Offset: {x: 10, y: -40} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -473,21 +428,53 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 240, y: 400} + m_Size: {x: 20, y: 80} m_EdgeRadius: 0 ---- !u!61 &61849620888538198 +--- !u!1 &8414872173395934520 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 231905513245790519} + - component: {fileID: 2556750677603361499} + m_Layer: 0 + m_Name: RectangleObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &231905513245790519 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8414872173395934520} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -320, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 411254} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &2556750677603361499 BoxCollider2D: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1025056818014386} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8414872173395934520} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 10, y: -40} + m_Offset: {x: 120, y: -200} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -498,21 +485,53 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 20, y: 80} + m_Size: {x: 240, y: 400} m_EdgeRadius: 0 ---- !u!61 &61863914397295314 +--- !u!1 &8862380143484095640 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2508422384424575483} + - component: {fileID: 4886932592977508131} + m_Layer: 0 + m_Name: RectangleObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2508422384424575483 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8862380143484095640} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -840, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 411254} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &4886932592977508131 BoxCollider2D: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1859677702817620} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8862380143484095640} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 10, y: -60} + m_Offset: {x: 200, y: -60} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -523,5 +542,5 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 20, y: 120} + m_Size: {x: 400, y: 120} m_EdgeRadius: 0 diff --git a/Assets/Tiled2Unity/Prefabs/newhome3.prefab b/Assets/Tiled2Unity/Prefabs/newhome3.prefab index d9f371509..9488f630e 100644 --- a/Assets/Tiled2Unity/Prefabs/newhome3.prefab +++ b/Assets/Tiled2Unity/Prefabs/newhome3.prefab @@ -1,13 +1,14 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &100954 +--- !u!1 &21525650134150102 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 499446} + - component: {fileID: 4150513976756769114} m_Layer: 0 m_Name: Tile Layer 1 m_TagString: Untagged @@ -15,47 +16,31 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &122298 -GameObject: +--- !u!4 &4150513976756769114 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 409426} - m_Layer: 0 - m_Name: Collision Layer - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &157016 -GameObject: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 491902} - - component: {fileID: 3303974} - - component: {fileID: 2372798} - m_Layer: 0 - m_Name: UT NewHome 3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &157488 + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 21525650134150102} + 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_Children: + - {fileID: 3261362566610714698} + m_Father: {fileID: 2096174297406191888} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &125565105870726672 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 452124} - - component: {fileID: 11430030} + - component: {fileID: 2096174297406191888} + - component: {fileID: 1277374824807000803} m_Layer: 0 m_Name: newhome3 m_TagString: Untagged @@ -63,167 +48,29 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &168310 -GameObject: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 460918} - - component: {fileID: 6198640} - m_Layer: 0 - m_Name: RectangleObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &409426 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 122298} - 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_Children: - - {fileID: 4267017996010262} - - {fileID: 4899333970105504} - - {fileID: 4152408791190010} - - {fileID: 460918} - m_Father: {fileID: 452124} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &452124 +--- !u!4 &2096174297406191888 Transform: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 157488} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 125565105870726672} 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_Children: - - {fileID: 499446} - - {fileID: 409426} + - {fileID: 4150513976756769114} + - {fileID: 3490782280333174482} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &460918 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 168310} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3600, y: -320, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 409426} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &491902 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 157016} - 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_Children: [] - m_Father: {fileID: 499446} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &499446 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 100954} - 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_Children: - - {fileID: 491902} - m_Father: {fileID: 452124} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &2372798 -MeshRenderer: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 157016} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RenderingLayerMask: 4294967295 - m_Materials: - - {fileID: 2100000, guid: eedf15fe50af22f43ab66a928fa6cbd9, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!33 &3303974 -MeshFilter: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 157016} - m_Mesh: {fileID: 4300000, guid: 89471cf351cef2f44907b32927e15d0b, type: 3} ---- !u!61 &6198640 -BoxCollider2D: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 168310} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 10, y: -40} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 20, y: 80} - m_EdgeRadius: 0 ---- !u!114 &11430030 +--- !u!114 &1277374824807000803 MonoBehaviour: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 157488} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 125565105870726672} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: c0619e460a775cc458d37cb4a214a189, type: 3} @@ -242,42 +89,50 @@ MonoBehaviour: MapWidthInPixels: 3600 MapHeightInPixels: 480 BackgroundColor: {r: 0, g: 0, b: 0, a: 1} ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 0} - m_RootGameObject: {fileID: 157488} - m_IsPrefabAsset: 1 ---- !u!1 &1153290694345626 +--- !u!1 &2479471810706179880 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4899333970105504} - - component: {fileID: 61655815683472178} + - component: {fileID: 3490782280333174482} m_Layer: 0 - m_Name: RectangleObject + m_Name: Collision Layer m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1512024926355746 +--- !u!4 &3490782280333174482 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2479471810706179880} + 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_Children: + - {fileID: 678529431461622565} + - {fileID: 8241241253551623255} + - {fileID: 6410204663983051367} + - {fileID: 7939637729463358444} + m_Father: {fileID: 2096174297406191888} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3720451129461840925 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4152408791190010} - - component: {fileID: 61144832723697554} + - component: {fileID: 8241241253551623255} + - component: {fileID: 3185841047767328482} m_Layer: 0 m_Name: RectangleObject m_TagString: Untagged @@ -285,15 +140,56 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1945422830436646 +--- !u!4 &8241241253551623255 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3720451129461840925} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -400, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3490782280333174482} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &3185841047767328482 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3720451129461840925} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 1800, y: -40} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 3600, y: 80} + m_EdgeRadius: 0 +--- !u!1 &4609161601064412243 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4267017996010262} - - component: {fileID: 61125834731607818} + - component: {fileID: 6410204663983051367} + - component: {fileID: 6445714129612374936} m_Layer: 0 m_Name: RectangleObject m_TagString: Untagged @@ -301,58 +197,34 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4152408791190010 +--- !u!4 &6410204663983051367 Transform: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1512024926355746} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4609161601064412243} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -20, y: -320, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 409426} + m_Father: {fileID: 3490782280333174482} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4267017996010262 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1945422830436646} - 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_Children: [] - m_Father: {fileID: 409426} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4899333970105504 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1153290694345626} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -400, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 409426} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &61125834731607818 +--- !u!61 &6445714129612374936 BoxCollider2D: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1945422830436646} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4609161601064412243} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 1800, y: -160} + m_Offset: {x: 10, y: -40} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -363,21 +235,53 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 3600, y: 320} + m_Size: {x: 20, y: 80} m_EdgeRadius: 0 ---- !u!61 &61144832723697554 +--- !u!1 &5450211339410162125 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 678529431461622565} + - component: {fileID: 1173381994078391385} + m_Layer: 0 + m_Name: RectangleObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &678529431461622565 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5450211339410162125} + 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_Children: [] + m_Father: {fileID: 3490782280333174482} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &1173381994078391385 BoxCollider2D: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1512024926355746} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5450211339410162125} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 10, y: -40} + m_Offset: {x: 1800, y: -160} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -388,21 +292,130 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 20, y: 80} + m_Size: {x: 3600, y: 320} m_EdgeRadius: 0 ---- !u!61 &61655815683472178 +--- !u!1 &5802265357538150596 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3261362566610714698} + - component: {fileID: 7791608339800814632} + - component: {fileID: 7118279989945658668} + m_Layer: 0 + m_Name: UT NewHome 3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3261362566610714698 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5802265357538150596} + 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_Children: [] + m_Father: {fileID: 4150513976756769114} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &7791608339800814632 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5802265357538150596} + m_Mesh: {fileID: 4300000, guid: 89471cf351cef2f44907b32927e15d0b, type: 3} +--- !u!23 &7118279989945658668 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5802265357538150596} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: eedf15fe50af22f43ab66a928fa6cbd9, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!1 &8051287327322741904 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7939637729463358444} + - component: {fileID: 6746840583172082043} + m_Layer: 0 + m_Name: RectangleObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7939637729463358444 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8051287327322741904} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3600, y: -320, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3490782280333174482} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &6746840583172082043 BoxCollider2D: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1153290694345626} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8051287327322741904} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 1800, y: -40} + m_Offset: {x: 10, y: -40} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -413,5 +426,5 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 3600, y: 80} + m_Size: {x: 20, y: 80} m_EdgeRadius: 0 diff --git a/Assets/Tiled2Unity/Prefabs/test-1.prefab b/Assets/Tiled2Unity/Prefabs/test-1.prefab index 17a06886b..3b549d1c7 100644 --- a/Assets/Tiled2Unity/Prefabs/test-1.prefab +++ b/Assets/Tiled2Unity/Prefabs/test-1.prefab @@ -4,7 +4,8 @@ GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 462018} @@ -16,74 +17,12 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &170920 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 473076} - m_Layer: 0 - m_Name: Tile Layer 1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &175212 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 478356} - m_Layer: 0 - m_Name: Tile Layer 2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &188098 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 436934} - m_Layer: 0 - m_Name: Object Layer 1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &436934 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 188098} - 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_Children: - - {fileID: 4109915465674544} - - {fileID: 4527693755342962} - - {fileID: 4005722986985020} - - {fileID: 4805652970513816} - - {fileID: 4874695609774708} - m_Father: {fileID: 462018} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &462018 Transform: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 108122} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -95,39 +34,12 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &473076 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 170920} - 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_Children: - - {fileID: 4675695008080542} - m_Father: {fileID: 462018} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &478356 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 175212} - 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_Children: - - {fileID: 4263749786036870} - m_Father: {fileID: 462018} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &11422174 MonoBehaviour: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 108122} m_Enabled: 1 m_EditorHideFlags: 0 @@ -147,227 +59,149 @@ MonoBehaviour: MapWidthInPixels: 200 MapHeightInPixels: 400 BackgroundColor: {r: 0, g: 0, b: 0, a: 1} ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 0} - m_RootGameObject: {fileID: 108122} - m_IsPrefabAsset: 1 ---- !u!1 &1074318236647486 +--- !u!1 &170920 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4263749786036870} - - component: {fileID: 33888533619008670} - - component: {fileID: 23060260893748432} + - component: {fileID: 473076} m_Layer: 0 - m_Name: PC Computer - Undertale - Core Tileset(1) + m_Name: Tile Layer 1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1172877552676812 -GameObject: - m_ObjectHideFlags: 1 +--- !u!4 &473076 +Transform: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 4675695008080542} - - component: {fileID: 33420303090746512} - - component: {fileID: 23251781904783406} - m_Layer: 0 - m_Name: PC Computer - Undertale - Core Tileset(1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1181085048317504 + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 170920} + 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_Children: + - {fileID: 4263749786036870} + m_Father: {fileID: 462018} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &175212 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4527693755342962} - - component: {fileID: 61022475632201062} + - component: {fileID: 478356} m_Layer: 0 - m_Name: RectangleObject + m_Name: Tile Layer 2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1209775362976118 -GameObject: - m_ObjectHideFlags: 1 +--- !u!4 &478356 +Transform: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 4874695609774708} - - component: {fileID: 61608051966722316} - m_Layer: 0 - m_Name: RectangleObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1827111925166534 + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 175212} + 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_Children: + - {fileID: 5685182411409286538} + m_Father: {fileID: 462018} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &188098 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4005722986985020} - - component: {fileID: 61857584658700072} + - component: {fileID: 436934} m_Layer: 0 - m_Name: RectangleObject + m_Name: Object Layer 1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1888132597933118 -GameObject: - m_ObjectHideFlags: 1 +--- !u!4 &436934 +Transform: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 4805652970513816} - - component: {fileID: 61243847926065106} - m_Layer: 0 - m_Name: RectangleObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1924756371600646 + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 188098} + 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_Children: + - {fileID: 4005722986985020} + - {fileID: 5643737666794247080} + - {fileID: 2034948152402515760} + - {fileID: 8321359178836307803} + - {fileID: 16908458198997509} + m_Father: {fileID: 462018} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1074318236647486 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4109915465674544} - - component: {fileID: 61046314034752336} + - component: {fileID: 4263749786036870} + - component: {fileID: 33888533619008670} + - component: {fileID: 23060260893748432} m_Layer: 0 - m_Name: RectangleObject + m_Name: PC Computer - Undertale - Core Tileset(1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4005722986985020 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1827111925166534} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -32, y: -181, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 436934} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4109915465674544 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1924756371600646} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 26, y: -146.875, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 436934} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4263749786036870 Transform: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1074318236647486} 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_Children: [] - m_Father: {fileID: 478356} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4527693755342962 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1181085048317504} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 180.125, y: -136.125, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 436934} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4675695008080542 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1172877552676812} - 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_Children: [] m_Father: {fileID: 473076} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4805652970513816 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1888132597933118} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -11.375, y: -300, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 436934} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4874695609774708 -Transform: - m_ObjectHideFlags: 1 +--- !u!33 &33888533619008670 +MeshFilter: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1209775362976118} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 180.125, y: -102.875, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 436934} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1074318236647486} + m_Mesh: {fileID: 4300000, guid: 789e20ad054a26546900db8e8ca079fc, type: 3} --- !u!23 &23060260893748432 MeshRenderer: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1074318236647486} m_Enabled: 1 m_CastShadows: 0 @@ -376,7 +210,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 - m_RenderingLayerMask: 4294967295 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: b90bff42e575b504a9929ba56d216286, type: 2} m_StaticBatchInfo: @@ -397,13 +232,111 @@ MeshRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 1 ---- !u!23 &23251781904783406 + m_SortingOrder: 0 +--- !u!1 &1827111925166534 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4005722986985020} + - component: {fileID: 61857584658700072} + m_Layer: 0 + m_Name: RectangleObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4005722986985020 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1827111925166534} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 26, y: -146.875, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 436934} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &61857584658700072 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1827111925166534} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 77, y: -36.5} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 154, y: 73} + m_EdgeRadius: 0 +--- !u!1 &4065590252675477895 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5685182411409286538} + - component: {fileID: 4959506155972340358} + - component: {fileID: 6955763850995735281} + m_Layer: 0 + m_Name: PC Computer - Undertale - Core Tileset(1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5685182411409286538 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4065590252675477895} + 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_Children: [] + m_Father: {fileID: 478356} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4959506155972340358 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4065590252675477895} + m_Mesh: {fileID: 4300002, guid: 789e20ad054a26546900db8e8ca079fc, type: 3} +--- !u!23 &6955763850995735281 MeshRenderer: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1172877552676812} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4065590252675477895} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -411,7 +344,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 - m_RenderingLayerMask: 4294967295 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: b90bff42e575b504a9929ba56d216286, type: 2} m_StaticBatchInfo: @@ -432,27 +366,45 @@ MeshRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!33 &33420303090746512 -MeshFilter: - m_ObjectHideFlags: 1 + m_SortingOrder: 1 +--- !u!1 &5851539604850185470 +GameObject: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1172877552676812} - m_Mesh: {fileID: 4300000, guid: 789e20ad054a26546900db8e8ca079fc, type: 3} ---- !u!33 &33888533619008670 -MeshFilter: - m_ObjectHideFlags: 1 + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5643737666794247080} + - component: {fileID: 7296481537241950590} + m_Layer: 0 + m_Name: RectangleObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5643737666794247080 +Transform: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1074318236647486} - m_Mesh: {fileID: 4300002, guid: 789e20ad054a26546900db8e8ca079fc, type: 3} ---- !u!61 &61022475632201062 + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5851539604850185470} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 180.125, y: -136.125, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 436934} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &7296481537241950590 BoxCollider2D: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1181085048317504} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5851539604850185470} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -472,19 +424,51 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 59, y: 122} m_EdgeRadius: 0 ---- !u!61 &61046314034752336 +--- !u!1 &7144078254984563853 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2034948152402515760} + - component: {fileID: 7296271364638965479} + m_Layer: 0 + m_Name: RectangleObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2034948152402515760 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7144078254984563853} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -32, y: -181, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 436934} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &7296271364638965479 BoxCollider2D: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1924756371600646} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7144078254984563853} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 77, y: -36.5} + m_Offset: {x: 25.5, y: -68} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -495,14 +479,46 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 154, y: 73} + m_Size: {x: 51, y: 136} m_EdgeRadius: 0 ---- !u!61 &61243847926065106 +--- !u!1 &7697041145352817625 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8321359178836307803} + - component: {fileID: 5753622176823393795} + m_Layer: 0 + m_Name: RectangleObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8321359178836307803 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7697041145352817625} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -11.375, y: -300, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 436934} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &5753622176823393795 BoxCollider2D: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1888132597933118} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7697041145352817625} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -522,12 +538,44 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 215, y: 59} m_EdgeRadius: 0 ---- !u!61 &61608051966722316 +--- !u!1 &7876194854574486584 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 16908458198997509} + - component: {fileID: 4000058320334235429} + m_Layer: 0 + m_Name: RectangleObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &16908458198997509 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7876194854574486584} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 180.125, y: -102.875, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 436934} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &4000058320334235429 BoxCollider2D: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1209775362976118} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7876194854574486584} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -547,28 +595,3 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 95, y: 278} m_EdgeRadius: 0 ---- !u!61 &61857584658700072 -BoxCollider2D: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1827111925166534} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 25.5, y: -68} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 51, y: 136} - m_EdgeRadius: 0 diff --git a/Assets/Tiled2Unity/Prefabs/test5.prefab b/Assets/Tiled2Unity/Prefabs/test5.prefab index b7d44ccea..96e574ba1 100644 --- a/Assets/Tiled2Unity/Prefabs/test5.prefab +++ b/Assets/Tiled2Unity/Prefabs/test5.prefab @@ -1,37 +1,11 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 0} - m_RootGameObject: {fileID: 1024873750970880} - m_IsPrefabAsset: 1 ---- !u!1 &1009121368450562 -GameObject: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 4476349648793928} - - component: {fileID: 68258954711597254} - m_Layer: 0 - m_Name: PolylineObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1024873750970880 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 4223729940957908} @@ -43,43 +17,54 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1039623379508922 -GameObject: - m_ObjectHideFlags: 1 +--- !u!4 &4223729940957908 +Transform: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 4884208887492208} - - component: {fileID: 61326583645969848} - m_Layer: 0 - m_Name: RectangleObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1049059904639266 -GameObject: - m_ObjectHideFlags: 1 + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1024873750970880} + 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_Children: + - {fileID: 4655166886644270} + - {fileID: 4143477061281516} + - {fileID: 4813426738253004} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &114992522259512466 +MonoBehaviour: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 4261540870177432} - - component: {fileID: 61710131415453432} - m_Layer: 0 - m_Name: RectangleObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1024873750970880} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c0619e460a775cc458d37cb4a214a189, type: 3} + m_Name: + m_EditorClassIdentifier: + Orientation: 0 + StaggerAxis: 1 + StaggerIndex: 0 + HexSideLength: 0 + NumLayers: 2 + NumTilesWide: 52 + NumTilesHigh: 12 + TileWidth: 40 + TileHeight: 40 + ExportScale: 1 + MapWidthInPixels: 2080 + MapHeightInPixels: 480 + BackgroundColor: {r: 0, g: 0, b: 0, a: 1} --- !u!1 &1064818537211094 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 4552248326568602} @@ -92,31 +77,121 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1158443489125602 +--- !u!4 &4552248326568602 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1064818537211094} + 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_Children: [] + m_Father: {fileID: 4655166886644270} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &33083800856714144 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1064818537211094} + m_Mesh: {fileID: 4300000, guid: a290fdadf63fa2843b745be3b9ae38ab, type: 3} +--- !u!23 &23673618452596374 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1064818537211094} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 7ea947c0bf8de2d4982a572cbceb9c7c, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!1 &1462899328005788 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4626680989066874} - - component: {fileID: 61455320700249840} + - component: {fileID: 4813426738253004} m_Layer: 0 - m_Name: RectangleObject + m_Name: Object Layer 1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1159279414185460 +--- !u!4 &4813426738253004 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1462899328005788} + 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_Children: + - {fileID: 4158292855852566} + - {fileID: 4245973373776372} + - {fileID: 4240443218860910687} + - {fileID: 502055310758252430} + - {fileID: 4796882851985593731} + - {fileID: 4537433120656818658} + - {fileID: 2452130216657893193} + - {fileID: 4933578820734812508} + - {fileID: 7049949380736959808} + - {fileID: 2075198698554325758} + - {fileID: 5402607264017107097} + - {fileID: 7122757520942221441} + - {fileID: 5123397281350898043} + - {fileID: 3313085009795066236} + - {fileID: 2697329484852669053} + - {fileID: 9135379367205492864} + m_Father: {fileID: 4223729940957908} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1574834935296902 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4749737794510630} - - component: {fileID: 68429573410563730} + - component: {fileID: 4245973373776372} + - component: {fileID: 68871684585772014} m_Layer: 0 m_Name: PolylineObject m_TagString: Untagged @@ -124,205 +199,216 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1241676472948342 +--- !u!4 &4245973373776372 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1574834935296902} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 200, y: -160, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4813426738253004} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!68 &68871684585772014 +EdgeCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1574834935296902} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_EdgeRadius: 0 + m_Points: + - {x: -0.0416667, y: 0.0208333} + - {x: -120, y: -120} +--- !u!1 &1837335525706062 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4211181547369294} - - component: {fileID: 61470299298021810} + - component: {fileID: 4143477061281516} m_Layer: 0 - m_Name: RectangleObject + m_Name: Foreground m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1320907430305648 +--- !u!4 &4143477061281516 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1837335525706062} + 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_Children: + - {fileID: 4190343574303449264} + m_Father: {fileID: 4223729940957908} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1840146610781288 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4260881409647146} - - component: {fileID: 68861572370759210} + - component: {fileID: 4655166886644270} m_Layer: 0 - m_Name: PolylineObject + m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1350981670576636 +--- !u!4 &4655166886644270 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1840146610781288} + 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_Children: + - {fileID: 4552248326568602} + m_Father: {fileID: 4223729940957908} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1911612352690632 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4717744879041346} - - component: {fileID: 33074764953476134} - - component: {fileID: 23502575969233380} + - component: {fileID: 4158292855852566} + - component: {fileID: 61483515308649220} m_Layer: 0 - m_Name: Snow 2 + m_Name: RectangleObject m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1398648846063026 +--- !u!4 &4158292855852566 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1911612352690632} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 320, y: -200, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4813426738253004} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &61483515308649220 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1911612352690632} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 660, y: -20} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1320, y: 40} + m_EdgeRadius: 0 +--- !u!1 &586285669341695400 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4832394919342242} - - component: {fileID: 61989043812901388} + - component: {fileID: 7122757520942221441} + - component: {fileID: 3314823443461978366} m_Layer: 0 - m_Name: RectangleObject + m_Name: PolylineObject m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1462899328005788 -GameObject: +--- !u!4 &7122757520942221441 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 4813426738253004} - m_Layer: 0 - m_Name: Object Layer 1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1574834935296902 -GameObject: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 4245973373776372} - - component: {fileID: 68871684585772014} - m_Layer: 0 - m_Name: PolylineObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1580041210440570 -GameObject: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 4566018846965328} - - component: {fileID: 61158848388428178} - m_Layer: 0 - m_Name: RectangleObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1689479687039904 -GameObject: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 4838167907831258} - - component: {fileID: 68223421681585436} - m_Layer: 0 - m_Name: PolylineObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1755824878571242 -GameObject: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 4589750361172916} - - component: {fileID: 68729944837697388} - m_Layer: 0 - m_Name: PolylineObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1815118626568716 -GameObject: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 4913466119788452} - - component: {fileID: 61832027957170590} - m_Layer: 0 - m_Name: RectangleObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1837335525706062 -GameObject: + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 586285669341695400} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1640, y: -320, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4813426738253004} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!68 &3314823443461978366 +EdgeCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 4143477061281516} - m_Layer: 0 - m_Name: Foreground - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1840146610781288 + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 586285669341695400} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_EdgeRadius: 0 + m_Points: + - {x: 0, y: -0.0738636} + - {x: 40, y: -40.0455} +--- !u!1 &1149024204242163365 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 4655166886644270} - m_Layer: 0 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1895459164886706 -GameObject: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4510871098715578} - - component: {fileID: 61925902250580260} + - component: {fileID: 4933578820734812508} + - component: {fileID: 5160435054324359487} m_Layer: 0 m_Name: RectangleObject m_TagString: Untagged @@ -330,442 +416,34 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1911612352690632 -GameObject: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 4158292855852566} - - component: {fileID: 61483515308649220} - m_Layer: 0 - m_Name: RectangleObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1988456315979154 -GameObject: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 4950124293241566} - - component: {fileID: 68577125423501882} - m_Layer: 0 - m_Name: PolylineObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4143477061281516 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1837335525706062} - 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_Children: - - {fileID: 4552248326568602} - m_Father: {fileID: 4223729940957908} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4158292855852566 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1911612352690632} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 200, y: -120, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4813426738253004} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4211181547369294 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1241676472948342} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -360, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4813426738253004} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4223729940957908 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1024873750970880} - 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_Children: - - {fileID: 4655166886644270} - - {fileID: 4143477061281516} - - {fileID: 4813426738253004} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4245973373776372 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1574834935296902} - m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068} - m_LocalPosition: {x: 1679.5, y: -160, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4813426738253004} - m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4260881409647146 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1320907430305648} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 280, y: -160.5, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4813426738253004} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4261540870177432 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1049059904639266} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1680, y: -360, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4813426738253004} - m_RootOrder: 15 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4476349648793928 +--- !u!4 &4933578820734812508 Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1009121368450562} - m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068} - m_LocalPosition: {x: 2039.5, y: -320, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4813426738253004} - m_RootOrder: 13 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4510871098715578 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1895459164886706} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 320, y: -200, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4813426738253004} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4552248326568602 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1064818537211094} - 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_Children: [] - m_Father: {fileID: 4143477061281516} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4566018846965328 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1580041210440570} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -240, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4813426738253004} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4589750361172916 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1755824878571242} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2000, y: -160, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4813426738253004} - m_RootOrder: 12 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4626680989066874 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1158443489125602} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2040, y: -200, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4813426738253004} - m_RootOrder: 10 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4655166886644270 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1840146610781288} - 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_Children: - - {fileID: 4717744879041346} - m_Father: {fileID: 4223729940957908} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4717744879041346 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1350981670576636} - 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_Children: [] - m_Father: {fileID: 4655166886644270} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4749737794510630 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1159279414185460} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 200, y: -160, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4813426738253004} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4813426738253004 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1462899328005788} - 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_Children: - - {fileID: 4510871098715578} - - {fileID: 4749737794510630} - - {fileID: 4566018846965328} - - {fileID: 4158292855852566} - - {fileID: 4260881409647146} - - {fileID: 4950124293241566} - - {fileID: 4211181547369294} - - {fileID: 4913466119788452} - - {fileID: 4245973373776372} - - {fileID: 4832394919342242} - - {fileID: 4626680989066874} - - {fileID: 4838167907831258} - - {fileID: 4589750361172916} - - {fileID: 4476349648793928} - - {fileID: 4884208887492208} - - {fileID: 4261540870177432} - m_Father: {fileID: 4223729940957908} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4832394919342242 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1398648846063026} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1680, y: -120, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4813426738253004} - m_RootOrder: 9 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4838167907831258 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1689479687039904} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1640, y: -320, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4813426738253004} - m_RootOrder: 11 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4884208887492208 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1039623379508922} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2040, y: -280, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4813426738253004} - m_RootOrder: 14 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4913466119788452 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1815118626568716} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 320, y: -280, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4813426738253004} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4950124293241566 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1988456315979154} - m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068} - m_LocalPosition: {x: 319.5, y: -320, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4813426738253004} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &23502575969233380 -MeshRenderer: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1350981670576636} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RenderingLayerMask: 4294967295 - m_Materials: - - {fileID: 2100000, guid: 7ea947c0bf8de2d4982a572cbceb9c7c, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!23 &23673618452596374 -MeshRenderer: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1064818537211094} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RenderingLayerMask: 4294967295 - m_Materials: - - {fileID: 2100000, guid: 7ea947c0bf8de2d4982a572cbceb9c7c, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 2 ---- !u!33 &33074764953476134 -MeshFilter: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1350981670576636} - m_Mesh: {fileID: 4300000, guid: a290fdadf63fa2843b745be3b9ae38ab, type: 3} ---- !u!33 &33083800856714144 -MeshFilter: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1064818537211094} - m_Mesh: {fileID: 4300002, guid: a290fdadf63fa2843b745be3b9ae38ab, type: 3} ---- !u!61 &61158848388428178 + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1149024204242163365} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 320, y: -280, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4813426738253004} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &5160435054324359487 BoxCollider2D: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1580041210440570} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1149024204242163365} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 40, y: -20} + m_Offset: {x: 660, y: -20} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -776,46 +454,102 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 80, y: 40} + m_Size: {x: 1320, y: 40} m_EdgeRadius: 0 ---- !u!61 &61326583645969848 -BoxCollider2D: - m_ObjectHideFlags: 1 +--- !u!1 &1557081480596013594 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3313085009795066236} + - component: {fileID: 305071401460532573} + m_Layer: 0 + m_Name: PolylineObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3313085009795066236 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1557081480596013594} + m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068} + m_LocalPosition: {x: 2039.5, y: -320, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4813426738253004} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!68 &305071401460532573 +EdgeCollider2D: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1039623379508922} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1557081480596013594} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 20, y: -20} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 40, y: 40} + m_Offset: {x: 0, y: 0} m_EdgeRadius: 0 ---- !u!61 &61455320700249840 + m_Points: + - {x: 0, y: 0.5625} + - {x: 40, y: -39.5} +--- !u!1 &2095467408197434278 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2075198698554325758} + - component: {fileID: 632664326067945327} + m_Layer: 0 + m_Name: RectangleObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2075198698554325758 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2095467408197434278} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1680, y: -120, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4813426738253004} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &632664326067945327 BoxCollider2D: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1158443489125602} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2095467408197434278} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 20, y: -20} + m_Offset: {x: 160, y: -20} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -826,14 +560,46 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 40, y: 40} + m_Size: {x: 320, y: 40} m_EdgeRadius: 0 ---- !u!61 &61470299298021810 +--- !u!1 &2721895035680735446 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2452130216657893193} + - component: {fileID: 4566361937504480816} + m_Layer: 0 + m_Name: RectangleObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2452130216657893193 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2721895035680735446} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -360, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4813426738253004} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &4566361937504480816 BoxCollider2D: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1241676472948342} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2721895035680735446} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -853,19 +619,51 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 280, y: 40} m_EdgeRadius: 0 ---- !u!61 &61483515308649220 +--- !u!1 &4166493947162343653 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5402607264017107097} + - component: {fileID: 1997181110929047584} + m_Layer: 0 + m_Name: RectangleObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5402607264017107097 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4166493947162343653} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 2040, y: -200, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4813426738253004} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &1997181110929047584 BoxCollider2D: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1911612352690632} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4166493947162343653} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 40, y: -20} + m_Offset: {x: 20, y: -20} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -876,21 +674,53 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 80, y: 40} + m_Size: {x: 40, y: 40} m_EdgeRadius: 0 ---- !u!61 &61710131415453432 +--- !u!1 &4404947127678603395 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2697329484852669053} + - component: {fileID: 3126830891708353734} + m_Layer: 0 + m_Name: RectangleObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2697329484852669053 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4404947127678603395} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 2040, y: -280, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4813426738253004} + m_RootOrder: 14 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &3126830891708353734 BoxCollider2D: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1049059904639266} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4404947127678603395} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 160, y: -20} + m_Offset: {x: 20, y: -20} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -901,21 +731,151 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 320, y: 40} + m_Size: {x: 40, y: 40} + m_EdgeRadius: 0 +--- !u!1 &4885025069904081327 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7049949380736959808} + - component: {fileID: 1178971144008255599} + m_Layer: 0 + m_Name: PolylineObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7049949380736959808 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4885025069904081327} + m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068} + m_LocalPosition: {x: 1679.5, y: -160, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4813426738253004} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!68 &1178971144008255599 +EdgeCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4885025069904081327} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_EdgeRadius: 0 + m_Points: + - {x: 0, y: 0.5625} + - {x: 40, y: -39.5} +--- !u!1 &5014475918418122235 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4537433120656818658} + - component: {fileID: 8523391018087368199} + m_Layer: 0 + m_Name: PolylineObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4537433120656818658 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5014475918418122235} + m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068} + m_LocalPosition: {x: 319.5, y: -320, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4813426738253004} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!68 &8523391018087368199 +EdgeCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5014475918418122235} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} m_EdgeRadius: 0 ---- !u!61 &61832027957170590 + m_Points: + - {x: 0, y: 0.5625} + - {x: 40, y: -39.5} +--- !u!1 &5023970805145959701 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4240443218860910687} + - component: {fileID: 469883288614656332} + m_Layer: 0 + m_Name: RectangleObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4240443218860910687 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5023970805145959701} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -240, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4813426738253004} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &469883288614656332 BoxCollider2D: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1815118626568716} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5023970805145959701} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 660, y: -20} + m_Offset: {x: 40, y: -20} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -926,39 +886,123 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 1320, y: 40} + m_Size: {x: 80, y: 40} m_EdgeRadius: 0 ---- !u!61 &61925902250580260 -BoxCollider2D: - m_ObjectHideFlags: 1 +--- !u!1 &5029527385453260590 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4190343574303449264} + - component: {fileID: 3394818552091551918} + - component: {fileID: 1174604475410029845} + m_Layer: 0 + m_Name: Snow 2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4190343574303449264 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5029527385453260590} + 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_Children: [] + m_Father: {fileID: 4143477061281516} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3394818552091551918 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5029527385453260590} + m_Mesh: {fileID: 4300002, guid: a290fdadf63fa2843b745be3b9ae38ab, type: 3} +--- !u!23 &1174604475410029845 +MeshRenderer: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1895459164886706} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5029527385453260590} m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 660, y: -20} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1320, y: 40} - m_EdgeRadius: 0 ---- !u!61 &61989043812901388 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 7ea947c0bf8de2d4982a572cbceb9c7c, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 2 +--- !u!1 &5761371039435873454 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9135379367205492864} + - component: {fileID: 9019396968019943398} + m_Layer: 0 + m_Name: RectangleObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9135379367205492864 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5761371039435873454} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1680, y: -360, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4813426738253004} + m_RootOrder: 15 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &9019396968019943398 BoxCollider2D: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1398648846063026} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5761371039435873454} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -978,12 +1022,44 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 320, y: 40} m_EdgeRadius: 0 ---- !u!68 &68223421681585436 +--- !u!1 &6535497239748501259 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5123397281350898043} + - component: {fileID: 8854593105790235860} + m_Layer: 0 + m_Name: PolylineObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5123397281350898043 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6535497239748501259} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 2000, y: -160, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4813426738253004} + m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!68 &8854593105790235860 EdgeCollider2D: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1689479687039904} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6535497239748501259} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -995,46 +1071,44 @@ EdgeCollider2D: m_Points: - {x: 0, y: -0.0738636} - {x: 40, y: -40.0455} ---- !u!68 &68258954711597254 -EdgeCollider2D: - m_ObjectHideFlags: 1 +--- !u!1 &8427968321868361190 +GameObject: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1009121368450562} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_EdgeRadius: 0 - m_Points: - - {x: 0, y: 0.5625} - - {x: 40, y: -39.5} ---- !u!68 &68429573410563730 -EdgeCollider2D: - m_ObjectHideFlags: 1 + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4796882851985593731} + - component: {fileID: 3473499971235760239} + m_Layer: 0 + m_Name: PolylineObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4796882851985593731 +Transform: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1159279414185460} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_EdgeRadius: 0 - m_Points: - - {x: -0.0416667, y: 0.0208333} - - {x: -120, y: -120} ---- !u!68 &68577125423501882 + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8427968321868361190} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 280, y: -160.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4813426738253004} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!68 &3473499971235760239 EdgeCollider2D: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1988456315979154} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8427968321868361190} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -1046,78 +1120,60 @@ EdgeCollider2D: m_Points: - {x: 0, y: 0.5625} - {x: 40, y: -39.5} ---- !u!68 &68729944837697388 -EdgeCollider2D: - m_ObjectHideFlags: 1 +--- !u!1 &8451709643041568258 +GameObject: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1755824878571242} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_EdgeRadius: 0 - m_Points: - - {x: 0, y: -0.0738636} - - {x: 40, y: -40.0455} ---- !u!68 &68861572370759210 -EdgeCollider2D: - m_ObjectHideFlags: 1 + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 502055310758252430} + - component: {fileID: 448928264639939395} + m_Layer: 0 + m_Name: RectangleObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &502055310758252430 +Transform: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1320907430305648} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_EdgeRadius: 0 - m_Points: - - {x: 0, y: 0.5625} - - {x: 40, y: -39.5} ---- !u!68 &68871684585772014 -EdgeCollider2D: - m_ObjectHideFlags: 1 + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8451709643041568258} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 200, y: -120, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4813426738253004} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &448928264639939395 +BoxCollider2D: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1574834935296902} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8451709643041568258} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} + m_Offset: {x: 40, y: -20} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 80, y: 40} m_EdgeRadius: 0 - m_Points: - - {x: 0, y: 0.5625} - - {x: 40, y: -39.5} ---- !u!114 &114992522259512466 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1024873750970880} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c0619e460a775cc458d37cb4a214a189, type: 3} - m_Name: - m_EditorClassIdentifier: - Orientation: 0 - StaggerAxis: 1 - StaggerIndex: 0 - HexSideLength: 0 - NumLayers: 2 - NumTilesWide: 52 - NumTilesHigh: 12 - TileWidth: 40 - TileHeight: 40 - ExportScale: 1 - MapWidthInPixels: 2080 - MapHeightInPixels: 480 - BackgroundColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Build.py b/Build.py index ea99c2b5e..9bd613b2c 100644 --- a/Build.py +++ b/Build.py @@ -22,7 +22,7 @@ ### Script Vars ### # This is the version of CYF to name the executables and the Documentation folder -CYFversion = "0.6.6 LTS 2" +CYFversion = "0.6.6 LTS 3" # This is the path we will build to buildPath = os.getcwd() + "\\bin" diff --git a/Documentation CYF 1.0/css/themesidebar.css b/Documentation CYF 1.0/css/themesidebar.css index 453986460..2d550315f 100644 --- a/Documentation CYF 1.0/css/themesidebar.css +++ b/Documentation CYF 1.0/css/themesidebar.css @@ -15,6 +15,7 @@ border: 1px solid #ddd; text-align: left; padding: 5px 5px; + font-weight: normal; } *:not(.syntaxhighlighter) > table tr:nth-child(even) { @@ -218,27 +219,33 @@ h4 { -ms-interpolation-mode: nearest-neighbor; /* IE8+ */ } -.li-header{ - color:#fff; -} - .linklike { color: #8ad; text-decoration:underline; cursor:pointer; } -ul.nav li a, ul.nav .li-header { +ul.nav li a, ul.nav .li-header, ul.nav .li-subheader { font-size: 13px; line-height:13px; height: auto !important; - padding-bottom: 3 !important; - padding-top: 0 !important; + padding-top: 0px; margin-bottom: 5px; left: -10px; width: 180px; } +.li-subheader { + width: 170px; + color:#fff; + padding-top: 3px !important; +} + +.li-header { + color:#fff; + padding-top: 3px !important; +} + ul.nav li a { border-top: 8px solid rgba(0,0,0,0); } @@ -252,9 +259,11 @@ ul.nav li a:hover, ul.nav li a:active { color: #8ad; } -ul.nav li.active a { - background-color:#222 !important; - color: #8ad; +ul.nav li.active { + font-size: 13px; + line-height: 13px; + height: auto !important; + padding-bottom: 5px; } h2 { diff --git a/Documentation CYF 1.0/img/columns.png b/Documentation CYF 1.0/img/columns.png new file mode 100644 index 000000000..03caf2a9d Binary files /dev/null and b/Documentation CYF 1.0/img/columns.png differ diff --git a/Documentation CYF 1.0/img/icon.png b/Documentation CYF 1.0/img/icon.png new file mode 100644 index 000000000..7d3674da5 Binary files /dev/null and b/Documentation CYF 1.0/img/icon.png differ diff --git a/Documentation CYF 1.0/index.html b/Documentation CYF 1.0/index.html index c93a4e70e..d5ff95564 100644 --- a/Documentation CYF 1.0/index.html +++ b/Documentation CYF 1.0/index.html @@ -23,68 +23,10 @@ Undertale background
-
- - -
+ + + +
@@ -105,7 +47,7 @@

Welcome to Create Your Frisk's documentation!



Note: Create Your Frisk v0.6.6 was built using Unity Personal 2018.4.36f1, also known as Unity 2018's Long Term Support version, which you can find here.
See the GitHub page here.


- Indicates new or changed content in Create Your Frisk v0.6.6. + Indicates new or changed content in Create Your Frisk v0.6.6 LTS 3.

Finally, you should start your visit with How to read this documentation.
diff --git a/Documentation CYF 1.0/js/SideBar.js b/Documentation CYF 1.0/js/SideBar.js new file mode 100644 index 000000000..fa1baec81 --- /dev/null +++ b/Documentation CYF 1.0/js/SideBar.js @@ -0,0 +1,259 @@ +// Names of the various tabs of the side bar +// Empty strings are separators +const tabs = [ + "Welcome", + "How to read this documentation", + "", + "Controls", + "Basic Setup", + "Unity Setup (Optional)", + "Special Variables", + "Terminology", + + "Text Commands", + "Game Events", + "", + "Misc. Functions", + "General Objects", + "The Player Object", + "The Script Object", + "The Audio Object", + "The NewAudio Object", + "The Input Object", + "The Text Object", + "The Time Object", + "The Inventory Object", + "The Misc Object", + "The Discord Object", + "The Arena Object", + "The UI Object", + + "", + "Projectile Management", + "The Pixel-Perfect Collision System", + "Sprites & Animation", + "", + + "Shader Introduction", + "The Shader Object", + "Coding a Shader", + "", + + "Overworld Basics", + "How to create a map", + "How to create an event", + "How to animate an event", + "How to create a shop", + "", + + "The General Overworld Object", + "The Event Overworld Object", + "The Player Overworld Object", + "The Screen Overworld Object", + "The Inventory Overworld Object", + "The Map Overworld Object", + + "", + + "Dialog Bubble Names", + "Key List", + "Item List" +]; + +// Links for tabs which have one +const links = new Map([ + ["Welcome", "index.html"], + ["How to read this documentation", "howtoread.html"], + ["Controls", "controls.html"], + ["Basic Setup", "basic.html"], + ["Unity Setup (Optional)", "unity.html"], + ["Special Variables", "variables.html"], + ["Terminology", "terms.html"], + + ["Text Commands", "api-text.html"], + ["Game Events", "api-events.html"], + + ["Misc. Functions", "api-functions-main.html"], + ["General Objects", "api-functions-object.html"], + ["The Player Object", "api-functions-player.html"], + ["The Script Object", "api-functions-script.html"], + ["The Audio Object", "api-functions-audio.html"], + ["The NewAudio Object", "api-functions-newaudio.html"], + ["The Input Object", "api-functions-input.html"], + ["The Text Object", "cyf-text.html"], + ["The Time Object", "api-functions-time.html"], + ["The Inventory Object", "cyf-inventory.html"], + ["The Misc Object", "api-functions-misc.html"], + ["The Discord Object", "api-functions-discord.html"], + ["The Arena Object", "api-functions-waves.html"], + ["The UI Object", "api-functions-ui.html"], + + ["Projectile Management", "api-projectile.html"], + ["The Pixel-Perfect Collision System", "cyf-ppcollision.html"], + ["Sprites & Animation", "api-animation.html"], + + ["Shader Introduction", "shaders.html"], + ["The Shader Object", "shaders-object.html"], + ["Coding a Shader", "shaders-coding.html"], + + ["Overworld Basics", "overworld.html"], + ["How to create a map", "overworld-howto-map.html"], + ["How to create an event", "overworld-howto-event.html"], + ["How to animate an event", "overworld-howto-animevent.html"], + ["How to create a shop", "overworld-howto-shop.html"], + + ["The General Overworld Object", "overworld-object-general.html"], + ["The Event Overworld Object", "overworld-object-event.html"], + ["The Player Overworld Object", "overworld-object-player.html"], + ["The Screen Overworld Object", "overworld-object-screen.html"], + ["The Inventory Overworld Object", "overworld-object-inventory.html"], + ["The Map Overworld Object", "overworld-object-map.html"], + + ["Dialog Bubble Names", "media/dialogoptions.png"], + ["Key List", "api-keys.html"], + ["Item List", "item-list.html"] +]); + +// These pages are not in the pages folder of the docs +const pageIsInRoot = [ "Welcome", "Dialog Bubble Names" ]; + +// Tabs at which these categories start +const categoriesStart = new Map([ + ["Basics", "Welcome"], + ["API", "Text Commands"], + ["Functions & Objects:", "Misc. Functions"], + ["Shaders", "Shader Introduction"], + ["Overworld", "Overworld Basics"], + ["Overworld Objects:", "The General Overworld Object"], + ["Resources", "Dialog Bubble Names"] +]); + +// Tabs before which these categories ends +// If there's no value, then the category ends at the end of the side bar +const categoriesEnd = new Map([ + ["Basics", "Text Commands"], + ["API", "Shader Introduction"], + ["Functions & Objects:", "Projectile Management"], + ["Shaders", "Overworld Basics"], + ["Overworld", "Dialog Bubble Names"], + ["Overworld Objects:", "Dialog Bubble Names"] +]); + +// Categories with an exclamation mark next to them +// Used to set apart categories with new elements in them +const isNew = [ + "Special Variables", "Text Commands", "Game Events", + "The Text Object", "The Arena Object", "The UI Object", + "Projectile Management", "Sprites & Animation", + "General Objects", "Item List", "Key List", + "The Input Object" ]; + +// Categories with a prefix +// Used for categories only added during CYF's development +const isCYF = [ + "Unity Setup (Optional)", "The NewAudio Object", + "The Text Object", "The Inventory Object", + "The Misc Object", "The Discord Object", + "The UI Object", "The Pixel-Perfect Collision System", + "Shaders", "Overworld", "Key List", "Item List" ]; + +// Returns the various classes an element should have depending on its category depth, +// whether it's active and whether it's a header or not +function GetClasses(title, depth, isActiveTab, isHeader = false) { + var hasIndent = depth > 1; + var hasNew = isNew.includes(title); + var headerType = isHeader ? (depth == 1 ? "li-header " : "li-subheader ") : ""; + return headerType + (hasIndent ? "li-indent " : "") + (hasNew ? "new " : "") + (isActiveTab ? "active" : ""); +} + +// Fetches the link of an element. Returns an empty string if it has none +// Also takes in account whether the current page is in the pages folder or not +function GetLink(title, isInRoot) { + if (!links.has(title)) + return ""; + var link = links.get(title); + var needsRoot = pageIsInRoot.includes(title); + if (isInRoot && !needsRoot) + link = "pages/" + link; + else if (!isInRoot && needsRoot) + link = "../" + link; + return link; +} + +// Main function creating the entire side bar +function CreateSideBar(activeTab) { + var contents = '
'; + + // Write it all in the HTML document + document.write(contents); +} \ No newline at end of file diff --git a/Documentation CYF 1.0/pages/api-animation.html b/Documentation CYF 1.0/pages/api-animation.html index be5cda16b..fb910903b 100644 --- a/Documentation CYF 1.0/pages/api-animation.html +++ b/Documentation CYF 1.0/pages/api-animation.html @@ -12,7 +12,7 @@ - + CYF Documentation - Sprites & Animation @@ -28,68 +28,10 @@ Undertale background
-
- - -
+ + + +
@@ -155,6 +97,9 @@

The Sprite object

The Sprite object has many controls intended for animation. There is a working intermediate example included in the Examples folder. +
+ As this object exists in CYF's hierarchy, it's possible to manipulate its parent and children. + See the General Objects page for more information.


@@ -382,6 +327,13 @@

The Sprite object

It's clamped between 0 and 360, so if you set it to 365, it will become 5.


+

+ sprite.localRotation + Gets or sets a sprite's local rotation, as in its rotation compared to its parent, in degrees. +

+ It's clamped between 0 and 360, so if you set it to 365, it will become 5. +


+

sprite.layer Gets or sets the current layer a sprite is on. Does nothing if you set it to a layer that doesn't exist. @@ -390,30 +342,29 @@

The Sprite object



Overworld Event sprites and Text Objects letter sprites can not have their layers set.

- Note: It is common practice to use sprite.layer to deparent + Note: It is common practice to use sprite.layer to deparent a sprite if you need to do so. Setting it again will parent the sprite to the given layer, removing its previous parenting altogether.


- sprite.Set( newSprite) - Change a sprite's current image. It retains its scaling and rotation. + sprite.characterNumber + Only used for letters fetched through Text.GetLetters(). Gets the index of the character this + sprite displays. If the current letter shows the first character of the text object, then its number will be + 0.

- If you have an animation running with SetAnimation, the animation will override your sprite change. -

- Note: Using this function with a sprite which has a parent with a different rotation will reset the sprite's rotation to its usual value. - Setting the variable noscalerotationbug to true in the Encounter script prevents that effect! + Non-displayed letters and text commands are taken in account, meaning if text commands are before the first shown letter + of the text, its index won't be 0.


- sprite.SetParent(sprite otherSpriteObject) - Parents sprite to otherSpriteObject. + sprite.Set( newSprite) + Change a sprite's current image. It retains its scaling and rotation.

- This will make the original sprite move along with the object it's parented to. + If you have an animation running with SetAnimation, the animation will override your sprite change.

- NOTE: If you are in the Overworld, you can NOT use this to parent sprites to Event objects' sprites, - or vice versa.
- Text Object letter sprites can only be parented to other Text Object letter sprites. + Note: Using this function with a sprite which has a parent with a different rotation will reset the sprite's rotation to its usual value. + Setting the variable noscalerotationbug to true in the Encounter script prevents that effect!


@@ -511,7 +462,7 @@

The Sprite object



See sprite.xscale and sprite.yscale.

- Note: Using this function with a sprite which has a parent with a different rotation will reset the sprite's rotation to its usual value. + Note: Using this function with a sprite which has a parent with a different rotation will reset the sprite's rotation to its usual value. Setting the variable noscalerotationbug to true in the Encounter script prevents that effect!


@@ -530,7 +481,7 @@

The Sprite object



This can use sprites with different sizes!

- Note: Using this function with a sprite which has a parent with a different rotation will reset the sprite's rotation to its usual value. + Note: Using this function with a sprite which has a parent with a different rotation will reset the sprite's rotation to its usual value. Setting the variable noscalerotationbug to true in the Encounter script prevents that effect!


@@ -573,20 +524,20 @@

The Sprite object

sprite.SetVar( yourVariableName, value) -
or sprite[ yourVariableName] +
or sprite[ yourVariableName] = value Sets a variable in a sprite object that you can retrieve with sprite.GetVar.
Identical to SetVar in projectiles.


sprite.GetVar( yourVariableName) -
or sprite[ yourVariableName] = value +
or sprite[ yourVariableName] Gets a variable in a sprite object that you previously set with sprite.SetVar.
Identical to GetVar in projectiles.


- sprite.Dust( playSound=true, removeObject = false) + sprite.Dust( playSound = true, removeObject = false) Turns a sprite into dust, just like what happens in Undertale when an enemy is killed.

Will remove a bullet or sprite if removeObject is set to true. diff --git a/Documentation CYF 1.0/pages/api-events.html b/Documentation CYF 1.0/pages/api-events.html index a6b41b30a..bc932dd67 100644 --- a/Documentation CYF 1.0/pages/api-events.html +++ b/Documentation CYF 1.0/pages/api-events.html @@ -12,7 +12,7 @@ - + CYF Documentation - Game Events @@ -28,68 +28,10 @@ Undertale background

-
- - -
+ + + +
@@ -140,7 +82,7 @@

Encounter script events

last enemy in the encounter, this function will not happen - the encounter is over at that point.

-
HandleFlee( success) +
HandleFlee( success) Happens when you select the Flee option from the Mercy menu. If you implement HandleFlee(), the fleeing sequence will not run automatically, and you will have to do it manually with the Flee() function.

    @@ -225,6 +167,16 @@

    Encounter script events

    If you use Player.hp or Player.Heal here to bring the Player's hp back to greater than 0, they will live and the Game Over sequence will be cancelled.

    +

    +
    OnTextDisplay(text text) + Every time any text object's letters are created, this function gets called. This function is the best + place to manipulate the text object's letters using Text.GetLetters. +

    + The argument text is the text object itself. +

    + This event isn't called for text objects which have their own Text.OnTextDisplay() + function. +



    Monster script events

    @@ -337,24 +289,7 @@

    All-script events



    If you implement this function in your script, you have to manually define what should happen after bullet collision. This is what allows you to create orange, cyan and green projectiles, and much much more. If you don't implement this function in your script, it'll stick to the default of dealing 3 - damage on hit. -

    -

    -
    OnTextAdvance(text text, final) - Every time a Text Object automatically advances to the next line of text (that's - by any means except Text.NextLine()), this function gets called in the - script that created the text object. This function is the best place to manipulate the letters from - Text.GetLetters. -

    - text is the text object in question, while final is - true only if the text object just advanced past its last line and deleted itself now that it's finished. -

    - Text objects have a one-frame delay by default - see CreateText in - The Text Object. If the text object is using this delay, then this function will - additionally be called on the first frame it starts to type (so one frame after it gets created). But if - you disable the one-frame delay, this function will not be called for the first line of text, since - you would already be able to access Text.GetLetters and similar properties right - after calling CreateText. + damage on hit.

diff --git a/Documentation CYF 1.0/pages/api-functions-audio.html b/Documentation CYF 1.0/pages/api-functions-audio.html index 65c15414e..4508e9d6d 100644 --- a/Documentation CYF 1.0/pages/api-functions-audio.html +++ b/Documentation CYF 1.0/pages/api-functions-audio.html @@ -12,7 +12,7 @@ - + CYF Documentation - The Audio Object @@ -28,68 +28,10 @@ Undertale background
-
- - -
+ + + +
diff --git a/Documentation CYF 1.0/pages/api-functions-discord.html b/Documentation CYF 1.0/pages/api-functions-discord.html index 2eb471c2e..e31939bcc 100644 --- a/Documentation CYF 1.0/pages/api-functions-discord.html +++ b/Documentation CYF 1.0/pages/api-functions-discord.html @@ -12,7 +12,7 @@ - + CYF Documentation - The Discord Object @@ -23,68 +23,10 @@ Undertale background
-
- - -
+ + + +
diff --git a/Documentation CYF 1.0/pages/api-functions-input.html b/Documentation CYF 1.0/pages/api-functions-input.html index b6e7cea16..5c1191325 100644 --- a/Documentation CYF 1.0/pages/api-functions-input.html +++ b/Documentation CYF 1.0/pages/api-functions-input.html @@ -12,7 +12,7 @@ - + CYF Documentation - The Input Object @@ -23,99 +23,143 @@ Undertale background
-
- - -
+ + + +
+
The Input object [E/M/W]

-
The Input object [E/M/W] - The Input object allows you to retrieve input status. All keys will return a number; 0 when not pressed, - 1 on the first frame the key is pressed, 2 while it's being held, and -1 on the first frame it's released. - You can check if a key's value is greater than 0 to see if it's pressed, or if it's exactly 1/-1 to only - have an action if it was just pressed/released. Possible key options are below.
+ The Input object allows you to retrieve input status.
- Note: do not rely on the Input object to replace proper UI controls. Changing game state in the UI based + All keys will return a number. Here are the different values each variable or function below returns, if + it returns a number: +

    +
  • 2: The key is being held
    • +
  • 1: The key is being pressed this very frame
    • +
  • 0: The key isn't being pressed
    • +
  • -1: The key has been released this very frame
    • +
+

+

+ Following these values, you can check if a key's value is greater than 0 to see if it's pressed, or if + it's exactly 1/-1 to only have an action if it was just pressed/released. +
+ Possible key options are below: +

    +
  • Input.Confirm - Z or Enter
    • +
  • Input.Cancel - X or any Shift key
    • +
  • Input.Menu - C or any Control key
    • +
  • Input.Up - Up arrow or W
    • +
  • Input.Down - Down arrow or S
    • +
  • Input.Left - Left arrow or A
    • +
  • Input.Right - Right arrow or D
    • +
+

+

+ Note: do not rely on the Input object to replace proper UI controls. Changing game state in the UI based on input will likely cause a fair share of issues and is not supported at this moment (but feel free to see what does and doesn't work).

+
+

+ Here follows a list of other variables and functions available within the Input object. +
Keep in mind that the Key List page shows a + list of most available keys within the engine. +


    -
  • Input.Confirm - Z or Enter keys

    • -
  • Input.Cancel - X or Left Shift keys

    • -
  • Input.Menu - C or Left Control keys

    • -
  • Input.Up - Up arrow or W

    • -
  • Input.Down - Down arrow or S

    • -
  • Input.Left - Left arrow or A

    • -
  • Input.Right - Right arrow or D

    • -
  • Input.GetKey( keyname) - Get the state of the given key. -
    Check the Key List to see the available keys.

    • -
  • Input.MousePosX (readonly) - Returns the X position of the mouse relative to the - bottom left corner of the screen. (from 0 to 639)

    • -
  • Input.MousePosY (readonly) - Returns the Y position of the mouse relative to the - bottom left corner of the screen. (from 0 to 479)

    • -
  • Input.IsMouseInWindow (readonly) - Returns true if the mouse is in the window, false - otherwise.

    • -
  • Input.MouseScroll (readonly) - Returns a number representing the change in the user's scroll wheel position (or movement supplied by the trackpad when using a Mac). 0 represents no movement, while a positive number means the user is scrolling up, and a negative number means the user is scrolling down.

    • +
  • Input.MousePosX (readonly) + - Returns the X position of the mouse relative to the bottom left corner of the screen. + (from 0 to 639)

    • + +
  • Input.MousePosY (readonly) + - Returns the Y position of the mouse relative to the bottom left corner of the screen. + (from 0 to 479)

    • + +
  • Input.IsMouseInWindow + (readonly) - Returns true if the mouse is in the window, false otherwise.

    • + +
  • Input.IsMouseVisible + - Returns true if the mouse cursor is visible, false otherwise. True by default. Can be set in order to hide or + show the mouse cursor.

    • + +
  • Input.MouseScroll + (readonly) - Returns a number representing the change in the user's scroll wheel position (or movement supplied + by the trackpad when using a Mac). + 0 represents no movement, while a positive number means the user is scrolling up, and + a negative number means the user is scrolling down.

    • + +
  • Input.GetKey( + keyname) - Gets the state of the given key.

    • + +
  • Input.GetAxisRaw( + axisName) - Gets the precise state of the given axis (joystick, trigger, + D-Pad), between -1 and 1.

    • + +
  • + Input.GetPressedKeys() - Gets a list of all the keys which are currently pressed. This function only takes + keys in account, not axes.

    • + +
  • + Input.GetHeldKeys() - Gets a list of all the keys which are currently held. This function only takes keys + in account, not axes.

    • + +
  • + Input.GetReleasedKeys() - Gets a list of all the keys which are currently being released. This function + only takes keys in account, not axes.

    • + +
  • Input.CreateKeybind( name, + keys = { }) - Creates a keybind, which can be + used as a shortcut to get the state of several keys at the same time. +
    For quick setup, you can give it a list of keys to bind to it immediately, or you can only give it a name + and use the functions Input.SetKeybindKeys() or + Input.BindKeyToKeybind() to bind keys to it afterwards.

    • + +
  • Input.RemoveKeybind( name + - Completely removes an existing keybind. +
    Note that base CYF keybinds cannot be deleted, as it would cause errors when the engine tries to fetch them. +

    • + +
  • Input.SetKeybindKeys( name, + keys) OR + Input[ name] = + keys - Replaces a keybind's list of bound keys + with the given list of keys, erasing any keys set before running this function.

    • + +
  • Input.BindKeyToKeybind( + name, key) - Adds a key to the keys bound to the + given keybind. Returns true if the key was successfully bound to the keybind, false otherwise. +
    If the key is already bound to the given keybind, nothing will happen and this function will return false. +

    • + +
  • Input.UnbindKeyFromKeybind( + name, key) - Removes a key from the keys bound + to the given keybind. Returns true if the key was successfully unbound from the keybind, false otherwise. +
    If the key is not bound to the given keybind, nothing will happen and this function will return false. +

    • + +
  • Input.GetKeybind( + name) OR Input[ name] + - Gets the state of the given keybind.

    • + +
  • + Input.GetKeybindKeys( name) - Returns a table of the keys currently bound to + the given keybind.

    • + +
  • + + Input.GetKeybindConflicts() - Returns a table containing one table for each existing keybind conflict. + Each conflict table contains as its first value the key that currently has a conflict, with each following + values being the keybinds containing this key. +
    Example: If the key T is bound to both keybinds + Confirm and Cancel, then the resulting conflict table will + be { "T", "Confirm", "Cancel" }.

    • + +
  • Input.ResetKeybinds() - Resets all created + and modified keybinds within the encounter, effectively wiping any keybind changes made in this encounter. +

diff --git a/Documentation CYF 1.0/pages/api-functions-main.html b/Documentation CYF 1.0/pages/api-functions-main.html index 59b92bb0b..4ae2470cb 100644 --- a/Documentation CYF 1.0/pages/api-functions-main.html +++ b/Documentation CYF 1.0/pages/api-functions-main.html @@ -12,7 +12,7 @@ - + CYF Documentation - Misc. Functions @@ -28,68 +28,10 @@ Undertale background
-
- - -
+ + + +
@@ -237,12 +179,12 @@

All-script functions

-
CreateState( name) [E/M/W] +
CreateState( name) [E/M/W] This function creates a custom state with the name name, which will function like the NONE state. You cannot have two states with the same name.

-
UnloadSprite( path) [E/M/W] +
UnloadSprite( path) [E/M/W] This function removes the sprite loaded through path from CYF's internal cache, allowing you to load it from your folder again.

Usually, CYF keeps all sprites it loads in an encounter in memory so the engine does not have to load it again, which may create a lag spike. However, if the sprite is changed during the mod, the file will not be reloaded, and only its first version will be kept until the encounter is over, or the mod is unloaded in the overworld. @@ -368,7 +310,7 @@

Encounter script functions

-
CreateEnemy( scriptName, +
CreateEnemy( scriptName, x, y) [E] This function creates an enemy script using the script scriptName in the Lua/Monsters folder of your mod, which will act as a new enemy in battle, and returns a reference to it.

@@ -379,7 +321,7 @@

Encounter script functions

-
Flee() [E/M/W] +
Flee() [E] This function runs the fleeing sequence.

@@ -401,7 +343,7 @@

Monster script functions

-
SetDamage(amount) [M] +
SetDamage( amount) [M] Set the amount of damage the monster will take the next time it is attacked. Can be negative.
Set amount to the amount of damage the monster will take, or 0 to make the attack miss.

@@ -411,14 +353,14 @@

Monster script functions

-
Kill( playSound = true) [M] +
Kill( playSound = true) [M] Kills the monster immediately. If this was the last monster, the battle ends.
Does NOT call the Game Event OnDeath.

If playSound is set to false, the dusting sound will not be played.

-
Spare( playSound = true) [M] +
Spare( playSound = true) [M] Spares the monster immediately. Similar to Kill(), if this was the last monster, the battle ends.
Does NOT call the Game Event OnSpare.

If playSound is set to false, the sparing sound will not be played. @@ -461,7 +403,7 @@

Monster script functions

-
Remove() [M] +
Remove() [M] This function immediately removes this enemy from the encounter, including the script it's been called from.

Be aware that removing an enemy this way will NOT remove it from the Encounter script's enemies table, so you have to manage the table yourself by removing this enemy script from it before running this function, because any reference to it will be invalid. diff --git a/Documentation CYF 1.0/pages/api-functions-misc.html b/Documentation CYF 1.0/pages/api-functions-misc.html index 20399fe18..6296749ba 100644 --- a/Documentation CYF 1.0/pages/api-functions-misc.html +++ b/Documentation CYF 1.0/pages/api-functions-misc.html @@ -12,7 +12,7 @@ - + CYF Documentation - The Misc Object @@ -28,68 +28,10 @@ Undertale background

-
- - -
+ + + +
@@ -118,21 +60,21 @@
  • Misc.cameraY - Gets or sets the current y position of the bottom-left corner of the camera.

  • Misc.FullScreen - Gets or sets whether the user is in fullscreen mode.

  • - Misc.ResizeWindow( width, height) - Resizes CYF's window to the given width and height, in pixels. The parameters width and height must both be positive, and the function will return true if the window was successfully resized, false otherwise. The window will not be resized if the requested width or height are bigger than the player's screen's respective width or height. + Misc.ResizeWindow( width, height) - Resizes CYF's window to the given width and height, in pixels. The parameters width and height must both be positive, and the function will return true if the window was successfully resized, false otherwise. The window will not be resized if the requested width or height are bigger than the player's screen's respective width or height.

    It also works in fullscreen; this function will make sure the given area will be displayed on screen at all times by adding black borders if needed.

    * NOTE: Only allowed during battles.

  • - Misc.WindowWidth - Returns the width of the game window when running in windowed mode (even in fullscreen). + Misc.WindowWidth - Returns the width of the game window when running in windowed mode (even in fullscreen).

    If set, it will set the width of CYF's window in pixels. CYF's default width is 640 pixels. Will do nothing if the player's screen's width is lower than the requested width.

    * NOTE: Only allowed during battles.

  • - Misc.WindowHeight - Returns the height of the game window when running in windowed mode (even in fullscreen). + Misc.WindowHeight - Returns the height of the game window when running in windowed mode (even in fullscreen).

    If set, it will set the height of CYF's window in pixels. CYF's default height is 480 pixels. Will do nothing if the player's screen's height is lower than the requested height.

    @@ -167,14 +109,14 @@
      -
    • Misc.debuggerX - Change the debugger's x position relative to the camera's position.

      • -
    • Misc.debuggerY - Change the debugger's y position relative to the camera's position.

      • -
    • Misc.debuggerAbsX - Change the debugger's x position relative to the encounter's bottom-left corner, or the map's bottom-left corner if used in the overworld.

      • -
    • Misc.debuggerAbsY - Change the debugger's y position relative to the encounter's bottom-left corner, or the map's bottom-left corner if used in the overworld.

      • -
    • Misc.MoveDebugger( x, y) - Move the debugger relative to its current position.

      • -
    • Misc.MoveDebuggerTo( x, y) - Move the debugger relative to the camera's current position.

      • -
    • Misc.MoveDebuggerToAbs( x, y) - Move the debugger relative to the encounter's bottom-left corner, or the map's bottom-left corner if used in the overworld.

      • -
    • Misc.isDebuggerAttachedToCamera - Whether or not the camera should move the debugger along with it when it moves. True by default.

      • +
    • Misc.debuggerX - Change the debugger's x position relative to the camera's position.

      • +
    • Misc.debuggerY - Change the debugger's y position relative to the camera's position.

      • +
    • Misc.debuggerAbsX - Change the debugger's x position relative to the encounter's bottom-left corner, or the map's bottom-left corner if used in the overworld.

      • +
    • Misc.debuggerAbsY - Change the debugger's y position relative to the encounter's bottom-left corner, or the map's bottom-left corner if used in the overworld.

      • +
    • Misc.MoveDebugger( x, y) - Move the debugger relative to its current position.

      • +
    • Misc.MoveDebuggerTo( x, y) - Move the debugger relative to the camera's current position.

      • +
    • Misc.MoveDebuggerToAbs( x, y) - Move the debugger relative to the encounter's bottom-left corner, or the map's bottom-left corner if used in the overworld.

      • +
    • Misc.isDebuggerAttachedToCamera - Whether or not the camera should move the debugger along with it when it moves. True by default.

    • Additional notes on the debugger:
      • The debugger's pivot point is its top-right corner.
        • @@ -272,7 +214,7 @@

        File Functions

        This is what you entered for mode in Misc.OpenFile.
      • File.lineCount (read-only): The number of lines in the file.

        • -
      • File.filePath (read-only): +
      • File.filePath (read-only): The full file path to the opened file.

      • File.Move( new_path): Moves the opened file to the path new_path.
        diff --git a/Documentation CYF 1.0/pages/api-functions-newaudio.html b/Documentation CYF 1.0/pages/api-functions-newaudio.html index 13497f95a..10cf2502e 100644 --- a/Documentation CYF 1.0/pages/api-functions-newaudio.html +++ b/Documentation CYF 1.0/pages/api-functions-newaudio.html @@ -12,7 +12,7 @@ - + CYF Documentation - The NewAudio Object @@ -23,68 +23,10 @@ Undertale background
        -
        - - -
        + + + +
        @@ -146,7 +88,8 @@ Voices played are loaded from your mod's Sounds/Voices folder, as .ogg or .wav files. Don't include the file extension.

      • NewAudio.SetPitch( name, value) - Sets the pitch (and speed) of the audio channel name. -
        1.0 is normal pitch/speed.

        • +
        1.0 is normal pitch/speed. +
        If the value becomes negative, the audio will be played in reverse.
      • NewAudio.GetPitch( name) - Gets the pitch of the audio channel name.

      • NewAudio.SetVolume( name, value) - Sets the volume of the audio channel name.
        0.75 is the default value.

        • diff --git a/Documentation CYF 1.0/pages/api-functions-object.html b/Documentation CYF 1.0/pages/api-functions-object.html new file mode 100644 index 000000000..3d176f18a --- /dev/null +++ b/Documentation CYF 1.0/pages/api-functions-object.html @@ -0,0 +1,178 @@ + + + + + + + + + + + + + CYF Documentation - General Objects + + + + + + + + + + + +Undertale background +
        + + + + + +
        +
        +

        General object functions and the CYFObject object



        +

        + Usually, in CYF, you handle given objects such as text objects, sprites and the like. +
        + However, in certain situations, you may have to manipulate some elements which you + can't normally use, such as internal elements used by Unity. +

        + The CYFObject object's goal is to be able to manipulate + these objects, mostly by moving the various elements of the battle's hierarchy. + All of its functions and variables are also usable for + text objects, sprites and + bullets unless said otherwise. +

        + +

        +
        object.name + (readonly) + + The name of the object in Unity. Different from sprites' + spritename variable. +

        + +

        +
        object.childIndex + + The position of this object in its parent's children list, between 1 and + childCount. The first child will be displayed under all + other children, while the last child will be displayed above all others. +

        + For example, if an object has 5 children and this value is 2, then this object is + its parent's second child, and will appear above the parent's first child and + below all of its other children. +

        + Setting this value will change the current object's child index, reordering it in + its parent's children list. +

        + +

        +
        object.childCount + (readonly) + + The number of children this object has. +

        + +

        +
        object.GetParent() returns object + + + Returns the parent of this object. Can be either a sprite, a + bullet or a CYFObject. +

        + If you don't know by advance the type of this object's parent, you can use the function + tostring on the parent to know which kind of object it is. + The values are as follows: +

          +
        • Sprites will return "LuaSpriteController",
          • +
        • Bullets will return "ProjectileController",
          • +
        • CYFObjects will return "LuaCYFObject".
          • +
        +

        + +

        +
        object.SetParent(object + otherObject) + + Parents object to otherObject. +
        + This will make the original object move along with the object it's parented to. +

        + You can parent any sprite, bullet, + CYFObject or text object to + sprites, bullets and + CYFObjects, although text objects + cannot be the parent of another object. +

        + NOTE: If you are in the Overworld, you can NOT use + this to parent sprites to Event objects' sprites, or vice versa.
        + Text object letter sprites can only be parented to other Text object letter + sprites. +

        + +

        +
        object.GetChild( childIndex) + returns object + + Returns the child at index childIndex of this object. Can + be either a sprite, a bullet, a + text object or a CYFObject. +

        + If you don't know by advance the type of this object's child, you can use the function + tostring on the child to know which kind of object it is. + The values are as follows: +

          +
        • Sprites will return "LuaSpriteController",
          • +
        • Bullets will return "ProjectileController",
          • +
        • Text objects will return "LuaTextManager",
          • +
        • CYFObjects will return "LuaCYFObject".
          • +
        +

        + +

        +
        object.GetChildren() returns + object + + Returns a table with all of this object's children. See + object.GetChild() for more information. +

        +
        + +
        +

        + * YOU WON!
        + * You earned 0 EXP and 0 gold.
        + * also the nav menu is broken now +


        +
        +
        +
        + +
        +
        Undertale fake button +
        +
        Undertale fake button +
        +
        Undertale fake button +
        +
        Undertale fake button +
        +
        +
        + + + + + + + + + \ No newline at end of file diff --git a/Documentation CYF 1.0/pages/api-functions-player.html b/Documentation CYF 1.0/pages/api-functions-player.html index 1418a88af..72b640033 100644 --- a/Documentation CYF 1.0/pages/api-functions-player.html +++ b/Documentation CYF 1.0/pages/api-functions-player.html @@ -12,7 +12,7 @@ - + CYF Documentation - The Player Object @@ -23,68 +23,10 @@ Undertale background
        -
        - - -
        + + + +
        @@ -138,7 +80,7 @@
      • Player.armordef (readonly) - defense value of the player's current armor.

        • -
      • Player.speed - Player's speed in pixels per second. Default is 120. +
      • Player.speed - Player's speed in pixels per second. Default is 120.

      • Player.name - get or set the player's current name.
        6 letters max. By default, it is a name randomly chosen from a small list of pre-set names.
        @@ -200,7 +142,7 @@ the arena.

      • Player.ForceHP( amount) - Lets you set the player's HP to a number above the - player's Max HP. The REAL maximum is 999. + player's Max HP. The REAL maximum is 999.

      • Player.SetMaxHPShift( shift, invulnerabilitySeconds = 1.7f, set = false, canHeal = false, playSound = true) - Lets you set the Player's MaxHP, relative to their normal MaxHP. If the total MaxHP is negative or nil, it diff --git a/Documentation CYF 1.0/pages/api-functions-script.html b/Documentation CYF 1.0/pages/api-functions-script.html index d8457dc8a..6fddcfe01 100644 --- a/Documentation CYF 1.0/pages/api-functions-script.html +++ b/Documentation CYF 1.0/pages/api-functions-script.html @@ -12,7 +12,7 @@ - + CYF Documentation - The Script Object @@ -28,68 +28,10 @@ Undertale background
        -
        - - -
        + + + +
        diff --git a/Documentation CYF 1.0/pages/api-functions-time.html b/Documentation CYF 1.0/pages/api-functions-time.html index e3d4cc99b..8092bd5d4 100644 --- a/Documentation CYF 1.0/pages/api-functions-time.html +++ b/Documentation CYF 1.0/pages/api-functions-time.html @@ -12,7 +12,7 @@ - + CYF Documentation - The Time Object @@ -23,68 +23,10 @@ Undertale background
        -
        - - -
        + + + +
        @@ -110,9 +52,9 @@ waves while in DEFENDING. -1 outside of DEFENDING.
        You can use wavetimer - Time.wave while in DEFENDING to see how much time is left in the defense round.

        • -
      • Time.frameCount (readonly) - The total number of frames since the start of the +
      • Time.frameCount (readonly) - The total number of frames since the start of the encounter or overworld.

        • -
      • Time.timeScale - The scale at which time passes. +
      • Time.timeScale - The scale at which time passes. When timeScale is 1.0, time passes as fast as real time. When timeScale is 0.5 time passes 2x slower than realtime.
        Note: You should examine the Examples 2 / #10 - timeScale test mod to see how to properly implement waves to make them work with this.

        • diff --git a/Documentation CYF 1.0/pages/api-functions-ui.html b/Documentation CYF 1.0/pages/api-functions-ui.html index 7f1e060d6..2c8287771 100644 --- a/Documentation CYF 1.0/pages/api-functions-ui.html +++ b/Documentation CYF 1.0/pages/api-functions-ui.html @@ -12,7 +12,7 @@ - + CYF Documentation - The UI Object @@ -23,68 +23,10 @@ Undertale background
        -
        - - -
        + + + +
        @@ -93,6 +35,8 @@

        The UI Object [E/M/W]



        This section details the various elements you can use to manipulate CYF's internal user interface.

        If you want to manipulate UI elements related to the enemy (attack animation, health bar, position of the damage text), I suggest visiting the Misc. Functions section of the documentation. +

        + Keep in mind that removing any of these elements has a great chance of making the engine unstable, so take caution when manipulating the UI.

        @@ -101,7 +45,7 @@

        The UI Object [E/M/W]



        -
        textObject UI.namelv +
        text UI.namelv Text object displaying the Player's name as well as its level. Its contents is usually the Player's name followed by two spaces, the text LV, another space, then finally the Player's level.

        @@ -116,10 +60,30 @@

        The UI Object [E/M/W]



        -
        textObject UI.hptext +
        text UI.hptext Text object displaying the Player's HP. Its contents display the Player's current HP, a space, a slash, another space, and finally the Player's max HP.

        +

        +
        text UI.maintext + Text object used in the Arena to display most things. Take caution when handling this object, as it's used absolutely everywhere in encounters. +

        + +

        +
        sprite UI.mugshot + Sprite used to display a character's face sprite on the left side of the arena, through the usage of the [mugshot:x] text command. +

        + +

        +
        sprite UI.mugshotmask + Mask sprite used to keep the mugshot within the bounds of the arena. Its size is usually 130x130, although its height scales with the arena's, meaning changing its height may not work as intended. Changing its anchor will stop that effect from happening. +

        + +

        +
        bar UI.enemylifebarlist + List of life bars displayed next to each enemy whenever the Player selects the FIGHT button. All life bars are destroyed whenever the Player changes the current page if there are more than 3 active enemies, so you need to get this variable again to fetch the new life bars if the page is changed +

        +


        sprite UI.fightbtn Sprite for the FIGHT button. Do not use its Remove function, or it may cause unexpected errors. If you want to remove it, set its alpha to 0 instead. @@ -140,6 +104,11 @@

        The UI Object [E/M/W]



        Sprite for the MERCY button. Do not remove it in any way, or it may cause unexpected errors. If you want to remove it, set its alpha to 0 instead.

        +

        +
        object UI.root + Root of the entire battle scene. See the General Objects for more information on how to handle this object. +

        +


        UI.StopUpdate( toggle) If toggle is true, the Player's UI (except the buttons) will not be updated by the engine, whether it is the Player's name and level text or the Player's hp bar and text.

        @@ -189,14 +158,14 @@

        The UI Object [E/M/W]



        -
        UI.GetPlayerXPosOnButton( button) +
        UI.GetPlayerXPosOnButton( button) returns Returns the player's horizontal position offset when selecting the given button, starting from the button's bottom left corner. The default value for all buttons is 16.

        Accepted values for the button argument are FIGHT, ACT, ITEM or MERCY.

        -
        UI.GetPlayerYPosOnButton( button) +
        UI.GetPlayerYPosOnButton( button) returns Returns the player's vertical position offset when selecting the given button, starting from the button's bottom left corner. The default value for all buttons is 19.

        Accepted values for the button argument are FIGHT, ACT, ITEM or MERCY. @@ -300,12 +269,17 @@

        The Bar Object [E/M/W]



        -
        Bar.outlineThickness +
        Bar.outlineThickness Returns the thickness in pixels of the outline sprite. Returns 0 if the outline doesn't exist.

        Can be set to resize the outline's thickness.

        +

        +
        Bar.isactive + True if the lifebar hasn't been removed, false otherwise. +

        +


        Bar.SetInstant( fillValue, allowNonClamped = false) Sets the fill percentage of the bar object between 0 and 1. 0 means the bar is empty, while 1 means it is full. @@ -316,8 +290,8 @@

        The Bar Object [E/M/W]



        -
        Bar.SetLerp( fillValue, time = 60, allowNonClamped = false) - Gradually sets the fill percentage of the bar object between 0 and 1 to fillValue over time frames, with 60 frames being equal to one second. 0 means the bar is empty, while 1 means it is full. +
        Bar.SetLerp( fillValue, time = 60, allowNonClamped = false) + Gradually sets the fill percentage of the bar object between 0 and 1 from the bar's current fill to fillValue over time frames, with 60 frames being equal to one second. 0 means the bar is empty, while 1 means it is full.

        If allowNonClamped is set to true, you can use values lower than 0 and higher than 1.

        @@ -325,8 +299,12 @@

        The Bar Object [E/M/W]



        -
        Bar.SetLerp( originalValue, fillValue, time = 60, allowNonClamped = false) - Acts like the function above, except you can set the initial fill percentage of the bar object using originalValue. +
        Bar.SetLerpFull( originalValue, fillValue, time = 60, allowNonClamped = false) + Gradually sets the fill percentage of the bar object between 0 and 1 from originalValue to fillValue over time frames, with 60 frames being equal to one second. 0 means the bar is empty, while 1 means it is full. +

        + If allowNonClamped is set to true, you can use values lower than 0 and higher than 1. +

        + Note that the bar will be updated properly when fillValue is beyond its usual bounds only if the bar-px sprite is used for all of the bar's sprites.

        diff --git a/Documentation CYF 1.0/pages/api-functions-waves.html b/Documentation CYF 1.0/pages/api-functions-waves.html index 06cc82200..6b3174bd3 100644 --- a/Documentation CYF 1.0/pages/api-functions-waves.html +++ b/Documentation CYF 1.0/pages/api-functions-waves.html @@ -12,7 +12,7 @@ - + CYF Documentation - The Arena Object @@ -23,68 +23,10 @@ Undertale background

        -
        - - -
        + + + +
        @@ -96,7 +38,7 @@

        The Arena Object



        -
        The Arena object [W] +
        The Arena object You can use this object to obtain information about the arena, resize it or move it.
        Don't forget that the Arena's position is reset at the end of the wave!

        @@ -131,16 +73,16 @@

        The Arena Object



        NOTE: Arena.currenty is the position of the bottom of the inside (black part) of the Arena. It will be 5 pixels (the arena's width) greater than Arena.y.
        -
      • , , , = 1 Arena.innerColor +
      • , , , = 1 Arena.innerColor - Set RGBA color (0-1) of Arena's inner sprite.

        • -
      • , , , = 255 Arena.innerColor32 +
      • < , , , = 255 Arena.innerColor32 - Set RGBA color (0-255) of Arena's inner sprite.

        • -
      • , , , = 1 Arena.outerColor +
      • , , , = 1 Arena.outerColor - Set RGBA color (0-1) of Arena's outer sprite.

        • -
      • , , , = 255 Arena.outerColor32 +
      • , , , = 255 Arena.outerColor32 - Set RGBA color (0-255) of Arena's outer sprite.

      • Arena.isResizing (readonly) - Tells you if the Arena is currently being resized.
        : There's an equivalent of this in @@ -178,12 +120,14 @@

        The Arena Object



        movePlayer to true if you want the Player to move with the Arena and set immediate to true if you want to move the Arena immediately.

        • -
      • Arena.Hide() - Makes the Arena invisible, but it will stay active.

        • +
      • Arena.Hide( showWhenWaveEnds = true) + - Makes the Arena invisible, but it will stay active. If showWhenWaveEnds is set to true, the Arena will + be shown again after the end of the wave. Setting it to false will keep it hidden until it's manually shown again.

      • Arena.Show() - Makes the Arena visible after using Arena.Hide.
        - This is not called automatically whenever a wave ends anymore, meaning the arena will be permanently hidden - if Arena.Hide is used.

        • + This is called automatically whenever a wave ends if the showWhenWaveEnds argument of + Arena.Hide() is set to true upon its last use.
    • diff --git a/Documentation CYF 1.0/pages/api-keys.html b/Documentation CYF 1.0/pages/api-keys.html index 3145e11c8..75808d841 100644 --- a/Documentation CYF 1.0/pages/api-keys.html +++ b/Documentation CYF 1.0/pages/api-keys.html @@ -12,7 +12,7 @@ - + CYF Documentation - Key List @@ -23,68 +23,10 @@ Undertale background
    -
    - - -
    + + + +
    @@ -555,6 +497,27 @@

    Mouse Inputs:

    + +

    +

    Controller Buttons:

    + All controller buttons follow the same format: JoystickXButtonY +
    X represents the number of the controller currently in use, between 1 and 8. +
    Y represents the number of the button checked, between 0 and 19. +

    Note: It is not recommended to directly query a user's controller inputs, as these can greatly vary between users. + It would be best to make a keybind and let the user bind their controller buttons to it, or to restrict yourself to standard CYF keys. +

    + +

    +

    Controller Axes (Joysticks, D-Pad, Triggers...):

    + Most controller axes follow the same format: AxisX-Y + or AxisX-Y - +
    X represents the number of the axis currently checked, between 3 and 10. +
    Y represents the number of the controller currently in use, between 1 and 2. CYF currently only handles axes for up to 2 controllers. +

    Axes 1 and 2 have specific names: Axis 1 is named HorizontalY, while Axis 2 is named + VerticalY, following the same scheme as above. +

    Note: It is not recommended to directly query a user's controller inputs except for HorizontalY and + VerticalY, as these can greatly vary between users. + It would be best to make a keybind and let the user bind their controller buttons to it, or to restrict yourself to standard CYF keys. +

    diff --git a/Documentation CYF 1.0/pages/api-projectile.html b/Documentation CYF 1.0/pages/api-projectile.html index 9922d3f90..9d9190678 100644 --- a/Documentation CYF 1.0/pages/api-projectile.html +++ b/Documentation CYF 1.0/pages/api-projectile.html @@ -12,7 +12,7 @@ - + CYF Documentation - Projectile management @@ -28,68 +28,10 @@ Undertale background
    -
    - - -
    + + + +
    @@ -128,7 +70,10 @@

    Projectile management



    The Bullet object

    This is what you use to move around the arena and store values in. You can store a bunch of bullets in a table - and modify them. The functions and variables you can use on a Bullet are as follows.

    + and modify them. The functions and variables you can use on a Bullet are as follows. +
    + As this object exists in CYF's hierarchy, it's possible to manipulate its parent and children. + See the General Objects page for more information.


    sprite Bullet.sprite @@ -187,7 +132,7 @@

    The Bullet object


    Bullet.layer The bullet layer that the bullet is on.

    - Note: It is common practice to use Bullet.layer to deparent + Note: It is common practice to use Bullet.layer to deparent a bullet if you need to do so. Setting it back to "" will parent the bullet to its default layer, removing its previous parenting altogether.

    @@ -255,7 +200,7 @@

    The Bullet object

    Will use PPCollision (pixel-perfect collisions) if the bullet has PP enabled. See Bullet.ppcollision.

    -
    Bullet.OnHit(bullet bullet) +
    Bullet.OnHit(bullet bullet) This variable must receive a function, which can be done in two possible ways:

    diff --git a/Documentation CYF 1.0/pages/api-text.html b/Documentation CYF 1.0/pages/api-text.html index 9e496a2a8..0a01a32ee 100644 --- a/Documentation CYF 1.0/pages/api-text.html +++ b/Documentation CYF 1.0/pages/api-text.html @@ -12,7 +12,7 @@ - + CYF Documentation - Text Commands @@ -28,68 +28,10 @@ Undertale background
    -
    - - -
    + + + +
    @@ -152,7 +94,7 @@

    Instant commands


    -
    [color] +
    [color] This command resets any previous usage of the [color:rrggbb] command, displaying any following text in the font's default color.

    @@ -164,7 +106,7 @@

    Instant commands


    -
    [alpha] +
    [alpha] This command resets any previous usage of the [alpha:aa] command, displaying any following text in the font's default alpha.

    @@ -177,33 +119,38 @@

    Instant commands


    -
    [effect:x] or [effect:x,intensity] +
    [effect:x] or [effect:x,intensity] or [effect:x,intensity,step] Sets the text effect for the entire message, regardless of position. You can use the following effects:

    • none: No effect on the text.

    • rotate: Rotating text, most random monsters have this by default. Intensity sets how far letters rotate, in pixels. Default is 1.5. +
      + Step allows shifting the rotation animation of the letters by a given degree in radians.

    • shake: Shaking text. Flowey uses this sometimes. Intensity sets how far the letters offset, in pixels. Default is 1.0. +
      + Step allows shifting the frequency of the twitching effect. Default is 48 frames. + The value will be varied by about 33% every time the delay until the next twitch effect show up is computed.

    • twitch: Letters twitch occasionally - the battle UI has this by default. Intensity sets how far a letter should shake. Default is 2.0.

    -

    - Note that the twitch effect should, at a later point, let you set shake frequency. Unfortunately you - can't do this yet. -

    -
    [lettereffect:x] or [lettereffect:x,intensity] - This works the same as [effect:x] / [effect:x,intensity], but it works inline. +
    [lettereffect:x] or [lettereffect:x,intensity] or [lettereffect:x,intensity,step] + This works the same as [effect:x], but it works inline. This means you can have multiple different text effects in a single line!

    Keep in mind that, like all other inline text commands, this command will not execute if the player skips over it with X - unless you set playerskipdocommand to true, first. +

    + On top of that, the default step value for the shake effect is now 500. The value will be varied by about + 80% every time the delay until the next twitch effect show up is computed. It's high + so the twitch effects of all letters can play at various times!

    @@ -293,7 +240,8 @@

    Inline commands


    The wait command. Pauses your textbox temporarily based on the number you enter.

    Technically: This will pause the textbox for x * 4 in-game frames.
    - Calling [w:1] will freeze the textbox for 4 in-game frames.
    + Calling [w:1] will freeze the textbox for 4 in-game frames. +

    [w:4] is 16 in-game frames, [w:10] is 40, and so on.

    @@ -312,17 +260,22 @@

    Inline commands


    Sets the voice (sound per letter) to a sound located in YOUR MOD/Sounds/Voices. Applies to all letters after the command. It resets per dialogue. This has to be a .wav file, and you shouldn't include the file extension when using [voice]. If your voice sound is YOUR MOD/Sounds/Voices/mettaton.wav, you can - use it with [voice:mettaton].
    + use it with [voice:mettaton]. +

    [voice:default] resets to the default voice (beeps). If you have a voice sound named 'default', it will be ignored.


    [novoice] Removes the voice for the letters after this command. It resets per dialogue. - Useful for when you should be burning in hell. + Useful for when you should be burning in hell.

    + +


    [next] - Skips to the next dialogue automatically. You can also use this for textbox trickery. Here's an example - to replicate Flowey's text-changing effect if you dodge the Friendliness Pellets(tm) twice. + Skips to the next line of the current text object automatically. + If used in a monster's text object, skips the dialogue of all monsters, without concern for the other monsters' dialogue's state. + You can also use this for textbox trickery. + Here's an example to replicate Flowey's text-changing effect if you dodge the Friendliness Pellets(tm) twice. 

    first line:  "[noskip][voice:flowey][effect:none]RUN. [w:30]INTO. [w:30]THE.\n[w:30]BULLETS!![w:30][next]"
@@ -330,20 +283,25 @@ 
    Inline commands

    -
    [finished] - Sets this dialogue box as "finished". To go through the next dialogue box, you'll have to wait until the other - monsters' dialogue boxes are also finished. +
    [nextthisnow] + Skips to the next dialogue of the current monster only, even if several monsters are speaking, effectively desyncing their text. + It acts like [next] outside of monster text objects, its only difference is that it only affects the current monster + if used on a monster's text object.

    -
    [nextthisnow] - Skips to the next dialogue of all monsters automatically, without concern for the other monsters' dialogue's state. +
    [finished] + Sets this dialogue box as "finished". To go through the next dialogue box, you'll have to wait until the other + monsters' dialogue boxes are also finished.


    [waitfor:key] Waits for the user to press the given key to continue the message. Check the Key List to see the available keys. +

    + * Note that keybinds are also accepted here. + For more info, check the page on The Input Object

    @@ -390,6 +348,13 @@

    Inline commands



    [letters:x] For this frame only, the text box will show the next x characters. +
    If used with the command [lettersperframe:y], the next x+y-1 + letters will be displayed. +

    + +

    +
    [lettersperframe:x] + For the rest of the line, the text box will show the next x characters every time one character should be displayed.

    @@ -417,21 +382,26 @@

    Inline commands



    [mugshot:face], [mugshot:null] or [mugshot:{face1,face2,...,time}] - Overworld only. + Only usable with the Overworld's main text as well as the main text object in battles.

    Displays a set face sprite (or sequence of face sprites) next to your dialogue set by General.SetDialog.
    Note that the overworld's automatic line break system will not account for face sprites set this way; instead, it's recommended to set a face sprite in General.SetDialog (see The General Object).

    - This function loads face sprites from YOUR MOD/Sprites/Mugshots. You may put folder names in here, such as - [mugshot:Papyrus/suspicious] for YOUR MOD/Sprites/Mugshots/Papyrus/suspicious.png.
    - Use [mugshot:null] to revert the overworld text box back to normal.
    + This function loads face sprites from YOUR MOD/Sprites/Mugshots, and if none exists, from + Default/Sprites/Mugshots. You may put folder names in here, such as + [mugshot:Papyrus/suspicious] to get the file YOUR MOD/Sprites/Mugshots/Papyrus/suspicious.png, + or if it doesn't exist, Default/Sprites/Mugshots/Papyrus/suspicious.png.
    + Use [mugshot:null] or [mugshot] to revert the text box back to normal.


    To use a sequence of face sprites, enter something such as
    [mugshot:{Papyrus/happy,Papyrus/suspicious,0.1}].
    This is a list of normal paths to put into [mugshot:x] as described above, followed by the amount of real time seconds between faces (such as with sprite.SetAnimation).

    - If you do not provide a time, or the time you enter is <= 0, a default value of 0.2 will be used. + If you do not provide a time, or the time you enter is lower than 0, a default value of 0.2 will be used. +

    + NOTE: While the overworld's mugshots have a size of 140x140, in battles, the mugshots are 130x130, so if bigger + mugshots are applied in battles, 5 pixels around each edge are hidden.

    @@ -470,17 +440,15 @@

    Command tags




    skipover - Makes a command only be activated when the text is not skipped (by using any [instant] command or the - player's skip if playerskipdocommand is set to true). Has no effect on [w] and - [letters]. + Makes a command only be activated when the text is not skipped (by using any [instant] command or by the + player skipping). Has no effect on the commands [w] and [letters].


    skiponly - The command this is attached to will only be activated if the text has been skipped by using any - [instant] command, or if the player skips it manually and - playerskipdocommand is set to true. - This tag disables the [w] and [letters] commands if used on them. + The command this is attached to will only be activated if the text has been skipped by using any [instant] + command, or if the player skips it manually. + This tag disables the commands [w] and [letters] if used with them.

    diff --git a/Documentation CYF 1.0/pages/basic.html b/Documentation CYF 1.0/pages/basic.html index 03cfcb411..bebaf942c 100644 --- a/Documentation CYF 1.0/pages/basic.html +++ b/Documentation CYF 1.0/pages/basic.html @@ -12,7 +12,7 @@ - + CYF Documentation - Basic Setup @@ -23,68 +23,10 @@ Undertale background
    -
    - - -
    + + + +
    diff --git a/Documentation CYF 1.0/pages/controls.html b/Documentation CYF 1.0/pages/controls.html index d229d92c5..15866c687 100644 --- a/Documentation CYF 1.0/pages/controls.html +++ b/Documentation CYF 1.0/pages/controls.html @@ -12,7 +12,7 @@ - + CYF Documentation - Controls @@ -23,68 +23,10 @@ Undertale background
    -
    - - -
    + + + +
    @@ -103,12 +45,12 @@

    In battle

    the player.


    Mod Selection screen (main)

    Z, Enter, or Mouse Click - Start an encounter, or open an encounter list for a mod if it has multiple. (see below)

    -

    X or left/right Shift - Return to the disclaimer (title) screen.

    +

    X or any Shift key - Return to the disclaimer (title) screen.

    Up or C - Opens the mod list, used to jump to any mods you have installed. (see below)

    Left or Right arrows - Scroll through your installed mods.


    Mod Selection screen (mod or encounter list)

    Z, Enter, or Mouse Click - Jump to a mod you have installed (mod list), or start a selected encounter (encounter list).

    -

    X or left/right Shift - Close the list.

    +

    X or any Shift key - Close the list.

    Up and Down, Mouse Scroll, Click and Drag - Move up and down through the list.

    diff --git a/Documentation CYF 1.0/pages/cyf-inventory.html b/Documentation CYF 1.0/pages/cyf-inventory.html index c89286bee..6a88b2bba 100644 --- a/Documentation CYF 1.0/pages/cyf-inventory.html +++ b/Documentation CYF 1.0/pages/cyf-inventory.html @@ -12,7 +12,7 @@ - + CYF Documentation - The Inventory Object @@ -28,68 +28,10 @@ Undertale background
    -
    - - -
    + + + +
    @@ -99,7 +41,7 @@ because they are the only ones that will ever love you. But now, nobody loves you at all, because items can be deleted and the Inventory System has been simplified! Here are the functions that are created to help you with this hellish mechanism that added items.

    - Note: All of Undertale's consumable items, weapons and armors are already implemented in CYF!
    + Note: All of Undertale's consumable items, weapons and armors are already implemented in CYF!
    You can use them in your mod if you want to, all you need to do is:

    -
    Text.deleteWhenFinished +
    Text.deleteWhenFinished This value is used to check whether the text object should be removed or not after the text is finished. Its default value is true, meaning the text object will be automatically removed after the end of the text. You can set it to false to automatically hide the text object once its text is complete, which allows you to reuse it later. @@ -184,7 +136,7 @@

    The Text Object



    The absolute y position of the object, measured from the bottom left corner of the screen. This value depends on the object's pivot.

    -
    Text.textMaxWidth +
    Text.textMaxWidth or Text.width Get or set the maximum width of the text. If the value is lower than 16, it'll be set back to 16.

    @@ -210,7 +162,7 @@

    The Text Object



    The 4th value is the alpha (transparency) value of the text.

    -
    Text.ResetColor( resetAlpha = false) +
    Text.ResetColor( resetAlpha = false) Resets any previous set of the variable Text.color or Text.color32, resetting the text's default color to the font's default color.
    This function will not reset the color's alpha if it was set in any way unless @@ -225,28 +177,68 @@

    The Text Object



    Get or set the text's transparency, as an integer between 0 and 255.

    -
    Text.ResetAlpha() +
    Text.ResetAlpha() Resets the text object's alpha value, whether it was set through Text.alpha, Text.color or Text.color32, resetting the text's default alpha to the font's default alpha.

    +

    +
    Text.currentCharacter + Returns a number representing the total number of characters currently shown in the text object's text. +
    It also works the same if your text is slowed down or sped up. +

    Text commands are also taken in account using this variable. + You can easily check where the text is currently at using this value and Text.text's output. +


    Text.currentReferenceCharacter Returns a number representing the total number of visible characters currently shown in the text object's text.
    It also works the same if your text is slowed down or sped up.

    Any text commands that you have in your active line of text will be ignored by this number, as it only counts the visible characters, and not the length of the string you put into the text object.

    +

    +
    Text.rotation + Gets or sets a text object's rotation, in degrees. Will also rotate the text object's bubble if it has any. +

    The text object will rotate around the bottom left corner of the first letter of the text object. +

    It's clamped between 0 and 360, so if you set it to 365, it will become 5. +

    +

    +
    Text.adjustTextDisplay + False by default. If set to true, CYF will try to adjust the text's position and scale to prevent jagged lines to appear if the text's scale or position is slightly off. +

    Only taken in account if set, otherwise the global value set through the adjusttextdisplay Encounter variable is used. +


    Text.currentLine Returns the number of the line (page) that the text is currently on, starting from 0.

    So, if your text object's text table is {"Text 1", "Text 2"}, then "Text 1" is line 0, and "Text 2" is line 1.

    -
    sprite Text.GetLetters() +
    Text.linePrefix + This variable will be added at the beginning of each line of text the text object will display. +

    Useful for adding various text commands you want to apply to all lines of text displayed by a given text object. +

    +

    +
    Text.columnNumber + Represents the number of columns used by some texts in CYF, such as the ITEM and ACT menu. +
    If this is value is set, you should also consider changing Text.columnShift. +

    This value is only ever used by the engine, so setting it to a specific value doesn't prevent you from using the character \t as much as you like. +
    Refer to the entry on Text.columnShift for more informations on the character \t. +

    +

    +
    Text.columnShift + Amount of horizontal pixels the letters moves by from its last column (or first character) whenever the character \t is used. +

    The \t character is used in-engine for aligning columns of text. It affects the current line of the text and can be used several times on the same line to support more than two columns. +

    For example, the following text will result with the following image: + 

    * Check \t * Act 1 \t * Act 2 \n
+* Act 3 \t * Act 4 \t * Act 5 \n
+\t \t * Act 6
    + +

    +

    +
    sprite Text.GetLetters() Returns a table containing sprite objects representing every letter to be displayed in the text object's current line of text. Note that even if a text object has not finished typing yet, all characters it will type are still accessible this way.

    Letter sprite objects can not have their layer changed, can not run sprite.Mask, and can only be parented to other letter sprites. They cannot be deleted or dusted (using sprite.Dust()) as well.


    NOTE: Accessing this table generates the table anew every time. To save on resources, store this table to a local variable before doing any operations on it. Even code such as for i = 1, #text.GetLetters() do is a bad idea.

    - It is recommended to use this property in coordination with the Game Event OnTextAdvance. You may also have some difficulty if you use this on the same frame as creating the text - read the note under CreateText for more information. + It is recommended to use this property in coordination with the Game Event OnTextAdvance. You may also not be able to use this on the same frame as creating the text - read the note under CreateText for more information.


    Here is an example of using Text.GetLetters to apply offset and rotation to every letter. 
    local t = CreateText({"Some example text for testing!"}, {40, 400}, 560, "Top")
@@ -277,6 +269,16 @@ 
    Letter sprite objects can not have their layer changed, can not run

    +

    +
    function Text.OnTextDisplay(text text) + Every time this text object's letters are created, this function gets called. This function is the best + place to manipulate the text object's letters using Text.GetLetters. +

    + The argument text is the text object itself. +

    + If this value isn't set and the function OnTextDisplay() exists in the Encounter + script, it will call it with the text object as its argument. +


    Text.SkipLine() This function skips to the end of the text object's current text, as if using the text command [instant].
    @@ -300,7 +302,7 @@

    Letter sprite objects can not have their layer changed, can not run
    Text.NextLine() Shows the next line (dialogue) of the text instantly, regardless of if the current one is finished or what progress mode the object has.
    - If you run this function while this is this text object's last line, it will delete the text object if its + If you run this function while this is this text object's last line, it will delete the text object if its Text.deleteWhenFinished variable is set to true, othrwise it will deactive it until further use.

    @@ -312,13 +314,7 @@

    Letter sprite objects can not have their layer changed, can not run Only applies to the "auto" progress mode.

    -
    Text.SetParent(sprite parent) - Sets the text object's parent.
    The text object will follow around the parent object as it moves. -

    - NOTE: If you are in the Overworld, you can NOT use this to parent text objects to Event objects' sprites. -

    -

    -
    Text.SetAnchor( x, y) +
    Text.SetAnchor( x, y) If this text object has a parent set via Text.SetParent, this will control its anchor point (the relative point on the parent sprite that the text object will follow if the parent sprite gets scaled).

    @@ -329,7 +325,7 @@

    Letter sprite objects can not have their layer changed, can not run


    Text.xscale,
    - Text.yscale,
     + Text.yscale
    Allows you to stretch and squish text objects, similarly to sprite objects.

    This works at any point: while the text has not yet started to type, is in the middle of typing, is paused, between lines, even if it's done typing. @@ -347,14 +343,14 @@

    Letter sprite objects can not have their layer changed, can not run They must both be on the same layer.

    -
    Text.SendToTop() +
    Text.SendToTop() Sends this text object to the top of its layer's hierarchy. If a sprite has 5 children, for instance, you can use this to rearrange this text object's position internally. However, child text objects will always appear on top of their parents, regardless of this function being called.

    -
    Text.SendToBottom() +
    Text.SendToBottom() Sends this text objct to the bottom of its layer's hierarchy. Similar rules apply as with SendToTop().

    @@ -399,8 +395,8 @@

    Letter sprite objects can not have their layer changed, can not run Text.SetSpeechThingPositionAndSide to see how to use this.

    -
    Text.SetTail(side, / position = "50%") - Shortcut to Text.SetSpeechThingPositionAndSide. +
    Text.SetTail( side, / position = "50%") + Shorter (and better) alias of Text.SetSpeechThingPositionAndSide.


    Text.SetSpeechThingPositionAndSide( side, @@ -410,7 +406,7 @@

    Letter sprite objects can not have their layer changed, can not run "none".
    "none" is used to hide the speech thing, while the other directions control the side of the bubble where the speech thing is.

    - center can be set to one of two things: + position can be set to one of two things: