allez
2021-03-18 b09a15acd68ac1257f466b46e96d9132b6a0f85d
Merge branch 'master' of http://192.168.1.20:10010/r/U3DRepository
8个文件已修改
1 文件已重命名
1个文件已删除
4个文件已添加
637 ■■■■ 已修改文件
Channel/Android/gtgame/AndroidManifest.xml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Channel/Android/gtgame/debug/libs/library-debug-gtgame.aar 补丁 | 查看 | 原始文档 | blame | 历史
Channel/Android/gtgame/release/libs/library-release-gtgame.aar 补丁 | 查看 | 原始文档 | blame | 历史
Channel/Android/qkbt2game/AndroidManifest.xml 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Channel/Android/test/AndroidManifest.xml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Channel/Android/test/debug/libs/library-debug-test.aar 补丁 | 查看 | 原始文档 | blame | 历史
Channel/Android/test/release/libs/library-release-test.aar 补丁 | 查看 | 原始文档 | blame | 历史
Channel/IOS/qkbt2game/UnityAppController.mm 511 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/channel/GTGame/libs/fjsanxia_syh5_1.1.5.jar 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/channel/test/java/com/secondworld/sdk/TestApp.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/library/build.gradle 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/library/src/main/java/com/secondworld/sdk/GameActivity.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/library/src/main/java/com/secondworld/sdk/command/CmdGoToAppStore.java 51 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/library/src/main/java/com/secondworld/sdk/utils/CodeU2A.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Channel/Android/gtgame/AndroidManifest.xml
New file
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- GENERATED BY UNITY. REMOVE THIS COMMENT TO PREVENT OVERWRITING WHEN EXPORTING AGAIN-->
<manifest
    xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.unity3d.player"
    xmlns:tools="http://schemas.android.com/tools">
    <application>
        <activity android:name="com.secondworld.sdk.GameActivity"
                  android:theme="@style/UnityThemeSelector">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
            <meta-data android:name="unityplayer.UnityActivity" android:value="true" />
        </activity>
    </application>
</manifest>
Channel/Android/gtgame/debug/libs/library-debug-gtgame.aar
Binary files differ
Channel/Android/gtgame/release/libs/library-release-gtgame.aar
Binary files differ
Channel/Android/qkbt2game/AndroidManifest.xml
New file
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- GENERATED BY UNITY. REMOVE THIS COMMENT TO PREVENT OVERWRITING WHEN EXPORTING AGAIN-->
<manifest
    xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.unity3d.player"
    xmlns:tools="http://schemas.android.com/tools">
    <application>
        <activity android:name="com.secondworld.sdk.SplashActivity">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
         <activity android:name="com.secondworld.sdk.GameActivity"
                  android:theme="@style/UnityThemeSelector">
            <meta-data android:name="unityplayer.UnityActivity" android:value="true" />
         </activity>
    </application>
</manifest>
Channel/Android/test/AndroidManifest.xml
New file
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- GENERATED BY UNITY. REMOVE THIS COMMENT TO PREVENT OVERWRITING WHEN EXPORTING AGAIN-->
<manifest
    xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.unity3d.player"
    xmlns:tools="http://schemas.android.com/tools">
    <application>
        <activity android:name="com.secondworld.sdk.GameActivity"
                  android:theme="@style/UnityThemeSelector">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
            <meta-data android:name="unityplayer.UnityActivity" android:value="true" />
        </activity>
    </application>
</manifest>
Channel/Android/test/debug/libs/library-debug-test.aar
Binary files differ
Channel/Android/test/release/libs/library-release-test.aar
Binary files differ
Channel/IOS/qkbt2game/UnityAppController.mm
File was deleted
SdkProject/channel/GTGame/libs/fjsanxia_syh5_1.1.5.jar
Binary files differ
SdkProject/channel/test/java/com/secondworld/sdk/TestApp.java
@@ -1,9 +1,14 @@
package com.secondworld.sdk;
public class TestApp extends GameApp {
import android.app.Application;
public class TestApp extends Application {
    @Override
    protected void initPlatformDiff(){
        PlatformDiff.I = new TestPlatform();
    public void onCreate() {
        super.onCreate();
        GameAppProxy.create(this,new TestPlatform());
        GameActivity.registerProxy(GameActivityProxy.class);
    }
}
SdkProject/library/build.gradle
@@ -138,7 +138,8 @@
}
task deleteSdk() {
    delete "${outPutPath}\\${CHANNEL_NAME}"
    delete "${outPutPath}\\${CHANNEL_NAME}\\debug"
    delete "${outPutPath}\\${CHANNEL_NAME}\\release"
}
//执行打包任务以及拷贝到外部
@@ -171,6 +172,8 @@
    def dir = new File("${outPutPath}\\${CHANNEL_NAME}")
    def libraries = new File("${outPutPath}\\${CHANNEL_NAME}\\deps.gradle")
    dir.mkdir()
    if (libraries.exists())
        libraries.delete()
    if (!libraries.exists())
        libraries.createNewFile()
    libraries.text = content
SdkProject/library/src/main/java/com/secondworld/sdk/GameActivity.java
@@ -4,7 +4,6 @@
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.view.KeyEvent;
import android.webkit.WebView;
import android.widget.FrameLayout;
import android.widget.RelativeLayout;
SdkProject/library/src/main/java/com/secondworld/sdk/command/CmdGoToAppStore.java
New file
@@ -0,0 +1,51 @@
package com.secondworld.sdk.command;
import android.content.ActivityNotFoundException;
import android.content.Intent;
import android.net.Uri;
import android.text.TextUtils;
import com.secondworld.sdk.GameActivityProxy;
import com.secondworld.sdk.GameAppProxy;
import com.secondworld.sdk.utils.CodeU2A;
import org.json.JSONObject;
public class CmdGoToAppStore implements ICommand {
    @Override
    public int getCode() {
        return CodeU2A.GoToAppStore;
    }
    @Override
    public void process(JSONObject json) throws Exception {
        String url = "";
        if (json.has("url"))
            url = json.getString("url");
        String marketPkg="";
        if(json.has("marketPkg"))
            marketPkg=json.getString("marketPkg");
        Uri uri = Uri.parse("market://details?id=" + GameAppProxy.app.getPackageName());
        Intent intent = new Intent(Intent.ACTION_VIEW, uri);
        intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY |
                Intent.FLAG_ACTIVITY_NEW_DOCUMENT |
                Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
        if (!TextUtils.isEmpty(marketPkg)) {
            intent.setPackage(marketPkg);
        }
        if (GameActivityProxy.I.activity == null)
            return;
        try {
            GameActivityProxy.I.activity.startActivity(intent);
        } catch (ActivityNotFoundException e) {
            if (!TextUtils.isEmpty(url))
                GameActivityProxy.I.activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
        }
    }
}
SdkProject/library/src/main/java/com/secondworld/sdk/utils/CodeU2A.java
@@ -58,6 +58,10 @@
     */
    int CopyOneAsset = 12;
    /**
     * 打开应用商店地址
     */
    int GoToAppStore=13;
    /**
     * 每个渠道Sdk相关