Merge branch 'master' of http://192.168.2.10:3000/GFG/Client

GameClient/Assets/Plugins/Android/baseProjectTemplate.gradle

@@ -0,0 +1,39 @@
+// GENERATED BY UNITY. REMOVE THIS COMMENT TO PREVENT OVERWRITING WHEN EXPORTING AGAIN
+
+allprojects {
+    buildscript {
+        repositories {**ARTIFACTORYREPOSITORY**
+            google()
+            jcenter()
+            maven {
+            url "https://mvn.mob.com/android/"}
+        }
+
+        dependencies {
+            // If you are changing the Android Gradle Plugin version, make sure it is compatible with the Gradle version preinstalled with Unity
+            // See which Gradle version is preinstalled with Unity here https://docs.unity3d.com/Manual/android-gradle-overview.html
+            // See official Gradle and Android Gradle Plugin compatibility table here https://developer.android.com/studio/releases/gradle-plugin#updating-gradle
+            // To specify a custom Gradle version in Unity, go do "Preferences > External Tools", uncheck "Gradle Installed with Unity (recommended)" and specify a path to a custom Gradle version
+            classpath 'com.android.tools.build:gradle:3.4.3'
+            // Add MobSDK classpath dependency
+            classpath "com.mob.sdk:MobSDK2:+"
+            **BUILD_SCRIPT_DEPS**
+        }
+    }
+
+    repositories {**ARTIFACTORYREPOSITORY**
+        google()
+        jcenter()
+        flatDir {
+            dirs "${project(':unityLibrary').projectDir}/libs"
+        }
+         // Add MobSDK Maven repository
+        maven {
+            url "https://mvn.mob.com/android/"
+        }
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}

GameClient/Assets/Plugins/Android/baseProjectTemplate.gradle.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: af9cc692d722e2a4299568439af42567
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Plugins/Android/gradleTemplate.properties

@@ -0,0 +1,6 @@
+org.gradle.jvmargs=-Xmx**JVM_HEAP_SIZE**M
+org.gradle.parallel=true
+android.enableR8=**MINIFY_WITH_R_EIGHT**
+unityStreamingAssets=.unity3d**STREAMING_ASSETS**
+MobSDK.spEdition=FP
+**ADDITIONAL_PROPERTIES**

GameClient/Assets/Plugins/Android/gradleTemplate.properties.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4f713b8861a31a841a13e8666d75549d
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Plugins/Android/launcherTemplate.gradle

@@ -0,0 +1,135 @@
+// GENERATED BY UNITY. REMOVE THIS COMMENT TO PREVENT OVERWRITING WHEN EXPORTING AGAIN
+
+apply plugin: 'com.android.application'
+
+dependencies {
+    implementation project(':unityLibrary')
+    }
+
+android {
+    compileSdkVersion **APIVERSION**
+    buildToolsVersion '**BUILDTOOLS**'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    defaultConfig {
+        minSdkVersion **MINSDKVERSION**
+        targetSdkVersion **TARGETSDKVERSION**
+        applicationId '**APPLICATIONID**'
+        ndk {
+            abiFilters **ABIFILTERS**
+        }
+        versionCode **VERSIONCODE**
+        versionName '**VERSIONNAME**'
+    }
+
+    aaptOptions {
+        noCompress = ['.ress', '.resource', '.obb'] + unityStreamingAssets.tokenize(', ')
+        ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~"
+    }**SIGN**
+
+    lintOptions {
+        abortOnError false
+    }
+
+    buildTypes {
+        debug {
+            minifyEnabled **MINIFY_DEBUG**
+            proguardFiles getDefaultProguardFile('proguard-android.txt')**SIGNCONFIG**
+            jniDebuggable true
+        }
+        release {
+            minifyEnabled **MINIFY_RELEASE**
+            proguardFiles getDefaultProguardFile('proguard-android.txt')**SIGNCONFIG**
+        }
+    }**PACKAGING_OPTIONS****PLAY_ASSET_PACKS****SPLITS**
+**BUILT_APK_LOCATION**
+    bundle {
+        language {
+            enableSplit = false
+        }
+        density {
+            enableSplit = false
+        }
+        abi {
+            enableSplit = true
+        }
+    }
+}**SPLITS_VERSION_CODE****LAUNCHER_SOURCE_BUILD_SETUP**
+
+apply plugin: 'com.mob.sdk'
+
+MobSDK {
+    appKey "39cb75f714db3"
+    appSecret "7fdbd1e2d3fd5beaa360d7eca51d844e"
+    ShareSDK {
+        //第三方平台配置
+        devInfo {
+            SinaWeibo {
+                id 1
+                sortId 59
+                appKey "568898243"
+                appSecret "38a4f8204cc784f81f9f0daaf31e02e3"
+                callbackUri "http://www.sharesdk.cn"
+                shareByAppClient true
+                enable true
+            }
+
+            TencentWeibo {
+                id 2
+                sortId 2
+                appKey "801307650"
+                appSecret "ae36f4ee3946e1cbb98d6965b0b2ff5c"
+                callbackUri "http://sharesdk.cn"
+                enable true
+            }
+            Wechat {
+                id 4
+                sortId 4
+                appId "wxf8452955e8de2e46"
+                appSecret "f9fcae1666d6e9e24cac0f7dd395433d"
+                withShareTicket true
+                bypassApproval true
+                enable true
+            }
+            WechatMoments {
+                id 5
+                sortId 5
+                appId "wxf8452955e8de2e46"
+                appSecret "f9fcae1666d6e9e24cac0f7dd395433d"
+                bypassApproval true
+                enable true
+            }
+            WeChatFavorites{
+                id 6
+                sortId 6
+                appId "wxf8452955e8de2e46"
+                appSecret "f9fcae1666d6e9e24cac0f7dd395433d"
+                bypassApproval true
+                enable true
+            }
+            QZone {
+                id 3
+                sortId 3
+                appId "100371282"
+                appKey "aed9b0303e3ed1e27bae87c33761161d"
+                shareByAppClient true
+                bypassApproval false
+                enable true
+            }
+             QQ {
+                id 7
+                sortId 7
+                appId "100371282"
+                appKey "aed9b0303e3ed1e27bae87c33761161d"
+                shareByAppClient true
+                bypassApproval false
+                enable true
+            }
+            //如果需要，添加其他第三方平台的配置
+        }
+    }
+}

GameClient/Assets/Plugins/Android/launcherTemplate.gradle.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 9c684b72e4e62e54093076fcc306c48f
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Plugins/Android/libs/douyou-release.aar.meta

@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: 586f79cda14c10f46bfc629a29771d7d
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Plugins/Android/libs/douyouTT-release.aar.meta

@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: 3a452077ab5726045aefeac7735faeb6
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Plugins/com/easy/bridge/DouYouMainActivity.java

@@ -1,249 +0,0 @@
-package com.easy.bridge;
-
-import android.os.Bundle;
-
-import android.content.Intent;
-import android.content.res.Configuration;
-
-import com.sdk.douyou.DouYou;
-import com.sdk.douyou.listen.ActiveGameInterface;
-import com.sdk.douyou.listen.EnterGameInterface;
-import com.sdk.douyou.listen.SwitchAccountInterface;
-import com.sdk.douyou.adapter.DouYouSDKListenerAdapter;
-import com.sdk.douyou.listen.DouYouSDKListener;
-import com.sdk.douyou.bean.OrderInfoBean;
-import com.sdk.douyou.bean.RoleInfoBean;
-import com.sdk.douyou.util.LogUtil;
-import com.tencent.bugly.crashreport.CrashReport;
-import com.unity3d.player.UnityPlayer;
-import com.unity3d.player.UnityPlayerActivity;
-
-public class DouYouMainActivity extends UnityPlayerActivity
-{
-    private int uid;
-
-    private Bundle _savedInstanceState;
-
-    @Override protected void onCreate(Bundle savedInstanceState)
-    {
-        _savedInstanceState = savedInstanceState;
-        super.onCreate(savedInstanceState);
-
-        CrashReport.initCrashReport(getApplicationContext(), "766c5bdb0f", false);
-    }
-
-    //初始化douYou Sdk
-    public void initDouYou(String adId) {
-        UnityPlayer.UnitySendMessage("DouYouSDKGameObject", "ReceiveMessage", "SDK 实例化开始");
-        DouYou.getInstance().reportActive(this, adId);
-        DouYou.getInstance().setActivesuccessCallBack(new ActiveGameInterface() {
-            @Override
-            public void Activesuccess() {
-                UnityPlayer.UnitySendMessage("DouYouSDKGameObject", "InitSuccess", "SDK 实例化成功");
-            }
-        });
-
-        DouYou.getInstance().init(this, adId, true, new EnterGameInterface() {
-            @Override
-            public void enter(int resUid, String token) {
-                uid = resUid;
-                // 登录成功后的处理逻辑，可以将 uid 和 token 发送给Unity
-                DouYou.getInstance().showFloatBall(DouYouMainActivity.this);
-                UnityPlayer.UnitySendMessage("DouYouSDKGameObject", "LoginSuccess", resUid + "|gfg|" + token);
-            }
-        }, new SwitchAccountInterface() {
-            @Override
-            public void home() {
-                // 切换账号或退出登录后的处理逻辑，可以通知Unity返回游戏登录界面
-                UnityPlayer.UnitySendMessage("DouYouSDKGameObject", "OutLoginSuccess",  "退出登录成功!");
-            }
-        });
-
-        DouYou.getInstance().onCreate(this, _savedInstanceState);
-
-        //监听支付回调
-        DouYou.getInstance().setSDKListener(new DouYouSDKListenerAdapter(){
-            @Override
-            public void onPayResult(int code, OrderInfoBean params) {
-                // params.getOrderID() 研发ID
-                // params.getXxx() 是DouYou的订单ID
-                switch (code) {
-                    case DouYouSDKListener.CODE_PAY_FAIL: //支付失败
-                        LogUtil.debug("pay fail ： " + params.toString());
-                        UnityPlayer.UnitySendMessage("DouYouSDKGameObject", "PayFail", code + "|gfg|" + params.toString());
-                        break;
-                    case DouYouSDKListener.CODE_PAY_SUCCESS:  //支付成功
-                        LogUtil.debug("pay success ： " + params.toString());
-                        UnityPlayer.UnitySendMessage("DouYouSDKGameObject", "PaySuccess", code + "|gfg|" + params.toString());
-                        break;
-                }
-            }
-        });
-    }
-
-    //显示登录界面
-    public void extShowLogin(){
-        UnityPlayer.UnitySendMessage("DouYouSDKGameObject", "ReceiveMessage", "显示登录界面");
-        DouYou.getInstance().showLogin(DouYouMainActivity.this);
-    }
-
-    //角色登录数据上报
-    public void extReportRoleLogin(String id, String level, String nickname, String sid, String serverName){
-        RoleInfoBean roleInfo = new RoleInfoBean();
-        roleInfo.setType(RoleInfoBean.TYPE_ENTER_GAME);
-        roleInfo.setSid(sid);
-        roleInfo.setServerName(serverName);
-        roleInfo.setId(id);
-        roleInfo.setNickname(nickname);
-        roleInfo.setLevel(level);
-       
-        DouYou.getInstance().reportRoleLogin(DouYouMainActivity.this, roleInfo);
-    }
-
-    //角色数据上报
-    public void extReportRole(int logType, String id, String level, String nickname, String sid, String serverName){
-        RoleInfoBean roleInfo = new RoleInfoBean();
-        roleInfo.setType(logType);
-        roleInfo.setSid(sid);
-        roleInfo.setServerName(serverName);
-        roleInfo.setId(id);
-        roleInfo.setNickname(nickname);
-        roleInfo.setLevel(level);
-
-        // 获取当前时间的毫秒级时间戳
-        long currentTimeMillis = System.currentTimeMillis();
-        // 将毫秒级时间戳转换为秒级时间戳
-        long currentTimeSeconds = currentTimeMillis / 1000;
-        if(logType == RoleInfoBean.TYPE_CREATE_ROLE){
-            roleInfo.setRoleCreateTime(currentTimeSeconds + "");
-        }
-        else if(logType == RoleInfoBean.TYPE_LEVEL_UP){
-            roleInfo.setRoleLevelUpTime(currentTimeSeconds + "");
-        }
-
-        DouYou.getInstance().reportRole(DouYouMainActivity.this, roleInfo);
-    }
-
-    //退出登录
-    public void extShowLogout(){
-        DouYou.getInstance().showLogout(DouYouMainActivity.this);
-    }
-
-    //退出app
-    public void extExitApp(){
-        DouYou.getInstance().exit();
-    }
-
-    //cp激励广告订单id  登录后用户uid  角色id
-    public void extOpenGroMoreAD(String cpAdOrderId, String roleId){
-        DouYou.getInstance().openGroMoreAD(cpAdOrderId, Integer.toString(uid), roleId);
-    }
-
-    //调起支付
-    public void extShowSwitchPayment(String orderId, String orderMoney, String productId, String productName, String productDesc, String roleServiceId, String serviceName, String roleId, String roleName, String roleLevel, String other){
-        OrderInfoBean orderInfoBean = new OrderInfoBean();
-        orderInfoBean.setOrderID(orderId);
-        orderInfoBean.setCpOrderMoney(orderMoney);
-        orderInfoBean.setProductId(productId);
-        orderInfoBean.setProductName(productName);
-        orderInfoBean.setProductDesc(productDesc);
-        orderInfoBean.setRoleServiceId(roleServiceId);
-        orderInfoBean.setRoleServiceName(serviceName);
-        orderInfoBean.setRoleId(roleId);
-        orderInfoBean.setRoleName(roleName);
-        orderInfoBean.setRoleLevel(roleLevel);
-        orderInfoBean.setOther(other);
-        
-        DouYou.getInstance().showSwitchPayment(DouYouMainActivity.this, orderInfoBean);
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        DouYou.getInstance().onStart(this);
-        UnityPlayer.UnitySendMessage("DouYouSDKGameObject", "SdkOnStart", "onStart finish");
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        DouYou.getInstance().onPause(this);
-        UnityPlayer.UnitySendMessage("DouYouSDKGameObject", "SdkOnPause", "onPause finish");
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        DouYou.getInstance().onResume(this);
-        UnityPlayer.UnitySendMessage("DouYouSDKGameObject", "SdkOnResume", "onResume finish");
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        DouYou.getInstance().onStop(this);
-        UnityPlayer.UnitySendMessage("DouYouSDKGameObject", "SdkOnStop", "onStop finish");
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        DouYou.getInstance().onDestroy(this);
-        UnityPlayer.UnitySendMessage("DouYouSDKGameObject", "SdkOnDestroy", "onDestroy finish");
-    }
-
-    @Override
-    protected void onRestart() {
-        super.onRestart();
-        DouYou.getInstance().onRestart(this);
-        UnityPlayer.UnitySendMessage("DouYouSDKGameObject", "SdkOnRestart", "onRestart finish");
-    }
-
-    @Override
-    public void onBackPressed() {
-        DouYou.getInstance().onBackPressed();
-        UnityPlayer.UnitySendMessage("DouYouSDKGameObject", "SdkOnBackPressed", "onBackPressed finish");
-    }
-
-    @Override
-    protected void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
-        DouYou.getInstance().onNewIntent(intent);
-        UnityPlayer.UnitySendMessage("DouYouSDKGameObject", "SdkOnNewIntent", "onNewIntent finish");
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        DouYou.getInstance().onConfigurationChanged(newConfig);
-        UnityPlayer.UnitySendMessage("DouYouSDKGameObject", "SdkOnConfigurationChanged", "onConfigurationChanged finish");
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        DouYou.getInstance().onSaveInstanceState(outState);
-        UnityPlayer.UnitySendMessage("DouYouSDKGameObject", "SdkOnSaveInstanceState", "onSaveInstanceState finish");
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        DouYou.getInstance().onActivityResult(requestCode, resultCode, data);
-        UnityPlayer.UnitySendMessage("DouYouSDKGameObject", "SdkOnActivityResult", "onActivityResult finish");
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        DouYou.getInstance().onRequestPermissionResult(DouYouMainActivity.this,requestCode,permissions,grantResults);
-        UnityPlayer.UnitySendMessage("DouYouSDKGameObject", "SdkOnRequestPermissionResult", "onRequestPermissionsResult finish");
-    }
-
-    @Override
-    public void onWindowFocusChanged(boolean hasFocus) {
-        super.onWindowFocusChanged(hasFocus);
-        DouYou.getInstance().onWindowFocusChanged(hasFocus);
-        UnityPlayer.UnitySendMessage("DouYouSDKGameObject", "SdkOnWindowFocusChanged", "onWindowFocusChanged finish");
-    }
-}

GameClient/Assets/Plugins/com/easy/bridge/DouYouMainActivity.java.meta

@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: d9bab6b10a929ac46bfc239972f59adc
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: