浏览代码

douyoutap

hexiaojie 11 月之前
父节点
当前提交
03ef323284
共有 33 个文件被更改,包括 44 次插入287 次删除
  1. 6 0
      GameClient/Assets/Editor/ToolsMenu.cs
  2. 8 0
      GameClient/Assets/Game/HotUpdate/Platform/QDDouYouManager.cs
  3. 12 11
      GameClient/Assets/Game/HotUpdate/Views/RoleInfo/GMPanelView.cs
  4. 4 0
      GameClient/Assets/Game/Launcher/LauncherConfig.cs
  5. 8 0
      GameClient/Assets/Game/Launcher/Platform/QDDouYouManagerInit.cs
  6. 二进制
      GameClient/Assets/Plugins/Android/libs/douyou-release.aar
  7. 二进制
      GameClient/Assets/Plugins/Android/libs/douyouTT-release.aar
  8. 5 0
      GameClient/Assets/Plugins/com/easy/bridge/DouYouMainActivity.java
  9. 0 8
      GameClient/Assets/Plugins/iOS/Debug-iphoneos.meta
  10. 二进制
      GameClient/Assets/Plugins/iOS/Debug-iphoneos/libLive2DCubismCore.a
  11. 0 33
      GameClient/Assets/Plugins/iOS/Debug-iphoneos/libLive2DCubismCore.a.meta
  12. 0 8
      GameClient/Assets/Plugins/iOS/Debug-iphonesimulator.meta
  13. 二进制
      GameClient/Assets/Plugins/iOS/Debug-iphonesimulator/libLive2DCubismCore.a
  14. 0 33
      GameClient/Assets/Plugins/iOS/Debug-iphonesimulator/libLive2DCubismCore.a.meta
  15. 0 8
      GameClient/Assets/Plugins/iOS/Release-iphoneos.meta
  16. 二进制
      GameClient/Assets/Plugins/iOS/Release-iphoneos/libLive2DCubismCore.a
  17. 0 33
      GameClient/Assets/Plugins/iOS/Release-iphoneos/libLive2DCubismCore.a.meta
  18. 0 8
      GameClient/Assets/Plugins/iOS/Release-iphonesimulator.meta
  19. 二进制
      GameClient/Assets/Plugins/iOS/Release-iphonesimulator/libLive2DCubismCore.a
  20. 0 33
      GameClient/Assets/Plugins/iOS/Release-iphonesimulator/libLive2DCubismCore.a.meta
  21. 二进制
      GameClient/Assets/Plugins/iOS/libkcp.a
  22. 0 33
      GameClient/Assets/Plugins/iOS/libkcp.a.meta
  23. 1 1
      GameClient/ProjectSettings/ProjectSettings.asset
  24. 0 8
      GameClient/TapTap/AntiAddiction.meta
  25. 0 8
      GameClient/TapTap/Bootstrap.meta
  26. 0 8
      GameClient/TapTap/Common.meta
  27. 0 8
      GameClient/TapTap/Gen.meta
  28. 0 8
      GameClient/TapTap/Gen/Editor.meta
  29. 0 7
      GameClient/TapTap/Gen/Editor/TapTapADRDependencies.xml
  30. 0 7
      GameClient/TapTap/Gen/Editor/TapTapADRDependencies.xml.meta
  31. 0 8
      GameClient/TapTap/Login.meta
  32. 0 8
      GameClient/TapTap/Payment.meta
  33. 0 8
      GameClient/TapTap/TapDB.meta

+ 6 - 0
GameClient/Assets/Editor/ToolsMenu.cs

@@ -52,6 +52,12 @@ namespace GFGEditor
         {
             
         }
+#elif PT_DouYouTap
+        [MenuItem("PT_DouYouTap/")]
+        public static void VersionTag()
+        {
+            
+        }
 #elif PT_TAPTAP
         [MenuItem("TAPTAP/")]
         public static void VersionTag()

+ 8 - 0
GameClient/Assets/Game/HotUpdate/Platform/QDDouYouManager.cs

