Download as
Browse Code »

Commit f1f0ce6839993d4f029bccdb3bf89e38899eebfe

Authored by Mateus Lustosa
1 parent 7b4a334c
Exists in master and in 1 other branch dev

Tratamento de pontuacao.

Showing 3 changed files with 110 additions and 8 deletions   Show diff stats
Assets/Scripts/GenericPlayerManager.cs
  Diff comments   View file @f1f0ce6
@@ -388,8 +388,37 @@ public abstract class GenericPlayerManager : MonoBehaviour { @@ -388,8 +388,37 @@ public abstract class GenericPlayerManager : MonoBehaviour {
388 spelled = false; 388 spelled = false;
389 } 389 }
390 390
391 - playAnimation(TYPE_WORD, aniName); 391 + bool isPunctuation = false;
392 lastAnimationSubtitle = aniName; 392 lastAnimationSubtitle = aniName;
  393 +
  394 + if (aniName[0] == '[')
  395 + {
  396 + if (aniName.Equals("[PONTO]"))
  397 + {
  398 + isPunctuation = true;
  399 + lastAnimationSubtitle = ".";
  400 + }
  401 +
  402 + else if (aniName.Equals("[INTERROGACAO]"))
  403 + {
  404 + isPunctuation = true;
  405 + lastAnimationSubtitle = "?";
  406 + }
  407 +
  408 + else if (aniName.Equals("[EXCLAMACAO]"))
  409 + {
  410 + isPunctuation = true;
  411 + lastAnimationSubtitle = "!";
  412 + }
  413 + }
  414 +
  415 + if (isPunctuation)
  416 + playAnimation(TYPE_WORD, aniName, lastAnimationSubtitle);
  417 + else
  418 + playAnimation(TYPE_WORD, aniName);
  419 +
  420 + /*playAnimation(TYPE_WORD, aniName);
  421 + lastAnimationSubtitle = aniName;*/
393 } 422 }
394 // Soletra palavra 423 // Soletra palavra
395 else 424 else
@@ -399,13 +428,20 @@ public abstract class GenericPlayerManager : MonoBehaviour { @@ -399,13 +428,20 @@ public abstract class GenericPlayerManager : MonoBehaviour {
399 if ( ! nonexistent) 428 if ( ! nonexistent)
400 nonexistentAssetBundles.Add(aniName); 429 nonexistentAssetBundles.Add(aniName);
401 430
402 - // Se já houve o soletramento de alguma palavra, reproduz animação default  
403 - if (spelled)  
404 - playAnimation(TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle, 1.6F); 431 + if (aniName[0] == '[' && (aniName.Equals("[PONTO]") || aniName.Equals("[INTERROGACAO]") || aniName.Equals("[EXCLAMACAO]")))
  432 + {
  433 + playAnimation(TYPE_NONE, DEFAULT_ANIMATION, "", 1.6F);
  434 + }
405 else 435 else
406 - spelled = true; 436 + {
  437 + // Se já houve o soletramento de alguma palavra, reproduz animação default
  438 + if (spelled)
  439 + playAnimation(TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle, 1.6F);
  440 + else
  441 + spelled = true;
407 442
408 - lastAnimationSubtitle = spellWord(aniName); 443 + lastAnimationSubtitle = spellWord(aniName);
  444 + }
409 } 445 }
410 } 446 }
411 447
ProjectSettings/ProjectSettings.asset
  Diff comments   View file @f1f0ce6
@@ -8,6 +8,7 @@ PlayerSettings: @@ -8,6 +8,7 @@ PlayerSettings:
8 defaultScreenOrientation: 4 8 defaultScreenOrientation: 4
9 targetDevice: 2 9 targetDevice: 2
10 targetResolution: 0 10 targetResolution: 0
  11 + useOnDemandResources: 0
11 accelerometerFrequency: 60 12 accelerometerFrequency: 60
12 companyName: LAViD 13 companyName: LAViD
13 productName: VLibrasPlayer 14 productName: VLibrasPlayer
@@ -28,6 +29,7 @@ PlayerSettings: @@ -28,6 +29,7 @@ PlayerSettings:
28 androidShowActivityIndicatorOnLoading: -1 29 androidShowActivityIndicatorOnLoading: -1
29 iosAppInBackgroundBehavior: 0 30 iosAppInBackgroundBehavior: 0
30 displayResolutionDialog: 0 31 displayResolutionDialog: 0
  32 + iosAllowHTTPDownload: 1
31 allowedAutorotateToPortrait: 1 33 allowedAutorotateToPortrait: 1
32 allowedAutorotateToPortraitUpsideDown: 1 34 allowedAutorotateToPortraitUpsideDown: 1
33 allowedAutorotateToLandscapeRight: 1 35 allowedAutorotateToLandscapeRight: 1
@@ -60,11 +62,23 @@ PlayerSettings: @@ -60,11 +62,23 @@ PlayerSettings:
60 xboxSpeechDB: 0 62 xboxSpeechDB: 0
61 xboxEnableHeadOrientation: 0 63 xboxEnableHeadOrientation: 0
62 xboxEnableGuest: 0 64 xboxEnableGuest: 0
  65 + n3dsDisableStereoscopicView: 0
  66 + n3dsEnableSharedListOpt: 1
  67 + n3dsEnableVSync: 0
