From 517b5ff95a9e882a7bb9e8d9a5fe4ff15afe4912 Mon Sep 17 00:00:00 2001 From: shadow8t4 Date: Tue, 10 Apr 2018 14:27:15 -0500 Subject: [PATCH] changes. --- MoCha/Assets/Plugins.meta~Stashed changes | 10 ++++++++++ .../Assets/Plugins.meta~Stashed changes.meta | 9 +++++++++ MoCha/Assets/Plugins/Android.meta | 6 ++++++ MoCha/Assets/Prefabs/Canvas.prefab | Bin 22332 -> 22332 bytes MoCha/Assets/Scenes/Main.unity | Bin 46272 -> 28080 bytes 5 files changed, 25 insertions(+) create mode 100644 MoCha/Assets/Plugins.meta~Stashed changes create mode 100644 MoCha/Assets/Plugins.meta~Stashed changes.meta diff --git a/MoCha/Assets/Plugins.meta~Stashed changes b/MoCha/Assets/Plugins.meta~Stashed changes new file mode 100644 index 0000000..12bb076 --- /dev/null +++ b/MoCha/Assets/Plugins.meta~Stashed changes @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 36a268db14e08be4586c27503c77855b +folderAsset: yes +timeCreated: 1523388046 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Plugins.meta~Stashed changes.meta b/MoCha/Assets/Plugins.meta~Stashed changes.meta new file mode 100644 index 0000000..e28d3ae --- /dev/null +++ b/MoCha/Assets/Plugins.meta~Stashed changes.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: a6833ac8a2686c841ac5a1b5b7b9be48 +timeCreated: 1523388413 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Plugins/Android.meta b/MoCha/Assets/Plugins/Android.meta index b46881b..7bc5691 100644 --- a/MoCha/Assets/Plugins/Android.meta +++ b/MoCha/Assets/Plugins/Android.meta @@ -1,7 +1,13 @@ fileFormatVersion: 2 +<<<<<<< Updated upstream guid: 8cd453422b2e32245b54c76a62e2a81e folderAsset: yes timeCreated: 1523387294 +======= +guid: e306a28a11a4976488ab98bb77d05c1d +folderAsset: yes +timeCreated: 1523388046 +>>>>>>> Stashed changes licenseType: Free DefaultImporter: externalObjects: {} diff --git a/MoCha/Assets/Prefabs/Canvas.prefab b/MoCha/Assets/Prefabs/Canvas.prefab index a39cd3cbcb9161bf4c9c55308328628a05a989d3..4571dfdcd320d9428cff2046097e16e2145f3aa5 100644 GIT binary patch delta 32 ocmdn9j&aXA#tl({tnDrg3?DYf2bwdpO><^o5Odx_jR3F-g< diff --git a/MoCha/Assets/Scenes/Main.unity b/MoCha/Assets/Scenes/Main.unity index 5d6c207ebe5927b10ec0124270ecb99144eb86fe..a77fda73760a456f209ebc914b08077d50fbdeab 100644 GIT binary patch delta 2407 zcmbW2U1%It6vxl(>}*!;M_M;cG=5ZRY_XcQ66jMQ(okDybP}bc)UZr8chilTon>|! zlfKL#Z9(v%n^7!+A{Di*KBP<^#HVO|un1BGeJKQe5E{^0tVINM{GXZ0W+tr3)`7#! z`JH?2IrrRi@60WvX0J)DM8g##eU^we;QMr~H7B)Q?0Rpzl=iM{ucf*cWSD&ai9b&s z+A%ip*zcd78}9FV>*k}NS0E|Ke9FDK?J4`-V4&|ak{k$(U#H07p=%&Kkraqb^F&S$ zzSEINH0_MP$NhHcX64`7}Xg`9Q0G#PsHaKj| z#548RG4EyGl1Owt^FUf?07-J9tYeoV9?ow==lQW?OY;LRmcrl2hF*3`2H-7f6d+gU zVI@vN=T)`Ud9o6l0`6e0rAln&GPl42UQZ~f3VIaI)!aK?^d?9OFi!T7u%04_R{9qn1hJ(NuU!w!tY)p z)f7c-q~91V6-x!pDj8+c^UKs1Os!lk8m6vlrYKwPH^Xgqd`K0u7!_e!({W0cW{wGq zDv?dqtfMrkO&k+sjEswdH7JS#^A!Xl4hr3v6r+0$y<(IRqY4&A3loHTpc;M#*!z3v z_6AAuZjJx2R+7CZPkf)2QeOJiL0Rf_55IQHcJ}P%a?*92gANGS_w#r9c-chg|6_RZ z5xE?(DKNeZxO2aV*fyL8+z~vS-p^m<<4kA3cyHPFgNW_K`FI^VclU=Ov*}Af6@Xj& zTr{u)S@7ZKwmu&*6>Krcg^108?Z+5y^N%8yMP_|yVeasszv?dHMJggruEH>GZ>`3;(RS#y!gi<;{(|dtJ45CfDQN$bDP8 z{fsMqR4&gQ$?+xU-Z%5Ow{PaRba3@4Ae;W0&w6Jck~w2Nf6yps6RJ@yaX)oWf$@|( zA@OH5KVI1?es;rv$5(fZ`wbda(D-+nDE#cuv58C@2K>K?z8o!Z7vG2RCtgy%v~jQu z!+Opf6=qOMZoc>vAJ4s^=btVYjvA&IUD~~sw!r2+{}0FMl^ofRkD8u;zI0sli3v+< zs{G4*?CxetA3B9A>n}Cekjs4<$3gw$B}_PJQ+KeUC^`5v4wQ_;7ZUEr(xh!zO$Dht zVEjq}Ua5_|?R+NV=f(k^)pS9@_g<|$sZ{}&Jy~A;yJLSS?!e3zZ_8O#ac3`Oy`1;4 F^e^c>(^mih delta 12392 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