U3DRepository.git

parent: 64c503a9 | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of http://192.168.1.20:10010/r/U3DRepository

lwb

2020-11-19 5a3581b8fc752916ff5ad83f0ee8168dae68b133

Merge branch 'master' of http://192.168.1.20:10010/r/U3DRepository

10个文件已修改

	ChannelDiff/Android/qkbtgame/AndroidManifest.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ChannelDiff/Android/qkbtgame/libs/qkbt_sdk-game_qk-release.aar	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ChannelDiff/Android/qkcwgame/AndroidManifest.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ChannelDiff/Android/qkcwgame/libs/qkcw2_sdk-game_qk-release.aar	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Project/qkbt_sdk/build.gradle	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Project/qkbt_sdk/src/game_qk/java/com/secondworld/universalsdk/H2EngineSDK.java	53 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Project/qkbt_sdk/src/main/java/com/secondworld/universalsdk/MainActivity.java	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Project/qkcw2_sdk/build.gradle	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Project/qkcw2_sdk/src/game_qk/java/com/secondworld/universalsdk/H2EngineSDK.java	51 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Project/qkcw2_sdk/src/main/java/com/secondworld/universalsdk/MainActivity.java	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 ChannelDiff/Android/qkbtgame/AndroidManifest.xml

@@ -7,7 +7,7 @@
    android:versionName="1.0" >

    <uses-sdk
        android:minSdkVersion="16"
        android:minSdkVersion="17"
        android:targetSdkVersion="26" />

    <uses-permission android:name="android.permission.INTERNET" />

 ChannelDiff/Android/qkbtgame/libs/qkbt_sdk-game_qk-release.aar

Binary files differ

 ChannelDiff/Android/qkcwgame/AndroidManifest.xml

@@ -7,7 +7,7 @@
    android:versionName="1.0" >

    <uses-sdk
        android:minSdkVersion="16"
        android:minSdkVersion="17"
        android:targetSdkVersion="26" />

    <uses-permission android:name="android.permission.INTERNET" />

 ChannelDiff/Android/qkcwgame/libs/qkcw2_sdk-game_qk-release.aar

Binary files differ

 Project/qkbt_sdk/build.gradle