63 xboxOneResolution: 0 68 xboxOneResolution: 0
64 ps3SplashScreen: {fileID: 0} 69 ps3SplashScreen: {fileID: 0}
65 videoMemoryForVertexBuffers: 0 70 videoMemoryForVertexBuffers: 0
66 psp2PowerMode: 0 71 psp2PowerMode: 0
67 psp2AcquireBGM: 1 72 psp2AcquireBGM: 1
  73 + wiiUTVResolution: 0
  74 + wiiUGamePadMSAA: 1
  75 + wiiUSupportsNunchuk: 0
  76 + wiiUSupportsClassicController: 0
  77 + wiiUSupportsBalanceBoard: 0
  78 + wiiUSupportsMotionPlus: 0
  79 + wiiUSupportsProController: 0
  80 + wiiUAllowScreenCapture: 1
  81 + wiiUControllerCount: 0
68 m_SupportedAspectRatios: 82 m_SupportedAspectRatios:
69 4:3: 1 83 4:3: 1
70 5:4: 1 84 5:4: 1
@@ -84,14 +98,19 @@ PlayerSettings: @@ -84,14 +98,19 @@ PlayerSettings:
84 AndroidPreferredInstallLocation: 1 98 AndroidPreferredInstallLocation: 1
85 aotOptions: 99 aotOptions:
86 apiCompatibilityLevel: 1 100 apiCompatibilityLevel: 1
  101 + stripEngineCode: 1
87 iPhoneStrippingLevel: 0 102 iPhoneStrippingLevel: 0
88 iPhoneScriptCallOptimization: 0 103 iPhoneScriptCallOptimization: 0
  104 + iPhoneBuildNumber: 0
89 ForceInternetPermission: 0 105 ForceInternetPermission: 0
90 ForceSDCardPermission: 0 106 ForceSDCardPermission: 0
91 CreateWallpaper: 0 107 CreateWallpaper: 0
92 APKExpansionFiles: 0 108 APKExpansionFiles: 0
93 preloadShaders: 0 109 preloadShaders: 0
94 StripUnusedMeshComponents: 0 110 StripUnusedMeshComponents: 0
  111 + VertexChannelCompressionMask:
  112 + serializedVersion: 2
  113 + m_Bits: 238
95 iPhoneSdkVersion: 988 114 iPhoneSdkVersion: 988
96 iPhoneTargetOSVersion: 22 115 iPhoneTargetOSVersion: 22
97 uIPrerenderedIcon: 0 116 uIPrerenderedIcon: 0
@@ -118,6 +137,15 @@ PlayerSettings: @@ -118,6 +137,15 @@ PlayerSettings:
118 iOSLaunchScreenFillPct: 100 137 iOSLaunchScreenFillPct: 100
119 iOSLaunchScreenSize: 100 138 iOSLaunchScreenSize: 100
120 iOSLaunchScreenCustomXibPath: 139 iOSLaunchScreenCustomXibPath:
  140 + iOSLaunchScreeniPadType: 0
  141 + iOSLaunchScreeniPadImage: {fileID: 0}
  142 + iOSLaunchScreeniPadBackgroundColor:
  143 + serializedVersion: 2
  144 + rgba: 0
  145 + iOSLaunchScreeniPadFillPct: 100
  146 + iOSLaunchScreeniPadSize: 100
  147 + iOSLaunchScreeniPadCustomXibPath:
  148 + iOSDeviceRequirements: []
121 AndroidTargetDevice: 0 149 AndroidTargetDevice: 0
122 AndroidSplashScreenScale: 0 150 AndroidSplashScreenScale: 0
123 androidSplashScreen: {fileID: 0} 151 androidSplashScreen: {fileID: 0}
@@ -144,6 +172,23 @@ PlayerSettings: @@ -144,6 +172,23 @@ PlayerSettings:
144 m_BuildTargetGraphicsAPIs: [] 172 m_BuildTargetGraphicsAPIs: []
145 webPlayerTemplate: APPLICATION:Default 173 webPlayerTemplate: APPLICATION:Default
146 m_TemplateCustomTags: {} 174 m_TemplateCustomTags: {}
  175 + wiiUTitleID: 0005000011000000
  176 + wiiUGroupID: 00010000
  177 + wiiUCommonSaveSize: 4096
  178 + wiiUAccountSaveSize: 2048
  179 + wiiUOlvAccessKey: 0
  180 + wiiUTinCode: 0
  181 + wiiUJoinGameId: 0
  182 + wiiUJoinGameModeMask: 0000000000000000
  183 + wiiUCommonBossSize: 0
  184 + wiiUAccountBossSize: 0
  185 + wiiUAddOnUniqueIDs: []
  186 + wiiUMainThreadStackSize: 3072
  187 + wiiULoaderThreadStackSize: 1024
  188 + wiiUSystemHeapSize: 128
  189 + wiiUTVStartupScreen: {fileID: 0}
  190 + wiiUGamePadStartupScreen: {fileID: 0}
  191 + wiiUProfilerLibPath:
