Merge remote-tracking branch 'origin/develop_ddcy_1.0.3' into develop_ddcy_1.0.3

732c01ba · gaoleichao · 445df3d9 · df0a5528 · 732c01ba · 732c01ba
Commit 732c01ba authored Nov 11, 2020 by gaoleichao
49 changed files
--- a/game/src/main/assets/bin/Data/Managed/Assembly-CSharp.dll
+++ b/game/src/main/assets/bin/Data/Managed/Assembly-CSharp.dll
--- a/game/src/main/assets/bin/Data/Managed/Unity.Analytics.DataPrivacy.dll
+++ b/game/src/main/assets/bin/Data/Managed/Unity.Analytics.DataPrivacy.dll
--- a/game/src/main/assets/bin/Data/Managed/Unity.TextMeshPro.dll
+++ b/game/src/main/assets/bin/Data/Managed/Unity.TextMeshPro.dll
--- a/game/src/main/assets/bin/Data/bbcb2a56d91b045fa9322a72c947c9c2
+++ b/game/src/main/assets/bin/Data/bbcb2a56d91b045fa9322a72c947c9c2
--- a/game/src/main/assets/bin/Data/globalgamemanagers
+++ b/game/src/main/assets/bin/Data/globalgamemanagers
--- a/game/src/main/assets/bin/Data/globalgamemanagers.assets
+++ b/game/src/main/assets/bin/Data/globalgamemanagers.assets
--- a/game/src/main/assets/bin/Data/level0
+++ b/game/src/main/assets/bin/Data/level0
--- a/game/src/main/assets/bin/Data/level1
+++ b/game/src/main/assets/bin/Data/level1
--- a/game/src/main/assets/bin/Data/sharedassets0.assets.split0
+++ b/game/src/main/assets/bin/Data/sharedassets0.assets.split0
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split0
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split0
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split1
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split1
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split10
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split10
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split11
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split11
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split12
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split12
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split13
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split13
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split14
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split14
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split15
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split15
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split16
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split16
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split18
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split18
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split19
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split19
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split2
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split2
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split20
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split20
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split21
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split21
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split22
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split22
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split23
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split23
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split24
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split24
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split25
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split25
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split26
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split26
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split27
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split27
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split28
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split28
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split29
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split29
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split3
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split3
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split30
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split30
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split31
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split31
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split32
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split32
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split33
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split33
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split34
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split34
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split35
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split35
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split36
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split36
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split37
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split37
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split38
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split38
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split39
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split39
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split4
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split4
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split40
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split40
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split41
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split41
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split5
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split5
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split6
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split6
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split8
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split8
--- a/game/src/main/assets/bin/Data/sharedassets1.assets.split9
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split9