U3DRepository.git

parent: 6b6d8f48 | 补丁 | 提交 | ignore whitespace

client_Hale

2018-09-25 2862d6e994d6f89962cde51e2381effc6a9e6bbb

fixed 自由sdk充值卡住问题修复

4个文件已修改

5个文件已添加

	ChannelDiff/Android/226114725/libs/iapppay_plugin.aar	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ChannelDiff/Android/813015059/libs/iapppay_plugin.aar	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ChannelDiff/Android/815035853/libs/iapppay_plugin.aar	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ChannelDiff/Android/822055139/libs/iapppay_plugin.aar	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ChannelDiff/Android/mrgame/AndroidManifest.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ChannelDiff/Android/mrgame/libs/mr_sdk-game_mrgame-release.aar	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Project/mr_sdk/build.gradle	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Project/mr_sdk/src/game_mrgame/AndroidManifest.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Project/mr_sdk/src/main/AndroidManifest.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 ChannelDiff/Android/226114725/libs/iapppay_plugin.aar

Binary files differ

 ChannelDiff/Android/813015059/libs/iapppay_plugin.aar

Binary files differ

 ChannelDiff/Android/815035853/libs/iapppay_plugin.aar

Binary files differ

 ChannelDiff/Android/822055139/libs/iapppay_plugin.aar

Binary files differ

 ChannelDiff/Android/mrgame/AndroidManifest.xml

@@ -47,8 +47,8 @@
            android:name="com.secondworld.univeralsdk.MainActivity"
            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale|layoutDirection"
            android:label="@string/app_name"
            android:launchMode="singleTop"
            android:screenOrientation="portrait" >
            android:launchMode="singleTask"
            android:screenOrientation="sensorLandscape" >
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />


 ChannelDiff/Android/mrgame/libs/mr_sdk-game_mrgame-release.aar

Binary files differ

 Project/mr_sdk/build.gradle

@@ -55,12 +55,12 @@
    dependsOn 'assembleGame_mrgameRelease'
    from zipTree("build/outputs/aar/mr_sdk-game_mrgame-release.aar")
    include "AndroidManifest.xml"
    into "C:\\Unity3D_SDK\\ChannelDiff\\mrgame\\"
    into "C:\\Unity3D_SDK\\ChannelDiff\\Android\\mrgame\\"
}

task autoCopy_mrgame(type: Copy) {
    dependsOn autoCopy_mrgame_Manifest
    from "build/outputs/aar/"
    include "mr_sdk-game_mrgame-release.aar"
    into "C:\\Unity3D_SDK\\ChannelDiff\\mrgame\\libs\\"
    into "C:\\Unity3D_SDK\\ChannelDiff\\Android\\mrgame\\libs\\"
}

 Project/mr_sdk/src/game_mrgame/AndroidManifest.xml

@@ -43,8 +43,8 @@
            android:name="com.secondworld.univeralsdk.MainActivity"
            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale|layoutDirection"
            android:label="@string/app_name"
            android:launchMode="singleTop"
            android:screenOrientation="landscape">
            android:launchMode="singleTask"
            android:screenOrientation="sensorLandscape">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />


 Project/mr_sdk/src/main/AndroidManifest.xml

@@ -59,8 +59,8 @@
            android:name="com.secondworld.univeralsdk.MainActivity"
            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale|layoutDirection"
            android:label="@string/app_name"
            android:launchMode="singleTop"
            android:screenOrientation="landscape">
            android:launchMode="singleTask"
            android:screenOrientation="sensorLandscape">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

			@@ -47,8 +47,8 @@
			android:name="com.secondworld.univeralsdk.MainActivity"
			android:configChanges="mcc\|mnc\|locale\|touchscreen\|keyboard\|keyboardHidden\|navigation\|orientation\|screenLayout\|uiMode\|screenSize\|smallestScreenSize\|fontScale\|layoutDirection"
			android:label="@string/app_name"
			android:launchMode="singleTop"
			android:screenOrientation="portrait" >
			android:launchMode="singleTask"
			android:screenOrientation="sensorLandscape" >
			<intent-filter>
			<action android:name="android.intent.action.MAIN" />

			@@ -55,12 +55,12 @@
			dependsOn 'assembleGame_mrgameRelease'
			from zipTree("build/outputs/aar/mr_sdk-game_mrgame-release.aar")
			include "AndroidManifest.xml"
			into "C:\\Unity3D_SDK\\ChannelDiff\\mrgame\\"
			into "C:\\Unity3D_SDK\\ChannelDiff\\Android\\mrgame\\"
			}

			task autoCopy_mrgame(type: Copy) {
			dependsOn autoCopy_mrgame_Manifest
			from "build/outputs/aar/"
			include "mr_sdk-game_mrgame-release.aar"
			into "C:\\Unity3D_SDK\\ChannelDiff\\mrgame\\libs\\"
			into "C:\\Unity3D_SDK\\ChannelDiff\\Android\\mrgame\\libs\\"
			}

			@@ -43,8 +43,8 @@
			android:name="com.secondworld.univeralsdk.MainActivity"
			android:configChanges="mcc\|mnc\|locale\|touchscreen\|keyboard\|keyboardHidden\|navigation\|orientation\|screenLayout\|uiMode\|screenSize\|smallestScreenSize\|fontScale\|layoutDirection"
			android:label="@string/app_name"
			android:launchMode="singleTop"
			android:screenOrientation="landscape">
			android:launchMode="singleTask"
			android:screenOrientation="sensorLandscape">
			<intent-filter>
			<action android:name="android.intent.action.MAIN" />

			@@ -59,8 +59,8 @@
			android:name="com.secondworld.univeralsdk.MainActivity"
			android:configChanges="mcc\|mnc\|locale\|touchscreen\|keyboard\|keyboardHidden\|navigation\|orientation\|screenLayout\|uiMode\|screenSize\|smallestScreenSize\|fontScale\|layoutDirection"
			android:label="@string/app_name"
			android:launchMode="singleTop"
			android:screenOrientation="landscape">
			android:launchMode="singleTask"
			android:screenOrientation="sensorLandscape">
			<intent-filter>
			<action android:name="android.intent.action.MAIN" />