147 actionOnDotNetUnhandledException: 1 192 actionOnDotNetUnhandledException: 1
148 enableInternalProfiler: 0 193 enableInternalProfiler: 0
149 logObjCUncaughtExceptions: 1 194 logObjCUncaughtExceptions: 1
@@ -194,15 +239,20 @@ PlayerSettings: @@ -194,15 +239,20 @@ PlayerSettings:
194 ps4BackgroundImagePath: 239 ps4BackgroundImagePath:
195 ps4StartupImagePath: 240 ps4StartupImagePath:
196 ps4SaveDataImagePath: 241 ps4SaveDataImagePath:
  242 + ps4SdkOverride:
197 ps4BGMPath: 243 ps4BGMPath:
198 ps4ShareFilePath: 244 ps4ShareFilePath:
  245 + ps4ShareOverlayImagePath:
  246 + ps4PrivacyGuardImagePath:
199 ps4NPtitleDatPath: 247 ps4NPtitleDatPath:
200 ps4RemotePlayKeyAssignment: -1 248 ps4RemotePlayKeyAssignment: -1
  249 + ps4RemotePlayKeyMappingDir:
201 ps4EnterButtonAssignment: 1 250 ps4EnterButtonAssignment: 1
202 ps4ApplicationParam1: 0 251 ps4ApplicationParam1: 0
203 ps4ApplicationParam2: 0 252 ps4ApplicationParam2: 0
204 ps4ApplicationParam3: 0 253 ps4ApplicationParam3: 0
205 ps4ApplicationParam4: 0 254 ps4ApplicationParam4: 0
  255 + ps4DownloadDataSize: 0
206 ps4GarlicHeapSize: 2048 256 ps4GarlicHeapSize: 2048
207 ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ 257 ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ
208 ps4pnSessions: 1 258 ps4pnSessions: 1
@@ -210,6 +260,12 @@ PlayerSettings: @@ -210,6 +260,12 @@ PlayerSettings:
210 ps4pnFriends: 1 260 ps4pnFriends: 1
211 ps4pnGameCustomData: 1 261 ps4pnGameCustomData: 1
212 playerPrefsSupport: 0 262 playerPrefsSupport: 0
  263 + ps4ReprojectionSupport: 0
  264 + ps4attribUserManagement: 0
  265 + ps4attribMoveSupport: 0
  266 + ps4attrib3DSupport: 0
  267 + ps4attribShareSupport: 0
  268 + ps4IncludedModules: []
213 monoEnv: 269 monoEnv:
214 psp2Splashimage: {fileID: 0} 270 psp2Splashimage: {fileID: 0}
215 psp2NPTrophyPackPath: 271 psp2NPTrophyPackPath:
@@ -349,6 +405,17 @@ PlayerSettings: @@ -349,6 +405,17 @@ PlayerSettings:
349 tizenSigningProfileName: 405 tizenSigningProfileName:
350 tizenGPSPermissions: 0 406 tizenGPSPermissions: 0
351 tizenMicrophonePermissions: 0 407 tizenMicrophonePermissions: 0
  408 + n3dsUseExtSaveData: 0
  409 + n3dsCompressStaticMem: 1
  410 + n3dsExtSaveDataNumber: 0x12345
  411 + n3dsStackSize: 131072
  412 + n3dsTargetPlatform: 2
  413 + n3dsRegion: 7
  414 + n3dsMediaSize: 0
  415 + n3dsLogoStyle: 3
  416 + n3dsTitle: GameName
  417 + n3dsProductCode:
  418 + n3dsApplicationId: 0xFF3FF
352 stvDeviceAddress: 419 stvDeviceAddress:
353 stvProductDescription: 420 stvProductDescription:
354 stvProductAuthor: 421 stvProductAuthor:
@@ -414,7 +481,6 @@ PlayerSettings: @@ -414,7 +481,6 @@ PlayerSettings:
414 additionalIl2CppArgs::additionalIl2CppArgs: 481 additionalIl2CppArgs::additionalIl2CppArgs:
415 firstStreamedSceneWithResources: 0 482 firstStreamedSceneWithResources: 0
416 cloudProjectId: 483 cloudProjectId:
417 - projectId:  
418 projectName: 484 projectName:
419 organizationId: 485 organizationId:
420 cloudEnabled: 0 486 cloudEnabled: 0
ProjectSettings/ProjectVersion.txt
  Diff comments   View file @f1f0ce6
1 -m_EditorVersion: 5.1.2f1 1 +m_EditorVersion: 5.2.1f1
2 m_StandardAssetsVersion: 0 2 m_StandardAssetsVersion: 0