Commit porque si

Commit que jode
Cambios en General, intentando actualizar repo
Merge remote-tracking branch 'origin/rama-outsider'

Conflicts:
	New Unity Project/Assets/Code/Scripts/RecibirMensaje.cs
	New Unity Project/Assets/Prefabs/GUI_module_1.prefab
	New Unity Project/Assets/Prefabs/GUI_module_2.prefab
	New Unity Project/Assets/Prefabs/GUI_module_3.prefab
	New Unity Project/Assets/Scene/Play.unity
	New Unity Project/Library/CurrentLayout.dwlt
	New Unity Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	New Unity Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	New Unity Project/Library/assetDatabase3
	New Unity Project/Library/expandedItems
	New Unity Project/Library/guidmapper
	New Unity Project/Library/metadata/07/0774aac9907c517449824324a501351e
	New Unity Project/Library/metadata/5f/5f7be0ee4f7649b4f889a43f5089a8b9
	New Unity Project/Library/metadata/68/68a37dd6378280641b2922ba8b067c06
	New Unity Project/Library/metadata/74/74dc852b936459c449793268ec605b8e
	New Unity Project/Library/metadata/85/85ef27b87c6987a4cae484ea2582f781
	New Unity Project/Library/metadata/8d/8d628c337f4068c4f9a1bef8e5ca6c31
	New Unity Project/Library/metadata/bc/bce24ab5cc237c54ea2a62738580cc6b
	New Unity Project/Library/metadata/c0/c085e0227699c0f42a639085692eb260
	New Unity Project/Library/metadata/c7/c70041ab264c8ee43b7546b036dac1a6
	New Unity Project/Library/metadata/c9/c941156ee398131428a4657e22a4ce1d
	New Unity Project/Library/metadata/e3/e367d2c153e215f41b217b1261153da5
	New Unity Project/Library/metadata/ec/ec3c9a45029e4104b8f0810ead33b198
	New Unity Project/Library/metadata/ee/eecc298ffb2f6004a829342be20d2154
	New Unity Project/Library/metadata/f1/f1afdef330de83d45b9143a1d0c9bda0
	New Unity Project/New Unity Project.userprefs
	New Unity Project/ProjectSettings/EditorBuildSettings.asset
Semi-implementacion del sistema de comparacion
Quite algunas cosas de los scripts PlayState y DataPlayState que no servian y me falta comenzar
a poner la implementacion del llamado a funcion del evento comprar para que la funcion comparar
no se llame en todo momento que el usuario escribe un numero
temporales Unity
temporales otra vez
On branch master/origin merge trying to fix userprefs conflict problem
Merge remote-tracking branch 'origin/master'

Conflicts:
	New Unity Project/New Unity Project.userprefs
temp
temp
temp
pequeño comentario
temp
Merge remote-tracking branch 'origin/rama-outsider'