@@ -6,7 +6,7 @@


    defaultConfig {
        minSdkVersion 16
        minSdkVersion 17
        targetSdkVersion 26
        versionCode 1
        versionName "1.0"

 Project/qkbt_sdk/src/game_qk/java/com/secondworld/universalsdk/H2EngineSDK.java

@@ -100,12 +100,14 @@
                case CodeU2A.FreePlatformInit:
                    break;
                case CodeU2A.FreePlatformLogin:
                    QuickPlatformUtil.getInstance().login(_activity);
                    //QuickPlatformUtil.getInstance().login(_activity);
                    LoginEx(_activity);
                    break;
                case CodeU2A.FreePlatformSwitchAccount:
                    break;
                case CodeU2A.FreePlatformLogout:
                    QuickPlatformUtil.getInstance().logout(_activity);
                    //QuickPlatformUtil.getInstance().logout(_activity);
                    LogoutEx(_activity);
                    break;
                case CodeU2A.FreePlatformPay:

@@ -212,8 +214,8 @@
                    roleInfo.setProfession("法师"); //360渠道参数，设置角色职业名称
                    roleInfo.setFriendlist(
                            "无"); //360渠道参数，设置好友关系列表，格式请参考：http://open.quicksdk.net/help/detail/aid/190
                    User.getInstance().setGameRoleInfo(_activity, roleInfo, true);

                    //User.getInstance().setGameRoleInfo(_activity, roleInfo, true);
                    SetRoleInfoEx(_activity, roleInfo, true);
//                    QuickPlatformUtil.getInstance().createRole(_activity,
//                                                            _json.getString("sid"),
//                                                            _json.getString("serverName"),
@@ -250,7 +252,8 @@
                    roleInfo1.setProfession("法师"); //360渠道参数，设置角色职业名称
                    roleInfo1.setFriendlist(
                            "无"); //360渠道参数，设置好友关系列表，格式请参考：http://open.quicksdk.net/help/detail/aid/190
                    User.getInstance().setGameRoleInfo(_activity, roleInfo1, false);
                    //User.getInstance().setGameRoleInfo(_activity, roleInfo1, false);
                    SetRoleInfoEx(_activity, roleInfo1, false);
//                    QuickPlatformUtil.getInstance().enterWorld(_activity,
//                                                            _json.getString("sid"),
//                                                            _json.getString("serverName"),
@@ -288,7 +291,8 @@
                    roleInfo2.setFriendlist(
                            "无"); //360渠道参数，设置好友关系列表，格式请参考：http://open.quicksdk.net/help/detail/aid/190

                    User.getInstance().setGameRoleInfo(_activity, roleInfo2, false);
                    //User.getInstance().setGameRoleInfo(_activity, roleInfo2, false);
                    SetRoleInfoEx(_activity, roleInfo2, false);
//                    QuickPlatformUtil.getInstance().levelUp(_activity,
//                                                         _json.getString("sid"),
//                                                         _json.getString("serverName"),
@@ -407,6 +411,43 @@
        }
    }

    public static void LoginEx(final Activity activity)
    {
        activity.runOnUiThread(new Runnable()
        {
            @Override
            public void run()
            {
                QuickPlatformUtil.getInstance().login(activity);
            }
        });
    }

    public static void LogoutEx(final Activity activity)
    {
        activity.runOnUiThread(new Runnable()
        {
            @Override
            public void run()
            {
                QuickPlatformUtil.getInstance().logout(activity);
            }
        });
    }

    public static void SetRoleInfoEx(final Activity activity, final GameRoleInfo roleInfo, final boolean createRole)
    {
        activity.runOnUiThread(new Runnable()
        {
            @Override
            public void run()
            {
                User.getInstance().setGameRoleInfo(activity, roleInfo, createRole);
            }
        });
    }


    public static void CopyContent(final Activity activity, final String content)
    {
        activity.runOnUiThread(new Runnable()

 Project/qkbt_sdk/src/main/java/com/secondworld/universalsdk/MainActivity.java

@@ -26,6 +26,7 @@
import com.secondworld.univeralsdk.R;
import com.unity3d.player.UnityPlayer;
import com.unity3d.player.UnityPlayerActivity;
import android.util.DisplayMetrics;

public class MainActivity extends UnityPlayerActivity
{
@@ -40,6 +41,9 @@
    private RelativeLayout m_MainContainer;
    private int mType;
    private boolean isNotch = false;

    private int gameWidth;
    private int gameHeight;

    @Override
    protected void onCreate(Bundle savedInstanceState)
@@ -104,6 +108,17 @@
            Sdk.getInstance().init(this, "93578681820710896227244688639138", "49535443");
        }
        QuickSDK.getInstance().setIsLandScape(true);

        DisplayMetrics dm = new DisplayMetrics();
        this.getWindowManager().getDefaultDisplay().getRealMetrics(dm);
        if(gameWidth == 0){
            gameWidth = dm.widthPixels;
        }

        if(gameHeight == 0)
        {
            gameHeight = dm.heightPixels;
        }
    }

    @Override
@@ -187,6 +202,10 @@
        H2EngineSDK.onConfigurationChanged(newConfig);

        super.onConfigurationChanged(newConfig);

        mUnityPlayer.getView().getLayoutParams().width = gameWidth;

        mUnityPlayer.getView().getLayoutParams().height = gameHeight;
    }

    @Override

 Project/qkcw2_sdk/build.gradle