@@ -120,6 +120,14 @@ namespace GFGGame
             QDManager.PushRoleAction(DouYouRoleLogReportType.ExitGame);
             QDDouYouManagerInit.Instance.ExitApp();
         }
+        
+        /// <summary>
+        /// 跳转信息
+        /// </summary>
+        public void JumpInfo()
+        {
+            QDDouYouManagerInit.Instance.ExtJumpInfo();
+        }
     }
 
     /// <summary>

+ 12 - 11
GameClient/Assets/Game/HotUpdate/Views/RoleInfo/GMPanelView.cs

@@ -416,17 +416,18 @@ namespace GFGGame
 
         private void OnClickShareTest1(EventContext context = null)
         {
-            QDShareManager.Instance.SubmitPolicyGrantResult();
-            ShareContent content = new ShareContent();
-            content.SetText("this is a test string.");
-            content.SetImageUrl("https://f1.webshare.mob.com/code/demo/img/1.jpg");
-            content.SetTitle("test title");
-            content.SetSite("Mob-ShareSDK");
-            content.SetComment("test description");
-            content.SetShareType(ContentType.Image);
-            PlatformType[] platformTypes = new[]
-                { PlatformType.WeChatMoments, PlatformType.WeChat, PlatformType.WeChatFavorites };
-            QDShareManager.Instance.ShowPlatformList(platformTypes, content);
+            // QDShareManager.Instance.SubmitPolicyGrantResult();
+            // ShareContent content = new ShareContent();
+            // content.SetText("this is a test string.");
+            // content.SetImageUrl("https://f1.webshare.mob.com/code/demo/img/1.jpg");
+            // content.SetTitle("test title");
+            // content.SetSite("Mob-ShareSDK");
+            // content.SetComment("test description");
+            // content.SetShareType(ContentType.Image);
+            // PlatformType[] platformTypes = new[]
+            //     { PlatformType.WeChatMoments, PlatformType.WeChat, PlatformType.WeChatFavorites };
+            // QDShareManager.Instance.ShowPlatformList(platformTypes, content);
+            QDDouYouManager.Instance.JumpInfo();
         }
 
         private void OnClickShareTest2(EventContext context = null)

+ 4 - 0
GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -84,6 +84,10 @@ namespace GFGGame
             netType = EnumNetType.PUBLIC;
             cfgName = "cfg_douYou12";
             ChannelId = (int)ChannelID.DouYou;
+#elif PT_DouYouTap
+            netType = EnumNetType.PUBLIC;
+            cfgName = "cfg_douYouTap";
+            ChannelId = (int)ChannelID.DouYou;
 #elif PT_IOS
             netType = EnumNetType.PUBLIC;
             cfgName = "cfg_ios";

+ 8 - 0
GameClient/Assets/Game/Launcher/Platform/QDDouYouManagerInit.cs

@@ -91,6 +91,14 @@ namespace GFGGame.Launcher
         {
             Instance.CallDouYouMainActivity("extExitApp");
         }
+        
+        /// <summary>
+        /// 跳转信息
+        /// </summary>
+        public void ExtJumpInfo()
+        {
+            Instance.CallDouYouMainActivity("extJumpInfo");
+        }
 
         /// <summary>
         /// 调起支付

二进制
GameClient/Assets/Plugins/Android/libs/douyou-release.aar


二进制
GameClient/Assets/Plugins/Android/libs/douyouTT-release.aar


+ 5 - 0
GameClient/Assets/Plugins/com/easy/bridge/DouYouMainActivity.java

@@ -157,6 +157,11 @@ public class DouYouMainActivity extends UnityPlayerActivity
         DouYou.getInstance().showSwitchPayment(DouYouMainActivity.this, orderInfoBean);
     }
 