Conflicts:
	New Unity Project/Assets/Code/Scripts/GameData.cs
	New Unity Project/Assets/Code/Scripts/RecibirMensaje.cs
	New Unity Project/Assets/Prefabs/Historal/Objeto_historial.prefab
	New Unity Project/Assets/Prefabs/Play/Modulos/GUI_module_1.prefab
	New Unity Project/Assets/Prefabs/Play/Modulos/GUI_module_2.prefab
	New Unity Project/Assets/Scene/Play.unity
	New Unity Project/Library/CurrentLayout.dwlt
	New Unity Project/Library/CurrentMaximizeLayout.dwlt
	New Unity Project/Library/InspectorExpandedItems.asset
	New Unity Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	New Unity Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	New Unity Project/Library/ScriptAssemblies/Assembly-UnityScript.dll
	New Unity Project/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	New Unity Project/Library/assetDatabase3
	New Unity Project/Library/expandedItems
	New Unity Project/Library/guidmapper
	New Unity Project/Library/metadata/00/009041545c6b6d44e8014315d8badd8e
	New Unity Project/Library/metadata/04/04a0ea8ffc56d8241a6e04b5cad12261
	New Unity Project/Library/metadata/06/06f4a0a0e43bf484381e580955384964
	New Unity Project/Library/metadata/07/0774aac9907c517449824324a501351e
	New Unity Project/Library/metadata/09/092ca9dc877c91c4db351248a840d0c6
	New Unity Project/Library/metadata/09/09b9b18e706c6854f90ba2d444dd34d8
	New Unity Project/Library/metadata/1d/1d6d0c261a1a9354da4caad0dba593fb
	New Unity Project/Library/metadata/1e/1e1ec16245b7e734ab120026612b067f
	New Unity Project/Library/metadata/26/26667bb00aa695e418c72adb039ff123
	New Unity Project/Library/metadata/2d/2d74d018ba3a3ec46b9a18995a6903fe
	New Unity Project/Library/metadata/31/3140e321b2a2f1849b3e4ec0eeedafb0
	New Unity Project/Library/metadata/33/3385c4835bb24c44a813b01f485815b4
	New Unity Project/Library/metadata/36/369281a3bdf2a3d45b91a58e496f1769
	New Unity Project/Library/metadata/38/385a2da7f71e8c8498bb103f40f78b6e
	New Unity Project/Library/metadata/39/39edd11a52859204d80221f97e66fc98
	New Unity Project/Library/metadata/3b/3bca9c42009396a428ed3e218c48d436
	New Unity Project/Library/metadata/40/40829c2db58578b4ebefda7bbd7f2d04
	New Unity Project/Library/metadata/43/433b95ac483ca2d499585dfec0a802e3
	New Unity Project/Library/metadata/43/43ceab7bf04a5684bba3ef324ddcdb7a
	New Unity Project/Library/metadata/43/43ef88409a8dda14bbe5746632dfcaf3
	New Unity Project/Library/metadata/45/45f8f7c18936e4b46874fd8df6276185
	New Unity Project/Library/metadata/47/4702c6bf47ebabb41a0cb2056a23a9b3
	New Unity Project/Library/metadata/49/491e6d8e8321631439bb32e1fe509e5f
	New Unity Project/Library/metadata/4f/4f521ae660299d74db827f315798a694
	New Unity Project/Library/metadata/5f/5f7be0ee4f7649b4f889a43f5089a8b9
	New Unity Project/Library/metadata/64/6419834466c2dcb46bc6c00a87cba037
	New Unity Project/Library/metadata/68/68a37dd6378280641b2922ba8b067c06
	New Unity Project/Library/metadata/69/693b5b7a21e72ef41a15481fa12e2c04
	New Unity Project/Library/metadata/6e/6ef7858ac1b886244b212b4704f6b193
	New Unity Project/Library/metadata/74/7420236b3793ae04b8d1011f95997326
	New Unity Project/Library/metadata/74/74dc852b936459c449793268ec605b8e
	New Unity Project/Library/metadata/75/75e6720897ea8994a8434c188826e4a4
	New Unity Project/Library/metadata/79/790c8a3f902e5b54193ae8e304100e45
	New Unity Project/Library/metadata/7d/7db6554ea28d135479bd8fc3084de6b3
	New Unity Project/Library/metadata/7f/7f5b7845247cbbc40b21de8310b66a5e
	New Unity Project/Library/metadata/81/81f8af3c76d8c9b4a904c6080b9d6021
	New Unity Project/Library/metadata/85/85a9b0bcc4a9daf4a97abfb28a37cce6
	New Unity Project/Library/metadata/85/85ef27b87c6987a4cae484ea2582f781
	New Unity Project/Library/metadata/86/86ac162d8ecb7e7479a2f6d4049f610e
	New Unity Project/Library/metadata/88/88b6f20eeec999343bf17e5d52e52a8a
	New Unity Project/Library/metadata/8d/8d628c337f4068c4f9a1bef8e5ca6c31
	New Unity Project/Library/metadata/8e/8e7d6802aec3a404f8c0ce381f22b32a
	New Unity Project/Library/metadata/8f/8f17505c64acb6e469798892647884f6
	New Unity Project/Library/metadata/90/909170eb0fc75a74bbd248e8f1b20f97
	New Unity Project/Library/metadata/91/91830034d70ee3d4d89c552b311e91dc
	New Unity Project/Library/metadata/93/93426f1b1b72ade4aa6ea2bfe7376af7
	New Unity Project/Library/metadata/9a/9a769e95a0c537a49ad823e6a3a9b232
	New Unity Project/Library/metadata/9d/9ddbe366d25d351498c3030768b03031
	New Unity Project/Library/metadata/9e/9e37e4aa3580189458091e8a45d9bb45
	New Unity Project/Library/metadata/a0/a02c75b912f51b245a395c2dc2aa34af
	New Unity Project/Library/metadata/a0/a05fb2ca95d9df944801ccb5cc6da614
	New Unity Project/Library/metadata/a1/a168e85ab1d4ec442baf542800ff4a95
	New Unity Project/Library/metadata/a1/a1acab0ee92c9094ba0ac764f0c71267
	New Unity Project/Library/metadata/ac/ac287128c4806f0409f3e631de0c42c4
	New Unity Project/Library/metadata/af/afb48ba010de6f047a558d00256405c9
	New Unity Project/Library/metadata/b0/b05310d6464aedb4da387da522c4b6fd
	New Unity Project/Library/metadata/b1/b1be72d31c8264243a72994d9941b3b7
	New Unity Project/Library/metadata/b3/b346f2ff2daa4f24e9ef1de8c665537c
	New Unity Project/Library/metadata/b7/b74dee9d393307244992fcc37c8f0357
	New Unity Project/Library/metadata/ba/ba793de64848e72498868233c4383089
	New Unity Project/Library/metadata/ba/baf868840afc33c4b991d3d771336d04
	New Unity Project/Library/metadata/bc/bce24ab5cc237c54ea2a62738580cc6b
	New Unity Project/Library/metadata/bf/bf655fc8c815f4e4b904802c509a7f2f
	New Unity Project/Library/metadata/c0/c085e0227699c0f42a639085692eb260
	New Unity Project/Library/metadata/c7/c70041ab264c8ee43b7546b036dac1a6
	New Unity Project/Library/metadata/c9/c941156ee398131428a4657e22a4ce1d
	New Unity Project/Library/metadata/cc/ccdbe19916b34a344bf5396100fea6d8
	New Unity Project/Library/metadata/ce/ced41afd62031d24c9e0bef314baa593
	New Unity Project/Library/metadata/ce/cedad172a5f2e0343a532fb984191990
	New Unity Project/Library/metadata/cf/cf9605ce45eedf94aa010247fdb8c824
	New Unity Project/Library/metadata/d0/d075e877d71806b429cf501b64930af0
	New Unity Project/Library/metadata/d8/d8346d48274ceb54f863f833f244d7c0
	New Unity Project/Library/metadata/da/daf60443cd0d33a48b191f5f534de7b4
	New Unity Project/Library/metadata/e1/e1a9f5f8cedaa874095441b1e787381a
	New Unity Project/Library/metadata/e8/e8e988f7a398ffc498e27b9ed17c4114
	New Unity Project/Library/metadata/ec/ec3c9a45029e4104b8f0810ead33b198
	New Unity Project/Library/metadata/ee/eecc298ffb2f6004a829342be20d2154
	New Unity Project/Library/metadata/f0/f0f4175047d1b0748b186ea543a13aba
	New Unity Project/Library/metadata/f1/f1afdef330de83d45b9143a1d0c9bda0
	New Unity Project/Library/metadata/fb/fb643e52f206f4e429c378daa1625d86
	New Unity Project/Library/metadata/ff/ffda3b8ab4f93264fbe6dcb859f031f0
	New Unity Project/New Unity Project.userprefs