@@ -6,7 +6,7 @@


    defaultConfig {
        minSdkVersion 16
        minSdkVersion 17
        targetSdkVersion 26
        versionCode 1
        versionName "1.0"

 Project/qkcw2_sdk/src/game_qk/java/com/secondworld/universalsdk/H2EngineSDK.java

@@ -100,12 +100,14 @@
                case CodeU2A.FreePlatformInit:
                    break;
                case CodeU2A.FreePlatformLogin:
                    QuickPlatformUtil.getInstance().login(_activity);
                    //QuickPlatformUtil.getInstance().login(_activity);
                    LoginEx(_activity);
                    break;
                case CodeU2A.FreePlatformSwitchAccount:
                    break;
                case CodeU2A.FreePlatformLogout:
                    QuickPlatformUtil.getInstance().logout(_activity);
                    //QuickPlatformUtil.getInstance().logout(_activity);
                    LogoutEx(_activity);
                    break;
                case CodeU2A.FreePlatformPay:

@@ -212,7 +214,8 @@
                    roleInfo.setProfession("法师"); //360渠道参数，设置角色职业名称
                    roleInfo.setFriendlist(
                            "无"); //360渠道参数，设置好友关系列表，格式请参考：http://open.quicksdk.net/help/detail/aid/190
                    User.getInstance().setGameRoleInfo(_activity, roleInfo, true);
                    //User.getInstance().setGameRoleInfo(_activity, roleInfo, true);
                    SetRoleInfoEx(_activity, roleInfo, true);

//                    QuickPlatformUtil.getInstance().createRole(_activity,
//                                                            _json.getString("sid"),
@@ -250,7 +253,8 @@
                    roleInfo1.setProfession("法师"); //360渠道参数，设置角色职业名称
                    roleInfo1.setFriendlist(
                            "无"); //360渠道参数，设置好友关系列表，格式请参考：http://open.quicksdk.net/help/detail/aid/190
                    User.getInstance().setGameRoleInfo(_activity, roleInfo1, false);
                    //User.getInstance().setGameRoleInfo(_activity, roleInfo1, false);
                    SetRoleInfoEx(_activity, roleInfo1, false);
//                    QuickPlatformUtil.getInstance().enterWorld(_activity,
//                                                            _json.getString("sid"),
//                                                            _json.getString("serverName"),
@@ -288,7 +292,8 @@
                    roleInfo2.setFriendlist(
                            "无"); //360渠道参数，设置好友关系列表，格式请参考：http://open.quicksdk.net/help/detail/aid/190

                    User.getInstance().setGameRoleInfo(_activity, roleInfo2, false);
                    //User.getInstance().setGameRoleInfo(_activity, roleInfo2, false);
                    SetRoleInfoEx(_activity, roleInfo2, false);
//                    QuickPlatformUtil.getInstance().levelUp(_activity,
//                                                         _json.getString("sid"),
//                                                         _json.getString("serverName"),
@@ -422,6 +427,42 @@
        });
    }

    public static void LoginEx(final Activity activity)
    {
        activity.runOnUiThread(new Runnable()
        {
            @Override
            public void run()
            {
                QuickPlatformUtil.getInstance().login(activity);
            }
        });
    }

    public static void LogoutEx(final Activity activity)
    {
        activity.runOnUiThread(new Runnable()
        {
            @Override
            public void run()
            {
                QuickPlatformUtil.getInstance().logout(activity);
            }
        });
    }

    public static void SetRoleInfoEx(final Activity activity, final GameRoleInfo roleInfo, final boolean createRole)
    {
        activity.runOnUiThread(new Runnable()
        {
            @Override
            public void run()
            {
                User.getInstance().setGameRoleInfo(activity, roleInfo, createRole);
            }
        });
    }

    public static void RestartApp(final Activity activity)
    {
        activity.runOnUiThread(new Runnable()

 Project/qkcw2_sdk/src/main/java/com/secondworld/universalsdk/MainActivity.java

@@ -26,6 +26,7 @@
import com.secondworld.univeralsdk.R;
import com.unity3d.player.UnityPlayer;
import com.unity3d.player.UnityPlayerActivity;
import android.util.DisplayMetrics;

public class MainActivity extends UnityPlayerActivity
{
@@ -40,6 +41,9 @@
    private RelativeLayout m_MainContainer;
    private int mType;
    private boolean isNotch = false;

    private int gameWidth;
    private int gameHeight;

    @Override
    protected void onCreate(Bundle savedInstanceState)
@@ -104,6 +108,17 @@
            Sdk.getInstance().init(this, "55748756613777418058915575591656", "23010677");
        }
        QuickSDK.getInstance().setIsLandScape(true);

        DisplayMetrics dm = new DisplayMetrics();
        this.getWindowManager().getDefaultDisplay().getRealMetrics(dm);
        if(gameWidth == 0){
            gameWidth = dm.widthPixels;
        }

        if(gameHeight == 0)
        {
            gameHeight = dm.heightPixels;
        }
    }

    @Override
@@ -187,6 +202,10 @@
        H2EngineSDK.onConfigurationChanged(newConfig);

        super.onConfigurationChanged(newConfig);

        mUnityPlayer.getView().getLayoutParams().width = gameWidth;

        mUnityPlayer.getView().getLayoutParams().height = gameHeight;
    }

    @Override

			@@ -7,7 +7,7 @@
			android:versionName="1.0" >

			<uses-sdk
			android:minSdkVersion="16"
			android:minSdkVersion="17"
			android:targetSdkVersion="26" />

			<uses-permission android:name="android.permission.INTERNET" />

			@@ -6,7 +6,7 @@


			defaultConfig {
			minSdkVersion 16
			minSdkVersion 17
			targetSdkVersion 26
			versionCode 1
			versionName "1.0"

			@@ -100,12 +100,14 @@
			case CodeU2A.FreePlatformInit:
			break;
			case CodeU2A.FreePlatformLogin:
			QuickPlatformUtil.getInstance().login(_activity);
			//QuickPlatformUtil.getInstance().login(_activity);
			LoginEx(_activity);
			break;
			case CodeU2A.FreePlatformSwitchAccount:
			break;
			case CodeU2A.FreePlatformLogout:
			QuickPlatformUtil.getInstance().logout(_activity);
			//QuickPlatformUtil.getInstance().logout(_activity);
			LogoutEx(_activity);
			break;
			case CodeU2A.FreePlatformPay:

			@@ -212,8 +214,8 @@
			roleInfo.setProfession("法师"); //360渠道参数，设置角色职业名称
			roleInfo.setFriendlist(
			"无"); //360渠道参数，设置好友关系列表，格式请参考：http://open.quicksdk.net/help/detail/aid/190
			User.getInstance().setGameRoleInfo(_activity, roleInfo, true);

			//User.getInstance().setGameRoleInfo(_activity, roleInfo, true);
			SetRoleInfoEx(_activity, roleInfo, true);
			// QuickPlatformUtil.getInstance().createRole(_activity,
			// _json.getString("sid"),
			// _json.getString("serverName"),
			@@ -250,7 +252,8 @@
			roleInfo1.setProfession("法师"); //360渠道参数，设置角色职业名称
			roleInfo1.setFriendlist(
			"无"); //360渠道参数，设置好友关系列表，格式请参考：http://open.quicksdk.net/help/detail/aid/190
			User.getInstance().setGameRoleInfo(_activity, roleInfo1, false);
			//User.getInstance().setGameRoleInfo(_activity, roleInfo1, false);
			SetRoleInfoEx(_activity, roleInfo1, false);
			// QuickPlatformUtil.getInstance().enterWorld(_activity,
			// _json.getString("sid"),
			// _json.getString("serverName"),
			@@ -288,7 +291,8 @@
			roleInfo2.setFriendlist(
			"无"); //360渠道参数，设置好友关系列表，格式请参考：http://open.quicksdk.net/help/detail/aid/190

			User.getInstance().setGameRoleInfo(_activity, roleInfo2, false);
			//User.getInstance().setGameRoleInfo(_activity, roleInfo2, false);
			SetRoleInfoEx(_activity, roleInfo2, false);
			// QuickPlatformUtil.getInstance().levelUp(_activity,
			// _json.getString("sid"),
			// _json.getString("serverName"),
			@@ -407,6 +411,43 @@
			}
			}

			public static void LoginEx(final Activity activity)
			{
			activity.runOnUiThread(new Runnable()
			{
			@Override
			public void run()
			{
			QuickPlatformUtil.getInstance().login(activity);
			}
			});
			}

			public static void LogoutEx(final Activity activity)
			{
			activity.runOnUiThread(new Runnable()
			{
			@Override
			public void run()
			{
			QuickPlatformUtil.getInstance().logout(activity);
			}
			});
			}

			public static void SetRoleInfoEx(final Activity activity, final GameRoleInfo roleInfo, final boolean createRole)
			{
			activity.runOnUiThread(new Runnable()
			{
			@Override
			public void run()
			{
			User.getInstance().setGameRoleInfo(activity, roleInfo, createRole);
			}
			});
			}


			public static void CopyContent(final Activity activity, final String content)
			{
			activity.runOnUiThread(new Runnable()

			@@ -26,6 +26,7 @@
			import com.secondworld.univeralsdk.R;
			import com.unity3d.player.UnityPlayer;
			import com.unity3d.player.UnityPlayerActivity;
			import android.util.DisplayMetrics;

			public class MainActivity extends UnityPlayerActivity
			{
			@@ -40,6 +41,9 @@
			private RelativeLayout m_MainContainer;
			private int mType;
			private boolean isNotch = false;

			private int gameWidth;
			private int gameHeight;

			@Override
			protected void onCreate(Bundle savedInstanceState)
			@@ -104,6 +108,17 @@
			Sdk.getInstance().init(this, "93578681820710896227244688639138", "49535443");
			}
			QuickSDK.getInstance().setIsLandScape(true);

			DisplayMetrics dm = new DisplayMetrics();
			this.getWindowManager().getDefaultDisplay().getRealMetrics(dm);
			if(gameWidth == 0){
			gameWidth = dm.widthPixels;
			}

			if(gameHeight == 0)
			{
			gameHeight = dm.heightPixels;
			}
			}

			@Override
			@@ -187,6 +202,10 @@
			H2EngineSDK.onConfigurationChanged(newConfig);

			super.onConfigurationChanged(newConfig);

			mUnityPlayer.getView().getLayoutParams().width = gameWidth;

			mUnityPlayer.getView().getLayoutParams().height = gameHeight;
			}

			@Override