From c1f0326d9f1d36a705932ecd123246ae8642d35d Mon Sep 17 00:00:00 2001
From: MacBuilder <MacBuilder@secondworld.com>
Date: 星期三, 26 九月 2018 19:35:40 +0800
Subject: [PATCH] Merge commit 'ef1a198350030a32e1d1a3dc9a94013ef18b2551'
---
ChannelDiff/Android/spxjgame/libs/sp_sdk-game_spxjgame-release.aar | 0
/dev/null | 0
ChannelDiff/Android/mrgame/AndroidManifest.xml | 2 +-
ChannelDiff/Android/mrgame/libs/mr_sdk-game_mrgame-release.aar | 0
Project/mr_sdk/proguard-rules.pro | 4 ++--
Project/sp_sdk/proguard-rules.pro | 4 ++--
6 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ChannelDiff/Android/mrgame/AndroidManifest.xml b/ChannelDiff/Android/mrgame/AndroidManifest.xml
index e8e7b98..ce727f8 100644
--- a/ChannelDiff/Android/mrgame/AndroidManifest.xml
+++ b/ChannelDiff/Android/mrgame/AndroidManifest.xml
@@ -92,7 +92,7 @@
android:value="_mrgame" />
<meta-data
android:name="Mr_GAME_ID"
- android:value="_498" />
+ android:value="_559" />
<!-- Required SDK 鏍稿績鍔熻兘 -->
<!-- 鍙厤缃產ndroid:process鍙傛暟灏哖ushService鏀惧湪鍏朵粬杩涚▼涓� -->
diff --git a/ChannelDiff/Android/mrgame/libs/app-game_mrgame-release.aar b/ChannelDiff/Android/mrgame/libs/app-game_mrgame-release.aar
deleted file mode 100644
index 5f78bb9..0000000
--- a/ChannelDiff/Android/mrgame/libs/app-game_mrgame-release.aar
+++ /dev/null
Binary files differ
diff --git a/ChannelDiff/Android/mrgame/libs/mr_sdk-game_mrgame-release.aar b/ChannelDiff/Android/mrgame/libs/mr_sdk-game_mrgame-release.aar
index 5209942..a6f3780 100644
--- a/ChannelDiff/Android/mrgame/libs/mr_sdk-game_mrgame-release.aar
+++ b/ChannelDiff/Android/mrgame/libs/mr_sdk-game_mrgame-release.aar
Binary files differ
diff --git a/ChannelDiff/Android/spxjgame/libs/sp_sdk-game_spxjgame-release.aar b/ChannelDiff/Android/spxjgame/libs/sp_sdk-game_spxjgame-release.aar
index aadfc0e..b6c21fa 100644
--- a/ChannelDiff/Android/spxjgame/libs/sp_sdk-game_spxjgame-release.aar
+++ b/ChannelDiff/Android/spxjgame/libs/sp_sdk-game_spxjgame-release.aar
Binary files differ
diff --git a/Project/mr_sdk/proguard-rules.pro b/Project/mr_sdk/proguard-rules.pro
index 4c86d63..7589e5f 100644
--- a/Project/mr_sdk/proguard-rules.pro
+++ b/Project/mr_sdk/proguard-rules.pro
@@ -51,5 +51,5 @@
-dontwarn com.mrcn.sdk.**
-keep class com.mrcn.sdk.** { *;}
--dontwarn com.secondworld.mr_sdk.**
--keep class com.secondworld.mr_sdk.** { *;}
\ No newline at end of file
+-dontwarn com.secondworld.univeralsdk.**
+-keep class com.secondworld.univeralsdk.** { *;}
\ No newline at end of file
diff --git a/Project/sp_sdk/proguard-rules.pro b/Project/sp_sdk/proguard-rules.pro
index 078a658..11cf76a 100644
--- a/Project/sp_sdk/proguard-rules.pro
+++ b/Project/sp_sdk/proguard-rules.pro
@@ -79,5 +79,5 @@
-dontwarn MTT.**
-keep class MTT.** { *;}
--dontwarn com.secondworld.sp_sdk.**
--keep class com.secondworld.sp_sdk.** { *;}
\ No newline at end of file
+-dontwarn com.secondworld.univeralsdk.**
+-keep class com.secondworld.univeralsdk.** { *;}
\ No newline at end of file
--
Gitblit v1.8.0