Puja, Cupones, Reglas y Logros

Toda la parte grafica de estas escenas terminadas
Información cupón

Falta script escalable y mucho mas....
Temp

Archivos temp
Merge remote-tracking branch 'origin/rama-outsider'

Conflicts:
	New Unity Project/Assets/Code/Scripts/DataPlayState.cs
	New Unity Project/Assets/Code/Scripts/RecibirMensaje.cs
	New Unity Project/Assets/Prefabs/Historal/Objeto_historial.prefab
	New Unity Project/Assets/Prefabs/Play/Modulos/GUI_module_1.prefab
	New Unity Project/Assets/Prefabs/Play/Modulos/GUI_module_3.prefab
	New Unity Project/Assets/Scene/Play.unity
	New Unity Project/Library/CurrentLayout.dwlt
	New Unity Project/Library/CurrentMaximizeLayout.dwlt
	New Unity Project/Library/InspectorExpandedItems.asset
	New Unity Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	New Unity Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	New Unity Project/Library/ScriptAssemblies/Assembly-UnityScript.dll
	New Unity Project/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	New Unity Project/Library/assetDatabase3
	New Unity Project/Library/expandedItems
	New Unity Project/Library/guidmapper
	New Unity Project/Library/metadata/04/04a0ea8ffc56d8241a6e04b5cad12261
	New Unity Project/Library/metadata/07/0774aac9907c517449824324a501351e
	New Unity Project/Library/metadata/1d/1d6d0c261a1a9354da4caad0dba593fb
	New Unity Project/Library/metadata/26/26667bb00aa695e418c72adb039ff123
	New Unity Project/Library/metadata/33/3385c4835bb24c44a813b01f485815b4
	New Unity Project/Library/metadata/40/40829c2db58578b4ebefda7bbd7f2d04
	New Unity Project/Library/metadata/4f/4f521ae660299d74db827f315798a694
	New Unity Project/Library/metadata/5f/5f7be0ee4f7649b4f889a43f5089a8b9
	New Unity Project/Library/metadata/64/6419834466c2dcb46bc6c00a87cba037
	New Unity Project/Library/metadata/68/68a37dd6378280641b2922ba8b067c06
	New Unity Project/Library/metadata/74/74dc852b936459c449793268ec605b8e
	New Unity Project/Library/metadata/81/81f8af3c76d8c9b4a904c6080b9d6021
	New Unity Project/Library/metadata/85/85a9b0bcc4a9daf4a97abfb28a37cce6
	New Unity Project/Library/metadata/85/85ef27b87c6987a4cae484ea2582f781
	New Unity Project/Library/metadata/8d/8d628c337f4068c4f9a1bef8e5ca6c31
	New Unity Project/Library/metadata/9d/9ddbe366d25d351498c3030768b03031
	New Unity Project/Library/metadata/9e/9e37e4aa3580189458091e8a45d9bb45
	New Unity Project/Library/metadata/a1/a1acab0ee92c9094ba0ac764f0c71267
	New Unity Project/Library/metadata/ba/baf868840afc33c4b991d3d771336d04
	New Unity Project/Library/metadata/bc/bce24ab5cc237c54ea2a62738580cc6b
	New Unity Project/Library/metadata/c0/c085e0227699c0f42a639085692eb260
	New Unity Project/Library/metadata/c7/c70041ab264c8ee43b7546b036dac1a6
	New Unity Project/Library/metadata/c9/c941156ee398131428a4657e22a4ce1d
	New Unity Project/Library/metadata/d8/d8346d48274ceb54f863f833f244d7c0
	New Unity Project/Library/metadata/da/daf60443cd0d33a48b191f5f534de7b4
	New Unity Project/Library/metadata/e3/e367d2c153e215f41b217b1261153da5
	New Unity Project/Library/metadata/ec/ec3c9a45029e4104b8f0810ead33b198
	New Unity Project/Library/metadata/ee/eecc298ffb2f6004a829342be20d2154
	New Unity Project/Library/metadata/f0/f0f4175047d1b0748b186ea543a13aba
	New Unity Project/Library/metadata/f1/f1afdef330de83d45b9143a1d0c9bda0
	New Unity Project/Library/metadata/ff/ffda3b8ab4f93264fbe6dcb859f031f0
	New Unity Project/New Unity Project.userprefs
