hexiaojie 11 mēneši atpakaļ
vecāks
revīzija
3a3b5198bf

+ 48 - 48
GameClient/Assets/Game/Launcher/Platform/ATTAuth.cs

@@ -1,48 +1,48 @@
-using System;
-using UnityEngine;
-
-namespace GFGGame.Launcher
-{
-    public class ATTAuth : MonoBehaviour
-    {
-        [System.Runtime.InteropServices.DllImport("__Internal")]
-        private static extern void _RequestTrackingAuthorizationWithCompletionHandler();
-
-        [System.Runtime.InteropServices.DllImport("__Internal")]
-        private static extern int _GetAppTrackingAuthorizationStatus();
-
-        private static Action<int> getAuthorizationStatusAction;
-
-        /// <summary>
-        /// 请求ATT授权窗口
-        /// </summary>
-        /// <param name="getResult"></param>
-        public static void RequestTrackingAuthorizationWithCompletionHandler(Action<int> getResult)
-        {
-            //-1:"ios版本低于14"
-            //0: "ATT 授权状态待定";
-            //1: "ATT 授权状态受限";
-            //2: "ATT 已拒绝";
-            //3: "ATT 已授权";
-            Debug.Log("RequestTrackingAuthorizationWithCompletionHandler");
-            getAuthorizationStatusAction = getResult;
-            _RequestTrackingAuthorizationWithCompletionHandler();
-        }
-
-        /// <summary>
-        /// 获取当前ATT授权状态
-        /// </summary>
-        /// <returns></returns>
-        public static int GetAppTrackingAuthorizationStatus()
-        {
-            return _GetAppTrackingAuthorizationStatus();
-        }
-
-        public void GetAuthorizationStatus(string status)
-        {
-            getAuthorizationStatusAction?.Invoke(int.Parse(status));
-        }
-
-    }
-}
-
+// using System;
+// using UnityEngine;
+//
+// namespace GFGGame.Launcher
+// {
+//     public class ATTAuth : MonoBehaviour
+//     {
+//         [System.Runtime.InteropServices.DllImport("__Internal")]
+//         private static extern void _RequestTrackingAuthorizationWithCompletionHandler();
+//
+//         [System.Runtime.InteropServices.DllImport("__Internal")]
+//         private static extern int _GetAppTrackingAuthorizationStatus();
+//
+//         private static Action<int> getAuthorizationStatusAction;
+//
+//         /// <summary>
+//         /// 请求ATT授权窗口
+//         /// </summary>
+//         /// <param name="getResult"></param>
+//         public static void RequestTrackingAuthorizationWithCompletionHandler(Action<int> getResult)
+//         {
+//             //-1:"ios版本低于14"
+//             //0: "ATT 授权状态待定";
+//             //1: "ATT 授权状态受限";
+//             //2: "ATT 已拒绝";
+//             //3: "ATT 已授权";
+//             Debug.Log("RequestTrackingAuthorizationWithCompletionHandler");
+//             getAuthorizationStatusAction = getResult;
+//             _RequestTrackingAuthorizationWithCompletionHandler();
+//         }
+//
+//         /// <summary>
+//         /// 获取当前ATT授权状态
+//         /// </summary>
+//         /// <returns></returns>
+//         public static int GetAppTrackingAuthorizationStatus()
+//         {
+//             return _GetAppTrackingAuthorizationStatus();
+//         }
+//
+//         public void GetAuthorizationStatus(string status)
+//         {
+//             getAuthorizationStatusAction?.Invoke(int.Parse(status));
+//         }
+//
+//     }
+// }
+//

+ 11 - 11
GameClient/Assets/Game/Launcher/Platform/QDAppStoreManagerInit.cs

@@ -31,16 +31,16 @@ namespace GFGGame.Launcher
         }
 
 
-        private static void AddIOSMethod()
-        {
-            string objName = "IOSMethod";
-            var obj = GameObject.Find(objName);
-            if(obj == null)
-            {
-                obj = new GameObject(objName);
-                GameObject.DontDestroyOnLoad(obj);
-            }
-            obj.AddComponent<ATTAuth>();
-        }
+        // private static void AddIOSMethod()
+        // {
+        //     string objName = "IOSMethod";
+        //     var obj = GameObject.Find(objName);
+        //     if(obj == null)
+        //     {
+        //         obj = new GameObject(objName);
+        //         GameObject.DontDestroyOnLoad(obj);
+        //     }
+        //     obj.AddComponent<ATTAuth>();
+        // }
     }
 }

+ 1 - 1
GameClient/Assets/Plugins/Android/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.gfg.douyou"
+    package="com.gfg.douyoua"
     xmlns:tools="http://schemas.android.com/tools"
     android:installLocation="auto" >
 

BIN
GameClient/Assets/Plugins/Android/libs/takuSDK-release.aar


+ 0 - 32
GameClient/Assets/Plugins/Android/libs/takuSDK-release.aar.meta

@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: 9a317c756cd72a04a9ecc1382320fadb
-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: 

+ 3 - 6
GameClient/Assets/Plugins/com/easy/bridge/DouYouMainActivity.java

@@ -6,6 +6,7 @@ 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;
@@ -13,6 +14,7 @@ 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.bean.ShareBean;
 import com.sdk.douyou.util.LogUtil;
 import com.tencent.bugly.crashreport.CrashReport;
 import com.unity3d.player.UnityPlayer;
@@ -134,11 +136,6 @@ public class DouYouMainActivity extends UnityPlayerActivity
         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();
@@ -167,7 +164,7 @@ public class DouYouMainActivity extends UnityPlayerActivity
         ShareBean shareBean = new ShareBean();
         shareBean.setTitle(title); // 分享标题,可为空
         shareBean.setContents(contents); // 分享内容,可为空
-        DouYou.getInstance().share(MainActivity.this, shareBean);
+        DouYou.getInstance().share(DouYouMainActivity.this, shareBean);
     }
 
     @Override

+ 2 - 2
GameClient/ProjectSettings/ProjectSettings.asset

@@ -145,7 +145,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.2
+  bundleVersion: 1.3
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -164,7 +164,7 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-    Android: com.gfg.douyou
+    Android: com.gfg.douyoua
   buildNumber:
     Standalone: 0
     iPhone: 0