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 388 spelled = false;
389 389 }
390 390  
391   - playAnimation(TYPE_WORD, aniName);
  391 + bool isPunctuation = false;
392 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 423 // Soletra palavra
395 424 else
... ... @@ -399,13 +428,20 @@ public abstract class GenericPlayerManager : MonoBehaviour {
399 428 if ( ! nonexistent)
400 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 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 8 defaultScreenOrientation: 4
9 9 targetDevice: 2
10 10 targetResolution: 0
  11 + useOnDemandResources: 0
11 12 accelerometerFrequency: 60
12 13 companyName: LAViD
13 14 productName: VLibrasPlayer
... ... @@ -28,6 +29,7 @@ PlayerSettings:
28 29 androidShowActivityIndicatorOnLoading: -1
29 30 iosAppInBackgroundBehavior: 0
30 31 displayResolutionDialog: 0
  32 + iosAllowHTTPDownload: 1
31 33 allowedAutorotateToPortrait: 1
32 34 allowedAutorotateToPortraitUpsideDown: 1
33 35 allowedAutorotateToLandscapeRight: 1
... ... @@ -60,11 +62,23 @@ PlayerSettings:
60 62 xboxSpeechDB: 0
61 63 xboxEnableHeadOrientation: 0
62 64 xboxEnableGuest: 0
  65 + n3dsDisableStereoscopicView: 0
  66 + n3dsEnableSharedListOpt: 1
  67 + n3dsEnableVSync: 0
63 68 xboxOneResolution: 0
64 69 ps3SplashScreen: {fileID: 0}
65 70 videoMemoryForVertexBuffers: 0
66 71 psp2PowerMode: 0
67 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 82 m_SupportedAspectRatios:
69 83 4:3: 1
70 84 5:4: 1
... ... @@ -84,14 +98,19 @@ PlayerSettings:
84 98 AndroidPreferredInstallLocation: 1
85 99 aotOptions:
86 100 apiCompatibilityLevel: 1
  101 + stripEngineCode: 1
87 102 iPhoneStrippingLevel: 0
88 103 iPhoneScriptCallOptimization: 0
  104 + iPhoneBuildNumber: 0
89 105 ForceInternetPermission: 0
90 106 ForceSDCardPermission: 0
91 107 CreateWallpaper: 0
92 108 APKExpansionFiles: 0
93 109 preloadShaders: 0
94 110 StripUnusedMeshComponents: 0
  111 + VertexChannelCompressionMask:
  112 + serializedVersion: 2
  113 + m_Bits: 238
95 114 iPhoneSdkVersion: 988
96 115 iPhoneTargetOSVersion: 22
97 116 uIPrerenderedIcon: 0
... ... @@ -118,6 +137,15 @@ PlayerSettings:
118 137 iOSLaunchScreenFillPct: 100
119 138 iOSLaunchScreenSize: 100
120 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 149 AndroidTargetDevice: 0
122 150 AndroidSplashScreenScale: 0
123 151 androidSplashScreen: {fileID: 0}
... ... @@ -144,6 +172,23 @@ PlayerSettings:
144 172 m_BuildTargetGraphicsAPIs: []
145 173 webPlayerTemplate: APPLICATION:Default
146 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 192 actionOnDotNetUnhandledException: 1
148 193 enableInternalProfiler: 0
149 194 logObjCUncaughtExceptions: 1
... ... @@ -194,15 +239,20 @@ PlayerSettings:
194 239 ps4BackgroundImagePath:
195 240 ps4StartupImagePath:
196 241 ps4SaveDataImagePath:
  242 + ps4SdkOverride:
197 243 ps4BGMPath:
198 244 ps4ShareFilePath:
  245 + ps4ShareOverlayImagePath:
  246 + ps4PrivacyGuardImagePath:
199 247 ps4NPtitleDatPath:
200 248 ps4RemotePlayKeyAssignment: -1
  249 + ps4RemotePlayKeyMappingDir:
201 250 ps4EnterButtonAssignment: 1
202 251 ps4ApplicationParam1: 0
203 252 ps4ApplicationParam2: 0
204 253 ps4ApplicationParam3: 0
205 254 ps4ApplicationParam4: 0
  255 + ps4DownloadDataSize: 0
206 256 ps4GarlicHeapSize: 2048
207 257 ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ
208 258 ps4pnSessions: 1
... ... @@ -210,6 +260,12 @@ PlayerSettings:
210 260 ps4pnFriends: 1
211 261 ps4pnGameCustomData: 1
212 262 playerPrefsSupport: 0
  263 + ps4ReprojectionSupport: 0
  264 + ps4attribUserManagement: 0
  265 + ps4attribMoveSupport: 0
  266 + ps4attrib3DSupport: 0
  267 + ps4attribShareSupport: 0
  268 + ps4IncludedModules: []
213 269 monoEnv:
214 270 psp2Splashimage: {fileID: 0}
215 271 psp2NPTrophyPackPath:
... ... @@ -349,6 +405,17 @@ PlayerSettings:
349 405 tizenSigningProfileName:
350 406 tizenGPSPermissions: 0
351 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 419 stvDeviceAddress:
353 420 stvProductDescription:
354 421 stvProductAuthor:
... ... @@ -414,7 +481,6 @@ PlayerSettings:
414 481 additionalIl2CppArgs::additionalIl2CppArgs:
415 482 firstStreamedSceneWithResources: 0
416 483 cloudProjectId:
417   - projectId:
418 484 projectName:
419 485 organizationId:
420 486 cloudEnabled: 0
... ...
ProjectSettings/ProjectVersion.txt
  Diff comments   View file @f1f0ce6
1   -m_EditorVersion: 5.1.2f1
  1 +m_EditorVersion: 5.2.1f1
2 2 m_StandardAssetsVersion: 0
... ...