Merge branch 'master' of https://github.com/JhonH3avy/Vault_Game

Conflicts:
	New Unity Project/Assets/Code/Scripts/RecibirMensaje.cs
	New Unity Project/Assets/Prefabs/GuiaVisual.prefab
	New Unity Project/Assets/Prefabs/Historal/Objeto_historial.prefab
	New Unity Project/Assets/Prefabs/Play/Modulos/GUI_module_2.prefab
	New Unity Project/Assets/Scene/Hist.unity
	New Unity Project/Assets/Scene/Home.unity
	New Unity Project/Assets/Scene/Menu.unity
	New Unity Project/Assets/Scene/Perfil.unity
	New Unity Project/Assets/Scene/Play.unity
	New Unity Project/Assets/Scene/Store.unity
	New Unity Project/Library/CurrentLayout.dwlt
	New Unity Project/Library/CurrentMaximizeLayout.dwlt
	New Unity Project/Library/InspectorExpandedItems.asset
	New Unity Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	New Unity Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	New Unity Project/Library/ScriptAssemblies/Assembly-UnityScript.dll
	New Unity Project/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	New Unity Project/Library/assetDatabase3
	New Unity Project/Library/expandedItems
	New Unity Project/Library/guidmapper
	New Unity Project/Library/metadata/01/01eb3460ca11f464ebb995bf0f2d87c1
	New Unity Project/Library/metadata/05/050aeeb24e5962247a5e6ff5a3f91fd1
	New Unity Project/Library/metadata/07/0774aac9907c517449824324a501351e
	New Unity Project/Library/metadata/1d/1d6d0c261a1a9354da4caad0dba593fb
	New Unity Project/Library/metadata/26/26667bb00aa695e418c72adb039ff123
	New Unity Project/Library/metadata/2a/2a05bcba4af492f4389eb332f4731657
	New Unity Project/Library/metadata/2c/2ce104fb95715bf4e95f61f213daec6c
	New Unity Project/Library/metadata/38/385a2da7f71e8c8498bb103f40f78b6e
	New Unity Project/Library/metadata/3a/3a11162092ec5f84da25b39bf017edf5
	New Unity Project/Library/metadata/40/40829c2db58578b4ebefda7bbd7f2d04
	New Unity Project/Library/metadata/43/43ceab7bf04a5684bba3ef324ddcdb7a
	New Unity Project/Library/metadata/45/45f3207626cce4e4f8c40b0b7ea752dd
	New Unity Project/Library/metadata/45/45f8f7c18936e4b46874fd8df6276185
	New Unity Project/Library/metadata/48/48ae0f2bed2eb5244a016bb2745a4dc9
	New Unity Project/Library/metadata/4f/4f521ae660299d74db827f315798a694
	New Unity Project/Library/metadata/5f/5f7be0ee4f7649b4f889a43f5089a8b9
	New Unity Project/Library/metadata/63/632e7d0749841cb45a812f89e3452bd9
	New Unity Project/Library/metadata/64/6419834466c2dcb46bc6c00a87cba037
	New Unity Project/Library/metadata/65/659d89b9fa8607146b01662d01dec1da
	New Unity Project/Library/metadata/68/68a37dd6378280641b2922ba8b067c06
	New Unity Project/Library/metadata/72/72c50b641572cc849be25597b4d5dcd1
	New Unity Project/Library/metadata/73/73643cbae2400b543aec7854cbcf1512
	New Unity Project/Library/metadata/74/74dc852b936459c449793268ec605b8e
	New Unity Project/Library/metadata/75/75a86bb2769c77d4fa8a71007ab9b2a4
	New Unity Project/Library/metadata/81/81f8af3c76d8c9b4a904c6080b9d6021
	New Unity Project/Library/metadata/85/85a9b0bcc4a9daf4a97abfb28a37cce6
	New Unity Project/Library/metadata/85/85ef27b87c6987a4cae484ea2582f781
	New Unity Project/Library/metadata/8d/8d628c337f4068c4f9a1bef8e5ca6c31
	New Unity Project/Library/metadata/9d/9d9056eedc5854348aca08e2d79c4d2f
	New Unity Project/Library/metadata/9d/9ddbe366d25d351498c3030768b03031
	New Unity Project/Library/metadata/9e/9e37e4aa3580189458091e8a45d9bb45
	New Unity Project/Library/metadata/a0/a02c75b912f51b245a395c2dc2aa34af
	New Unity Project/Library/metadata/a7/a701606cb02fdde428d81b880146d68e
	New Unity Project/Library/metadata/a9/a9cd973b824ef16419214cc186236c10
	New Unity Project/Library/metadata/aa/aabeb05643fc2b047a41d021e1012622
	New Unity Project/Library/metadata/b1/b1be72d31c8264243a72994d9941b3b7
	New Unity Project/Library/metadata/b3/b3eafe21b72da02409b61485eec862ba
	New Unity Project/Library/metadata/ba/baf868840afc33c4b991d3d771336d04
	New Unity Project/Library/metadata/bb/bb3da97a8cbc47140b073e2596d54547
	New Unity Project/Library/metadata/bc/bce24ab5cc237c54ea2a62738580cc6b
	New Unity Project/Library/metadata/c0/c085e0227699c0f42a639085692eb260
	New Unity Project/Library/metadata/c3/c368e82ca74a94549ae1fd7cf1a6710c
	New Unity Project/Library/metadata/c7/c70041ab264c8ee43b7546b036dac1a6
	New Unity Project/Library/metadata/c7/c7bad02e4dcf25048b7e75632aa7d131
	New Unity Project/Library/metadata/c9/c91d4404d29bbe04d9b9d2b6aa9d9b87
	New Unity Project/Library/metadata/c9/c941156ee398131428a4657e22a4ce1d
	New Unity Project/Library/metadata/ce/ced41afd62031d24c9e0bef314baa593
	New Unity Project/Library/metadata/ce/cedad172a5f2e0343a532fb984191990
	New Unity Project/Library/metadata/da/daf60443cd0d33a48b191f5f534de7b4
	New Unity Project/Library/metadata/dc/dc8624aca99e04e44b13091f631645d0
	New Unity Project/Library/metadata/e1/e1a9f5f8cedaa874095441b1e787381a
	New Unity Project/Library/metadata/e6/e61068ea6a3974b42a33727a7eb6f851
	New Unity Project/Library/metadata/e8/e81166ec6cf82db48a5a01b389a25a96
	New Unity Project/Library/metadata/ec/ec3c9a45029e4104b8f0810ead33b198
	New Unity Project/Library/metadata/ee/eecc298ffb2f6004a829342be20d2154
	New Unity Project/Library/metadata/f0/f0f4175047d1b0748b186ea543a13aba
	New Unity Project/Library/metadata/f1/f1afdef330de83d45b9143a1d0c9bda0
	New Unity Project/Library/metadata/fa/fa97e887e8278e8409c2552fdc2a48e0
	New Unity Project/New Unity Project.userprefs