From f1f0ce6839993d4f029bccdb3bf89e38899eebfe Mon Sep 17 00:00:00 2001 From: Mateus Pires Date: Mon, 16 Nov 2015 16:19:13 -0200 Subject: [PATCH] Tratamento de pontuacao. --- Assets/Scripts/GenericPlayerManager.cs | 48 ++++++++++++++++++++++++++++++++++++++++++------ ProjectSettings/ProjectSettings.asset | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- ProjectSettings/ProjectVersion.txt | 2 +- 3 files changed, 110 insertions(+), 8 deletions(-) diff --git a/Assets/Scripts/GenericPlayerManager.cs b/Assets/Scripts/GenericPlayerManager.cs index 967a309..2655e5b 100644 --- a/Assets/Scripts/GenericPlayerManager.cs +++ b/Assets/Scripts/GenericPlayerManager.cs @@ -388,8 +388,37 @@ public abstract class GenericPlayerManager : MonoBehaviour { spelled = false; } - playAnimation(TYPE_WORD, aniName); + bool isPunctuation = false; lastAnimationSubtitle = aniName; + + if (aniName[0] == '[') + { + if (aniName.Equals("[PONTO]")) + { + isPunctuation = true; + lastAnimationSubtitle = "."; + } + + else if (aniName.Equals("[INTERROGACAO]")) + { + isPunctuation = true; + lastAnimationSubtitle = "?"; + } + + else if (aniName.Equals("[EXCLAMACAO]")) + { + isPunctuation = true; + lastAnimationSubtitle = "!"; + } + } + + if (isPunctuation) + playAnimation(TYPE_WORD, aniName, lastAnimationSubtitle); + else + playAnimation(TYPE_WORD, aniName); + + /*playAnimation(TYPE_WORD, aniName); + lastAnimationSubtitle = aniName;*/ } // Soletra palavra else @@ -399,13 +428,20 @@ public abstract class GenericPlayerManager : MonoBehaviour { if ( ! nonexistent) nonexistentAssetBundles.Add(aniName); - // Se já houve o soletramento de alguma palavra, reproduz animação default - if (spelled) - playAnimation(TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle, 1.6F); + if (aniName[0] == '[' && (aniName.Equals("[PONTO]") || aniName.Equals("[INTERROGACAO]") || aniName.Equals("[EXCLAMACAO]"))) + { + playAnimation(TYPE_NONE, DEFAULT_ANIMATION, "", 1.6F); + } else - spelled = true; + { + // Se já houve o soletramento de alguma palavra, reproduz animação default + if (spelled) + playAnimation(TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle, 1.6F); + else + spelled = true; - lastAnimationSubtitle = spellWord(aniName); + lastAnimationSubtitle = spellWord(aniName); + } } } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index f7ed24f..8d4c592 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -8,6 +8,7 @@ PlayerSettings: defaultScreenOrientation: 4 targetDevice: 2 targetResolution: 0 + useOnDemandResources: 0 accelerometerFrequency: 60 companyName: LAViD productName: VLibrasPlayer @@ -28,6 +29,7 @@ PlayerSettings: androidShowActivityIndicatorOnLoading: -1 iosAppInBackgroundBehavior: 0 displayResolutionDialog: 0 + iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -60,11 +62,23 @@ PlayerSettings: xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0 + n3dsDisableStereoscopicView: 0 + n3dsEnableSharedListOpt: 1 + n3dsEnableVSync: 0 xboxOneResolution: 0 ps3SplashScreen: {fileID: 0} videoMemoryForVertexBuffers: 0 psp2PowerMode: 0 psp2AcquireBGM: 1 + wiiUTVResolution: 0 + wiiUGamePadMSAA: 1 + wiiUSupportsNunchuk: 0 + wiiUSupportsClassicController: 0 + wiiUSupportsBalanceBoard: 0 + wiiUSupportsMotionPlus: 0 + wiiUSupportsProController: 0 + wiiUAllowScreenCapture: 1 + wiiUControllerCount: 0 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -84,14 +98,19 @@ PlayerSettings: AndroidPreferredInstallLocation: 1 aotOptions: apiCompatibilityLevel: 1 + stripEngineCode: 1 iPhoneStrippingLevel: 0 iPhoneScriptCallOptimization: 0 + iPhoneBuildNumber: 0 ForceInternetPermission: 0 ForceSDCardPermission: 0 CreateWallpaper: 0 APKExpansionFiles: 0 preloadShaders: 0 StripUnusedMeshComponents: 0 + VertexChannelCompressionMask: + serializedVersion: 2 + m_Bits: 238 iPhoneSdkVersion: 988 iPhoneTargetOSVersion: 22 uIPrerenderedIcon: 0 @@ -118,6 +137,15 @@ PlayerSettings: iOSLaunchScreenFillPct: 100 iOSLaunchScreenSize: 100 iOSLaunchScreenCustomXibPath: + iOSLaunchScreeniPadType: 0 + iOSLaunchScreeniPadImage: {fileID: 0} + iOSLaunchScreeniPadBackgroundColor: + serializedVersion: 2 + rgba: 0 + iOSLaunchScreeniPadFillPct: 100 + iOSLaunchScreeniPadSize: 100 + iOSLaunchScreeniPadCustomXibPath: + iOSDeviceRequirements: [] AndroidTargetDevice: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} @@ -144,6 +172,23 @@ PlayerSettings: m_BuildTargetGraphicsAPIs: [] webPlayerTemplate: APPLICATION:Default m_TemplateCustomTags: {} + wiiUTitleID: 0005000011000000 + wiiUGroupID: 00010000 + wiiUCommonSaveSize: 4096 + wiiUAccountSaveSize: 2048 + wiiUOlvAccessKey: 0 + wiiUTinCode: 0 + wiiUJoinGameId: 0 + wiiUJoinGameModeMask: 0000000000000000 + wiiUCommonBossSize: 0 + wiiUAccountBossSize: 0 + wiiUAddOnUniqueIDs: [] + wiiUMainThreadStackSize: 3072 + wiiULoaderThreadStackSize: 1024 + wiiUSystemHeapSize: 128 + wiiUTVStartupScreen: {fileID: 0} + wiiUGamePadStartupScreen: {fileID: 0} + wiiUProfilerLibPath: actionOnDotNetUnhandledException: 1 enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 @@ -194,15 +239,20 @@ PlayerSettings: ps4BackgroundImagePath: ps4StartupImagePath: ps4SaveDataImagePath: + ps4SdkOverride: ps4BGMPath: ps4ShareFilePath: + ps4ShareOverlayImagePath: + ps4PrivacyGuardImagePath: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 + ps4RemotePlayKeyMappingDir: ps4EnterButtonAssignment: 1 ps4ApplicationParam1: 0 ps4ApplicationParam2: 0 ps4ApplicationParam3: 0 ps4ApplicationParam4: 0 + ps4DownloadDataSize: 0 ps4GarlicHeapSize: 2048 ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ ps4pnSessions: 1 @@ -210,6 +260,12 @@ PlayerSettings: ps4pnFriends: 1 ps4pnGameCustomData: 1 playerPrefsSupport: 0 + ps4ReprojectionSupport: 0 + ps4attribUserManagement: 0 + ps4attribMoveSupport: 0 + ps4attrib3DSupport: 0 + ps4attribShareSupport: 0 + ps4IncludedModules: [] monoEnv: psp2Splashimage: {fileID: 0} psp2NPTrophyPackPath: @@ -349,6 +405,17 @@ PlayerSettings: tizenSigningProfileName: tizenGPSPermissions: 0 tizenMicrophonePermissions: 0 + n3dsUseExtSaveData: 0 + n3dsCompressStaticMem: 1 + n3dsExtSaveDataNumber: 0x12345 + n3dsStackSize: 131072 + n3dsTargetPlatform: 2 + n3dsRegion: 7 + n3dsMediaSize: 0 + n3dsLogoStyle: 3 + n3dsTitle: GameName + n3dsProductCode: + n3dsApplicationId: 0xFF3FF stvDeviceAddress: stvProductDescription: stvProductAuthor: @@ -414,7 +481,6 @@ PlayerSettings: additionalIl2CppArgs::additionalIl2CppArgs: firstStreamedSceneWithResources: 0 cloudProjectId: - projectId: projectName: organizationId: cloudEnabled: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 8c353d8..8a062e6 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.1.2f1 +m_EditorVersion: 5.2.1f1 m_StandardAssetsVersion: 0 -- libgit2 0.21.2