Merge remote-tracking branch 'origin/develop_dd_garden_1.0.1' into develop_dd_garden_1.0.1

4ae8e03d · maxiaoliang · cccdb090 · 394f2091 · cccdb090 · 4ae8e03d
Commit 4ae8e03d authored Dec 02, 2020 by maxiaoliang
46 changed files
--- a/app/src/main/res/mipmap-xhdpi/notif_icon.png
+++ b/app/src/main/res/mipmap-xhdpi/notif_icon.png
--- a/app/src/main/res/mipmap-xhdpi/wx_logo_bg.png
+++ b/app/src/main/res/mipmap-xhdpi/wx_logo_bg.png
--- 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/globalgamemanagers
+++ b/game/src/main/assets/bin/Data/globalgamemanagers
--- a/game/src/main/assets/bin/Data/level1
+++ b/game/src/main/assets/bin/Data/level1
--- 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.split17
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split17
--- 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.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.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.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.split7
+++ b/game/src/main/assets/bin/Data/sharedassets1.assets.split7
--- 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
--- a/library/src/main/java/com/ym/library/net/NetConfig.java
+++ b/library/src/main/java/com/ym/library/net/NetConfig.java
@@ -114,13 +114,13 @@ public class NetConfig {

        public static String WEB_URL_ABOUT_US;//TODO 关于我们页面

-        public static String WEB_URL_PRIVACY = "https://newspool.huolea.com/sspapiNovel/su/custom/duoduocaiyuan/privacy.html";//TODO 隐私协议
+        public static String WEB_URL_PRIVACY = "https://newspool.huolea.com/sspapiNovel/su/custom/duoduohuayuan/privacy.html";//TODO 隐私协议

        public static String WEB_URL_FEEDBACK;//TODO 用户反馈

        public static String WEB_URL_CLEARINSTRUCTIONS;//TODO

-        public static String WEB_URL_USER = "https://newspool.huolea.com/sspapiNovel/su/custom/duoduocaiyuan/privacy.html\n";//TODO 用户协议
+        public static String WEB_URL_USER = "https://newspool.huolea.com/sspapiNovel/su/custom/duoduohuayuan/user.html\n";//TODO 用户协议

        public static String WEB_URL_SHARE_LAND; //TODO