fix merge

2e636967 · maxiaoliang · 6cbd4fa2 · 2e636967 · 2e636967 · 2e636967
Commit 2e636967 authored Nov 21, 2020 by maxiaoliang
9 changed files
--- a/.gitignore
+++ b/.gitignore
@@ -29,4 +29,3 @@ guesssong/*.iml
 happyplay/*.iml
 userinfo/*.iml
 antearn.jks
-game/src/main/assets/bin/Data/
--- a/game/src/main/assets/bin/Data/Managed/GameFramework.dll
+++ b/game/src/main/assets/bin/Data/Managed/GameFramework.dll
--- a/game/src/main/assets/bin/Data/Managed/ICSharpCode.SharpZipLib.dll
+++ b/game/src/main/assets/bin/Data/Managed/ICSharpCode.SharpZipLib.dll
--- a/game/src/main/assets/bin/Data/Managed/UnityGameFramework.Runtime.dll
+++ b/game/src/main/assets/bin/Data/Managed/UnityGameFramework.Runtime.dll
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split42
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split42
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split43
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split43
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split44
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split44
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split45
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split45
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split46
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split46