diff --git a/Assets/scripts/OnClickedMoveCamera.cs b/Assets/scripts/OnClickedMoveCamera.cs index f3bd3f2..b2328c8 100644 --- a/Assets/scripts/OnClickedMoveCamera.cs +++ b/Assets/scripts/OnClickedMoveCamera.cs @@ -14,7 +14,7 @@ public class OnClickedMoveCamera : MonoBehaviour { public Canvas canva; void Awake(){ - clrBase = renderer.material.color; + clrBase = GetComponent().material.color; clrTarget = clrBase; children = GetComponentsInChildren(); //canva = destination.GetComponentInChildren (Canvas); @@ -42,7 +42,7 @@ public class OnClickedMoveCamera : MonoBehaviour { void Update(){ //Lerp to clrTarget - Color clr = Color.Lerp(renderer.material.color, clrTarget, Time.deltaTime * 10); + Color clr = Color.Lerp(GetComponent().material.color, clrTarget, Time.deltaTime * 10); //Fixme? Any newly created chilren wont be lerped foreach (Renderer child in children) { diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 7bb5d16..280a9fd 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,8 +3,27 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 2 + serializedVersion: 3 + m_Deferred: + m_Mode: 1 + m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} + m_LegacyDeferred: + m_Mode: 1 + m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0} m_AlwaysIncludedShaders: - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0} + m_PreloadedShaders: [] + m_LightmapStripping: 0 + m_LightmapKeepPlain: 1 + m_LightmapKeepDirCombined: 1 + m_LightmapKeepDirSeparate: 1 + m_LightmapKeepDynamic: 1 + m_FogStripping: 0 + m_FogKeepLinear: 1 + m_FogKeepExp: 1 + m_FogKeepExp2: 1 diff --git a/ProjectSettings/NavMeshAreas.asset b/ProjectSettings/NavMeshAreas.asset new file mode 100644 index 0000000..79cb3ae --- /dev/null +++ b/ProjectSettings/NavMeshAreas.asset @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!126 &1 +NavMeshLayers: + m_ObjectHideFlags: 0 + Built-in Layer 0: + name: Default + cost: 1 + editType: 2 + Built-in Layer 1: + name: Not Walkable + cost: 1 + editType: 0 + Built-in Layer 2: + name: Jump + cost: 2 + editType: 2 + User Layer 0: + name: + cost: 1 + editType: 3 + User Layer 1: + name: + cost: 1 + editType: 3 + User Layer 2: + name: + cost: 1 + editType: 3 + User Layer 3: + name: + cost: 1 + editType: 3 + User Layer 4: + name: + cost: 1 + editType: 3 + User Layer 5: + name: + cost: 1 + editType: 3 + User Layer 6: + name: + cost: 1 + editType: 3 + User Layer 7: + name: + cost: 1 + editType: 3 + User Layer 8: + name: + cost: 1 + editType: 3 + User Layer 9: + name: + cost: 1 + editType: 3 + User Layer 10: + name: + cost: 1 + editType: 3 + User Layer 11: + name: + cost: 1 + editType: 3 + User Layer 12: + name: + cost: 1 + editType: 3 + User Layer 13: + name: + cost: 1 + editType: 3 + User Layer 14: + name: + cost: 1 + editType: 3 + User Layer 15: + name: + cost: 1 + editType: 3 + User Layer 16: + name: + cost: 1 + editType: 3 + User Layer 17: + name: + cost: 1 + editType: 3 + User Layer 18: + name: + cost: 1 + editType: 3 + User Layer 19: + name: + cost: 1 + editType: 3 + User Layer 20: + name: + cost: 1 + editType: 3 + User Layer 21: + name: + cost: 1 + editType: 3 + User Layer 22: + name: + cost: 1 + editType: 3 + User Layer 23: + name: + cost: 1 + editType: 3 + User Layer 24: + name: + cost: 1 + editType: 3 + User Layer 25: + name: + cost: 1 + editType: 3 + User Layer 26: + name: + cost: 1 + editType: 3 + User Layer 27: + name: + cost: 1 + editType: 3 + User Layer 28: + name: + cost: 1 + editType: 3 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index e5200ca..958a9c0 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,15 +3,17 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 2 + serializedVersion: 6 AndroidProfiler: 0 defaultScreenOrientation: 0 targetDevice: 2 targetGlesGraphics: 1 + targetIOSGraphics: -1 targetResolution: 0 accelerometerFrequency: 60 companyName: DefaultCompany productName: Akadoc + cloudProjectId: defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} defaultScreenWidth: 1024 @@ -24,8 +26,10 @@ PlayerSettings: m_MTRendering: 1 m_MobileMTRendering: 0 m_UseDX11: 0 + m_Stereoscopic3D: 0 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 + iosAppInBackgroundBehavior: 0 displayResolutionDialog: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 @@ -33,16 +37,16 @@ PlayerSettings: allowedAutorotateToLandscapeLeft: 1 useOSAutorotation: 1 use32BitDisplayBuffer: 1 - use24BitDepthBuffer: 1 + disableDepthAndStencilBuffers: 0 defaultIsFullScreen: 1 defaultIsNativeResolution: 1 runInBackground: 0 captureSingleScreen: 0 Override IPod Music: 0 Prepare IOS For Recording: 0 - enableHWStatistics: 1 + submitAnalytics: 1 usePlayerLog: 1 - stripPhysics: 0 + bakeCollisionMeshes: 0 forceSingleInstance: 0 resizableWindow: 0 useMacAppStoreValidation: 0 @@ -52,32 +56,31 @@ PlayerSettings: xboxEnableKinect: 0 xboxEnableKinectAutoTracking: 0 xboxEnableFitness: 0 + visibleInBackground: 0 macFullscreenMode: 2 + d3d9FullscreenMode: 1 + d3d11FullscreenMode: 1 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0 - wiiHio2Usage: -1 - wiiLoadingScreenRectPlacement: 0 - wiiLoadingScreenBackground: {r: 1, g: 1, b: 1, a: 1} - wiiLoadingScreenPeriod: 1000 - wiiLoadingScreenFileName: - wiiLoadingScreenRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 + xboxOneResolution: 0 + ps3SplashScreen: {fileID: 0} + videoMemoryForVertexBuffers: 0 + psp2PowerMode: 0 + psp2AcquireBGM: 1 m_SupportedAspectRatios: 4:3: 1 5:4: 1 16:10: 1 16:9: 1 Others: 1 - iPhoneBundleIdentifier: com.Company.ProductName + bundleIdentifier: com.Company.ProductName + bundleVersion: 1.0 + preloadedAssets: [] metroEnableIndependentInputSource: 0 metroEnableLowLatencyPresentationAPI: 0 + xboxOneDisableKinectGpuReservation: 0 productGUID: 2fc6d26440f7e704aabd86bc09fc6f08 - iPhoneBundleVersion: 1.0 AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 9 AndroidPreferredInstallLocation: 1 @@ -89,9 +92,10 @@ PlayerSettings: ForceSDCardPermission: 0 CreateWallpaper: 0 APKExpansionFiles: 0 + preloadShaders: 0 StripUnusedMeshComponents: 0 iPhoneSdkVersion: 988 - iPhoneTargetOSVersion: 16 + iPhoneTargetOSVersion: 22 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIStatusBarHidden: 1 @@ -100,30 +104,42 @@ PlayerSettings: iPhoneSplashScreen: {fileID: 0} iPhoneHighResSplashScreen: {fileID: 0} iPhoneTallHighResSplashScreen: {fileID: 0} + iPhone47inSplashScreen: {fileID: 0} + iPhone55inPortraitSplashScreen: {fileID: 0} + iPhone55inLandscapeSplashScreen: {fileID: 0} iPadPortraitSplashScreen: {fileID: 0} iPadHighResPortraitSplashScreen: {fileID: 0} iPadLandscapeSplashScreen: {fileID: 0} iPadHighResLandscapeSplashScreen: {fileID: 0} + iOSLaunchScreenType: 0 + iOSLaunchScreenPortrait: {fileID: 0} + iOSLaunchScreenLandscape: {fileID: 0} + iOSLaunchScreenBackgroundColor: + serializedVersion: 2 + rgba: 0 + iOSLaunchScreenFillPct: 1 + iOSLaunchScreenCustomXibPath: AndroidTargetDevice: 0 AndroidSplashScreenScale: 0 AndroidKeystoreName: AndroidKeyaliasName: + AndroidTVCompatibility: 1 + AndroidIsGame: 1 + androidEnableBanner: 1 + m_AndroidBanners: + - width: 320 + height: 180 + banner: {fileID: 0} resolutionDialogBanner: {fileID: 0} m_BuildTargetIcons: [] m_BuildTargetBatching: [] webPlayerTemplate: APPLICATION:Default m_TemplateCustomTags: {} - wiiRegion: 1 - wiiGameCode: RABA - wiiGameVersion: - wiiCompanyCode: ZZ - wiiSupportsNunchuk: 0 - wiiSupportsClassicController: 0 - wiiSupportsBalanceBoard: 0 - wiiSupportsMotionPlus: 0 - wiiControllerCount: 1 - wiiFloatingPointExceptions: 0 - wiiScreenCrashDumps: 1 + actionOnDotNetUnhandledException: 1 + enableInternalProfiler: 0 + logObjCUncaughtExceptions: 1 + enableCrashReportAPI: 0 + locationUsageDescription: XboxTitleId: XboxImageXexPath: XboxSpaPath: @@ -139,6 +155,7 @@ PlayerSettings: ps3ThumbnailPath: ps3BackgroundPath: ps3SoundPath: + ps3NPAgeRating: 12 ps3TrophyCommId: ps3NpCommunicationPassphrase: ps3TrophyPackagePath: @@ -146,11 +163,96 @@ PlayerSettings: ps3TrophyCommSig: ps3SaveGameSlots: 1 ps3TrialMode: 0 - flashStrippingLevel: 2 + ps3VideoMemoryForAudio: 0 + ps3EnableVerboseMemoryStats: 0 + ps3UseSPUForUmbra: 0 + ps3EnableMoveSupport: 1 + ps3DisableDolbyEncoding: 0 + ps4NPAgeRating: 12 + ps4NPTitleSecret: + ps4NPTrophyPackPath: + ps4ParentalLevel: 1 + ps4ContentID: ED1633-NPXX51362_00-0000000000000000 + ps4Category: 0 + ps4MasterVersion: 01.00 + ps4AppVersion: 01.00 + ps4AppType: 0 + ps4ParamSfxPath: + ps4VideoOutPixelFormat: 0 + ps4VideoOutResolution: 4 + ps4PronunciationXMLPath: + ps4PronunciationSIGPath: + ps4BackgroundImagePath: + ps4StartupImagePath: + ps4SaveDataImagePath: + ps4BGMPath: + ps4ShareFilePath: + ps4NPtitleDatPath: + ps4RemotePlayKeyAssignment: -1 + ps4EnterButtonAssignment: 1 + ps4ApplicationParam1: 0 + ps4ApplicationParam2: 0 + ps4ApplicationParam3: 0 + ps4ApplicationParam4: 0 + ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ + ps4pnSessions: 1 + ps4pnPresence: 1 + ps4pnFriends: 1 + ps4pnGameCustomData: 1 + playerPrefsSupport: 0 + monoEnv: + psp2Splashimage: {fileID: 0} + psp2NPTrophyPackPath: + psp2NPSupportGBMorGJP: 0 + psp2NPAgeRating: 12 + psp2NPCommsID: + psp2NPCommunicationsID: + psp2NPCommsPassphrase: + psp2NPCommsSig: + psp2ParamSfxPath: + psp2ManualPath: + psp2LiveAreaGatePath: + psp2LiveAreaBackroundPath: + psp2LiveAreaPath: + psp2LiveAreaTrialPath: + psp2PatchChangeInfoPath: + psp2PatchOriginalPackage: + psp2PackagePassword: F69AzBlax3CF3EDNhm3soLBPh71Yexui + psp2KeystoneFile: + psp2DRMType: 0 + psp2StorageType: 0 + psp2MediaCapacity: 0 + psp2DLCConfigPath: + psp2ThumbnailPath: + psp2BackgroundPath: + psp2SoundPath: + psp2TrophyCommId: + psp2TrophyPackagePath: + psp2PackagedResourcesPath: + psp2SaveDataQuota: 10240 + psp2ParentalLevel: 1 + psp2ShortTitle: Not Set + psp2ContentID: IV0000-ABCD12345_00-0123456789ABCDEF + psp2Category: 0 + psp2MasterVersion: 01.00 + psp2AppVersion: 01.00 + psp2TVBootMode: 0 + psp2EnterButtonAssignment: 2 + psp2TVDisableEmu: 0 + psp2AllowTwitterDialog: 1 + psp2Upgradable: 0 + psp2HealthWarning: 0 + psp2UseLibLocation: 0 + psp2InfoBarOnStartup: 0 + psp2InfoBarColor: 0 + psmSplashimage: {fileID: 0} spritePackerPolicy: scriptingDefineSymbols: {} metroPackageName: Akadoc metroPackageLogo: + metroPackageLogo140: + metroPackageLogo180: + metroPackageLogo240: metroPackageVersion: metroCertificatePath: metroCertificatePassword: @@ -158,19 +260,59 @@ PlayerSettings: metroCertificateIssuer: metroCertificateNotAfter: 0000000000000000 metroApplicationDescription: Akadoc - metroTileLogo: - metroTileWideLogo: - metroTileSmallLogo: + metroStoreTileLogo80: + metroStoreTileLogo: + metroStoreTileLogo140: + metroStoreTileLogo180: + metroStoreTileWideLogo80: + metroStoreTileWideLogo: + metroStoreTileWideLogo140: + metroStoreTileWideLogo180: + metroStoreTileSmallLogo80: + metroStoreTileSmallLogo: + metroStoreTileSmallLogo140: + metroStoreTileSmallLogo180: + metroStoreSmallTile80: + metroStoreSmallTile: + metroStoreSmallTile140: + metroStoreSmallTile180: + metroStoreLargeTile80: + metroStoreLargeTile: + metroStoreLargeTile140: + metroStoreLargeTile180: + metroStoreSplashScreenImage: + metroStoreSplashScreenImage140: + metroStoreSplashScreenImage180: + metroPhoneAppIcon: + metroPhoneAppIcon140: + metroPhoneAppIcon240: + metroPhoneSmallTile: + metroPhoneSmallTile140: + metroPhoneSmallTile240: + metroPhoneMediumTile: + metroPhoneMediumTile140: + metroPhoneMediumTile240: + metroPhoneWideTile: + metroPhoneWideTile140: + metroPhoneWideTile240: + metroPhoneSplashScreenImage: + metroPhoneSplashScreenImage140: + metroPhoneSplashScreenImage240: metroTileShortName: metroCommandLineArgsFile: metroTileShowName: 1 + metroMediumTileShowName: 0 + metroLargeTileShowName: 0 + metroWideTileShowName: 0 + metroDefaultTileSize: 1 metroTileForegroundText: 1 metroTileBackgroundColor: {r: 0, g: 0, b: 0, a: 1} - metroSplashScreenImage: metroSplashScreenBackgroundColor: {r: 0, g: 0, b: 0, a: 1} metroSplashScreenUseBackgroundColor: 0 - metroCapabilities: {} - metroUnprocessedPlugins: [] + platformCapabilities: {} + metroFTAName: + metroFTAFileTypes: [] + metroProtocolName: metroCompilationOverrides: 1 blackberryDeviceAddress: blackberryDevicePassword: @@ -178,10 +320,8 @@ PlayerSettings: blackberryTokenExires: blackberryTokenAuthor: blackberryTokenAuthorId: - blackberryAuthorId: blackberryCskPassword: blackberrySaveLogPath: - blackberryAuthorIdOveride: 0 blackberrySharedPermissions: 0 blackberryCameraPermissions: 0 blackberryGPSPermissions: 0 @@ -196,8 +336,54 @@ PlayerSettings: tizenProductURL: tizenCertificatePath: tizenCertificatePassword: - tizenSaveLogPath: + tizenGPSPermissions: 0 + tizenMicrophonePermissions: 0 + stvDeviceAddress: + stvProductDescription: + stvProductAuthor: + stvProductAuthorEmail: + stvProductLink: + stvProductCategory: 0 + XboxOneProductId: + XboxOneUpdateKey: + XboxOneSandboxId: + XboxOneContentId: + XboxOneTitleId: + XboxOneSCId: + XboxOneGameOsOverridePath: + XboxOnePackagingOverridePath: + XboxOneAppManifestOverridePath: + XboxOnePackageEncryption: 0 + XboxOneDescription: + XboxOneIsContentPackage: 0 + XboxOneEnableGPUVariability: 0 + XboxOneSockets: {} + XboxOneSplashScreen: {fileID: 0} + XboxOneAllowedProductIds: [] + XboxOnePersistentLocalStorageSize: 0 + intPropertyNames: + - Metro::ScriptingBackend + - WP8::ScriptingBackend + - WebGL::ScriptingBackend + - WebGL::audioCompressionFormat + - WebGL::exceptionSupport + - WebGL::memorySize + - iOS::Architecture + - iOS::ScriptingBackend + Metro::ScriptingBackend: 2 + WP8::ScriptingBackend: 2 + WebGL::ScriptingBackend: 1 + WebGL::audioCompressionFormat: 4 + WebGL::exceptionSupport: 0 + WebGL::memorySize: 256 + iOS::Architecture: 2 + iOS::ScriptingBackend: 0 + boolPropertyNames: + - WebGL::dataCaching + WebGL::dataCaching: 0 + stringPropertyNames: + - WebGL::emscriptenArgs + - WebGL::template + WebGL::emscriptenArgs: + WebGL::template: APPLICATION:Default firstStreamedLevelWithResources: 0 - unityRebuildLibraryVersion: 9 - unityForwardCompatibleVersion: 39 - unityStandardAssetsVersion: 0