+    //跳转信息(非必要接口)
+    public void extJumpInfo(){
+      DouYou.getInstance().jumpInfo(DouYouMainActivity.this);
+    }
+
     @Override
     protected void onStart() {
         super.onStart();

+ 0 - 8
GameClient/Assets/Plugins/iOS/Debug-iphoneos.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5c19cfc39cc1f49b29475edb6f7c3239
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

二进制
GameClient/Assets/Plugins/iOS/Debug-iphoneos/libLive2DCubismCore.a


+ 0 - 33
GameClient/Assets/Plugins/iOS/Debug-iphoneos/libLive2DCubismCore.a.meta

@@ -1,33 +0,0 @@
-fileFormatVersion: 2
-guid: 8bc317ec51d1749a587bdd23fa6a64aa
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  - first:
-      iPhone: iOS
-    second:
-      enabled: 1
-      settings:
-        AddToEmbeddedBinaries: false
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
GameClient/Assets/Plugins/iOS/Debug-iphonesimulator.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 2a287cf0b3d5e4326829a18e59a1b2f3
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

二进制
GameClient/Assets/Plugins/iOS/Debug-iphonesimulator/libLive2DCubismCore.a


+ 0 - 33
GameClient/Assets/Plugins/iOS/Debug-iphonesimulator/libLive2DCubismCore.a.meta

@@ -1,33 +0,0 @@
-fileFormatVersion: 2
-guid: 3817d63e9b2a944909f94d297a9b8b10
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  - first:
-      iPhone: iOS
-    second:
-      enabled: 1
-      settings:
-        AddToEmbeddedBinaries: false
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
GameClient/Assets/Plugins/iOS/Release-iphoneos.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9365db11ec0c24014a84201684985639
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

二进制
GameClient/Assets/Plugins/iOS/Release-iphoneos/libLive2DCubismCore.a


+ 0 - 33
GameClient/Assets/Plugins/iOS/Release-iphoneos/libLive2DCubismCore.a.meta

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

+ 0 - 8
GameClient/Assets/Plugins/iOS/Release-iphonesimulator.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 14432d5d2914044b08aae734c8a7d59c
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

二进制
GameClient/Assets/Plugins/iOS/Release-iphonesimulator/libLive2DCubismCore.a


+ 0 - 33
GameClient/Assets/Plugins/iOS/Release-iphonesimulator/libLive2DCubismCore.a.meta

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

二进制
GameClient/Assets/Plugins/iOS/libkcp.a


+ 0 - 33
GameClient/Assets/Plugins/iOS/libkcp.a.meta

@@ -1,33 +0,0 @@
-fileFormatVersion: 2
-guid: 1772665981fac4a9dbb4b27048f61792
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  - first:
-      iPhone: iOS
-    second:
-      enabled: 1
-      settings:
-        AddToEmbeddedBinaries: false
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 1 - 1
GameClient/ProjectSettings/ProjectSettings.asset

@@ -638,7 +638,7 @@ PlayerSettings:
   webGLThreadsSupport: 0
   webGLDecompressionFallback: 0
   scriptingDefineSymbols:
-    7: PT_DOUYOU
+    7: PT_DouYouTap
   additionalCompilerArguments: {}
   platformArchitecture: {}
   scriptingBackend:

+ 0 - 8
GameClient/TapTap/AntiAddiction.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f4506ccb78153cb46b24c54cf18b27bb
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
GameClient/TapTap/Bootstrap.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5795c8013ee0cd945a41dc9c5402dc50
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
GameClient/TapTap/Common.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 3083609e7e019724ab991ea6aad22711
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
GameClient/TapTap/Gen.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 57d831c58e10e64438f9d172fa6d9263
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
GameClient/TapTap/Gen/Editor.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4906bb74d47848047a9584f2be7a0870
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
GameClient/TapTap/Gen/Editor/TapTapADRDependencies.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<dependencies>
-  <androidPackages>
-    <androidPackage spec="com.tencent.mm.opensdk:wechat-sdk-android:6.8.0" />
-    <androidPackage spec="com.alipay.sdk:alipaysdk-android:15.8.11@aar" />
-  </androidPackages>
-</dependencies>

+ 0 - 7
GameClient/TapTap/Gen/Editor/TapTapADRDependencies.xml.meta

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

+ 0 - 8
GameClient/TapTap/Login.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0978ae390dff90d449c8c1b99a471373
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
GameClient/TapTap/Payment.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 6d996cc11b92af5449ec6f3fd32489c2
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
GameClient/TapTap/TapDB.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: dff7ef7181aedcc42ac5c711a3023ef5
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: